cpp/openttd-patchpack/source Changeset - r5126:5583f846665d

Changeset - r5126:5583f846665d

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

Darkvater - 18 years ago 2006-11-18 17:07:05
darkvater@openttd.org

(svn r7207) -Codechange: Pass the (unchanged) windowpointer to the console window and do it only once.

3 files changed with 11 insertions and 7 deletions:

console.c

console.h

window.c

0 comments (0 inline, 0 general)

console.c

➞

Show inline comments

@@ @@ -152,7 +152,7 @@ static void IConsoleWndProc(Window *w, W @@
 					break;
 				case WKC_CTRL | WKC_RETURN:
 					_iconsole_mode = (_iconsole_mode == ICONSOLE_FULL) ? ICONSOLE_OPENED : ICONSOLE_FULL;
 					IConsoleResize();
+					IConsoleResize(w);
 					MarkWholeScreenDirty();
 					break;
 				case (WKC_CTRL | 'V'):
@@ @@ -283,9 +283,9 @@ void IConsoleFree(void) @@
 	CloseConsoleLogIfActive();
+}
-void IConsoleResize(void)
+void IConsoleResize(Window *w)
+{
-	_iconsole_win = FindWindowById(WC_CONSOLE, 0);
+	assert(_iconsole_win == w);
 	switch (_iconsole_mode) {
 		case ICONSOLE_OPENED:

console.h

➞

Show inline comments

@@ @@ -118,7 +118,7 @@ VARDEF IConsoleModes _iconsole_mode; @@
 void IConsoleInit(void);
 void IConsoleFree(void);
 void IConsoleClearBuffer(void);
-void IConsoleResize(void);
+void IConsoleResize(Window *w);
 void IConsoleSwitch(void);
 void IConsoleClose(void);
 void IConsoleOpen(void);

window.c

➞

Show inline comments

@@ @@ -20,7 +20,7 @@ static Point _drag_delta; @@
 static Window _windows[25];
 Window *_z_windows[lengthof(_windows)];
 Window **_last_z_window; // always points to the next free space in the z-array
+Window **_last_z_window; ///< always points to the next free space in the z-array
 void CDECL SetWindowWidgetsDisabledState(Window *w, bool disab_stat, int widgets, ...)
+{
@@ @@ -1886,8 +1886,8 @@ void RelocateAllWindows(int neww, int ne @@
 			continue; // don't modify top,left
+		}
 		IConsoleResize();
 		/* XXX - this probably needs something more sane. For example specying
 		 * in a 'backup'-desc that the window should always be centred. */
 		switch (w->window_class) {
 			case WC_MAIN_TOOLBAR:
 				top = w->top;
@@ @@ -1916,6 +1916,10 @@ void RelocateAllWindows(int neww, int ne @@
 				left = (neww - w->width) >> 1;
 				break;
 			case WC_CONSOLE:
 				IConsoleResize(w);
 				break;
 			default:
 				left = w->left;
 				if (left + (w->width >> 1) >= neww) left = neww - w->width;

0 comments (0 inline, 0 general)