mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r170) -Fix: [1022902] network fix .. console fix bug [1018523]. Fixes some variable initialization errors and a console.h warning (sign_de)

release/0.4.5
darkvater 2004-09-06 21:27:26 +00:00
parent 78b64ed192
commit bb75f30a79
3 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
console.c
View File

@ -65,8 +65,8 @@ static void IConsoleWndProc(Window *w, WindowEvent *e)
{ {
switch(e->event) { switch(e->event) {
case WE_PAINT: case WE_PAINT:
GfxFillRect(w->left,w->top,w->width,w->height-1,0); GfxFillRect(w->left,w->top,w->width,w->height-1,0);
{ {
int i=_iconsole_scroll; int i=_iconsole_scroll;
@ -100,6 +100,11 @@ static void IConsoleWndProc(Window *w, WindowEvent *e)
} }
break; break;
case WE_DESTROY:
_iconsole_win=NULL;
_iconsole_mode=ICONSOLE_CLOSED;
break;
case WE_KEYPRESS: case WE_KEYPRESS:
e->keypress.cont=false; e->keypress.cont=false;
if (e->keypress.keycode == (WKC_UP)) if (e->keypress.keycode == (WKC_UP))
@ -257,7 +262,7 @@ void IConsoleSwitch()
} }
void IConsoleClose() { void IConsoleClose() {
if (_iconsole_mode==ICONSOLE_OPENED) IConsoleSwitch(); if (_iconsole_mode==ICONSOLE_OPENED) IConsoleSwitch();
_iconsole_mode=ICONSOLE_CLOSED; _iconsole_mode=ICONSOLE_CLOSED;
} }
@ -333,7 +338,7 @@ if (_iconsole_win!=NULL) SetWindowDirty(_iconsole_win);
} }
void IConsolePrintF(byte color_code, const char *s, ...) void CDECL IConsolePrintF(byte color_code, const char *s, ...)
{ {
va_list va; va_list va;
char buf[1024]; char buf[1024];

2
console.h
View File

@ -65,7 +65,7 @@ void IConsoleCmdBufferNavigate(signed char direction);
// ** console output ** // // ** console output ** //
void IConsolePrint(byte color_code, byte* string); void IConsolePrint(byte color_code, byte* string);
void IConsolePrintF(byte color_code, const char *s, ...); void CDECL IConsolePrintF(byte color_code, const char *s, ...);
void IConsoleDebug(byte* string); void IConsoleDebug(byte* string);
void IConsoleError(byte* string); void IConsoleError(byte* string);

9
network.c
View File

@ -1100,7 +1100,12 @@ void NetworkClose(bool client) {
void NetworkShutdown() void NetworkShutdown()
{ {
_networking_server = false;
_networking = false;
_networking_sync = false;
_frame_counter = 0;
_frame_counter_max = 0;
_frame_counter_srv = 0;
} }
// switch to synced mode. // switch to synced mode.
@ -1491,8 +1496,6 @@ void NetworkCoreDisconnect()
NetworkClose(true); NetworkClose(true);
} }
_networking_server = false;
_networking = false;
NetworkShutdown(); NetworkShutdown();
} }