[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] CVS: Games/Pingus/src/worldmap node.cxx,1.5,1.6
From: |
grumbel |
Subject: |
[Pingus-CVS] CVS: Games/Pingus/src/worldmap node.cxx,1.5,1.6 |
Date: |
2 Aug 2002 11:25:49 -0000 |
Update of /usr/local/cvsroot/Games/Pingus/src/worldmap
In directory dark:/tmp/cvs-serv29308/worldmap
Modified Files:
node.cxx
Log Message:
even more gui/input cleanup, client still broken, but already half working
Index: node.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldmap/node.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- node.cxx 1 Aug 2002 21:40:02 -0000 1.5
+++ node.cxx 2 Aug 2002 11:25:47 -0000 1.6
@@ -29,6 +29,7 @@
#include "../sound.hxx"
#include "../pingus_resource.hxx"
#include "../globals.hxx"
+#include "../screen_manager.hxx"
#include "node.hxx"
using namespace Pingus::WorldMap;
@@ -107,11 +108,10 @@
PingusSound::play_sound(path_manager.complete("sounds/letsgo.wav"));
/** We could reuse the plf here */
- PingusGameSession game (path_manager.complete(levelname));
- // Launch the game and wait until it is finished
- game.start ();
-
+ ScreenManager::instance()->push_screen
+ (new PingusGameSession (path_manager.complete(levelname)), true);
+ /*
if (game.get_result ().finished ())
{
finished = true;
@@ -120,13 +120,14 @@
{
console.puts("Please try again!");
}
+ */
}
else
{
std::cout << "LevelNode::on_click (): Error: level is invalid" <<
std::endl;
}
- PingusResource::cleanup ();
+ //PingusResource::cleanup ();
}
void
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] CVS: Games/Pingus/src/worldmap node.cxx,1.5,1.6,
grumbel <=