Author: grumbel
Date: 2007-01-16 08:42:09 +0100 (Tue, 16 Jan 2007)
New Revision: 2671
Modified:
branches/pingus_sdl/src/pingus_main.cxx
branches/pingus_sdl/src/pingus_main.hxx
Log:
- enabled editor
Modified: branches/pingus_sdl/src/pingus_main.cxx
===================================================================
--- branches/pingus_sdl/src/pingus_main.cxx 2007-01-16 07:40:41 UTC (rev
2670)
+++ branches/pingus_sdl/src/pingus_main.cxx 2007-01-16 07:42:09 UTC (rev
2671)
@@ -81,7 +81,7 @@
#include "worldmap/manager.hxx"
//#include "worldobj_factory.hxx"
-// #include "editor/editor_screen.hxx"
+#include "editor/editor_screen.hxx"
#if _MSC_VER >= 1400
// Disable stupid deprecation warnings
@@ -755,7 +755,7 @@
}
else if (editor == true)
{
- //ScreenManager::instance()->push_screen (new Editor::EditorScreen());
+ ScreenManager::instance()->push_screen (new Editor::EditorScreen());
}
else // start a normal game
{
Modified: branches/pingus_sdl/src/pingus_main.hxx
===================================================================
--- branches/pingus_sdl/src/pingus_main.hxx 2007-01-16 07:40:41 UTC (rev
2670)
+++ branches/pingus_sdl/src/pingus_main.hxx 2007-01-16 07:42:09 UTC (rev
2671)
@@ -33,7 +33,7 @@
bool blitter_test;
bool no_config_file;
bool show_credits;
- bool editor;
+ bool editor;
/// the name of the exe: argv[0]
std::string executable_name;
_______________________________________________
pingus-cvs mailing list
[email protected]
http://lists.nongnu.org/mailman/listinfo/pingus-cvs
