Merge branch 'master' into aa

This commit is contained in:
KimLS
2015-06-09 22:13:03 -07:00
3 changed files with 16 additions and 1 deletions
+3
View File
@@ -1449,6 +1449,9 @@ private:
Timer position_timer;
uint8 position_timer_counter;
// this is used to try to cut back on position update reflections
int position_update_same_count;
PTimerList p_timers; //persistent timers
Timer hpupdate_timer;
Timer camp_timer;