diff options
| author | Einar Johan Trøan Sømåen | 2012-07-09 02:50:15 +0200 |
|---|---|---|
| committer | Einar Johan Trøan Sømåen | 2012-07-09 02:50:15 +0200 |
| commit | 5224ebef2c8013bc9ff5cc6f9bdefbcf635b456c (patch) | |
| tree | ba1c7248ce50a7ce6c9b00f566d3df21f713d712 /engines/wintermute/Base/scriptables/ScEngine.cpp | |
| parent | 0273e495e1495d6abbcac4dde4cfa7e6ca2c29d7 (diff) | |
| download | scummvm-rg350-5224ebef2c8013bc9ff5cc6f9bdefbcf635b456c.tar.gz scummvm-rg350-5224ebef2c8013bc9ff5cc6f9bdefbcf635b456c.tar.bz2 scummvm-rg350-5224ebef2c8013bc9ff5cc6f9bdefbcf635b456c.zip | |
WINTERMUTE: Silence most warnings
Diffstat (limited to 'engines/wintermute/Base/scriptables/ScEngine.cpp')
| -rw-r--r-- | engines/wintermute/Base/scriptables/ScEngine.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/engines/wintermute/Base/scriptables/ScEngine.cpp b/engines/wintermute/Base/scriptables/ScEngine.cpp index 9b51cb2fe2..665829b6c0 100644 --- a/engines/wintermute/Base/scriptables/ScEngine.cpp +++ b/engines/wintermute/Base/scriptables/ScEngine.cpp @@ -289,9 +289,8 @@ byte *CScEngine::getCompiledScript(const char *filename, uint32 *outSize, bool i //////////////////////////////////////////////////////////////////////////
HRESULT CScEngine::tick() {
-
-
- if (_scripts.GetSize() == 0) return S_OK;
+ if (_scripts.GetSize() == 0)
+ return S_OK;
// resolve waiting scripts
@@ -369,15 +368,15 @@ HRESULT CScEngine::tick() { // normal script
else {
- uint32 StartTime = 0;
+ uint32 startTime = 0;
bool isProfiling = _isProfiling;
- if (isProfiling) StartTime = CBPlatform::getTime();
+ if (isProfiling) startTime = CBPlatform::getTime();
while (_scripts[i]->_state == SCRIPT_RUNNING) {
_currentScript = _scripts[i];
_scripts[i]->executeInstruction();
}
- if (isProfiling && _scripts[i]->_filename) addScriptTime(_scripts[i]->_filename, CBPlatform::getTime() - StartTime);
+ if (isProfiling && _scripts[i]->_filename) addScriptTime(_scripts[i]->_filename, CBPlatform::getTime() - startTime);
}
_currentScript = NULL;
}
|