diff options
| author | Alan Aguiar <alanjas@hotmail.com> | 2013-08-11 22:58:02 (GMT) |
|---|---|---|
| committer | Alan Aguiar <alanjas@hotmail.com> | 2013-08-11 22:58:02 (GMT) |
| commit | fe124a018760e24e6594f9a466abbb3ee15db3b4 (patch) | |
| tree | 76ca8957bd77e4ddc13f5f3be1c7940290cd9e61 /src/game/HallState.py | |
| parent | e7973f02f5509a975f44360de9cd82c6a04f991b (diff) | |
check boundary hall states
Diffstat (limited to 'src/game/HallState.py')
| -rw-r--r-- | src/game/HallState.py | 31 |
1 files changed, 22 insertions, 9 deletions
diff --git a/src/game/HallState.py b/src/game/HallState.py index 94f586e..30303e9 100644 --- a/src/game/HallState.py +++ b/src/game/HallState.py @@ -110,25 +110,32 @@ class CHallState(CGameState): elif self.mLeftArrow.clicked(): print 'previous game' self.mCurrentSelectedArea = self.mCurrentSelectedArea - 1 - CGame().setBackground(self.mBackgroundList[self.mCurrentSelectedArea]) - self.mPlayer.mDestX = 1000 - self.mPlayer.setXY(1400, 500) - #self.mPlayer.setState(1) + if self.mCurrentSelectedArea < 0: + self.mCurrentSelectedArea = 0 + else: + CGame().setBackground(self.mBackgroundList[self.mCurrentSelectedArea]) + self.mPlayer.mDestX = 1000 + self.mPlayer.setXY(1400, 500) elif self.mRightArrow.clicked(): print 'next game' self.mCurrentSelectedArea = self.mCurrentSelectedArea + 1 - CGame().setBackground(self.mBackgroundList[self.mCurrentSelectedArea]) - self.mPlayer.mDestX = 200 - self.mPlayer.setXY(-200, 500) + if self.mCurrentSelectedArea > 5: + self.mCurrentSelectedArea = 5 + else: + CGame().setBackground(self.mBackgroundList[self.mCurrentSelectedArea]) + self.mPlayer.mDestX = 200 + self.mPlayer.setXY(-200, 500) elif (CMath.pointInsidePolygon(CMouse().getX(), CMouse().getY(), self.AREA1_POLYGON)): if not(self.mDoorIs): CGame().addChild(self.mDoor) self.mDoorIs = True if (CMouse().release()): - a1g1 = CArea1Game1() - CGame().setState(a1g1) + if self.mCurrentSelectedArea == 0: + a1g1 = CArea1Game1() + CGame().setState(a1g1) + else: if self.mDoorIs: CGame().removeChild(self.mDoor) @@ -144,6 +151,12 @@ class CHallState(CGameState): CGame().removeChild(self.mDoor) #self.mDoor.destroy() self.mDoor = None + CGame().removeChild(self.mLeftArrow) + self.mLeftArrow.destroy() + self.mLeftArrow = None + CGame().removeChild(self.mRightArrow) + self.mRightArrow.destroy() + self.mRightArrow = None CGame().removeChild(self.mPlayer) self.mPlayer.destroy() self.mPlayer = None |