mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r13167) -Codechange: prepend _ to a global variable.

release/0.7
rubidium 2008-05-18 19:41:47 +00:00
parent 2e25df3ddf
commit 629c5ce740
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/saveload.cpp
View File

@ -1534,7 +1534,7 @@ static void SaveFileError()
SaveFileDone(); SaveFileDone();
} }
static ThreadObject *save_thread; static ThreadObject *_save_thread;
/** We have written the whole game into memory, _Savegame_pool, now find /** We have written the whole game into memory, _Savegame_pool, now find
* and appropiate compressor and start writing to file. * and appropiate compressor and start writing to file.
@ -1604,10 +1604,10 @@ static void * CDECL SaveFileToDiskThread(void *arg)
void WaitTillSaved() void WaitTillSaved()
{ {
if (save_thread == NULL) return; if (_save_thread == NULL) return;
save_thread->Join(); _save_thread->Join();
save_thread = NULL; _save_thread = NULL;
} }
/** /**
@ -1679,7 +1679,7 @@ SaveOrLoadResult SaveOrLoad(const char *filename, int mode, Subdirectory sb)
SaveFileStart(); SaveFileStart();
if (_network_server || if (_network_server ||
(save_thread = ThreadObject::New(&SaveFileToDiskThread, NULL)) == NULL) { (_save_thread = ThreadObject::New(&SaveFileToDiskThread, NULL)) == NULL) {
if (!_network_server) DEBUG(sl, 1, "Cannot create savegame thread, reverting to single-threaded mode..."); if (!_network_server) DEBUG(sl, 1, "Cannot create savegame thread, reverting to single-threaded mode...");
SaveOrLoadResult result = SaveFileToDisk(false); SaveOrLoadResult result = SaveFileToDisk(false);