[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[adonthell-wastesedge-commits] Release_0-3-1 c31d284 145/237: MOVED fadi
From: |
Kai Sterker |
Subject: |
[adonthell-wastesedge-commits] Release_0-3-1 c31d284 145/237: MOVED fading code to mapengine |
Date: |
Mon, 25 Jul 2016 18:15:07 +0000 (UTC) |
tag: Release_0-3-1
commit c31d28470b37f5602e3512297779c01c77d1f72c
Author: adondev <adondev>
Commit: adondev <adondev>
MOVED fading code to mapengine
---
scripts/init.py | 73 +++++++++++++++---------------------------
scripts/modules/main_menu.py | 2 ++
2 files changed, 27 insertions(+), 48 deletions(-)
diff --git a/scripts/init.py b/scripts/init.py
index 3d44900..b85b546 100755
--- a/scripts/init.py
+++ b/scripts/init.py
@@ -17,32 +17,6 @@ from adonthell import *
from main_menu import *
import time
-# -- Fade the screen out
-def fade_out ():
- i = 0
-
- while i < 60:
- gamedata_map_engine ().mainloop ()
-
- screen_transition (i * 2)
- screen_show ()
-
- gametime_update ()
- i = i + (gametime_frames_to_do () * 2)
-
-# -- Fade the screen in
-def fade_in ():
- i = 60
-
- while i > 0:
- gamedata_map_engine ().mainloop ()
-
- screen_transition (i * 2)
- screen_show ()
-
- gametime_update ()
- i = i - (gametime_frames_to_do () * 2)
-
class title_screen:
def __init__ (self):
# -- load our music
@@ -196,32 +170,14 @@ class title_screen:
# -- on to the main menu
def on_menu_close (self, retval):
- fade_out ()
-
- screen_display.fillrect (0, 0, screen_length (), screen_height (), 0)
- screen_show ()
-
- # -- cleanup
- win_manager_remove (self.window)
-
- self.window.remove (self.bag_o)
- self.window.remove (self.bag_c)
- self.window.remove (self.bag_t)
-
- del self.bag_o
- del self.bag_c
- del self.bag_t
-
- self.retval = 0
- audio_pause_music ()
-
- ##retval = 1
-
if retval < 5:
gamedata_map_engine ().set_should_update_map (1)
# -- start new game
if retval == 1:
+ gamedata_map_engine ().fade_out ()
+ self.cleanup ()
+
gamedata_load_characters (0)
gamedata_load_quests (0)
@@ -233,10 +189,31 @@ class title_screen:
win_manager_add (self.cs)
win_manager_set_focus (self.cs)
+ # -- Load game
+ else:
+ self.cleanup ()
+ gamedata_map_engine ().fade_in ()
else:
gamedata_map_engine ().quit ()
+ # -- cleanup
+ def cleanup (self):
+ win_manager_remove (self.window)
+
+ self.window.remove (self.bag_o)
+ self.window.remove (self.bag_c)
+ self.window.remove (self.bag_t)
+
+ del self.bag_o
+ del self.bag_c
+ del self.bag_t
+
+ self.retval = 0
+ audio_pause_music ()
+
+ screen_display.fillrect (0, 0, 320, 240, 0)
+ screen_show ()
def on_cs_close (self, retval):
# Launches the intro
@@ -1043,7 +1020,7 @@ class title_screen:
audio_play_background (1)
gametime_update ()
- fade_in ()
+ gamedata_map_engine ().fade_in ()
# -- Main --
title = title_screen ()
diff --git a/scripts/modules/main_menu.py b/scripts/modules/main_menu.py
index 3a9d794..072c5ae 100755
--- a/scripts/modules/main_menu.py
+++ b/scripts/modules/main_menu.py
@@ -177,6 +177,8 @@ class main_menu (win_container):
# -- Callback to close the window
def on_destroy (self):
+ if self.quit == 0:
+ print "Closing Main Menu ..."
return self.quit
# -- pressing ESC will close the menu if it's open
- [adonthell-wastesedge-commits] Release_0-3-1 31f9068 122/237: Schedule to get everybody down the cellar, (continued)
- [adonthell-wastesedge-commits] Release_0-3-1 31f9068 122/237: Schedule to get everybody down the cellar, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 ed1c142 160/237: FIXED Makefile.am's, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 6087908 137/237: ADDED Bjarn's schedule, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 69c9103 210/237: Fixed the extro a bit, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 79418df 227/237: ADDED Enter as alternative 'Action' key, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 4f1725f 119/237: FIXED erek and jelom, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 8fdfd66 165/237: Added Barn interior, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 48053be 090/237: Updated the init script, so you can skip the title sequence, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 547a59d 130/237: FIXED the mess I made ; P, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 b1a1e7a 154/237: ADDED extro dialogue, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 c31d284 145/237: MOVED fading code to mapengine,
Kai Sterker <=
- [adonthell-wastesedge-commits] Release_0-3-1 78eb33a 147/237: UPDATED scripts to make use of the new win_manager features, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 22057de 206/237: ADDED new music, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 fb80ca7 128/237: Corrected a problem with the name., Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 8054ed1 175/237: ADDED gem found in Silverhair's luggage, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 39a6545 170/237: Fixed gate and added Kitchen's furnitures, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 febb1af 187/237: ADDED in-game music!, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 88aa49d 067/237: Fixed Oliver's teleportation bug., Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 558cf65 088/237: Fixed the mess I made yesterday. Sorry., Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 0924f07 144/237: ADDED final part to Bjarn's dialogue, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 c20844e 118/237: UPDATED Erek's dialogue, Kai Sterker, 2016/07/25