pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-09-04 06:16:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge fixes

Browse Source
This commit is contained in:
Akkadius
2018-01-13 16:41:10 -06:00
parent b6fc878aab d18fb730ec
commit c4432bcd7e
92 changed files with 2787 additions and 1448 deletions
Download Patch File Download Diff File Expand all files Collapse all files
world/adventure.cpp
+3 -3
View File
@@ -380,7 +380,7 @@ void Adventure::MoveCorpsesToGraveyard()
std::list<uint32> dbid_list;
std::list<uint32> charid_list;
std::string query = StringFormat("SELECT id, charid FROM character_corpses WHERE instanceid=%d", GetInstanceID());
std::string query = StringFormat("SELECT id, charid FROM character_corpses WHERE instance_id=%d", GetInstanceID());
auto results = database.QueryDatabase(query);
if(!results.Success())
@@ -395,8 +395,8 @@ void Adventure::MoveCorpsesToGraveyard()
float z = GetTemplate()->graveyard_z;
query = StringFormat("UPDATE character_corpses "
"SET zoneid = %d, instanceid = 0, "
"x = %f, y = %f, z = %f WHERE instanceid = %d",
"SET zone_id = %d, instance_id = 0, "
"x = %f, y = %f, z = %f WHERE instance_id = %d",
GetTemplate()->graveyard_zone_id,
x, y, z, GetInstanceID());
database.QueryDatabase(query);
world/net.cpp
+11 -2
View File
@@ -23,6 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include <stdlib.h>
#include <signal.h>
#include "../common/string_util.h"
#include "../common/eqemu_logsys.h"
#include "../common/queue.h"
#include "../common/timer.h"
@@ -105,6 +106,12 @@ WebInterfaceList web_interface;
void CatchSignal(int sig_num);
void CheckForServerScript(bool force_download = false);
inline void UpdateWindowTitle(std::string new_title) {
#ifdef _WINDOWS
SetConsoleTitle(new_title.c_str());
#endif
}
int main(int argc, char** argv) {
RegisterExecutablePlatform(ExePlatformWorld);
LogSys.LoadLogSettingsDefaults();
@@ -539,8 +546,7 @@ int main(int argc, char** argv) {
database.PurgeExpiredInstances();
}
if (EQTimeTimer.Check())
{
if (EQTimeTimer.Check()) {
TimeOfDay_Struct tod;
zoneserver_list.worldclock.GetCurrentEQTimeOfDay(time(0), &tod);
if (!database.SaveTime(tod.minute, tod.hour, tod.day, tod.month, tod.year))
@@ -557,6 +563,9 @@ int main(int argc, char** argv) {
if (InterserverTimer.Check()) {
InterserverTimer.Start();
database.ping();
std::string window_title = StringFormat("World: %s Clients: %i", Config->LongName.c_str(), client_list.GetClientCount());
UpdateWindowTitle(window_title);
}
EQ::EventLoop::Get().Process();
world/net.h
-1
View File
@@ -31,7 +31,6 @@
#endif
void CatchSignal(int sig_num);
void UpdateWindowTitle(char* iNewTitle);
#define EQ_WORLD_PORT 9000 //mandated by the client
#define LOGIN_PORT 5997