[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[adonthell-wastesedge-commits] master e5e4325 15/21: FIXED game quitting
From: |
Kai Sterker |
Subject: |
[adonthell-wastesedge-commits] master e5e4325 15/21: FIXED game quitting when pressing ESC while menu labels are sliding in |
Date: |
Mon, 25 Jul 2016 18:16:39 +0000 (UTC) |
branch: master
commit e5e432507debc0b4a9897795aa443a1b98bb28b0
Author: Kai Sterker <address@hidden>
Commit: Kai Sterker <address@hidden>
FIXED game quitting when pressing ESC while menu labels are sliding in
---
scripts/modules/main_menu.py | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/scripts/modules/main_menu.py b/scripts/modules/main_menu.py
index 41a26c8..4176da7 100755
--- a/scripts/modules/main_menu.py
+++ b/scripts/modules/main_menu.py
@@ -202,6 +202,13 @@ class main_menu (win_container):
# -- pressing ESC will close the menu if it's open
if input_has_been_pushed (SDLK_ESCAPE):
+ # -- if the options are still sliding in, skip
+ if self.startup > 0:
+ # -- center labels again
+ for label in self.labels:
+ label.move ((self.length()-label.length())//2, label.y ())
+ return
+
# -- If we're on the title screen, then exit the game
if self.enable_save == 0: self.retval = 5
else: self.retval = 0
- [adonthell-wastesedge-commits] branch master created (now d1164d8), Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] master d0bc1d0 03/21: FIXED creation of adonthell-wastesedge script, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] master 6fe08b7 06/21: FIXED label size not adjusted properly after changing option value, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] master a296535 02/21: ADDED script to add game data to OSX app bundle, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] master e5e4325 15/21: FIXED game quitting when pressing ESC while menu labels are sliding in,
Kai Sterker <=
- [adonthell-wastesedge-commits] master 16eedb1 17/21: ADDED bitmap to use as Window and taskbar icon, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] master 20eb806 04/21: FIXED launcher script inside bundle needs to determine correct path at runtime, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] master 2b7e807 07/21: FIXED garbage showing up in first frame of intro, due to uninitialized label, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] master 17ad166 05/21: FIXED replacing of bundle executable, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] master 8267c01 08/21: FIXED compatibility with Python 2.3, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] master 2120713 19/21: REMOVED Debian specific files; those are taken care of by the package maintainer, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] master d1164d8 21/21: UPDATED windows package and installer scripts, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] master 88062ca 14/21: UPDATE text position during Redwyne Inn part of intro, so it is better readable, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] master 428cd53 20/21: CHANGED font from avatar.ttf (whose license was unclear) with Aclonica, which is licensed under the Apache 2.0 License, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] master 5b8b830 18/21: UPDATED order of icons from largest to smallest, Kai Sterker, 2016/07/25