MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'eventManager' into trueTransformation

develop
expwnent 2013-01-02 19:24:14 -05:00
parent d4afa4b6e4 6d2773856a
commit 8c4e63e0cd
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
library/modules/EventManager.cpp
Unescape Escape View File

@ -159,6 +159,7 @@ static unordered_set<int32_t> buildings;
//construction //construction
static unordered_set<df::construction*> constructions; static unordered_set<df::construction*> constructions;
static bool gameLoaded;
void DFHack::EventManager::onStateChange(color_ostream& out, state_change_event event) { void DFHack::EventManager::onStateChange(color_ostream& out, state_change_event event) {
static bool doOnce = false; static bool doOnce = false;
@ -184,6 +185,7 @@ void DFHack::EventManager::onStateChange(color_ostream& out, state_change_event
constructions.clear(); constructions.clear();
Buildings::clearBuildings(out); Buildings::clearBuildings(out);
gameLoaded = false;
} else if ( event == DFHack::SC_MAP_LOADED ) { } else if ( event == DFHack::SC_MAP_LOADED ) {
uint32_t tick = DFHack::World::ReadCurrentYear()*ticksPerYear uint32_t tick = DFHack::World::ReadCurrentYear()*ticksPerYear
+ DFHack::World::ReadCurrentTick(); + DFHack::World::ReadCurrentTick();
@ -198,11 +200,12 @@ void DFHack::EventManager::onStateChange(color_ostream& out, state_change_event
nextItem = 0; nextItem = 0;
nextBuilding = 0; nextBuilding = 0;
lastTick = 0; lastTick = 0;
gameLoaded = true;
} }
} }
void DFHack::EventManager::manageEvents(color_ostream& out) { void DFHack::EventManager::manageEvents(color_ostream& out) {
if ( !Core::getInstance().isWorldLoaded() ) { if ( !gameLoaded ) {
return; return;
} }
uint32_t tick = DFHack::World::ReadCurrentYear()*ticksPerYear uint32_t tick = DFHack::World::ReadCurrentYear()*ticksPerYear
@ -478,7 +481,7 @@ static void manageSyndromeEvent(color_ostream& out) {
df::unit_syndrome* syndrome = unit->syndromes.active[b]; df::unit_syndrome* syndrome = unit->syndromes.active[b];
uint32_t startTime = syndrome->year*ticksPerYear + syndrome->year_time; uint32_t startTime = syndrome->year*ticksPerYear + syndrome->year_time;
out.print("start time = %d, time = %d\n", startTime, eventLastTick[EventType::SYNDROME]); out.print("start time = %d, time = %d\n", startTime, eventLastTick[EventType::SYNDROME]);
if ( startTime < eventLastTick[EventType::SYNDROME] ) if ( startTime <= eventLastTick[EventType::SYNDROME] )
continue; continue;
SyndromeData data(unit->id, b); SyndromeData data(unit->id, b);