From 1fd89646ff234ce74f35f9fb759c6b503a14bc6c Mon Sep 17 00:00:00 2001 From: Haru Date: Wed, 30 Oct 2013 19:05:07 +0100 Subject: Follow-up to baef78f7954fa4e6fa2449f2c7de92a901c7f5f3 - Corrected an issue with ammunitions not being detected correctly, making all ammo-dependent skills fail. - Credits to Ind, special thanks to Yommy Signed-off-by: Haru --- src/map/pc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/map/pc.h b/src/map/pc.h index 14e1da5f4..5f12052ca 100644 --- a/src/map/pc.h +++ b/src/map/pc.h @@ -47,13 +47,13 @@ enum equip_index { EQI_COSTUME_MID, EQI_COSTUME_LOW, EQI_COSTUME_GARMENT, + EQI_AMMO, EQI_SHADOW_ARMOR, EQI_SHADOW_WEAPON, EQI_SHADOW_SHIELD, EQI_SHADOW_SHOES, EQI_SHADOW_ACC_R, EQI_SHADOW_ACC_L, - EQI_AMMO, EQI_MAX }; struct weapon_data { -- cgit v1.2.3-70-g09d2 From bd04c6c566902d03d633b4dfee5335361155a79e Mon Sep 17 00:00:00 2001 From: Haru Date: Wed, 30 Oct 2013 20:23:34 +0100 Subject: Follow-up to 44c33fda3614d588e6bf6cee1cf884e98f1531f0 Corrected some leftover 32bit typecasts. Special thanks to Ind. Signed-off-by: Haru --- src/common/timer.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/common/timer.c b/src/common/timer.c index ccd91f9c7..e5cf5df2a 100644 --- a/src/common/timer.c +++ b/src/common/timer.c @@ -355,17 +355,17 @@ int64 timer_settick(int tid, int64 tick) { return -1; } - if( (int)tick == -1 ) - tick = 0;// add 1ms to avoid the error value -1 + if( tick == -1 ) + tick = 0; // add 1ms to avoid the error value -1 if( timer_data[tid].tick == tick ) - return (int)tick;// nothing to do, already in propper position + return tick; // nothing to do, already in proper position // pop and push adjusted timer BHEAP_POPINDEX(timer_heap, i, DIFFTICK_MINTOPCMP, swap); timer_data[tid].tick = tick; BHEAP_PUSH(timer_heap, tid, DIFFTICK_MINTOPCMP, swap); - return (int)tick; + return tick; } /// Executes all expired timers. -- cgit v1.2.3-70-g09d2