From: <Ven...@us...> - 2008-11-07 05:02:53
|
Revision: 2369 http://planeshift.svn.sourceforge.net/planeshift/?rev=2369&view=rev Author: Vengeance2001 Date: 2008-11-07 05:02:49 +0000 (Fri, 07 Nov 2008) Log Message: ----------- Db version bump here also. Modified Paths: -------------- trunk/src/server/psserver.cpp Modified: trunk/src/server/psserver.cpp =================================================================== --- trunk/src/server/psserver.cpp 2008-11-07 05:01:02 UTC (rev 2368) +++ trunk/src/server/psserver.cpp 2008-11-07 05:02:49 UTC (rev 2369) @@ -89,7 +89,7 @@ #include "introductionmanager.h" // Remember to bump this in server_options.sql and add to upgrade_schema.sql! -#define DATABASE_VERSION_STR "1202" +#define DATABASE_VERSION_STR "1203" psCharacterLoader psServer::CharacterLoader; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Ven...@us...> - 2008-11-26 06:19:24
|
Revision: 2521 http://planeshift.svn.sourceforge.net/planeshift/?rev=2521&view=rev Author: Vengeance2001 Date: 2008-11-26 06:19:17 +0000 (Wed, 26 Nov 2008) Log Message: ----------- DB version bump Modified Paths: -------------- trunk/src/server/psserver.cpp Modified: trunk/src/server/psserver.cpp =================================================================== --- trunk/src/server/psserver.cpp 2008-11-26 06:18:11 UTC (rev 2520) +++ trunk/src/server/psserver.cpp 2008-11-26 06:19:17 UTC (rev 2521) @@ -89,7 +89,7 @@ #include "introductionmanager.h" // Remember to bump this in server_options.sql and add to upgrade_schema.sql! -#define DATABASE_VERSION_STR "1207" +#define DATABASE_VERSION_STR "1208" psCharacterLoader psServer::CharacterLoader; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2008-12-13 12:59:22
|
Revision: 2678 http://planeshift.svn.sourceforge.net/planeshift/?rev=2678&view=rev Author: mgist Date: 2008-12-13 12:59:18 +0000 (Sat, 13 Dec 2008) Log Message: ----------- - Disabled threaded loading in psserver. Modified Paths: -------------- trunk/src/server/psserver.cpp Modified: trunk/src/server/psserver.cpp =================================================================== --- trunk/src/server/psserver.cpp 2008-12-13 10:09:41 UTC (rev 2677) +++ trunk/src/server/psserver.cpp 2008-12-13 12:59:18 UTC (rev 2678) @@ -216,6 +216,11 @@ bool psServer::Initialize(iObjectRegistry* object_reg) { + // Disable threaded loading. + // This doesn't work correctly with psserver because the console isn't running in the main thread. + csRef<iThreadManager> tman = csQueryRegistry<iThreadManager>(object_reg); + tman->SetAlwaysRunNow(true); + //Map isn't loaded yet MapLoaded=false; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Ven...@us...> - 2008-12-21 05:32:37
|
Revision: 2729 http://planeshift.svn.sourceforge.net/planeshift/?rev=2729&view=rev Author: Vengeance2001 Date: 2008-12-21 05:32:33 +0000 (Sun, 21 Dec 2008) Log Message: ----------- Updated db version number here also. Modified Paths: -------------- trunk/src/server/psserver.cpp Modified: trunk/src/server/psserver.cpp =================================================================== --- trunk/src/server/psserver.cpp 2008-12-21 05:31:15 UTC (rev 2728) +++ trunk/src/server/psserver.cpp 2008-12-21 05:32:33 UTC (rev 2729) @@ -89,7 +89,7 @@ #include "introductionmanager.h" // Remember to bump this in server_options.sql and add to upgrade_schema.sql! -#define DATABASE_VERSION_STR "1210" +#define DATABASE_VERSION_STR "1211" psCharacterLoader psServer::CharacterLoader; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ac...@us...> - 2008-12-25 23:08:14
|
Revision: 2774 http://planeshift.svn.sourceforge.net/planeshift/?rev=2774&view=rev Author: acraig Date: 2008-12-25 23:08:10 +0000 (Thu, 25 Dec 2008) Log Message: ----------- Deleted the server console object in the engine dtor. It was holding a reference to VFS. Modified Paths: -------------- trunk/src/server/psserver.cpp Modified: trunk/src/server/psserver.cpp =================================================================== --- trunk/src/server/psserver.cpp 2008-12-25 22:49:21 UTC (rev 2773) +++ trunk/src/server/psserver.cpp 2008-12-25 23:08:10 UTC (rev 2774) @@ -191,7 +191,7 @@ delete gmeventManager; delete bankmanager; delete intromanager; - + delete serverconsole; /* PS_CHECK_REF_COUNT(guildmanager); PS_CHECK_REF_COUNT(questionmanager); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2009-06-10 14:22:16
|
Revision: 3837 http://planeshift.svn.sourceforge.net/planeshift/?rev=3837&view=rev Author: weltall2 Date: 2009-06-10 13:48:11 +0000 (Wed, 10 Jun 2009) Log Message: ----------- fixed a crash on shutdown Modified Paths: -------------- trunk/src/server/psserver.cpp Modified: trunk/src/server/psserver.cpp =================================================================== --- trunk/src/server/psserver.cpp 2009-06-10 13:02:29 UTC (rev 3836) +++ trunk/src/server/psserver.cpp 2009-06-10 13:48:11 UTC (rev 3837) @@ -130,6 +130,7 @@ cachemanager = NULL; logcsv = NULL; vfs = NULL; + server_quit_event = NULL; unused_pid = 0; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2009-07-12 21:47:13
|
Revision: 4006 http://planeshift.svn.sourceforge.net/planeshift/?rev=4006&view=rev Author: weltall2 Date: 2009-07-12 21:47:09 +0000 (Sun, 12 Jul 2009) Log Message: ----------- missed file Modified Paths: -------------- trunk/src/server/psserver.cpp Modified: trunk/src/server/psserver.cpp =================================================================== --- trunk/src/server/psserver.cpp 2009-07-12 19:55:37 UTC (rev 4005) +++ trunk/src/server/psserver.cpp 2009-07-12 21:47:09 UTC (rev 4006) @@ -89,7 +89,7 @@ #include "workmanager.h" // Remember to bump this in server_options.sql and add to upgrade_schema.sql! -#define DATABASE_VERSION_STR "1224" +#define DATABASE_VERSION_STR "1225" psCharacterLoader psServer::CharacterLoader; @@ -584,7 +584,7 @@ Notify3(LOG_CHARACTER, "Remove player '%s' (%d)\n", client->GetName(),client->GetClientNum() ); client->Disconnect(); - + chatmanager->RemoveAllChannels(client); authserver->SendDisconnect(client,reason); @@ -683,7 +683,7 @@ va_start(args, fmt); csString cssLine = csString().FormatV(fmt, args); va_end(args); - + psSystemMessage newmsg(clientnum ,MSG_INFO, cssLine.GetData()); if (newmsg.valid) @@ -708,7 +708,7 @@ va_start(args, fmt); csString cssLine = csString().FormatV(fmt, args); va_end(args); - + psSystemMessage newmsg(clientnum ,MSG_INFO_BASE, cssLine.GetData()); if (newmsg.valid) @@ -758,7 +758,7 @@ va_start(args, fmt); csString cssLine = csString().FormatV(fmt, args); va_end(args); - + psSystemMessage newmsg(clientnum ,MSG_OK, cssLine.GetData()); if (newmsg.valid) @@ -1068,11 +1068,11 @@ gotAccess = CacheManager::GetSingleton().GetCommandManager()->Validate(client->GetSecurityLevel(), command, errorMessage); if(gotAccess) return true; - + SendSystemError(client->GetClientNum(), errorMessage); return false; } - + return CacheManager::GetSingleton().GetCommandManager()->Validate(client->GetSecurityLevel(), command); } @@ -1153,7 +1153,7 @@ return; } //we got less than 5 minutes for shut down so let's lock the server immediately - if(quit_delay < 5) EntityManager::GetSingleton().SetReady(false); + if(quit_delay < 5) EntityManager::GetSingleton().SetReady(false); //generates the messages to alert the user and allocates them in the queque for(uint i = 3; i > 0; i--) //i = 3 sets up the 0 seconds message and so is the event triggering This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2009-08-02 06:18:06
|
Revision: 4166 http://planeshift.svn.sourceforge.net/planeshift/?rev=4166&view=rev Author: weltall2 Date: 2009-08-02 06:17:57 +0000 (Sun, 02 Aug 2009) Log Message: ----------- removed various unedded newlines making the server show blank lines Modified Paths: -------------- trunk/src/server/psserver.cpp Modified: trunk/src/server/psserver.cpp =================================================================== --- trunk/src/server/psserver.cpp 2009-08-01 22:58:02 UTC (rev 4165) +++ trunk/src/server/psserver.cpp 2009-08-02 06:17:57 UTC (rev 4166) @@ -255,7 +255,7 @@ if (!configmanager || !vfs) { - Error1 ("Couldn't find Configmanager!\n"); + Error1 ("Couldn't find Configmanager!"); return false; } @@ -283,7 +283,7 @@ db_name = configmanager->GetStr("PlaneShift.Database.name", "planeshift"); db_port = configmanager->GetInt("PlaneShift.Database.port"); - Debug5(LOG_STARTUP,0,COL_BLUE "Database Host: '%s' User: '%s' Databasename: '%s' Port: %d\n" COL_NORMAL, + Debug5(LOG_STARTUP,0,COL_BLUE "Database Host: '%s' User: '%s' Databasename: '%s' Port: %d" COL_NORMAL, (const char*) db_host, (const char*) db_user, (const char*) db_name, db_port); if (!database->Initialize(db_host, db_port, db_user, db_pass, db_name)) @@ -297,7 +297,7 @@ csString db_version; if ( ! GetServerOption("db_version", db_version) ) { - CPrintf (CON_ERROR, "Couldn't determine database version. Error was %s.\n", db->GetLastError() ); + CPrintf (CON_ERROR, "Couldn't determine database version. Error was %s.", db->GetLastError() ); db = NULL; return false; } @@ -310,7 +310,7 @@ } - Debug1(LOG_STARTUP,0,"Started Database\n"); + Debug1(LOG_STARTUP,0,"Started Database"); cachemanager = new CacheManager(); @@ -339,7 +339,7 @@ return false; } - Debug1(LOG_STARTUP,0,"Preloaded mesh names, texture names, part names, image names, race info, sector info, traits, item categories, item stats, ways and spells.\n"); + Debug1(LOG_STARTUP,0,"Preloaded mesh names, texture names, part names, image names, race info, sector info, traits, item categories, item stats, ways and spells."); if (!CharacterLoader.Initialize()) { @@ -362,7 +362,7 @@ configmanager->GetStr("PlaneShift.Server.Addr", "0.0.0.0"); int port = configmanager->GetInt("PlaneShift.Server.Port", 1243); - Debug3(LOG_STARTUP,0,COL_BLUE "Listening on '%s' Port %d.\n" COL_NORMAL, + Debug3(LOG_STARTUP,0,COL_BLUE "Listening on '%s' Port %d." COL_NORMAL, (const char*) serveraddr, port); if (!netmanager->Bind(serveraddr, port)) { @@ -370,7 +370,7 @@ netmanager = NULL; return false; } - Debug1(LOG_STARTUP,0,"Started Network Thread\n"); + Debug1(LOG_STARTUP,0,"Started Network Thread"); // Start Event Manager @@ -389,30 +389,30 @@ if (!eventmanager->Initialize(netmanager, 1000)) return false; - Debug1(LOG_STARTUP,0,"Started Event Manager Thread\n"); + Debug1(LOG_STARTUP,0,"Started Event Manager Thread"); usermanager = new UserManager(GetConnections()); - Debug1(LOG_STARTUP,0,"Started User Manager\n"); + Debug1(LOG_STARTUP,0,"Started User Manager"); // Load emotes if(!usermanager->LoadEmotes("/planeshift/data/emotes.xml", vfs)) { - CPrintf(CON_ERROR, "Could not load emotes from emotes.xml\n"); + CPrintf(CON_ERROR, "Could not load emotes from emotes.xml"); return false; } entitymanager = new EntityManager; if (!entitymanager->Initialize(object_reg, GetConnections(), usermanager)) { - Error1("Failed to initialise CEL!\n"); + Error1("Failed to initialise CEL!"); delete entitymanager; entitymanager = NULL; return false; } entitymanager->SetReady(false); netmanager->SetEngine(entitymanager->GetEngine()); - Debug1(LOG_STARTUP,0,"Started CEL\n"); + Debug1(LOG_STARTUP,0,"Started CEL"); // Start Combat Manager combatmanager = new CombatManager(); @@ -420,16 +420,16 @@ { return false; } - Debug1(LOG_STARTUP,0,"Started Combat Manager\n"); + Debug1(LOG_STARTUP,0,"Started Combat Manager"); // Start Spell Manager spellmanager = new SpellManager(GetConnections(), object_reg); - Debug1(LOG_STARTUP,0,"Started Spell Manager\n"); + Debug1(LOG_STARTUP,0,"Started Spell Manager"); // Start Weather Manager weathermanager = new WeatherManager(); weathermanager->Initialize(); - Debug1(LOG_STARTUP,0,"Started Weather Manager\n"); + Debug1(LOG_STARTUP,0,"Started Weather Manager"); marriageManager = new psMarriageManager(); @@ -439,41 +439,41 @@ return false; chatmanager = csPtr<ChatManager> (new ChatManager); - Debug1(LOG_STARTUP,0,"Started Chat Manager\n"); + Debug1(LOG_STARTUP,0,"Started Chat Manager"); guildmanager = csPtr<GuildManager>(new GuildManager(GetConnections(), chatmanager)); - Debug1(LOG_STARTUP,0,"Started Guild Manager\n"); + Debug1(LOG_STARTUP,0,"Started Guild Manager"); questionmanager = csPtr<QuestionManager>(new QuestionManager() ); - Debug1(LOG_STARTUP,0,"Started Question Manager\n"); + Debug1(LOG_STARTUP,0,"Started Question Manager"); advicemanager = csPtr<AdviceManager>(new AdviceManager( database ) ); - Debug1(LOG_STARTUP,0,"Started Advice Manager\n"); + Debug1(LOG_STARTUP,0,"Started Advice Manager"); groupmanager = csPtr<GroupManager>(new GroupManager(GetConnections(), chatmanager)); - Debug1(LOG_STARTUP,0,"Started Group Manager\n"); + Debug1(LOG_STARTUP,0,"Started Group Manager"); charmanager = new ServerCharManager(); if (!charmanager->Initialize()) return false; - Debug1(LOG_STARTUP,0,"Started Character Manager\n"); + Debug1(LOG_STARTUP,0,"Started Character Manager"); spawnmanager = new SpawnManager(database); - Debug1(LOG_STARTUP,0,"Started NPC Spawn Manager\n"); + Debug1(LOG_STARTUP,0,"Started NPC Spawn Manager"); adminmanager = new AdminManager; - Debug1(LOG_STARTUP,0,"Started Admin Manager\n"); + Debug1(LOG_STARTUP,0,"Started Admin Manager"); tutorialmanager = new TutorialManager(GetConnections()); actionmanager = csPtr<ActionManager>(new ActionManager( database)); - Debug1(LOG_STARTUP,0,"Started Action Manager\n"); + Debug1(LOG_STARTUP,0,"Started Action Manager"); authserver = csPtr<AuthenticationServer>(new AuthenticationServer(GetConnections(), usermanager, guildmanager)); - Debug1(LOG_STARTUP,0,"Started Authentication Server\n"); + Debug1(LOG_STARTUP,0,"Started Authentication Server"); exchangemanager = new ExchangeManager(GetConnections()); - Debug1(LOG_STARTUP,0,"Started Exchange Manager\n"); + Debug1(LOG_STARTUP,0,"Started Exchange Manager"); npcmanager = new NPCManager(GetConnections(), database, eventmanager); if ( !npcmanager->Initialize()) @@ -482,7 +482,7 @@ return false; } - Debug1(LOG_STARTUP,0,"Started NPC Superclient Manager\n"); + Debug1(LOG_STARTUP,0,"Started NPC Superclient Manager"); progression = new ProgressionManager(GetConnections()); if ( !progression->Initialize()) @@ -491,15 +491,15 @@ return false; } - Debug1(LOG_STARTUP,0,"Started Progression Manager\n"); + Debug1(LOG_STARTUP,0,"Started Progression Manager"); // Start work manager workmanager = new WorkManager(); - Debug1(LOG_STARTUP,0,"Started Work Manager\n"); + Debug1(LOG_STARTUP,0,"Started Work Manager"); // Start economy manager economymanager = new EconomyManager(); - Debug1(LOG_STARTUP,0,"Started Economy Manager\n"); + Debug1(LOG_STARTUP,0,"Started Economy Manager"); // Start droping economymanager->ScheduleDrop(1 * 60 * 60 * 1000,true); // 1 hour @@ -510,7 +510,7 @@ Error1("Failed to load minigame data"); return false; } - Debug1(LOG_STARTUP, 0, "Started Minigame Manager\n"); + Debug1(LOG_STARTUP, 0, "Started Minigame Manager"); charCreationManager = new CharCreationManager(); if ( !charCreationManager->Initialize() ) @@ -539,7 +539,7 @@ } else { - Debug1(LOG_STARTUP,0,"Server status reporter initialized.\n"); + Debug1(LOG_STARTUP,0,"Server status reporter initialized."); } weathermanager->StartGameTime(); @@ -581,7 +581,7 @@ psserver->GetLogCSV()->Write(CSV_AUTHENT, status); - Notify3(LOG_CHARACTER, "Remove player '%s' (%d)\n", client->GetName(),client->GetClientNum() ); + Notify3(LOG_CHARACTER, "Remove player '%s' (%d)", client->GetName(),client->GetClientNum() ); client->Disconnect(); @@ -695,7 +695,7 @@ } else { - Bug2("Could not create valid psSystemMessage for client %u.\n",clientnum); + Bug2("Could not create valid psSystemMessage for client %u.",clientnum); } } @@ -720,7 +720,7 @@ } else { - Bug2("Could not create valid psSystemMessage for client %u.\n",clientnum); + Bug2("Could not create valid psSystemMessage for client %u.",clientnum); } } @@ -745,7 +745,7 @@ } else { - Bug2("Could not create valid psSystemMessage for client %u.\n",clientnum); + Bug2("Could not create valid psSystemMessage for client %u.",clientnum); } } @@ -770,7 +770,7 @@ } else { - Bug2("Could not create valid psSystemMessage for client %u.\n",clientnum); + Bug2("Could not create valid psSystemMessage for client %u.",clientnum); } } @@ -795,7 +795,7 @@ } else { - Bug2("Could not create valid psSystemMessage for client %u.\n",clientnum); + Bug2("Could not create valid psSystemMessage for client %u.",clientnum); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2009-10-12 09:50:55
|
Revision: 4644 http://planeshift.svn.sourceforge.net/planeshift/?rev=4644&view=rev Author: weltall2 Date: 2009-10-12 09:50:49 +0000 (Mon, 12 Oct 2009) Log Message: ----------- added missing space Modified Paths: -------------- trunk/src/server/psserver.cpp Modified: trunk/src/server/psserver.cpp =================================================================== --- trunk/src/server/psserver.cpp 2009-10-12 09:42:28 UTC (rev 4643) +++ trunk/src/server/psserver.cpp 2009-10-12 09:50:49 UTC (rev 4644) @@ -1225,9 +1225,9 @@ uint seconds = planned_shutdown%60; //get the seconds to the event when the minutes are subtracted csString quitInfo = "The server is already shutting down in "; if(minutes) //if we don't have minutes (so they are zero) skip them - quitInfo += minutes; quitInfo += "minutes "; + quitInfo += minutes; quitInfo += " minutes "; if(seconds) //if we don't have seconds (so they are zero) skip them - quitInfo += seconds; quitInfo += "seconds"; + quitInfo += seconds; quitInfo += " seconds"; CPrintf(CON_CMDOUTPUT, "%s\n", quitInfo.GetDataSafe()); //send the message to the server console if(client) SendSystemInfo(client->GetClientNum(),quitInfo.GetDataSafe()); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Kha...@us...> - 2009-12-01 15:59:59
|
Revision: 4853 http://planeshift.svn.sourceforge.net/planeshift/?rev=4853&view=rev Author: Khakilord Date: 2009-12-01 15:59:45 +0000 (Tue, 01 Dec 2009) Log Message: ----------- Fixed crash on server exit. Modified Paths: -------------- trunk/src/server/psserver.cpp Modified: trunk/src/server/psserver.cpp =================================================================== --- trunk/src/server/psserver.cpp 2009-12-01 15:02:33 UTC (rev 4852) +++ trunk/src/server/psserver.cpp 2009-12-01 15:59:45 UTC (rev 4853) @@ -173,7 +173,6 @@ delete usermanager; delete exchangemanager; delete netmanager; - delete database; delete marriageManager; delete spawnmanager; delete adminmanager; @@ -188,6 +187,7 @@ delete minigamemanager; delete cachemanager; delete questmanager; + delete database; delete logcsv; delete rng; delete gmeventManager; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2010-01-29 00:29:14
|
Revision: 5410 http://planeshift.svn.sourceforge.net/planeshift/?rev=5410&view=rev Author: weltall2 Date: 2010-01-29 00:25:31 +0000 (Fri, 29 Jan 2010) Log Message: ----------- forgot this Modified Paths: -------------- trunk/src/server/psserver.cpp Modified: trunk/src/server/psserver.cpp =================================================================== --- trunk/src/server/psserver.cpp 2010-01-28 23:21:40 UTC (rev 5409) +++ trunk/src/server/psserver.cpp 2010-01-29 00:25:31 UTC (rev 5410) @@ -91,7 +91,7 @@ #include "workmanager.h" // Remember to bump this in server_options.sql and add to upgrade_schema.sql! -#define DATABASE_VERSION_STR "1235" +#define DATABASE_VERSION_STR "1236" psCharacterLoader psServer::CharacterLoader; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2010-02-09 20:36:50
|
Revision: 5494 http://planeshift.svn.sourceforge.net/planeshift/?rev=5494&view=rev Author: weltall2 Date: 2010-02-09 20:36:44 +0000 (Tue, 09 Feb 2010) Log Message: ----------- missing files Modified Paths: -------------- trunk/src/server/psserver.cpp Modified: trunk/src/server/psserver.cpp =================================================================== --- trunk/src/server/psserver.cpp 2010-02-09 20:35:22 UTC (rev 5493) +++ trunk/src/server/psserver.cpp 2010-02-09 20:36:44 UTC (rev 5494) @@ -91,7 +91,7 @@ #include "workmanager.h" // Remember to bump this in server_options.sql and add to upgrade_schema.sql! -#define DATABASE_VERSION_STR "1237" +#define DATABASE_VERSION_STR "1238" psCharacterLoader psServer::CharacterLoader; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2010-02-09 20:41:57
|
Revision: 5496 http://planeshift.svn.sourceforge.net/planeshift/?rev=5496&view=rev Author: weltall2 Date: 2010-02-09 20:41:51 +0000 (Tue, 09 Feb 2010) Log Message: ----------- updated files (1.5/2) Modified Paths: -------------- trunk/src/server/psserver.cpp Modified: trunk/src/server/psserver.cpp =================================================================== --- trunk/src/server/psserver.cpp 2010-02-09 20:39:48 UTC (rev 5495) +++ trunk/src/server/psserver.cpp 2010-02-09 20:41:51 UTC (rev 5496) @@ -91,7 +91,7 @@ #include "workmanager.h" // Remember to bump this in server_options.sql and add to upgrade_schema.sql! -#define DATABASE_VERSION_STR "1239" +#define DATABASE_VERSION_STR "1238" psCharacterLoader psServer::CharacterLoader; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2010-08-06 17:28:58
|
Revision: 6142 http://planeshift.svn.sourceforge.net/planeshift/?rev=6142&view=rev Author: weltall2 Date: 2010-08-06 17:28:52 +0000 (Fri, 06 Aug 2010) Log Message: ----------- missing file with the db bump Modified Paths: -------------- trunk/src/server/psserver.cpp Modified: trunk/src/server/psserver.cpp =================================================================== --- trunk/src/server/psserver.cpp 2010-08-06 17:12:30 UTC (rev 6141) +++ trunk/src/server/psserver.cpp 2010-08-06 17:28:52 UTC (rev 6142) @@ -92,7 +92,7 @@ #include "workmanager.h" // Remember to bump this in server_options.sql and add to upgrade_schema.sql! -#define DATABASE_VERSION_STR "1250" +#define DATABASE_VERSION_STR "1251" psCharacterLoader psServer::CharacterLoader; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2010-08-17 20:51:34
|
Revision: 6163 http://planeshift.svn.sourceforge.net/planeshift/?rev=6163&view=rev Author: weltall2 Date: 2010-08-17 20:51:28 +0000 (Tue, 17 Aug 2010) Log Message: ----------- missing file Modified Paths: -------------- trunk/src/server/psserver.cpp Modified: trunk/src/server/psserver.cpp =================================================================== --- trunk/src/server/psserver.cpp 2010-08-17 20:43:42 UTC (rev 6162) +++ trunk/src/server/psserver.cpp 2010-08-17 20:51:28 UTC (rev 6163) @@ -92,7 +92,7 @@ #include "workmanager.h" // Remember to bump this in server_options.sql and add to upgrade_schema.sql! -#define DATABASE_VERSION_STR "1251" +#define DATABASE_VERSION_STR "1252" psCharacterLoader psServer::CharacterLoader; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2010-09-13 13:11:55
|
Revision: 6193 http://planeshift.svn.sourceforge.net/planeshift/?rev=6193&view=rev Author: weltall2 Date: 2010-09-13 13:11:49 +0000 (Mon, 13 Sep 2010) Log Message: ----------- forgot this Modified Paths: -------------- trunk/src/server/psserver.cpp Modified: trunk/src/server/psserver.cpp =================================================================== --- trunk/src/server/psserver.cpp 2010-09-13 10:34:45 UTC (rev 6192) +++ trunk/src/server/psserver.cpp 2010-09-13 13:11:49 UTC (rev 6193) @@ -92,7 +92,7 @@ #include "workmanager.h" // Remember to bump this in server_options.sql and add to upgrade_schema.sql! -#define DATABASE_VERSION_STR "1252" +#define DATABASE_VERSION_STR "1253" psCharacterLoader psServer::CharacterLoader; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rly...@us...> - 2010-12-03 21:59:01
|
Revision: 6483 http://planeshift.svn.sourceforge.net/planeshift/?rev=6483&view=rev Author: rlydontknow Date: 2010-12-03 21:58:55 +0000 (Fri, 03 Dec 2010) Log Message: ----------- added missing newline in error message Modified Paths: -------------- trunk/src/server/psserver.cpp Modified: trunk/src/server/psserver.cpp =================================================================== --- trunk/src/server/psserver.cpp 2010-12-03 21:20:24 UTC (rev 6482) +++ trunk/src/server/psserver.cpp 2010-12-03 21:58:55 UTC (rev 6483) @@ -300,7 +300,7 @@ csString db_version; if ( ! GetServerOption("db_version", db_version) ) { - CPrintf (CON_ERROR, "Couldn't determine database version. Error was %s.", db->GetLastError() ); + CPrintf (CON_ERROR, "Couldn't determine database version. Error was %s.\n", db->GetLastError() ); db = NULL; return false; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2010-12-23 21:33:47
|
Revision: 6570 http://planeshift.svn.sourceforge.net/planeshift/?rev=6570&view=rev Author: weltall2 Date: 2010-12-23 21:33:41 +0000 (Thu, 23 Dec 2010) Log Message: ----------- removed printf Modified Paths: -------------- trunk/src/server/psserver.cpp Modified: trunk/src/server/psserver.cpp =================================================================== --- trunk/src/server/psserver.cpp 2010-12-23 18:18:55 UTC (rev 6569) +++ trunk/src/server/psserver.cpp 2010-12-23 21:33:41 UTC (rev 6570) @@ -319,7 +319,7 @@ csRef<iBgLoader> loader = csQueryRegistry<iBgLoader>(object_reg); loader->PrecacheDataWait("/planeshift/materials/materials.cslib", false); -printf("a\n"); + csRef<iStringArray> meshes = vfs->FindFiles("/planeshift/meshes/"); for(size_t j=0; j<meshes->GetSize(); ++j) { @@ -327,7 +327,7 @@ } csRef<iStringArray> maps = vfs->FindFiles("/planeshift/world/"); -printf("b\n"); + for(size_t j=0; j<maps->GetSize(); ++j) { loader->PrecacheDataWait(maps->Get(j), false); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2011-02-12 06:22:59
|
Revision: 6908 http://planeshift.svn.sourceforge.net/planeshift/?rev=6908&view=rev Author: weltall2 Date: 2011-02-12 06:22:52 +0000 (Sat, 12 Feb 2011) Log Message: ----------- removed printf Modified Paths: -------------- trunk/src/server/psserver.cpp Modified: trunk/src/server/psserver.cpp =================================================================== --- trunk/src/server/psserver.cpp 2011-02-12 05:53:40 UTC (rev 6907) +++ trunk/src/server/psserver.cpp 2011-02-12 06:22:52 UTC (rev 6908) @@ -676,7 +676,6 @@ bool psServer::LoadMap(char* mapname) { - printf("%p\n", mapname); if (entitymanager->LoadMap(mapname)) { MapLoaded=true; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2013-11-19 19:27:36
|
Revision: 9009 http://sourceforge.net/p/planeshift/code/9009 Author: weltall2 Date: 2013-11-19 19:27:33 +0000 (Tue, 19 Nov 2013) Log Message: ----------- don't allow printf placeholders to be parsed twice causing an access out of bounds. Modified Paths: -------------- trunk/src/server/psserver.cpp Modified: trunk/src/server/psserver.cpp =================================================================== --- trunk/src/server/psserver.cpp 2013-11-19 19:22:58 UTC (rev 9008) +++ trunk/src/server/psserver.cpp 2013-11-19 19:27:33 UTC (rev 9009) @@ -738,7 +738,8 @@ csString cssLine = csString().FormatV(fmt, args); va_end(args); - psSystemMessage newmsg(clientnum ,MSG_INFO, cssLine.GetData()); + // As the message fmt was already parsed there is no need to do it again. + psSystemMessageSafe newmsg(clientnum ,MSG_INFO, cssLine.GetData()); if(newmsg.valid) { @@ -763,7 +764,8 @@ csString cssLine = csString().FormatV(fmt, args); va_end(args); - psSystemMessage newmsg(clientnum ,MSG_INFO_BASE, cssLine.GetData()); + // As the message fmt was already parsed there is no need to do it again. + psSystemMessageSafe newmsg(clientnum ,MSG_INFO_BASE, cssLine.GetData()); if(newmsg.valid) { @@ -788,7 +790,8 @@ csString cssLine = csString().FormatV(fmt, args); va_end(args); - psSystemMessage newmsg(clientnum ,MSG_RESULT, cssLine.GetData()); + // As the message fmt was already parsed there is no need to do it again. + psSystemMessageSafe newmsg(clientnum ,MSG_RESULT, cssLine.GetData()); if(newmsg.valid) { @@ -813,7 +816,8 @@ csString cssLine = csString().FormatV(fmt, args); va_end(args); - psSystemMessage newmsg(clientnum ,MSG_OK, cssLine.GetData()); + // As the message fmt was already parsed there is no need to do it again. + psSystemMessageSafe newmsg(clientnum ,MSG_OK, cssLine.GetData()); if(newmsg.valid) { @@ -838,7 +842,8 @@ csString cssLine = csString().FormatV(fmt, args); va_end(args); - psSystemMessage newmsg(clientnum ,MSG_ERROR, cssLine.GetData()); + // As the message fmt was already parsed there is no need to do it again. + psSystemMessageSafe newmsg(clientnum ,MSG_ERROR, cssLine.GetData()); if(newmsg.valid) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ral...@us...> - 2014-04-12 03:45:02
|
Revision: 9411 http://sourceforge.net/p/planeshift/code/9411 Author: ralphcampbell Date: 2014-04-12 03:44:59 +0000 (Sat, 12 Apr 2014) Log Message: ----------- Fix CID 1139469 Modified Paths: -------------- trunk/src/server/psserver.cpp Modified: trunk/src/server/psserver.cpp =================================================================== --- trunk/src/server/psserver.cpp 2014-04-12 00:02:16 UTC (rev 9410) +++ trunk/src/server/psserver.cpp 2014-04-12 03:44:59 UTC (rev 9411) @@ -127,18 +127,21 @@ progression = NULL; npcmanager = NULL; spellmanager = NULL; + rng = NULL; questmanager = NULL; gmeventManager = NULL; bankmanager = NULL; + hiremanager = NULL; intromanager = NULL; songManager = NULL; mathscriptengine = NULL; + objreg = NULL; cachemanager = NULL; logcsv = NULL; vfs = NULL; server_quit_event = NULL; unused_pid = 0; - + MapLoaded = false; } #define PS_CHECK_REF_COUNT(c) printf("%3d %s\n",c->GetRefCount(),#c) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |