CVS: bzflag/src/bzflag clientCommands.cxx,2.23,2.24 playing.cxx,2.170,2.171

[Ian A. <la...@us...>]

Update of /cvsroot/bzflag/bzflag/src/bzflag
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18782/src/bzflag

Modified Files:
	clientCommands.cxx playing.cxx 
Log Message:
check if we are falling when we want to pause. it previously only checked if we had jumped

Index: clientCommands.cxx
===================================================================
RCS file: /cvsroot/bzflag/bzflag/src/bzflag/clientCommands.cxx,v
retrieving revision 2.23
retrieving revision 2.24
diff -w -u -r2.23 -r2.24
--- clientCommands.cxx	26 Dec 2005 13:06:20 -0000	2.23
+++ clientCommands.cxx	29 Dec 2005 04:34:26 -0000	2.24
@@ -406,7 +406,7 @@
       // (could get stuck on un-pause if flag is taken)
       hud->setAlert(1, "Can't pause while inside a building", 1.0f, false);
 
-    } else if (myTank->getLocation() == LocalPlayer::InAir) {
+    } else if (myTank->getLocation() == LocalPlayer::InAir || myTank->isFalling()) {
       // custom message when trying to pause when jumping/falling
       hud->setAlert(1, "Can't pause when you are in the air", 1.0f, false);
 

Index: playing.cxx
===================================================================
RCS file: /cvsroot/bzflag/bzflag/src/bzflag/playing.cxx,v
retrieving revision 2.170
retrieving revision 2.171
diff -w -u -r2.170 -r2.171
--- playing.cxx	29 Dec 2005 03:25:59 -0000	2.170
+++ playing.cxx	29 Dec 2005 04:34:26 -0000	2.171
@@ -5659,7 +5659,7 @@
 	// (could get stuck on un-pause if flag is taken/lost)
 	hud->setAlert(1, "Can't pause while inside a building", 1.0f, false);
 
-      } else if (myTank->getLocation() == LocalPlayer::InAir) {
+      } else if (myTank->getLocation() == LocalPlayer::InAir || myTank->isFalling()) {
 	// custom message when trying to pause when jumping/falling
 	hud->setAlert(1, "Can't pause when you are in the air", 1.0f, false);