[Clonekeenplus-commits] [SCM] clonekeenplus branch, master, updated. c92a2c6372b8f1fc1ce69da0720fc86a70edd233

[Gerstrong <ger...@us...>]

       via  c92a2c6372b8f1fc1ce69da0720fc86a70edd233 (commit)
      from  28064f4d41b16310adc95c4ee72d1f7dc63f51fc (commit)


- Log -----------------------------------------------------------------
commit c92a2c6372b8f1fc1ce69da0720fc86a70edd233
Author: Gerhard Stein <ger...@gm...>
Date:   Wed Aug 25 07:32:16 2010 +0200

    fixed a small crash we had in Galaxy when loading a level

-----------------------------------------------------------------------

Summary of changes:
 makeAllBuilds.sh                      |    2 ++
 src/common/CPhysicsSettings.h         |    3 +--
 src/engine/CPassive.cpp               |    3 ---
 src/engine/CPassive.h                 |    2 --
 src/engine/galaxy/CPlayGameGalaxy.cpp |    3 +--
 src/engine/playgame/CPlayGame.h       |    2 +-
 6 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/makeAllBuilds.sh b/makeAllBuilds.sh
index 939eb25..541b974 100755
--- a/makeAllBuilds.sh
+++ b/makeAllBuilds.sh
@@ -12,6 +12,8 @@ make
 cmake . -DBUILD_TYPE=LINUX32 -DDEBUG=OFF -DOGG=yes -DTREMOR=NO
 make
 
+rm CMakeBuilds -R
+
 # upload the packages
 #rsync -e ssh CG-SVN-${dt}-win32.zip gerstrong,clo...@fr...:/home/frs/project/c/cl/clonekeenplus/
 #rsync -e ssh CCG-SVN-${dt}-linux32.zip gerstrong,clo...@fr...:/home/frs/project/c/cl/clonekeenplus/
diff --git a/src/common/CPhysicsSettings.h b/src/common/CPhysicsSettings.h
index b303555..fb88c96 100644
--- a/src/common/CPhysicsSettings.h
+++ b/src/common/CPhysicsSettings.h
@@ -7,8 +7,7 @@
  *  This class has been created to fill with information
  *  about some physical values. Those values were defines before.
  *  Now they are constants. We might provide modding for those values
- *  This Vorticon only!!!
- *  in future.
+ *  This is Vorticon only!!!
  */
 
 #ifndef CPHYSICSSETTINGS_H_
diff --git a/src/engine/CPassive.cpp b/src/engine/CPassive.cpp
index af41294..7f29723 100644
--- a/src/engine/CPassive.cpp
+++ b/src/engine/CPassive.cpp
@@ -21,6 +21,3 @@ CPassive::CPassive(CExeFile &Exefile,
 	m_NumPlayers = 0; // because no game chosen
 }
 
-CPassive::~CPassive() {
-}
-
diff --git a/src/engine/CPassive.h b/src/engine/CPassive.h
index de35ad9..fa873ce 100644
--- a/src/engine/CPassive.h
+++ b/src/engine/CPassive.h
@@ -49,8 +49,6 @@ public:
 	
 	virtual void cleanup() {};
 	
-	virtual ~CPassive();
-
 	char m_mode;
 	
 	CMenuVorticon *mp_Menu;
diff --git a/src/engine/galaxy/CPlayGameGalaxy.cpp b/src/engine/galaxy/CPlayGameGalaxy.cpp
index 732cdc3..833af5f 100644
--- a/src/engine/galaxy/CPlayGameGalaxy.cpp
+++ b/src/engine/galaxy/CPlayGameGalaxy.cpp
@@ -90,8 +90,6 @@ void CPlayGameGalaxy::process()
 	CEventContainer& EventContainer = g_pBehaviorEngine->m_EventList;
 	if( EventEnterLevel* ev = EventContainer.occurredEvent<EventEnterLevel>() )
 	{
-		EventContainer.pop_Event();
-
 		// Start a new level!
 		if(ev->data > 0xC000)
 		{
@@ -99,6 +97,7 @@ void CPlayGameGalaxy::process()
 			m_LevelPlay.loadLevel(ev->data - 0xC000);
 			m_LevelPlay.setActive(true);
 		}
+		EventContainer.pop_Event();
 	}
 	else if( EventContainer.occurredEvent<EventExitLevel>() )
 	{
diff --git a/src/engine/playgame/CPlayGame.h b/src/engine/playgame/CPlayGame.h
index f03acf4..95d257a 100644
--- a/src/engine/playgame/CPlayGame.h
+++ b/src/engine/playgame/CPlayGame.h
@@ -41,7 +41,7 @@ public:
 	virtual ~CPlayGame();
 
 protected:
-	char m_NumPlayers;
+	unsigned char m_NumPlayers;
 	bool m_endgame;
 	CExeFile &m_ExeFile;
 	char m_Episode;


hooks/post-receive
-- 
clonekeenplus