diff options
| author | rubidium <rubidium@openttd.org> | 2008-05-18 19:41:47 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2008-05-18 19:41:47 +0000 |
| commit | 97293e5cbb7e7e1cef20119f166ca86d5c241378 (patch) | |
| tree | b97ec599dc0e11705a16eb01b6250bc25d7c77e2 | |
| parent | 78eb7d66b12b38ba21cbbbbfad9e16831768f22c (diff) | |
| download | openttd-97293e5cbb7e7e1cef20119f166ca86d5c241378.tar.xz | |
(svn r13167) -Codechange: prepend _ to a global variable.
| -rw-r--r-- | src/saveload.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/saveload.cpp b/src/saveload.cpp index b69fdbfe2..512d402e9 100644 --- a/src/saveload.cpp +++ b/src/saveload.cpp @@ -1534,7 +1534,7 @@ static void SaveFileError() SaveFileDone(); } -static ThreadObject *save_thread; +static ThreadObject *_save_thread; /** We have written the whole game into memory, _Savegame_pool, now find * and appropiate compressor and start writing to file. @@ -1604,10 +1604,10 @@ static void * CDECL SaveFileToDiskThread(void *arg) void WaitTillSaved() { - if (save_thread == NULL) return; + if (_save_thread == NULL) return; - save_thread->Join(); - save_thread = NULL; + _save_thread->Join(); + _save_thread = NULL; } /** @@ -1679,7 +1679,7 @@ SaveOrLoadResult SaveOrLoad(const char *filename, int mode, Subdirectory sb) SaveFileStart(); 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..."); SaveOrLoadResult result = SaveFileToDisk(false); |