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

[Casey B. <fc...@us...>]

       via  b61c91ba37305e1ed808558cac017fd45928b4d8 (commit)
      from  75c91e7cc7fe93801a48c17422b1ee6d9b091891 (commit)


- Log -----------------------------------------------------------------
commit b61c91ba37305e1ed808558cac017fd45928b4d8
Author: Casey <casey@crunchbang.(none)>
Date:   Mon Jan 17 21:23:00 2011 -0500

    Fixed subsequent parts of save game bug.  This isn't a particularily elegant solution, but it is simple and that's the best that I can do right now.

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

Summary of changes:
 src/engine/vorticon/playgame/CPlayGameVorticon.cpp |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/engine/vorticon/playgame/CPlayGameVorticon.cpp b/src/engine/vorticon/playgame/CPlayGameVorticon.cpp
index dde3581..1b30793 100644
--- a/src/engine/vorticon/playgame/CPlayGameVorticon.cpp
+++ b/src/engine/vorticon/playgame/CPlayGameVorticon.cpp
@@ -335,7 +335,7 @@ void CPlayGameVorticon::process()
 		}
 
 		// Open the Main Menu if ESC Key pressed and mp_Menu not opened
-		if(!mp_Menu && !mp_Finale && g_pInput->getPressedCommand(IC_QUIT) )
+		if( !mp_Menu && !mp_Finale && g_pInput->getPressedCommand(IC_QUIT) )
 		{	// Open the menu
 			if( m_Player[0].solid ){
 				mp_Menu = new CMenuVorticon( ACTIVE, m_ExeFile, m_Map, m_SavedGame, mp_option, m_restartVideo, m_hideobjects );
@@ -458,21 +458,21 @@ void CPlayGameVorticon::handleFKeys()
 	}*/
 
     // F2 - Sound Menu
-    if (g_pInput->getPressedKey(KF2))
+    if (g_pInput->getPressedKey(KF2) && m_Player[0].solid )
     {
 		mp_Menu = new CMenuVorticon( ACTIVE, m_ExeFile, m_Map,
 									m_SavedGame, mp_option, m_restartVideo, m_hideobjects );
 		mp_Menu->init(AUDIO);
     }
     // F3 - Controls Menu
-    else if (g_pInput->getPressedKey(KF3))
+    else if (g_pInput->getPressedKey(KF3) && m_Player[0].solid )
     {
 		mp_Menu = new CMenuVorticon( ACTIVE, m_ExeFile, m_Map,
 									m_SavedGame, mp_option, m_restartVideo, m_hideobjects );
 		mp_Menu->init(CONTROLS);
     }
     // F5 - save game
-    else if (g_pInput->getPressedKey(KF5))
+    else if ( g_pInput->getPressedKey(KF5) && m_Player[0].solid )
     {
 		mp_Menu = new CMenuVorticon( ACTIVE, m_ExeFile, m_Map,
 									m_SavedGame, mp_option, m_restartVideo, m_hideobjects );


hooks/post-receive
-- 
clonekeenplus