summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2013-10-30 19:45:57 -0200
committershennetsind <ind@henn.et>2013-10-30 19:45:57 -0200
commit8039bd169886a4b0583cd1a794fcf61c79626e86 (patch)
tree74ef0e6664ee85a6e729eb5aef6b790f68aa8b18
parent4340bf74d5fa64d8205bc86a3d2c0592b7a542c7 (diff)
parentbd04c6c566902d03d633b4dfee5335361155a79e (diff)
downloadhercules-8039bd169886a4b0583cd1a794fcf61c79626e86.tar.gz
hercules-8039bd169886a4b0583cd1a794fcf61c79626e86.tar.bz2
hercules-8039bd169886a4b0583cd1a794fcf61c79626e86.tar.xz
hercules-8039bd169886a4b0583cd1a794fcf61c79626e86.zip
Merge branch 'master' of https://github.com/HerculesWS/Hercules
-rw-r--r--src/common/timer.c8
-rw-r--r--src/map/pc.h2
2 files changed, 5 insertions, 5 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.
diff --git a/src/map/pc.h b/src/map/pc.h
index ddd3de1b9..fc37d0ef2 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 {