From: <wel...@us...> - 2010-04-03 19:26:28
|
Revision: 5762 http://planeshift.svn.sourceforge.net/planeshift/?rev=5762&view=rev Author: weltall2 Date: 2010-04-03 19:26:22 +0000 (Sat, 03 Apr 2010) Log Message: ----------- fixed uninit variable patch by agy Modified Paths: -------------- trunk/src/client/psengine.cpp Modified: trunk/src/client/psengine.cpp =================================================================== --- trunk/src/client/psengine.cpp 2010-04-03 18:46:53 UTC (rev 5761) +++ trunk/src/client/psengine.cpp 2010-04-03 19:26:22 UTC (rev 5762) @@ -388,6 +388,7 @@ //Check if sound is on or off in psclient.cfg csString soundPlugin; + soundOn = true; // FIXMESOUND is this variable REALLY needed and if not how do we handle this in future? SndSysMgr = new SoundSystemManager; SndSysMgr->Initialize ( object_reg ); SoundManager = new psSoundManager; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2010-05-16 05:23:02
|
Revision: 5920 http://planeshift.svn.sourceforge.net/planeshift/?rev=5920&view=rev Author: weltall2 Date: 2010-05-16 05:22:56 +0000 (Sun, 16 May 2010) Log Message: ----------- removed some printf Modified Paths: -------------- trunk/src/client/psengine.cpp Modified: trunk/src/client/psengine.cpp =================================================================== --- trunk/src/client/psengine.cpp 2010-05-15 17:15:15 UTC (rev 5919) +++ trunk/src/client/psengine.cpp 2010-05-16 05:22:56 UTC (rev 5920) @@ -1533,10 +1533,8 @@ if (oNode) { chatWidget = oNode->GetAttributeValue("value"); - printf("%s\n", chatWidget.GetData()); if(!chatWidget.Length()) //if none are defined put a default one - { - chatWidget = "chat.xml"; printf("a\n"); } + chatWidget = "chat.xml"; } } return chatWidget; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rly...@us...> - 2010-06-05 18:13:00
|
Revision: 5963 http://planeshift.svn.sourceforge.net/planeshift/?rev=5963&view=rev Author: rlydontknow Date: 2010-06-05 18:12:54 +0000 (Sat, 05 Jun 2010) Log Message: ----------- removed showing the loader count that was intended for debugging Modified Paths: -------------- trunk/src/client/psengine.cpp Modified: trunk/src/client/psengine.cpp =================================================================== --- trunk/src/client/psengine.cpp 2010-06-05 04:54:46 UTC (rev 5962) +++ trunk/src/client/psengine.cpp 2010-06-05 18:12:54 UTC (rev 5963) @@ -960,15 +960,7 @@ fpsDisplay.Format("%.2f", getFPS()); g2d->Write(font, 5, 5, g2d->FindRGB(255, 255, 255), -1, fpsDisplay); } - - // show loader count - if (loader && backgroundWorldLoading) - { - csString loaderDisplay; - loaderDisplay.Format("%lu", loader->GetLoadingCount()); - g2d->Write(font, 50, 5, g2d->FindRGB(255, 255, 255), -1, loaderDisplay); - } - + paws->Draw(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rly...@us...> - 2010-07-06 21:59:20
|
Revision: 6010 http://planeshift.svn.sourceforge.net/planeshift/?rev=6010&view=rev Author: rlydontknow Date: 2010-07-06 21:59:14 +0000 (Tue, 06 Jul 2010) Log Message: ----------- fixed indention Modified Paths: -------------- trunk/src/client/psengine.cpp Modified: trunk/src/client/psengine.cpp =================================================================== --- trunk/src/client/psengine.cpp 2010-07-06 21:58:26 UTC (rev 6009) +++ trunk/src/client/psengine.cpp 2010-07-06 21:59:14 UTC (rev 6010) @@ -954,12 +954,12 @@ g3d->BeginDraw(CSDRAW_2DGRAPHICS); if (effectManager) effectManager->Render2D(g3d, g2d); - if (showFPS) - { - csString fpsDisplay; - fpsDisplay.Format("%.2f", getFPS()); - g2d->Write(font, 5, 5, g2d->FindRGB(255, 255, 255), -1, fpsDisplay); - } + if (showFPS) + { + csString fpsDisplay; + fpsDisplay.Format("%.2f", getFPS()); + g2d->Write(font, 5, 5, g2d->FindRGB(255, 255, 255), -1, fpsDisplay); + } paws->Draw(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rly...@us...> - 2010-08-10 00:12:38
|
Revision: 6149 http://planeshift.svn.sourceforge.net/planeshift/?rev=6149&view=rev Author: rlydontknow Date: 2010-08-10 00:12:32 +0000 (Tue, 10 Aug 2010) Log Message: ----------- fixed frame limit Modified Paths: -------------- trunk/src/client/psengine.cpp Modified: trunk/src/client/psengine.cpp =================================================================== --- trunk/src/client/psengine.cpp 2010-08-08 17:01:42 UTC (rev 6148) +++ trunk/src/client/psengine.cpp 2010-08-10 00:12:32 UTC (rev 6149) @@ -1028,20 +1028,10 @@ // If we're loading then do special handling. if(zonehandler.IsValid() && zonehandler->IsLoading()) { - // Do 30 frame updates a second at most. - if(elapsedTime < 33) - { - // If we're not due to update then sleep. - csSleep(33 - elapsedTime); - } - - // Now it's time to draw another frame. - elapsed = csGetTicks(); - return true; + sleeptime = 1000/30; } - // Define sleeptimes - if(!camera) + else if(!camera) { // Get the window static pawsWidget* credits = NULL; @@ -1049,14 +1039,16 @@ credits = paws->FindWidget("CreditsWindow", false); if(credits && credits->IsVisible()) - sleeptime = 10; + sleeptime = 1000/60; else - sleeptime = 30; + sleeptime = 1000/30; } else + { sleeptime = frameLimit; + } - timeFPS += elapsedTime; + timeFPS += sleeptime; countFPS++; if(timeFPS > 500) { @@ -1064,11 +1056,11 @@ timeFPS = 0; countFPS = 0; } - elapsed = csGetTicks(); // Here we sacrifice drawing AND loading time if(elapsedTime < sleeptime) csSleep(sleeptime - elapsedTime); + elapsed = csGetTicks(); return true; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rly...@us...> - 2010-10-11 13:46:49
|
Revision: 6266 http://planeshift.svn.sourceforge.net/planeshift/?rev=6266&view=rev Author: rlydontknow Date: 2010-10-11 13:46:43 +0000 (Mon, 11 Oct 2010) Log Message: ----------- fixed FPS calculation Modified Paths: -------------- trunk/src/client/psengine.cpp Modified: trunk/src/client/psengine.cpp =================================================================== --- trunk/src/client/psengine.cpp 2010-10-10 19:22:00 UTC (rev 6265) +++ trunk/src/client/psengine.cpp 2010-10-11 13:46:43 UTC (rev 6266) @@ -1064,20 +1064,22 @@ sleeptime = frameLimit; } - timeFPS += sleeptime; + // Here we sacrifice drawing AND loading time + if(elapsedTime < sleeptime) + csSleep(sleeptime - elapsedTime); + + timeFPS -= elapsed; + elapsed = csGetTicks(); + + timeFPS += elapsed; countFPS++; if(timeFPS > 500) { - currFPS = 1000.0 * countFPS / timeFPS; - timeFPS = 0; - countFPS = 0; + currFPS = 1000.0 * countFPS / timeFPS; + timeFPS = 0; + countFPS = 0; } - // Here we sacrifice drawing AND loading time - if(elapsedTime < sleeptime) - csSleep(sleeptime - elapsedTime); - elapsed = csGetTicks(); - return true; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2010-11-01 08:05:19
|
Revision: 6330 http://planeshift.svn.sourceforge.net/planeshift/?rev=6330&view=rev Author: weltall2 Date: 2010-11-01 08:05:13 +0000 (Mon, 01 Nov 2010) Log Message: ----------- fixed build. acraig you should have a look Modified Paths: -------------- trunk/src/client/psengine.cpp Modified: trunk/src/client/psengine.cpp =================================================================== --- trunk/src/client/psengine.cpp 2010-10-31 02:19:38 UTC (rev 6329) +++ trunk/src/client/psengine.cpp 2010-11-01 08:05:13 UTC (rev 6330) @@ -192,7 +192,7 @@ #include "gui/pawsconfigchatbubbles.h" #include "gui/pawsconfigshadows.h" #include "gui/pawsnpcdialog.h" -#include "gui/bartender.h" +//#include "gui/bartender.h" // Needed for debugging @@ -819,7 +819,7 @@ RegisterFactory (pawsConfigChatBubblesFactory); RegisterFactory (pawsConfigShadowsFactory); RegisterFactory (pawsNpcDialogWindowFactory); - RegisterFactory (pawsBartenderWindowFactory); + //RegisterFactory (pawsBartenderWindowFactory); RegisterFactory (pawsCraftCancelWindowFactory); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2010-11-05 15:27:25
|
Revision: 6353 http://planeshift.svn.sourceforge.net/planeshift/?rev=6353&view=rev Author: weltall2 Date: 2010-11-05 15:27:19 +0000 (Fri, 05 Nov 2010) Log Message: ----------- uncommented those lines as the needed files are now in place Modified Paths: -------------- trunk/src/client/psengine.cpp Modified: trunk/src/client/psengine.cpp =================================================================== --- trunk/src/client/psengine.cpp 2010-11-05 15:20:28 UTC (rev 6352) +++ trunk/src/client/psengine.cpp 2010-11-05 15:27:19 UTC (rev 6353) @@ -192,7 +192,7 @@ #include "gui/pawsconfigchatbubbles.h" #include "gui/pawsconfigshadows.h" #include "gui/pawsnpcdialog.h" -//#include "gui/bartender.h" +#include "gui/bartender.h" // Needed for debugging @@ -819,7 +819,7 @@ RegisterFactory (pawsConfigChatBubblesFactory); RegisterFactory (pawsConfigShadowsFactory); RegisterFactory (pawsNpcDialogWindowFactory); - //RegisterFactory (pawsBartenderWindowFactory); + RegisterFactory (pawsBartenderWindowFactory); RegisterFactory (pawsCraftCancelWindowFactory); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rly...@us...> - 2010-11-18 13:45:29
|
Revision: 6408 http://planeshift.svn.sourceforge.net/planeshift/?rev=6408&view=rev Author: rlydontknow Date: 2010-11-18 13:45:23 +0000 (Thu, 18 Nov 2010) Log Message: ----------- removed superflous call to iGraphics3D::BeginDraw Modified Paths: -------------- trunk/src/client/psengine.cpp Modified: trunk/src/client/psengine.cpp =================================================================== --- trunk/src/client/psengine.cpp 2010-11-18 09:52:48 UTC (rev 6407) +++ trunk/src/client/psengine.cpp 2010-11-18 13:45:23 UTC (rev 6408) @@ -951,7 +951,6 @@ paws->Draw3D(); if(camera && loadstate == LS_DONE) { - g3d->BeginDraw(CSDRAW_3DGRAPHICS); camera->Draw(); return true; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2011-03-28 04:48:30
|
Revision: 7113 http://planeshift.svn.sourceforge.net/planeshift/?rev=7113&view=rev Author: weltall2 Date: 2011-03-28 04:48:24 +0000 (Mon, 28 Mar 2011) Log Message: ----------- missing file Modified Paths: -------------- trunk/src/client/psengine.cpp Modified: trunk/src/client/psengine.cpp =================================================================== --- trunk/src/client/psengine.cpp 2011-03-27 21:35:05 UTC (rev 7112) +++ trunk/src/client/psengine.cpp 2011-03-28 04:48:24 UTC (rev 7113) @@ -195,6 +195,7 @@ #include "gui/pawsconfigshadows.h" #include "gui/pawsnpcdialog.h" #include "gui/bartender.h" +#include "gui/pawsconfigtooltips.h" // Needed for debugging @@ -833,6 +834,7 @@ RegisterFactory (pawsNpcDialogWindowFactory); RegisterFactory (pawsBartenderWindowFactory); RegisterFactory (pawsCraftCancelWindowFactory); + RegisterFactory (pawsConfigTooltipsFactory); } //----------------------------------------------------------------------------- This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2011-08-02 18:33:36
|
Revision: 7578 http://planeshift.svn.sourceforge.net/planeshift/?rev=7578&view=rev Author: weltall2 Date: 2011-08-02 18:33:30 +0000 (Tue, 02 Aug 2011) Log Message: ----------- use crystal space libraries instead of win32 api Modified Paths: -------------- trunk/src/client/psengine.cpp Modified: trunk/src/client/psengine.cpp =================================================================== --- trunk/src/client/psengine.cpp 2011-08-02 18:32:46 UTC (rev 7577) +++ trunk/src/client/psengine.cpp 2011-08-02 18:33:30 UTC (rev 7578) @@ -385,8 +385,9 @@ // Check for Windows software OpenGL renderer. if(hwRenderer == "GDI Generic") { - printf("PlaneShift requires hardware acceleration (OpenGL). Make sure your video card drivers are up-to-date."); - ::MessageBoxA( NULL, "PlaneShift requires hardware acceleration (OpenGL). Make sure your video card drivers are up-to-date.", "Warning!", MB_OK + MB_ICONERROR ); + printf("PlaneShift requires hardware acceleration (OpenGL). Make sure your video card drivers are up-to-date.\n"); + csRef<iWin32Assistant> assistant = csQueryRegistry<iWin32Assistant>(object_reg); + assistant->AlertV(psEngine::hwnd, CS_ALERT_ERROR, "Warning!", 0, "PlaneShift requires hardware acceleration (OpenGL). Make sure your video card drivers are up-to-date.", 0); } csRef<iWin32Canvas> canvas = scfQueryInterface<iWin32Canvas> (g2d); // This does not seem to give the correct window handle. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lpa...@us...> - 2012-05-30 21:44:17
|
Revision: 8334 http://planeshift.svn.sourceforge.net/planeshift/?rev=8334&view=rev Author: lpancallo Date: 2012-05-30 21:44:11 +0000 (Wed, 30 May 2012) Log Message: ----------- Loading logger before sound manager, so we can see sound debugs Modified Paths: -------------- trunk/src/client/psengine.cpp Modified: trunk/src/client/psengine.cpp =================================================================== --- trunk/src/client/psengine.cpp 2012-05-30 20:29:46 UTC (rev 8333) +++ trunk/src/client/psengine.cpp 2012-05-30 21:44:11 UTC (rev 8334) @@ -421,11 +421,12 @@ soundOn = true; // FIXMESOUND is this variable REALLY needed and if not how do we handle this in future? + // Load Logger settings + LoadLogSettings(); + // Initialize sound SoundManager->InitializeSectors(); - LoadLogSettings(); - // Mount the selected gui first to allow overwriting of certain elements csString skinPath; skinPath += cfgmgr->GetStr("PlaneShift.GUI.Skin.Dir", "/planeshift/art/skins/"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ma...@us...> - 2013-11-24 12:57:04
|
Revision: 9031 http://sourceforge.net/p/planeshift/code/9031 Author: magodra Date: 2013-11-24 12:57:02 +0000 (Sun, 24 Nov 2013) Log Message: ----------- - Fixed compiler warning. Modified Paths: -------------- trunk/src/client/psengine.cpp Modified: trunk/src/client/psengine.cpp =================================================================== --- trunk/src/client/psengine.cpp 2013-11-24 12:42:20 UTC (rev 9030) +++ trunk/src/client/psengine.cpp 2013-11-24 12:57:02 UTC (rev 9031) @@ -51,7 +51,8 @@ } \ #define RegisterFactory(factoryclass) \ - factory = new factoryclass(); + factory = new factoryclass(); \ + CS_ASSERT(factory); ////////////////////////////////////////////////////////////////////////////// This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ral...@us...> - 2014-01-27 06:23:32
|
Revision: 9226 http://sourceforge.net/p/planeshift/code/9226 Author: ralphcampbell Date: 2014-01-27 06:23:26 +0000 (Mon, 27 Jan 2014) Log Message: ----------- Fix NULL pointer crash if exiting before netmanager is initialized. Modified Paths: -------------- trunk/src/client/psengine.cpp Modified: trunk/src/client/psengine.cpp =================================================================== --- trunk/src/client/psengine.cpp 2014-01-27 06:22:26 UTC (rev 9225) +++ trunk/src/client/psengine.cpp 2014-01-27 06:23:26 UTC (rev 9226) @@ -1257,7 +1257,8 @@ void psEngine::Disconnect() { - netmanager->Disconnect(); + if (netmanager) + netmanager->Disconnect(); } //---------------------------------------------------------------------------- This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ral...@us...> - 2014-03-03 01:44:33
|
Revision: 9306 http://sourceforge.net/p/planeshift/code/9306 Author: ralphcampbell Date: 2014-03-03 01:44:30 +0000 (Mon, 03 Mar 2014) Log Message: ----------- Hide NPCDialogWindow at start. Modified Paths: -------------- trunk/src/client/psengine.cpp Modified: trunk/src/client/psengine.cpp =================================================================== --- trunk/src/client/psengine.cpp 2014-03-03 00:54:19 UTC (rev 9305) +++ trunk/src/client/psengine.cpp 2014-03-03 01:44:30 UTC (rev 9306) @@ -1502,6 +1502,7 @@ HideWindow("WritingWindow"); HideWindow("CraftCancelWindow"); HideWindow("ScriptHiredNPCWindow"); + HideWindow("NPCDialogWindow"); paws->GetMouse()->ChangeImage("Skins Normal Mouse Pointer"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |