[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[adonthell-wastesedge-commits] Release_0-3-4 93d678d 14/22: FIXED freezi
From: |
Kai Sterker |
Subject: |
[adonthell-wastesedge-commits] Release_0-3-4 93d678d 14/22: FIXED freezing of game right near the end |
Date: |
Mon, 25 Jul 2016 18:15:49 +0000 (UTC) |
tag: Release_0-3-4
commit 93d678d0e455b17ad0f1b9ae7b9977f1b84af2a2
Author: Kai Sterker <address@hidden>
Commit: Kai Sterker <address@hidden>
FIXED freezing of game right near the end
---
scripts/dialogues/jelom_2nd.py | 12 ++++++------
scripts/modules/console.py | 2 +-
scripts/schedules/mapcharacters/to_cellar.py | 3 ++-
3 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/scripts/dialogues/jelom_2nd.py b/scripts/dialogues/jelom_2nd.py
index 383fd1a..bc4008a 100644
--- a/scripts/dialogues/jelom_2nd.py
+++ b/scripts/dialogues/jelom_2nd.py
@@ -103,7 +103,7 @@ class jelom_2nd (dialogue.base):
("Default", -1, ((36, 0, -1), )),\
("Erek Stonebreaker", -1, ((37, 0, -1), )),\
("Default", 2, ()),\
- ("Default", -1, ((39, 0, 8), (34, 0, 7), (32, 0, -1), )),\
+ ("Default", -1, ((39, 0, 8), (34, 0, 7), )),\
(None, -1, ((40, 0, -1), )),\
("Default", -1, ())]
@@ -126,21 +126,21 @@ class jelom_2nd (dialogue.base):
jelom = adonthell.gamedata_get_character("Jelom Rasgar")
jelom.set_schedule ("to_cellar")
jelom.time_callback_string ("1t", "walk")
-
+
player = adonthell.gamedata_player ()
+ player.set_schedule_active (1)
player.set_schedule ("to_cellar")
- player.resume ()
player.time_callback_string ("2t", "walk")
-
+
erek = adonthell.gamedata_get_character("Erek Stonebreaker")
erek.resume ()
erek.set_schedule ("to_cellar")
erek.time_callback_string ("3t", "walk")
-
+
fnir = adonthell.gamedata_get_character("Fellnir Kezular")
fnir.set_schedule ("to_cellar")
fnir.time_callback_string ("4t", "walk")
-
+
illig = adonthell.gamedata_get_character("Tristan Illig")
illig.set_schedule ("to_cellar")
illig.time_callback_string ("7t", "walk")
diff --git a/scripts/modules/console.py b/scripts/modules/console.py
index cf47515..8e918ed 100755
--- a/scripts/modules/console.py
+++ b/scripts/modules/console.py
@@ -79,7 +79,7 @@ class console (adonthell.win_container):
self.hist_idx = len (self.history)
# -- quit?
- if text == "quit":
+ if text == "quit" or text == "exit":
self.write_history ()
adonthell.gamedata_engine ().main_quit ()
diff --git a/scripts/schedules/mapcharacters/to_cellar.py
b/scripts/schedules/mapcharacters/to_cellar.py
index df6aa38..962307a 100644
--- a/scripts/schedules/mapcharacters/to_cellar.py
+++ b/scripts/schedules/mapcharacters/to_cellar.py
@@ -38,7 +38,8 @@ class to_cellar:
(0, 3, adonthell.STAND_WEST), \
(5, 3, adonthell.STAND_EAST), \
(5, 1, adonthell.STAND_NORTH), \
- (5, 1, adonthell.STAND_NORTH)]
+ (5, 1, adonthell.STAND_NORTH), \
+ (4, 1, adonthell.STAND_SOUTH)]
self.myself.set_callback (self.walk)
- [adonthell-wastesedge-commits] tag Release_0-3-4 created (now 184650b), Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-4 44a6e77 02/22: FIXED output of autogen.sh (s/Adonthell/Waste's Edge/ - copy & paste is evil!), Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-4 b083ac4 16/22: ADDED icons for OS X, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-4 9ef5c12 21/22: FIXED 'make dist', Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-4 30906a2 17/22: IMPROVED speed of end sequence, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-4 c0f10e1 05/22: FIXED extro, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-4 f3faace 04/22: ADDED a few files used by the binary distribution for BeOS 5, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-4 93d678d 14/22: FIXED freezing of game right near the end,
Kai Sterker <=
- [adonthell-wastesedge-commits] Release_0-3-4 474606c 09/22: FIXED can't leave through door when coming through window and S. is free (thanks Leif Thande), Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-4 e47f051 07/22: ADDED installation instructions, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-4 dd04699 13/22: FIXED autogen.sh to use newest versions of autotools, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-4 50eddcb 20/22: UPDATED ReadMe.html for italian translation, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-4 ed9afe1 01/22: FIXED autogen.sh (no longer deletes intl/Makefile.in), Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-4 4fe3fa2 19/22: UPDATED stuff for v0.3.4, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-4 d26087e 08/22: FIXED missing option in Jalom's dialogue, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-4 184650b 22/22: FIXED (really???) end sequence bug (thanks Avanger), Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-4 edb0cfd 10/22: Fixed a typo in Oliver's dialog (thanks Leif!), Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-4 14dbaef 11/22: UPDATED to GNU gettext 0.13, Kai Sterker, 2016/07/25