Files
@ r24498:e9114d9ab04a
Branch filter:
Location: cpp/openttd-patchpack/source/src/viewport_gui.cpp - annotation
r24498:e9114d9ab04a
7.2 KiB
text/x-c
Fix #6468: don't store version of AIs-started-via-console in name
You can do: "startai myai.3", which starts version 3 of "myai".
This is very useful for testing save/load code between different
versions of your AI.
However, when using this syntax, the AI got saved as "myai.3" as
name of the AI, instead of "myai". This caused several problems,
like indicating to the user the AI could not be found, but still
load the AI. But in all cases, the AI never got the chance to
load the saved data, making the whole reason this exists pointless.
By splitting the name and version already in the console command,
the code becomes simpler and AIs started this way now follow the
normal flow after initialization.
You can do: "startai myai.3", which starts version 3 of "myai".
This is very useful for testing save/load code between different
versions of your AI.
However, when using this syntax, the AI got saved as "myai.3" as
name of the AI, instead of "myai". This caused several problems,
like indicating to the user the AI could not be found, but still
load the AI. But in all cases, the AI never got the chance to
load the saved data, making the whole reason this exists pointless.
By splitting the name and version already in the console command,
the code becomes simpler and AIs started this way now follow the
normal flow after initialization.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 | r13303:b411503e5ec3 r13303:b411503e5ec3 r13303:b411503e5ec3 r13303:b411503e5ec3 r13303:b411503e5ec3 r13303:b411503e5ec3 r13303:b411503e5ec3 r13303:b411503e5ec3 r13303:b411503e5ec3 r13303:b411503e5ec3 r13303:b411503e5ec3 r13303:b411503e5ec3 r13303:b411503e5ec3 r13303:b411503e5ec3 r13303:b411503e5ec3 r13303:b411503e5ec3 r13303:b411503e5ec3 r18670:f122c356353c r18670:f122c356353c r13303:b411503e5ec3 r13303:b411503e5ec3 r13303:b411503e5ec3 r21383:942c32fb8b0e r21383:942c32fb8b0e r24333:94ef0c6c84e2 r24333:94ef0c6c84e2 r13303:b411503e5ec3 r13742:180ad925befc r24333:94ef0c6c84e2 r14035:4f06488d5a62 r20287:5b9a8691769e r13742:180ad925befc r13303:b411503e5ec3 r13745:49505a0400d8 r18674:87553327b450 r13303:b411503e5ec3 r13303:b411503e5ec3 r18674:87553327b450 r18674:87553327b450 r13303:b411503e5ec3 r18674:87553327b450 r13303:b411503e5ec3 r18674:87553327b450 r13303:b411503e5ec3 r13303:b411503e5ec3 r13303:b411503e5ec3 r13303:b411503e5ec3 r13745:49505a0400d8 r13742:180ad925befc r13303:b411503e5ec3 r13303:b411503e5ec3 r13303:b411503e5ec3 r13303:b411503e5ec3 r13303:b411503e5ec3 r20280:ca1fc41725ff r13303:b411503e5ec3 r20280:ca1fc41725ff r13303:b411503e5ec3 r18674:87553327b450 r18467:be6d7226508e r18674:87553327b450 r13303:b411503e5ec3 r13303:b411503e5ec3 r13303:b411503e5ec3 r16251:3815ee8ed475 r13303:b411503e5ec3 r13303:b411503e5ec3 r13303:b411503e5ec3 r14172:37285dcc663e r13303:b411503e5ec3 r13303:b411503e5ec3 r22536:73c92403b703 r13303:b411503e5ec3 r13303:b411503e5ec3 r14172:37285dcc663e r14172:37285dcc663e r13303:b411503e5ec3 r13303:b411503e5ec3 r13303:b411503e5ec3 r13303:b411503e5ec3 r23499:f9bf6ad58697 r13303:b411503e5ec3 r13303:b411503e5ec3 r18674:87553327b450 r13303:b411503e5ec3 r13303:b411503e5ec3 r13303:b411503e5ec3 r13303:b411503e5ec3 r13303:b411503e5ec3 r13303:b411503e5ec3 r23499:f9bf6ad58697 r13303:b411503e5ec3 r13303:b411503e5ec3 r18674:87553327b450 r18674:87553327b450 r13303:b411503e5ec3 r18674:87553327b450 r13303:b411503e5ec3 r13303:b411503e5ec3 r13303:b411503e5ec3 r13303:b411503e5ec3 r13303:b411503e5ec3 r13303:b411503e5ec3 r13303:b411503e5ec3 r13303:b411503e5ec3 r15608:7b580ec7448a r15608:7b580ec7448a r13303:b411503e5ec3 r18674:87553327b450 r13303:b411503e5ec3 r13303:b411503e5ec3 r13303:b411503e5ec3 r13303:b411503e5ec3 r13303:b411503e5ec3 r13303:b411503e5ec3 r15608:7b580ec7448a r15608:7b580ec7448a r13303:b411503e5ec3 r13303:b411503e5ec3 r13303:b411503e5ec3 r23499:f9bf6ad58697 r13303:b411503e5ec3 r23607:36c15679007d r18674:87553327b450 r13303:b411503e5ec3 r13303:b411503e5ec3 r13303:b411503e5ec3 r13303:b411503e5ec3 r23499:f9bf6ad58697 r13303:b411503e5ec3 r17091:91a5bff32f6c r17091:91a5bff32f6c r13303:b411503e5ec3 r13303:b411503e5ec3 r13303:b411503e5ec3 r13303:b411503e5ec3 r23499:f9bf6ad58697 r13303:b411503e5ec3 r22872:74e10e9baeb0 r17227:09618fcc767a r17227:09618fcc767a r13303:b411503e5ec3 r13303:b411503e5ec3 r17476:d3b7a183536d r17476:d3b7a183536d r17476:d3b7a183536d r17476:d3b7a183536d r17476:d3b7a183536d r23499:f9bf6ad58697 r13303:b411503e5ec3 r17476:d3b7a183536d r13303:b411503e5ec3 r18674:87553327b450 r13303:b411503e5ec3 r13303:b411503e5ec3 r13303:b411503e5ec3 r24333:94ef0c6c84e2 r20283:2a199c78224c r24333:94ef0c6c84e2 r19745:d8f95208ad9e r24333:94ef0c6c84e2 r13303:b411503e5ec3 r13303:b411503e5ec3 r16251:3815ee8ed475 r16251:3815ee8ed475 r16251:3815ee8ed475 r16251:3815ee8ed475 r24333:94ef0c6c84e2 r13303:b411503e5ec3 r13303:b411503e5ec3 r13303:b411503e5ec3 r13303:b411503e5ec3 r24333:94ef0c6c84e2 r13303:b411503e5ec3 r24333:94ef0c6c84e2 r13303:b411503e5ec3 r16251:3815ee8ed475 r16251:3815ee8ed475 r16251:3815ee8ed475 r16251:3815ee8ed475 r16251:3815ee8ed475 r16251:3815ee8ed475 r24333:94ef0c6c84e2 r16251:3815ee8ed475 r16251:3815ee8ed475 r16251:3815ee8ed475 r16251:3815ee8ed475 r24333:94ef0c6c84e2 r16251:3815ee8ed475 | /*
* This file is part of OpenTTD.
* OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
* OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
* See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
*/
/** @file viewport_gui.cpp Extra viewport window. */
#include "stdafx.h"
#include "landscape.h"
#include "window_gui.h"
#include "viewport_func.h"
#include "strings_func.h"
#include "zoom_func.h"
#include "window_func.h"
#include "widgets/viewport_widget.h"
#include "table/strings.h"
#include "table/sprites.h"
#include "safeguards.h"
/* Extra Viewport Window Stuff */
static const NWidgetPart _nested_extra_viewport_widgets[] = {
NWidget(NWID_HORIZONTAL),
NWidget(WWT_CLOSEBOX, COLOUR_GREY),
NWidget(WWT_CAPTION, COLOUR_GREY, WID_EV_CAPTION), SetDataTip(STR_EXTRA_VIEWPORT_TITLE, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
NWidget(WWT_SHADEBOX, COLOUR_GREY),
NWidget(WWT_DEFSIZEBOX, COLOUR_GREY),
NWidget(WWT_STICKYBOX, COLOUR_GREY),
EndContainer(),
NWidget(WWT_PANEL, COLOUR_GREY),
NWidget(NWID_VIEWPORT, INVALID_COLOUR, WID_EV_VIEWPORT), SetPadding(2, 2, 2, 2), SetResize(1, 1), SetFill(1, 1),
EndContainer(),
NWidget(NWID_HORIZONTAL),
NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, WID_EV_ZOOM_IN), SetDataTip(SPR_IMG_ZOOMIN, STR_TOOLBAR_TOOLTIP_ZOOM_THE_VIEW_IN),
NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, WID_EV_ZOOM_OUT), SetDataTip(SPR_IMG_ZOOMOUT, STR_TOOLBAR_TOOLTIP_ZOOM_THE_VIEW_OUT),
NWidget(NWID_HORIZONTAL, NC_EQUALSIZE),
NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_EV_MAIN_TO_VIEW), SetFill(1, 1), SetResize(1, 0),
SetDataTip(STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW, STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TT),
NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_EV_VIEW_TO_MAIN), SetFill(1, 1), SetResize(1, 0),
SetDataTip(STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN, STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT),
EndContainer(),
EndContainer(),
NWidget(NWID_HORIZONTAL),
NWidget(WWT_PANEL, COLOUR_GREY), SetFill(1, 1), SetResize(1, 0), EndContainer(),
NWidget(WWT_RESIZEBOX, COLOUR_GREY),
EndContainer(),
};
class ExtraViewportWindow : public Window {
public:
ExtraViewportWindow(WindowDesc *desc, int window_number, TileIndex tile) : Window(desc)
{
this->InitNested(window_number);
NWidgetViewport *nvp = this->GetWidget<NWidgetViewport>(WID_EV_VIEWPORT);
nvp->InitializeViewport(this, 0, ZOOM_LVL_VIEWPORT);
if (_settings_client.gui.zoom_min == ZOOM_LVL_VIEWPORT) this->DisableWidget(WID_EV_ZOOM_IN);
Point pt;
if (tile == INVALID_TILE) {
/* No tile? Use center of main viewport. */
const Window *w = FindWindowById(WC_MAIN_WINDOW, 0);
/* center on same place as main window (zoom is maximum, no adjustment needed) */
pt.x = w->viewport->scrollpos_x + w->viewport->virtual_width / 2;
pt.y = w->viewport->scrollpos_y + w->viewport->virtual_height / 2;
} else {
pt = RemapCoords(TileX(tile) * TILE_SIZE + TILE_SIZE / 2, TileY(tile) * TILE_SIZE + TILE_SIZE / 2, TilePixelHeight(tile));
}
this->viewport->scrollpos_x = pt.x - this->viewport->virtual_width / 2;
this->viewport->scrollpos_y = pt.y - this->viewport->virtual_height / 2;
this->viewport->dest_scrollpos_x = this->viewport->scrollpos_x;
this->viewport->dest_scrollpos_y = this->viewport->scrollpos_y;
}
void SetStringParameters(int widget) const override
{
switch (widget) {
case WID_EV_CAPTION:
/* set the number in the title bar */
SetDParam(0, this->window_number + 1);
break;
}
}
void OnClick(Point pt, int widget, int click_count) override
{
switch (widget) {
case WID_EV_ZOOM_IN: DoZoomInOutWindow(ZOOM_IN, this); break;
case WID_EV_ZOOM_OUT: DoZoomInOutWindow(ZOOM_OUT, this); break;
case WID_EV_MAIN_TO_VIEW: { // location button (move main view to same spot as this view) 'Paste Location'
Window *w = FindWindowById(WC_MAIN_WINDOW, 0);
int x = this->viewport->scrollpos_x; // Where is the main looking at
int y = this->viewport->scrollpos_y;
/* set this view to same location. Based on the center, adjusting for zoom */
w->viewport->dest_scrollpos_x = x - (w->viewport->virtual_width - this->viewport->virtual_width) / 2;
w->viewport->dest_scrollpos_y = y - (w->viewport->virtual_height - this->viewport->virtual_height) / 2;
w->viewport->follow_vehicle = INVALID_VEHICLE;
break;
}
case WID_EV_VIEW_TO_MAIN: { // inverse location button (move this view to same spot as main view) 'Copy Location'
const Window *w = FindWindowById(WC_MAIN_WINDOW, 0);
int x = w->viewport->scrollpos_x;
int y = w->viewport->scrollpos_y;
this->viewport->dest_scrollpos_x = x + (w->viewport->virtual_width - this->viewport->virtual_width) / 2;
this->viewport->dest_scrollpos_y = y + (w->viewport->virtual_height - this->viewport->virtual_height) / 2;
break;
}
}
}
void OnResize() override
{
if (this->viewport != nullptr) {
NWidgetViewport *nvp = this->GetWidget<NWidgetViewport>(WID_EV_VIEWPORT);
nvp->UpdateViewportCoordinates(this);
}
}
void OnScroll(Point delta) override
{
this->viewport->scrollpos_x += ScaleByZoom(delta.x, this->viewport->zoom);
this->viewport->scrollpos_y += ScaleByZoom(delta.y, this->viewport->zoom);
this->viewport->dest_scrollpos_x = this->viewport->scrollpos_x;
this->viewport->dest_scrollpos_y = this->viewport->scrollpos_y;
}
void OnMouseWheel(int wheel) override
{
if (_settings_client.gui.scrollwheel_scrolling != 2) {
ZoomInOrOutToCursorWindow(wheel < 0, this);
}
}
/**
* Some data on this window has become invalid.
* @param data Information about the changed data.
* @param gui_scope Whether the call is done from GUI scope. You may not do everything when not in GUI scope. See #InvalidateWindowData() for details.
*/
void OnInvalidateData(int data = 0, bool gui_scope = true) override
{
if (!gui_scope) return;
/* Only handle zoom message if intended for us (msg ZOOM_IN/ZOOM_OUT) */
HandleZoomMessage(this, this->viewport, WID_EV_ZOOM_IN, WID_EV_ZOOM_OUT);
}
};
static WindowDesc _extra_viewport_desc(
WDP_AUTO, "extra_viewport", 300, 268,
WC_EXTRA_VIEWPORT, WC_NONE,
0,
_nested_extra_viewport_widgets, lengthof(_nested_extra_viewport_widgets)
);
/**
* Show a new Extra Viewport window.
* @param tile Tile to center the view on. INVALID_TILE means to use the center of main viewport.
*/
void ShowExtraViewportWindow(TileIndex tile)
{
int i = 0;
/* find next free window number for extra viewport */
while (FindWindowById(WC_EXTRA_VIEWPORT, i) != nullptr) i++;
new ExtraViewportWindow(&_extra_viewport_desc, i, tile);
}
/**
* Show a new Extra Viewport window.
* Center it on the tile under the cursor, if the cursor is inside a viewport.
* If that fails, center it on main viewport center.
*/
void ShowExtraViewportWindowForTileUnderCursor()
{
/* Use tile under mouse as center for new viewport.
* Do this before creating the window, it might appear just below the mouse. */
Point pt = GetTileBelowCursor();
ShowExtraViewportWindow(pt.x != -1 ? TileVirtXY(pt.x, pt.y) : INVALID_TILE);
}
|