[adonthell-wastesedge-commits] Release_0-3-4 93d678d 14/22: FIXED freezing of game right near the end

[Kai Sterker]

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)