summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 {