[adonthell-wastesedge-commits] Release_0-3-1 56fe2ff 046/237: Fixed Oliver's teleport bug.

[Kai Sterker]

tag: Release_0-3-1
commit 56fe2ff09faebf0d100982b3760c616b78498c26
Author: adondev <adondev>
Commit: adondev <adondev>

    Fixed Oliver's teleport bug.
---
 scripts/dialogues/orloth_start.py     |    2 +-
 scripts/modules/events.py             |    1 -
 scripts/schedules/keyboard_control.py |    2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/scripts/dialogues/orloth_start.py 
b/scripts/dialogues/orloth_start.py
index e3178fa..495f260 100755
--- a/scripts/dialogues/orloth_start.py
+++ b/scripts/dialogues/orloth_start.py
@@ -32,10 +32,10 @@ class orloth_start:
     def __del__ (self):
         oliver = characters["Oliver Redwyne"]
         if oliver.get_val ("goto_players_room") == 1:
-            oliver.set_val ("goto_players_room", 2)
             from events import switch_submap
             switch_submap (the_player, 12, 5, 3, 1)
             switch_submap (oliver, 12, 5, 4, 0)
+            oliver.set_val ("goto_players_room", 2)
     
 
 
diff --git a/scripts/modules/events.py b/scripts/modules/events.py
index 017d19e..4e15ef8 100755
--- a/scripts/modules/events.py
+++ b/scripts/modules/events.py
@@ -45,7 +45,6 @@ def fade_in ():
 def switch_submap (mychar, x, y, submap, dir):
     if mychar.is_schedule_activated ():
         mychar.set_schedule_active (0)
-        mychar.stand ()
         schedule_active = 1
     else:
         schedule_active = 0
diff --git a/scripts/schedules/keyboard_control.py 
b/scripts/schedules/keyboard_control.py
index 2cd8222..6d1498d 100755
--- a/scripts/schedules/keyboard_control.py
+++ b/scripts/schedules/keyboard_control.py
@@ -47,7 +47,7 @@ def close_gate ():
         sm.get_square (6, 19).set_walkable_west (0)
         sm.get_square (6, 20).set_walkable_west (0)
 
-#print "%d %d %d" % (myself.submap (), myself.posx (), myself.posy ())
+print "%d %d %d" % (myself.submap (), myself.posx (), myself.posy ())
 
 if input_has_been_pushed (SDLK_o):
     open_gate ()