[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[adonthell-wastesedge-commits] Release_0-3-1 06c1205 149/237: FIXED Pyth
From: |
Kai Sterker |
Subject: |
[adonthell-wastesedge-commits] Release_0-3-1 06c1205 149/237: FIXED Python console |
Date: |
Mon, 25 Jul 2016 18:15:08 +0000 (UTC) |
tag: Release_0-3-1
commit 06c1205e3217970e9e947969c729475ceefd9fe1
Author: adondev <adondev>
Commit: adondev <adondev>
FIXED Python console
---
scripts/modules/console.py | 18 ++++--------------
scripts/schedules/mapcharacters/keyboard_control.py | 17 +++++++++++------
2 files changed, 15 insertions(+), 20 deletions(-)
diff --git a/scripts/modules/console.py b/scripts/modules/console.py
index fe944ad..06596ca 100755
--- a/scripts/modules/console.py
+++ b/scripts/modules/console.py
@@ -25,13 +25,10 @@ class console (adonthell.win_container):
self.namespace = ns
self.history = []
self.hist_idx = 0
- self.thisown = 0
- self.quit = 1
# read the old history
self.read_history ()
- self.py_signal_connect (self.on_destroy, adonthell.win_event_DESTROY)
self.py_signal_connect (self.on_update, adonthell.win_event_UPDATE)
# -- get font and theme
@@ -69,10 +66,6 @@ class console (adonthell.win_container):
self.entry.set_focus (1)
self.entry.set_activate (1)
- # -- cleanup --
- def __del__(self):
- self.write_history ()
-
# -- callback for command execution
def on_execute (self):
text = self.entry.text_char ()
@@ -94,16 +87,13 @@ class console (adonthell.win_container):
error = "Error:\n " + str (type) + ":\n \"" + str (value) +
"\""
self.entry.set_text (error)
- # -- callback to close the window
- def on_destroy (self):
- return self.quit
-
- # -- catch relevant keypresses
+ # -- catch relevant keypresses
def on_update (self):
# -- quit
if adonthell.input_has_been_pushed (adonthell.SDLK_TAB):
- self.quit = 0
-
+ self.write_history ()
+ adonthell.gamedata_engine ().main_quit ()
+
# -- clear screen
elif adonthell.input_has_been_pushed (adonthell.SDLK_DELETE):
self.entry.set_text ("")
diff --git a/scripts/schedules/mapcharacters/keyboard_control.py
b/scripts/schedules/mapcharacters/keyboard_control.py
index 6b90a2d..6a719a4 100755
--- a/scripts/schedules/mapcharacters/keyboard_control.py
+++ b/scripts/schedules/mapcharacters/keyboard_control.py
@@ -152,12 +152,17 @@ class keyboard_control:
# -- python console
elif input_has_been_pushed (SDLK_TAB):
import console
+
c = console.console (globals ())
- c.thisown = C
- # c.py_signal_connect (self.on_data_screen_close, win_event_CLOSE)
- # Stop updating the map
- # gamedata_map_engine ().set_should_update_map (0)
c.set_activate (1)
- win_manager_add (c)
- win_manager_set_focus (c)
+
+ # -- Stop updating the map
+ gamedata_engine ().set_update_map (0)
+
+ # -- open the console
+ gamedata_engine ().main (c, "console")
+
+ # -- continue
+ gamedata_engine ().set_update_map (1)
+
c = None
- [adonthell-wastesedge-commits] Release_0-3-1 3bc0ac3 230/237: FIXED a little bug in Sarin's dialogue, (continued)
- [adonthell-wastesedge-commits] Release_0-3-1 3bc0ac3 230/237: FIXED a little bug in Sarin's dialogue, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 c544301 203/237: Some fixes to some dialogues, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 f47e582 148/237: FIXED start of new game, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 b4a0e9c 073/237: Others furnitures added, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 cdc0455 199/237: ADDED Ryan O'Neil to credits, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 12bc098 195/237: ADDED credits to the extro, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 b770dc8 111/237: ADDED 'name your character' dialog that pops up when starting a new game, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 5f31f05 215/237: Small fixes, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 c49550c 161/237: IMPROVED Erek slightly, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 f470b9c 198/237: CHANGED credits, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 06c1205 149/237: FIXED Python console,
Kai Sterker <=
- [adonthell-wastesedge-commits] Release_0-3-1 07b6477 176/237: ADDED more gameplay, hooray!, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 20e2b04 188/237: CHANGED stables to pantry, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 c8fca18 186/237: FIXED extro, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 fa60e79 139/237: Building now creates byte-compiled script files, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 c2af165 106/237: Added the final mapcharacters., Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 bfb1042 180/237: IMPROVED chest-owners, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 b239465 152/237: CHANGED scripts to new character handling, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 9a014b6 191/237: FIXES to the extro, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 770b604 235/237: REMOVED ^M's from end of line, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 eb644d3 229/237: FIXED Audio should now be in sync with the extro, Kai Sterker, 2016/07/25