Compiling Error on vending.c

[SlashGeeGee]

Hi rA

I just updated my svn to the latest version then it states "one or more files is in a conflicted state" then I check out vending.c then right click -> Tortoise SVN -> Resolved.. , I thought it would solve the problem but then when I compile I got this error.

1>c:\ragnarok files\rathena\src\map\vending.c(236): error C2198: 'pc_payzeny' : too few arguments for call

1>c:\ragnarok files\rathena\src\map\vending.c(239): error C2198: 'pc_getzeny' : too few arguments for call

1>c:\ragnarok files\rathena\src\map\vending.c(258): error C2198: 'pc_payzeny' : too few arguments for call

1>c:\ragnarok files\rathena\src\map\vending.c(261): error C2198: 'pc_getzeny' : too few arguments for call

[code]

I checked it out all of lines 236,239,258 & 261 has this code [color=#008000]pc_payzeny(sd, (int)z);[/color]

BTW, I have diffed Lilith's Extended Vending System 1.8 this one :

@all

I've updated the diff to r16857. I did not test.

Here: extending_vending_16857.patch

thanks in advance for helping

[b]SlashGeeGee[/b]

Edited November 12, 2012 by SlashGeeGee

[Lighta]

wasn't really resolve you need to use resolve using their (mean for the conflict part use the svn one)

Anyway about those line :

line 236,239,258,261 : pc_payzeny and pc_getzeny need extra argument since r16914.

does line don't match for me so if you may quote it I could fix it for you other wise it should be something like :

pc_getzeny(vsd, (int)z, LOG_TYPE_VENDING, sd);

=> you need the LOG_TYPE_VENDING, and sd at end (well the last sd is optional, it's from who)

[MarkZD]

In src/map/vending.c

Replace all occurrences from this:

pc_payzeny(sd, (int)z);

to this:

pc_payzeny(sd, (int)z, LOG_TYPE_VENDING, vsd);

Replace all occurrencies from this:

pc_getzeny(vsd, (int)z);

to this:

pc_getzeny(vsd, (int)z, LOG_TYPE_VENDING, sd);

Remove both lines like this one:

//Logs (V)ending Zeny [Lupus]
log_zeny(vsd, LOG_TYPE_VENDING, sd, (int)z);

Edited November 13, 2012 by MarkZD