pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-13 10:31:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

corrected incorrect use of StringFormat and did basic indenting fix.

Browse Source
This commit is contained in:
Arthur Ice 2013-05-20 23:16:02 -07:00
parent 26143750f3
commit 9002bfb9a0
2 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
zone/client.cpp
View File

@ -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 <stdarg.h>
#include <sys/socket.h>

28
zone/net.cpp
View File

@ -74,16 +74,16 @@
#endif
#ifdef _WINDOWS
#include <conio.h>
#include <process.h>
#define vsnprintf _vsnprintf
#define snprintf _snprintf
#define strncasecmp _strnicmp
#define strcasecmp _stricmp
#include <conio.h>
#include <process.h>
#define vsnprintf _vsnprintf
#define snprintf _snprintf
#define strncasecmp _strnicmp
#define strcasecmp _stricmp
#else
#include <pthread.h>
#include "../common/unix.h"
#include <pthread.h>
#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
}
}