cpp/openttd-patchpack/source Changeset - r169:55ce1e29f09a

Changeset - r169:55ce1e29f09a

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

darkvater - 20 years ago 2004-09-06 21:27:26
darkvater@openttd.org

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

3 files changed with 16 insertions and 8 deletions:

console.c

console.h

network.c

0 comments (0 inline, 0 general)

console.c

➞

Show inline comments

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

console.h

➞

Show inline comments

@@ @@ -65,7 +65,7 @@ void IConsoleCmdBufferNavigate(signed ch @@
 // ** console output ** //
 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 IConsoleError(byte* string);

network.c

➞

Show inline comments

@@ @@ -1100,7 +1100,12 @@ void NetworkClose(bool client) { @@
 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.
@@ @@ -1491,8 +1496,6 @@ void NetworkCoreDisconnect() @@
 		NetworkClose(true);
+		}
 	_networking_server = false;
 	_networking = false;
 	NetworkShutdown();
+}

0 comments (0 inline, 0 general)