From 629c5ce740084d5f42ff72354523528488d063d8 Mon Sep 17 00:00:00 2001 From: rubidium Date: Sun, 18 May 2008 19:41:47 +0000 Subject: [PATCH] (svn r13167) -Codechange: prepend _ to a global variable. --- src/saveload.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/saveload.cpp b/src/saveload.cpp index b69fdbfe2a..512d402e90 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);