diff --git a/zone/client.cpp b/zone/client.cpp index 3730c1b4d..7b2460879 100644 --- a/zone/client.cpp +++ b/zone/client.cpp @@ -29,10 +29,6 @@ using namespace std; // for windows compile #ifdef _WINDOWS #define abs64 _abs64 - #define snprintf _snprintf - #define vsnprintf _vsnprintf - #define strncasecmp _strnicmp - #define strcasecmp _stricmp #else #include #include diff --git a/zone/net.cpp b/zone/net.cpp index b408c8a7f..30b0eb614 100644 --- a/zone/net.cpp +++ b/zone/net.cpp @@ -74,16 +74,16 @@ #endif #ifdef _WINDOWS - #include - #include - - #define vsnprintf _vsnprintf - #define snprintf _snprintf - #define strncasecmp _strnicmp - #define strcasecmp _stricmp + #include + #include + + #define vsnprintf _vsnprintf + #define snprintf _snprintf + #define strncasecmp _strnicmp + #define strcasecmp _stricmp #else - #include - #include "../common/unix.h" + #include + #include "../common/unix.h" #endif volatile bool RunLoops = true; @@ -613,21 +613,21 @@ void UpdateWindowTitle(char* iNewTitle) { #ifdef _WINDOWS std::string newTitle; if (iNewTitle) { - StringFormat(&newTitle, "%i: %s", ZoneConfig::get()->ZonePort, iNewTitle); + StringFormat(newTitle, "%i: %s", ZoneConfig::get()->ZonePort, iNewTitle); } else { if (zone) { #if defined(GOTFRAGS) || defined(_EQDEBUG) - StringFormat(&newTitle, "%i: %s, %i clients, %i", ZoneConfig::get()->ZonePort, zone->GetShortName(), numclients, getpid()); + StringFormat(newTitle, "%i: %s, %i clients, %i", ZoneConfig::get()->ZonePort, zone->GetShortName(), numclients, getpid()); #else - StringFormat(&newTitle, "%i: %s, %i clients", ZoneConfig::get()->ZonePort, zone->GetShortName(), numclients); + StringFormat(newTitle, "%i: %s, %i clients", ZoneConfig::get()->ZonePort, zone->GetShortName(), numclients); #endif } else { #if defined(GOTFRAGS) || defined(_EQDEBUG) - StringFormat(&newTitle, "%i: sleeping, %i", ZoneConfig::get()->ZonePort, getpid()); + StringFormat(newTitle, "%i: sleeping, %i", ZoneConfig::get()->ZonePort, getpid()); #else - StringFormat(&newTitle, "%i: sleeping", ZoneConfig::get()->ZonePort); + StringFormat(newTitle, "%i: sleeping", ZoneConfig::get()->ZonePort); #endif } }