Ticket #3011: 0008-Automatically-convert-all-CLogger-format-strings-fro.patch

source/graphics/ColladaManager.cpp

@@ -42 +42 @@
         VfsPath* path = static_cast<VfsPath*>(cb_data);
 
         if (severity == LOG_INFO)
-            LOGMESSAGE(L"%ls: %hs", path->string().c_str(), text);
+            LOGMESSAGE("%ls: %hs", path->string().c_str(), text);
         else if (severity == LOG_WARNING)
-            LOGWARNING(L"%ls: %hs", path->string().c_str(), text);
+            LOGWARNING("%ls: %hs", path->string().c_str(), text);
         else
-            LOGERROR(L"%ls: %hs", path->string().c_str(), text);
+            LOGERROR("%ls: %hs", path->string().c_str(), text);
     }
 
     void ColladaOutput(void* cb_data, const char* data, unsigned int length)
@@ -99 +99 @@
         if (!dll.IsLoaded() && !TryLoadDLL())
             return ERR::FAIL;   
 
-        LOGMESSAGE(L"Hotloading skeleton definitions from '%ls'", path.string().c_str());
+        LOGMESSAGE("Hotloading skeleton definitions from '%ls'", path.string().c_str());
         // Set the filename for the logger to report
         set_logger(ColladaLog, const_cast<void*>(static_cast<const void*>(&path)));
 
         CVFSFile skeletonFile;
         if (skeletonFile.Load(m_VFS, path) != PSRETURN_OK)
         {
-            LOGERROR(L"Failed to read skeleton defintions from '%ls'", path.string().c_str());
+            LOGERROR("Failed to read skeleton defintions from '%ls'", path.string().c_str());
             return ERR::FAIL;
         }
 
         int ok = set_skeleton_definitions((const char*)skeletonFile.GetBuffer(), (int)skeletonFile.GetBufferSize());
         if (ok < 0)
         {
-            LOGERROR(L"Failed to load skeleton definitions from '%ls'", path.string().c_str());
+            LOGERROR("Failed to load skeleton definitions from '%ls'", path.string().c_str());
             return ERR::FAIL;
         }
 
@@ -189 +189 @@
     {
         if (!dll.LoadDLL())
         {
-            LOGERROR(L"Failed to load COLLADA conversion DLL");
+            LOGERROR("Failed to load COLLADA conversion DLL");
             return false;
         }
 
@@ -202 +202 @@
         }
         catch (PSERROR_DllLoader&)
         {
-            LOGERROR(L"Failed to load symbols from COLLADA conversion DLL");
+            LOGERROR("Failed to load symbols from COLLADA conversion DLL");
             dll.Unload();
             return false;
         }
@@ -214 +214 @@
         VfsPaths pathnames;
         if (vfs::GetPathnames(m_VFS, L"art/skeletons/", L"*.xml", pathnames) < 0)
         {
-            LOGERROR(L"No skeleton definition files present");
+            LOGERROR("No skeleton definition files present");
             return false;
         }
 
         bool loaded = false;
         for (VfsPaths::const_iterator it = pathnames.begin(); it != pathnames.end(); ++it)
         {
-            LOGMESSAGE(L"Loading skeleton definitions from '%ls'", it->string().c_str());
+            LOGMESSAGE("Loading skeleton definitions from '%ls'", it->string().c_str());
             // Set the filename for the logger to report
             set_logger(ColladaLog, const_cast<void*>(static_cast<const void*>(&(*it))));
 
             CVFSFile skeletonFile;
             if (skeletonFile.Load(m_VFS, *it) != PSRETURN_OK)
             {
-                LOGERROR(L"Failed to read skeleton defintions from '%ls'", it->string().c_str());
+                LOGERROR("Failed to read skeleton defintions from '%ls'", it->string().c_str());
                 continue;
             }
 
             int ok = set_skeleton_definitions((const char*)skeletonFile.GetBuffer(), (int)skeletonFile.GetBufferSize());
             if (ok < 0)
             {
-                LOGERROR(L"Failed to load skeleton definitions from '%ls'", it->string().c_str());
+                LOGERROR("Failed to load skeleton definitions from '%ls'", it->string().c_str());
                 continue;
             }
 
@@ -243 +243 @@
         }
 
         if (!loaded)
-            LOGERROR(L"Failed to load any skeleton definitions");
+            LOGERROR("Failed to load any skeleton definitions");
 
         return loaded;
     }
@@ -267 +267 @@
             VfsPaths paths;
             if (vfs::GetPathnames(m_VFS, L"art/skeletons/", L"*.xml", paths) != INFO::OK)
             {
-                LOGWARNING(L"Failed to load skeleton definitions");
+                LOGWARNING("Failed to load skeleton definitions");
                 return;
             }
 
@@ -287 +287 @@
                 //  should never happen, unless there really is a problem
                 if (m_VFS->GetFileInfo(*it, &fileInfo) != INFO::OK)
                 {
-                    LOGERROR(L"Failed to stat '%ls' for DAE caching", it->string().c_str());
+                    LOGERROR("Failed to stat '%ls' for DAE caching", it->string().c_str());
                 }
                 else
                 {
@@ -298 +298 @@
 
             // Check if we were able to load any skeleton files
             if (m_skeletonHashes.empty())
-                LOGERROR(L"Failed to stat any skeleton definitions for DAE caching");
+                LOGERROR("Failed to stat any skeleton definitions for DAE caching");
                 // We can continue, something else will break if we try loading a skeletal model
 
             m_skeletonHashInvalidated = false;

source/graphics/FontManager.cpp

@@ -59 +59 @@
     const VfsPath fntName(fontName.string() + ".fnt");
     if (g_VFS->LoadFile(path / fntName, buf, size) < 0)
     {
-        LOGERROR(L"Failed to open font file %ls", (path / fntName).string().c_str());
+        LOGERROR("Failed to open font file %ls", (path / fntName).string().c_str());
         return false;
     }
     std::istringstream FNTStream(std::string((const char*)buf.get(), size));
@@ -68 +68 @@
     FNTStream >> Version;
     if (Version != 101) // Make sure this is from a recent version of the font builder
     {
-        LOGERROR(L"Font %hs has invalid version", fontName.c_str());
+        LOGERROR("Font %hs has invalid version", fontName.c_str());
         return 0;
     }
 
@@ -102 +102 @@
 
         if (Codepoint < 0 || Codepoint > 0xFFFF)
         {
-            LOGWARNING(L"Font %hs has invalid codepoint 0x%x", fontName.c_str(), Codepoint);
+            LOGWARNING("Font %hs has invalid codepoint 0x%x", fontName.c_str(), Codepoint);
             continue;
         }
 

source/graphics/LOSTexture.cpp

@@ -82 +82 @@
     
     if (!m_ShaderInitialized)
     {
-        LOGERROR(L"Failed to load SmoothLOS shader, disabling.");
+        LOGERROR("Failed to load SmoothLOS shader, disabling.");
         g_Renderer.m_Options.m_SmoothLOS = false;
         return false;
     }
@@ -163 +163 @@
     GLenum status = pglCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT);
     if (status != GL_FRAMEBUFFER_COMPLETE_EXT)
     {
-        LOGWARNING(L"LOS framebuffer object incomplete: 0x%04X", status);
+        LOGWARNING("LOS framebuffer object incomplete: 0x%04X", status);
     }
 
     m_smoothShader->BeginPass();

source/graphics/MapGenerator.cpp

@@ -111 +111 @@
     JS::RootedValue settingsVal(cx);
     if (!m_ScriptInterface->ParseJSON(m_Settings, &settingsVal) && settingsVal.isUndefined())
     {
-        LOGERROR(L"CMapGeneratorWorker::Run: Failed to parse settings");
+        LOGERROR("CMapGeneratorWorker::Run: Failed to parse settings");
         return false;
     }
     
@@ -119 +119 @@
     u32 seed;
     if (!m_ScriptInterface->GetProperty(settingsVal, "Seed", seed))
     {   // No seed specified
-        LOGWARNING(L"CMapGeneratorWorker::Run: No seed value specified - using 0");
+        LOGWARNING("CMapGeneratorWorker::Run: No seed value specified - using 0");
         seed = 0;
     }
 
@@ -129 +129 @@
     JS::RootedValue global(cx, m_ScriptInterface->GetGlobalObject());
     if (!m_ScriptInterface->SetProperty(global, "g_MapSettings", settingsVal))
     {
-        LOGERROR(L"CMapGeneratorWorker::Run: Failed to define g_MapSettings");
+        LOGERROR("CMapGeneratorWorker::Run: Failed to define g_MapSettings");
         return false;
     }
 
     // Load RMS
-    LOGMESSAGE(L"Loading RMS '%ls'", m_ScriptPath.string().c_str());
+    LOGMESSAGE("Loading RMS '%ls'", m_ScriptPath.string().c_str());
     if (!m_ScriptInterface->LoadGlobalScriptFile(m_ScriptPath))
     {
-        LOGERROR(L"CMapGeneratorWorker::Run: Failed to load RMS '%ls'", m_ScriptPath.string().c_str());
+        LOGERROR("CMapGeneratorWorker::Run: Failed to load RMS '%ls'", m_ScriptPath.string().c_str());
         return false;
     }
 
@@ -210 +210 @@
             PSRETURN ret = file.Load(g_VFS, *it);
             if (ret != PSRETURN_OK)
             {
-                LOGERROR(L"CMapGeneratorWorker::GetCivData: Failed to load file '%ls': %hs", path.string().c_str(), GetErrorString(ret));
+                LOGERROR("CMapGeneratorWorker::GetCivData: Failed to load file '%ls': %hs", path.string().c_str(), GetErrorString(ret));
             }
             else
             {
@@ -222 +222 @@
     {
         // Some error reading directory
         wchar_t error[200];
-        LOGERROR(L"CMapGeneratorWorker::GetCivData: Error reading directory '%ls': %ls", path.string().c_str(), StatusDescription(ret, error, ARRAY_SIZE(error)));
+        LOGERROR("CMapGeneratorWorker::GetCivData: Error reading directory '%ls': %ls", path.string().c_str(), StatusDescription(ret, error, ARRAY_SIZE(error)));
     }
 
     return data;
@@ -234 +234 @@
     CMapGeneratorWorker* self = static_cast<CMapGeneratorWorker*>(pCxPrivate->pCBData);
     const CParamNode& templateRoot = self->m_TemplateLoader.GetTemplateFileData(templateName).GetChild("Entity");
     if (!templateRoot.IsOk())
-        LOGERROR(L"Invalid template found for '%hs'", templateName.c_str());
+        LOGERROR("Invalid template found for '%hs'", templateName.c_str());
     
     return templateRoot;
 }
@@ -271 +271 @@
     {
         for (VfsPaths::iterator it = pathnames.begin(); it != pathnames.end(); ++it)
         {
-            LOGMESSAGE(L"Loading map generator script '%ls'", it->string().c_str());
+            LOGMESSAGE("Loading map generator script '%ls'", it->string().c_str());
 
             if (!m_ScriptInterface->LoadGlobalScriptFile(*it))
             {
-                LOGERROR(L"CMapGeneratorWorker::LoadScripts: Failed to load script '%ls'", it->string().c_str());
+                LOGERROR("CMapGeneratorWorker::LoadScripts: Failed to load script '%ls'", it->string().c_str());
                 return false;
             }
         }
@@ -284 +284 @@
     {
         // Some error reading directory
         wchar_t error[200];
-        LOGERROR(L"CMapGeneratorWorker::LoadScripts: Error reading scripts in directory '%ls': %ls", path.string().c_str(), StatusDescription(ret, error, ARRAY_SIZE(error)));
+        LOGERROR("CMapGeneratorWorker::LoadScripts: Error reading scripts in directory '%ls': %ls", path.string().c_str(), StatusDescription(ret, error, ARRAY_SIZE(error)));
         return false;
     }
 

source/graphics/MapReader.cpp

@@ -1052 +1052 @@
         entity_id_t player = cmpPlayerManager->GetPlayerByID(PlayerID);
         if (ent == INVALID_ENTITY || player == INVALID_ENTITY)
         {   // Don't add entities with invalid player IDs
-            LOGERROR(L"Failed to load entity template '%ls'", TemplateName.c_str());
+            LOGERROR("Failed to load entity template '%ls'", TemplateName.c_str());
         }
         else
         {
@@ -1332 +1332 @@
     //  an error here should stop the loading process
 #define GET_TERRAIN_PROPERTY(val, prop, out)\
     if (!pSimulation2->GetScriptInterface().GetProperty(val, #prop, out))\
-        {   LOGERROR(L"CMapReader::ParseTerrain() failed to get '%hs' property", #prop);\
+        {   LOGERROR("CMapReader::ParseTerrain() failed to get '%hs' property", #prop);\
             throw PSERROR_Game_World_MapLoadFailed("Error parsing terrain data.\nCheck application log for details"); }
 
     JS::RootedValue tmpMapData(cx, m_MapData.get()); // TODO: Check if this temporary root can be removed after SpiderMonkey 31 upgrade 
@@ -1411 +1411 @@
     std::vector<Entity> entities;
 
     if (!pSimulation2->GetScriptInterface().GetProperty(tmpMapData, "entities", entities))
-        LOGWARNING(L"CMapReader::ParseEntities() failed to get 'entities' property");
+        LOGWARNING("CMapReader::ParseEntities() failed to get 'entities' property");
 
     CSimulation2& sim = *pSimulation2;
     CmpPtr<ICmpPlayerManager> cmpPlayerManager(sim, SYSTEM_ENTITY);
@@ -1430 +1430 @@
         entity_id_t player = cmpPlayerManager->GetPlayerByID(currEnt.playerID);
         if (ent == INVALID_ENTITY || player == INVALID_ENTITY)
         {   // Don't add entities with invalid player IDs
-            LOGERROR(L"Failed to load entity template '%ls'", currEnt.templateName.c_str());
+            LOGERROR("Failed to load entity template '%ls'", currEnt.templateName.c_str());
         }
         else
         {
@@ -1476 +1476 @@
 
 #define GET_ENVIRONMENT_PROPERTY(val, prop, out)\
     if (!pSimulation2->GetScriptInterface().GetProperty(val, #prop, out))\
-        LOGWARNING(L"CMapReader::ParseEnvironment() failed to get '%hs' property", #prop);
+        LOGWARNING("CMapReader::ParseEnvironment() failed to get '%hs' property", #prop);
 
     JS::RootedValue envObj(cx);
     GET_ENVIRONMENT_PROPERTY(tmpMapData, Environment, &envObj)
 
     if (envObj.isUndefined())
     {
-        LOGWARNING(L"CMapReader::ParseEnvironment(): Environment settings not found");
+        LOGWARNING("CMapReader::ParseEnvironment(): Environment settings not found");
         return 0;
     }
 
@@ -1581 +1581 @@
 
 #define GET_CAMERA_PROPERTY(val, prop, out)\
     if (!pSimulation2->GetScriptInterface().GetProperty(val, #prop, out))\
-        LOGWARNING(L"CMapReader::ParseCamera() failed to get '%hs' property", #prop);
+        LOGWARNING("CMapReader::ParseCamera() failed to get '%hs' property", #prop);
 
     JS::RootedValue tmpMapData(cx, m_MapData.get()); // TODO: Check if this temporary root can be removed after SpiderMonkey 31 upgrade 
     JS::RootedValue cameraObj(cx);

source/graphics/MapWriter.cpp

@@ -71 +71 @@
     }
     catch (PSERROR_File_WriteFailed&)
     {
-        LOGERROR(L"Failed to write map '%ls'", pathname.string().c_str());
+        LOGERROR("Failed to write map '%ls'", pathname.string().c_str());
         return;
     }
 
@@ -447 +447 @@
         }
     }
     if (!XML_StoreVFS(g_VFS, filename))
-        LOGERROR(L"Failed to write map '%ls'", filename.string().c_str());
+        LOGERROR("Failed to write map '%ls'", filename.string().c_str());
 }

source/graphics/MeshManager.cpp

@@ -53 +53 @@
 
     if (pmdFilename.empty())
     {
-        LOGERROR(L"Could not load mesh '%ls'", pathname.string().c_str());
+        LOGERROR("Could not load mesh '%ls'", pathname.string().c_str());
         return CModelDefPtr();
     }
 
@@ -65 +65 @@
     }
     catch (PSERROR_File&)
     {
-        LOGERROR(L"Could not load mesh '%ls'", pmdFilename.string().c_str());
+        LOGERROR("Could not load mesh '%ls'", pmdFilename.string().c_str());
         return CModelDefPtr();
     }
 }

source/graphics/Model.cpp

@@ -473 +473 @@
         if (anim->m_AnimDef && anim->m_AnimDef->GetNumKeys() != m_pModelDef->GetNumBones())
         {
             // mismatch between model's skeleton and animation's skeleton
-            LOGERROR(L"Mismatch between model's skeleton and animation's skeleton (%lu model bones != %lu animation keys)",
+            LOGERROR("Mismatch between model's skeleton and animation's skeleton (%lu model bones != %lu animation keys)",
                     (unsigned long)m_pModelDef->GetNumBones(), (unsigned long)anim->m_AnimDef->GetNumKeys());
             return false;
         }

source/graphics/ModelAbstract.cpp

@@ -57 +57 @@
             {
                 // TODO: unimplemented
                 m_SelectionBox.SetEmpty();
-                LOGWARNING(L"[ModelAbstract] TODO: Cylinder selection boxes are not yet implemented. Use BOX or BOUNDS selection shapes instead.");
+                LOGWARNING("[ModelAbstract] TODO: Cylinder selection boxes are not yet implemented. Use BOX or BOUNDS selection shapes instead.");
             }
             break;
         default:
             {
                 m_SelectionBox.SetEmpty();
-                //LOGWARNING(L"[ModelAbstract] Unrecognized selection shape type: %ld", m_CustomSelectionShape->m_Type);
+                //LOGWARNING("[ModelAbstract] Unrecognized selection shape type: %ld", m_CustomSelectionShape->m_Type);
                 debug_warn("[ModelAbstract] Unrecognized selection shape type");
             }
             break;

source/graphics/ObjectBase.cpp

@@ -90 +90 @@
 
     if (root.GetNodeName() != el_actor)
     {
-        LOGERROR(L"Invalid actor format (unrecognised root element '%hs')", XeroFile.GetElementString(root.GetNodeName()).c_str());
+        LOGERROR("Invalid actor format (unrecognised root element '%hs')", XeroFile.GetElementString(root.GetNodeName()).c_str());
         return false;
     }
 
@@ -266 +266 @@
 
             if (currentGroup->size() == 0)
             {
-                LOGERROR(L"Actor group has zero variants ('%ls')", pathname.string().c_str());
+                LOGERROR("Actor group has zero variants ('%ls')", pathname.string().c_str());
             }
 
             ++currentGroup;

source/graphics/ObjectEntry.cpp

@@ -73 +73 @@
         str << variation.color;
         int r, g, b;
         if (! (str >> r >> g >> b)) // Any trailing data is ignored
-            LOGERROR(L"Actor '%ls' has invalid RGB colour '%hs'", m_Base->m_ShortName.c_str(), variation.color.c_str());
+            LOGERROR("Actor '%ls' has invalid RGB colour '%hs'", m_Base->m_ShortName.c_str(), variation.color.c_str());
         else
             m_Color = CColor(r/255.0f, g/255.0f, b/255.0f, 1.0f);
     }
@@ -119 +119 @@
     CModelDefPtr modeldef (objectManager.GetMeshManager().GetMesh(m_ModelName));
     if (!modeldef)
     {
-        LOGERROR(L"CObjectEntry::BuildVariation(): Model %ls failed to load", m_ModelName.string().c_str());
+        LOGERROR("CObjectEntry::BuildVariation(): Model %ls failed to load", m_ModelName.string().c_str());
         return false;
     }
 
@@ -133 +133 @@
     
     if (m_Samplers.size() == 0)
     {
-        LOGERROR(L"Actor '%ls' has no textures.", m_Base->m_ShortName.c_str());
+        LOGERROR("Actor '%ls' has no textures.", m_Base->m_ShortName.c_str());
     }
     
     std::vector<CObjectBase::Samp>::iterator samp;
@@ -190 +190 @@
     {
         // start up idling
         if (!model->SetAnimation(GetRandomAnimation("idle")))
-            LOGERROR(L"Failed to set idle animation in model \"%ls\"", m_ModelName.string().c_str());
+            LOGERROR("Failed to set idle animation in model \"%ls\"", m_ModelName.string().c_str());
     }
 
     // build props - TODO, RC - need to fix up bounds here
@@ -209 +209 @@
         CObjectEntry* oe = objectManager.FindObjectVariation(prop.m_ModelName.c_str(), selections);
         if (!oe)
         {
-            LOGERROR(L"Failed to build prop model \"%ls\" on actor \"%ls\"", prop.m_ModelName.c_str(), m_Base->m_ShortName.c_str());
+            LOGERROR("Failed to build prop model \"%ls\" on actor \"%ls\"", prop.m_ModelName.c_str(), m_Base->m_ShortName.c_str());
             continue;
         }
 
@@ -240 +240 @@
                 propmodel->ToCModel()->SetAnimation(oe->GetRandomAnimation("idle"));
         }
         else
-            LOGERROR(L"Failed to find matching prop point called \"%hs\" in model \"%ls\" for actor \"%ls\"", ppn.c_str(), m_ModelName.string().c_str(), m_Base->m_ShortName.c_str());
+            LOGERROR("Failed to find matching prop point called \"%hs\" in model \"%ls\" for actor \"%ls\"", ppn.c_str(), m_ModelName.string().c_str(), m_Base->m_ShortName.c_str());
     }
 
     // setup flags

source/graphics/ObjectManager.cpp

@@ -96 +96 @@
     else
         delete obj;
 
-    LOGERROR(L"CObjectManager::FindObjectBase(): Cannot find object '%ls'", objectname.c_str());
+    LOGERROR("CObjectManager::FindObjectBase(): Cannot find object '%ls'", objectname.c_str());
 
     return 0;
 }

source/graphics/ParticleEmitterType.cpp

@@ -329 +329 @@
     if (name == "color.r")          return VAR_COLOR_R;
     if (name == "color.g")          return VAR_COLOR_G;
     if (name == "color.b")          return VAR_COLOR_B;
-    LOGWARNING(L"Particle sets unknown variable '%hs'", name.c_str());
+    LOGWARNING("Particle sets unknown variable '%hs'", name.c_str());
     return -1;
 }
 

source/graphics/ShaderManager.cpp

@@ -49 +49 @@
         TIMER_ACCRUE(tc_ShaderValidation);
         CVFSFile grammar;
         if (grammar.Load(g_VFS, L"shaders/program.rng") != PSRETURN_OK)
-            LOGERROR(L"Failed to read grammar shaders/program.rng");
+            LOGERROR("Failed to read grammar shaders/program.rng");
         else
         {
             if (!m_Validator.LoadGrammar(grammar.GetAsString()))
-                LOGERROR(L"Failed to load grammar shaders/program.rng");
+                LOGERROR("Failed to load grammar shaders/program.rng");
         }
     }
 #endif
@@ -77 +77 @@
     CShaderProgramPtr program;
     if (!NewProgram(name, defines, program))
     {
-        LOGERROR(L"Failed to load shader '%hs'", name);
+        LOGERROR("Failed to load shader '%hs'", name);
         program = CShaderProgramPtr();
     }
 
@@ -378 +378 @@
     CShaderTechniquePtr tech(new CShaderTechnique());
     if (!NewEffect(name.c_str(), defines, tech))
     {
-        LOGERROR(L"Failed to load effect '%hs'", name.c_str());
+        LOGERROR("Failed to load effect '%hs'", name.c_str());
         tech = CShaderTechniquePtr();
     }
 

source/graphics/ShaderProgram.cpp

@@ -71 +71 @@
             glGetIntegerv(GL_PROGRAM_ERROR_POSITION_ARB, &errPos);
             int errLine = std::count(code.begin(), code.begin() + std::min((int)code.length(), errPos + 1), '\n') + 1;
             char* errStr = (char*)glGetString(GL_PROGRAM_ERROR_STRING_ARB);
-            LOGERROR(L"Failed to compile %hs program '%ls' (line %d):\n%hs", targetName, file.string().c_str(), errLine, errStr);
+            LOGERROR("Failed to compile %hs program '%ls' (line %d):\n%hs", targetName, file.string().c_str(), errLine, errStr);
             return false;
         }
 
@@ -310 +310 @@
             pglGetShaderInfoLog(shader, length, NULL, infolog);
 
             if (ok)
-                LOGMESSAGE(L"Info when compiling shader '%ls':\n%hs", file.string().c_str(), infolog);
+                LOGMESSAGE("Info when compiling shader '%ls':\n%hs", file.string().c_str(), infolog);
             else
-                LOGERROR(L"Failed to compile shader '%ls':\n%hs", file.string().c_str(), infolog);
+                LOGERROR("Failed to compile shader '%ls':\n%hs", file.string().c_str(), infolog);
 
             delete[] infolog;
         }
@@ -357 +357 @@
             pglGetProgramInfoLog(m_Program, length, NULL, infolog);
 
             if (ok)
-                LOGMESSAGE(L"Info when linking program '%ls'+'%ls':\n%hs", m_VertexFile.string().c_str(), m_FragmentFile.string().c_str(), infolog);
+                LOGMESSAGE("Info when linking program '%ls'+'%ls':\n%hs", m_VertexFile.string().c_str(), m_FragmentFile.string().c_str(), infolog);
             else
-                LOGERROR(L"Failed to link program '%ls'+'%ls':\n%hs", m_VertexFile.string().c_str(), m_FragmentFile.string().c_str(), infolog);
+                LOGERROR("Failed to link program '%ls'+'%ls':\n%hs", m_VertexFile.string().c_str(), m_FragmentFile.string().c_str(), infolog);
             
             delete[] infolog;
         }
@@ -561 +561 @@
             else if (id.second == GL_FLOAT_VEC4)
                 pglUniform4fARB(id.first, v0, v1, v2, v3);
             else
-                LOGERROR(L"CShaderProgramGLSL::Uniform(): Invalid uniform type (expected float, vec2, vec3, vec4)");
+                LOGERROR("CShaderProgramGLSL::Uniform(): Invalid uniform type (expected float, vec2, vec3, vec4)");
         }
     }
 
@@ -572 +572 @@
             if (id.second == GL_FLOAT_MAT4)
                 pglUniformMatrix4fvARB(id.first, 1, GL_FALSE, &v._11);
             else
-                LOGERROR(L"CShaderProgramGLSL::Uniform(): Invalid uniform type (expected mat4)");
+                LOGERROR("CShaderProgramGLSL::Uniform(): Invalid uniform type (expected mat4)");
         }
     }
 
@@ -583 +583 @@
             if (id.second == GL_FLOAT_MAT4)
                 pglUniformMatrix4fvARB(id.first, count, GL_FALSE, &v->_11);
             else
-                LOGERROR(L"CShaderProgramGLSL::Uniform(): Invalid uniform type (expected mat4)");
+                LOGERROR("CShaderProgramGLSL::Uniform(): Invalid uniform type (expected mat4)");
         }
     }
 
@@ -663 +663 @@
     const std::map<CStrIntern, int>& UNUSED(vertexIndexes), const std::map<CStrIntern, frag_index_pair_t>& UNUSED(fragmentIndexes),
     int UNUSED(streamflags))
 {
-    LOGERROR(L"CShaderProgram::ConstructARB: '%ls'+'%ls': ARB shaders not supported on this device",
+    LOGERROR("CShaderProgram::ConstructARB: '%ls'+'%ls': ARB shaders not supported on this device",
         vertexFile.string().c_str(), fragmentFile.string().c_str());
     return NULL;
 }

source/graphics/ShaderProgramFFP.cpp

@@ -1159 +1159 @@
     if (id == "model_solid_tex")
         return new CShaderProgramFFP_ModelSolidTex(defines);
 
-    LOGERROR(L"CShaderProgram::ConstructFFP: '%hs': Invalid id", id.c_str());
+    LOGERROR("CShaderProgram::ConstructFFP: '%hs': Invalid id", id.c_str());
     debug_warn(L"CShaderProgram::ConstructFFP: Invalid id");
     return NULL;
 }

source/graphics/SkeletonAnimManager.cpp

@@ -65 +65 @@
 
     if (psaFilename.empty())
     {
-        LOGERROR(L"Could not load animation '%ls'", pathname.string().c_str());
+        LOGERROR("Could not load animation '%ls'", pathname.string().c_str());
         def = NULL;
     }
     else
@@ -76 +76 @@
         }
         catch (PSERROR_File&)
         {
-            LOGERROR(L"Could not load animation '%ls'", psaFilename.string().c_str());
+            LOGERROR("Could not load animation '%ls'", psaFilename.string().c_str());
         }
     }
 
     if (def)
-        LOGMESSAGE(L"CSkeletonAnimManager::GetAnimation(%ls): Loaded successfully", pathname.string().c_str());
+        LOGMESSAGE("CSkeletonAnimManager::GetAnimation(%ls): Loaded successfully", pathname.string().c_str());
     else
-        LOGERROR(L"CSkeletonAnimManager::GetAnimation(%ls): Failed loading, marked file as bad", pathname.string().c_str());
+        LOGERROR("CSkeletonAnimManager::GetAnimation(%ls): Failed loading, marked file as bad", pathname.string().c_str());
 
     // Add to map
     m_Animations[name] = def; // NULL if failed to load - we won't try loading it again

source/graphics/TerrainTextureEntry.cpp

@@ -47 +47 @@
     CXeromyces XeroFile;
     if (XeroFile.Load(g_VFS, path) != PSRETURN_OK)
     {
-        LOGERROR(L"Terrain xml not found (%hs)", path.string().c_str());
+        LOGERROR("Terrain xml not found (%hs)", path.string().c_str());
         return;
     }
 
@@ -70 +70 @@
 
     if (root.GetNodeName() != el_terrain)
     {
-        LOGERROR(L"Invalid terrain format (unrecognised root element '%hs')", XeroFile.GetElementString(root.GetNodeName()).c_str());
+        LOGERROR("Invalid terrain format (unrecognised root element '%hs')", XeroFile.GetElementString(root.GetNodeName()).c_str());
         return;
     }
     

source/graphics/TerrainTextureManager.cpp

@@ -89 +89 @@
             return m_TextureEntries[i];
     }
 
-    LOGWARNING(L"CTerrainTextureManager: Couldn't find terrain %hs", tag.c_str());
+    LOGWARNING("CTerrainTextureManager: Couldn't find terrain %hs", tag.c_str());
     return 0;
 }
 
@@ -141 +141 @@
 
 void CTerrainTextureManager::RecurseDirectory(const CTerrainPropertiesPtr& parentProps, const VfsPath& path)
 {
-    //LOGMESSAGE(L"CTextureManager::RecurseDirectory(%ls)", path.string().c_str());
+    //LOGMESSAGE("CTextureManager::RecurseDirectory(%ls)", path.string().c_str());
 
     CTerrainPropertiesPtr props;
 
@@ -153 +153 @@
     // No terrains.xml, or read failures -> use parent props (i.e. 
     if (!props)
     {
-        LOGMESSAGE(L"CTerrainTextureManager::RecurseDirectory(%ls): no terrains.xml (or errors while loading) - using parent properties", path.string().c_str());
+        LOGMESSAGE("CTerrainTextureManager::RecurseDirectory(%ls): no terrains.xml (or errors while loading) - using parent properties", path.string().c_str());
         props = parentProps;
     }
 

source/graphics/TextureConverter.cpp

@@ -120 +120 @@
 
     if (root.GetNodeName() != el_textures)
     {
-        LOGERROR(L"Invalid texture settings file \"%ls\" (unrecognised root element)", path.string().c_str());
+        LOGERROR("Invalid texture settings file \"%ls\" (unrecognised root element)", path.string().c_str());
         return NULL;
     }
 
@@ -152 +152 @@
                     else if (v == "alpha")
                         p.settings.format = FMT_ALPHA;
                     else
-                        LOGERROR(L"Invalid attribute value <file format='%hs'>", v.c_str());
+                        LOGERROR("Invalid attribute value <file format='%hs'>", v.c_str());
                 }
                 else if (attr.Name == at_mipmap)
                 {
@@ -162 +162 @@
                     else if (v == "false")
                         p.settings.mipmap = MIP_FALSE;
                     else
-                        LOGERROR(L"Invalid attribute value <file mipmap='%hs'>", v.c_str());
+                        LOGERROR("Invalid attribute value <file mipmap='%hs'>", v.c_str());
                 }
                 else if (attr.Name == at_normal)
                 {
@@ -172 +172 @@
                     else if (v == "false")
                         p.settings.normal = NORMAL_FALSE;
                     else
-                        LOGERROR(L"Invalid attribute value <file normal='%hs'>", v.c_str());
+                        LOGERROR("Invalid attribute value <file normal='%hs'>", v.c_str());
                 }
                 else if (attr.Name == at_alpha)
                 {
@@ -184 +184 @@
                     else if (v == "transparency")
                         p.settings.alpha = ALPHA_TRANSPARENCY;
                     else
-                        LOGERROR(L"Invalid attribute value <file alpha='%hs'>", v.c_str());
+                        LOGERROR("Invalid attribute value <file alpha='%hs'>", v.c_str());
                 }
                 else if (attr.Name == at_filter)
                 {
@@ -196 +196 @@
                     else if (v == "kaiser")
                         p.settings.filter = FILTER_KAISER;
                     else
-                        LOGERROR(L"Invalid attribute value <file filter='%hs'>", v.c_str());
+                        LOGERROR("Invalid attribute value <file filter='%hs'>", v.c_str());
                 }
                 else if (attr.Name == at_kaiserwidth)
                 {
@@ -212 +212 @@
                 }
                 else
                 {
-                    LOGERROR(L"Invalid attribute name <file %hs='...'>", XeroFile.GetAttributeString(attr.Name).c_str());
+                    LOGERROR("Invalid attribute name <file %hs='...'>", XeroFile.GetAttributeString(attr.Name).c_str());
                 }
             }
 
@@ -326 +326 @@
     size_t fileSize;
     if (m_VFS->LoadFile(src, file, fileSize) < 0)
     {
-        LOGERROR(L"Failed to load texture \"%ls\"", src.string().c_str());
+        LOGERROR("Failed to load texture \"%ls\"", src.string().c_str());
         return false;
     }
 
     Tex tex;
     if (tex.decode(file, fileSize) < 0)
     {
-        LOGERROR(L"Failed to decode texture \"%ls\"", src.string().c_str());
+        LOGERROR("Failed to decode texture \"%ls\"", src.string().c_str());
         return false;
     }
 
@@ -345 +345 @@
         // Convert to uncompressed 8-bit with no mipmaps
         if (tex.transform_to((tex.m_Flags | TEX_GREY) & ~(TEX_DXT | TEX_MIPMAPS | TEX_ALPHA)) < 0)
         {
-            LOGERROR(L"Failed to transform texture \"%ls\"", src.string().c_str());
+            LOGERROR("Failed to transform texture \"%ls\"", src.string().c_str());
             return false;
         }
     }
@@ -356 +356 @@
         // (plain_transform doesn't know how to construct the alpha channel)
         if (tex.m_Flags & TEX_GREY)
         {
-            LOGERROR(L"Failed to convert grayscale texture \"%ls\" - only RGB textures are currently supported", src.string().c_str());
+            LOGERROR("Failed to convert grayscale texture \"%ls\" - only RGB textures are currently supported", src.string().c_str());
             return false;
         }
 
         // Convert to uncompressed BGRA with no mipmaps
         if (tex.transform_to((tex.m_Flags | TEX_BGR | TEX_ALPHA) & ~(TEX_DXT | TEX_MIPMAPS)) < 0)
         {
-            LOGERROR(L"Failed to transform texture \"%ls\"", src.string().c_str());
+            LOGERROR("Failed to transform texture \"%ls\"", src.string().c_str());
             return false;
         }
     }
@@ -482 +482 @@
     return true;
 
 #else
-    LOGERROR(L"Failed to convert texture \"%ls\" (NVTT not available)", src.string().c_str());
+    LOGERROR("Failed to convert texture \"%ls\" (NVTT not available)", src.string().c_str());
     return false;
 #endif
 }

source/graphics/TextureManager.cpp

@@ -178 +178 @@
         Handle h = ogl_tex_load(m_VFS, path, RES_UNIQUE);
         if (h <= 0)
         {
-            LOGERROR(L"Texture failed to load; \"%ls\"", texture->m_Properties.m_Path.string().c_str());
+            LOGERROR("Texture failed to load; \"%ls\"", texture->m_Properties.m_Path.string().c_str());
 
             // Replace with error texture to make it obvious
             texture->SetHandle(m_ErrorHandle);
@@ -218 +218 @@
         // Upload to GL
         if (!m_DisableGL && ogl_tex_upload(h, texture->m_Properties.m_Format) < 0)
         {
-            LOGERROR(L"Texture failed to upload: \"%ls\"", texture->m_Properties.m_Path.string().c_str());
+            LOGERROR("Texture failed to upload: \"%ls\"", texture->m_Properties.m_Path.string().c_str());
 
             ogl_tex_free(h);
 
@@ -277 +277 @@
 
             // No source file or archive cache was found, so we can't load the
             // real texture at all - return the error texture instead
-            LOGERROR(L"CCacheLoader failed to find archived or source file for: \"%ls\"", texture->m_Properties.m_Path.string().c_str());
+            LOGERROR("CCacheLoader failed to find archived or source file for: \"%ls\"", texture->m_Properties.m_Path.string().c_str());
             texture->SetHandle(m_ErrorHandle);
             return true;
         }
@@ -299 +299 @@
         PrepareCacheKey(texture, hash, version);
         VfsPath looseCachePath = m_CacheLoader.LooseCachePath(sourcePath, hash, version);
 
-//      LOGWARNING(L"Converting texture \"%ls\"", srcPath.c_str());
+//      LOGWARNING("Converting texture \"%ls\"", srcPath.c_str());
 
         CTextureConverter::Settings settings = GetConverterSettings(texture);
 
@@ -345 +345 @@
                 }
                 else
                 {
-                    LOGERROR(L"Texture failed to convert: \"%ls\"", texture->m_Properties.m_Path.string().c_str());
+                    LOGERROR("Texture failed to convert: \"%ls\"", texture->m_Properties.m_Path.string().c_str());
                     texture->SetHandle(m_ErrorHandle);
                 }
                 texture->m_State = CTexture::LOADED;

source/graphics/scripting/JSInterface_GameView.cpp

@@ -28 +28 @@
 { \
     if (!g_Game || !g_Game->GetView()) \
     { \
-        LOGERROR(L"Trying to get a setting from GameView when it's not initialized!"); \
+        LOGERROR("Trying to get a setting from GameView when it's not initialized!"); \
         return false; \
     } \
     return g_Game->GetView()->Get##NAME##Enabled(); \
@@ -38 +38 @@
 { \
     if (!g_Game || !g_Game->GetView()) \
     { \
-        LOGERROR(L"Trying to set a setting of GameView when it's not initialized!"); \
+        LOGERROR("Trying to set a setting of GameView when it's not initialized!"); \
         return; \
     } \
     g_Game->GetView()->Set##NAME##Enabled(Enabled); \

source/gui/CGUI.cpp

@@ -380 +380 @@
     }
     catch (PSERROR_GUI& e)
     {
-        LOGERROR(L"GUI draw error: %hs", e.what());
+        LOGERROR("GUI draw error: %hs", e.what());
     }
 }
 
@@ -969 +969 @@
     }
     catch (PSERROR_GUI& e)
     {
-        LOGERROR(L"Errors loading GUI file %ls (%u)", Filename.string().c_str(), e.getCode());
+        LOGERROR("Errors loading GUI file %ls (%u)", Filename.string().c_str(), e.getCode());
         return;
     }
 }
@@ -1091 +1091 @@
     if (!object)
     {
         // Report error that object was unsuccessfully loaded
-        LOGERROR(L"GUI: Unrecognized object type \"%hs\"", type.c_str());
+        LOGERROR("GUI: Unrecognized object type \"%hs\"", type.c_str());
         return;
     }
 
@@ -1133 +1133 @@
     {
         // additional check
         if (m_Styles.count(argStyle) == 0)
-            LOGERROR(L"GUI: Trying to use style '%hs' that doesn't exist.", argStyle.c_str());
+            LOGERROR("GUI: Trying to use style '%hs' that doesn't exist.", argStyle.c_str());
         else
             object->LoadStyle(*this, argStyle);
     }
@@ -1185 +1185 @@
         // Try setting the value
         if (object->SetSetting(pFile->GetAttributeString(attr.Name), attr.Value.FromUTF8(), true) != PSRETURN_OK)
         {
-            LOGERROR(L"GUI: (object: %hs) Can't set \"%hs\" to \"%ls\"", object->GetPresentableName().c_str(), pFile->GetAttributeString(attr.Name).c_str(), attr.Value.FromUTF8().c_str());
+            LOGERROR("GUI: (object: %hs) Can't set \"%hs\" to \"%ls\"", object->GetPresentableName().c_str(), pFile->GetAttributeString(attr.Name).c_str(), attr.Value.FromUTF8().c_str());
 
             // This is not a fatal error
         }
@@ -1248 +1248 @@
                 CVFSFile scriptfile;
                 if (scriptfile.Load(g_VFS, filename) != PSRETURN_OK)
                 {
-                    LOGERROR(L"Error opening GUI script action file '%ls'", filename.c_str());
+                    LOGERROR("Error opening GUI script action file '%ls'", filename.c_str());
                     throw PSERROR_GUI_JSOpenFailed();
                 }
 
@@ -1293 +1293 @@
             CStr attributeName(child.GetAttributes().GetNamedItem(attr_id)); // Read the attribute name.
             if (attributeName.empty())
             {
-                LOGERROR(L"GUI: ‘translatableAttribute’ XML element with empty ‘id’ XML attribute found. (object: %hs)", object->GetPresentableName().c_str());
+                LOGERROR("GUI: ‘translatableAttribute’ XML element with empty ‘id’ XML attribute found. (object: %hs)", object->GetPresentableName().c_str());
                 continue;
             }
 
@@ -1320 +1320 @@
             CStr attributeName(child.GetAttributes().GetNamedItem(attr_id)); // Read the attribute name.
             if (attributeName.empty())
             {
-                LOGERROR(L"GUI: ‘attribute’ XML element with empty ‘id’ XML attribute found. (object: %hs)", object->GetPresentableName().c_str());
+                LOGERROR("GUI: ‘attribute’ XML element with empty ‘id’ XML attribute found. (object: %hs)", object->GetPresentableName().c_str());
                 continue;
             }
 
@@ -1348 +1348 @@
             if (!filename.empty())
             {
                 if (!directory.empty())
-                    LOGWARNING(L"GUI: Include element found with file name (%ls) and directory name (%ls). Only the file will be processed.", filename.c_str(), directory.c_str());
+                    LOGWARNING("GUI: Include element found with file name (%ls) and directory name (%ls). Only the file will be processed.", filename.c_str(), directory.c_str());
 
                 Paths.insert(filename);
 
                 CXeromyces XeroIncluded;
                 if (XeroIncluded.Load(g_VFS, filename) != PSRETURN_OK)
                 {
-                    LOGERROR(L"GUI: Error reading included XML: '%ls'", filename.c_str());
+                    LOGERROR("GUI: Error reading included XML: '%ls'", filename.c_str());
                     continue;
                 }
 
                 XMBElement node = XeroIncluded.GetRoot();
                 if (node.GetNodeName() != XeroIncluded.GetElementID("object"))
                 {
-                    LOGERROR(L"GUI: Error reading included XML: '%ls', root element must have be of type 'object'.", filename.c_str());
+                    LOGERROR("GUI: Error reading included XML: '%ls', root element must have be of type 'object'.", filename.c_str());
                     continue;
                 }
                 Xeromyces_ReadObject(node, &XeroIncluded, object, NameSubst, Paths, nesting_depth+1);
@@ -1379 +1379 @@
                     CXeromyces XeroIncluded;
                     if (XeroIncluded.Load(g_VFS, *it) != PSRETURN_OK)
                     {
-                        LOGERROR(L"GUI: Error reading included XML: '%ls'", (*it).string().c_str());
+                        LOGERROR("GUI: Error reading included XML: '%ls'", (*it).string().c_str());
                         continue;
                     }
 
                     XMBElement node = XeroIncluded.GetRoot();
                     if (node.GetNodeName() != XeroIncluded.GetElementID("object"))
                     {
-                        LOGERROR(L"GUI: Error reading included XML: '%ls', root element must have be of type 'object'.", (*it).string().c_str());
+                        LOGERROR("GUI: Error reading included XML: '%ls', root element must have be of type 'object'.", (*it).string().c_str());
                         continue;
                     }
                     Xeromyces_ReadObject(node, &XeroIncluded, object, NameSubst, Paths, nesting_depth+1);
@@ -1394 +1394 @@
 
             }
             else
-                LOGERROR(L"GUI: 'include' XML element must have valid 'file' or 'directory' attribute found. (object %hs)", object->GetPresentableName().c_str());
+                LOGERROR("GUI: 'include' XML element must have valid 'file' or 'directory' attribute found. (object %hs)", object->GetPresentableName().c_str());
         }
         else
         {
             // Try making the object read the tag.
             if (!object->HandleAdditionalChildren(child, pFile))
             {
-                LOGERROR(L"GUI: (object: %hs) Reading unknown children for its type", object->GetPresentableName().c_str());
+                LOGERROR("GUI: (object: %hs) Reading unknown children for its type", object->GetPresentableName().c_str());
             }
         }
     } 
@@ -1442 +1442 @@
     }
     catch (PSERROR_GUI& e)
     {
-        LOGERROR(L"GUI error: %hs", e.what());
+        LOGERROR("GUI error: %hs", e.what());
     }
 }
 
@@ -1491 +1491 @@
         }
         catch (PSERROR_Scripting& e)
         {
-            LOGERROR(L"GUI: Error executing script %ls: %hs", file.c_str(), e.what());
+            LOGERROR("GUI: Error executing script %ls: %hs", file.c_str(), e.what());
         }
     }
 
@@ -1512 +1512 @@
                 }
                 catch (PSERROR_Scripting& e)
                 {
-                    LOGERROR(L"GUI: Error executing script %ls: %hs", (*it).string().c_str(), e.what());
+                    LOGERROR("GUI: Error executing script %ls: %hs", (*it).string().c_str(), e.what());
                 }
             }
         }
@@ -1527 +1527 @@
     }
     catch (PSERROR_Scripting& e)
     {
-        LOGERROR(L"GUI: Error executing inline script: %hs", e.what());
+        LOGERROR("GUI: Error executing inline script: %hs", e.what());
     }
 }
 
@@ -1547 +1547 @@
     name = Element.GetAttributes().GetNamedItem( pFile->GetAttributeID("name") );
 
     if (m_Sprites.find(name) != m_Sprites.end())
-        LOGWARNING(L"GUI sprite name '%hs' used more than once; first definition will be discarded", name.c_str());
+        LOGWARNING("GUI sprite name '%hs' used more than once; first definition will be discarded", name.c_str());
 
     //
     //  Read Children (the images)
@@ -1573 +1573 @@
         {
             if (effects)
             {
-                LOGERROR(L"GUI <sprite> must not have more than one <effect>");
+                LOGERROR("GUI <sprite> must not have more than one <effect>");
             }
             else
             {
@@ -1636 +1636 @@
         {
             CClientArea ca;
             if (!GUI<CClientArea>::ParseString(attr_value, ca))
-                LOGERROR(L"GUI: Error parsing '%hs' (\"%ls\")", attr_name.c_str(), attr_value.c_str());
+                LOGERROR("GUI: Error parsing '%hs' (\"%ls\")", attr_name.c_str(), attr_value.c_str());
             else Image->m_Size = ca;
         }
         else
@@ -1644 +1644 @@
         {
             CClientArea ca;
             if (!GUI<CClientArea>::ParseString(attr_value, ca))
-                LOGERROR(L"GUI: Error parsing '%hs' (\"%ls\")", attr_name.c_str(), attr_value.c_str());
+                LOGERROR("GUI: Error parsing '%hs' (\"%ls\")", attr_name.c_str(), attr_value.c_str());
             else Image->m_TextureSize = ca;
         }
         else
@@ -1652 +1652 @@
         {
             CRect rect;
             if (!GUI<CRect>::ParseString(attr_value, rect))
-                LOGERROR(L"GUI: Error parsing '%hs' (\"%ls\")", attr_name.c_str(), attr_value.c_str());
+                LOGERROR("GUI: Error parsing '%hs' (\"%ls\")", attr_name.c_str(), attr_value.c_str());
             else Image->m_TexturePlacementInFile = rect;
         }
         else
@@ -1660 +1660 @@
         {
             CSize size;
             if (!GUI<CSize>::ParseString(attr_value, size))
-                LOGERROR(L"GUI: Error parsing '%hs' (\"%ls\")", attr_name.c_str(), attr_value.c_str());
+                LOGERROR("GUI: Error parsing '%hs' (\"%ls\")", attr_name.c_str(), attr_value.c_str());
             else Image->m_CellSize = size;
         }
         else
@@ -1668 +1668 @@
         {
             float val;
             if (!GUI<float>::ParseString(attr_value, val))
-                LOGERROR(L"GUI: Error parsing '%hs' (\"%ls\")", attr_name.c_str(), attr_value.c_str());
+                LOGERROR("GUI: Error parsing '%hs' (\"%ls\")", attr_name.c_str(), attr_value.c_str());
             else Image->m_FixedHAspectRatio = val;
         }
         else
@@ -1676 +1676 @@
         {
             bool b;
             if (!GUI<bool>::ParseString(attr_value, b))
-                LOGERROR(L"GUI: Error parsing '%hs' (\"%ls\")", attr_name.c_str(), attr_value.c_str());
+                LOGERROR("GUI: Error parsing '%hs' (\"%ls\")", attr_name.c_str(), attr_value.c_str());
             else Image->m_RoundCoordinates = b;
         }
         else
@@ -1689 +1689 @@
             else if (attr_value == L"clamp_to_edge")
                 Image->m_WrapMode = GL_CLAMP_TO_EDGE;
             else
-                LOGERROR(L"GUI: Error parsing '%hs' (\"%ls\")", attr_name.c_str(), attr_value.c_str());
+                LOGERROR("GUI: Error parsing '%hs' (\"%ls\")", attr_name.c_str(), attr_value.c_str());
         }
         else
         if (attr_name == "z_level")
         {
             float z_level;
             if (!GUI<float>::ParseString(attr_value, z_level))
-                LOGERROR(L"GUI: Error parsing '%hs' (\"%ls\")", attr_name.c_str(), attr_value.c_str());
+                LOGERROR("GUI: Error parsing '%hs' (\"%ls\")", attr_name.c_str(), attr_value.c_str());
             else Image->m_DeltaZ = z_level/100.f;
         }
         else
@@ -1704 +1704 @@
         {
             CColor color;
             if (!GUI<CColor>::ParseString(attr_value, color))
-                LOGERROR(L"GUI: Error parsing '%hs' (\"%ls\")", attr_name.c_str(), attr_value.c_str());
+                LOGERROR("GUI: Error parsing '%hs' (\"%ls\")", attr_name.c_str(), attr_value.c_str());
             else Image->m_BackColor = color;
         }
         else
@@ -1712 +1712 @@
         {
             CColor color;
             if (!GUI<CColor>::ParseString(attr_value, color))
-                LOGERROR(L"GUI: Error parsing '%hs' (\"%ls\")", attr_name.c_str(), attr_value.c_str());
+                LOGERROR("GUI: Error parsing '%hs' (\"%ls\")", attr_name.c_str(), attr_value.c_str());
             else Image->m_BorderColor = color;
         }
         else
@@ -1720 +1720 @@
         {
             bool b;
             if (!GUI<bool>::ParseString(attr_value, b))
-                LOGERROR(L"GUI: Error parsing '%hs' (\"%ls\")", attr_name.c_str(), attr_value.c_str());
+                LOGERROR("GUI: Error parsing '%hs' (\"%ls\")", attr_name.c_str(), attr_value.c_str());
             else Image->m_Border = b;
         }
         else
@@ -1739 +1739 @@
         {
             if (Image->m_Effects)
             {
-                LOGERROR(L"GUI <image> must not have more than one <effect>");
+                LOGERROR("GUI <image> must not have more than one <effect>");
             }
             else
             {
@@ -1773 +1773 @@
         {
             CColor color;
             if (!GUI<int>::ParseColor(attr_value, color, 0))
-                LOGERROR(L"GUI: Error parsing '%hs' (\"%ls\")", attr_name.c_str(), attr_value.c_str());
+                LOGERROR("GUI: Error parsing '%hs' (\"%ls\")", attr_name.c_str(), attr_value.c_str());
             else effects.m_AddColor = color;
         }
         else if (attr_name == "grayscale")
@@ -1853 +1853 @@
         {
             bool b;
             if (!GUI<bool>::ParseString(attr_value.FromUTF8(), b))
-                LOGERROR(L"GUI: Error parsing '%hs' (\"%hs\")", attr_name.c_str(), attr_value.c_str());
+                LOGERROR("GUI: Error parsing '%hs' (\"%hs\")", attr_name.c_str(), attr_value.c_str());
             else
                 scrollbar.m_UseEdgeButtons = b;
         }
@@ -1861 +1861 @@
         {
             float f;
             if (!GUI<float>::ParseString(attr_value.FromUTF8(), f))
-                LOGERROR(L"GUI: Error parsing '%hs' (\"%hs\")", attr_name.c_str(), attr_value.c_str());
+                LOGERROR("GUI: Error parsing '%hs' (\"%hs\")", attr_name.c_str(), attr_value.c_str());
             else
                 scrollbar.m_Width = f;
         }
@@ -1870 +1870 @@
         {
             float f;
             if (!GUI<float>::ParseString(attr_value.FromUTF8(), f))
-                LOGERROR(L"GUI: Error parsing '%hs' (\"%hs\")", attr_name.c_str(), attr_value.c_str());
+                LOGERROR("GUI: Error parsing '%hs' (\"%hs\")", attr_name.c_str(), attr_value.c_str());
             else
                 scrollbar.m_MinimumBarSize = f;
         }
@@ -1879 +1879 @@
         {
             float f;
             if (!GUI<float>::ParseString(attr_value.FromUTF8(), f))
-                LOGERROR(L"GUI: Error parsing '%hs' (\"%hs\")", attr_name.c_str(), attr_value.c_str());
+                LOGERROR("GUI: Error parsing '%hs' (\"%hs\")", attr_name.c_str(), attr_value.c_str());
             else
                 scrollbar.m_MaximumBarSize = f;
         }
@@ -1952 +1952 @@
         {
             CSize size;
             if (!GUI<CSize>::ParseString(attr_value.FromUTF8(), size))
-                LOGERROR(L"Error parsing '%hs' (\"%hs\") inside <icon>.", attr_name.c_str(), attr_value.c_str());
+                LOGERROR("Error parsing '%hs' (\"%hs\") inside <icon>.", attr_name.c_str(), attr_value.c_str());
             else
                 icon.m_Size = size;
         }
@@ -1960 +1960 @@
         {
             int cell_id;
             if (!GUI<int>::ParseString(attr_value.FromUTF8(), cell_id))
-                LOGERROR(L"GUI: Error parsing '%hs' (\"%hs\") inside <icon>.", attr_name.c_str(), attr_value.c_str());
+                LOGERROR("GUI: Error parsing '%hs' (\"%hs\") inside <icon>.", attr_name.c_str(), attr_value.c_str());
             else
                 icon.m_CellID = cell_id;
         }
@@ -2013 +2013 @@
         // Try setting color to value
         if (!color.ParseString(value))
         {
-            LOGERROR(L"GUI: Unable to create custom color '%hs'. Invalid color syntax.", name.c_str());
+            LOGERROR("GUI: Unable to create custom color '%hs'. Invalid color syntax.", name.c_str());
         }
         else
         {

source/gui/CGUIScrollBarVertical.cpp

@@ -51 +51 @@
 {
     if (!GetStyle())
     {
-        LOGWARNING(L"Attempt to draw scrollbar without a style.");
+        LOGWARNING("Attempt to draw scrollbar without a style.");
         return;
     }
 

source/gui/COList.cpp

@@ -158 +158 @@
             {
                 CColor color;
                 if (!GUI<CColor>::ParseString(attr_value.FromUTF8(), color))
-                    LOGERROR(L"GUI: Error parsing '%hs' (\"%ls\")", attr_name.c_str(), attr_value.c_str());
+                    LOGERROR("GUI: Error parsing '%hs' (\"%ls\")", attr_name.c_str(), attr_value.c_str());
                 else oDef.m_TextColor = color;
             }
             else if (attr_name == "id")
@@ -169 +169 @@
             {
                 float width;
                 if (!GUI<float>::ParseString(attr_value.FromUTF8(), width))
-                    LOGERROR(L"GUI: Error parsing '%hs' (\"%ls\")", attr_name.c_str(), attr_value.c_str());
+                    LOGERROR("GUI: Error parsing '%hs' (\"%ls\")", attr_name.c_str(), attr_value.c_str());
                 else
                 {
                     // Check if it's a relative value, and save as decimal if so.
@@ -215 +215 @@
                 }
                 else // Ignore.
                 {
-                    LOGERROR(L"GUI: translatable attribute in olist def that isn't a heading. (object: %hs)", this->GetPresentableName().c_str());
+                    LOGERROR("GUI: translatable attribute in olist def that isn't a heading. (object: %hs)", this->GetPresentableName().c_str());
                 }
             }
         }

source/gui/GUIManager.cpp

@@ -117 +117 @@
         scriptInterface->ReadStructuredClone(initDataClone, &initDataVal);
     else
     {
-        LOGERROR(L"Called PopPageCB when initData (which should contain the callback function name) isn't set!");
+        LOGERROR("Called PopPageCB when initData (which should contain the callback function name) isn't set!");
         return;
     }
     
     if (!scriptInterface->HasProperty(initDataVal, "callback"))
     {
-        LOGERROR(L"Called PopPageCB when the callback function name isn't set!");
+        LOGERROR("Called PopPageCB when the callback function name isn't set!");
         return;
     }
     
     std::string callback;
     if (!scriptInterface->GetProperty(initDataVal, "callback", callback))
     {
-        LOGERROR(L"Failed to get the callback property as a string from initData in PopPageCB!");
+        LOGERROR("Failed to get the callback property as a string from initData in PopPageCB!");
         return;
     }
     
     JS::RootedValue global(cx, scriptInterface->GetGlobalObject());
     if (!scriptInterface->HasProperty(global, callback.c_str()))
     {
-        LOGERROR(L"The specified callback function %hs does not exist in the page %ls", callback.c_str(), m_PageStack.back().name.c_str());
+        LOGERROR("The specified callback function %hs does not exist in the page %ls", callback.c_str(), m_PageStack.back().name.c_str());
         return;
     }
 
@@ -146 +146 @@
         scriptInterface->ReadStructuredClone(args, &argVal);
     if (!scriptInterface->CallFunctionVoid(global, callback.c_str(), argVal))
     {
-        LOGERROR(L"Failed to call the callback function %hs in the page %ls", callback.c_str(), m_PageStack.back().name.c_str());
+        LOGERROR("Failed to call the callback function %hs in the page %ls", callback.c_str(), m_PageStack.back().name.c_str());
         return;
     }
 }
@@ -204 +204 @@
 
     if (root.GetNodeName() != elmt_page)
     {
-        LOGERROR(L"GUI page '%ls' must have root element <page>", page.name.c_str());
+        LOGERROR("GUI page '%ls' must have root element <page>", page.name.c_str());
         return;
     }
 
@@ -212 +212 @@
     {
         if (node.GetNodeName() != elmt_include)
         {
-            LOGERROR(L"GUI page '%ls' must only have <include> elements inside <page>", page.name.c_str());
+            LOGERROR("GUI page '%ls' must only have <include> elements inside <page>", page.name.c_str());
             continue;
         }
 
@@ -252 +252 @@
             hotloadDataVal)
         )
     {
-        LOGERROR(L"GUI page '%ls': Failed to call init() function", page.name.c_str());
+        LOGERROR("GUI page '%ls': Failed to call init() function", page.name.c_str());
     }
 
     m_CurrentGUI = oldGUI;
@@ -264 +264 @@
     {
         if (it->inputs.count(path))
         {
-            LOGMESSAGE(L"GUI file '%ls' changed - reloading page '%ls'", path.string().c_str(), it->name.c_str());
+            LOGMESSAGE("GUI file '%ls' changed - reloading page '%ls'", path.string().c_str(), it->name.c_str());
             LoadPage(*it);
             // TODO: this can crash if LoadPage runs an init script which modifies the page stack and breaks our iterators
         }
@@ -407 +407 @@
 {
     const CParamNode& templateRoot = m_TemplateLoader.GetTemplateFileData(templateName).GetChild("Entity");
     if (!templateRoot.IsOk())
-        LOGERROR(L"Invalid template found for '%hs'", templateName.c_str());
+        LOGERROR("Invalid template found for '%hs'", templateName.c_str());
 
     return templateRoot;
 }

source/gui/GUIRenderer.cpp

@@ -144 +144 @@
             // Check colour is valid
             if (!GUI<CColor>::ParseString(value, color))
             {
-                LOGERROR(L"GUI: Error parsing sprite 'colour' (\"%ls\")", value.c_str());
+                LOGERROR("GUI: Error parsing sprite 'colour' (\"%ls\")", value.c_str());
                 return;
             }
 
@@ -167 +167 @@
         else
         {
             // Otherwise, just complain and give up:
-            LOGERROR(L"Trying to use a sprite that doesn't exist (\"%hs\").", SpriteName.c_str());
+            LOGERROR("Trying to use a sprite that doesn't exist (\"%hs\").", SpriteName.c_str());
             return;
         }
     }

source/gui/GUITooltip.cpp

@@ -149 +149 @@
     IGUIObject* tooltipobj = gui->FindObjectByName("__tooltip_"+style);
     if (! tooltipobj)
     {
-        LOGERROR(L"Cannot find tooltip named '%hs'", style.c_str());
+        LOGERROR("Cannot find tooltip named '%hs'", style.c_str());
         return;
     }
 
@@ -162 +162 @@
         usedobj = gui->FindObjectByName(usedObjectName);
         if (! usedobj)
         {
-            LOGERROR(L"Cannot find object named '%hs' used by tooltip '%hs'", usedObjectName.c_str(), style.c_str());
+            LOGERROR("Cannot find object named '%hs' used by tooltip '%hs'", usedObjectName.c_str(), style.c_str());
             return;
         }
 
@@ -213 +213 @@
     IGUIObject* tooltipobj = gui->FindObjectByName("__tooltip_"+style);
     if (! tooltipobj)
     {
-        LOGERROR(L"Cannot find tooltip named '%hs'", style.c_str());
+        LOGERROR("Cannot find tooltip named '%hs'", style.c_str());
         return;
     }
 
@@ -224 +224 @@
         IGUIObject* usedobj = gui->FindObjectByName(usedObjectName);
         if (! usedobj)
         {
-            LOGERROR(L"Cannot find object named '%hs' used by tooltip '%hs'", usedObjectName.c_str(), style.c_str());
+            LOGERROR("Cannot find object named '%hs' used by tooltip '%hs'", usedObjectName.c_str(), style.c_str());
             return;
         }
 
@@ -254 +254 @@
     IGUIObject* tooltipobj = gui->FindObjectByName("__tooltip_"+style);
     if (! tooltipobj)
     {
-        LOGERROR(L"Cannot find tooltip object named '%hs'", style.c_str());
+        LOGERROR("Cannot find tooltip object named '%hs'", style.c_str());
         return delay;
     }
     GUI<int>::GetSetting(tooltipobj, "delay", delay);

source/gui/GUIbase.cpp

@@ -113 +113 @@
             coord++;
             break;
         default:
-            LOGWARNING(L"ClientArea definitions may only contain numerics. Your input: '%hs'", Value.c_str());
+            LOGWARNING("ClientArea definitions may only contain numerics. Your input: '%hs'", Value.c_str());
             return false;
         }
         if (coord > 3)
         {
-            LOGWARNING(L"Too many CClientArea parameters (4 max). Your input: '%hs'", Value.c_str());
+            LOGWARNING("Too many CClientArea parameters (4 max). Your input: '%hs'", Value.c_str());
             return false;
         }
     }
 
     if (coord < 3)
     {
-        LOGWARNING(L"Too few CClientArea parameters (4 min). Your input: '%hs'", Value.c_str());
+        LOGWARNING("Too few CClientArea parameters (4 min). Your input: '%hs'", Value.c_str());
         return false;
     }
 

source/gui/GUItext.cpp

@@ -109 +109 @@
             if (!pGUI->IconExists(path))
             {
                 if (pObject)
-                    LOGERROR(L"Trying to use an icon, imgleft or imgright-tag with an undefined icon (\"%hs\").", path.c_str());
+                    LOGERROR("Trying to use an icon, imgleft or imgright-tag with an undefined icon (\"%hs\").", path.c_str());
                 continue;
             }
 
@@ -158 +158 @@
                             CSize displacement;
                             // Parse the value
                             if (!GUI<CSize>::ParseString(tagAttrib.value, displacement))
-                                LOGERROR(L"Error parsing 'displace' value for tag [ICON]");
+                                LOGERROR("Error parsing 'displace' value for tag [ICON]");
                             else
                                 SpriteCall.m_Area += displacement;
                         }
@@ -182 +182 @@
                 }
                 break;
             default:
-                LOGERROR(L"Encountered unexpected tag applied to text");
+                LOGERROR("Encountered unexpected tag applied to text");
                 break;
             }
         }
@@ -207 +207 @@
 
                     if (!GUI<CColor>::ParseString(it2->m_TagValue, TextCall.m_Color)
                         && pObject)
-                        LOGERROR(L"Error parsing the value of a [color]-tag in GUI text when reading object \"%hs\".", pObject->GetPresentableName().c_str());
+                        LOGERROR("Error parsing the value of a [color]-tag in GUI text when reading object \"%hs\".", pObject->GetPresentableName().c_str());
                     break;
                 case CGUIString::TextChunk::Tag::TAG_FONT:
                     // TODO Gee: (2004-08-15) Check if Font exists?
                     TextCall.m_Font = CStrIntern(utf8_from_wstring(it2->m_TagValue));
                     break;
                 default:
-                    LOGERROR(L"Encountered unexpected tag applied to text");
+                    LOGERROR("Encountered unexpected tag applied to text");
                     break;
                 }
             }
@@ -306 +306 @@
             closing = false;
             if (++p == l)
             {
-                LOGERROR(L"Partial tag at end of string '%ls'", str.c_str());
+                LOGERROR("Partial tag at end of string '%ls'", str.c_str());
                 break;
             }
             if (str[p] == L'/')
@@ -314 +314 @@
                 closing = true;
                 if (tags.empty())
                 {
-                    LOGERROR(L"Encountered closing tag without having any open tags. At %d in '%ls'", p, str.c_str());
+                    LOGERROR("Encountered closing tag without having any open tags. At %d in '%ls'", p, str.c_str());
                     break;
                 }
                 if (++p == l)
                 {
-                    LOGERROR(L"Partial closing tag at end of string '%ls'", str.c_str());
+                    LOGERROR("Partial closing tag at end of string '%ls'", str.c_str());
                     break;
                 }
             }
@@ -332 +332 @@
                 {
                 case L' ':
                     if (closing) // We still parse them to make error handling cleaner
-                        LOGERROR(L"Closing tags do not support parameters (at pos %d '%ls')", p, str.c_str());
+                        LOGERROR("Closing tags do not support parameters (at pos %d '%ls')", p, str.c_str());
 
                     // parse something="something else"
                     for (++p; p < l && str[p] != L'='; ++p)
@@ -340 +340 @@
 
                     if (p == l)
                     {
-                        LOGERROR(L"Parameter without value at pos %d '%ls'", p, str.c_str());
+                        LOGERROR("Parameter without value at pos %d '%ls'", p, str.c_str());
                         break;
                     }
                     // fall-through
                 case L'=':
                     // parse a quoted parameter
                     if (closing) // We still parse them to make error handling cleaner
-                        LOGERROR(L"Closing tags do not support parameters (at pos %d '%ls')", p, str.c_str());
+                        LOGERROR("Closing tags do not support parameters (at pos %d '%ls')", p, str.c_str());
 
                     if (++p == l)
                     {
-                        LOGERROR(L"Expected parameter, got end of string '%ls'", str.c_str());
+                        LOGERROR("Expected parameter, got end of string '%ls'", str.c_str());
                         break;
                     }
                     if (str[p] != L'"')
                     {
-                        LOGERROR(L"Unquoted parameters are not supported (at pos %d '%ls')", p, str.c_str());
+                        LOGERROR("Unquoted parameters are not supported (at pos %d '%ls')", p, str.c_str());
                         break;
                     }
                     for (++p; p < l && str[p] != L'"'; ++p)
@@ -366 +366 @@
                         case L'\\':
                             if (++p == l)
                             {
-                                LOGERROR(L"Escape character at end of string '%ls'", str.c_str());
+                                LOGERROR("Escape character at end of string '%ls'", str.c_str());
                                 break;
                             }
                             // NOTE: We do not support \n in tag parameters
@@ -392 +392 @@
 
             if (!tag_.SetTagType(tag))
             {
-                LOGERROR(L"Invalid tag '%ls' at %d in '%ls'", tag.c_str(), p, str.c_str());
+                LOGERROR("Invalid tag '%ls' at %d in '%ls'", tag.c_str(), p, str.c_str());
                 break;
             }
             if (!closing)
@@ -415 +415 @@
             {
                 if (tag != tags.back())
                 {
-                    LOGERROR(L"Closing tag '%ls' does not match last opened tag '%ls' at %d in '%ls'", tag.c_str(), tags.back().c_str(), p, str.c_str());
+                    LOGERROR("Closing tag '%ls' does not match last opened tag '%ls' at %d in '%ls'", tag.c_str(), tags.back().c_str(), p, str.c_str());
                     break;
                 }
 
@@ -426 +426 @@
         case L'\\':
             if (++p == l)
             {
-                LOGERROR(L"Escape character at end of string '%ls'", str.c_str());
+                LOGERROR("Escape character at end of string '%ls'", str.c_str());
                 break;
             }
             if (str[p] == L'n')

source/gui/GUIutil.cpp

@@ -69 +69 @@
     {
         if (stream.eof())
         {
-            LOGWARNING(L"Too few CRect parameters (min %i). Your input: '%hs'", NUM_COORDS, Value.ToUTF8().c_str());
+            LOGWARNING("Too few CRect parameters (min %i). Your input: '%hs'", NUM_COORDS, Value.ToUTF8().c_str());
             return false;
         }
         stream >> coords[i];
         if ((stream.rdstate() & std::wstringstream::failbit) != 0)
         {
-            LOGWARNING(L"Unable to parse CRect parameters. Your input: '%hs'", Value.ToUTF8().c_str());
+            LOGWARNING("Unable to parse CRect parameters. Your input: '%hs'", Value.ToUTF8().c_str());
             return false;
         }
     }
 
     if (!stream.eof())
     {
-        LOGWARNING(L"Too many CRect parameters (max %i). Your input: '%hs'", NUM_COORDS, Value.ToUTF8().c_str());
+        LOGWARNING("Too many CRect parameters (max %i). Your input: '%hs'", NUM_COORDS, Value.ToUTF8().c_str());
         return false;
     }
 
@@ -134 +134 @@
     {
         if (stream.eof())
         {
-            LOGWARNING(L"Too few CSize parameters (min %i). Your input: '%hs'", NUM_COORDS, Value.ToUTF8().c_str());
+            LOGWARNING("Too few CSize parameters (min %i). Your input: '%hs'", NUM_COORDS, Value.ToUTF8().c_str());
             return false;
         }
         stream >> coords[i];
         if ((stream.rdstate() & std::wstringstream::failbit) != 0)
         {
-            LOGWARNING(L"Unable to parse CSize parameters. Your input: '%hs'", Value.ToUTF8().c_str());
+            LOGWARNING("Unable to parse CSize parameters. Your input: '%hs'", Value.ToUTF8().c_str());
             return false;
         }
     }
@@ -150 +150 @@
 
     if (!stream.eof())
     {
-        LOGWARNING(L"Too many CSize parameters (max %i). Your input: '%hs'", NUM_COORDS, Value.ToUTF8().c_str());
+        LOGWARNING("Too many CSize parameters (max %i). Your input: '%hs'", NUM_COORDS, Value.ToUTF8().c_str());
         return false;
     }
 
@@ -169 +169 @@
     {
         if (stream.eof())
         {
-            LOGWARNING(L"Too few CPos parameters (min %i). Your input: '%hs'", NUM_COORDS, Value.ToUTF8().c_str());
+            LOGWARNING("Too few CPos parameters (min %i). Your input: '%hs'", NUM_COORDS, Value.ToUTF8().c_str());
             return false;
         }
         stream >> coords[i];
         if ((stream.rdstate() & std::wstringstream::failbit) != 0)
         {
-            LOGWARNING(L"Unable to parse CPos parameters. Your input: '%hs'", Value.ToUTF8().c_str());
+            LOGWARNING("Unable to parse CPos parameters. Your input: '%hs'", Value.ToUTF8().c_str());
             return false;
         }
     }
@@ -185 +185 @@
 
     if (!stream.eof())
     {
-        LOGWARNING(L"Too many CPos parameters (max %i). Your input: '%hs'", NUM_COORDS, Value.ToUTF8().c_str());
+        LOGWARNING("Too many CPos parameters (max %i). Your input: '%hs'", NUM_COORDS, Value.ToUTF8().c_str());
         return false;
     }
 
@@ -339 +339 @@
     std::map<CStr, SGUISetting>::const_iterator it = pObject->m_Settings.find(Setting);
     if (it == pObject->m_Settings.end())
     {
-        LOGWARNING(L"setting %hs was not found on object %hs", 
+        LOGWARNING("setting %hs was not found on object %hs", 
             Setting.c_str(),
             pObject->GetPresentableName().c_str());
         return PSRETURN_GUI_InvalidSetting;
@@ -388 +388 @@
 
     if (!pObject->SettingExists(Setting))
     {
-        LOGWARNING(L"setting %hs was not found on object %hs", 
+        LOGWARNING("setting %hs was not found on object %hs", 
             Setting.c_str(),
             pObject->GetPresentableName().c_str());
         return PSRETURN_GUI_InvalidSetting;

source/gui/IGUIObject.cpp

@@ -561 +561 @@
 
 PSRETURN IGUIObject::LogInvalidSettings(const CStr8 &Setting) const
 {
-    LOGWARNING(L"IGUIObject: setting %hs was not found on an object", 
+    LOGWARNING("IGUIObject: setting %hs was not found on an object", 
         Setting.c_str());
     return PSRETURN_GUI_InvalidSetting;
 }

source/gui/scripting/ScriptFunctions.cpp

@@ -308 +308 @@
     
     shared_ptr<ScriptInterface::StructuredClone> GUIMetadataClone = pCxPrivate->pScriptInterface->WriteStructuredClone(GUIMetadata);
     if (SavedGames::Save(filename, description, *g_Game->GetSimulation2(), GUIMetadataClone, g_Game->GetPlayerID()) < 0)
-        LOGERROR(L"Failed to save game");
+        LOGERROR("Failed to save game");
 }
 
 void SaveGamePrefix(ScriptInterface::CxPrivate* pCxPrivate, std::wstring prefix, std::wstring description, CScriptVal GUIMetadata1)
@@ -320 +320 @@
     
     shared_ptr<ScriptInterface::StructuredClone> GUIMetadataClone = pCxPrivate->pScriptInterface->WriteStructuredClone(GUIMetadata);
     if (SavedGames::SavePrefix(prefix, description, *g_Game->GetSimulation2(), GUIMetadataClone, g_Game->GetPlayerID()) < 0)
-        LOGERROR(L"Failed to save game");
+        LOGERROR("Failed to save game");
 }
 
 void SetNetworkGameAttributes(ScriptInterface::CxPrivate* pCxPrivate, CScriptVal attribs1)
@@ -630 +630 @@
     if (g_NetServer)
         g_NetServer->SetTurnLength(length);
     else
-        LOGERROR(L"Only network host can change turn length");
+        LOGERROR("Only network host can change turn length");
 }
 
 // Focus the game camera on a given position.
@@ -676 +676 @@
     g_Game->GetWorld()->GetTerrain()->GetHeightMipmap().DumpToDisk(filename);
     OsPath realPath;
     g_VFS->GetRealPath(filename, realPath);
-    LOGMESSAGERENDER(L"Terrain mipmap written to '%ls'", realPath.string().c_str());
+    LOGMESSAGERENDER("Terrain mipmap written to '%ls'", realPath.string().c_str());
 }
 
 void EnableTimeWarpRecording(ScriptInterface::CxPrivate* UNUSED(pCxPrivate), unsigned int numTurns)
@@ -906 +906 @@
     ONCE(InitJsTimers(*(pCxPrivate->pScriptInterface)));
     
     if (slot >= MAX_JS_TIMERS)
-        LOGERROR(L"Exceeded the maximum number of timer slots for scripts!");
+        LOGERROR("Exceeded the maximum number of timer slots for scripts!");
 
     js_start_times[slot].SetFromTimer();
 }
@@ -914 +914 @@
 void StopJsTimer(ScriptInterface::CxPrivate* UNUSED(pCxPrivate), unsigned int slot)
 {
     if (slot >= MAX_JS_TIMERS)
-        LOGERROR(L"Exceeded the maximum number of timer slots for scripts!");
+        LOGERROR("Exceeded the maximum number of timer slots for scripts!");
 
     TimerUnit now;
     now.SetFromTimer();

source/i18n/L10n.cpp

@@ -203 +203 @@
             return;
         }
         else
-            LOGWARNING(L"The configured locale is not valid or no translations are available. Falling back to another locale.");
+            LOGWARNING("The configured locale is not valid or no translations are available. Falling back to another locale.");
     }
     
     Locale systemLocale = Locale::getDefault();
@@ -408 +408 @@
     UnicodeString unicodeFormat = UnicodeString::fromUTF8(formatString.c_str());
     SimpleDateFormat* dateFormat = new SimpleDateFormat(unicodeFormat, status);
     if (U_FAILURE(status))
-        LOGERROR(L"Error creating SimpleDateFormat: %hs", u_errorName(status));
+        LOGERROR("Error creating SimpleDateFormat: %hs", u_errorName(status));
 
     const TimeZone* timeZone = TimeZone::getGMT();
 
     status = U_ZERO_ERROR;
     Calendar* calendar = Calendar::createInstance(*timeZone, currentLocale, status);
     if (U_FAILURE(status))
-        LOGERROR(L"Error creating calendar: %hs", u_errorName(status));
+        LOGERROR("Error creating calendar: %hs", u_errorName(status));
    
     dateFormat->adoptCalendar(calendar);
     dateFormat->format(milliseconds, dateString);
@@ -470 +470 @@
     if (path.string().rfind(dictName) == std::string::npos)
         return INFO::OK;
 
-    LOGMESSAGE(L"Hotloading translations from '%ls'", path.string().c_str());
+    LOGMESSAGE("Hotloading translations from '%ls'", path.string().c_str());
 
     CVFSFile file;
     if (file.Load(g_VFS, path) != PSRETURN_OK)
     {
-        LOGERROR(L"Failed to read translations from '%ls'", path.string().c_str());
+        LOGERROR("Failed to read translations from '%ls'", path.string().c_str());
         return ERR::FAIL;
     }
 
@@ -505 +505 @@
         std::wstring dictName = GetFallbackToAvailableDictLocale(currentLocale);
         if (vfs::GetPathnames(g_VFS, L"l10n/", dictName.append(L".*.po").c_str(), filenames) < 0)
         {
-            LOGERROR(L"No files for the dictionary found, but at this point the input should already be validated!");
+            LOGERROR("No files for the dictionary found, but at this point the input should already be validated!");
             return;
         }
     }
@@ -569 +569 @@
     }
     catch(std::exception& e)
     {
-        LOGERROR(L"[Localization] Exception while reading virtual PO file: %hs", e.what());
+        LOGERROR("[Localization] Exception while reading virtual PO file: %hs", e.what());
     }
 }
 

source/lib/sysdep/os/linux/dir_watch_inotify.cpp

@@ -188 +188 @@
             // Check for error ?
             int err = errno;
             initialized = -1;
-            LOGERROR(L"Error initializing inotify file descriptor; hotloading will be disabled, errno=%d", err);
+            LOGERROR("Error initializing inotify file descriptor; hotloading will be disabled, errno=%d", err);
             errno = err;
             return StatusFromErrno();   // NOWARN
         }
@@ -198 +198 @@
         if (ret != 0)
         {
             initialized = -1;
-            LOGERROR(L"Error creating inotify event loop thread; hotloading will be disabled, err=%d", ret);
+            LOGERROR("Error creating inotify event loop thread; hotloading will be disabled, err=%d", ret);
             errno = ret;
             return StatusFromErrno();   // NOWARN
         }

source/lobby/XmppClient.cpp

@@ -749 +749 @@
     {
         CreateSimpleMessage("system", g_L10n.Translate("unknown subtype (see logs)"), "error");
         std::string tag = tag_name(iq);
-        LOGMESSAGE(L"unknown subtype '%hs'", tag.c_str());
+        LOGMESSAGE("unknown subtype '%hs'", tag.c_str());
     }
 
     return true;
@@ -896 +896 @@
     else IF("offline", Unavailable);
     // The others are not to be set
 #undef IF
-    else LOGERROR(L"Unknown presence '%hs'", presence.c_str());
+    else LOGERROR("Unknown presence '%hs'", presence.c_str());
 }
 
 /**
@@ -952 +952 @@
     CASE(Error, "error");
     CASE(Invalid, "invalid");
     default:
-        LOGERROR(L"Unknown presence type '%d'", (int)p);
+        LOGERROR("Unknown presence type '%d'", (int)p);
         break;
 #undef CASE
     }
@@ -975 +975 @@
     CASE(RoleModerator, "moderator");
     CASE(RoleInvalid, "invalid");
     default:
-        LOGERROR(L"Unknown role type '%d'", (int)r);
+        LOGERROR("Unknown role type '%d'", (int)r);
         break;
 #undef CASE
     }

source/main.cpp

@@ -159 +159 @@
             // Fullscreen toggling is broken on OS X w/ SDL 1.2, see http://trac.wildfiregames.com/ticket/741
             g_VideoMode.ToggleFullscreen();
 #else
-            LOGWARNING(L"Toggling fullscreen and resizing are disabled on OS X due to a known bug. Please use the config file to change display settings.");
+            LOGWARNING("Toggling fullscreen and resizing are disabled on OS X due to a known bug. Please use the config file to change display settings.");
 #endif
             return IN_HANDLED;
         }

source/network/NetClient.cpp

@@ -304 +304 @@
 
         std::stringstream stream;
 
-        LOGMESSAGERENDER(L"Serializing game at turn %u for rejoining player", m_ClientTurnManager->GetCurrentTurn());
+        LOGMESSAGERENDER("Serializing game at turn %u for rejoining player", m_ClientTurnManager->GetCurrentTurn());
         u32 turn = to_le32(m_ClientTurnManager->GetCurrentTurn());
         stream.write((char*)&turn, sizeof(turn));
 
@@ -324 +324 @@
     // Update FSM
     bool ok = Update(message->GetType(), message);
     if (!ok)
-        LOGERROR(L"Net client: Error running FSM update (type=%d state=%d)", (int)message->GetType(), (int)GetCurrState());
+        LOGERROR("Net client: Error running FSM update (type=%d state=%d)", (int)message->GetType(), (int)GetCurrState());
     return ok;
 }
 
@@ -347 +347 @@
         stream.read((char*)&turn, sizeof(turn));
         turn = to_le32(turn);
 
-        LOGMESSAGE(L"Rejoining client deserializing state at turn %u\n", turn);
+        LOGMESSAGE("Rejoining client deserializing state at turn %u\n", turn);
 
         bool ok = m_Game->GetSimulation2()->DeserializeState(stream);
         ENSURE(ok);
@@ -428 +428 @@
 
     CAuthenticateResultMessage* message = (CAuthenticateResultMessage*)event->GetParamRef();
 
-    LOGMESSAGE(L"Net: Authentication result: host=%u, %ls", message->m_HostID, message->m_Message.c_str());
+    LOGMESSAGE("Net: Authentication result: host=%u, %ls", message->m_HostID, message->m_Message.c_str());
 
     bool  isRejoining = (message->m_Code == ARC_OK_REJOINING);
 

source/network/NetFileTransfer.cpp

@@ -15 +15 @@
 
         if (m_FileReceiveTasks.find(respMessage->m_RequestID) == m_FileReceiveTasks.end())
         {
-            LOGERROR(L"Net transfer: Unsolicited file transfer response (id=%d)", (int)respMessage->m_RequestID);
+            LOGERROR("Net transfer: Unsolicited file transfer response (id=%d)", (int)respMessage->m_RequestID);
             return ERR::FAIL;
         }
 
         if (respMessage->m_Length == 0 || respMessage->m_Length > MAX_FILE_TRANSFER_SIZE)
         {
-            LOGERROR(L"Net transfer: Invalid size for file transfer response (length=%d)", (int)respMessage->m_Length);
+            LOGERROR("Net transfer: Invalid size for file transfer response (length=%d)", (int)respMessage->m_Length);
             return ERR::FAIL;
         }
 
@@ -30 +30 @@
         task->m_Length = respMessage->m_Length;
         task->m_Buffer.reserve(respMessage->m_Length);
 
-        LOGMESSAGERENDER(L"Downloading data over network (%d KB) - please wait...", (int)(task->m_Length/1024));
+        LOGMESSAGERENDER("Downloading data over network (%d KB) - please wait...", (int)(task->m_Length/1024));
         m_LastProgressReportTime = timer_Time();
 
         return INFO::OK;
@@ -41 +41 @@
 
         if (m_FileReceiveTasks.find(dataMessage->m_RequestID) == m_FileReceiveTasks.end())
         {
-            LOGERROR(L"Net transfer: Unsolicited file transfer data (id=%d)", (int)dataMessage->m_RequestID);
+            LOGERROR("Net transfer: Unsolicited file transfer data (id=%d)", (int)dataMessage->m_RequestID);
             return ERR::FAIL;
         }
 
@@ -51 +51 @@
 
         if (task->m_Buffer.size() > task->m_Length)
         {
-            LOGERROR(L"Net transfer: Invalid size for file transfer data (length=%d actual=%d)", (int)task->m_Length, (int)task->m_Buffer.size());
+            LOGERROR("Net transfer: Invalid size for file transfer data (length=%d actual=%d)", (int)task->m_Length, (int)task->m_Buffer.size());
             return ERR::FAIL;
         }
 
@@ -62 +62 @@
 
         if (task->m_Buffer.size() == task->m_Length)
         {
-            LOGMESSAGERENDER(L"Download completed");
+            LOGMESSAGERENDER("Download completed");
 
             task->OnComplete();
             m_FileReceiveTasks.erase(dataMessage->m_RequestID);
@@ -75 +75 @@
         double t = timer_Time();
         if (t > m_LastProgressReportTime + 0.5)
         {
-            LOGMESSAGERENDER(L"Downloading data: %.1f%% of %d KB", 100.f*task->m_Buffer.size()/task->m_Length, (int)(task->m_Length/1024));
+            LOGMESSAGERENDER("Downloading data: %.1f%% of %d KB", 100.f*task->m_Buffer.size()/task->m_Length, (int)(task->m_Length/1024));
             m_LastProgressReportTime = t;
         }
 
@@ -87 +87 @@
 
         if (m_FileSendTasks.find(ackMessage->m_RequestID) == m_FileSendTasks.end())
         {
-            LOGERROR(L"Net transfer: Unsolicited file transfer ack (id=%d)", (int)ackMessage->m_RequestID);
+            LOGERROR("Net transfer: Unsolicited file transfer ack (id=%d)", (int)ackMessage->m_RequestID);
             return ERR::FAIL;
         }
 
@@ -95 +95 @@
 
         if (ackMessage->m_NumPackets > task.packetsInFlight)
         {
-            LOGERROR(L"Net transfer: Invalid num packets for file transfer ack (num=%d inflight=%d)",
+            LOGERROR("Net transfer: Invalid num packets for file transfer ack (num=%d inflight=%d)",
                 (int)ackMessage->m_NumPackets, (int)task.packetsInFlight);
             return ERR::FAIL;
         }

source/network/NetHost.cpp

@@ -29 +29 @@
     if (!packet)
         return false;
 
-    LOGMESSAGE(L"Net: Sending message %hs of size %lu to %hs", message->ToString().c_str(), (unsigned long)packet->dataLength, peerName);
+    LOGMESSAGE("Net: Sending message %hs of size %lu to %hs", message->ToString().c_str(), (unsigned long)packet->dataLength, peerName);
 
     // Let ENet send the message to peer
     if (enet_peer_send(peer, DEFAULT_CHANNEL, packet) < 0)
     {
-        LOGERROR(L"Net: Failed to send packet to peer");
+        LOGERROR("Net: Failed to send packet to peer");
         return false;
     }
 
@@ -62 +62 @@
     // Create a reliable packet
     ENetPacket* packet = enet_packet_create(&buffer[0], size, ENET_PACKET_FLAG_RELIABLE);
     if (!packet)
-        LOGERROR(L"Net: Failed to construct packet");
+        LOGERROR("Net: Failed to construct packet");
 
     return packet;
 }

source/network/NetMessage.cpp

@@ -54 +54 @@
 {
     if (pStart + 3 > pEnd)
     {
-        LOGERROR(L"CNetMessage: Corrupt packet (smaller than header)");
+        LOGERROR("CNetMessage: Corrupt packet (smaller than header)");
         return NULL;
     }
 
@@ -68 +68 @@
 
     if (pStart + size != pEnd)
     {
-        LOGERROR(L"CNetMessage: Corrupt packet (incorrect size)");
+        LOGERROR("CNetMessage: Corrupt packet (incorrect size)");
         return NULL;
     }
 
@@ -184 +184 @@
         break;
 
     default:
-        LOGERROR(L"CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", header.GetType());
+        LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", header.GetType());
         break;
     }
 

source/network/NetServer.cpp

@@ -94 +94 @@
 
         if (!session)
         {
-            LOGMESSAGE(L"Net server: rejoining client disconnected before we sent to it");
+            LOGMESSAGE("Net server: rejoining client disconnected before we sent to it");
             return;
         }
 
@@ -177 +177 @@
     m_Host = enet_host_create(&addr, MAX_CLIENTS, CHANNEL_COUNT, 0, 0);
     if (!m_Host)
     {
-        LOGERROR(L"Net server: enet_host_create failed");
+        LOGERROR("Net server: enet_host_create failed");
         return false;
     }
 
@@ -224 +224 @@
     std::string rootDescURL;
     CFG_GET_VAL("network.upnprootdescurl", rootDescURL);
     if (!rootDescURL.empty())
-        LOGMESSAGE(L"Net server: attempting to use cached root descriptor URL: %hs", rootDescURL.c_str());
+        LOGMESSAGE("Net server: attempting to use cached root descriptor URL: %hs", rootDescURL.c_str());
 
     int ret = 0;
     bool allocatedUrls = false;
@@ -232 +232 @@
     // Try a cached URL first
     if (!rootDescURL.empty() && UPNP_GetIGDFromUrl(rootDescURL.c_str(), &urls, &data, internalIPAddress, sizeof(internalIPAddress)))
     {
-        LOGMESSAGE(L"Net server: using cached IGD = %hs", urls.controlURL);
+        LOGMESSAGE("Net server: using cached IGD = %hs", urls.controlURL);
         ret = 1;
     }
     // No cached URL, or it did not respond. Try getting a valid UPnP device for 10 seconds.
@@ -243 +243 @@
     }
     else
     {
-        LOGMESSAGE(L"Net server: upnpDiscover failed and no working cached URL.");
+        LOGMESSAGE("Net server: upnpDiscover failed and no working cached URL.");
         return NULL;
     }
 
     switch (ret)
     {
     case 0:
-        LOGMESSAGE(L"Net server: No IGD found");
+        LOGMESSAGE("Net server: No IGD found");
         break;
     case 1:
-        LOGMESSAGE(L"Net server: found valid IGD = %hs", urls.controlURL);
+        LOGMESSAGE("Net server: found valid IGD = %hs", urls.controlURL);
         break;
     case 2:
-        LOGMESSAGE(L"Net server: found a valid, not connected IGD = %hs, will try to continue anyway", urls.controlURL);
+        LOGMESSAGE("Net server: found a valid, not connected IGD = %hs, will try to continue anyway", urls.controlURL);
         break;
     case 3:
-        LOGMESSAGE(L"Net server: found a UPnP device unrecognized as IGD = %hs, will try to continue anyway", urls.controlURL);
+        LOGMESSAGE("Net server: found a UPnP device unrecognized as IGD = %hs, will try to continue anyway", urls.controlURL);
         break;
     default:
         debug_warn(L"Unrecognized return value from UPNP_GetValidIGD");
@@ -269 +269 @@
     ret = UPNP_GetExternalIPAddress(urls.controlURL, data.first.servicetype, externalIPAddress);
     if (ret != UPNPCOMMAND_SUCCESS)
     {
-        LOGMESSAGE(L"Net server: GetExternalIPAddress failed with code %d (%hs)", ret, strupnperror(ret));
+        LOGMESSAGE("Net server: GetExternalIPAddress failed with code %d (%hs)", ret, strupnperror(ret));
         return NULL;
     }
-    LOGMESSAGE(L"Net server: ExternalIPAddress = %hs", externalIPAddress);
+    LOGMESSAGE("Net server: ExternalIPAddress = %hs", externalIPAddress);
 
     // Try to setup port forwarding.
     ret = UPNP_AddPortMapping(urls.controlURL, data.first.servicetype, psPort, psPort,
                             internalIPAddress, description, protocall, 0, leaseDuration);
     if (ret != UPNPCOMMAND_SUCCESS)
     {
-        LOGMESSAGE(L"Net server: AddPortMapping(%hs, %hs, %hs) failed with code %d (%hs)",
+        LOGMESSAGE("Net server: AddPortMapping(%hs, %hs, %hs) failed with code %d (%hs)",
                psPort, psPort, internalIPAddress, ret, strupnperror(ret));
         return NULL;
     }
@@ -296 +296 @@
 
     if (ret != UPNPCOMMAND_SUCCESS)
     {
-        LOGMESSAGE(L"Net server: GetSpecificPortMappingEntry() failed with code %d (%hs)", ret, strupnperror(ret));
+        LOGMESSAGE("Net server: GetSpecificPortMappingEntry() failed with code %d (%hs)", ret, strupnperror(ret));
         return NULL;
     }
 
-    LOGMESSAGE(L"Net server: External %hs:%hs %hs is redirected to internal %hs:%hs (duration=%hs)",
+    LOGMESSAGE("Net server: External %hs:%hs %hs is redirected to internal %hs:%hs (duration=%hs)",
                    externalIPAddress, psPort, protocall, intClient, intPort, duration);
 
     // Cache root descriptor URL to try to avoid discovery next time.
     g_ConfigDB.SetValueString(CFG_USER, "network.upnprootdescurl", urls.controlURL);
     g_ConfigDB.WriteFile(CFG_USER);
-    LOGMESSAGE(L"Net server: cached UPnP root descriptor URL as %hs", urls.controlURL);
+    LOGMESSAGE("Net server: cached UPnP root descriptor URL as %hs", urls.controlURL);
 
     // Make sure everything is properly freed.
     if (allocatedUrls)
@@ -451 +451 @@
     int status = enet_host_service(m_Host, &event, HOST_SERVICE_TIMEOUT);
     if (status < 0)
     {
-        LOGERROR(L"CNetServerWorker: enet_host_service failed (%d)", status);
+        LOGERROR("CNetServerWorker: enet_host_service failed (%d)", status);
         // TODO: notify game that the server has shut down
         return false;
     }
@@ -471 +471 @@
         // Report the client address
         char hostname[256] = "(error)";
         enet_address_get_host_ip(&event.peer->address, hostname, ARRAY_SIZE(hostname));
-        LOGMESSAGE(L"Net server: Received connection from %hs:%u", hostname, (unsigned int)event.peer->address.port);
+        LOGMESSAGE("Net server: Received connection from %hs:%u", hostname, (unsigned int)event.peer->address.port);
 
         // Set up a session object for this peer
 
@@ -496 +496 @@
         CNetServerSession* session = static_cast<CNetServerSession*>(event.peer->data);
         if (session)
         {
-            LOGMESSAGE(L"Net server: Disconnected %hs", DebugName(session).c_str());
+            LOGMESSAGE("Net server: Disconnected %hs", DebugName(session).c_str());
 
             // Remove the session first, so we won't send player-update messages to it
             // when updating the FSM
@@ -522 +522 @@
             CNetMessage* msg = CNetMessageFactory::CreateMessage(event.packet->data, event.packet->dataLength, GetScriptInterface());
             if (msg)
             {
-                LOGMESSAGE(L"Net server: Received message %hs of size %lu from %hs", msg->ToString().c_str(), (unsigned long)msg->GetSerializedLength(), DebugName(session).c_str());
+                LOGMESSAGE("Net server: Received message %hs of size %lu from %hs", msg->ToString().c_str(), (unsigned long)msg->GetSerializedLength(), DebugName(session).c_str());
 
                 HandleMessageReceive(msg, session);
 
@@ -566 +566 @@
     // Update FSM
     bool ok = session->Update(message->GetType(), (void*)message);
     if (!ok)
-        LOGERROR(L"Net server: Error running FSM update (type=%d state=%d)", (int)message->GetType(), (int)session->GetCurrState());
+        LOGERROR("Net server: Error running FSM update (type=%d state=%d)", (int)message->GetType(), (int)session->GetCurrState());
 }
 
 void CNetServerWorker::SetupSession(CNetServerSession* session)
@@ -810 +810 @@
         // Players who weren't already in the game are not allowed to join now that it's started
         if (!isRejoining)
         {
-            LOGMESSAGE(L"Refused connection after game start from not-previously-known user \"%ls\"", username.c_str());
+            LOGMESSAGE("Refused connection after game start from not-previously-known user \"%ls\"", username.c_str());
             session->Disconnect(NDR_SERVER_ALREADY_IN_GAME);
             return true;
         }

source/network/NetSession.cpp

@@ -112 +112 @@
             // Report the server address
             char hostname[256] = "(error)";
             enet_address_get_host_ip(&event.peer->address, hostname, ARRAY_SIZE(hostname));
-            LOGMESSAGE(L"Net client: Connected to %hs:%u", hostname, (unsigned int)event.peer->address.port);
+            LOGMESSAGE("Net client: Connected to %hs:%u", hostname, (unsigned int)event.peer->address.port);
 
             m_Client.HandleConnect();
 
@@ -123 +123 @@
         {
             ENSURE(event.peer == m_Server);
 
-            LOGMESSAGE(L"Net client: Disconnected");
+            LOGMESSAGE("Net client: Disconnected");
             m_Client.HandleDisconnect(event.data);
             return;
         }
@@ -133 +133 @@
             CNetMessage* msg = CNetMessageFactory::CreateMessage(event.packet->data, event.packet->dataLength, m_Client.GetScriptInterface());
             if (msg)
             {
-                LOGMESSAGE(L"Net client: Received message %hs of size %lu from server", msg->ToString().c_str(), (unsigned long)msg->GetSerializedLength());
+                LOGMESSAGE("Net client: Received message %hs of size %lu from server", msg->ToString().c_str(), (unsigned long)msg->GetSerializedLength());
 
                 m_Client.HandleMessage(msg);
 

source/network/NetTurnManager.cpp

@@ -244 +244 @@
     if (g_GUI)
         g_GUI->DisplayMessageBox(600, 350, L"Sync error", msg.str());
     else
-        LOGERROR(L"%ls", msg.str().c_str());
+        LOGERROR("%ls", msg.str().c_str());
 }
 
 void CNetTurnManager::Interpolate(float simFrameLength, float realFrameLength)
@@ -327 +327 @@
     bool ok = m_Simulation2.SerializeState(stream);
     if (!ok)
     {
-        LOGERROR(L"Failed to quicksave game");
+        LOGERROR("Failed to quicksave game");
         return;
     }
 
@@ -337 +337 @@
     else
         m_QuickSaveMetadata = std::string();
 
-    LOGMESSAGERENDER(L"Quicksaved game");
+    LOGMESSAGERENDER("Quicksaved game");
 
 }
 
@@ -347 +347 @@
 
     if (m_QuickSaveState.empty())
     {
-        LOGERROR(L"Cannot quickload game - no game was quicksaved");
+        LOGERROR("Cannot quickload game - no game was quicksaved");
         return;
     }
 
@@ -355 +355 @@
     bool ok = m_Simulation2.DeserializeState(stream);
     if (!ok)
     {
-        LOGERROR(L"Failed to quickload game");
+        LOGERROR("Failed to quickload game");
         return;
     }
 
     if (g_GUI && !m_QuickSaveMetadata.empty())
         g_GUI->RestoreSavedGameData(m_QuickSaveMetadata);
 
-    LOGMESSAGERENDER(L"Quickloaded game");
+    LOGMESSAGERENDER("Quickloaded game");
 
     // See RewindTimeWarp
     ResetState(0, 1);

source/ps/CStrIntern.cpp

@@ -30 +30 @@
     CStrInternInternals(const char* str, size_t len)
         : data(str, str+len), hash(fnv_hash(str, len))
     {
-//      LOGWARNING(L"New interned string '%hs'", data.c_str());
+//      LOGWARNING("New interned string '%hs'", data.c_str());
     }
 
     bool operator==(const CStrInternInternals& b) const

source/ps/ConfigDB.cpp

@@ -214 +214 @@
         // Handle missing files quietly
         if (g_VFS->GetFileInfo(m_ConfigFile[ns], NULL) < 0)
         {
-            LOGMESSAGE(L"Cannot find config file \"%ls\" - ignoring", m_ConfigFile[ns].string().c_str());
+            LOGMESSAGE("Cannot find config file \"%ls\" - ignoring", m_ConfigFile[ns].string().c_str());
             return false;
         }
 
-        LOGMESSAGE(L"Loading config file \"%ls\"", m_ConfigFile[ns].string().c_str());
+        LOGMESSAGE("Loading config file \"%ls\"", m_ConfigFile[ns].string().c_str());
         Status ret = g_VFS->LoadFile(m_ConfigFile[ns], buffer, buflen);
         if (ret != INFO::OK)
         {
-            LOGERROR(L"CConfigDB::Reload(): vfs_load for \"%ls\" failed: return was %lld", m_ConfigFile[ns].string().c_str(), (long long)ret);
+            LOGERROR("CConfigDB::Reload(): vfs_load for \"%ls\" failed: return was %lld", m_ConfigFile[ns].string().c_str(), (long long)ret);
             return false;
         }
     }
@@ -256 +256 @@
 
             if (pos == filebufend || *pos == '\n')
             {
-                LOGERROR(L"Config header with missing close tag encountered on line %d in '%ls'", line, m_ConfigFile[ns].string().c_str());
+                LOGERROR("Config header with missing close tag encountered on line %d in '%ls'", line, m_ConfigFile[ns].string().c_str());
                 header.clear();
                 ++line;
                 continue;
             }
 
-            LOGMESSAGE(L"Found config header '%hs'", header.c_str());
+            LOGMESSAGE("Found config header '%hs'", header.c_str());
             header.push_back('.');
             while (++pos < filebufend && *pos != '\n' && *pos != ';')
                 if (*pos != ' ' && *pos != '\r')
                 {
-                    LOGERROR(L"Config settings on the same line as a header on line %d in '%ls'", line, m_ConfigFile[ns].string().c_str());
+                    LOGERROR("Config settings on the same line as a header on line %d in '%ls'", line, m_ConfigFile[ns].string().c_str());
                     break;
                 }
             while (pos < filebufend && *pos != '\n')
@@ -288 +288 @@
                     {
                         if (*pos == '\\' && ++pos == filebufend)
                         {
-                            LOGERROR(L"Escape character at end of input (line %d in '%ls')", line, m_ConfigFile[ns].string().c_str());
+                            LOGERROR("Escape character at end of input (line %d in '%ls')", line, m_ConfigFile[ns].string().c_str());
                             break;
                         }
 
@@ -316 +316 @@
                 }
             }
             if (quoted) // We ignore the invalid parameter
-                LOGERROR(L"Unmatched quote while parsing config file '%ls' on line %d", m_ConfigFile[ns].string().c_str(), line);
+                LOGERROR("Unmatched quote while parsing config file '%ls' on line %d", m_ConfigFile[ns].string().c_str(), line);
             else if (!value.empty())
                 values.push_back(value);
             value.clear();
@@ -337 +337 @@
             CStr key(header + name);
             newMap[key] = values;
             if (key == "lobby.password")
-                LOGMESSAGE(L"Loaded config string \"%hs\"", key.c_str());
+                LOGMESSAGE("Loaded config string \"%hs\"", key.c_str());
             else
             {
                 std::string vals;
                 for (size_t i = 0; i < newMap[key].size() - 1; ++i)
                     vals += "\"" + EscapeString(newMap[key][i]) + "\", ";
                 vals += "\"" + EscapeString(newMap[key][values.size()-1]) + "\"";
-                LOGMESSAGE(L"Loaded config string \"%hs\" = %hs", key.c_str(), vals.c_str());
+                LOGMESSAGE("Loaded config string \"%hs\" = %hs", key.c_str(), vals.c_str());
             }
         }
         else if (!name.empty())
-            LOGERROR(L"Encountered config setting '%hs' without value while parsing '%ls' on line %d", name.c_str(), m_ConfigFile[ns].string().c_str(), line);
+            LOGERROR("Encountered config setting '%hs' without value while parsing '%ls' on line %d", name.c_str(), m_ConfigFile[ns].string().c_str(), line);
 
         name.clear();
         values.clear();
@@ -356 +356 @@
     }
 
     if (!name.empty())
-        LOGERROR(L"Config file does not have a new line after the last config setting '%hs'", name.c_str());
+        LOGERROR("Config file does not have a new line after the last config setting '%hs'", name.c_str());
 
     m_Map[ns].swap(newMap);
 
@@ -393 +393 @@
     Status ret = g_VFS->CreateFile(path, buf, len);
     if (ret < 0)
     {
-        LOGERROR(L"CConfigDB::WriteFile(): CreateFile \"%ls\" failed (error: %d)", path.string().c_str(), (int)ret);
+        LOGERROR("CConfigDB::WriteFile(): CreateFile \"%ls\" failed (error: %d)", path.string().c_str(), (int)ret);
         return false;
     }
 

source/ps/DllLoader.cpp

@@ -196 +196 @@
     switch (m_LoadErrorLogMethod)
     {
     case CLogger::Normal:
-        LOGMESSAGE(L"DllLoader: %hs", errors);
+        LOGMESSAGE("DllLoader: %hs", errors);
         break;
     case CLogger::Warning:
-        LOGWARNING(L"DllLoader: %hs", errors);
+        LOGWARNING("DllLoader: %hs", errors);
         break;
     case CLogger::Error:
-        LOGERROR(L"DllLoader: %hs", errors);
+        LOGERROR("DllLoader: %hs", errors);
         break;
     }
 }

source/ps/FileIo.cpp

@@ -69 +69 @@
     const Status st = g_VFS->CreateFile(filename, m_writeBuffer.Data(), m_writeBuffer.Size());
     if (st < 0)
     {
-        LOGERROR(L"Failed to write file '%ls' with status '%lld'", filename.string().c_str(), (long long)st);
+        LOGERROR("Failed to write file '%ls' with status '%lld'", filename.string().c_str(), (long long)st);
         throw PSERROR_File_WriteFailed();
     }
 }

source/ps/Filesystem.cpp

@@ -124 +124 @@
     if (ret != INFO::OK)
     {
         if (log)
-            LOGERROR(L"CVFSFile: file %ls couldn't be opened (vfs_load: %lld)", filename.string().c_str(), (long long)ret);
+            LOGERROR("CVFSFile: file %ls couldn't be opened (vfs_load: %lld)", filename.string().c_str(), (long long)ret);
         m_Buffer.reset();
         m_BufferSize = 0;
         return PSRETURN_CVFSFile_LoadFailed;

source/ps/GameSetup/Config.cpp

@@ -131 +131 @@
     CFG_GET_VAL("profiler2.script.enable", g_ScriptProfilingEnabled);
 
     if (g_JSDebuggerEnabled)
-        LOGERROR(L"JS debugger temporarily disabled during the SpiderMonkey upgrade (check trac ticket #2348 for details)");
+        LOGERROR("JS debugger temporarily disabled during the SpiderMonkey upgrade (check trac ticket #2348 for details)");
     // Script Debugging and profiling does not make sense together because of the hooks
     // that reduce performance a lot - and it wasn't tested if it even works together.
     if (g_JSDebuggerEnabled && g_ScriptProfilingEnabled)
-        LOGERROR(L"Enabling both script profiling and script debugging is not supported!");
+        LOGERROR("Enabling both script profiling and script debugging is not supported!");
 }
 
 

source/ps/GameSetup/GameSetup.cpp

@@ -293 +293 @@
 #warning TODO: cursors for Android
 #else
             if (cursor_draw(g_VFS, cursorName.c_str(), g_mouse_x, g_yres-g_mouse_y, forceGL) < 0)
-                LOGWARNING(L"Failed to draw cursor '%ls'", cursorName.c_str());
+                LOGWARNING("Failed to draw cursor '%ls'", cursorName.c_str());
 #endif
 
 #if CONFIG2_GLES
@@ -656 +656 @@
 
     if(SDL_Init(SDL_INIT_VIDEO|SDL_INIT_TIMER|SDL_INIT_NOPARACHUTE) < 0)
     {
-        LOGERROR(L"SDL library initialization failed: %hs", SDL_GetError());
+        LOGERROR("SDL library initialization failed: %hs", SDL_GetError());
         throw PSERROR_System_SDLInitFailed();
     }
     atexit(SDL_Quit);
@@ -814 +814 @@
     }
     catch (std::runtime_error&)
     {
-        LOGWARNING(L"Invalid locale settings");
+        LOGWARNING("Invalid locale settings");
 
         for (size_t i = 0; i < ARRAY_SIZE(LocaleEnvVars); i++)
         {
             if (char* envval = getenv(LocaleEnvVars[i]))
-                LOGWARNING(L"  %hs=\"%hs\"", LocaleEnvVars[i], envval);
+                LOGWARNING("  %hs=\"%hs\"", LocaleEnvVars[i], envval);
             else
-                LOGWARNING(L"  %hs=\"(unset)\"", LocaleEnvVars[i]);
+                LOGWARNING("  %hs=\"(unset)\"", LocaleEnvVars[i]);
         }
 
         // We should set LC_ALL since it overrides LANG
         if (setenv("LC_ALL", std::locale::classic().name().c_str(), 1))
             debug_warn(L"Invalid locale settings, and unable to set LC_ALL env variable.");
         else
-            LOGWARNING(L"Setting LC_ALL env variable to: %hs", getenv("LC_ALL"));
+            LOGWARNING("Setting LC_ALL env variable to: %hs", getenv("LC_ALL"));
     }
 }
 #else
@@ -1132 +1132 @@
 
     if (INFO::OK != loadResult)
     {
-        LOGERROR(L"LoadSettingsOfScenarioMap: Unable to load map file '%ls'", mapPath.string().c_str());
+        LOGERROR("LoadSettingsOfScenarioMap: Unable to load map file '%ls'", mapPath.string().c_str());
         throw PSERROR_Game_World_MapLoadFailed("Unable to load map file, check the path for typos.");
     }
     XMBElement mapElement = mapFile.GetRoot();
@@ -1246 +1246 @@
         else
         {
             // Problem with JSON file
-            LOGERROR(L"Autostart: Error reading random map script '%ls'", scriptPath.c_str());
+            LOGERROR("Autostart: Error reading random map script '%ls'", scriptPath.c_str());
             throw PSERROR_Game_World_MapLoadFailed("Error reading random map script.\nCheck application log for details.");
         }
 
@@ -1301 +1301 @@
     }
     else
     {
-        LOGERROR(L"Autostart: Unrecognized map type '%ls'", mapDirectory.c_str());
+        LOGERROR("Autostart: Unrecognized map type '%ls'", mapDirectory.c_str());
         throw PSERROR_Game_World_MapLoadFailed("Unrecognized map type.\nConsult readme.txt for the currently supported types.");
     }
     scriptInterface.SetProperty(attrs, "mapType", mapType);
@@ -1336 +1336 @@
                 if (mapDirectory == L"scenarios" || mapDirectory == L"skirmishes")
                 {
                     // playerID is certainly bigger than this map player number
-                    LOGWARNING(L"Autostart: Invalid player %d in autostart-ai option", playerID);
+                    LOGWARNING("Autostart: Invalid player %d in autostart-ai option", playerID);
                     continue;
                 }
                 scriptInterface.Eval("({})", &player);
@@ -1363 +1363 @@
                 if (mapDirectory == L"scenarios" || mapDirectory == L"skirmishes")
                 {
                     // playerID is certainly bigger than this map player number
-                    LOGWARNING(L"Autostart: Invalid player %d in autostart-aidiff option", playerID);
+                    LOGWARNING("Autostart: Invalid player %d in autostart-aidiff option", playerID);
                     continue;
                 }
                 scriptInterface.Eval("({})", &player);
@@ -1391 +1391 @@
                     if (mapDirectory == L"skirmishes")
                     {
                         // playerID is certainly bigger than this map player number
-                        LOGWARNING(L"Autostart: Invalid player %d in autostart-civ option", playerID);
+                        LOGWARNING("Autostart: Invalid player %d in autostart-civ option", playerID);
                         continue;
                     }
                     scriptInterface.Eval("({})", &player);
@@ -1403 +1403 @@
             }
         }
         else
-            LOGWARNING(L"Autostart: Option 'autostart-civ' is invalid for scenarios");
+            LOGWARNING("Autostart: Option 'autostart-civ' is invalid for scenarios");
     }
 
     // Add player data to map settings

source/ps/GameSetup/HWDetect.cpp

@@ -203 +203 @@
     CVFSFile file;
     if (file.Load(g_VFS, scriptName) != PSRETURN_OK)
     {
-        LOGERROR(L"Failed to load hardware detection script");
+        LOGERROR("Failed to load hardware detection script");
         return;
     }
 

source/ps/GameSetup/Paths.cpp

@@ -172 +172 @@
     // make sure it's valid
     if(!FileExists(pathname))
     {
-        LOGERROR(L"Cannot find executable (expected at '%ls')", pathname.string().c_str());
+        LOGERROR("Cannot find executable (expected at '%ls')", pathname.string().c_str());
         WARN_IF_ERR(StatusFromErrno());
     }
 

source/ps/Hotkey.cpp

@@ -83 +83 @@
                 int mapping = FindKeyCode(*it);
                 if (!mapping)
                 {
-                    LOGWARNING(L"Hotkey mapping used invalid key '%hs'", hotkey.c_str());
+                    LOGWARNING("Hotkey mapping used invalid key '%hs'", hotkey.c_str());
                     continue;
                 }
 

source/ps/Joystick.cpp

@@ -41 +41 @@
 
     if (SDL_InitSubSystem(SDL_INIT_JOYSTICK) < 0)
     {
-        LOGERROR(L"CJoystick::Initialise failed to initialise joysticks (\"%hs\")", SDL_GetError());
+        LOGERROR("CJoystick::Initialise failed to initialise joysticks (\"%hs\")", SDL_GetError());
         return;
     }
 
     int numJoysticks = SDL_NumJoysticks();
 
-    LOGMESSAGE(L"Found %d joystick(s)", numJoysticks);
+    LOGMESSAGE("Found %d joystick(s)", numJoysticks);
 
     for (int i = 0; i < numJoysticks; ++i)
     {
@@ -55 +55 @@
         SDL_Joystick* stick = SDL_JoystickOpen(i);
         if (!stick)
         {
-            LOGERROR(L"CJoystick::Initialise failed to open joystick %d (\"%hs\")", i, SDL_GetError());
+            LOGERROR("CJoystick::Initialise failed to open joystick %d (\"%hs\")", i, SDL_GetError());
             continue;
         }
         const char* name = SDL_JoystickName(stick);
 #else // SDL 1.2
         const char* name = SDL_JoystickName(i);
 #endif
-        LOGMESSAGE(L"Joystick %d: %hs", i, name);
+        LOGMESSAGE("Joystick %d: %hs", i, name);
 #if SDL_VERSION_ATLEAST(2, 0, 0)
         SDL_JoystickClose(stick);
 #endif
@@ -75 +75 @@
         // Always pick the first joystick, and assume that's the right one
         m_Joystick = SDL_JoystickOpen(0);
         if (!m_Joystick)
-            LOGERROR(L"CJoystick::Initialise failed to open joystick (\"%hs\")", SDL_GetError());
+            LOGERROR("CJoystick::Initialise failed to open joystick (\"%hs\")", SDL_GetError());
     }
 }
 

source/ps/Overlay.cpp

@@ -48 +48 @@
         stream >> values[i];
         if ((stream.rdstate() & std::stringstream::failbit) != 0)
         {
-            LOGWARNING(L"Unable to parse CColor parameters. Your input: '%hs'", Value.c_str());
+            LOGWARNING("Unable to parse CColor parameters. Your input: '%hs'", Value.c_str());
             return false;
         }
         if (values[i] < 0 || values[i] > 255)
         {
-            LOGWARNING(L"Invalid value (<0 or >255) when parsing CColor parameters. Your input: '%hs'", Value.c_str());
+            LOGWARNING("Invalid value (<0 or >255) when parsing CColor parameters. Your input: '%hs'", Value.c_str());
             return false;
         }
     }
 
     if (i < 3)
     {
-        LOGWARNING(L"Not enough parameters when parsing as CColor. Your input: '%hs'", Value.c_str());
+        LOGWARNING("Not enough parameters when parsing as CColor. Your input: '%hs'", Value.c_str());
         return false;
     }
     if (!stream.eof())
     {
-        LOGWARNING(L"Too many parameters when parsing as CColor. Your input: '%hs'", Value.c_str());
+        LOGWARNING("Too many parameters when parsing as CColor. Your input: '%hs'", Value.c_str());
         return false;
     }
 

source/ps/Preprocessor.cpp

@@ -231 +231 @@
 {
     (void)iData;
     if (iToken)
-        LOGERROR(L"Preprocessor error: line %d: %hs: '%.*hs'\n",
+        LOGERROR("Preprocessor error: line %d: %hs: '%.*hs'\n",
                   iLine, iError, int (iTokenLen), iToken);
     else
-        LOGERROR(L"Preprocessor error: line %d: %hs\n", iLine, iError);
+        LOGERROR("Preprocessor error: line %d: %hs\n", iLine, iError);
 }
 
 //---------------------------------------------------------------------------//

source/ps/PreprocessorWrapper.cpp

@@ -51 +51 @@
 
     if (!output)
     {
-        LOGERROR(L"Failed to parse conditional expression '%hs'", expr.c_str());
+        LOGERROR("Failed to parse conditional expression '%hs'", expr.c_str());
         return false;
     }
 
@@ -72 +72 @@
 
     if (!output)
     {
-        LOGERROR(L"Shader preprocessing failed");
+        LOGERROR("Shader preprocessing failed");
         return "";
     }
 

source/ps/ProfileViewer.cpp

@@ -570 +570 @@
 
         if (m->outputStream.fail())
         {
-            LOGERROR(L"Failed to open profile log file");
+            LOGERROR("Failed to open profile log file");
             return;
         }
         else
         {
-            LOGMESSAGERENDER(L"Profiler snapshot saved to '%ls'", path.string().c_str());
+            LOGMESSAGERENDER("Profiler snapshot saved to '%ls'", path.string().c_str());
         }
     }
 

source/ps/Profiler2.cpp

@@ -126 +126 @@
 
     case MG_EVENT_LOG:
         // Called by Mongoose's cry()
-        LOGERROR(L"Mongoose error: %hs", request_info->log_message);
+        LOGERROR("Mongoose error: %hs", request_info->log_message);
         return NULL;
 
     case MG_INIT_SSL:
@@ -157 +157 @@
 void CProfiler2::EnableHTTP()
 {
     ENSURE(m_Initialised);
-    LOGMESSAGERENDER(L"Starting profiler2 HTTP server");
+    LOGMESSAGERENDER("Starting profiler2 HTTP server");
 
     // Ignore multiple enablings
     if (m_MgContext)
@@ -177 +177 @@
     ENSURE(m_Initialised);
     if (!m_GPU)
     {
-        LOGMESSAGERENDER(L"Starting profiler2 GPU mode");
+        LOGMESSAGERENDER("Starting profiler2 GPU mode");
         InitialiseGPU();
     }
 }
 
 void CProfiler2::ShutdownGPU()
 {
-    LOGMESSAGERENDER(L"Shutting down profiler2 GPU mode");
+    LOGMESSAGERENDER("Shutting down profiler2 GPU mode");
     SAFE_DELETE(m_GPU);
 }
 
 void CProfiler2::ShutDownHTTP()
 {
-    LOGMESSAGERENDER(L"Shutting down profiler2 HTTP server");
+    LOGMESSAGERENDER("Shutting down profiler2 HTTP server");
     if (m_MgContext)
     {
         mg_stop(m_MgContext);

source/ps/SavedGame.cpp

@@ -244 +244 @@
         if (!archiveReader)
         {
             // Triggered by e.g. the file being open in another program
-            LOGWARNING(L"Failed to read saved game '%ls'", realPath.string().c_str());
+            LOGWARNING("Failed to read saved game '%ls'", realPath.string().c_str());
             continue; // skip this file
         }
 

source/ps/TemplateLoader.cpp

@@ -39 +39 @@
     // Handle infinite loops more gracefully than running out of stack space and crashing
     if (depth > 100)
     {
-        LOGERROR(L"Probable infinite inheritance loop in entity template '%hs'", templateName.c_str());
+        LOGERROR("Probable infinite inheritance loop in entity template '%hs'", templateName.c_str());
         return false;
     }
 
@@ -57 +57 @@
         std::string baseName = templateName.substr(8);
         if (!LoadTemplateFile(baseName, depth+1))
         {
-            LOGERROR(L"Failed to load entity template '%hs'", baseName.c_str());
+            LOGERROR("Failed to load entity template '%hs'", baseName.c_str());
             return false;
         }
         // Copy a subset to the requested template
@@ -72 +72 @@
         std::string baseName = templateName.substr(7);
         if (!LoadTemplateFile(baseName, depth+1))
         {
-            LOGERROR(L"Failed to load entity template '%hs'", baseName.c_str());
+            LOGERROR("Failed to load entity template '%hs'", baseName.c_str());
             return false;
         }
         // Copy a subset to the requested template
@@ -87 +87 @@
         std::string baseName = templateName.substr(7);
         if (!LoadTemplateFile(baseName, depth+1))
         {
-            LOGERROR(L"Failed to load entity template '%hs'", baseName.c_str());
+            LOGERROR("Failed to load entity template '%hs'", baseName.c_str());
             return false;
         }
         // Copy a subset to the requested template
@@ -102 +102 @@
         std::string baseName = templateName.substr(11);
         if (!LoadTemplateFile(baseName, depth+1))
         {
-            LOGERROR(L"Failed to load entity template '%hs'", baseName.c_str());
+            LOGERROR("Failed to load entity template '%hs'", baseName.c_str());
             return false;
         }
         // Copy a subset to the requested template
@@ -117 +117 @@
         std::string baseName = templateName.substr(13);
         if (!LoadTemplateFile(baseName, depth+1))
         {
-            LOGERROR(L"Failed to load entity template '%hs'", baseName.c_str());
+            LOGERROR("Failed to load entity template '%hs'", baseName.c_str());
             return false;
         }
         // Copy a subset to the requested template
@@ -132 +132 @@
         std::string baseName = templateName.substr(9);
         if (!LoadTemplateFile(baseName, depth+1))
         {
-            LOGERROR(L"Failed to load entity template '%hs'", baseName.c_str());
+            LOGERROR("Failed to load entity template '%hs'", baseName.c_str());
             return false;
         }
         // Copy a subset to the requested template
@@ -155 +155 @@
         // To prevent needless complexity in template design, we don't allow |-separated strings as parents
         if (parentName.find('|') != parentName.npos)
         {
-            LOGERROR(L"Invalid parent '%hs' in entity template '%hs'", parentName.c_str(), templateName.c_str());
+            LOGERROR("Invalid parent '%hs' in entity template '%hs'", parentName.c_str(), templateName.c_str());
             return false;
         }
 
         // Ensure the parent is loaded
         if (!LoadTemplateFile(parentName, depth+1))
         {
-            LOGERROR(L"Failed to load parent '%hs' of entity template '%hs'", parentName.c_str(), templateName.c_str());
+            LOGERROR("Failed to load parent '%hs' of entity template '%hs'", parentName.c_str(), templateName.c_str());
             return false;
         }
 
@@ -272 +272 @@
     }
 
     if (templatesType != SIMULATION_TEMPLATES && templatesType != ACTOR_TEMPLATES && templatesType != ALL_TEMPLATES)
-        LOGERROR(L"Undefined template type (valid: all, simulation, actor)");
+        LOGERROR("Undefined template type (valid: all, simulation, actor)");
 
     return templates;
 }
@@ -304 +304 @@
     }
 
     if (templatesType != SIMULATION_TEMPLATES && templatesType != ACTOR_TEMPLATES && templatesType != ALL_TEMPLATES)
-        LOGERROR(L"Undefined template type (valid: all, simulation, actor)");
+        LOGERROR("Undefined template type (valid: all, simulation, actor)");
 
     return templates;
 }
@@ -314 +314 @@
     // Load the template if necessary
     if (!LoadTemplateFile(templateName, 0))
     {
-        LOGERROR(L"Failed to load entity template '%hs'", templateName.c_str());
+        LOGERROR("Failed to load entity template '%hs'", templateName.c_str());
         return NULL_NODE;
     }
 
@@ -327 +327 @@
     const char* templateName = "special/actor";
     if (!LoadTemplateFile(templateName, 0))
     {
-        LOGERROR(L"Failed to load entity template '%hs'", templateName);
+        LOGERROR("Failed to load entity template '%hs'", templateName);
         return;
     }
 

source/ps/Util.cpp

@@ -244 +244 @@
         LOGMESSAGERENDER(wstring_from_utf8(g_L10n.Translate("Screenshot written to '%ls'")).c_str(), realPath.string().c_str());
     }
     else
-        LOGERROR(L"Error writing screenshot to '%ls'", filename.string().c_str());
+        LOGERROR("Error writing screenshot to '%ls'", filename.string().c_str());
 }
 
 
@@ -377 +377 @@
         LOGMESSAGERENDER(wstring_from_utf8(g_L10n.Translate("Screenshot written to '%ls'")).c_str(), realPath.string().c_str());
     }
     else
-        LOGERROR(L"Error writing screenshot to '%ls'", filename.string().c_str());
+        LOGERROR("Error writing screenshot to '%ls'", filename.string().c_str());
 
     free(tile_data);
 }

source/ps/VideoMode.cpp

@@ -88 +88 @@
             // If fullscreen fails, try windowed mode
             if (fullscreen)
             {
-                LOGWARNING(L"Failed to set the video mode to fullscreen for the chosen resolution "
+                LOGWARNING("Failed to set the video mode to fullscreen for the chosen resolution "
                     L"%dx%d:%d (\"%hs\"), falling back to windowed mode",
                     w, h, bpp, SDL_GetError());
                 // Using default size for the window for now, as the attempted setting
@@ -97 +97 @@
             }
             else
             {
-                LOGERROR(L"SetVideoMode failed in SDL_CreateWindow: %dx%d:%d %d (\"%hs\")",
+                LOGERROR("SetVideoMode failed in SDL_CreateWindow: %dx%d:%d %d (\"%hs\")",
                     w, h, bpp, fullscreen ? 1 : 0, SDL_GetError());
                 return false;
             }
@@ -105 +105 @@
 
         if (SDL_SetWindowDisplayMode(m_Window, NULL) < 0)
         {
-            LOGERROR(L"SetVideoMode failed in SDL_SetWindowDisplayMode: %dx%d:%d %d (\"%hs\")",
+            LOGERROR("SetVideoMode failed in SDL_SetWindowDisplayMode: %dx%d:%d %d (\"%hs\")",
                 w, h, bpp, fullscreen ? 1 : 0, SDL_GetError());
             return false;
         }
@@ -113 +113 @@
         SDL_GLContext context = SDL_GL_CreateContext(m_Window);
         if (!context)
         {
-            LOGERROR(L"SetVideoMode failed in SDL_GL_CreateContext: %dx%d:%d %d (\"%hs\")",
+            LOGERROR("SetVideoMode failed in SDL_GL_CreateContext: %dx%d:%d %d (\"%hs\")",
                 w, h, bpp, fullscreen ? 1 : 0, SDL_GetError());
             return false;
         }
@@ -132 +132 @@
 
             if (SDL_SetWindowFullscreen(m_Window, flags) < 0)
             {
-                LOGERROR(L"SetVideoMode failed in SDL_SetWindowFullscreen: %dx%d:%d %d (\"%hs\")",
+                LOGERROR("SetVideoMode failed in SDL_SetWindowFullscreen: %dx%d:%d %d (\"%hs\")",
                     w, h, bpp, fullscreen ? 1 : 0, SDL_GetError());
                 return false;
             }
@@ -172 +172 @@
         // If fullscreen fails, try windowed mode
         if (fullscreen)
         {
-            LOGWARNING(L"Failed to set the video mode to fullscreen for the chosen resolution "
+            LOGWARNING("Failed to set the video mode to fullscreen for the chosen resolution "
                 L"%dx%d:%d (\"%hs\"), falling back to windowed mode",
                 w, h, bpp, SDL_GetError());
             // Using default size for the window for now, as the attempted setting
@@ -181 +181 @@
         }
         else
         {
-            LOGERROR(L"SetVideoMode failed: %dx%d:%d %d (\"%hs\")",
+            LOGERROR("SetVideoMode failed: %dx%d:%d %d (\"%hs\")",
                 w, h, bpp, fullscreen ? 1 : 0, SDL_GetError());
             return false;
         }
@@ -294 +294 @@
     u16 ramp[256];
     SDL_CalculateGammaRamp(g_Gamma, ramp);
     if (SDL_SetWindowGammaRamp(m_Window, ramp, ramp, ramp) < 0)
-        LOGWARNING(L"SDL_SetWindowGammaRamp failed");
+        LOGWARNING("SDL_SetWindowGammaRamp failed");
 #else
 # if OS_MACOSX
     // Workaround for crash on Mavericks, see http://trac.wildfiregames.com/ticket/2272
@@ -304 +304 @@
     {
 # endif
     if (SDL_SetGamma(g_Gamma, g_Gamma, g_Gamma) < 0)
-        LOGWARNING(L"SDL_SetGamma failed");
+        LOGWARNING("SDL_SetGamma failed");
 # if OS_MACOSX
     }
 # endif

source/ps/World.cpp

@@ -89 +89 @@
         catch (PSERROR_File& err)
         {
             delete reader;
-            LOGERROR(L"Failed to load map %ls: %hs", mapfilename.string().c_str(), err.what());
+            LOGERROR("Failed to load map %ls: %hs", mapfilename.string().c_str(), err.what());
             throw PSERROR_Game_World_MapLoadFailed("Failed to load map.\nCheck application log for details.");
         }
     }

source/ps/XML/RelaxNG.cpp

@@ -46 +46 @@
         xmlRelaxNGFreeParserCtxt(ctxt);
 
         if (m_Schema == NULL)
-            LOGERROR(L"RelaxNGValidator: Failed to compile schema");
+            LOGERROR("RelaxNGValidator: Failed to compile schema");
     }
 
     ~RelaxNGSchema()
@@ -108 +108 @@
 
     if (!m_Schema)
     {
-        LOGERROR(L"RelaxNGValidator: No grammar loaded");
+        LOGERROR("RelaxNGValidator: No grammar loaded");
         return false;
     }
 
     xmlDocPtr doc = xmlReadMemory(document.c_str(), (int)document.size(), utf8_from_wstring(filename).c_str(), NULL, XML_PARSE_NONET);
     if (doc == NULL)
     {
-        LOGERROR(L"RelaxNGValidator: Failed to parse document");
+        LOGERROR("RelaxNGValidator: Failed to parse document");
         return false;
     }
 
@@ -130 +130 @@
     }
     else if (ret > 0)
     {
-        LOGERROR(L"RelaxNGValidator: Validation failed");
+        LOGERROR("RelaxNGValidator: Validation failed");
         return false;
     }
     else
     {
-        LOGERROR(L"RelaxNGValidator: Internal error %d", ret);
+        LOGERROR("RelaxNGValidator: Internal error %d", ret);
         return false;
     }
 }

source/ps/XML/XMLWriter.cpp

@@ -102 +102 @@
     Status ret = vfs->CreateFile(pathname, data, size);
     if (ret < 0)
     {
-        LOGERROR(L"Error saving XML data through VFS: %lld '%ls'", (long long)ret, pathname.string().c_str());
+        LOGERROR("Error saving XML data through VFS: %lld '%ls'", (long long)ret, pathname.string().c_str());
         return false;
     }
     return true;

source/ps/XML/Xeromyces.cpp

@@ -38 +38 @@
     if (message.length() > 0 && message[message.length()-1] == '\n')
         message.erase(message.length()-1);
 
-    LOGERROR(L"CXeromyces: Parse %ls: %hs:%d: %hs",
+    LOGERROR("CXeromyces: Parse %ls: %hs:%d: %hs",
         error->level == XML_ERR_WARNING ? L"warning" : L"error",
         error->file, error->line, message.c_str());
     // TODO: The (non-fatal) warnings and errors don't get stored in the XMB,
@@ -89 +89 @@
 
         // No source file or archive cache was found, so we can't load the
         // XML file at all
-        LOGERROR(L"CCacheLoader failed to find archived or source file for: \"%ls\"", filename.string().c_str());
+        LOGERROR("CCacheLoader failed to find archived or source file for: \"%ls\"", filename.string().c_str());
         return PSRETURN_Xeromyces_XMLOpenFailed;
     }
 
@@ -111 +111 @@
     CVFSFile input;
     if (input.Load(vfs, filename))
     {
-        LOGERROR(L"CXeromyces: Failed to open XML file %ls", filename.string().c_str());
+        LOGERROR("CXeromyces: Failed to open XML file %ls", filename.string().c_str());
         return PSRETURN_Xeromyces_XMLOpenFailed;
     }
 
@@ -120 +120 @@
         filename8.c_str(), NULL, XML_PARSE_NONET|XML_PARSE_NOCDATA);
     if (! doc)
     {
-        LOGERROR(L"CXeromyces: Failed to parse XML file %ls", filename.string().c_str());
+        LOGERROR("CXeromyces: Failed to parse XML file %ls", filename.string().c_str());
         return PSRETURN_Xeromyces_XMLParseError;
     }
 
@@ -167 +167 @@
     xmlDocPtr doc = xmlReadMemory(xml, (int)strlen(xml), "", NULL, XML_PARSE_NONET|XML_PARSE_NOCDATA);
     if (! doc)
     {
-        LOGERROR(L"CXeromyces: Failed to parse XML string");
+        LOGERROR("CXeromyces: Failed to parse XML string");
         return PSRETURN_Xeromyces_XMLParseError;
     }
 

source/ps/scripting/JSInterface_ConfigDB.cpp

@@ -35 +35 @@
         cfgNs = CFG_MOD;
     else
     {
-        LOGERROR(L"Invalid namespace name passed to the ConfigDB!");
+        LOGERROR("Invalid namespace name passed to the ConfigDB!");
         cfgNs = CFG_DEFAULT;
         return false;       
     }

source/ps/scripting/JSInterface_Console.cpp

@@ -26 +26 @@
 {   
     if (!g_Console)
     {
-        LOGERROR(L"Trying to access the console when it's not initialized!");
+        LOGERROR("Trying to access the console when it's not initialized!");
         return false;
     }
     return true;

source/ps/scripting/JSInterface_VFS.cpp

@@ -36 +36 @@
     }\
     /* unknown failure. We output an error message. */\
     else if (err < 0)\
-        LOGERROR(L"Unknown failure in VFS %i", err );
+        LOGERROR("Unknown failure in VFS %i", err );
     /* else: success */
 
 

source/renderer/DecalRData.cpp

@@ -84 +84 @@
         
         if (material.GetShaderEffect().length() == 0)
         {
-            LOGERROR(L"Terrain renderer failed to load shader effect.\n");
+            LOGERROR("Terrain renderer failed to load shader effect.\n");
             continue;
         }
         
@@ -98 +98 @@
             
             if (!techBase)
             {
-                LOGERROR(L"Terrain renderer failed to load shader effect (%hs)\n",          
+                LOGERROR("Terrain renderer failed to load shader effect (%hs)\n",           
                         material.GetShaderEffect().string().c_str());
                 continue;
             }

source/renderer/ModelRenderer.cpp

@@ -98 +98 @@
         // some broken situations
         if (numVertices && vertices[0].m_Blend.m_Bone[0] == 0xff)
         {
-            LOGERROR(L"Model %ls is boned with unboned animation", mdef->GetName().string().c_str());
+            LOGERROR("Model %ls is boned with unboned animation", mdef->GetName().string().c_str());
             return;
         }
 

source/renderer/PatchRData.cpp

@@ -766 +766 @@
         {
             if (itt->first->GetMaterial().GetShaderEffect().length() == 0)
             {
-                LOGERROR(L"Terrain renderer failed to load shader effect.\n");
+                LOGERROR("Terrain renderer failed to load shader effect.\n");
                 continue;
             }
                         

source/renderer/PostprocManager.cpp

@@ -159 +159 @@
     GLenum status = pglCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT);
     if (status != GL_FRAMEBUFFER_COMPLETE_EXT)
     {
-        LOGWARNING(L"Framebuffer object incomplete (A): 0x%04X", status);
+        LOGWARNING("Framebuffer object incomplete (A): 0x%04X", status);
     }
     
     pglGenFramebuffersEXT(1, &m_PongFbo);
@@ -174 +174 @@
     status = pglCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT);
     if (status != GL_FRAMEBUFFER_COMPLETE_EXT)
     {
-        LOGWARNING(L"Framebuffer object incomplete (B): 0x%04X", status);
+        LOGWARNING("Framebuffer object incomplete (B): 0x%04X", status);
     }
     
     pglGenFramebuffersEXT(1, &m_BloomFbo);
@@ -187 +187 @@
     status = pglCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT);
     if (status != GL_FRAMEBUFFER_COMPLETE_EXT)
     {
-        LOGWARNING(L"Framebuffer object incomplete (B): 0x%04X", status);
+        LOGWARNING("Framebuffer object incomplete (B): 0x%04X", status);
     }
     */
 
@@ -519 +519 @@
     
     VfsPaths pathnames;
     if(vfs::GetPathnames(g_VFS, path, 0, pathnames) < 0)
-        LOGERROR(L"Error finding Post effects in '%ls'", path.string().c_str());
+        LOGERROR("Error finding Post effects in '%ls'", path.string().c_str());
 
     for(size_t i = 0; i < pathnames.size(); i++)
     {

source/renderer/Renderer.cpp

@@ -636 +636 @@
 
     GLint bits;
     glGetIntegerv(GL_DEPTH_BITS,&bits);
-    LOGMESSAGE(L"CRenderer::Open: depth bits %d",bits);
+    LOGMESSAGE("CRenderer::Open: depth bits %d",bits);
     glGetIntegerv(GL_STENCIL_BITS,&bits);
-    LOGMESSAGE(L"CRenderer::Open: stencil bits %d",bits);
+    LOGMESSAGE("CRenderer::Open: stencil bits %d",bits);
     glGetIntegerv(GL_ALPHA_BITS,&bits);
-    LOGMESSAGE(L"CRenderer::Open: alpha bits %d",bits);
+    LOGMESSAGE("CRenderer::Open: alpha bits %d",bits);
 
     // Validate the currently selected render path
     SetRenderPath(m_Options.m_RenderPath);
@@ -808 +808 @@
     {
         if (!(m_Caps.m_ARBProgram || (m_Caps.m_VertexShader && m_Caps.m_FragmentShader && m_Options.m_PreferGLSL)))
         {
-            LOGWARNING(L"Falling back to fixed function\n");
+            LOGWARNING("Falling back to fixed function\n");
             rp = RP_FIXED;
         }
     }
@@ -843 +843 @@
     if (name == "default")
         return RP_DEFAULT;
 
-    LOGWARNING(L"Unknown render path name '%hs', assuming 'default'", name.c_str());
+    LOGWARNING("Unknown render path name '%hs', assuming 'default'", name.c_str());
     return RP_DEFAULT;
 }
 
@@ -1629 +1629 @@
         int err = glGetError();
         if (err)
         {
-            ONCE(LOGERROR(L"CRenderer::EndFrame: GL errors %i occurred", err));
+            ONCE(LOGERROR("CRenderer::EndFrame: GL errors %i occurred", err));
         }
     }
 }

source/renderer/ShadowMap.cpp

@@ -406 +406 @@
     default: formatname = "DEPTH_COMPONENT"; break;
     }
 
-    LOGMESSAGE(L"Creating shadow texture (size %dx%d) (format = %hs)",
+    LOGMESSAGE("Creating shadow texture (size %dx%d) (format = %hs)",
         Width, Height, formatname);
 
 
@@ -494 +494 @@
 
     if (status != GL_FRAMEBUFFER_COMPLETE_EXT)
     {
-        LOGWARNING(L"Framebuffer object incomplete: 0x%04X", status);
+        LOGWARNING("Framebuffer object incomplete: 0x%04X", status);
 
         // Disable shadow rendering (but let the user try again if they want)
         g_Renderer.m_Options.m_Shadows = false;

source/renderer/SkyManager.cpp

@@ -126 +126 @@
             if (g_VFS->LoadFile(path2, file, fileSize) < 0)
             {
                 glDeleteTextures(1, &m_SkyCubeMap);
-                LOGERROR(L"Error creating sky cubemap.");
+                LOGERROR("Error creating sky cubemap.");
                 return;
             }
         }
@@ -207 +207 @@
     DirectoryNames subdirectories;
     if(g_VFS->GetDirectoryEntries(path, 0, &subdirectories) < 0)
     {
-        LOGERROR(L"Error opening directory '%ls'", path.string().c_str());
+        LOGERROR("Error opening directory '%ls'", path.string().c_str());
         return std::vector<CStrW>(1, GetSkySet()); // just return what we currently have
     }
 

source/renderer/TerrainRenderer.cpp

@@ -653 +653 @@
         
         if (!m->fancyWaterShader)
         {
-            LOGERROR(L"Failed to load water shader. Falling back to fixed pipeline water.\n");
+            LOGERROR("Failed to load water shader. Falling back to fixed pipeline water.\n");
             WaterMgr->m_RenderWater = false;
             return false;
         }

source/renderer/VertexBufferManager.cpp

@@ -87 +87 @@
     
     if (!result)
     {
-        LOGERROR(L"Failed to create VBOs (%lu*%lu)", (unsigned long)vertexSize, (unsigned long)numVertices);
+        LOGERROR("Failed to create VBOs (%lu*%lu)", (unsigned long)vertexSize, (unsigned long)numVertices);
     }
 
     return result;

source/renderer/WaterManager.cpp

@@ -326 +326 @@
     GLenum status = pglCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT);
     if (status != GL_FRAMEBUFFER_COMPLETE_EXT)
     {
-        LOGWARNING(L"Reflection framebuffer object incomplete: 0x%04X", status);
+        LOGWARNING("Reflection framebuffer object incomplete: 0x%04X", status);
         g_Renderer.m_Options.m_WaterReflection = false;
     }
 
@@ -341 +341 @@
     status = pglCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT);
     if (status != GL_FRAMEBUFFER_COMPLETE_EXT)
     {
-        LOGWARNING(L"Refraction framebuffer object incomplete: 0x%04X", status);
+        LOGWARNING("Refraction framebuffer object incomplete: 0x%04X", status);
         g_Renderer.m_Options.m_WaterRefraction = false;
     }
     
@@ -356 +356 @@
     status = pglCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT);
     if (status != GL_FRAMEBUFFER_COMPLETE_EXT)
     {
-        LOGWARNING(L"Fancy Effects framebuffer object incomplete: 0x%04X", status);
+        LOGWARNING("Fancy Effects framebuffer object incomplete: 0x%04X", status);
         g_Renderer.m_Options.m_WaterRefraction = false;
     }
     

source/scriptinterface/DebuggingServer.cpp

@@ -94 +94 @@
     m_SettingBreakOnException = true;
 
     EnableHTTP();
-    LOGWARNING(L"Javascript debugging webserver enabled.");
+    LOGWARNING("Javascript debugging webserver enabled.");
 }
 
 CDebuggingServer::~CDebuggingServer()
@@ -396 +396 @@
 
     case MG_EVENT_LOG:
         // Called by Mongoose's cry()
-        LOGERROR(L"Mongoose error: %hs", request_info->log_message);
+        LOGERROR("Mongoose error: %hs", request_info->log_message);
         return NULL;
 
     case MG_INIT_SSL:

source/scriptinterface/ScriptInterface.cpp

@@ -126 +126 @@
     }
 
     if (isWarning)
-        LOGWARNING(L"%hs", msg.str().c_str());
+        LOGWARNING("%hs", msg.str().c_str());
     else
-        LOGERROR(L"%hs", msg.str().c_str());
+        LOGERROR("%hs", msg.str().c_str());
 
     // When running under Valgrind, print more information in the error message
 //  VALGRIND_PRINTF_BACKTRACE("->");
@@ -163 +163 @@
     std::wstring str;
     if (!ScriptInterface::FromJSVal(cx, args.handleAt(0), str))
         return JS_FALSE;
-    LOGMESSAGE(L"%ls", str.c_str());
+    LOGMESSAGE("%ls", str.c_str());
     args.rval().setUndefined();
     return JS_TRUE;
 }
@@ -180 +180 @@
     std::wstring str;
     if (!ScriptInterface::FromJSVal(cx, args.handleAt(0), str))
         return JS_FALSE;
-    LOGWARNING(L"%ls", str.c_str());
+    LOGWARNING("%ls", str.c_str());
     args.rval().setUndefined();
     return JS_TRUE;
 }
@@ -197 +197 @@
     std::wstring str;
     if (!ScriptInterface::FromJSVal(cx, args.handleAt(0), str))
         return JS_FALSE;
-    LOGERROR(L"%ls", str.c_str());
+    LOGERROR("%ls", str.c_str());
     args.rval().setUndefined();
     return JS_TRUE;
 }
@@ -420 +420 @@
     if (g_JSDebuggerEnabled && g_DebuggingServer != NULL)
     {
         if(!JS_SetDebugMode(GetContext(), true))
-            LOGERROR(L"Failed to set Spidermonkey to debug mode!");
+            LOGERROR("Failed to set Spidermonkey to debug mode!");
         else
             g_DebuggingServer->RegisterScriptinterface(debugName, this);
     } */
@@ -478 +478 @@
     {
         if (!LoadGlobalScriptFile(*it))
         {
-            LOGERROR(L"LoadGlobalScripts: Failed to load script %ls", it->string().c_str());
+            LOGERROR("LoadGlobalScripts: Failed to load script %ls", it->string().c_str());
             return false;
         }
     }
@@ -507 +507 @@
         }
     }
 
-    LOGERROR(L"ReplaceNondeterministicRNG: failed to replace Math.random");
+    LOGERROR("ReplaceNondeterministicRNG: failed to replace Math.random");
     return false;
 }
 
@@ -543 +543 @@
     JSAutoRequest rq(m->m_cx);
     if (!ctor.isObject())
     {
-        LOGERROR(L"CallConstructor: ctor is not an object");
+        LOGERROR("CallConstructor: ctor is not an object");
         out.setNull();
         return;
     }
@@ -750 +750 @@
     
     if (!objVal.isObjectOrNull())
     {
-        LOGERROR(L"EnumeratePropertyNamesWithPrefix expected object type!");
+        LOGERROR("EnumeratePropertyNamesWithPrefix expected object type!");
         return false;
     }
         
@@ -866 +866 @@
     JSAutoRequest rq(m->m_cx);
     if (!VfsFileExists(path))
     {
-        LOGERROR(L"File '%ls' does not exist", path.string().c_str());
+        LOGERROR("File '%ls' does not exist", path.string().c_str());
         return false;
     }
 
@@ -876 +876 @@
 
     if (ret != PSRETURN_OK)
     {
-        LOGERROR(L"Failed to load file '%ls': %hs", path.string().c_str(), GetErrorString(ret));
+        LOGERROR("Failed to load file '%ls': %hs", path.string().c_str(), GetErrorString(ret));
         return false;
     }
 
@@ -926 +926 @@
     if (JS_ParseJSON(m->m_cx, reinterpret_cast<const jschar*>(string.c_str()), (u32)string.size(), out))
         return true;
 
-    LOGERROR(L"JS_ParseJSON failed!");
+    LOGERROR("JS_ParseJSON failed!");
     if (!JS_IsExceptionPending(m->m_cx))
         return false;
 
@@ -946 +946 @@
 
     std::wstring error;
     ScriptInterface::FromJSVal(m->m_cx, rval, error);
-    LOGERROR(L"%ls", error.c_str());
+    LOGERROR("%ls", error.c_str());
     return false;
 }
 
@@ -954 +954 @@
 {
     if (!VfsFileExists(path))
     {
-        LOGERROR(L"File '%ls' does not exist", path.string().c_str());
+        LOGERROR("File '%ls' does not exist", path.string().c_str());
         return;
     }
 
@@ -964 +964 @@
 
     if (ret != PSRETURN_OK)
     {
-        LOGERROR(L"Failed to load file '%ls': %hs", path.string().c_str(), GetErrorString(ret));
+        LOGERROR("Failed to load file '%ls': %hs", path.string().c_str(), GetErrorString(ret));
         return;
     }
 
     std::string content(file.DecodeUTF8()); // assume it's UTF-8
 
     if (!ParseJSON(content, out))
-        LOGERROR(L"Failed to parse '%ls'", path.string().c_str());
+        LOGERROR("Failed to parse '%ls'", path.string().c_str());
 }
 
 struct Stringifier
@@ -1011 +1011 @@
     if (!JS_Stringify(m->m_cx, obj.address(), NULL, indentVal, &Stringifier::callback, &str))
     {
         JS_ClearPendingException(m->m_cx);
-        LOGERROR(L"StringifyJSON failed");
+        LOGERROR("StringifyJSON failed");
         return std::string();
     }
 

source/scriptinterface/ThreadDebugger.cpp

@@ -493 +493 @@
             *m->m_pLastBreakFrame = JS_FrameIterator(m->m_pScriptInterface->GetContext(), &iter);
             
             if (!JS_SetSingleStepMode(cx, script, true))
-                LOGERROR(L"JS_SetSingleStepMode returned false!"); // TODO: When can this happen?
+                LOGERROR("JS_SetSingleStepMode returned false!"); // TODO: When can this happen?
             else
             {
                 if (nextDbgCmd == DBG_CMD_SINGLESTEP)
@@ -516 +516 @@
         else if (nextDbgCmd == DBG_CMD_CONTINUE)
         {
             if (!JS_SetSingleStepMode(cx, script, true))
-                LOGERROR(L"JS_SetSingleStepMode returned false!"); // TODO: When can this happen?
+                LOGERROR("JS_SetSingleStepMode returned false!"); // TODO: When can this happen?
             else
             {
                 // Setup a handler to check for break-requests from the DebuggingServer regularly
@@ -846 +846 @@
     JSObject* replacer = JS_GetFunctionObject(fun);
     if (!JS_Stringify(m->m_pScriptInterface->GetContext(), &obj, replacer, indent ? INT_TO_JSVAL(2) : JSVAL_VOID, &CyclicRefWorkaround::Stringifier::callback, &str))
     {
-        LOGERROR(L"StringifyJSON failed");
+        LOGERROR("StringifyJSON failed");
         jsval exec;
         jsval execString;
         if (JS_GetPendingException(m->m_pScriptInterface->GetContext(), &exec))
@@ -858 +858 @@
                 if (JSVAL_IS_STRING(execString))
                 {
                     std::string strExec = JS_EncodeString(m->m_pScriptInterface->GetContext(), JSVAL_TO_STRING(execString));
-                    LOGERROR(L"Error: %hs", strExec.c_str());
+                    LOGERROR("Error: %hs", strExec.c_str());
                 }
             }
             

source/simulation2/Simulation2.cpp

@@ -187 +187 @@
         VfsPath filename = *it;
         if (loadedScripts)
             loadedScripts->insert(filename);
-        LOGMESSAGE(L"Loading simulation script '%ls'", filename.string().c_str());
+        LOGMESSAGE("Loading simulation script '%ls'", filename.string().c_str());
         if (!componentManager.LoadScript(filename))
             ok = false;
     }
@@ -204 +204 @@
         for (u32 i = 0; i < scriptNames.size(); ++i)
         {
             std::string scriptName = "maps/" + scriptNames[i];
-            LOGMESSAGE(L"Loading trigger script '%hs'", scriptName.c_str());
+            LOGMESSAGE("Loading trigger script '%hs'", scriptName.c_str());
             if (!componentManager.LoadScript(scriptName.data()))
                 ok = false;
         }
@@ -224 +224 @@
     if (!VfsFileExists(path))
         return INFO::OK;
 
-    LOGMESSAGE(L"Reloading simulation script '%ls'", path.string().c_str());
+    LOGMESSAGE("Reloading simulation script '%ls'", path.string().c_str());
     if (!m_ComponentManager.LoadScript(path, true))
         return ERR::FAIL;
 
@@ -828 +828 @@
     {
         // Some error reading directory
         wchar_t error[200];
-        LOGERROR(L"Error reading directory '%ls': %ls", path.string().c_str(), StatusDescription(ret, error, ARRAY_SIZE(error)));
+        LOGERROR("Error reading directory '%ls': %ls", path.string().c_str(), StatusDescription(ret, error, ARRAY_SIZE(error)));
         return std::vector<std::string>();
     }
 
@@ -840 +840 @@
         PSRETURN ret = file.Load(g_VFS, *it);
         if (ret != PSRETURN_OK)
         {
-            LOGERROR(L"GetJSONData: Failed to load file '%ls': %hs", path.string().c_str(), GetErrorString(ret));
+            LOGERROR("GetJSONData: Failed to load file '%ls': %hs", path.string().c_str(), GetErrorString(ret));
             continue;
         }
 
@@ -864 +864 @@
 {
     if (!VfsFileExists(path))
     {
-        LOGERROR(L"File '%ls' does not exist", path.string().c_str());
+        LOGERROR("File '%ls' does not exist", path.string().c_str());
         return std::string();
     }
 
@@ -873 +873 @@
     PSRETURN ret = file.Load(g_VFS, path);
     if (ret != PSRETURN_OK)
     {
-        LOGERROR(L"Failed to load file '%ls': %hs", path.string().c_str(), GetErrorString(ret));
+        LOGERROR("Failed to load file '%ls': %hs", path.string().c_str(), GetErrorString(ret));
         return std::string();
     }
 

source/simulation2/components/CCmpAIManager.cpp

@@ -104 +104 @@
             m_Worker.LoadMetadata(path, &metadata);
             if (metadata.isUndefined())
             {
-                LOGERROR(L"Failed to create AI player: can't find %ls", path.string().c_str());
+                LOGERROR("Failed to create AI player: can't find %ls", path.string().c_str());
                 return false;
             }
 
@@ -116 +116 @@
             JS::RootedValue ctor(cx);
             if (!m_ScriptInterface->HasProperty(metadata, "moduleName"))
             {
-                LOGERROR(L"Failed to create AI player: %ls: missing 'moduleName'", path.string().c_str());
+                LOGERROR("Failed to create AI player: %ls: missing 'moduleName'", path.string().c_str());
                 return false;
             }
 
@@ -124 +124 @@
             if (!m_ScriptInterface->GetProperty(global, moduleName.c_str(), &objectWithConstructor)
                 || objectWithConstructor.isUndefined())
             {
-                LOGERROR(L"Failed to create AI player: %ls: can't find the module that should contain the constructor: '%hs'", path.string().c_str(), moduleName.c_str());
+                LOGERROR("Failed to create AI player: %ls: can't find the module that should contain the constructor: '%hs'", path.string().c_str(), moduleName.c_str());
                 return false;
             }
 
             if (!m_ScriptInterface->GetProperty(metadata, "constructor", constructor))
             {
-                LOGERROR(L"Failed to create AI player: %ls: missing 'constructor'", path.string().c_str());
+                LOGERROR("Failed to create AI player: %ls: missing 'constructor'", path.string().c_str());
                 return false;
             }
 
@@ -138 +138 @@
             if (!m_ScriptInterface->GetProperty(objectWithConstructor, constructor.c_str(), &ctor)
                 || ctor.isNull())
             {
-                LOGERROR(L"Failed to create AI player: %ls: can't find constructor '%hs'", path.string().c_str(), constructor.c_str());
+                LOGERROR("Failed to create AI player: %ls: can't find constructor '%hs'", path.string().c_str(), constructor.c_str());
                 return false;
             }
 
@@ -160 +160 @@
 
             if (obj.isNull())
             {
-                LOGERROR(L"Failed to create AI player: %ls: error calling constructor '%hs'", path.string().c_str(), constructor.c_str());
+                LOGERROR("Failed to create AI player: %ls: error calling constructor '%hs'", path.string().c_str(), constructor.c_str());
                 return false;
             }
 
@@ -261 +261 @@
         VfsPaths pathnames;
         if (vfs::GetPathnames(g_VFS, L"simulation/ai/" + moduleName + L"/", L"*.js", pathnames) < 0)
         {
-            LOGERROR(L"Failed to load AI scripts for module %ls", moduleName.c_str());
+            LOGERROR("Failed to load AI scripts for module %ls", moduleName.c_str());
             return false;
         }
 
@@ -269 +269 @@
         {
             if (!m_ScriptInterface->LoadGlobalScriptFile(*it))
             {
-                LOGERROR(L"Failed to load script %ls", it->string().c_str());
+                LOGERROR("Failed to load script %ls", it->string().c_str());
                 return false;
             }
         }
@@ -308 +308 @@
             }
         }
         
-        LOGERROR(L"Invalid playerid in PostCommand!");  
+        LOGERROR("Invalid playerid in PostCommand!");   
     }
     // The next two ought to be implmeneted someday but for now as it returns "null" it can't
     static void DumpHeap(ScriptInterface::CxPrivate* pCxPrivate)
@@ -391 +391 @@
         JS::RootedValue ctor(cx);
         if (!m_ScriptInterface->GetProperty(global, "API3", &AIModule) || AIModule.isUndefined())
         {
-            LOGERROR(L"Failed to create shared AI component: %ls: can't find module '%hs'", path.string().c_str(), "API3");
+            LOGERROR("Failed to create shared AI component: %ls: can't find module '%hs'", path.string().c_str(), "API3");
             return false;
         }
         
         if (!m_ScriptInterface->GetProperty(AIModule, "SharedScript", &ctor)
             || ctor.isUndefined())
         {
-            LOGERROR(L"Failed to create shared AI component: %ls: can't find constructor '%hs'", path.string().c_str(), "SharedScript");
+            LOGERROR("Failed to create shared AI component: %ls: can't find constructor '%hs'", path.string().c_str(), "SharedScript");
             return false;
         }
         
@@ -440 +440 @@
         
         if (tmpSharedAIObj.isNull())
         {
-            LOGERROR(L"Failed to create shared AI component: %ls: error calling constructor '%hs'", path.string().c_str(), "SharedScript");
+            LOGERROR("Failed to create shared AI component: %ls: error calling constructor '%hs'", path.string().c_str(), "SharedScript");
             return false;
         }
         
@@ -617 +617 @@
             JS::RootedValue sharedData(cx);
             JS::RootedValue tmpSharedAIObj(cx, m_SharedAIObj.get()); // TODO: Check if this temporary root can be removed after SpiderMonkey 31 upgrade
             if (!m_ScriptInterface->CallFunction(tmpSharedAIObj, "Serialize", &sharedData))
-                LOGERROR(L"AI shared script Serialize call failed");
+                LOGERROR("AI shared script Serialize call failed");
             serializer.ScriptVal("sharedData", &sharedData);
         }
         for (size_t i = 0; i < m_Players.size(); ++i)
@@ -640 +640 @@
             {
                 JS::RootedValue scriptData(cx);
                 if (!m_ScriptInterface->CallFunction(tmpPlayerObj, "Serialize", &scriptData))
-                    LOGERROR(L"AI script Serialize call failed");
+                    LOGERROR("AI script Serialize call failed");
                 serializer.ScriptVal("data", &scriptData);
             }
             else
@@ -681 +681 @@
             JS::RootedValue tmpSharedAIObj(cx, m_SharedAIObj.get()); // TODO: Check if this temporary root can be removed after SpiderMonkey 31
             deserializer.ScriptVal("sharedData", &sharedData);
             if (!m_ScriptInterface->CallFunctionVoid(tmpSharedAIObj, "Deserialize", sharedData))
-                LOGERROR(L"AI shared script Deserialize call failed");
+                LOGERROR("AI shared script Deserialize call failed");
         }
 
         for (size_t i = 0; i < numAis; ++i)
@@ -720 +720 @@
                 if (m_Players[i]->m_UseSharedComponent)
                 {
                     if (!m_ScriptInterface->CallFunctionVoid(tmpPlayerObj, "Deserialize", scriptData, m_SharedAIObj))
-                        LOGERROR(L"AI script Deserialize call failed");
+                        LOGERROR("AI script Deserialize call failed");
                 }
                 else if (!m_ScriptInterface->CallFunctionVoid(tmpPlayerObj, "Deserialize", scriptData))
                 {
-                    LOGERROR(L"AI script deserialize() call failed");
+                    LOGERROR("AI script deserialize() call failed");
                 }
             }
             else
@@ -748 +748 @@
         std::pair<std::map<JSObject*, std::wstring>::iterator, bool> ret1 = m_SerializablePrototypes.insert(std::make_pair(obj, name));
         std::pair<std::map<std::wstring, JSObject*>::iterator, bool> ret2 = m_DeserializablePrototypes.insert(std::make_pair(name, obj));
         if (!ret1.second || !ret2.second)
-            LOGERROR(L"RegisterSerializablePrototype called with same prototype multiple times: p=%p n='%ls'", obj, name.c_str());
+            LOGERROR("RegisterSerializablePrototype called with same prototype multiple times: p=%p n='%ls'", obj, name.c_str());
     }
 
 private:

source/simulation2/components/CCmpCommandQueue.cpp

@@ -119 +119 @@
         {
             bool ok = scriptInterface.CallFunctionVoid(global, "ProcessCommand", localCommands[i].player, localCommands[i].data);
             if (!ok)
-                LOGERROR(L"Failed to call ProcessCommand() global script function");
+                LOGERROR("Failed to call ProcessCommand() global script function");
         }
 
         for (size_t i = 0; i < commands.size(); ++i)
         {
             bool ok = scriptInterface.CallFunctionVoid(global, "ProcessCommand", commands[i].player, commands[i].data);
             if (!ok)
-                LOGERROR(L"Failed to call ProcessCommand() global script function");
+                LOGERROR("Failed to call ProcessCommand() global script function");
         }
     }
 };

source/simulation2/components/CCmpObstruction.cpp

@@ -515 +515 @@
         // required precondition to use SkipControlGroupsRequireFlagObstructionFilter
         if (m_ControlGroup == INVALID_ENTITY)
         {
-            LOGERROR(L"[CmpObstruction] Cannot test for foundation obstructions; primary control group must be valid");
+            LOGERROR("[CmpObstruction] Cannot test for foundation obstructions; primary control group must be valid");
             return FOUNDATION_CHECK_FAIL_ERROR;
         }
 
@@ -552 +552 @@
         // required precondition to use SkipControlGroupsRequireFlagObstructionFilter
         if (m_ControlGroup == INVALID_ENTITY)
         {
-            LOGERROR(L"[CmpObstruction] Cannot test for foundation obstructions; primary control group must be valid");
+            LOGERROR("[CmpObstruction] Cannot test for foundation obstructions; primary control group must be valid");
             return false;
         }
 
@@ -586 +586 @@
         // required precondition to use SkipControlGroupsRequireFlagObstructionFilter
         if (m_ControlGroup == INVALID_ENTITY)
         {
-            LOGERROR(L"[CmpObstruction] Cannot test for unit or structure obstructions; primary control group must be valid");
+            LOGERROR("[CmpObstruction] Cannot test for unit or structure obstructions; primary control group must be valid");
             return ret;
         }
 

source/simulation2/components/CCmpPathfinder.cpp

@@ -254 +254 @@
 {
     if (m_PassClassMasks.find(name) == m_PassClassMasks.end())
     {
-        LOGERROR(L"Invalid passability class name '%hs'", name.c_str());
+        LOGERROR("Invalid passability class name '%hs'", name.c_str());
         return 0;
     }
 
@@ -270 +270 @@
 {
     if (m_UnitCostClassTags.find(name) == m_UnitCostClassTags.end())
     {
-        LOGERROR(L"Invalid unit cost class name '%hs'", name.c_str());
+        LOGERROR("Invalid unit cost class name '%hs'", name.c_str());
         return m_UnitCostClassTags["default"];
     }
 

source/simulation2/components/CCmpPosition.cpp

@@ -271 +271 @@
         CmpPtr<ICmpPosition> cmpPosition(GetSimContext(), m_TurretParent);
         if (!cmpPosition)
         {
-            LOGERROR(L"Turret with parent without position component");
+            LOGERROR("Turret with parent without position component");
             return;
         }
         if (!cmpPosition->IsInWorld())
@@ -482 +482 @@
     {
         if (!m_InWorld)
         {
-            LOGERROR(L"CCmpPosition::GetPosition called on entity when IsInWorld is false");
+            LOGERROR("CCmpPosition::GetPosition called on entity when IsInWorld is false");
             return CFixedVector3D();
         }
 
@@ -493 +493 @@
     {
         if (!m_InWorld)
         {
-            LOGERROR(L"CCmpPosition::GetPosition2D called on entity when IsInWorld is false");
+            LOGERROR("CCmpPosition::GetPosition2D called on entity when IsInWorld is false");
             return CFixedVector2D();
         }
 
@@ -504 +504 @@
     { 
         if (!m_InWorld) 
         { 
-            LOGERROR(L"CCmpPosition::GetPreviousPosition called on entity when IsInWorld is false"); 
+            LOGERROR("CCmpPosition::GetPreviousPosition called on entity when IsInWorld is false"); 
             return CFixedVector3D(); 
         } 
 
@@ -515 +515 @@
     { 
         if (!m_InWorld) 
         { 
-            LOGERROR(L"CCmpPosition::GetPreviousPosition2D called on entity when IsInWorld is false"); 
+            LOGERROR("CCmpPosition::GetPreviousPosition2D called on entity when IsInWorld is false"); 
             return CFixedVector2D(); 
         } 
 
@@ -589 +589 @@
     {
         if (!m_InWorld)
         {
-            LOGERROR(L"CCmpPosition::GetDistanceTravelled called on entity when IsInWorld is false");
+            LOGERROR("CCmpPosition::GetDistanceTravelled called on entity when IsInWorld is false");
             return fixed::Zero();
         }
 
@@ -630 +630 @@
     {
         if (!m_InWorld)
         {
-            LOGERROR(L"CCmpPosition::GetInterpolatedPosition2D called on entity when IsInWorld is false");
+            LOGERROR("CCmpPosition::GetInterpolatedPosition2D called on entity when IsInWorld is false");
             return;
         }
 
@@ -647 +647 @@
             CmpPtr<ICmpPosition> cmpPosition(GetSimContext(), m_TurretParent);
             if (!cmpPosition)
             {
-                LOGERROR(L"Turret with parent without position component");
+                LOGERROR("Turret with parent without position component");
                 CMatrix3D m;
                 m.SetIdentity();
                 return m;
             }
             if (!cmpPosition->IsInWorld())
             {
-                LOGERROR(L"CCmpPosition::GetInterpolatedTransform called on turret entity when IsInWorld is false");
+                LOGERROR("CCmpPosition::GetInterpolatedTransform called on turret entity when IsInWorld is false");
                 CMatrix3D m;
                 m.SetIdentity();
                 return m;
@@ -670 +670 @@
         }
         if (!m_InWorld)
         {
-            LOGERROR(L"CCmpPosition::GetInterpolatedTransform called on entity when IsInWorld is false");
+            LOGERROR("CCmpPosition::GetInterpolatedTransform called on entity when IsInWorld is false");
             CMatrix3D m;
             m.SetIdentity();
             return m;
@@ -925 +925 @@
     {
         if (!m_InWorld)
         {
-            LOGERROR(L"CCmpPosition::UpdateXZRotation called on entity when IsInWorld is false");
+            LOGERROR("CCmpPosition::UpdateXZRotation called on entity when IsInWorld is false");
             return;
         }
 
@@ -940 +940 @@
         CmpPtr<ICmpTerrain> cmpTerrain(GetSystemEntity());
         if (!cmpTerrain || !cmpTerrain->IsLoaded())
         {
-            LOGERROR(L"Terrain not loaded");
+            LOGERROR("Terrain not loaded");
             return;
         }
 

source/simulation2/components/CCmpProjectileManager.cpp

@@ -175 +175 @@
     {
         // If the actor was actually loaded, complain that it doesn't have a projectile
         if (!cmpSourceVisual->GetActorShortName().empty())
-            LOGERROR(L"Unit with actor '%ls' launched a projectile but has no actor on 'projectile' attachpoint", cmpSourceVisual->GetActorShortName().c_str());
+            LOGERROR("Unit with actor '%ls' launched a projectile but has no actor on 'projectile' attachpoint", cmpSourceVisual->GetActorShortName().c_str());
         return 0;
     }
 

source/simulation2/components/CCmpRallyPointRenderer.cpp

@@ -521 +521 @@
 
         // the marker entity should be valid at this point, otherwise something went wrong trying to allocate it
         if (m_MarkerEntityIds[i] == INVALID_ENTITY)
-            LOGERROR(L"Failed to create rally point marker entity");
+            LOGERROR("Failed to create rally point marker entity");
 
         CmpPtr<ICmpPosition> markerCmpPosition(GetSimContext(), m_MarkerEntityIds[i]);
         if (markerCmpPosition)

source/simulation2/components/CCmpRangeManager.cpp

@@ -738 +738 @@
     {
         if (m_Queries.find(tag) == m_Queries.end())
         {
-            LOGERROR(L"CCmpRangeManager: DestroyActiveQuery called with invalid tag %u", tag);
+            LOGERROR("CCmpRangeManager: DestroyActiveQuery called with invalid tag %u", tag);
             return;
         }
 
@@ -750 +750 @@
         std::map<tag_t, Query>::iterator it = m_Queries.find(tag);
         if (it == m_Queries.end())
         {
-            LOGERROR(L"CCmpRangeManager: EnableActiveQuery called with invalid tag %u", tag);
+            LOGERROR("CCmpRangeManager: EnableActiveQuery called with invalid tag %u", tag);
             return;
         }
 
@@ -763 +763 @@
         std::map<tag_t, Query>::iterator it = m_Queries.find(tag);
         if (it == m_Queries.end())
         {
-            LOGERROR(L"CCmpRangeManager: DisableActiveQuery called with invalid tag %u", tag);
+            LOGERROR("CCmpRangeManager: DisableActiveQuery called with invalid tag %u", tag);
             return;
         }
 
@@ -820 +820 @@
         std::map<tag_t, Query>::iterator it = m_Queries.find(tag);
         if (it == m_Queries.end())
         {
-            LOGERROR(L"CCmpRangeManager: ResetActiveQuery called with invalid tag %u", tag);
+            LOGERROR("CCmpRangeManager: ResetActiveQuery called with invalid tag %u", tag);
             return r;
         }
 
@@ -1156 +1156 @@
     {
         // Min range must be non-negative
         if (minRange < entity_pos_t::Zero())
-            LOGWARNING(L"CCmpRangeManager: Invalid min range %f in query for entity %u", minRange.ToDouble(), source);
+            LOGWARNING("CCmpRangeManager: Invalid min range %f in query for entity %u", minRange.ToDouble(), source);
 
         // Max range must be non-negative, or else -1
         if (maxRange < entity_pos_t::Zero() && maxRange != entity_pos_t::FromInt(-1))
-            LOGWARNING(L"CCmpRangeManager: Invalid max range %f in query for entity %u", maxRange.ToDouble(), source);
+            LOGWARNING("CCmpRangeManager: Invalid max range %f in query for entity %u", maxRange.ToDouble(), source);
 
         Query q;
         q.enabled = false;
@@ -1337 +1337 @@
         if (identifier == "injured")
             return 2;
 
-        LOGWARNING(L"CCmpRangeManager: Invalid flag identifier %hs", identifier.c_str());
+        LOGWARNING("CCmpRangeManager: Invalid flag identifier %hs", identifier.c_str());
         return 0;
     }
 
@@ -1354 +1354 @@
         // We don't have a flag set
         if (flag == 0)
         {
-            LOGWARNING(L"CCmpRangeManager: Invalid flag identifier %hs for entity %u", identifier.c_str(), ent);
+            LOGWARNING("CCmpRangeManager: Invalid flag identifier %hs for entity %u", identifier.c_str(), ent);
             return;
         }
 

source/simulation2/components/CCmpTemplateManager.cpp

@@ -187 +187 @@
 
             // Show error on the first failure to validate the template
             if (!m_TemplateSchemaValidity[templateName])
-                LOGERROR(L"Failed to validate entity template '%hs'", templateName.c_str());
+                LOGERROR("Failed to validate entity template '%hs'", templateName.c_str());
         }
         // Refuse to return invalid templates
         if (!m_TemplateSchemaValidity[templateName])
@@ -198 +198 @@
     if (!templateRoot.IsOk())
     {
         // The validator should never let this happen
-        LOGERROR(L"Invalid root element in entity template '%hs'", templateName.c_str());
+        LOGERROR("Invalid root element in entity template '%hs'", templateName.c_str());
         return NULL;
     }
 

source/simulation2/components/CCmpUnitMotion.cpp

@@ -814 +814 @@
     }
     else
     {
-        LOGWARNING(L"unexpected PathResult (%u %d %d)", GetEntityId(), m_State, m_PathState);
+        LOGWARNING("unexpected PathResult (%u %d %d)", GetEntityId(), m_State, m_PathState);
     }
 }
 

source/simulation2/components/CCmpVisualActor.cpp

@@ -655 +655 @@
             }
             else
             {
-                LOGERROR(L"[VisualActor] Cannot apply footprint-based SelectionShape; Footprint component not initialized.");
+                LOGERROR("[VisualActor] Cannot apply footprint-based SelectionShape; Footprint component not initialized.");
             }
         }
         else if (shapeNode.GetChild("Box").IsOk())
@@ -669 +669 @@
         }
         else if (shapeNode.GetChild("Cylinder").IsOk())
         {
-            LOGWARNING(L"[VisualActor] TODO: Cylinder selection shapes are not yet implemented; defaulting to recursive bounding boxes");
+            LOGWARNING("[VisualActor] TODO: Cylinder selection shapes are not yet implemented; defaulting to recursive bounding boxes");
         }
         else
         {
             // shouldn't happen by virtue of validation against schema
-            LOGERROR(L"[VisualActor] No selection shape specified");
+            LOGERROR("[VisualActor] No selection shape specified");
         }
     }
 

source/simulation2/components/ICmpVisibility.cpp

@@ -43 +43 @@
         case ICmpRangeManager::VIS_VISIBLE:
             return ICmpRangeManager::VIS_VISIBLE;
         default:
-            LOGERROR(L"Received the invalid visibility value %d from the Visibility scripted component!", visibility);
+            LOGERROR("Received the invalid visibility value %d from the Visibility scripted component!", visibility);
             return ICmpRangeManager::VIS_HIDDEN;
         }
     }

source/simulation2/scripting/EngineScriptConversions.cpp

@@ -55 +55 @@
     if (!val->NewJSObject(*ScriptInterface::GetScriptInterfaceAndCBData(cx)->pScriptInterface, &obj))
     {
         // Report as an error, since scripts really shouldn't try to use unscriptable interfaces
-        LOGERROR(L"IComponent does not have a scriptable interface");
+        LOGERROR("IComponent does not have a scriptable interface");
         ret.setUndefined();
         return;
     }

source/simulation2/scripting/MessageTypeConversions.cpp

@@ -119 +119 @@
 
 JS::Value CMessageRenderSubmit::ToJSVal(ScriptInterface& UNUSED(scriptInterface)) const
 {
-    LOGWARNING(L"CMessageRenderSubmit::ToJSVal not implemented");
+    LOGWARNING("CMessageRenderSubmit::ToJSVal not implemented");
     return JS::UndefinedValue();
 }
 
 CMessage* CMessageRenderSubmit::FromJSVal(ScriptInterface& UNUSED(scriptInterface), JS::HandleValue UNUSED(val))
 {
-    LOGWARNING(L"CMessageRenderSubmit::FromJSVal not implemented");
+    LOGWARNING("CMessageRenderSubmit::FromJSVal not implemented");
     return NULL;
 }
 
@@ -133 +133 @@
 
 JS::Value CMessageProgressiveLoad::ToJSVal(ScriptInterface& UNUSED(scriptInterface)) const
 {
-    LOGWARNING(L"CMessageProgressiveLoad::ToJSVal not implemented");
+    LOGWARNING("CMessageProgressiveLoad::ToJSVal not implemented");
     return JS::UndefinedValue();
 }
 
 CMessage* CMessageProgressiveLoad::FromJSVal(ScriptInterface& UNUSED(scriptInterface), JS::HandleValue UNUSED(val))
 {
-    LOGWARNING(L"CMessageProgressiveLoad::FromJSVal not implemented");
+    LOGWARNING("CMessageProgressiveLoad::FromJSVal not implemented");
     return NULL;
 }
 
@@ -147 +147 @@
 
 JS::Value CMessageDeserialized::ToJSVal(ScriptInterface& UNUSED(scriptInterface)) const
 {
-    LOGWARNING(L"CMessageDeserialized::ToJSVal not implemented");
+    LOGWARNING("CMessageDeserialized::ToJSVal not implemented");
     return JS::UndefinedValue();
 }
 
 CMessage* CMessageDeserialized::FromJSVal(ScriptInterface& UNUSED(scriptInterface), JS::HandleValue UNUSED(val))
 {
-    LOGWARNING(L"CMessageDeserialized::FromJSVal not implemented");
+    LOGWARNING("CMessageDeserialized::FromJSVal not implemented");
     return NULL;
 }
 
@@ -237 +237 @@
 
 JS::Value CMessageInterpolatedPositionChanged::ToJSVal(ScriptInterface& UNUSED(scriptInterface)) const
 {
-    LOGWARNING(L"CMessageInterpolatedPositionChanged::ToJSVal not implemented");
+    LOGWARNING("CMessageInterpolatedPositionChanged::ToJSVal not implemented");
     return JS::UndefinedValue();
 }
 
 CMessage* CMessageInterpolatedPositionChanged::FromJSVal(ScriptInterface& UNUSED(scriptInterface), JS::HandleValue UNUSED(val))
 {
-    LOGWARNING(L"CMessageInterpolatedPositionChanged::FromJSVal not implemented");
+    LOGWARNING("CMessageInterpolatedPositionChanged::FromJSVal not implemented");
     return NULL;
 }
 
@@ -379 +379 @@
 
 CMessage* CMessageRangeUpdate::FromJSVal(ScriptInterface& UNUSED(scriptInterface), JS::HandleValue UNUSED(val))
 {
-    LOGWARNING(L"CMessageRangeUpdate::FromJSVal not implemented");
+    LOGWARNING("CMessageRangeUpdate::FromJSVal not implemented");
     return NULL;
 }
 
@@ -387 +387 @@
 
 JS::Value CMessagePathResult::ToJSVal(ScriptInterface& UNUSED(scriptInterface)) const
 {
-    LOGWARNING(L"CMessagePathResult::ToJSVal not implemented");
+    LOGWARNING("CMessagePathResult::ToJSVal not implemented");
     return JS::UndefinedValue();
 }
 
 CMessage* CMessagePathResult::FromJSVal(ScriptInterface& UNUSED(scriptInterface), JS::HandleValue UNUSED(val))
 {
-    LOGWARNING(L"CMessagePathResult::FromJSVal not implemented");
+    LOGWARNING("CMessagePathResult::FromJSVal not implemented");
     return NULL;
 }
 

source/simulation2/scripting/ScriptComponent.cpp

@@ -73 +73 @@
 
     JS::RootedValue tmpInstance(cx, m_Instance.get()); // TODO: Check if this temporary root can be removed after SpiderMonkey 31 upgrade 
     if (!m_ScriptInterface.CallFunctionVoid(tmpInstance, name, msgVal))
-        LOGERROR(L"Script message handler %hs failed", name);
+        LOGERROR("Script message handler %hs failed", name);
 }
 
 void CComponentTypeScript::Serialize(ISerializer& serialize)
@@ -92 +92 @@
     {
         JS::RootedValue val(cx);
         if (!m_ScriptInterface.CallFunction(tmpInstance, "Serialize", &val))
-            LOGERROR(L"Script Serialize call failed");
+            LOGERROR("Script Serialize call failed");
         serialize.ScriptVal("object", &val);
     }
     else
@@ -118 +118 @@
             deserialize.ScriptVal("object", &val);
 
         if (!m_ScriptInterface.CallFunctionVoid(tmpInstance, "Deserialize", val))
-            LOGERROR(L"Script Deserialize call failed");
+            LOGERROR("Script Deserialize call failed");
     }
     else
     {

source/simulation2/scripting/ScriptComponent.h

@@ -64 +64 @@
         R ret; \
         if (m_ScriptInterface.CallFunction(tmpInstance, funcname  BOOST_PP_ENUM_TRAILING_PARAMS(i, a), ret)) \
             return ret; \
-        LOGERROR(L"Error calling component script function %hs", funcname); \
+        LOGERROR("Error calling component script function %hs", funcname); \
         return R(); \
     } \
     BOOST_PP_IF(i, template<, ) BOOST_PP_ENUM_PARAMS(i, typename T) BOOST_PP_IF(i, >, ) \
@@ -75 +75 @@
         JS::RootedValue tmpInstance(cx, m_Instance.get()); \
         if (m_ScriptInterface.CallFunctionVoid(tmpInstance, funcname  BOOST_PP_ENUM_TRAILING_PARAMS(i, a))) \
             return; \
-        LOGERROR(L"Error calling component script function %hs", funcname); \
+        LOGERROR("Error calling component script function %hs", funcname); \
     }
 BOOST_PP_REPEAT(SCRIPT_INTERFACE_MAX_ARGS, OVERLOADS, ~)
 #undef OVERLOADS

source/simulation2/serialization/BinarySerializer.cpp

@@ -49 +49 @@
     case js::ArrayBufferView::TYPE_UINT8_CLAMPED:
         return SCRIPT_TYPED_ARRAY_UINT8_CLAMPED;
     default:
-        LOGERROR(L"Cannot serialize unrecognized typed array view: %d", arrayType);
+        LOGERROR("Cannot serialize unrecognized typed array view: %d", arrayType);
         throw PSERROR_Serialize_InvalidScriptValue();
     }
 }
@@ -258 +258 @@
             else
             {
                 // Unrecognized class
-                LOGERROR(L"Cannot serialise JS objects with unrecognized class '%hs'", jsclass->name);
+                LOGERROR("Cannot serialise JS objects with unrecognized class '%hs'", jsclass->name);
                 throw PSERROR_Serialize_InvalidScriptValue();
             }
         }
@@ -317 +317 @@
             }
         }
 
-        LOGERROR(L"Cannot serialise JS objects of type 'function': %ls", funcname.c_str());
+        LOGERROR("Cannot serialise JS objects of type 'function': %ls", funcname.c_str());
         throw PSERROR_Serialize_InvalidScriptValue();
     }
     case JSTYPE_STRING:

source/simulation2/system/ComponentManager.cpp

@@ -429 +429 @@
 CMessage* CComponentManager::ConstructMessage(int mtid, JS::HandleValue data)
 {
     if (mtid == MT__Invalid || mtid > (int)m_MessageTypeIdsByName.size()) // (IDs start at 1 so use '>' here)
-        LOGERROR(L"PostMessage with invalid message type ID '%d'", mtid);
+        LOGERROR("PostMessage with invalid message type ID '%d'", mtid);
 
     if (mtid < MT__LastNative)
     {
@@ -672 +672 @@
     for (; iiit != m_InterfaceIdsByName.end(); ++iiit)
         if (iiit->second == iid)
         {
-            LOGERROR(L"No script wrapper found for interface id %d '%hs'", iid, iiit->first.c_str());
+            LOGERROR("No script wrapper found for interface id %d '%hs'", iid, iiit->first.c_str());
             return CID__Invalid;
         }
 
-    LOGERROR(L"No script wrapper found for interface id %d", iid);
+    LOGERROR("No script wrapper found for interface id %d", iid);
     return CID__Invalid;
 }
 
@@ -753 +753 @@
     std::map<ComponentTypeId, ComponentType>::const_iterator it = m_ComponentTypesById.find(cid);
     if (it == m_ComponentTypesById.end())
     {
-        LOGERROR(L"Invalid component id %d", cid);
+        LOGERROR("Invalid component id %d", cid);
         return NULL;
     }
 
@@ -764 +764 @@
     boost::unordered_map<entity_id_t, IComponent*>& emap1 = m_ComponentsByInterface[ct.iid];
     if (emap1.find(ent.GetId()) != emap1.end())
     {
-        LOGERROR(L"Multiple components for interface %d", ct.iid);
+        LOGERROR("Multiple components for interface %d", ct.iid);
         return NULL;
     }
 
@@ -780 +780 @@
         m_ScriptInterface.CallConstructor(tmpCtor, argv, &obj);
         if (obj.isNull())
         {
-            LOGERROR(L"Script component constructor failed");
+            LOGERROR("Script component constructor failed");
             return NULL;
         }
     }
@@ -887 +887 @@
         CComponentManager::ComponentTypeId cid = LookupCID(it->first);
         if (cid == CID__Invalid)
         {
-            LOGERROR(L"Unrecognised component type name '%hs' in entity template '%ls'", it->first.c_str(), templateName.c_str());
+            LOGERROR("Unrecognised component type name '%hs' in entity template '%ls'", it->first.c_str(), templateName.c_str());
             return INVALID_ENTITY;
         }
 
         if (!AddComponent(handle, cid, it->second))
         {
-            LOGERROR(L"Failed to construct component type name '%hs' in entity template '%ls'", it->first.c_str(), templateName.c_str());
+            LOGERROR("Failed to construct component type name '%hs' in entity template '%ls'", it->first.c_str(), templateName.c_str());
             return INVALID_ENTITY;
         }
         // TODO: maybe we should delete already-constructed components if one of them fails?
@@ -1226 +1226 @@
     {
         // Some error reading directory
         wchar_t error[200];
-        LOGERROR(L"Error reading directory '%ls': %ls", cbData.path.string().c_str(), StatusDescription(ret, error, ARRAY_SIZE(error)));
+        LOGERROR("Error reading directory '%ls': %ls", cbData.path.string().c_str(), StatusDescription(ret, error, ARRAY_SIZE(error)));
     }
     
     return cbData.templates;

source/simulation2/system/ComponentManagerSerialization.cpp

@@ -322 +322 @@
             ComponentTypeId ctid = LookupCID(ctname);
             if (ctid == CID__Invalid)
             {
-                LOGERROR(L"Deserialization saw unrecognised component type '%hs'", ctname.c_str());
+                LOGERROR("Deserialization saw unrecognised component type '%hs'", ctname.c_str());
                 return false;
             }
 
@@ -349 +349 @@
             ComponentTypeId ctid = LookupCID(ctname);
             if (ctid == CID__Invalid)
             {
-                LOGERROR(L"Deserialization saw unrecognised component type '%hs'", ctname.c_str());
+                LOGERROR("Deserialization saw unrecognised component type '%hs'", ctname.c_str());
                 return false;
             }
 
@@ -379 +379 @@
 
         if (stream.peek() != EOF)
         {
-            LOGERROR(L"Deserialization didn't reach EOF");
+            LOGERROR("Deserialization didn't reach EOF");
             return false;
         }
 
@@ -391 +391 @@
     }
     catch (PSERROR_Deserialize& e)
     {
-        LOGERROR(L"Deserialization failed: %hs", e.what());
+        LOGERROR("Deserialization failed: %hs", e.what());
         return false;
     }
 }

source/simulation2/system/ParamNode.cpp

@@ -123 +123 @@
                         if (tokenIt != tokens.end())
                             tokens.erase(tokenIt);
                         else
-                            LOGWARNING(L"[ParamNode] Could not remove token '%ls' from node '%hs'%ls; not present in list nor inherited (possible typo?)",
+                            LOGWARNING("[ParamNode] Could not remove token '%ls' from node '%hs'%ls; not present in list nor inherited (possible typo?)",
                                 newTokens[i].substr(1).c_str(), name.c_str(), sourceIdentifier ? (L" in '" + std::wstring(sourceIdentifier) + L"'").c_str() : L"");
                     }
                     else

source/soundmanager/SoundManager.cpp

@@ -204 +204 @@
 
 void CSoundManager::al_ReportError(ALenum err, const char* caller, int line)
 {
-    LOGERROR(L"OpenAL error: %hs; called from %hs (line %d)\n", alGetString(err), caller, line);
+    LOGERROR("OpenAL error: %hs; called from %hs (line %d)\n", alGetString(err), caller, line);
 }
 
 void CSoundManager::al_check(const char* caller, int line)
@@ -216 +216 @@
 
 Status CSoundManager::ReloadChangedFiles(const VfsPath& UNUSED(path))
 {
-//  LOGERROR(L"GUI file '%ls' changed - reloading page", path.string().c_str());
+//  LOGERROR("GUI file '%ls' changed - reloading page", path.string().c_str());
 
     return INFO::OK;
 }
@@ -338 +338 @@
             }
             else
             {
-                LOGERROR(L"error in gensource = %d", err);
+                LOGERROR("error in gensource = %d", err);
             }
             delete[] sourceList;
         }
@@ -354 +354 @@
         debug_printf(L"Sound: AlcInit success, using %hs\n", dev_name);
     else
     {
-        LOGERROR(L"Sound: AlcInit failed, m_Device=%p m_Context=%p dev_name=%hs err=%x\n", m_Device, m_Context, dev_name, err);
+        LOGERROR("Sound: AlcInit failed, m_Device=%p m_Context=%p dev_name=%hs err=%x\n", m_Device, m_Context, dev_name, err);
 
 // FIXME Hack to get around exclusive access to the sound device
 #if OS_UNIX
@@ -654 +654 @@
         group = new CSoundGroup();
         if (!group->LoadSoundGroup(L"audio/" + groupPath.string()))
         {
-            LOGERROR(L"Failed to load sound group '%ls'", groupPath.string().c_str());
+            LOGERROR("Failed to load sound group '%ls'", groupPath.string().c_str());
             delete group;
             group = NULL;
         }

source/soundmanager/data/SoundData.cpp

@@ -107 +107 @@
     }
     else
     {
-        LOGERROR(L"could not initialize ogg data at %ls", itemPath.string().c_str());
+        LOGERROR("could not initialize ogg data at %ls", itemPath.string().c_str());
         delete oggAnswer;
     }
 

source/soundmanager/items/CSoundBase.cpp

@@ -112 +112 @@
     }
     else
     {
-//      LOGERROR(L"Source not allocated by SoundManager\n", 0);
+//      LOGERROR("Source not allocated by SoundManager\n", 0);
     }
     return false;
 }

source/soundmanager/scripting/SoundGroup.cpp

@@ -227 +227 @@
 {
     if (err == ERR::AGAIN)
         return; // open failed because sound is disabled (don't log this)
-    LOGERROR(L"%ls: pathname=%ls, error=%ls", message.c_str(), pathname.string().c_str(), ErrorString(err));
+    LOGERROR("%ls: pathname=%ls, error=%ls", message.c_str(), pathname.string().c_str(), ErrorString(err));
 }
 
 void CSoundGroup::PlayNext(const CVector3D& position, entity_id_t source)
@@ -320 +320 @@
 
     if (root.GetNodeName() != el_soundgroup)
     {
-        LOGERROR(L"Invalid SoundGroup format (unrecognised root element '%hs')", XeroFile.GetElementString(root.GetNodeName()).c_str());
+        LOGERROR("Invalid SoundGroup format (unrecognised root element '%hs')", XeroFile.GetElementString(root.GetNodeName()).c_str());
         return false;
     }
     

source/tools/atlas/GameInterface/GameLoop.cpp

@@ -178 +178 @@
                     debug_warn(L"Unrecognised message");
                     // CLogger might not be initialised, but this error will be sent
                     // to the debug output window anyway so people can still see it
-                    LOGERROR(L"Unrecognised message (%hs)", name.c_str());
+                    LOGERROR("Unrecognised message (%hs)", name.c_str());
                 }
 
                 if (msg->GetType() == IMessage::Query)

source/tools/atlas/GameInterface/Handlers/MapHandlers.cpp

@@ -176 +176 @@
     File file;
     if (file.Open(src, O_RDONLY) < 0)
     {
-        LOGERROR(L"Failed to load heightmap.");
+        LOGERROR("Failed to load heightmap.");
         return;
     }
     
@@ -187 +187 @@
     
     if (read(file.Descriptor(), fileData.get(), fileSize) < 0)
     {
-        LOGERROR(L"Failed to read heightmap image.");
+        LOGERROR("Failed to read heightmap image.");
         file.Close();
         return;
     }
@@ -198 +198 @@
     Tex tex;
     if (tex.decode(fileData, fileSize) < 0)
     {
-        LOGERROR(L"Failed to decode heightmap.");
+        LOGERROR("Failed to decode heightmap.");
         return;
     }
 
     // Convert to uncompressed BGRA with no mipmaps
     if (tex.transform_to((tex.m_Flags | TEX_BGR | TEX_ALPHA) & ~(TEX_DXT | TEX_MIPMAPS)) < 0)
     {
-        LOGERROR(L"Failed to transform heightmap.");
+        LOGERROR("Failed to transform heightmap.");
         return;
     }
 

source/tools/atlas/GameInterface/Handlers/ObjectHandlers.cpp

@@ -930 +930 @@
             entity_id_t ent = sim.AddEntity(oldObjects[i].templateName.FromUTF8(), oldObjects[i].entityID);
             if (ent == INVALID_ENTITY)
             {
-                LOGERROR(L"Failed to load entity template '%hs'", oldObjects[i].templateName.c_str());
+                LOGERROR("Failed to load entity template '%hs'", oldObjects[i].templateName.c_str());
             }
             else
             {