Files
@ r24498:e9114d9ab04a
Branch filter:
Location: cpp/openttd-patchpack/source/src/viewport_kdtree.h - annotation
r24498:e9114d9ab04a
2.4 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.
r23437:6ce81d75a8ed r23437:6ce81d75a8ed r23437:6ce81d75a8ed r23437:6ce81d75a8ed r23437:6ce81d75a8ed r23437:6ce81d75a8ed r23437:6ce81d75a8ed r23437:6ce81d75a8ed r23437:6ce81d75a8ed r23437:6ce81d75a8ed r23437:6ce81d75a8ed r23437:6ce81d75a8ed r23437:6ce81d75a8ed r23437:6ce81d75a8ed r23437:6ce81d75a8ed r23437:6ce81d75a8ed r23437:6ce81d75a8ed r23437:6ce81d75a8ed r23437:6ce81d75a8ed r23437:6ce81d75a8ed r23437:6ce81d75a8ed r23437:6ce81d75a8ed r23437:6ce81d75a8ed r23437:6ce81d75a8ed r23437:6ce81d75a8ed r23437:6ce81d75a8ed r23437:6ce81d75a8ed r23437:6ce81d75a8ed r23437:6ce81d75a8ed r23437:6ce81d75a8ed r23437:6ce81d75a8ed r23437:6ce81d75a8ed r23437:6ce81d75a8ed r23437:6ce81d75a8ed r23437:6ce81d75a8ed r23437:6ce81d75a8ed r23437:6ce81d75a8ed r23437:6ce81d75a8ed r23437:6ce81d75a8ed r23437:6ce81d75a8ed r23437:6ce81d75a8ed r23437:6ce81d75a8ed r23437:6ce81d75a8ed r23437:6ce81d75a8ed r23437:6ce81d75a8ed r23437:6ce81d75a8ed r23437:6ce81d75a8ed r23437:6ce81d75a8ed r23437:6ce81d75a8ed r23437:6ce81d75a8ed r23437:6ce81d75a8ed r23437:6ce81d75a8ed r23437:6ce81d75a8ed r23437:6ce81d75a8ed r23437:6ce81d75a8ed r23437:6ce81d75a8ed r23437:6ce81d75a8ed r23437:6ce81d75a8ed r23437:6ce81d75a8ed r23437:6ce81d75a8ed r23437:6ce81d75a8ed r23437:6ce81d75a8ed r23437:6ce81d75a8ed r23437:6ce81d75a8ed r23437:6ce81d75a8ed r23437:6ce81d75a8ed r23437:6ce81d75a8ed r23437:6ce81d75a8ed r23437:6ce81d75a8ed r23437:6ce81d75a8ed r23437:6ce81d75a8ed r23437:6ce81d75a8ed r23437:6ce81d75a8ed r23437:6ce81d75a8ed r23437:6ce81d75a8ed r23437:6ce81d75a8ed r23437:6ce81d75a8ed r23437:6ce81d75a8ed r23437:6ce81d75a8ed r23437:6ce81d75a8ed r23437:6ce81d75a8ed r23437:6ce81d75a8ed r23437:6ce81d75a8ed | /*
* 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 town_kdtree.h Declarations for accessing the k-d tree of towns */
#ifndef VIEWPORT_KDTREE_H
#define VIEWPORT_KDTREE_H
#include "core/kdtree.hpp"
#include "viewport_type.h"
#include "station_base.h"
#include "town_type.h"
#include "signs_base.h"
struct ViewportSignKdtreeItem {
enum ItemType : uint16 {
VKI_STATION,
VKI_WAYPOINT,
VKI_TOWN,
VKI_SIGN,
};
ItemType type;
union {
StationID station;
TownID town;
SignID sign;
} id;
int32 center;
int32 top;
bool operator== (const ViewportSignKdtreeItem &other) const
{
if (this->type != other.type) return false;
switch (this->type) {
case VKI_STATION:
case VKI_WAYPOINT:
return this->id.station == other.id.station;
case VKI_TOWN:
return this->id.town == other.id.town;
case VKI_SIGN:
return this->id.sign == other.id.sign;
default:
NOT_REACHED();
}
}
bool operator< (const ViewportSignKdtreeItem &other) const
{
if (this->type != other.type) return this->type < other.type;
switch (this->type) {
case VKI_STATION:
case VKI_WAYPOINT:
return this->id.station < other.id.station;
case VKI_TOWN:
return this->id.town < other.id.town;
case VKI_SIGN:
return this->id.sign < other.id.sign;
default:
NOT_REACHED();
}
}
static ViewportSignKdtreeItem MakeStation(StationID id);
static ViewportSignKdtreeItem MakeWaypoint(StationID id);
static ViewportSignKdtreeItem MakeTown(TownID id);
static ViewportSignKdtreeItem MakeSign(SignID id);
};
inline int32 Kdtree_ViewportSignXYFunc(const ViewportSignKdtreeItem &item, int dim)
{
return (dim == 0) ? item.center : item.top;
}
typedef Kdtree<ViewportSignKdtreeItem, decltype(&Kdtree_ViewportSignXYFunc), int32, int32> ViewportSignKdtree;
extern ViewportSignKdtree _viewport_sign_kdtree;
void RebuildViewportKdtree();
#endif
|