# HG changeset patch # User rubidium # Date 1211139707 0 # Node ID 258be16ef2bd17941694ef23e90526d913536f29 # Parent c758dcefb1f28d22c5206a9ad85da8dd4ab4b6e1 (svn r13167) -Codechange: prepend _ to a global variable. diff -r c758dcefb1f2 -r 258be16ef2bd src/saveload.cpp --- a/src/saveload.cpp Sun May 18 17:40:13 2008 +0000 +++ b/src/saveload.cpp Sun May 18 19:41:47 2008 +0000 @@ -1534,7 +1534,7 @@ 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 @@ 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 @@ 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);