openttd-ottdgrfs: comparison src/smallmap

equal deleted inserted replaced

-:2ffe947969ca
+:a2f86b8fd99b
 #include "vehicle.h"
 #include "town.h"
 #include "sound.h"
 #include "variables.h"
-static const Widget _smallmap_widgets[] = {
+static const OldWidget _smallmap_widgets[] = {
 {  WWT_CLOSEBOX,   RESIZE_NONE,    13,     0,    10,     0,    13, STR_00C5,                STR_018B_CLOSE_WINDOW},
 {   WWT_CAPTION,  RESIZE_RIGHT,    13,    11,   433,     0,    13, STR_00B0_MAP,            STR_018C_WINDOW_TITLE_DRAG_THIS},
 { WWT_STICKYBOX,     RESIZE_LR,    13,   434,   445,     0,    13, 0x0,                     STR_STICKY_BUTTON},
 {     WWT_PANEL,     RESIZE_RB,    13,     0,   445,    14,   257, 0x0,                     STR_NULL},
 {     WWT_INSET,     RESIZE_RB,    13,     2,   443,    16,   255, 0x0,                     STR_NULL},
 * The passes are:
 * <ol><li>The colors of tiles in the different modes.</li>
 * <li>Town names (optional)</li>
 *
 * @param dpi pointer to pixel to write onto
-* @param w pointer to Window struct
+* @param w pointer to BaseWindow struct
 * @param type type of map requested (vegetation, owners, routes, etc)
 * @param show_towns true if the town names should be displayed, false if not.
 */
-static void DrawSmallMap(DrawPixelInfo *dpi, Window *w, int type, bool show_towns)
+static void DrawSmallMap(DrawPixelInfo *dpi, BaseWindow *w, int type, bool show_towns)
 {
 	DrawPixelInfo *old_dpi;
 	int dx,dy, x, y, x2, y2;
 	Pixel *ptr;
 	int tile_x;
 	// Draw map indicators
 	{
 		Point pt;
 		// Find main viewport.
-		vp = Window::FindById(WC_MAIN_WINDOW,0)->viewport;
+		vp = BaseWindow::FindById(WC_MAIN_WINDOW,0)->viewport;
 		pt = RemapCoords(WP(w, smallmap_d).scroll_x, WP(w, smallmap_d).scroll_y, 0);
 		x = vp->virtual_left - pt.x;
 		y = vp->virtual_top - pt.y;
 		DrawHorizMapIndicator(x, y2, x2, y2);
 	}
 	_cur_dpi = old_dpi;
 }
-void SmallMapCenterOnCurrentPos(Window *w)
+void SmallMapCenterOnCurrentPos(BaseWindow *w)
 {
 	int x, y;
 	ViewPort *vp;
-	vp = Window::FindById(WC_MAIN_WINDOW, 0)->viewport;
+	vp = BaseWindow::FindById(WC_MAIN_WINDOW, 0)->viewport;
 	x  = ((vp->virtual_width  - (w->widget[4].right  - w->widget[4].left) * TILE_SIZE) / 2 + vp->virtual_left) / 4;
 	y  = ((vp->virtual_height - (w->widget[4].bottom - w->widget[4].top ) * TILE_SIZE) / 2 + vp->virtual_top ) / 2 - TILE_SIZE * 2;
 	WP(w, smallmap_d).scroll_x = (y - x) & ~0xF;
 	WP(w, smallmap_d).scroll_y = (x + y) & ~0xF;
 	w->SetDirty();
 }
-static void SmallMapWindowProc(Window *w, WindowEvent *e)
+static void SmallMapWindowProc(BaseWindow *w, WindowEvent *e)
 {
 	switch (e->event) {
 		case WE_PAINT: {
 			const uint16 *tbl;
 			int x, y, y_org;
 		} break;
 		case WE_CLICK:
 			switch (e->we.click.widget) {
 				case 4: { // Map window
-					Window *w2 = Window::FindById(WC_MAIN_WINDOW, 0);
+					BaseWindow *w2 = BaseWindow::FindById(WC_MAIN_WINDOW, 0);
 					Point pt;
 					/*
 					 * XXX: scrolling with the left mouse button is done by subsequently
 					 * clicking with the left mouse button; clicking once centers the
 	SmallMapWindowProc
 };
 void ShowSmallMap(void)
 {
-	Window *w;
+	BaseWindow *w;
-	w = AllocateWindowDescFront(&_smallmap_desc, 0);
+	w = BaseWindow::AllocateFront(&_smallmap_desc, 0);
 	if (w == NULL) return;
 	w->LowerWidget(_smallmap_type + 5);
 	w->SetWidgetLoweredState(12, _smallmap_show_towns);
 	w->resize.width = 350;
 	w->resize.height = 250;
 	SmallMapCenterOnCurrentPos(w);
 }
-/* Extra ViewPort Window Stuff */
+/* Extra ViewPort BaseWindow Stuff */
-static const Widget _extra_view_port_widgets[] = {
+static const OldWidget _extra_view_port_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,    14,     0,    10,     0,    13, STR_00C5,                         STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,  RESIZE_RIGHT,    14,    11,   287,     0,    13, STR_EXTRA_VIEW_PORT_TITLE,        STR_018C_WINDOW_TITLE_DRAG_THIS},
 {  WWT_STICKYBOX,     RESIZE_LR,    14,   288,   299,     0,    13, 0x0,                              STR_STICKY_BUTTON},
 {      WWT_PANEL,     RESIZE_RB,    14,     0,   299,    14,   233, 0x0,                              STR_NULL},
 {      WWT_INSET,     RESIZE_RB,    14,     2,   297,    16,   231, 0x0,                              STR_NULL},
 {      WWT_PANEL,    RESIZE_RTB,    14,     0,   287,   256,   267, 0x0,                              STR_NULL},
 {  WWT_RESIZEBOX,   RESIZE_LRTB,    14,   288,   299,   256,   267, 0x0,                              STR_RESIZE_BUTTON},
 {   WIDGETS_END},
 };
-static void ExtraViewPortWndProc(Window *w, WindowEvent *e)
+static void ExtraViewPortWndProc(BaseWindow *w, WindowEvent *e)
 {
 	switch (e->event) {
 	case WE_CREATE: /* Disable zoom in button */
 		w->DisableWidget(5);
 		break;
 		switch (e->we.click.widget) {
 			case 5: DoZoomInOutWindow(ZOOM_IN,  w); break;
 			case 6: DoZoomInOutWindow(ZOOM_OUT, w); break;
 		case 7: { /* location button (move main view to same spot as this view) 'Paste Location' */
-			Window *w2 = Window::FindById(WC_MAIN_WINDOW, 0);
+			BaseWindow *w2 = BaseWindow::FindById(WC_MAIN_WINDOW, 0);
 			int x = WP(w, vp_d).scrollpos_x; // Where is the main looking at
 			int y = WP(w, vp_d).scrollpos_y;
 			// set this view to same location. Based on the center, adjusting for zoom
 			WP(w2, vp_d).scrollpos_x =  x - (w2->viewport->virtual_width -  w->viewport->virtual_width) / 2;
 			WP(w2, vp_d).scrollpos_y =  y - (w2->viewport->virtual_height - w->viewport->virtual_height) / 2;
 		} break;
 		case 8: { /* inverse location button (move this view to same spot as main view) 'Copy Location' */
-			const Window *w2 = Window::FindById(WC_MAIN_WINDOW, 0);
+			const BaseWindow *w2 = BaseWindow::FindById(WC_MAIN_WINDOW, 0);
 			int x = WP(w2, const vp_d).scrollpos_x;
 			int y = WP(w2, const vp_d).scrollpos_y;
 			WP(w, vp_d).scrollpos_x =  x + (w2->viewport->virtual_width -  w->viewport->virtual_width) / 2;
 			WP(w, vp_d).scrollpos_y =  y + (w2->viewport->virtual_height - w->viewport->virtual_height) / 2;
 	ExtraViewPortWndProc
 };
 void ShowExtraViewPortWindow(void)
 {
-	Window *w, *v;
+	BaseWindow *w, *v;
 	int i = 0;
 	// find next free window number for extra viewport
-	while (Window::FindById(WC_EXTRA_VIEW_PORT, i) != NULL) i++;
+	while (BaseWindow::FindById(WC_EXTRA_VIEW_PORT, i) != NULL) i++;
-	w = AllocateWindowDescFront(&_extra_view_port_desc, i);
+	w = BaseWindow::AllocateFront(&_extra_view_port_desc, i);
 	if (w != NULL) {
 		int x, y;
 		// the main window with the main view
-		v = Window::FindById(WC_MAIN_WINDOW, 0);
+		v = BaseWindow::FindById(WC_MAIN_WINDOW, 0);
 		// New viewport start ats (zero,zero)
 		AssignWindowViewport(w, 3, 17, 294, 214, 0 , 0);
 		// center on same place as main window (zoom is maximum, no adjustment needed)
 		x = WP(v, vp_d).scrollpos_x;

branch	cpp_gui
changeset 6258	a2f86b8fd99b
parent 6251	cd413fa2e252
child 6263	19dab6a68886