aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorn0n4m3 <none@none>2009-12-18 10:14:24 +0100
committern0n4m3 <none@none>2009-12-18 10:14:24 +0100
commited082a1830ffc4905e67619bb4094f809be5ab10 (patch)
tree2991049a0db1682eef45ab031aec91415dbc2104 /src
parentdb29bc3ae58bb1c587c9f8de2233910ac27ff776 (diff)
Fix wintergrasp timer
--HG-- branch : trunk
Diffstat (limited to 'src')
-rw-r--r--src/game/OutdoorPvPWG.cpp2
-rw-r--r--src/game/World.h18
2 files changed, 10 insertions, 10 deletions
diff --git a/src/game/OutdoorPvPWG.cpp b/src/game/OutdoorPvPWG.cpp
index 94389f1c812..27a9a026f79 100644
--- a/src/game/OutdoorPvPWG.cpp
+++ b/src/game/OutdoorPvPWG.cpp
@@ -1215,11 +1215,11 @@ void OutdoorPvPWG::UpdateTenacityStack()
void OutdoorPvPWG::UpdateClockDigit(uint32 &timer, uint32 digit, uint32 mod)
{
uint32 value = timer%mod;
- timer /= mod;
if (m_clock[digit] != value)
{
m_clock[digit] = value;
SendUpdateWorldState(ClockWorldState[digit], (timer + time(NULL)));
+ sWorld.SetWintergrapsTimer(timer + time(NULL), digit);
}
}
diff --git a/src/game/World.h b/src/game/World.h
index 79c621d9a51..6884dcd5597 100644
--- a/src/game/World.h
+++ b/src/game/World.h
@@ -614,17 +614,17 @@ class World
static float GetVisibleObjectGreyDistance() { return m_VisibleObjectGreyDistance; }
- void SetWintergrapsTimer(uint32 timer, uint32 state)
- {
- m_WintergrapsTimer = timer;
- m_WintergrapsState = state;
- }
+ void SetWintergrapsTimer(uint32 timer, uint32 state)
+ {
+ m_WintergrapsTimer = timer;
+ m_WintergrapsState = state;
+ }
- uint32 GetWintergrapsTimer() { return m_WintergrapsTimer; }
- uint32 GetWintergrapsState() { return m_WintergrapsState; }
+ uint32 GetWintergrapsTimer() { return m_WintergrapsTimer; }
+ uint32 GetWintergrapsState() { return m_WintergrapsState; }
- uint32 m_WintergrapsTimer;
- uint32 m_WintergrapsState;
+ uint32 m_WintergrapsTimer;
+ uint32 m_WintergrapsState;
void ProcessCliCommands();
void QueueCliCommand( CliCommandHolder::Print* zprintf, char const* input ) { cliCmdQueue.add(new CliCommandHolder(input, zprintf)); }