dallasgroot/0ad
1
0
Fork 0
mirror of https://gitea.wildfiregames.com/0ad/0ad synced 2026-06-20 15:23:56 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix warning when quitting the game during loading. Patch by bb.

Browse source 
Also contains some `StatistcTracker` cleanup.

Differential Revision: https://code.wildfiregames.com/D475
This was SVN commit r19564.
This commit is contained in:
Imarok 2017-05-12 14:21:28 +00:00
parent 77246af17a
commit 31a41ab735
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
binaries/data/mods/public/simulation/components/StatisticsTracker.js
View file

@ -147,7 +147,7 @@ StatisticsTracker.prototype.Init = function()
let cmpTimer = Engine.QueryInterface(SYSTEM_ENTITY, IID_Timer);
this.updateTimer = cmpTimer.SetInterval(
this.entity, IID_StatisticsTracker, "updateSequences", 0, g_UpdateSequenceInterval);
this.entity, IID_StatisticsTracker, "UpdateSequences", 0, g_UpdateSequenceInterval);
};
/**
@ -203,13 +203,16 @@ StatisticsTracker.prototype.GetStatistics = function()
StatisticsTracker.prototype.GetSequences = function()
{
if (!this.sequences)
return {};
let ret = clone(this.sequences);
let cmpTimer = Engine.QueryInterface(SYSTEM_ENTITY, IID_Timer);
ret.time.push(cmpTimer.GetTime() / 1000);
this.PushValue(this.GetStatistics(), ret);
return ret;
}
};
/**
* Increments counter associated with certain entity/counter and type of given entity.
@ -530,12 +533,12 @@ StatisticsTracker.prototype.PushValue = function(fromData, toData)
toData.push(fromData);
};
StatisticsTracker.prototype.updateSequences = function()
StatisticsTracker.prototype.UpdateSequences = function()
{
let cmpTimer = Engine.QueryInterface(SYSTEM_ENTITY, IID_Timer);
// Don't do this on Init, because GetStatistics doesn't work in this state of the game
// This is probably, because the simulation hasn't totally started/initialized and we query some simulation values
// This is because the simulation hasn't totally started/initialized and we query some simulation values
if (!this.sequences)
{
this.sequences = clone(this.GetStatistics());
@ -544,6 +547,6 @@ StatisticsTracker.prototype.updateSequences = function()
this.sequences.time.push(cmpTimer.GetTime() / 1000);
this.PushValue(this.GetStatistics(), this.sequences);
}
};
Engine.RegisterComponentType(IID_StatisticsTracker, "StatisticsTracker", StatisticsTracker);