pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-21 15:28:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'StringFormatting' into small_stage_cleanup

Browse Source 
Conflicts:
	common/Item.cpp
	world/client.cpp
	zone/net.cpp
This commit is contained in:
Arthur Ice
2013-05-22 18:36:07 -07:00
parent 41dcd5bc29 ea2a1651d5
commit 54914a970e
190 changed files with 1859 additions and 2097 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/net.cpp
+7 -10
View File
@@ -86,7 +86,6 @@ extern volatile bool ZoneLoaded;
TimeoutManager timeout_manager;
NetConnection net;
EntityList entity_list;
@@ -107,8 +106,6 @@ const SPDat_Spell_Struct* spells;
void LoadSpells(EQEmu::MemoryMappedFile **mmf);
int32 SPDAT_RECORDS = -1;
void Shutdown();
extern void MapOpcodes();
@@ -606,27 +603,27 @@ void LoadSpells(EQEmu::MemoryMappedFile **mmf) {
void UpdateWindowTitle(char* iNewTitle) {
#ifdef _WINDOWS
std::string newTitle;
char tmp[500];
if (iNewTitle) {
StringFormat(newTitle, "%i: %s", ZoneConfig::get()->ZonePort, iNewTitle);
snprintf(tmp, sizeof(tmp), "%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());
snprintf(tmp, sizeof(tmp), "%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);
snprintf(tmp, sizeof(tmp), "%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());
snprintf(tmp, sizeof(tmp), "%i: sleeping, %i", ZoneConfig::get()->ZonePort, getpid());
#else
StringFormat(newTitle, "%i: sleeping", ZoneConfig::get()->ZonePort);
snprintf(tmp, sizeof(tmp), "%i: sleeping", ZoneConfig::get()->ZonePort);
#endif
}
}
SetConsoleTitle(newTitle.c_str());
SetConsoleTitle(tmp);
#endif
}