From: <mg...@us...> - 2008-12-03 02:48:43
|
Revision: 2603 http://planeshift.svn.sourceforge.net/planeshift/?rev=2603&view=rev Author: mgist Date: 2008-12-03 02:48:40 +0000 (Wed, 03 Dec 2008) Log Message: ----------- - Last compile fixes to eedit and pawseditor. Modified Paths: -------------- personal/Xordan/src/eedit/eeditapp.cpp personal/Xordan/src/tools/pawseditor/pawseditorapp.cpp Modified: personal/Xordan/src/eedit/eeditapp.cpp =================================================================== --- personal/Xordan/src/eedit/eeditapp.cpp 2008-12-03 02:33:04 UTC (rev 2602) +++ personal/Xordan/src/eedit/eeditapp.cpp 2008-12-03 02:48:40 UTC (rev 2603) @@ -231,9 +231,6 @@ // Register our event handler event_handler = csPtr<EventHandler> (new EventHandler (this)); csEventID esub[] = { - csevProcess (object_reg), - csevPostProcess (object_reg), - csevFinalProcess (object_reg), csevFrame (object_reg), csevMouseEvent (object_reg), csevKeyboardEvent (object_reg), @@ -364,19 +361,10 @@ if (controlManager->HandleEvent(ev)) return true; - if (ev.Name == csevProcess (object_reg)) + if (ev.Name == csevFrame (object_reg)) { Update(); - return true; - } - else if (ev.Name == csevFinalProcess (object_reg)) - { - g3d->FinishDraw (); - g3d->Print (0); - return true; - } - else if (ev.Name == csevPostProcess (object_reg)) - { + if (drawScreen) { g3d->BeginDraw(CSDRAW_2DGRAPHICS); @@ -386,6 +374,11 @@ { csSleep(150); } + + g3d->FinishDraw (); + g3d->Print (0); + + return true; } else if (ev.Name == csevCanvasHidden (object_reg, g3d->GetDriver2D ())) drawScreen = false; Modified: personal/Xordan/src/tools/pawseditor/pawseditorapp.cpp =================================================================== --- personal/Xordan/src/tools/pawseditor/pawseditorapp.cpp 2008-12-03 02:33:04 UTC (rev 2602) +++ personal/Xordan/src/tools/pawseditor/pawseditorapp.cpp 2008-12-03 02:48:40 UTC (rev 2603) @@ -207,10 +207,6 @@ // Register our event handler event_handler = csPtr<EventHandler> (new EventHandler (this)); csEventID esub[] = { - csevPreProcess (object_reg), - csevProcess (object_reg), - csevPostProcess (object_reg), - csevFinalProcess (object_reg), csevFrame (object_reg), csevMouseEvent (object_reg), csevKeyboardEvent (object_reg), @@ -481,19 +477,10 @@ if (paws->HandleEvent(ev)) return true; - if (ev.Name == csevProcess (object_reg)) + if (ev.Name == csevFrame (object_reg)) { Update(); - return true; - } - else if (ev.Name == csevFinalProcess (object_reg)) - { - g3d->FinishDraw (); - g3d->Print (0); - return true; - } - else if (ev.Name == csevPostProcess (object_reg)) - { + if (drawScreen) { g3d->BeginDraw(engine->GetBeginDrawFlags() | CSDRAW_2DGRAPHICS); @@ -503,6 +490,11 @@ { csSleep(150); } + + g3d->FinishDraw (); + g3d->Print (0); + + return true; } else if (ev.Name == csevCanvasHidden (object_reg, g3d->GetDriver2D ())) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |