mirror of
https://gitea.wildfiregames.com/0ad/0ad.git
synced 2026-07-28 13:31:59 +00:00
# Fixed some trigger bugs.
- Conditions were not properly converted to JavaScript (not read from the XML file correctly either). - Added an OrderFromTriggers function so that triggers can give orders which ignore fog of war. - Fixed some spelling mistakes in TriggerSpecs.xml (parameter vs. parameters). - Moved trigger update to CSimulation update, which is more correct. This was SVN commit r4821.
This commit is contained in:
@@ -26,6 +26,7 @@
|
||||
#include "simulation/Simulation.h"
|
||||
#include "simulation/TerritoryManager.h"
|
||||
#include "simulation/TurnManager.h"
|
||||
#include "simulation/TriggerManager.h"
|
||||
|
||||
CSimulation::CSimulation(CGame *pGame):
|
||||
m_pGame(pGame),
|
||||
@@ -146,6 +147,10 @@ void CSimulation::Simulate()
|
||||
m_pWorld->GetLOSManager()->Update();
|
||||
PROFILE_END( "los update" );
|
||||
|
||||
PROFILE_START("trigger update");
|
||||
g_TriggerManager.Update( m_pTurnManager->GetTurnLength() );
|
||||
PROFILE_END("trigger udpate");
|
||||
|
||||
PROFILE_START( "turn manager update" );
|
||||
m_pTurnManager->NewTurn();
|
||||
m_pTurnManager->IterateBatch(0, TranslateMessage, this);
|
||||
|
||||
Reference in New Issue
Block a user