cpp/openttd-patchpack/source Changeset - r5751:9b4f4afbf71b

Changeset - r5751:9b4f4afbf71b

Parent rev.

Child rev.

[Not reviewed]

master

0 6 1

maedhros - 17 years ago 2007-01-21 12:35:35
maedhros@openttd.org

(svn r8301) -Codechange: Move the code relating to the sign list window from graph_gui.cpp to a file of its own: signs_gui.cpp.

7 files changed with 159 insertions and 139 deletions:

projects/openttd.vcproj

projects/openttd_vs80.vcproj

source.list

src/graph_gui.cpp

138

src/gui.h

src/signs.h

src/signs_gui.cpp

150

0 comments (0 inline, 0 general)

projects/openttd.vcproj

➞

Show inline comments

@@ @@ -742,6 +742,9 @@ @@
 				RelativePath=".\..\src\ship_gui.cpp">
 			</File>
 			<File
 				RelativePath=".\..\src\signs_gui.cpp">
 			</File>
 			<File
 				RelativePath=".\..\src\smallmap_gui.cpp">
 			</File>
 			<File

projects/openttd_vs80.vcproj

➞

Show inline comments

@@ @@ -1025,6 +1025,9 @@ @@
 				RelativePath=".\..\src\ship_gui.cpp">
 			</File>
 			<File
 				RelativePath=".\..\src\signs_gui.cpp">
 			</File>
 			<File
 				RelativePath=".\..\src\smallmap_gui.cpp">
 			</File>
 			<File

source.list

➞

Show inline comments

@@ @@ -208,6 +208,7 @@ road_gui.cpp @@
 roadveh_gui.cpp
 settings_gui.cpp
 ship_gui.cpp
 signs_gui.cpp
 smallmap_gui.cpp
 station_gui.cpp
 subsidy_gui.cpp

src/graph_gui.cpp

➞

Show inline comments

@@ @@ -10,9 +10,6 @@ @@
 #include "gfx.h"
 #include "player.h"
 #include "economy.h"
 #include "signs.h"
 #include "strings.h"
 #include "debug.h"
 #include "variables.h"
 #include "date.h"
 #include "helpers.hpp"
@@ @@ -1116,138 +1113,3 @@ void ShowPerformanceRatingDetail(void) @@
+{
 	AllocateWindowDescFront(&_performance_rating_detail_desc, 0);
+}
 static const Sign **_sign_sort;
 static uint _num_sign_sort;
 static char _bufcache[64];
 static const Sign *_last_sign;
 static int CDECL SignNameSorter(const void *a, const void *b)
+{
 	const Sign *sign0 = *(const Sign**)a;
 	const Sign *sign1 = *(const Sign**)b;
 	char buf1[64];
 	GetString(buf1, sign0->str, lastof(buf1));
 	if (sign1 != _last_sign) {
 		_last_sign = sign1;
 		GetString(_bufcache, sign1->str, lastof(_bufcache));
+	}
 	return strcmp(buf1, _bufcache); // sort by name
+}
 static void GlobalSortSignList(void)
+{
 	const Sign *si;
 	uint n = 0;
 	/* Create array for sorting */
 	_sign_sort = ReallocT(_sign_sort, GetMaxSignIndex() + 1);
 	if (_sign_sort == NULL) error("Could not allocate memory for the sign-sorting-list");
 	FOR_ALL_SIGNS(si) _sign_sort[n++] = si;
 	_num_sign_sort = n;
 	qsort((void*)_sign_sort, n, sizeof(_sign_sort[0]), SignNameSorter);
 	_sign_sort_dirty = false;
 	DEBUG(misc, 3, "Resorting global signs list");
+}
 static void SignListWndProc(Window *w, WindowEvent *e)
+{
 	switch (e->event) {
 	case WE_PAINT: {
 		int y = 16; // offset from top of widget
 		if (_sign_sort_dirty)
 			GlobalSortSignList();
 		SetVScrollCount(w, _num_sign_sort);
 		SetDParam(0, w->vscroll.count);
 		DrawWindowWidgets(w);
 		/* No signs? */
 		if (w->vscroll.count == 0) {
 			DrawString(2, y, STR_304A_NONE, 0);
 			return;
+		}
+		{
 			uint16 i;
 			/* Start drawing the signs */
 			for (i = w->vscroll.pos; i < w->vscroll.cap + w->vscroll.pos && i < w->vscroll.count; i++) {
 				const Sign *si = _sign_sort[i];
 				if (si->owner != OWNER_NONE)
 					DrawPlayerIcon(si->owner, 4, y + 1);
 				DrawString(22, y, si->str, 8);
 				y += 10;
+			}
+		}
 	} break;
 	case WE_CLICK: {
 		switch (e->we.click.widget) {
 		case 3: {
 			uint32 id_v = (e->we.click.pt.y - 15) / 10;
 			const Sign *si;
 			if (id_v >= w->vscroll.cap)
 				return;
 			id_v += w->vscroll.pos;
 			if (id_v >= w->vscroll.count)
 				return;
 			si = _sign_sort[id_v];
 			ScrollMainWindowToTile(TileVirtXY(si->x, si->y));
 		} break;
+		}
 	} break;
 	case WE_RESIZE:
 		w->vscroll.cap += e->we.sizing.diff.y / 10;
 		break;
+	}
+}
 static const Widget _sign_list_widget[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,    14,     0,    10,     0,    13, STR_00C5,              STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,  RESIZE_RIGHT,    14,    11,   345,     0,    13, STR_SIGN_LIST_CAPTION, STR_018C_WINDOW_TITLE_DRAG_THIS},
 {  WWT_STICKYBOX,     RESIZE_LR,    14,   346,   357,     0,    13, 0x0,                   STR_STICKY_BUTTON},
 {      WWT_PANEL,     RESIZE_RB,    14,     0,   345,    14,   137, 0x0,                   STR_NULL},
 {  WWT_SCROLLBAR,    RESIZE_LRB,    14,   346,   357,    14,   125, 0x0,                   STR_0190_SCROLL_BAR_SCROLLS_LIST},
 {  WWT_RESIZEBOX,   RESIZE_LRTB,    14,   346,   357,   126,   137, 0x0,                   STR_RESIZE_BUTTON},
 {   WIDGETS_END},
 };
 static const WindowDesc _sign_list_desc = {
 	WDP_AUTO, WDP_AUTO, 358, 138,
 	WC_SIGN_LIST,0,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_STICKY_BUTTON | WDF_RESIZABLE,
 	_sign_list_widget,
 	SignListWndProc
 };
 void ShowSignList(void)
+{
 	Window *w;
 	w = AllocateWindowDescFront(&_sign_list_desc, 0);
 	if (w != NULL) {
 		w->vscroll.cap = 12;
 		w->resize.step_height = 10;
 		w->resize.height = w->height - 10 * 7; // minimum if 5 in the list
+	}
+}

src/gui.h

➞

Show inline comments

@@ @@ -87,7 +87,6 @@ void ShowSubsidiesList(void); @@
 void ShowPlayerStations(PlayerID player);
 void ShowPlayerFinances(PlayerID player);
 void ShowPlayerCompany(PlayerID player);
 void ShowSignList(void);
 void ShowEstimatedCostOrIncome(int32 cost, int x, int y);
 void ShowErrorMessage(StringID msg_1, StringID msg_2, int x, int y);

src/signs.h

➞

Show inline comments

@@ @@ -65,4 +65,6 @@ void PlaceProc_Sign(TileIndex tile); @@
 /* misc.c */
 void ShowRenameSignWindow(const Sign *si);
 void ShowSignList(void);
 #endif /* SIGNS_H */

src/signs_gui.cpp

➞

Show inline comments

@@ new file 100644 @@
 /* $Id$ */
 #include "stdafx.h"
 #include "openttd.h"
 #include "table/strings.h"
 #include "table/sprites.h"
 #include "functions.h"
 #include "window.h"
 #include "gui.h"
 #include "gfx.h"
 #include "player.h"
 #include "signs.h"
 #include "strings.h"
 #include "debug.h"
 #include "variables.h"
 #include "helpers.hpp"
 static const Sign **_sign_sort;
 static uint _num_sign_sort;
 static char _bufcache[64];
 static const Sign *_last_sign;
 static int CDECL SignNameSorter(const void *a, const void *b)
+{
 	const Sign *sign0 = *(const Sign**)a;
 	const Sign *sign1 = *(const Sign**)b;
 	char buf1[64];
 	GetString(buf1, sign0->str, lastof(buf1));
 	if (sign1 != _last_sign) {
 		_last_sign = sign1;
 		GetString(_bufcache, sign1->str, lastof(_bufcache));
+	}
 	return strcmp(buf1, _bufcache); // sort by name
+}
 static void GlobalSortSignList(void)
+{
 	const Sign *si;
 	uint n = 0;
 	/* Create array for sorting */
 	_sign_sort = ReallocT(_sign_sort, GetMaxSignIndex() + 1);
 	if (_sign_sort == NULL) error("Could not allocate memory for the sign-sorting-list");
 	FOR_ALL_SIGNS(si) _sign_sort[n++] = si;
 	_num_sign_sort = n;
 	qsort((void*)_sign_sort, n, sizeof(_sign_sort[0]), SignNameSorter);
 	_sign_sort_dirty = false;
 	DEBUG(misc, 3, "Resorting global signs list");
+}
 static void SignListWndProc(Window *w, WindowEvent *e)
+{
 	switch (e->event) {
 	case WE_PAINT: {
 		int y = 16; // offset from top of widget
 		if (_sign_sort_dirty)
 			GlobalSortSignList();
 		SetVScrollCount(w, _num_sign_sort);
 		SetDParam(0, w->vscroll.count);
 		DrawWindowWidgets(w);
 		/* No signs? */
 		if (w->vscroll.count == 0) {
 			DrawString(2, y, STR_304A_NONE, 0);
 			return;
+		}
+		{
 			uint16 i;
 			/* Start drawing the signs */
 			for (i = w->vscroll.pos; i < w->vscroll.cap + w->vscroll.pos && i < w->vscroll.count; i++) {
 				const Sign *si = _sign_sort[i];
 				if (si->owner != OWNER_NONE)
 					DrawPlayerIcon(si->owner, 4, y + 1);
 				DrawString(22, y, si->str, 8);
 				y += 10;
+			}
+		}
 	} break;
 	case WE_CLICK: {
 		switch (e->we.click.widget) {
 		case 3: {
 			uint32 id_v = (e->we.click.pt.y - 15) / 10;
 			const Sign *si;
 			if (id_v >= w->vscroll.cap)
 				return;
 			id_v += w->vscroll.pos;
 			if (id_v >= w->vscroll.count)
 				return;
 			si = _sign_sort[id_v];
 			ScrollMainWindowToTile(TileVirtXY(si->x, si->y));
 		} break;
+		}
 	} break;
 	case WE_RESIZE:
 		w->vscroll.cap += e->we.sizing.diff.y / 10;
 		break;
+	}
+}
 static const Widget _sign_list_widget[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,    14,     0,    10,     0,    13, STR_00C5,              STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,  RESIZE_RIGHT,    14,    11,   345,     0,    13, STR_SIGN_LIST_CAPTION, STR_018C_WINDOW_TITLE_DRAG_THIS},
 {  WWT_STICKYBOX,     RESIZE_LR,    14,   346,   357,     0,    13, 0x0,                   STR_STICKY_BUTTON},
 {      WWT_PANEL,     RESIZE_RB,    14,     0,   345,    14,   137, 0x0,                   STR_NULL},
 {  WWT_SCROLLBAR,    RESIZE_LRB,    14,   346,   357,    14,   125, 0x0,                   STR_0190_SCROLL_BAR_SCROLLS_LIST},
 {  WWT_RESIZEBOX,   RESIZE_LRTB,    14,   346,   357,   126,   137, 0x0,                   STR_RESIZE_BUTTON},
 {   WIDGETS_END},
 };
 static const WindowDesc _sign_list_desc = {
 	WDP_AUTO, WDP_AUTO, 358, 138,
 	WC_SIGN_LIST,0,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_STICKY_BUTTON | WDF_RESIZABLE,
 	_sign_list_widget,
 	SignListWndProc
 };
 void ShowSignList(void)
+{
 	Window *w;
 	w = AllocateWindowDescFront(&_sign_list_desc, 0);
 	if (w != NULL) {
 		w->vscroll.cap = 12;
 		w->resize.step_height = 10;
 		w->resize.height = w->height - 10 * 7; // minimum if 5 in the list
+	}
+}

0 comments (0 inline, 0 general)