[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.24,1.25
From: |
grumbel |
Subject: |
[Pingus-CVS] CVS: Games/Pingus/src/editor editor_event.cxx,1.24,1.25 |
Date: |
2 Aug 2002 11:25:49 -0000 |
Update of /usr/local/cvsroot/Games/Pingus/src/editor
In directory dark:/tmp/cvs-serv29308/editor
Modified Files:
editor_event.cxx
Log Message:
even more gui/input cleanup, client still broken, but already half working
Index: editor_event.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/editor_event.cxx,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- editor_event.cxx 2 Jul 2002 16:06:51 -0000 1.24
+++ editor_event.cxx 2 Aug 2002 11:25:47 -0000 1.25
@@ -44,6 +44,7 @@
#include "action_window.hxx"
#include "property_window.hxx"
#include "level_property_window.hxx"
+#include "../screen_manager.hxx"
EditorEvent::EditorEvent()
: is_enabled (1)
@@ -509,11 +510,7 @@
try {
std::string levelfile = editor->save_tmp_level();
- PingusGameSession game (levelfile);
- /*
- game.start_game(levelfile + ".plf",
- levelfile + ".psm");*/
- game.start ();
+ ScreenManager::instance()->push_screen(new PingusGameSession (levelfile));
}
catch(PingusError err) {
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] CVS: Games/Pingus/src/editor editor_event.cxx,1.24,1.25,
grumbel <=
- Prev by Date:
[Pingus-CVS] CVS: Games/Pingus/src/worldmap node.cxx,1.5,1.6
- Next by Date:
[Pingus-CVS] CVS: Games/Pingus/src action_button.cxx,1.4,1.5 action_button.hxx,1.4,1.5 button_panel.cxx,1.7,1.8 button_panel.hxx,1.5,1.6 client.cxx,1.7,1.8 client.hxx,1.6,1.7 game_session.cxx,1.2,1.3 game_session.hxx,1.3,1.4 multiplayer_client_child.cxx,1.5,1.6 pingus_main.cxx,1.8,1.9 playfield.cxx,1.7,1.8 playfield.hxx,1.5,1.6 screen.hxx,1.4,1.5 screen_manager.cxx,1.3,1.4 screen_manager.hxx,1.4,1.5 theme.cxx,1.2,1.3
- Previous by thread:
[Pingus-CVS] CVS: Games/Pingus/src/worldmap node.cxx,1.5,1.6
- Next by thread:
[Pingus-CVS] CVS: Games/Pingus/src action_button.cxx,1.4,1.5 action_button.hxx,1.4,1.5 button_panel.cxx,1.7,1.8 button_panel.hxx,1.5,1.6 client.cxx,1.7,1.8 client.hxx,1.6,1.7 game_session.cxx,1.2,1.3 game_session.hxx,1.3,1.4 multiplayer_client_child.cxx,1.5,1.6 pingus_main.cxx,1.8,1.9 playfield.cxx,1.7,1.8 playfield.hxx,1.5,1.6 screen.hxx,1.4,1.5 screen_manager.cxx,1.3,1.4 screen_manager.hxx,1.4,1.5 theme.cxx,1.2,1.3
- Index(es):