[adonthell-wastesedge-commits] Release_0-3-1 fab3f01 015/237: Fixed a graphical bug on the map

[Kai Sterker]

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

    Fixed a graphical bug on the map
    Fixed bug with game loading
    (Alex)
---
 maps/test.map                         |  Bin 848 -> 847 bytes
 scripts/schedules/keyboard_control.py |   22 ++++------------------
 2 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/maps/test.map b/maps/test.map
index 46076e8..14dd757 100755
Binary files a/maps/test.map and b/maps/test.map differ
diff --git a/scripts/schedules/keyboard_control.py 
b/scripts/schedules/keyboard_control.py
index d2f90d4..1304294 100755
--- a/scripts/schedules/keyboard_control.py
+++ b/scripts/schedules/keyboard_control.py
@@ -3,8 +3,7 @@ from main_menu import *
 # -- When the menu is closing, react accordingly
 def on_menu_close (retval, player):
     # -- Reactivate the player's schedule
-    player.set_schedule_active (1)
-    
+#    player.set_schedule_active (1)
     # -- Quit was selected, so that's what we do :)
     if retval == 5:
         map_engine.quit ()
@@ -26,7 +25,7 @@ if input_has_been_pushed (SDLK_SPACE):
 # -- bring up the main menu
 elif input_has_been_pushed (SDLK_ESCAPE):
     # -- deactivate the player's schedule, so he can't move while the menu is 
open
-    myself.set_schedule_active (0)
+#    myself.set_schedule_active (0)
 
     # -- open main menu without animation, with saving and background enabled
        #print "rt"
@@ -54,7 +53,7 @@ elif input_has_been_pushed (SDLK_l):
     s = data_screen (LOAD_SCREEN)
     s.thisown = 0
     s.set_activate (1) 
-    s.py_signal_connect (on_menu_close, win_event_CLOSE, (myself))
+#    s.py_signal_connect (on_menu_close, win_event_CLOSE, (myself))
     
     win_manager_add (s)
     win_manager_set_focus (s)
@@ -67,19 +66,6 @@ elif input_has_been_pushed (SDLK_s):
     s = data_screen (SAVE_SCREEN)
     s.thisown = 0
     s.set_activate (1) 
-    s.py_signal_connect (on_menu_close, win_event_CLOSE, (myself))
+#    s.py_signal_connect (on_menu_close, win_event_CLOSE, (myself))
     win_manager_add (s)
     win_manager_set_focus (s)
-
-
-
-
-
-
-
-
-
-
-
-
-