--- a/console.c Tue Aug 24 22:41:42 2004 +0000
+++ b/console.c Wed Aug 25 08:55:53 2004 +0000
@@ -16,7 +16,7 @@
static byte _iconsole_cbuffer[80];
static byte _iconsole_cmdline[255];
static byte _iconsole_cmdpos;
-static byte _iconsole_mode;
+static byte _iconsole_mode = ICONSOLE_CLOSED;
static byte _iconsole_color_default = 1;
static byte _iconsole_color_error = 3;
static byte _iconsole_color_debug = 5;
@@ -66,7 +66,8 @@
{
switch(e->event) {
- case WE_PAINT:
+ case WE_PAINT:
+
GfxFillRect(w->left,w->top,w->width,w->height-1,0);
{
int i=_iconsole_scroll;
@@ -82,10 +83,6 @@
case WE_TICK:
- if (_iconsole_mode==ICONSOLE_OPENING) {
- _iconsole_mode=ICONSOLE_OPENED;
- }
-
_icursor_counter++;
if (_icursor_counter>_icursor_rate) {
_icursor_state=!_icursor_state;
@@ -223,7 +220,7 @@
_iconsole_win = AllocateWindowDesc(&_iconsole_window_desc);
_iconsole_win->height = _screen.height / 3;
_iconsole_win->width= _screen.width;
- _iconsole_mode=ICONSOLE_OPENING;
+ _iconsole_mode=ICONSOLE_OPENED;
} else
if (_iconsole_mode==ICONSOLE_OPENED) {
DeleteWindow(_iconsole_win);
@@ -236,7 +233,8 @@
}
void IConsoleClose() {
-if (_iconsole_mode==ICONSOLE_OPENED) IConsoleSwitch();
+if (_iconsole_mode==ICONSOLE_OPENED) IConsoleSwitch();
+_iconsole_mode=ICONSOLE_CLOSED;
}
void IConsoleOpen() {
@@ -1188,7 +1186,6 @@
var = IConsoleVarAlloc(ICONSOLE_VAR_UINT32);
IConsoleVarInsert(var,"temp_uint32");
-
var = IConsoleVarAlloc(ICONSOLE_VAR_STRING);
IConsoleVarInsert(var,"temp_string");
}
--- a/console.h Tue Aug 24 22:41:42 2004 +0000
+++ b/console.h Wed Aug 25 08:55:53 2004 +0000
@@ -3,8 +3,6 @@
enum {
ICONSOLE_OPENED=0,
ICONSOLE_CLOSED,
- ICONSOLE_OPENING,
- ICONSOLE_CLOSING,
} _iconsole_modes;
// ** console parser ** //
--- a/ttd.c Tue Aug 24 22:41:42 2004 +0000
+++ b/ttd.c Wed Aug 25 08:55:53 2004 +0000
@@ -642,8 +642,8 @@
_opt_mod_ptr = &_new_opt;
GfxLoadSprites();
LoadStringWidthTable();
- // Setup main window
- IConsoleClose();
+
+ // Setup main window
InitWindowSystem();
SetupColorsAndInitialWindow();
@@ -672,8 +672,7 @@
GfxLoadSprites();
- // Reinitialize windows
- IConsoleClose();
+ // Reinitialize windows
InitWindowSystem();
LoadStringWidthTable();
@@ -700,8 +699,7 @@
GfxLoadSprites();
- // Re-init the windowing system
- IConsoleClose();
+ // Re-init the windowing system
InitWindowSystem();
// Create toolbars
@@ -735,8 +733,7 @@
GfxLoadSprites();
- // Reinitialize windows
- IConsoleClose();
+ // Reinitialize windows
InitWindowSystem();
LoadStringWidthTable();
--- a/window.c Tue Aug 24 22:41:42 2004 +0000
+++ b/window.c Wed Aug 25 08:55:53 2004 +0000
@@ -574,7 +574,8 @@
void InitWindowSystem()
-{
+{
+ IConsoleClose();
memset(&_windows, 0, sizeof(_windows));
_last_window = _windows;
memset(_viewports, 0, sizeof(_viewports));