Ticket #4095: movehexify2.patch

source/network/NetTurnManager.cpp

@@ -29 +29 @@
 #include "ps/CLogger.h"
 #include "ps/Profile.h"
 #include "ps/Pyrogenesis.h"
 #include "ps/Replay.h"
 #include "ps/SavedGame.h"
+#include "ps/Util.h"
 #include "scriptinterface/ScriptInterface.h"
 #include "simulation2/Simulation2.h"
 
-#include <sstream>
 #include <fstream>
-#include <iomanip>
 
 const u32 DEFAULT_TURN_LENGTH_MP = 500;
 const u32 DEFAULT_TURN_LENGTH_SP = 200;
 
 static const int COMMAND_DELAY = 2;
@@ -47 +46 @@
 #define NETTURN_LOG(args) debug_printf args
 #else
 #define NETTURN_LOG(args)
 #endif
 
-static std::string Hexify(const std::string& s)
-{
-    std::stringstream str;
-    str << std::hex;
-    for (size_t i = 0; i < s.size(); ++i)
-        str << std::setfill('0') << std::setw(2) << (int)(unsigned char)s[i];
-    return str.str();
-}
-
 CNetTurnManager::CNetTurnManager(CSimulation2& simulation, u32 defaultTurnLength, int clientId, IReplayLogger& replay) :
     m_Simulation2(simulation), m_CurrentTurn(0), m_ReadyTurn(1), m_TurnLength(defaultTurnLength), m_DeltaSimTime(0),
     m_PlayerId(-1), m_ClientId(clientId), m_HasSyncError(false), m_Replay(replay),
     m_TimeWarpNumTurns(0), m_FinalTurn(std::numeric_limits<u32>::max())
 {

source/ps/Replay.cpp

@@ -37 +37 @@
 #include "scriptinterface/ScriptStats.h"
 #include "simulation2/Simulation2.h"
 #include "simulation2/helpers/SimulationCommand.h"
 
 #include <ctime>
-#include <sstream>
 #include <fstream>
-#include <iomanip>
-
-static std::string Hexify(const std::string& s)
-{
-    std::stringstream str;
-    str << std::hex;
-    for (size_t i = 0; i < s.size(); ++i)
-        str << std::setfill('0') << std::setw(2) << (int)(unsigned char)s[i];
-    return str.str();
-}
 
 CReplayLogger::CReplayLogger(ScriptInterface& scriptInterface) :
     m_ScriptInterface(scriptInterface), m_Stream(NULL)
 {
 }

source/ps/Util.cpp

@@ -420 +420 @@
     else
         LOGERROR("Error writing screenshot to '%s'", filename.string8());
 
     free(tile_data);
 }
+
+std::string Hexify(const std::string& s)
+{
+    std::stringstream str;
+    str << std::hex;
+    for (char c : s)
+        str << std::setfill('0') << std::setw(2) << (int)(unsigned char)c;
+    return str.str();
+}

source/ps/Util.h

@@ -20 +20 @@
 
 #include "lib/file/vfs/vfs_path.h"
 
 struct Tex;
 
-extern void WriteSystemInfo();
+void WriteSystemInfo();
 
-extern const wchar_t* ErrorString(int err);
+const wchar_t* ErrorString(int err);
 
-extern OsPath createDateIndexSubdirectory(const OsPath& parentDir);
+OsPath createDateIndexSubdirectory(const OsPath& parentDir);
 
-extern void WriteScreenshot(const VfsPath& extension);
-extern void WriteBigScreenshot(const VfsPath& extension, int tiles);
+void WriteScreenshot(const VfsPath& extension);
+void WriteBigScreenshot(const VfsPath& extension, int tiles);
 
-extern Status tex_write(Tex* t, const VfsPath& filename);
+Status tex_write(Tex* t, const VfsPath& filename);
+
+std::string Hexify(const std::string& s);
 
 #endif // PS_UTIL_H

source/simulation2/Simulation2.cpp

@@ -44 +44 @@
 #include "ps/Util.h"
 #include "ps/XML/Xeromyces.h"
 
 #include <iomanip>
 
-static std::string Hexify(const std::string& s) // TODO: shouldn't duplicate this function in so many places
-{
-    std::stringstream str;
-    str << std::hex;
-    for (size_t i = 0; i < s.size(); ++i)
-        str << std::setfill('0') << std::setw(2) << (int)(unsigned char)s[i];
-    return str.str();
-}
-
 class CSimulation2Impl
 {
 public:
     CSimulation2Impl(CUnitManager* unitManager, shared_ptr<ScriptRuntime> rt, CTerrain* terrain) :
         m_SimContext(), m_ComponentManager(m_SimContext, rt),