openttd-ottdgrfs: comparison src/viewport.cpp

equal deleted inserted replaced

-:2ffe947969ca
+:a2f86b8fd99b
 static ViewportDrawer *_cur_vd;
 TileHighlightData _thd;
 static TileInfo *_cur_ti;
-extern void SmallMapCenterOnCurrentPos(Window *w);
+extern void SmallMapCenterOnCurrentPos(BaseWindow *w);
 static Point MapXYZToViewport(const ViewPort *vp, uint x, uint y, uint z)
 {
 	Point p = RemapCoords(x, y, z);
 	p.x -= vp->virtual_width / 2;
 void InitViewports(void) {
 	memset(_viewports, 0, sizeof(_viewports));
 	_active_viewports = 0;
 }
-void DeleteWindowViewport(Window *w)
+void DeleteWindowViewport(BaseWindow *w)
 {
 	CLRBIT(_active_viewports, w->viewport - _viewports);
 	w->viewport->width = 0;
 	w->viewport = NULL;
 }
-void AssignWindowViewport(Window *w, int x, int y,
+void AssignWindowViewport(BaseWindow *w, int x, int y,
 	int width, int height, uint32 follow_flags, byte zoom)
 {
 	ViewPort *vp;
 	Point pt;
 	uint32 bit;
 static Point _vp_move_offs;
 static void DoSetViewportPosition(WindowList::Iterator vit, int left, int top, int width, int height)
 {
-	//Window *w = (*wit).w;
+	//BaseWindow *w = (*wit).w;
-	for (WindowList::Iterator wit = vit; wit != Window::s_list.m_list.end(); wit++) {
+	for (WindowList::Iterator wit = vit; wit != BaseWindow::s_list.m_list.end(); wit++) {
-		const Window *w = (*wit).w;
+		const BaseWindow *w = (*wit).w;
 		if (left + width > w->left &&
 				w->left + w->width > left &&
 				top + height > w->top &&
 				w->top + w->height > top) {
 			RedrawScreenRect(left, top + height + yo, width+left, top + height);
 		}
 	}
 }
-static void SetViewportPosition(Window *w, int x, int y)
+static void SetViewportPosition(BaseWindow *w, int x, int y)
 {
 	ViewPort *vp = w->viewport;
 	int old_left = vp->virtual_left;
 	int old_top = vp->virtual_top;
 	int i;
 		}
 		i = top + height - _screen.height;
 		if (i >= 0) height -= i;
-		WindowList::Iterator it = Window::s_list.Find(w);
+		WindowList::Iterator it = BaseWindow::s_list.Find(w);
 		if (height > 0) DoSetViewportPosition(++it, left, top, width, height);
 	}
 }
-ViewPort *IsPtInWindowViewport(const Window *w, int x, int y)
+ViewPort *IsPtInWindowViewport(const BaseWindow *w, int x, int y)
 {
 	ViewPort *vp = w->viewport;
 	if (vp != NULL &&
 	    IS_INT_INSIDE(x, vp->left, vp->left + vp->width) &&
 /* When used for zooming, check area below current coordinates (x,y)
 * and return the tile of the zoomed out/in position (zoom_x, zoom_y)
 * when you just want the tile, make x = zoom_x and y = zoom_y */
 static Point GetTileFromScreenXY(int x, int y, int zoom_x, int zoom_y)
 {
-	Window *w;
+	BaseWindow *w;
 	ViewPort *vp;
 	Point pt;
-	if ( (w = FindWindowFromPt(x, y)) != NULL &&
+	if ( (w = BaseWindow::FindFromPt(x, y)) != NULL &&
 			 (vp = IsPtInWindowViewport(w, x, y)) != NULL)
 				return TranslateXYToTileCoord(vp, zoom_x, zoom_y);
 	pt.y = pt.x = -1;
 	return pt;
 {
 	return GetTileFromScreenXY(_cursor.pos.x, _cursor.pos.y, _cursor.pos.x, _cursor.pos.y);
 }
-Point GetTileZoomCenterWindow(bool in, Window * w)
+Point GetTileZoomCenterWindow(bool in, BaseWindow * w)
 {
 	int x, y;
 	ViewPort * vp;
 	vp = w->viewport;
 * of the viewport. This will update their status and invalidate accordingly
 * @param window pointer to the window that has the zoom buttons
 * @param vp pointer to the viewport whose zoom-level the buttons represent
 * @param widget_zoom_in widget index for window with zoom-in button
 * @param widget_zoom_out widget index for window with zoom-out button */
-void HandleZoomMessage(Window *w, const ViewPort *vp, byte widget_zoom_in, byte widget_zoom_out)
+void HandleZoomMessage(BaseWindow *w, const ViewPort *vp, byte widget_zoom_in, byte widget_zoom_out)
 {
 	w->SetWidgetDisabledState(widget_zoom_in, vp->zoom == 0);
 	w->InvalidateWidget(widget_zoom_in);
 	w->SetWidgetDisabledState(widget_zoom_out, vp->zoom == 2);
 	if (bottom > vp->top + vp->height) bottom = vp->top + vp->height;
 	ViewportDrawChk(vp, left, top, right, bottom);
 }
-void Window::DrawViewport() const
+void BaseWindow::DrawViewport() const
 {
 	DrawPixelInfo *dpi = _cur_dpi;
 	dpi->left += left;
 	dpi->top += top;
 	dpi->left -= left;
 	dpi->top -= top;
 }
-void UpdateViewportPosition(Window *w)
+void UpdateViewportPosition(BaseWindow *w)
 {
 	const ViewPort *vp = w->viewport;
 	if (WP(w, vp_d).follow_vehicle != INVALID_VEHICLE) {
 		const Vehicle* veh = GetVehicle(WP(w,vp_d).follow_vehicle);
 	}
 }
 Vehicle *CheckMouseOverVehicle(void)
 {
-	const Window *w;
+	const BaseWindow *w;
 	const ViewPort *vp;
 	int x = _cursor.pos.x;
 	int y = _cursor.pos.y;
-	w = FindWindowFromPt(x, y);
+	w = BaseWindow::FindFromPt(x, y);
 	if (w == NULL) return NULL;
 	vp = IsPtInWindowViewport(w, x, y);
 	return (vp != NULL) ? CheckClickOnVehicle(vp, x, y) : NULL;
 }
 void PlaceObject(void)
 {
 	Point pt;
-	Window *w;
+	BaseWindow *w;
 	pt = GetTileBelowCursor();
 	if (pt.x == -1) return;
 	if (_thd.place_mode == VHM_POINT) {
 	}
 }
 /* scrolls the viewport in a window to a given location */
-bool ScrollWindowTo(int x , int y, Window *w)
+bool ScrollWindowTo(int x , int y, BaseWindow *w)
 {
 	Point pt;
 	pt = MapXYZToViewport(w->viewport, x, y, GetSlopeZ(x, y));
 	WP(w, vp_d).follow_vehicle = INVALID_VEHICLE;
 }
 bool ScrollMainWindowTo(int x, int y)
 {
-	Window *w;
+	BaseWindow *w;
-	bool res = ScrollWindowTo(x, y, Window::FindById(WC_MAIN_WINDOW, 0));
+	bool res = ScrollWindowTo(x, y, BaseWindow::FindById(WC_MAIN_WINDOW, 0));
 	/* If a user scrolls to a tile (via what way what so ever) and already is on
 	 *  that tile (e.g.: pressed twice), move the smallmap to that location,
 	 *  so you directly see where you are on the smallmap. */
 	if (res) return res;
-	w = Window::FindById(WC_SMALLMAP, 0);
+	w = BaseWindow::FindById(WC_SMALLMAP, 0);
 	if (w == NULL) return res;
 	SmallMapCenterOnCurrentPos(w);
 	return res;
 }
 // while dragging
 bool VpHandlePlaceSizingDrag(void)
 {
-	Window *w;
+	BaseWindow *w;
 	WindowEvent e;
 	if (_special_mouse_mode != WSM_SIZING) return true;
 	e.we.place.userdata = _thd.userdata;
 	// stop drag mode if the window has been closed
-	w = Window::FindById(_thd.window_class,_thd.window_number);
+	w = BaseWindow::FindById(_thd.window_class,_thd.window_number);
 	if (w == NULL) {
 		ResetObjectToPlace();
 		return false;
 	}
 	w->wndproc(w, &e);
 	return false;
 }
-void SetObjectToPlaceWnd(CursorID icon, SpriteID pal, byte mode, Window *w)
+void SetObjectToPlaceWnd(CursorID icon, SpriteID pal, byte mode, BaseWindow *w)
 {
 	SetObjectToPlace(icon, pal, mode, w->window_class, w->window_number);
 }
 #include "table/animcursors.h"
 void SetObjectToPlace(CursorID icon, SpriteID pal, byte mode, WindowClass window_class, WindowNumber window_num)
 {
-	Window *w;
+	BaseWindow *w;
 	// undo clicking on button
 	if (_thd.place_mode != 0) {
 		_thd.place_mode = 0;
-		w = Window::FindById(_thd.window_class, _thd.window_number);
+		w = BaseWindow::FindById(_thd.window_class, _thd.window_number);
 		if (w != NULL) w->CallEventNP(WE_ABORT_PLACE_OBJ);
 	}
 	SetTileSelectSize(1, 1);

branch	cpp_gui
changeset 6258	a2f86b8fd99b
parent 6246	2a4c2c4d66f0
child 6259	0f36789984b1