[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] CVS: Games/Pingus/src/editor editor_event.cxx,1.48,1.49
From: |
grumbel |
Subject: |
[Pingus-CVS] CVS: Games/Pingus/src/editor editor_event.cxx,1.48,1.49 |
Date: |
3 Mar 2003 20:32:20 -0000 |
Update of /usr/local/cvsroot/Games/Pingus/src/editor
In directory dark:/tmp/cvs-serv31575/editor
Modified Files:
editor_event.cxx
Log Message:
seperated PLF loading a bit, not 100% sure if this is a good idea or not.
Index: editor_event.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/editor_event.cxx,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- editor_event.cxx 19 Feb 2003 09:50:36 -0000 1.48
+++ editor_event.cxx 3 Mar 2003 20:32:18 -0000 1.49
@@ -26,29 +26,31 @@
#include <ClanLib/Display/Input/keyboard.h>
#include <ClanLib/Display/Display/display.h>
#include <ClanLib/Display/Input/mouse.h>
-#include "../html_browser.hxx"
+
#include "../debug.hxx"
-#include "../globals.hxx"
#include "../game_session.hxx"
-#include "../system.hxx"
-#include "../pingus_error.hxx"
+#include "../globals.hxx"
+#include "../gui/screen_manager.hxx"
+#include "../html_browser.hxx"
#include "../loading.hxx"
#include "../my_gettext.hxx"
-#include "selection.hxx"
-#include "editorobj_group.hxx"
-#include "string_reader.hxx"
-#include "editor_event.hxx"
-#include "scroll_map.hxx"
-#include "panel.hxx"
-#include "object_selector.hxx"
-#include "editor.hxx"
+#include "../pingus_error.hxx"
+#include "../pingus_resource.hxx"
+#include "../system.hxx"
#include "action_window.hxx"
-#include "property_window.hxx"
+#include "editor.hxx"
+#include "editor_event.hxx"
+#include "editor_view.hxx"
+#include "editorobj_group.hxx"
#include "level_property_window.hxx"
#include "level_resizer.hxx"
+#include "object_selector.hxx"
#include "object_selector_window.hxx"
-#include "../gui/screen_manager.hxx"
-#include "editor_view.hxx"
+#include "panel.hxx"
+#include "property_window.hxx"
+#include "scroll_map.hxx"
+#include "selection.hxx"
+#include "string_reader.hxx"
namespace EditorNS {
@@ -510,7 +512,7 @@
try
{
std::string levelfile = editor->save_tmp_level();
- ScreenManager::instance()->push_screen(new PingusGameSession
(levelfile), true);
+ ScreenManager::instance()->push_screen(new PingusGameSession
(PingusResource::load_plf_raw(levelfile)), true);
}
catch(const PingusError& err)
{
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] CVS: Games/Pingus/src/editor editor_event.cxx,1.48,1.49,
grumbel <=
- Prev by Date:
[Pingus-CVS] CVS: Games/Pingus/src Makefile.static,1.12,1.13 game_session.cxx,1.29,1.30 game_session.hxx,1.16,1.17 pingus_main.cxx,1.48,1.49 pingus_resource.cxx,1.22,1.23 pingus_resource.hxx,1.11,1.12 theme.cxx,1.12,1.13 world.cxx,1.39,1.40 world.hxx,1.25,1.26
- Next by Date:
[Pingus-CVS] CVS: Games/Pingus/src/worldmap level_dot.cxx,1.8,1.9 level_dot.hxx,1.5,1.6 worldmap.cxx,1.31,1.32
- Previous by thread:
[Pingus-CVS] CVS: Games/Pingus/src Makefile.static,1.12,1.13 game_session.cxx,1.29,1.30 game_session.hxx,1.16,1.17 pingus_main.cxx,1.48,1.49 pingus_resource.cxx,1.22,1.23 pingus_resource.hxx,1.11,1.12 theme.cxx,1.12,1.13 world.cxx,1.39,1.40 world.hxx,1.25,1.26
- Next by thread:
[Pingus-CVS] CVS: Games/Pingus/src/worldmap level_dot.cxx,1.8,1.9 level_dot.hxx,1.5,1.6 worldmap.cxx,1.31,1.32
- Index(es):