cpp/openttd-patchpack/source Changeset - r23538:8df50944b27a

Changeset - r23538:8df50944b27a

Parent rev.

Child rev.

[Not reviewed]

master

! ! !

Henry Wilson - 5 years ago 2019-03-03 17:30:09
m3henry@googlemail.com

Codechange: Removed SmallVector completely

69 files changed with 109 insertions and 127 deletions:

src/animated_tile.cpp

src/company_gui.cpp

src/core/pool_type.hpp

src/core/smallmap_type.hpp

src/core/smallstack_type.hpp

src/core/smallvec_type.hpp

src/economy.cpp

src/engine_base.h

src/fios.cpp

src/fios.h

src/group_gui.cpp

src/hotkeys.cpp

src/hotkeys.h

src/industry_cmd.cpp

src/industry_gui.cpp

src/language.h

src/linkgraph/linkgraph.h

src/linkgraph/linkgraphjob.h

src/music/midifile.hpp

src/network/core/address.h

src/network/core/tcp_connect.cpp

src/network/core/tcp_http.cpp

src/network/network_content.h

src/network/network_content_gui.cpp

src/network/network_gui.cpp

src/newgrf.cpp

src/newgrf.h

src/newgrf_commons.cpp

src/newgrf_commons.h

src/newgrf_config.h

src/newgrf_debug.h

src/newgrf_debug_gui.cpp

src/newgrf_engine.cpp

src/newgrf_sound.cpp

src/newgrf_text.cpp

src/newgrf_text.h

src/object_base.h

src/object_cmd.cpp

src/openttd.cpp

src/rail.h

src/rail_cmd.cpp

src/saveload/afterload.cpp

src/saveload/animated_tile_sl.cpp

src/saveload/labelmaps_sl.cpp

src/saveload/linkgraph_sl.cpp

src/saveload/oldloader_sl.cpp

src/saveload/waypoint_sl.cpp

src/script/squirrel_helper.hpp

src/settingsgen/settingsgen.cpp

src/sortlist_type.h

src/station_cmd.cpp

src/station_gui.cpp

src/strgen/strgen_base.cpp

src/string.cpp

src/stringfilter_type.h

src/subsidy.cpp

src/texteff.cpp

src/textfile_gui.h

src/timetable_cmd.cpp

src/train_cmd.cpp

src/train_gui.cpp

src/vehicle_cmd.cpp

src/vehicle_func.h

src/vehicle_gui.cpp

src/vehiclelist.h

src/viewport.cpp

src/viewport_sprite_sorter.h

src/window.cpp

src/window_gui.h

0 comments (0 inline, 0 general)

src/animated_tile.cpp

➞

Show inline comments

@@ @@ -10,25 +10,25 @@ @@
 /** @file animated_tile.cpp Everything related to animated tiles. */
 #include "stdafx.h"
 #include "core/alloc_func.hpp"
 #include "core/smallvec_type.hpp"
 #include "tile_cmd.h"
 #include "viewport_func.h"
 #include "framerate_type.h"
 #include "safeguards.h"
 /** The table/list with animated tiles. */
-SmallVector<TileIndex, 256> _animated_tiles;
+std::vector<TileIndex> _animated_tiles;
 /**
  * Removes the given tile from the animated tile table.
  * @param tile the tile to remove
  */
 void DeleteAnimatedTile(TileIndex tile)
+{
 	auto to_remove = std::find(_animated_tiles.begin(), _animated_tiles.end(), tile);
 	if (to_remove != _animated_tiles.end()) {
 		/* The order of the remaining elements must stay the same, otherwise the animation loop may miss a tile. */
 		_animated_tiles.erase(to_remove);
 		MarkTileDirtyByTile(tile);

src/company_gui.cpp

➞

Show inline comments

@@ @@ -553,25 +553,25 @@ static const int LEVEL_WIDTH = 10; ///< @@
 typedef GUIList<const Group*> GUIGroupList;
 /** Company livery colour scheme window. */
 struct SelectCompanyLiveryWindow : public Window {
 private:
 	uint32 sel;
 	LiveryClass livery_class;
 	Dimension square;
 	uint rows;
 	uint line_height;
 	GUIGroupList groups;
-	SmallVector<int, 32> indents;
+	std::vector<int> indents;
 	Scrollbar *vscroll;
 	void ShowColourDropDownMenu(uint32 widget)
+	{
 		uint32 used_colours = 0;
 		const Company *c;
 		const Livery *livery, *default_livery = NULL;
 		bool primary = widget == WID_SCL_PRI_COL_DROPDOWN;
 		byte default_col;
 		/* Disallow other company colours for the primary colour */
 		if (this->livery_class < LC_GROUP_RAIL && HasBit(this->sel, LS_DEFAULT) && primary) {

src/core/pool_type.hpp

➞

Show inline comments

@@ @@ -17,25 +17,25 @@ @@
 /** Various types of a pool. */
 enum PoolType {
 	PT_NONE    = 0x00, ///< No pool is selected.
 	PT_NORMAL  = 0x01, ///< Normal pool containing game objects.
 	PT_NCLIENT = 0x02, ///< Network client pools.
 	PT_NADMIN  = 0x04, ///< Network admin pool.
 	PT_DATA    = 0x08, ///< NewGRF or other data, that is not reset together with normal pools.
 	PT_ALL     = 0x0F, ///< All pool types.
 };
 DECLARE_ENUM_AS_BIT_SET(PoolType)
-typedef SmallVector<struct PoolBase *, 4> PoolVector; ///< Vector of pointers to PoolBase
+typedef std::vector<struct PoolBase *> PoolVector; ///< Vector of pointers to PoolBase
 /** Base class for base of all pools. */
 struct PoolBase {
 	const PoolType type; ///< Type of this pool.
 	/**
 	 * Function used to access the vector of all pools.
 	 * @return pointer to vector of all pools
 	 */
 	static PoolVector *GetPools()
+	{
 		static PoolVector *pools = new PoolVector();

src/core/smallmap_type.hpp

➞

Show inline comments

@@ @@ -31,25 +31,25 @@ struct SmallPair { @@
 };
 /**
  * Implementation of simple mapping class. Both types have to be POD ("Plain Old Data")!
  * It has inherited accessors from SmallVector().
  * @tparam T Key type.
  * @tparam U Value type.
  * @tparam S Unit of allocation.
+ *
  * @see SmallVector
  */
 template <typename T, typename U, uint S = 16>
-struct SmallMap : SmallVector<SmallPair<T, U>, S> {
+struct SmallMap : std::vector<SmallPair<T, U> > {
 	typedef ::SmallPair<T, U> Pair;
 	typedef Pair *iterator;
 	typedef const Pair *const_iterator;
 	/** Creates new SmallMap. Data are initialized in SmallVector constructor */
 	inline SmallMap() { }
 	/** Data are freed in SmallVector destructor */
 	inline ~SmallMap() { }
 	/**
 	 * Finds given key in this map
 	 * @param key key to find

src/core/smallstack_type.hpp

➞

Show inline comments

@@ @@ -78,25 +78,25 @@ private: @@
+		}
 		return index;
+	}
 	struct SimplePoolPoolItem : public Titem {
 		bool valid;
 	};
 	Tindex first_unused;
 	Tindex first_free;
 	ThreadMutex *mutex;
-	SmallVector<SimplePoolPoolItem, Tgrowth_step> data;
+	std::vector<SimplePoolPoolItem> data;
 };
 /**
  * Base class for SmallStack. We cannot add this into SmallStack itself as
  * certain compilers don't like it.
  */
 template <typename Titem, typename Tindex>
 struct SmallStackItem {
 	Tindex next; ///< Pool index of next item.
 	Titem value; ///< Value of current item.
 	/**

src/core/smallvec_type.hpp

➞

Show inline comments

@@ @@ -25,88 +25,71 @@ @@
  * @param item Reference to the item to be copy-constructed if not found
+ *
  * @return Whether the item was already present
  */
 template <typename T>
 inline bool include(std::vector<T>& vec, const T &item)
+{
 	const bool is_member = std::find(vec.begin(), vec.end(), item) != vec.end();
 	if (!is_member) vec.emplace_back(item);
 	return is_member;
+}
 /**
  * Simple vector template class.
+ *
  * @note There are no asserts in the class so you have
  *       to care about that you grab an item which is
  *       inside the list.
+ *
  * @tparam T The type of the items stored
  * @tparam S The steps of allocation
  */
 template <typename T, uint S>
 using SmallVector = std::vector<T>;
 /**
  * Helper function to get the index of an item
  * Consider using std::set, std::unordered_set or std::flat_set in new code
+ *
  * @param vec A reference to the vector to be extended
  * @param item Reference to the item to be search for
+ *
  * @return Index of element if found, otherwise -1
  */
 template <typename T>
 int find_index(std::vector<T> const& vec, T const& item)
+{
 	auto const it = std::find(vec.begin(), vec.end(), item);
 	if (it != vec.end()) return it - vec.begin();
 	return -1;
+}
 /**
  * Helper function to append N default-constructed elements and get a pointer to the first new element
  * Consider using std::back_inserter in new code
+ *
  * @param vec A reference to the vector to be extended
- * @param num The number of elements to default-construct
+ * @param num Number of elements to be default-constructed
+ *
  * @return Pointer to the first new element
  */
 template <typename T>
-inline T* grow(std::vector<T>& vec, std::size_t num)
 T* grow(std::vector<T>& vec, std::size_t num)
+{
-	const std::size_t pos = vec.size();
+	std::size_t const pos = vec.size();
 	vec.resize(pos + num);
 	return vec.data() + pos;
+}
 /**
  * Simple vector template class, with automatic free.
+ *
  * @note There are no asserts in the class so you have
  *       to care about that you grab an item which is
  *       inside the list.
+ *
  * @param T The type of the items stored, must be a pointer
  * @param S The steps of allocation
  */
 template <typename T, uint S>
-class AutoFreeSmallVector : public SmallVector<T, S> {
+class AutoFreeSmallVector : public std::vector<T> {
 public:
 	~AutoFreeSmallVector()
+	{
 		this->Clear();
+	}
 	/**
 	 * Remove all items from the list.
 	 */
 	inline void Clear()
+	{
 		for (uint i = 0; i < std::vector<T>::size(); i++) {
@@ @@ -119,25 +102,25 @@ public: @@
 /**
  * Simple vector template class, with automatic delete.
+ *
  * @note There are no asserts in the class so you have
  *       to care about that you grab an item which is
  *       inside the list.
+ *
  * @param T The type of the items stored, must be a pointer
  * @param S The steps of allocation
  */
 template <typename T, uint S>
-class AutoDeleteSmallVector : public SmallVector<T, S> {
+class AutoDeleteSmallVector : public std::vector<T> {
 public:
 	~AutoDeleteSmallVector()
+	{
 		this->Clear();
+	}
 	/**
 	 * Remove all items from the list.
 	 */
 	inline void Clear()
+	{
 		for (uint i = 0; i < std::vector<T>::size(); i++) {

src/economy.cpp

➞

Show inline comments

@@ @@ -68,25 +68,25 @@ INSTANTIATE_POOL_METHODS(CargoPayment) @@
  * shifted by the amount of shift to right.
+ *
  * @param a The first integer
  * @param b The second integer
  * @param shift The amount to shift the value to right.
  * @return The shifted result
  */
 static inline int32 BigMulS(const int32 a, const int32 b, const uint8 shift)
+{
 	return (int32)((int64)a * (int64)b >> shift);
+}
-typedef SmallVector<Industry *, 16> SmallIndustryList;
+typedef std::vector<Industry *> SmallIndustryList;
 /**
  * Score info, values used for computing the detailed performance rating.
  */
 const ScoreInfo _score_info[] = {
 	{     120, 100}, // SCORE_VEHICLES
 	{      80, 100}, // SCORE_STATIONS
 	{   10000, 100}, // SCORE_MIN_PROFIT
 	{   50000,  50}, // SCORE_MIN_INCOME
 	{  100000, 100}, // SCORE_MAX_INCOME
 	{   40000, 400}, // SCORE_DELIVERED
 	{       8,  50}, // SCORE_CARGO

src/engine_base.h

➞

Show inline comments

@@ @@ -147,25 +147,25 @@ struct Engine : EnginePool::PoolItem<&_e @@
 struct EngineIDMapping {
 	uint32 grfid;          ///< The GRF ID of the file the entity belongs to
 	uint16 internal_id;    ///< The internal ID within the GRF file
 	VehicleTypeByte type;  ///< The engine type
 	uint8  substitute_id;  ///< The (original) entity ID to use if this GRF is not available (currently not used)
 };
 /**
  * Stores the mapping of EngineID to the internal id of newgrfs.
  * Note: This is not part of Engine, as the data in the EngineOverrideManager and the engine pool get resetted in different cases.
  */
-struct EngineOverrideManager : SmallVector<EngineIDMapping, 256> {
+struct EngineOverrideManager : std::vector<EngineIDMapping> {
 	static const uint NUM_DEFAULT_ENGINES; ///< Number of default entries
 	void ResetToDefaultMapping();
 	EngineID GetID(VehicleType type, uint16 grf_local_id, uint32 grfid);
 	static bool ResetToCurrentNewGRFConfig();
 };
 extern EngineOverrideManager _engine_mngr;
 #define FOR_ALL_ENGINES_FROM(var, start) FOR_ALL_ITEMS_FROM(Engine, engine_index, var, start)
 #define FOR_ALL_ENGINES(var) FOR_ALL_ENGINES_FROM(var, 0)

src/fios.cpp

➞

Show inline comments

@@ @@ -646,25 +646,25 @@ struct ScenarioIdentifier { @@
 				memcmp(this->md5sum, other.md5sum, sizeof(this->md5sum)) == 0;
+	}
 	bool operator != (const ScenarioIdentifier &other) const
+	{
 		return !(*this == other);
+	}
 };
 /**
  * Scanner to find the unique IDs of scenarios
  */
-class ScenarioScanner : protected FileScanner, public SmallVector<ScenarioIdentifier, 8> {
+class ScenarioScanner : protected FileScanner, public std::vector<ScenarioIdentifier> {
 	bool scanned; ///< Whether we've already scanned
 public:
 	/** Initialise */
 	ScenarioScanner() : scanned(false) {}
 	/**
 	 * Scan, but only if it's needed.
 	 * @param rescan whether to force scanning even when it's not necessary
 	 */
 	void Scan(bool rescan)
+	{
 		if (this->scanned && !rescan) return;

src/fios.h

➞

Show inline comments

@@ @@ -189,25 +189,25 @@ public: @@
 		this->files.clear();
+	}
 	/** Compact the list down to the smallest block size boundary. */
 	inline void Compact()
+	{
 		this->files.shrink_to_fit();
+	}
 	void BuildFileList(AbstractFileType abstract_filetype, SaveLoadOperation fop);
 	const FiosItem *FindItem(const char *file);
-	SmallVector<FiosItem, 32> files; ///< The list of files.
+	std::vector<FiosItem> files; ///< The list of files.
 };
 enum SortingBits {
 	SORT_ASCENDING  = 0,
 	SORT_DESCENDING = 1,
 	SORT_BY_DATE    = 0,
 	SORT_BY_NAME    = 2
 };
 DECLARE_ENUM_AS_BIT_SET(SortingBits)
 /* Variables to display file lists */
 extern SortingBits _savegame_sort_order;

src/group_gui.cpp

➞

Show inline comments

@@ @@ -112,25 +112,25 @@ private: @@
 		VGC_END
 	};
 	VehicleID vehicle_sel; ///< Selected vehicle
 	GroupID group_sel;     ///< Selected group (for drag/drop)
 	GroupID group_rename;  ///< Group being renamed, INVALID_GROUP if none
 	GroupID group_over;    ///< Group over which a vehicle is dragged, INVALID_GROUP if none
 	GroupID group_confirm; ///< Group awaiting delete confirmation
 	GUIGroupList groups;   ///< List of groups
 	uint tiny_step_height; ///< Step height for the group list
 	Scrollbar *group_sb;
-	SmallVector<int, 16> indents; ///< Indentation levels
+	std::vector<int> indents; ///< Indentation levels
 	Dimension column_size[VGC_END]; ///< Size of the columns in the group list.
 	void AddChildren(GUIGroupList *source, GroupID parent, int indent)
+	{
 		for (const Group *g : *source) {
 			if (g->parent != parent) continue;
 			this->groups.push_back(g);
 			this->indents.push_back(indent);
 			AddChildren(source, g->index, indent + 1);
+		}
+	}

src/hotkeys.cpp

➞

Show inline comments

@@ @@ -15,25 +15,25 @@ @@
 #include "ini_type.h"
 #include "string_func.h"
 #include "window_gui.h"
 #include "safeguards.h"
 char *_hotkeys_file;
 /**
  * List of all HotkeyLists.
  * This is a pointer to ensure initialisation order with the various static HotkeyList instances.
  */
-static SmallVector<HotkeyList*, 16> *_hotkey_lists = NULL;
+static std::vector<HotkeyList*> *_hotkey_lists = NULL;
 /** String representation of a keycode */
 struct KeycodeNames {
 	const char *name;       ///< Name of the keycode
 	WindowKeyCodes keycode; ///< The keycode
 };
 /** Array of non-standard keycodes that can be used in the hotkeys config file. */
 static const KeycodeNames _keycode_to_name[] = {
 	{"SHIFT", WKC_SHIFT},
 	{"CTRL", WKC_CTRL},
 	{"ALT", WKC_ALT},
@@ @@ -245,25 +245,25 @@ Hotkey::Hotkey(const uint16 *default_key @@
  * Add a keycode to this hotkey, from now that keycode will be matched
  * in addition to any previously added keycodes.
  * @param keycode The keycode to add.
  */
 void Hotkey::AddKeycode(uint16 keycode)
+{
 	include(this->keycodes, keycode);
+}
 HotkeyList::HotkeyList(const char *ini_group, Hotkey *items, GlobalHotkeyHandlerFunc global_hotkey_handler) :
 	global_hotkey_handler(global_hotkey_handler), ini_group(ini_group), items(items)
+{
-	if (_hotkey_lists == NULL) _hotkey_lists = new SmallVector<HotkeyList*, 16>();
+	if (_hotkey_lists == NULL) _hotkey_lists = new std::vector<HotkeyList*>();
 	_hotkey_lists->push_back(this);
+}
 HotkeyList::~HotkeyList()
+{
 	_hotkey_lists->erase(std::find(_hotkey_lists->begin(), _hotkey_lists->end(), this));
+}
 /**
  * Load HotkeyList from IniFile.
  * @param ini IniFile to load from.
  */

src/hotkeys.h

➞

Show inline comments

@@ @@ -20,25 +20,25 @@ @@
 /**
  * All data for a single hotkey. The name (for saving/loading a configfile),
  * a list of keycodes and a number to help identifying this hotkey.
  */
 struct Hotkey {
 	Hotkey(uint16 default_keycode, const char *name, int num);
 	Hotkey(const uint16 *default_keycodes, const char *name, int num);
 	void AddKeycode(uint16 keycode);
 	const char *name;
 	int num;
-	SmallVector<uint16, 1> keycodes;
+	std::vector<uint16> keycodes;
 };
 #define HOTKEY_LIST_END Hotkey((uint16)0, NULL, -1)
 struct IniFile;
 /**
  * List of hotkeys for a window.
  */
 struct HotkeyList {
 	typedef EventState (*GlobalHotkeyHandlerFunc)(int hotkey);

src/industry_cmd.cpp

➞

Show inline comments

@@ @@ -1875,25 +1875,25 @@ static void DoCreateNewIndustry(Industry @@
  * @return Succeeded or failed command.
+ *
  * @post \c *ip contains the newly created industry if all checks are successful and the \a flags request actual creation, else it contains \c NULL afterwards.
  */
 static CommandCost CreateNewIndustryHelper(TileIndex tile, IndustryType type, DoCommandFlag flags, const IndustrySpec *indspec, uint itspec_index, uint32 random_var8f, uint16 random_initial_bits, Owner founder, IndustryAvailabilityCallType creation_type, Industry **ip)
+{
 	assert(itspec_index < indspec->num_table);
 	const IndustryTileTable *it = indspec->table[itspec_index];
 	bool custom_shape_check = false;
 	*ip = NULL;
-	SmallVector<ClearedObjectArea, 1> object_areas(_cleared_object_areas);
+	std::vector<ClearedObjectArea> object_areas(_cleared_object_areas);
 	CommandCost ret = CheckIfIndustryTilesAreFree(tile, it, itspec_index, type, random_initial_bits, founder, creation_type, &custom_shape_check);
 	_cleared_object_areas = object_areas;
 	if (ret.Failed()) return ret;
 	if (HasBit(GetIndustrySpec(type)->callback_mask, CBM_IND_LOCATION)) {
 		ret = CheckIfCallBackAllowsCreation(tile, type, itspec_index, random_var8f, random_initial_bits, founder, creation_type);
 	} else {
 		ret = _check_new_industry_procs[indspec->check_proc](tile);
+	}
 	if (ret.Failed()) return ret;
 	if (!custom_shape_check && _settings_game.game_creation.land_generator == LG_TERRAGENESIS && _generating_world &&

src/industry_gui.cpp

➞

Show inline comments

@@ @@ -2146,25 +2146,25 @@ next_cargo: ; @@
  *   Also, space is needed between an industry and the leftmost/rightmost column to draw the non-carried cargoes.
  * - Height of a #CFT_CARGO field is equally high as the height of the #CFT_INDUSTRY.
  * - A field at the top (#CFT_HEADER or #CFT_SMALL_EMPTY) match the width of the fields below them (#CFT_INDUSTRY respectively
  *   #CFT_CARGO), the height should be sufficient to display the header text.
+ *
  * When displaying the cargoes around an industry type, five columns are needed (supplying industries, accepted cargoes, the industry,
  * produced cargoes, customer industries). Displaying the industries around a cargo needs three columns (supplying industries, the cargo,
  * customer industries). The remaining two columns are set to #CFT_EMPTY with a width equal to the average of a cargo and an industry column.
  */
 struct IndustryCargoesWindow : public Window {
 	static const int HOR_TEXT_PADDING, VERT_TEXT_PADDING;
-	typedef SmallVector<CargoesRow, 4> Fields;
+	typedef std::vector<CargoesRow> Fields;
 	Fields fields;  ///< Fields to display in the #WID_IC_PANEL.
 	uint ind_cargo; ///< If less than #NUM_INDUSTRYTYPES, an industry type, else a cargo id + NUM_INDUSTRYTYPES.
 	Dimension cargo_textsize; ///< Size to hold any cargo text, as well as STR_INDUSTRY_CARGOES_SELECT_CARGO.
 	Dimension ind_textsize;   ///< Size to hold any industry type text, as well as STR_INDUSTRY_CARGOES_SELECT_INDUSTRY.
 	Scrollbar *vscroll;
 	IndustryCargoesWindow(int id) : Window(&_industry_cargoes_desc)
+	{
 		this->OnInit();
 		this->CreateNestedTree();
 		this->vscroll = this->GetScrollbar(WID_IC_SCROLLBAR);

src/language.h

➞

Show inline comments

@@ @@ -87,25 +87,25 @@ struct LanguagePackHeader { @@
 		return MAX_NUM_CASES;
+	}
 };
 /** Make sure the size is right. */
 assert_compile(sizeof(LanguagePackHeader) % 4 == 0);
 /** Metadata about a single language. */
 struct LanguageMetadata : public LanguagePackHeader {
 	char file[MAX_PATH]; ///< Name of the file we read this data from.
 };
 /** Type for the list of language meta data. */
-typedef SmallVector<LanguageMetadata, 4> LanguageList;
+typedef std::vector<LanguageMetadata> LanguageList;
 /** The actual list of language meta data. */
 extern LanguageList _languages;
 /** The currently loaded language. */
 extern const LanguageMetadata *_current_language;
 #ifdef WITH_ICU_I18N
 extern icu::Collator *_current_collator;
 #endif /* WITH_ICU_I18N */
 bool ReadLanguagePack(const LanguageMetadata *lang);

src/linkgraph/linkgraph.h

➞

Show inline comments

@@ @@ -426,25 +426,25 @@ public: @@
 		 * @param demand New demand for the node.
 		 */
 		void SetDemand(uint demand)
+		{
 			this->node.demand = demand;
+		}
 		void AddEdge(NodeID to, uint capacity, uint usage, EdgeUpdateMode mode);
 		void UpdateEdge(NodeID to, uint capacity, uint usage, EdgeUpdateMode mode);
 		void RemoveEdge(NodeID to);
 	};
-	typedef SmallVector<BaseNode, 16> NodeVector;
+	typedef std::vector<BaseNode> NodeVector;
 	typedef SmallMatrix<BaseEdge> EdgeMatrix;
 	/** Minimum effective distance for timeout calculation. */
 	static const uint MIN_TIMEOUT_DISTANCE = 32;
 	/** Minimum number of days between subsequent compressions of a LG. */
 	static const uint COMPRESSION_INTERVAL = 256;
 	/**
 	 * Scale a value from a link graph of age orig_age for usage in one of age
 	 * target_age. Make sure that the value stays > 0 if it was > 0 before.
 	 * @param val Value to be scaled.

src/linkgraph/linkgraphjob.h

➞

Show inline comments

@@ @@ -41,25 +41,25 @@ private: @@
 	};
 	/**
 	 * Annotation for a link graph node.
 	 */
 	struct NodeAnnotation {
 		uint undelivered_supply; ///< Amount of supply that hasn't been distributed yet.
 		PathList paths;          ///< Paths through this node, sorted so that those with flow == 0 are in the back.
 		FlowStatMap flows;       ///< Planned flows to other nodes.
 		void Init(uint supply);
 	};
-	typedef SmallVector<NodeAnnotation, 16> NodeAnnotationVector;
+	typedef std::vector<NodeAnnotation> NodeAnnotationVector;
 	typedef SmallMatrix<EdgeAnnotation> EdgeAnnotationMatrix;
 	friend const SaveLoad *GetLinkGraphJobDesc();
 	friend class LinkGraphSchedule;
 protected:
 	const LinkGraph link_graph;       ///< Link graph to by analyzed. Is copied when job is started and mustn't be modified later.
 	const LinkGraphSettings settings; ///< Copy of _settings_game.linkgraph at spawn time.
 	ThreadObject *thread;             ///< Thread the job is running in or NULL if it's running in the main thread.
 	Date join_date;                   ///< Date when the job is to be joined.
 	NodeAnnotationVector nodes;       ///< Extra node data necessary for link graph calculation.
 	EdgeAnnotationMatrix edges;       ///< Extra edge data necessary for link graph calculation.

src/music/midifile.hpp

➞

Show inline comments

@@ @@ -15,25 +15,25 @@ @@
 #include "../stdafx.h"
 #include "../core/smallvec_type.hpp"
 #include "midi.h"
 #include <vector>
 #include <string>
 struct MusicSongInfo;
 struct MidiFile {
 	struct DataBlock {
 		uint32 ticktime;           ///< tick number since start of file this block should be triggered at
 		uint32 realtime;           ///< real-time (microseconds) since start of file this block should be triggered at
-		SmallVector<byte, 8> data; ///< raw midi data contained in block
+		std::vector<byte> data; ///< raw midi data contained in block
 		DataBlock(uint32 _ticktime = 0) : ticktime(_ticktime) { }
 	};
 	struct TempoChange {
 		uint32 ticktime; ///< tick number since start of file this tempo change occurs at
 		uint32 tempo;    ///< new tempo in microseconds per tick
 		TempoChange(uint32 _ticktime, uint32 _tempo) : ticktime(_ticktime), tempo(_tempo) { }
 	};
 	std::vector<DataBlock> blocks;   ///< sequential time-annotated data of file, merged to a single track
 	std::vector<TempoChange> tempos; ///< list of tempo changes in file
 	uint16 tickdiv;                  ///< ticks per quarter note

src/network/core/address.h

➞

Show inline comments

@@ @@ -9,25 +9,25 @@ @@
 /** @file core/address.h Wrapper for network addresses. */
 #ifndef NETWORK_CORE_ADDRESS_H
 #define NETWORK_CORE_ADDRESS_H
 #include "os_abstraction.h"
 #include "config.h"
 #include "../../string_func.h"
 #include "../../core/smallmap_type.hpp"
 class NetworkAddress;
-typedef SmallVector<NetworkAddress, 4> NetworkAddressList; ///< Type for a list of addresses.
+typedef std::vector<NetworkAddress> NetworkAddressList; ///< Type for a list of addresses.
 typedef SmallMap<NetworkAddress, SOCKET, 4> SocketList;    ///< Type for a mapping between address and socket.
 /**
  * Wrapper for (un)resolved network addresses; there's no reason to transform
  * a numeric IP to a string and then back again to pass it to functions. It
  * furthermore allows easier delaying of the hostname lookup.
  */
 class NetworkAddress {
 private:
 	char hostname[NETWORK_HOSTNAME_LENGTH]; ///< The hostname
 	int address_length;                     ///< The length of the resolved address
 	sockaddr_storage address;               ///< The resolved address

src/network/core/tcp_connect.cpp

➞

Show inline comments

@@ @@ -10,25 +10,25 @@ @@
 /**
  * @file tcp_connect.cpp Basic functions to create connections without blocking.
  */
 #include "../../stdafx.h"
 #include "../../thread/thread.h"
 #include "tcp.h"
 #include "../../safeguards.h"
 /** List of connections that are currently being created */
-static SmallVector<TCPConnecter *,  1> _tcp_connecters;
+static std::vector<TCPConnecter *> _tcp_connecters;
 /**
  * Create a new connecter for the given address
  * @param address the (un)resolved address to connect to
  */
 TCPConnecter::TCPConnecter(const NetworkAddress &address) :
 	connected(false),
 	aborted(false),
 	killed(false),
 	sock(INVALID_SOCKET),
 	address(address)
+{

src/network/core/tcp_http.cpp

➞

Show inline comments

@@ @@ -12,25 +12,25 @@ @@
  */
 #include "../../stdafx.h"
 #include "../../debug.h"
 #include "../../rev.h"
 #include "../network_func.h"
 #include "tcp_http.h"
 #include "../../safeguards.h"
 /** List of open HTTP connections. */
-static SmallVector<NetworkHTTPSocketHandler *, 1> _http_connections;
+static std::vector<NetworkHTTPSocketHandler *> _http_connections;
 /**
  * Start the querying
  * @param s        the socket of this connection
  * @param callback the callback for HTTP retrieval
  * @param host     the hostname of the server to connect to
  * @param url      the url at the server
  * @param data     the data to send
  * @param depth    the depth (redirect recursion) of the queries
  */
 NetworkHTTPSocketHandler::NetworkHTTPSocketHandler(SOCKET s,
 		HTTPCallback *callback, const char *host, const char *url,

src/network/network_content.h

➞

Show inline comments

@@ @@ -7,27 +7,27 @@ @@
  * 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 network_content.h Part of the network protocol handling content distribution. */
 #ifndef NETWORK_CONTENT_H
 #define NETWORK_CONTENT_H
 #include "core/tcp_content.h"
 #include "core/tcp_http.h"
 /** Vector with content info */
-typedef SmallVector<ContentInfo *, 16> ContentVector;
+typedef std::vector<ContentInfo *> ContentVector;
 /** Vector with constant content info */
-typedef SmallVector<const ContentInfo *, 16> ConstContentVector;
+typedef std::vector<const ContentInfo *> ConstContentVector;
 /** Iterator for the content vector */
 typedef ContentInfo **ContentIterator;
 /** Iterator for the constant content vector */
 typedef const ContentInfo * const * ConstContentIterator;
 /** Callbacks for notifying others about incoming data */
 struct ContentCallback {
 	/**
 	 * Callback for when the connection has finished
 	 * @param success whether the connection was made or that we failed to make it
 	 */
@@ @@ -57,29 +57,29 @@ struct ContentCallback { @@
 	 */
 	virtual void OnDownloadComplete(ContentID cid) {}
 	/** Silentium */
 	virtual ~ContentCallback() {}
 };
 /**
  * Socket handler for the content server connection
  */
 class ClientNetworkContentSocketHandler : public NetworkContentSocketHandler, ContentCallback, HTTPCallback {
 protected:
 	typedef SmallVector<ContentID, 4> ContentIDList; ///< List of content IDs to (possibly) select.
 	SmallVector<ContentCallback *, 2> callbacks; ///< Callbacks to notify "the world"
 	typedef std::vector<ContentID> ContentIDList; ///< List of content IDs to (possibly) select.
 	std::vector<ContentCallback *> callbacks; ///< Callbacks to notify "the world"
 	ContentIDList requested;                     ///< ContentIDs we already requested (so we don't do it again)
 	ContentVector infos;                         ///< All content info we received
-	SmallVector<char, 1024> http_response;       ///< The HTTP response to the requests we've been doing
+	std::vector<char> http_response;       ///< The HTTP response to the requests we've been doing
 	int http_response_index;                     ///< Where we are, in the response, with handling it
 	FILE *curFile;        ///< Currently downloaded file
 	ContentInfo *curInfo; ///< Information about the currently downloaded file
 	bool isConnecting;    ///< Whether we're connecting
 	uint32 lastActivity;  ///< The last time there was network activity
 	friend class NetworkContentConnecter;
 	bool Receive_SERVER_INFO(Packet *p) override;
 	bool Receive_SERVER_CONTENT(Packet *p) override;

src/network/network_content_gui.cpp

➞

Show inline comments

@@ @@ -151,25 +151,25 @@ void BaseNetworkContentDownloadStatusWin @@
 		this->cur_id = ci->id;
 		this->downloaded_files++;
+	}
 	this->downloaded_bytes += bytes;
 	this->SetDirty();
+}
 /** Window for showing the download status of content */
 struct NetworkContentDownloadStatusWindow : public BaseNetworkContentDownloadStatusWindow {
 private:
-	SmallVector<ContentType, 4> receivedTypes;     ///< Types we received so we can update their cache
+	std::vector<ContentType> receivedTypes;     ///< Types we received so we can update their cache
 public:
 	/**
 	 * Create a new download window based on a list of content information
 	 * with flags whether to download them or not.
 	 */
 	NetworkContentDownloadStatusWindow() : BaseNetworkContentDownloadStatusWindow(&_network_content_download_status_window_desc)
+	{
 		this->parent = FindWindowById(WC_NETWORK_WINDOW, WN_NETWORK_WINDOW_CONTENT_LIST);
+	}
 	/** Free whatever we've allocated */

src/network/network_gui.cpp

➞

Show inline comments

@@ @@ -1719,25 +1719,25 @@ static void ClientList_SpeakToAll(const @@
 /** Popup selection window to chose an action to perform */
 struct NetworkClientListPopupWindow : Window {
 	/** Container for actions that can be executed. */
 	struct ClientListAction {
 		StringID name;                ///< Name of the action to execute
 		ClientList_Action_Proc *proc; ///< Action to execute
 	};
 	uint sel_index;
 	ClientID client_id;
 	Point desired_location;
-	SmallVector<ClientListAction, 2> actions; ///< Actions to execute
+	std::vector<ClientListAction> actions; ///< Actions to execute
 	/**
 	 * Add an action to the list of actions to execute.
 	 * @param name the name of the action
 	 * @param proc the procedure to execute for the action
 	 */
 	inline void AddAction(StringID name, ClientList_Action_Proc *proc)
+	{
 		this->actions.push_back({name, proc});
+	}
 	NetworkClientListPopupWindow(WindowDesc *desc, int x, int y, ClientID client_id) :

src/newgrf.cpp

➞

Show inline comments

@@ @@ -56,25 +56,25 @@ @@
 #include "safeguards.h"
 /* TTDPatch extended GRF format codec
  * (c) Petr Baudis 2004 (GPL'd)
  * Changes by Florian octo Forster are (c) by the OpenTTD development team.
+ *
  * Contains portions of documentation by TTDPatch team.
  * Thanks especially to Josef Drexler for the documentation as well as a lot
  * of help at #tycoon. Also thanks to Michael Blunck for his GRF files which
  * served as subject to the initial testing of this codec. */
 /** List of all loaded GRF files */
-static SmallVector<GRFFile *, 16> _grf_files;
+static std::vector<GRFFile *> _grf_files;
 /** Miscellaneous GRF features, set by Action 0x0D, parameter 0x9E */
 byte _misc_grf_features = 0;
 /** 32 * 8 = 256 flags. Apparently TTDPatch uses this many.. */
 static uint32 _ttdpatch_flags[8];
 /** Indicates which are the newgrf features currently loaded ingame */
 GRFLoadedFeatures _loaded_newgrf_features;
 static const uint MAX_SPRITEGROUP = UINT8_MAX; ///< Maximum GRF-local ID for a spritegroup.
@@ @@ -450,25 +450,25 @@ static GRFError *DisableGrf(StringID mes @@
 	return config->error;
+}
 /**
  * Information for mapping static StringIDs.
  */
 struct StringIDMapping {
 	uint32 grfid;     ///< Source NewGRF.
 	StringID source;  ///< Source StringID (GRF local).
 	StringID *target; ///< Destination for mapping result.
 };
-typedef SmallVector<StringIDMapping, 16> StringIDMappingVector;
+typedef std::vector<StringIDMapping> StringIDMappingVector;
 static StringIDMappingVector _string_to_grf_mapping;
 /**
  * Record a static StringID for getting translated later.
  * @param source Source StringID (GRF local).
  * @param target Destination for the mapping result.
  */
 static void AddStringForMapping(StringID source, StringID *target)
+{
 	*target = STR_UNDEFINED;
 	_string_to_grf_mapping.push_back({_cur.grffile->grfid, source, target});
+}
@@ @@ -1892,25 +1892,25 @@ static ChangeInfoResult StationChangeInf @@
 					if (buf->HasData(4) && *(uint32*)buf->Data() == 0) {
 						buf->Skip(4);
 						extern const DrawTileSprites _station_display_datas_rail[8];
 						dts->Clone(&_station_display_datas_rail[t % 8]);
 						continue;
+					}
 					ReadSpriteLayoutSprite(buf, false, false, false, GSF_STATIONS, &dts->ground);
 					/* On error, bail out immediately. Temporary GRF data was already freed */
 					if (_cur.skip_sprites < 0) return CIR_DISABLED;
-					static SmallVector<DrawTileSeqStruct, 8> tmp_layout;
+					static std::vector<DrawTileSeqStruct> tmp_layout;
 					tmp_layout.clear();
 					for (;;) {
 						/* no relative bounding box support */
 						/*C++17: DrawTileSeqStruct &dtss = */ tmp_layout.emplace_back();
 						DrawTileSeqStruct &dtss = tmp_layout.back();
 						MemSetT(&dtss, 0);
 						dtss.delta_x = buf->ReadByte();
 						if (dtss.IsTerminator()) break;
 						dtss.delta_y = buf->ReadByte();
 						dtss.delta_z = buf->ReadByte();
 						dtss.size_x = buf->ReadByte();
@@ @@ -4778,25 +4778,25 @@ static void NewSpriteGroup(ByteReader *b @@
 			assert(DeterministicSpriteGroup::CanAllocateItem());
 			DeterministicSpriteGroup *group = new DeterministicSpriteGroup();
 			act_group = group;
 			group->var_scope = HasBit(type, 1) ? VSG_SCOPE_PARENT : VSG_SCOPE_SELF;
 			switch (GB(type, 2, 2)) {
 				default: NOT_REACHED();
 				case 0: group->size = DSG_SIZE_BYTE;  varsize = 1; break;
 				case 1: group->size = DSG_SIZE_WORD;  varsize = 2; break;
 				case 2: group->size = DSG_SIZE_DWORD; varsize = 4; break;
+			}
-			static SmallVector<DeterministicSpriteGroupAdjust, 16> adjusts;
+			static std::vector<DeterministicSpriteGroupAdjust> adjusts;
 			adjusts.clear();
 			/* Loop through the var adjusts. Unfortunately we don't know how many we have
 			 * from the outset, so we shall have to keep reallocing. */
 			do {
 				/*C++17: DeterministicSpriteGroupAdjust &adjust = */ adjusts.emplace_back();
 				DeterministicSpriteGroupAdjust &adjust = adjusts.back();
 				/* The first var adjust doesn't have an operation specified, so we set it to add. */
 				adjust.operation = adjusts.size() == 1 ? DSGA_OP_ADD : (DeterministicSpriteGroupAdjustOperation)buf->ReadByte();
 				adjust.variable  = buf->ReadByte();
 				if (adjust.variable == 0x7E) {

src/newgrf.h

➞

Show inline comments

@@ @@ -113,28 +113,28 @@ struct GRFFile : ZeroedMemoryAllocator { @@
 	struct HouseSpec **housespec;
 	struct IndustrySpec **industryspec;
 	struct IndustryTileSpec **indtspec;
 	struct ObjectSpec **objectspec;
 	struct AirportSpec **airportspec;
 	struct AirportTileSpec **airtspec;
 	uint32 param[0x80];
 	uint param_end;  ///< one more than the highest set parameter
 	GRFLabel *label; ///< Pointer to the first label. This is a linked list, not an array.
-	SmallVector<CargoLabel, 4> cargo_list;          ///< Cargo translation table (local ID -> label)
+	std::vector<CargoLabel> cargo_list;          ///< Cargo translation table (local ID -> label)
 	uint8 cargo_map[NUM_CARGO];                     ///< Inverse cargo translation table (CargoID -> local ID)
-	SmallVector<RailTypeLabel, 4> railtype_list;    ///< Railtype translation table
+	std::vector<RailTypeLabel> railtype_list;    ///< Railtype translation table
 	RailTypeByte railtype_map[RAILTYPE_END];
 	CanalProperties canal_local_properties[CF_END]; ///< Canal properties as set by this NewGRF
 	struct LanguageMap *language_map; ///< Mappings related to the languages.
 	int traininfo_vehicle_pitch;  ///< Vertical offset for draing train images in depot GUI and vehicle details
 	uint traininfo_vehicle_width; ///< Width (in pixels) of a 8/8 train vehicle in depot GUI and vehicle details
 	uint32 grf_features;                     ///< Bitset of GrfSpecFeature the grf uses
 	PriceMultipliers price_base_multipliers; ///< Price base multipliers as set by the grf.

src/newgrf_commons.cpp

➞

Show inline comments

@@ @@ -570,25 +570,25 @@ bool ConvertBooleanCallback(const GRFFil @@
  */
 bool Convert8bitBooleanCallback(const GRFFile *grffile, uint16 cbid, uint16 cb_res)
+{
 	assert(cb_res != CALLBACK_FAILED); // We do not know what to return
 	if (grffile->grf_version < 8) return GB(cb_res, 0, 8) != 0;
 	if (cb_res > 1) ErrorUnknownCallbackResult(grffile->grfid, cbid, cb_res);
 	return cb_res != 0;
+}
-/* static */ SmallVector<DrawTileSeqStruct, 8> NewGRFSpriteLayout::result_seq;
+/* static */ std::vector<DrawTileSeqStruct> NewGRFSpriteLayout::result_seq;
 /**
  * Clone the building sprites of a spritelayout.
  * @param source The building sprites to copy.
  */
 void NewGRFSpriteLayout::Clone(const DrawTileSeqStruct *source)
+{
 	assert(this->seq == NULL);
 	assert(source != NULL);
 	size_t count = 1; // 1 for the terminator
 	const DrawTileSeqStruct *element;

src/newgrf_commons.h

➞

Show inline comments

@@ @@ -161,25 +161,25 @@ struct NewGRFSpriteLayout : ZeroedMemory @@
 	 * Returns the result spritelayout after preprocessing.
 	 * @pre #PrepareLayout() and #ProcessRegisters() need calling first.
 	 * @return result spritelayout
 	 */
 	const DrawTileSeqStruct *GetLayout(PalSpriteID *ground) const
+	{
 		DrawTileSeqStruct *front = result_seq.data();
 		*ground = front->image;
 		return front + 1;
+	}
 private:
-	static SmallVector<DrawTileSeqStruct, 8> result_seq; ///< Temporary storage when preprocessing spritelayouts.
+	static std::vector<DrawTileSeqStruct> result_seq; ///< Temporary storage when preprocessing spritelayouts.
 };
 /**
  * Maps an entity id stored on the map to a GRF file.
  * Entities are objects used ingame (houses, industries, industry tiles) for
  * which we need to correlate the ids from the grf files with the ones in the
  * the savegames themselves.
  * An array of EntityIDMapping structs is saved with the savegame so
  * that those GRFs can be loaded in a different order, or removed safely. The
  * index in the array is the entity's ID stored on the map.
+ *
  * The substitute ID is the ID of an original entity that should be used instead

src/newgrf_config.h

➞

Show inline comments

@@ @@ -163,25 +163,25 @@ struct GRFConfig : ZeroedMemoryAllocator @@
 	GRFTextWrapper *url;                           ///< NOSAVE: URL belonging to this GRF.
 	GRFError *error;                               ///< NOSAVE: Error/Warning during GRF loading (Action 0x0B)
 	uint32 version;                                ///< NOSAVE: Version a NewGRF can set so only the newest NewGRF is shown
 	uint32 min_loadable_version;                   ///< NOSAVE: Minimum compatible version a NewGRF can define
 	uint8 flags;                                   ///< NOSAVE: GCF_Flags, bitset
 	GRFStatus status;                              ///< NOSAVE: GRFStatus, enum
 	uint32 grf_bugs;                               ///< NOSAVE: bugs in this GRF in this run, @see enum GRFBugs
 	uint32 param[0x80];                            ///< GRF parameters
 	uint8 num_params;                              ///< Number of used parameters
 	uint8 num_valid_params;                        ///< NOSAVE: Number of valid parameters (action 0x14)
 	uint8 palette;                                 ///< GRFPalette, bitset
-	SmallVector<GRFParameterInfo *, 4> param_info; ///< NOSAVE: extra information about the parameters
+	std::vector<GRFParameterInfo *> param_info; ///< NOSAVE: extra information about the parameters
 	bool has_param_defaults;                       ///< NOSAVE: did this newgrf specify any defaults for it's parameters
 	struct GRFConfig *next;                        ///< NOSAVE: Next item in the linked list
 	void CopyParams(const GRFConfig &src);
 	const char *GetTextfile(TextfileType type) const;
 	const char *GetName() const;
 	const char *GetDescription() const;
 	const char *GetURL() const;
 	void SetParameterDefaults();

src/newgrf_debug.h

➞

Show inline comments

@@ @@ -20,25 +20,25 @@ @@
 /** Current state of spritepicker */
 enum NewGrfDebugSpritePickerMode {
 	SPM_NONE,
 	SPM_WAIT_CLICK,
 	SPM_REDRAW,
 };
 /** Spritepicker of SpriteAligner */
 struct NewGrfDebugSpritePicker {
 	NewGrfDebugSpritePickerMode mode;   ///< Current state
 	void *clicked_pixel;                ///< Clicked pixel (pointer to blitter buffer)
 	uint32 click_time;                  ///< Realtime tick when clicked to detect next frame
-	SmallVector<SpriteID, 256> sprites; ///< Sprites found
+	std::vector<SpriteID> sprites; ///< Sprites found
 };
 extern NewGrfDebugSpritePicker _newgrf_debug_sprite_picker;
 bool IsNewGRFInspectable(GrfSpecFeature feature, uint index);
 void ShowNewGRFInspectWindow(GrfSpecFeature feature, uint index, const uint32 grfid = 0);
 void InvalidateNewGRFInspectWindow(GrfSpecFeature feature, uint index);
 void DeleteNewGRFInspectWindow(GrfSpecFeature feature, uint index);
 GrfSpecFeature GetGrfSpecFeature(TileIndex tile);
 GrfSpecFeature GetGrfSpecFeature(VehicleType type);

src/newgrf_debug_gui.cpp

➞

Show inline comments

@@ @@ -38,25 +38,25 @@ @@
 #include "newgrf_town.h"
 #include "newgrf_railtype.h"
 #include "newgrf_industries.h"
 #include "newgrf_industrytiles.h"
 #include "widgets/newgrf_debug_widget.h"
 #include "table/strings.h"
 #include "safeguards.h"
 /** The sprite picker. */
-NewGrfDebugSpritePicker _newgrf_debug_sprite_picker = { SPM_NONE, NULL, 0, SmallVector<SpriteID, 256>() };
+NewGrfDebugSpritePicker _newgrf_debug_sprite_picker = { SPM_NONE, NULL, 0, std::vector<SpriteID>() };
 /**
  * Get the feature index related to the window number.
  * @param window_number The window to get the feature index from.
  * @return the feature index
  */
 static inline uint GetFeatureIndex(uint window_number)
+{
 	return GB(window_number, 0, 24);
+}
 /**
@@ @@ -885,25 +885,25 @@ struct SpriteAlignerWindow : Window { @@
 				DrawSprite(this->current_sprite, PAL_NONE, x, y, NULL, ZOOM_LVL_GUI);
 				_cur_dpi = old_dpi;
 				break;
+			}
 			case WID_SA_LIST: {
 				const NWidgetBase *nwid = this->GetWidget<NWidgetBase>(widget);
 				int step_size = nwid->resize_y;
-				SmallVector<SpriteID, 256> &list = _newgrf_debug_sprite_picker.sprites;
+				std::vector<SpriteID> &list = _newgrf_debug_sprite_picker.sprites;
 				int max = min<int>(this->vscroll->GetPosition() + this->vscroll->GetCapacity(), list.size());
 				int y = r.top + WD_FRAMERECT_TOP;
 				for (int i = this->vscroll->GetPosition(); i < max; i++) {
 					SetDParam(0, list[i]);
 					DrawString(r.left + WD_FRAMERECT_LEFT, r.right - WD_FRAMERECT_RIGHT, y, STR_BLACK_COMMA, TC_FROMSTRING, SA_RIGHT | SA_FORCE);
 					y += step_size;
+				}
 				break;
+			}
+		}
+	}

src/newgrf_engine.cpp

➞

Show inline comments

@@ @@ -1176,25 +1176,25 @@ void TriggerVehicle(Vehicle *v, VehicleT @@
 	v->InvalidateNewGRFCacheOfChain();
 	DoTriggerVehicle(v, trigger, 0, true);
 	v->InvalidateNewGRFCacheOfChain();
+}
 /* Functions for changing the order of vehicle purchase lists */
 struct ListOrderChange {
 	EngineID engine;
 	uint target;      ///< local ID
 };
-static SmallVector<ListOrderChange, 16> _list_order_changes;
+static std::vector<ListOrderChange> _list_order_changes;
 /**
  * Record a vehicle ListOrderChange.
  * @param engine Engine to move
  * @param target Local engine ID to move \a engine in front of
  * @note All sorting is done later in CommitVehicleListOrderChanges
  */
 void AlterVehicleListOrder(EngineID engine, uint target)
+{
 	/* Add the list order change to a queue */
 	_list_order_changes.push_back({engine, target});
+}
@@ @@ -1217,25 +1217,25 @@ static int CDECL EnginePreSort(const Eng @@
 	if (id_a.grfid != id_b.grfid) return id_a.grfid < id_b.grfid ? -1 : 1;
 	/* 3. Sort by local ID */
 	return (int)id_a.internal_id - (int)id_b.internal_id;
+}
 /**
  * Deternine default engine sorting and execute recorded ListOrderChanges from AlterVehicleListOrder.
  */
 void CommitVehicleListOrderChanges()
+{
 	/* Pre-sort engines by scope-grfid and local index */
-	SmallVector<EngineID, 16> ordering;
+	std::vector<EngineID> ordering;
 	Engine *e;
 	FOR_ALL_ENGINES(e) {
 		ordering.push_back(e->index);
+	}
 	QSortT(ordering.data(), ordering.size(), EnginePreSort);
 	/* Apply Insertion-Sort operations */
 	for (const ListOrderChange &it : _list_order_changes) {
 		EngineID source = it.engine;
 		uint local_target = it.target;
 		const EngineIDMapping *id_source = _engine_mngr.data() + source;

src/newgrf_sound.cpp

➞

Show inline comments

@@ @@ -13,25 +13,25 @@ @@
 #include "engine_base.h"
 #include "newgrf.h"
 #include "newgrf_engine.h"
 #include "newgrf_sound.h"
 #include "vehicle_base.h"
 #include "sound_func.h"
 #include "fileio_func.h"
 #include "debug.h"
 #include "settings_type.h"
 #include "safeguards.h"
-static SmallVector<SoundEntry, 8> _sounds;
+static std::vector<SoundEntry> _sounds;
 /**
  * Allocate sound slots.
  * @param num Number of slots to allocate.
  * @return First allocated slot.
  */
 SoundEntry *AllocateSound(uint num)
+{
 	SoundEntry *sound = grow(_sounds, num);
 	MemSetT(sound, 0, num);
 	return sound;

src/newgrf_text.cpp

➞

Show inline comments

@@ @@ -158,40 +158,40 @@ struct GRFTextEntry { @@
 static uint _num_grf_texts = 0;
 static GRFTextEntry _grf_text[TAB_SIZE_NEWGRF];
 static byte _currentLangID = GRFLX_ENGLISH;  ///< by default, english is used.
 /**
  * Get the mapping from the NewGRF supplied ID to OpenTTD's internal ID.
  * @param newgrf_id The NewGRF ID to map.
  * @param gender    Whether to map genders or cases.
  * @return The, to OpenTTD's internal ID, mapped index, or -1 if there is no mapping.
  */
 int LanguageMap::GetMapping(int newgrf_id, bool gender) const
+{
-	const SmallVector<Mapping, 1> &map = gender ? this->gender_map : this->case_map;
+	const std::vector<Mapping> &map = gender ? this->gender_map : this->case_map;
 	for (const Mapping &m : map) {
 		if (m.newgrf_id == newgrf_id) return m.openttd_id;
+	}
 	return -1;
+}
 /**
  * Get the mapping from OpenTTD's internal ID to the NewGRF supplied ID.
  * @param openttd_id The OpenTTD ID to map.
  * @param gender     Whether to map genders or cases.
  * @return The, to the NewGRF supplied ID, mapped index, or -1 if there is no mapping.
  */
 int LanguageMap::GetReverseMapping(int openttd_id, bool gender) const
+{
-	const SmallVector<Mapping, 1> &map = gender ? this->gender_map : this->case_map;
+	const std::vector<Mapping> &map = gender ? this->gender_map : this->case_map;
 	for (const Mapping &m : map) {
 		if (m.openttd_id == openttd_id) return m.newgrf_id;
+	}
 	return -1;
+}
 /** Helper structure for mapping choice lists. */
 struct UnmappedChoiceList : ZeroedMemoryAllocator {
 	/** Clean everything up. */
 	~UnmappedChoiceList()
+	{
 		for (SmallPair<byte, char *> p : this->strings) {

src/newgrf_text.h

➞

Show inline comments

@@ @@ -48,22 +48,22 @@ struct LanguageMap { @@
 	/** Mapping between NewGRF and OpenTTD IDs. */
 	struct Mapping {
 		byte newgrf_id;  ///< NewGRF's internal ID for a case/gender.
 		byte openttd_id; ///< OpenTTD's internal ID for a case/gender.
 	};
 	/* We need a vector and can't use SmallMap due to the fact that for "setting" a
 	 * gender of a string or requesting a case for a substring we want to map from
 	 * the NewGRF's internal ID to OpenTTD's ID whereas for the choice lists we map
 	 * the genders/cases/plural OpenTTD IDs to the NewGRF's internal IDs. In this
 	 * case a NewGRF developer/translator might want a different translation for
 	 * both cases. Thus we are basically implementing a multi-map. */
 	SmallVector<Mapping, 1> gender_map; ///< Mapping of NewGRF and OpenTTD IDs for genders.
 	SmallVector<Mapping, 1> case_map;   ///< Mapping of NewGRF and OpenTTD IDs for cases.
 	std::vector<Mapping> gender_map; ///< Mapping of NewGRF and OpenTTD IDs for genders.
 	std::vector<Mapping> case_map;   ///< Mapping of NewGRF and OpenTTD IDs for cases.
 	int plural_form;                    ///< The plural form used for this language.
 	int GetMapping(int newgrf_id, bool gender) const;
 	int GetReverseMapping(int openttd_id, bool gender) const;
 	static const LanguageMap *GetLanguageMap(uint32 grfid, uint8 language_id);
 };
 #endif /* NEWGRF_TEXT_H */

src/object_base.h

➞

Show inline comments

@@ @@ -83,15 +83,15 @@ protected: @@
 #define FOR_ALL_OBJECTS_FROM(var, start) FOR_ALL_ITEMS_FROM(Object, object_index, var, start)
 #define FOR_ALL_OBJECTS(var) FOR_ALL_OBJECTS_FROM(var, 0)
 /**
  * Keeps track of removed objects during execution/testruns of commands.
  */
 struct ClearedObjectArea {
 	TileIndex first_tile;  ///< The first tile being cleared, which then causes the whole object to be cleared.
 	TileArea area;         ///< The area of the object.
 };
 ClearedObjectArea *FindClearedObject(TileIndex tile);
-extern SmallVector<ClearedObjectArea, 4> _cleared_object_areas;
+extern std::vector<ClearedObjectArea> _cleared_object_areas;
 #endif /* OBJECT_BASE_H */

src/object_cmd.cpp

➞

Show inline comments

@@ @@ -433,25 +433,25 @@ static Foundation GetFoundation_Object(T @@
  */
 static void ReallyClearObjectTile(Object *o)
+{
 	Object::DecTypeCount(o->type);
 	TILE_AREA_LOOP(tile_cur, o->location) {
 		DeleteNewGRFInspectWindow(GSF_OBJECTS, tile_cur);
 		MakeWaterKeepingClass(tile_cur, GetTileOwner(tile_cur));
+	}
 	delete o;
+}
-SmallVector<ClearedObjectArea, 4> _cleared_object_areas;
+std::vector<ClearedObjectArea> _cleared_object_areas;
 /**
  * Find the entry in _cleared_object_areas which occupies a certain tile.
  * @param tile Tile of interest
  * @return Occupying entry, or NULL if none
  */
 ClearedObjectArea *FindClearedObject(TileIndex tile)
+{
 	TileArea ta = TileArea(tile, 1, 1);
 	for (ClearedObjectArea &coa : _cleared_object_areas) {
 		if (coa.area.Intersects(ta)) return &coa;

src/openttd.cpp

➞

Show inline comments

@@ @@ -1165,44 +1165,44 @@ void SwitchToMode(SwitchMode new_mode) @@
  * Check the validity of some of the caches.
  * Especially in the sense of desyncs between
  * the cached value and what the value would
  * be when calculated from the 'base' data.
  */
 static void CheckCaches()
+{
 	/* Return here so it is easy to add checks that are run
 	 * always to aid testing of caches. */
 	if (_debug_desync_level <= 1) return;
 	/* Check the town caches. */
-	SmallVector<TownCache, 4> old_town_caches;
+	std::vector<TownCache> old_town_caches;
 	Town *t;
 	FOR_ALL_TOWNS(t) {
 		old_town_caches.push_back(t->cache);
+	}
 	extern void RebuildTownCaches();
 	RebuildTownCaches();
 	RebuildSubsidisedSourceAndDestinationCache();
 	uint i = 0;
 	FOR_ALL_TOWNS(t) {
 		if (MemCmpT(old_town_caches.data() + i, &t->cache) != 0) {
 			DEBUG(desync, 2, "town cache mismatch: town %i", (int)t->index);
+		}
 		i++;
+	}
 	/* Check company infrastructure cache. */
-	SmallVector<CompanyInfrastructure, 4> old_infrastructure;
+	std::vector<CompanyInfrastructure> old_infrastructure;
 	Company *c;
 	FOR_ALL_COMPANIES(c) old_infrastructure.push_back(c->infrastructure);
 	extern void AfterLoadCompanyStats();
 	AfterLoadCompanyStats();
 	i = 0;
 	FOR_ALL_COMPANIES(c) {
 		if (MemCmpT(old_infrastructure.data() + i, &c->infrastructure) != 0) {
 			DEBUG(desync, 2, "infrastructure cache mismatch: company %i", (int)c->index);
+		}
 		i++;

src/rail.h

➞

Show inline comments

@@ @@ -109,25 +109,25 @@ enum RailFenceOffset { @@
 	RFO_SLOPE_NW_NE,   //!< Slope NW,   Track Y,     Fence NE
 	RFO_FLAT_X_SE,     //!< Slope FLAT, Track X,     Fence SE
 	RFO_FLAT_Y_SW,     //!< Slope FLAT, Track Y,     Fence SW
 	RFO_FLAT_RIGHT,    //!< Slope FLAT, Track RIGHT, Fence W
 	RFO_FLAT_LOWER,    //!< Slope FLAT, Track LOWER, Fence N
 	RFO_SLOPE_SW_SE,   //!< Slope SW,   Track X,     Fence SE
 	RFO_SLOPE_SE_SW,   //!< Slope SE,   Track Y,     Fence SW
 	RFO_SLOPE_NE_SE,   //!< Slope NE,   Track X,     Fence SE
 	RFO_SLOPE_NW_SW,   //!< Slope NW,   Track Y,     Fence SW
 };
 /** List of rail type labels. */
-typedef SmallVector<RailTypeLabel, 4> RailTypeLabelList;
+typedef std::vector<RailTypeLabel> RailTypeLabelList;
 /**
  * This struct contains all the info that is needed to draw and construct tracks.
  */
 class RailtypeInfo {
 public:
 	/**
 	 * Struct containing the main sprites. @note not all sprites are listed, but only
 	 *  the ones used directly in the code
 	 */
 	struct {
 		SpriteID track_y;      ///< single piece of rail in Y direction, with ground

src/rail_cmd.cpp

➞

Show inline comments

@@ @@ -32,25 +32,25 @@ @@
 #include "date_func.h"
 #include "strings_func.h"
 #include "company_gui.h"
 #include "object_map.h"
 #include "table/strings.h"
 #include "table/railtypes.h"
 #include "table/track_land.h"
 #include "safeguards.h"
 /** Helper type for lists/vectors of trains */
-typedef SmallVector<Train *, 16> TrainList;
+typedef std::vector<Train *> TrainList;
 RailtypeInfo _railtypes[RAILTYPE_END];
 RailType _sorted_railtypes[RAILTYPE_END];
 uint8 _sorted_railtypes_size;
 RailTypes _railtypes_hidden_mask;
 /** Enum holding the signal offset in the sprite sheet according to the side it is representing. */
 enum SignalOffsets {
 	SIGNAL_TO_SOUTHWEST,
 	SIGNAL_TO_NORTHEAST,
 	SIGNAL_TO_SOUTHEAST,
 	SIGNAL_TO_NORTHWEST,
@@ @@ -1594,25 +1594,25 @@ CommandCost CmdConvertRail(TileIndex til @@
 		RailType type = GetRailType(tile);
 		/* Converting to the same type or converting 'hidden' elrail -> rail */
 		if (type == totype || (_settings_game.vehicle.disable_elrails && totype == RAILTYPE_RAIL && type == RAILTYPE_ELECTRIC)) continue;
 		/* Trying to convert other's rail */
 		CommandCost ret = CheckTileOwnership(tile);
 		if (ret.Failed()) {
 			error = ret;
 			continue;
+		}
-		SmallVector<Train *, 2> vehicles_affected;
+		std::vector<Train *> vehicles_affected;
 		/* Vehicle on the tile when not converting Rail <-> ElRail
 		 * Tunnels and bridges have special check later */
 		if (tt != MP_TUNNELBRIDGE) {
 			if (!IsCompatibleRail(type, totype)) {
 				CommandCost ret = IsPlainRailTile(tile) ? EnsureNoTrainOnTrackBits(tile, GetTrackBits(tile)) : EnsureNoVehicleOnGround(tile);
 				if (ret.Failed()) {
 					error = ret;
 					continue;
+				}
+			}
 			if (flags & DC_EXEC) { // we can safely convert, too

src/saveload/afterload.cpp

➞

Show inline comments

@@ @@ -2186,25 +2186,25 @@ bool AfterLoadGame() @@
 				assert_compile(CargoPaymentPool::MAX_SIZE == VehiclePool::MAX_SIZE);
 				assert(CargoPayment::CanAllocateItem());
 				Vehicle *v = *iter;
 				if (v->cargo_payment == NULL) v->cargo_payment = new CargoPayment(v);
+			}
+		}
+	}
 	if (IsSavegameVersionBefore(SLV_122)) {
 		/* Animated tiles would sometimes not be actually animated or
 		 * in case of old savegames duplicate. */
-		extern SmallVector<TileIndex, 256> _animated_tiles;
+		extern std::vector<TileIndex> _animated_tiles;
 		for (auto tile = _animated_tiles.begin(); tile < _animated_tiles.end(); /* Nothing */) {
 			/* Remove if tile is not animated */
 			bool remove = _tile_type_procs[GetTileType(*tile)]->animate_tile_proc == NULL;
 			/* and remove if duplicate */
 			for (auto j = _animated_tiles.begin(); !remove && j < tile; j++) {
 				remove = *tile == *j;
+			}
 			if (remove) {
 				DeleteAnimatedTile(*tile);
@@ @@ -2930,25 +2930,25 @@ bool AfterLoadGame() @@
+			}
+		}
+	}
 	if (IsSavegameVersionBefore(SLV_188)) {
 		/* Fix articulated road vehicles.
 		 * Some curves were shorter than other curves.
 		 * Now they have the same length, but that means that trailing articulated parts will
 		 * take longer to go through the curve than the parts in front which already left the courve.
 		 * So, make articulated parts catch up. */
 		RoadVehicle *v;
 		bool roadside = _settings_game.vehicle.road_side == 1;
-		SmallVector<uint, 16> skip_frames;
+		std::vector<uint> skip_frames;
 		FOR_ALL_ROADVEHICLES(v) {
 			if (!v->IsFrontEngine()) continue;
 			skip_frames.clear();
 			TileIndex prev_tile = v->tile;
 			uint prev_tile_skip = 0;
 			uint cur_skip = 0;
 			for (RoadVehicle *u = v; u != NULL; u = u->Next()) {
 				if (u->tile != prev_tile) {
 					prev_tile_skip = cur_skip;
 					prev_tile = u->tile;
 				} else {
 					cur_skip = prev_tile_skip;

src/saveload/animated_tile_sl.cpp

➞

Show inline comments

@@ @@ -9,25 +9,25 @@ @@
 /** @file animated_tile_sl.cpp Code handling saving and loading of animated tiles */
 #include "../stdafx.h"
 #include "../tile_type.h"
 #include "../core/alloc_func.hpp"
 #include "../core/smallvec_type.hpp"
 #include "saveload.h"
 #include "../safeguards.h"
-extern SmallVector<TileIndex, 256> _animated_tiles;
+extern std::vector<TileIndex> _animated_tiles;
 /**
  * Save the ANIT chunk.
  */
 static void Save_ANIT()
+{
 	SlSetLength(_animated_tiles.size() * sizeof(_animated_tiles.front()));
 	SlArray(_animated_tiles.data(), _animated_tiles.size(), SLE_UINT32);
+}
 /**
  * Load the ANIT chunk; the chunk containing the animated tiles.

src/saveload/labelmaps_sl.cpp

➞

Show inline comments

@@ @@ -8,50 +8,50 @@ @@
  */
 /** @file labelmaps_sl.cpp Code handling saving and loading of rail type label mappings */
 #include "../stdafx.h"
 #include "../station_map.h"
 #include "../tunnelbridge_map.h"
 #include "saveload.h"
 #include "../safeguards.h"
-static SmallVector<RailTypeLabel, RAILTYPE_END> _railtype_list;
+static std::vector<RailTypeLabel> _railtype_list;
 /**
  * Test if any saved rail type labels are different to the currently loaded
  * rail types, which therefore requires conversion.
  * @return true if (and only if) conversion due to rail type changes is needed.
  */
 static bool NeedRailTypeConversion()
+{
 	for (uint i = 0; i < _railtype_list.size(); i++) {
 		if ((RailType)i < RAILTYPE_END) {
 			const RailtypeInfo *rti = GetRailTypeInfo((RailType)i);
 			if (rti->label != _railtype_list[i]) return true;
 		} else {
 			if (_railtype_list[i] != 0) return true;
+		}
+	}
 	/* No rail type conversion is necessary */
 	return false;
+}
 void AfterLoadLabelMaps()
+{
 	if (NeedRailTypeConversion()) {
-		SmallVector<RailType, RAILTYPE_END> railtype_conversion_map;
+		std::vector<RailType> railtype_conversion_map;
 		for (uint i = 0; i < _railtype_list.size(); i++) {
 			RailType r = GetRailTypeByLabel(_railtype_list[i]);
 			if (r == INVALID_RAILTYPE) r = RAILTYPE_BEGIN;
 			railtype_conversion_map.push_back(r);
+		}
 		for (TileIndex t = 0; t < MapSize(); t++) {
 			switch (GetTileType(t)) {
 				case MP_RAILWAY:
 					SetRailType(t, railtype_conversion_map[GetRailType(t)]);

src/saveload/linkgraph_sl.cpp

➞

Show inline comments

@@ @@ -42,25 +42,25 @@ const SaveLoad *GetLinkGraphDesc() @@
 /**
  * Get a SaveLoad array for a link graph job. The settings struct is derived from
  * the global settings saveload array. The exact entries are calculated when the function
  * is called the first time.
  * It's necessary to keep a copy of the settings for each link graph job so that you can
  * change the settings while in-game and still not mess with current link graph runs.
  * Of course the settings have to be saved and loaded, too, to avoid desyncs.
  * @return Array of SaveLoad structs.
  */
 const SaveLoad *GetLinkGraphJobDesc()
+{
-	static SmallVector<SaveLoad, 16> saveloads;
+	static std::vector<SaveLoad> saveloads;
 	static const char *prefix = "linkgraph.";
 	/* Build the SaveLoad array on first call and don't touch it later on */
 	if (saveloads.size() == 0) {
 		size_t offset_gamesettings = cpp_offsetof(GameSettings, linkgraph);
 		size_t offset_component = cpp_offsetof(LinkGraphJob, settings);
 		size_t prefixlen = strlen(prefix);
 		int setting = 0;
 		const SettingDesc *desc = GetSettingDescription(setting);
 		while (desc->save.cmd != SL_END) {

src/saveload/oldloader_sl.cpp

➞

Show inline comments

@@ @@ -482,25 +482,25 @@ static inline byte RemapTTOColour(byte t @@
+}
 static inline uint RemapTownIndex(uint x)
+{
 	return _savegame_type == SGT_TTO ? (x - 0x264) / 78 : (x - 0x264) / 94;
+}
 static inline uint RemapOrderIndex(uint x)
+{
 	return _savegame_type == SGT_TTO ? (x - 0x1AC4) / 2 : (x - 0x1C18) / 2;
+}
-extern SmallVector<TileIndex, 256> _animated_tiles;
+extern std::vector<TileIndex> _animated_tiles;
 extern char *_old_name_array;
 static uint32 _old_town_index;
 static uint16 _old_string_id;
 static uint16 _old_string_id_2;
 static void ReadTTDPatchFlags()
+{
 	if (_read_ttdpatch_flags) return;
 	_read_ttdpatch_flags = true;

src/saveload/waypoint_sl.cpp

➞

Show inline comments

@@ @@ -33,25 +33,25 @@ struct OldWaypoint { @@
 	char *name;
 	uint8 delete_ctr;
 	Date build_date;
 	uint8 localidx;
 	uint32 grfid;
 	const StationSpec *spec;
 	OwnerByte owner;
 	size_t new_index;
 };
 /** Temporary array with old waypoints. */
-static SmallVector<OldWaypoint, 16> _old_waypoints;
+static std::vector<OldWaypoint> _old_waypoints;
 /**
  * Update the waypoint orders to get the new waypoint ID.
  * @param o the order 'list' to check.
  */
 static void UpdateWaypointOrder(Order *o)
+{
 	if (!o->IsType(OT_GOTO_WAYPOINT)) return;
 	for (OldWaypoint &wp : _old_waypoints) {
 		if (wp.index != o->GetDestination()) continue;

src/script/squirrel_helper.hpp

➞

Show inline comments

@@ @@ -20,25 +20,25 @@ @@
 template <class CL, ScriptType ST> const char *GetClassName();
 /**
  * The Squirrel convert routines
  */
 namespace SQConvert {
 	/**
 	 * Pointers assigned to this class will be free'd when this instance
 	 *  comes out of scope. Useful to make sure you can use stredup(),
 	 *  without leaking memory.
 	 */
-	struct SQAutoFreePointers : SmallVector<void *, 1> {
+	struct SQAutoFreePointers : std::vector<void *> {
 		~SQAutoFreePointers()
+		{
 			for (uint i = 0; i < std::vector<void *>::size(); i++) free(std::vector<void *>::operator[](i));
+		}
 	};
 	template <bool Y> struct YesT {
 		static const bool Yes = Y;
 		static const bool No = !Y;
 	};
 	/**
@@ @@ -123,25 +123,25 @@ namespace SQConvert { @@
+	}
 	template <> inline Array      *GetParam(ForceType<Array *>,      HSQUIRRELVM vm, int index, SQAutoFreePointers *ptr)
+	{
 		/* Sanity check of the size. */
 		if (sq_getsize(vm, index) > UINT16_MAX) throw sq_throwerror(vm, "an array used as parameter to a function is too large");
 		SQObject obj;
 		sq_getstackobj(vm, index, &obj);
 		sq_pushobject(vm, obj);
 		sq_pushnull(vm);
-		SmallVector<int32, 2> data;
+		std::vector<int32> data;
 		while (SQ_SUCCEEDED(sq_next(vm, -2))) {
 			SQInteger tmp;
 			if (SQ_SUCCEEDED(sq_getinteger(vm, -1, &tmp))) {
 				data.push_back((int32)tmp);
 			} else {
 				sq_pop(vm, 4);
 				throw sq_throwerror(vm, "a member of an array used as parameter to a function is not numeric");
+			}
 			sq_pop(vm, 2);
+		}

src/settingsgen/settingsgen.cpp

➞

Show inline comments

@@ @@ -143,25 +143,25 @@ public: @@
 private:
 	/**
 	 * Does the buffer have room without adding a new #OutputBuffer block?
 	 * @return \c true if room is available, else \c false.
 	 */
 	bool BufferHasRoom() const
+	{
 		uint num_blocks = this->output_buffer.size();
 		return num_blocks > 0 && this->output_buffer[num_blocks - 1].HasRoom();
+	}
-	typedef SmallVector<OutputBuffer, 2> OutputBufferVector; ///< Vector type for output buffers.
+	typedef std::vector<OutputBuffer> OutputBufferVector; ///< Vector type for output buffers.
 	OutputBufferVector output_buffer; ///< Vector of blocks containing the stored output.
 };
 /** Derived class for loading INI files without going through Fio stuff. */
 struct SettingsIniFile : IniLoadFile {
 	/**
 	 * Construct a new ini loader.
 	 * @param list_group_names A \c NULL terminated list with group names that should be loaded as lists instead of variables. @see IGT_LIST
 	 * @param seq_group_names  A \c NULL terminated list with group names that should be loaded as lists of names. @see IGT_SEQUENCE
 	 */
 	SettingsIniFile(const char * const *list_group_names = NULL, const char * const *seq_group_names = NULL) :

src/sortlist_type.h

➞

Show inline comments

@@ @@ -38,25 +38,25 @@ struct Listing { @@
 /** Data structure describing what to show in the list (filter criteria). */
 struct Filtering {
 	bool state;    ///< Filter on/off
 	byte criteria; ///< Filtering criteria
 };
 /**
  * List template of 'things' \p T to sort in a GUI.
  * @tparam T Type of data stored in the list to represent each item.
  * @tparam F Type of data fed as additional value to the filter function. @see FilterFunction
  */
 template <typename T, typename F = const char*>
-class GUIList : public SmallVector<T, 32> {
+class GUIList : public std::vector<T> {
 public:
 	typedef int CDECL SortFunction(const T*, const T*); ///< Signature of sort function.
 	typedef bool CDECL FilterFunction(const T*, F);     ///< Signature of filter function.
 protected:
 	SortFunction * const *sort_func_list;     ///< the sort criteria functions
 	FilterFunction * const *filter_func_list; ///< the filter criteria functions
 	SortListFlags flags;                      ///< used to control sorting/resorting/etc.
 	uint8 sort_type;                          ///< what criteria to sort on
 	uint8 filter_type;                        ///< what criteria to filter on
 	uint16 resort_timer;                      ///< resort list after a given amount of ticks if set

src/station_cmd.cpp

➞

Show inline comments

@@ @@ -878,25 +878,25 @@ static CommandCost CheckFlatLandAirport( @@
  * @param tile_area Area to check.
  * @param flags Operation to perform.
  * @param axis Rail station axis.
  * @param station StationID to be queried and returned if available.
  * @param rt The rail type to check for (overbuilding rail stations over rail).
  * @param affected_vehicles List of trains with PBS reservations on the tiles
  * @param spec_class Station class.
  * @param spec_index Index into the station class.
  * @param plat_len Platform length.
  * @param numtracks Number of platforms.
  * @return The cost in case of success, or an error code if it failed.
  */
-static CommandCost CheckFlatLandRailStation(TileArea tile_area, DoCommandFlag flags, Axis axis, StationID *station, RailType rt, SmallVector<Train *, 4> &affected_vehicles, StationClassID spec_class, byte spec_index, byte plat_len, byte numtracks)
+static CommandCost CheckFlatLandRailStation(TileArea tile_area, DoCommandFlag flags, Axis axis, StationID *station, RailType rt, std::vector<Train *> &affected_vehicles, StationClassID spec_class, byte spec_index, byte plat_len, byte numtracks)
+{
 	CommandCost cost(EXPENSES_CONSTRUCTION);
 	int allowed_z = -1;
 	uint invalid_dirs = 5 << axis;
 	const StationSpec *statspec = StationClass::Get(spec_class)->GetSpec(spec_index);
 	bool slope_cb = statspec != NULL && HasBit(statspec->callback_mask, CBM_STATION_SLOPE_CHECK);
 	TILE_AREA_LOOP(tile_cur, tile_area) {
 		CommandCost ret = CheckBuildableTile(tile_cur, invalid_dirs, allowed_z, false);
 		if (ret.Failed()) return ret;
 		cost.AddCost(ret);
@@ @@ -1301,25 +1301,25 @@ CommandCost CmdBuildRailStation(TileInde @@
 	if (!reuse) station_to_join = INVALID_STATION;
 	bool distant_join = (station_to_join != INVALID_STATION);
 	if (distant_join && (!_settings_game.station.distant_join_stations || !Station::IsValidID(station_to_join))) return CMD_ERROR;
 	if (h_org > _settings_game.station.station_spread || w_org > _settings_game.station.station_spread) return CMD_ERROR;
 	/* these values are those that will be stored in train_tile and station_platforms */
 	TileArea new_location(tile_org, w_org, h_org);
 	/* Make sure the area below consists of clear tiles. (OR tiles belonging to a certain rail station) */
 	StationID est = INVALID_STATION;
-	SmallVector<Train *, 4> affected_vehicles;
+	std::vector<Train *> affected_vehicles;
 	/* Clear the land below the station. */
 	CommandCost cost = CheckFlatLandRailStation(new_location, flags, axis, &est, rt, affected_vehicles, spec_class, spec_index, plat_len, numtracks);
 	if (cost.Failed()) return cost;
 	/* Add construction expenses. */
 	cost.AddCost((numtracks * _price[PR_BUILD_STATION_RAIL] + _price[PR_BUILD_STATION_RAIL_LENGTH]) * plat_len);
 	cost.AddCost(numtracks * plat_len * RailBuildCost(rt));
 	Station *st = NULL;
 	ret = FindJoiningStation(est, station_to_join, adjacent, new_location, &st);
 	if (ret.Failed()) return ret;
 	ret = BuildStationPart(&st, flags, reuse, new_location, STATIONNAMING_RAIL);
@@ @@ -1538,25 +1538,25 @@ restart: @@
 /**
  * Remove a number of tiles from any rail station within the area.
  * @param ta the area to clear station tile from.
  * @param affected_stations the stations affected.
  * @param flags the command flags.
  * @param removal_cost the cost for removing the tile, including the rail.
  * @param keep_rail whether to keep the rail of the station.
  * @tparam T the type of station to remove.
  * @return the number of cleared tiles or an error.
  */
 template <class T>
-CommandCost RemoveFromRailBaseStation(TileArea ta, SmallVector<T *, 4> &affected_stations, DoCommandFlag flags, Money removal_cost, bool keep_rail)
+CommandCost RemoveFromRailBaseStation(TileArea ta, std::vector<T *> &affected_stations, DoCommandFlag flags, Money removal_cost, bool keep_rail)
+{
 	/* Count of the number of tiles removed */
 	int quantity = 0;
 	CommandCost total_cost(EXPENSES_CONSTRUCTION);
 	/* Accumulator for the errors seen during clearing. If no errors happen,
 	 * and the quantity is 0 there is no station. Otherwise it will be one
 	 * of the other error that got accumulated. */
 	CommandCost error;
 	/* Do the action for every tile into the area */
 	TILE_AREA_LOOP(tile, ta) {
 		/* Make sure the specified tile is a rail station */
@@ @@ -1651,25 +1651,25 @@ CommandCost RemoveFromRailBaseStation(Ti @@
  * @param p1 start_tile
  * @param p2 various bitstuffed elements
  * - p2 = bit 0 - if set keep the rail
  * @param text unused
  * @return the cost of this operation or an error
  */
 CommandCost CmdRemoveFromRailStation(TileIndex start, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text)
+{
 	TileIndex end = p1 == 0 ? start : p1;
 	if (start >= MapSize() || end >= MapSize()) return CMD_ERROR;
 	TileArea ta(start, end);
-	SmallVector<Station *, 4> affected_stations;
+	std::vector<Station *> affected_stations;
 	CommandCost ret = RemoveFromRailBaseStation(ta, affected_stations, flags, _price[PR_CLEAR_STATION_RAIL], HasBit(p2, 0));
 	if (ret.Failed()) return ret;
 	/* Do all station specific functions here. */
 	for (Station *st : affected_stations) {
 		if (st->train_station.tile == INVALID_TILE) SetWindowWidgetDirty(WC_STATION_VIEW, st->index, WID_SV_TRAINS);
 		st->MarkTilesDirty(false);
 		st->RecomputeCatchment();
+	}
@@ @@ -1685,25 +1685,25 @@ CommandCost CmdRemoveFromRailStation(Til @@
  * @param p1 start_tile
  * @param p2 various bitstuffed elements
  * - p2 = bit 0 - if set keep the rail
  * @param text unused
  * @return the cost of this operation or an error
  */
 CommandCost CmdRemoveFromRailWaypoint(TileIndex start, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text)
+{
 	TileIndex end = p1 == 0 ? start : p1;
 	if (start >= MapSize() || end >= MapSize()) return CMD_ERROR;
 	TileArea ta(start, end);
-	SmallVector<Waypoint *, 4> affected_stations;
+	std::vector<Waypoint *> affected_stations;
 	return RemoveFromRailBaseStation(ta, affected_stations, flags, _price[PR_CLEAR_WAYPOINT_RAIL], HasBit(p2, 0));
+}
 /**
  * Remove a rail station/waypoint
  * @param st The station/waypoint to remove the rail part from
  * @param flags operation to perform
  * @param removal_cost the cost for removing a tile
  * @tparam T the type of station to remove
  * @return cost or failure of operation
@@ @@ -1718,25 +1718,25 @@ CommandCost RemoveRailStation(T *st, DoC @@
+	}
 	/* determine width and height of platforms */
 	TileArea ta = st->train_station;
 	assert(ta.w != 0 && ta.h != 0);
 	CommandCost cost(EXPENSES_CONSTRUCTION);
 	/* clear all areas of the station */
 	TILE_AREA_LOOP(tile, ta) {
 		/* only remove tiles that are actually train station tiles */
 		if (st->TileBelongsToRailStation(tile)) {
-			SmallVector<T*, 4> affected_stations; // dummy
+			std::vector<T*> affected_stations; // dummy
 			CommandCost ret = RemoveFromRailBaseStation(TileArea(tile, 1, 1), affected_stations, flags, removal_cost, false);
 			if (ret.Failed()) return ret;
 			cost.AddCost(ret);
+		}
+	}
 	return cost;
+}
 /**
  * Remove a rail station
  * @param tile Tile of the station.
@@ @@ -3512,25 +3512,25 @@ void DeleteStaleLinks(Station *from) @@
 			Station *to = Station::Get((*lg)[it->first].Station());
 			assert(to->goods[c].node == it->first);
 			++it; // Do that before removing the edge. Anything else may crash.
 			assert(_date >= edge.LastUpdate());
 			uint timeout = LinkGraph::MIN_TIMEOUT_DISTANCE + (DistanceManhattan(from->xy, to->xy) >> 3);
 			if ((uint)(_date - edge.LastUpdate()) > timeout) {
 				bool updated = false;
 				if (auto_distributed) {
 					/* Have all vehicles refresh their next hops before deciding to
 					 * remove the node. */
 					OrderList *l;
-					SmallVector<Vehicle *, 32> vehicles;
+					std::vector<Vehicle *> vehicles;
 					FOR_ALL_ORDER_LISTS(l) {
 						bool found_from = false;
 						bool found_to = false;
 						for (Order *order = l->GetFirstOrder(); order != NULL; order = order->next) {
 							if (!order->IsType(OT_GOTO_STATION) && !order->IsType(OT_IMPLICIT)) continue;
 							if (order->GetDestination() == from->index) {
 								found_from = true;
 								if (found_to) break;
 							} else if (order->GetDestination() == to->index) {
 								found_to = true;
 								if (found_from) break;
+							}

src/station_gui.cpp

➞

Show inline comments

@@ @@ -2107,26 +2107,26 @@ static WindowDesc _station_view_desc( @@
  */
 void ShowStationViewWindow(StationID station)
+{
 	AllocateWindowDescFront<StationViewWindow>(&_station_view_desc, station);
+}
 /** Struct containing TileIndex and StationID */
 struct TileAndStation {
 	TileIndex tile;    ///< TileIndex
 	StationID station; ///< StationID
 };
 static SmallVector<TileAndStation, 8> _deleted_stations_nearby;
 static SmallVector<StationID, 8> _stations_nearby_list;
 static std::vector<TileAndStation> _deleted_stations_nearby;
 static std::vector<StationID> _stations_nearby_list;
 /**
  * Add station on this tile to _stations_nearby_list if it's fully within the
  * station spread.
  * @param tile Tile just being checked
  * @param user_data Pointer to TileArea context
  * @tparam T the type of station to look for
  */
 template <class T>
 static bool AddNearbyStation(TileIndex tile, void *user_data)
+{
 	TileArea *ctx = (TileArea *)user_data;

src/strgen/strgen_base.cpp

➞

Show inline comments

@@ @@ -226,25 +226,25 @@ struct CmdPair { @@
 struct ParsedCommandStruct {
 	uint np;
 	CmdPair pairs[32];
 	const CmdStruct *cmd[32]; // ordered by param #
 };
 /* Used when generating some advanced commands. */
 static ParsedCommandStruct _cur_pcs;
 static int _cur_argidx;
 /** The buffer for writing a single string. */
-struct Buffer : SmallVector<byte, 256> {
+struct Buffer : std::vector<byte> {
 	/**
 	 * Convenience method for adding a byte.
 	 * @param value The value to add.
 	 */
 	void AppendByte(byte value)
+	{
 		this->push_back(value);
+	}
 	/**
 	 * Add an Unicode character encoded in UTF-8 to the buffer.
 	 * @param value The character to add.

src/string.cpp

➞

Show inline comments

@@ @@ -615,26 +615,26 @@ int strnatcmp(const char *s1, const char @@
 #elif defined(WITH_ICU_I18N)
 #include <unicode/utext.h>
 #include <unicode/brkiter.h>
 /** String iterator using ICU as a backend. */
 class IcuStringIterator : public StringIterator
+{
 	icu::BreakIterator *char_itr; ///< ICU iterator for characters.
 	icu::BreakIterator *word_itr; ///< ICU iterator for words.
 	SmallVector<UChar, 32> utf16_str;      ///< UTF-16 copy of the string.
 	SmallVector<size_t, 32> utf16_to_utf8; ///< Mapping from UTF-16 code point position to index in the UTF-8 source string.
 	std::vector<UChar> utf16_str;      ///< UTF-16 copy of the string.
 	std::vector<size_t> utf16_to_utf8; ///< Mapping from UTF-16 code point position to index in the UTF-8 source string.
 public:
 	IcuStringIterator() : char_itr(NULL), word_itr(NULL)
+	{
 		UErrorCode status = U_ZERO_ERROR;
 		this->char_itr = icu::BreakIterator::createCharacterInstance(icu::Locale(_current_language != NULL ? _current_language->isocode : "en"), status);
 		this->word_itr = icu::BreakIterator::createWordInstance(icu::Locale(_current_language != NULL ? _current_language->isocode : "en"), status);
 		this->utf16_str.push_back('\0');
 		this->utf16_to_utf8.push_back(0);
+	}

src/stringfilter_type.h

➞

Show inline comments

@@ @@ -30,25 +30,25 @@ @@
  *  2. Pass all lines of the item via AddLine() to the filter.
  *  3. Check the matching-result for the item via GetState().
  */
 struct StringFilter {
 private:
 	/** State of a single filter word */
 	struct WordState {
 		const char *start;                         ///< Word to filter for.
 		bool match;                                ///< Already matched?
 	};
 	const char *filter_buffer;                     ///< Parsed filter string. Words separated by 0.
-	SmallVector<WordState, 4> word_index;          ///< Word index and filter state.
+	std::vector<WordState> word_index;          ///< Word index and filter state.
 	uint word_matches;                             ///< Summary of filter state: Number of words matched.
 	const bool *case_sensitive;                    ///< Match case-sensitively (usually a static variable).
 public:
 	/**
 	 * Constructor for filter.
 	 * @param case_sensitive Pointer to a (usually static) variable controlling the case-sensitivity. NULL means always case-insensitive.
 	 */
 	StringFilter(const bool *case_sensitive = NULL) : filter_buffer(NULL), word_matches(0), case_sensitive(case_sensitive) {}
 	~StringFilter() { free(this->filter_buffer); }

src/subsidy.cpp

➞

Show inline comments

@@ @@ -555,25 +555,25 @@ bool CheckSubsidised(CargoID cargo_type, @@
 	switch (src_type) {
 		case ST_INDUSTRY:
 			if (!(Industry::Get(src)->part_of_subsidy & POS_SRC)) return false;
 			break;
 		case ST_TOWN:
 			if (!(Town::Get(src)->cache.part_of_subsidy & POS_SRC)) return false;
 			break;
 		default: return false;
+	}
 	/* Remember all towns near this station (at least one house in its catchment radius)
 	 * which are destination of subsidised path. Do that only if needed */
-	SmallVector<const Town *, 2> towns_near;
+	std::vector<const Town *> towns_near;
 	if (!st->rect.IsEmpty()) {
 		Subsidy *s;
 		FOR_ALL_SUBSIDIES(s) {
 			/* Don't create the cache if there is no applicable subsidy with town as destination */
 			if (s->dst_type != ST_TOWN) continue;
 			if (s->cargo_type != cargo_type || s->src_type != src_type || s->src != src) continue;
 			if (s->IsAwarded() && s->awarded != company) continue;
 			BitmapTileIterator it(st->catchment_tiles);
 			for (TileIndex tile = it; tile != INVALID_TILE; tile = ++it) {
 				if (!IsTileType(tile, MP_HOUSE)) continue;
 				const Town *t = Town::GetByTile(tile);

src/texteff.cpp

➞

Show inline comments

@@ @@ -28,25 +28,25 @@ struct TextEffect : public ViewportSign @@
 	uint8 duration;      ///< How long the text effect should stay, in ticks (applies only when mode == TE_RISING)
 	TextEffectMode mode; ///< Type of text effect
 	/** Reset the text effect */
 	void Reset()
+	{
 		this->MarkDirty();
 		this->width_normal = 0;
 		this->string_id = INVALID_STRING_ID;
+	}
 };
-static SmallVector<struct TextEffect, 32> _text_effects; ///< Text effects are stored there
+static std::vector<struct TextEffect> _text_effects; ///< Text effects are stored there
 /* Text Effects */
 TextEffectID AddTextEffect(StringID msg, int center, int y, uint8 duration, TextEffectMode mode)
+{
 	if (_game_mode == GM_MENU) return INVALID_TE_ID;
 	TextEffectID i;
 	for (i = 0; i < _text_effects.size(); i++) {
 		if (_text_effects[i].string_id == INVALID_STRING_ID) break;
+	}
 	if (i == _text_effects.size()) _text_effects.emplace_back();

src/textfile_gui.h

➞

Show inline comments

@@ @@ -12,30 +12,30 @@ @@
 #ifndef TEXTFILE_GUI_H
 #define TEXTFILE_GUI_H
 #include "fileio_type.h"
 #include "strings_func.h"
 #include "textfile_type.h"
 #include "window_gui.h"
 const char *GetTextfile(TextfileType type, Subdirectory dir, const char *filename);
 /** Window for displaying a textfile */
 struct TextfileWindow : public Window, MissingGlyphSearcher {
 	TextfileType file_type;              ///< Type of textfile to view.
 	Scrollbar *vscroll;                  ///< Vertical scrollbar.
 	Scrollbar *hscroll;                  ///< Horizontal scrollbar.
 	char *text;                          ///< Lines of text from the NewGRF's textfile.
 	SmallVector<const char *, 64> lines; ///< #text, split into lines in a table with lines.
 	uint search_iterator;                ///< Iterator for the font check search.
 	TextfileType file_type;          ///< Type of textfile to view.
 	Scrollbar *vscroll;              ///< Vertical scrollbar.
 	Scrollbar *hscroll;              ///< Horizontal scrollbar.
 	char *text;                      ///< Lines of text from the NewGRF's textfile.
 	std::vector<const char *> lines; ///< #text, split into lines in a table with lines.
 	uint search_iterator;            ///< Iterator for the font check search.
 	static const int TOP_SPACING    = WD_FRAMETEXT_TOP;    ///< Additional spacing at the top of the #WID_TF_BACKGROUND widget.
 	static const int BOTTOM_SPACING = WD_FRAMETEXT_BOTTOM; ///< Additional spacing at the bottom of the #WID_TF_BACKGROUND widget.
 	TextfileWindow(TextfileType file_type);
 	~TextfileWindow();
 	void UpdateWidgetSize(int widget, Dimension *size, const Dimension &padding, Dimension *fill, Dimension *resize) override;
 	void OnClick(Point pt, int widget, int click_count) override;
 	void DrawWidget(const Rect &r, int widget) const override;
 	void OnResize() override;

src/timetable_cmd.cpp

➞

Show inline comments

@@ @@ -272,25 +272,25 @@ CommandCost CmdSetTimetableStart(TileInd @@
 	CommandCost ret = CheckOwnership(v->owner);
 	if (ret.Failed()) return ret;
 	/* Don't let a timetable start more than 15 years into the future or 1 year in the past. */
 	Date start_date = (Date)p2;
 	if (start_date < 0 || start_date > MAX_DAY) return CMD_ERROR;
 	if (start_date - _date > 15 * DAYS_IN_LEAP_YEAR) return CMD_ERROR;
 	if (_date - start_date > DAYS_IN_LEAP_YEAR) return CMD_ERROR;
 	if (timetable_all && !v->orders.list->IsCompleteTimetable()) return CMD_ERROR;
 	if (flags & DC_EXEC) {
-		SmallVector<Vehicle *, 8> vehs;
+		std::vector<Vehicle *> vehs;
 		if (timetable_all) {
 			for (Vehicle *w = v->orders.list->GetFirstSharedVehicle(); w != NULL; w = w->NextShared()) {
 				vehs.push_back(w);
+			}
 		} else {
 			vehs.push_back(v);
+		}
 		int total_duration = v->orders.list->GetTimetableTotalDuration();
 		int num_vehs = vehs.size();

src/train_cmd.cpp

➞

Show inline comments

@@ @@ -805,25 +805,25 @@ static Train *FindGoodVehiclePos(const T @@
 			Train *t = dst;
 			while (t->engine_type == eng) {
 				t = t->Next();
 				if (t == NULL) return dst;
+			}
+		}
+	}
 	return NULL;
+}
 /** Helper type for lists/vectors of trains */
-typedef SmallVector<Train *, 16> TrainList;
+typedef std::vector<Train *> TrainList;
 /**
  * Make a backup of a train into a train list.
  * @param list to make the backup in
  * @param t    the train to make the backup of
  */
 static void MakeTrainBackup(TrainList &list, Train *t)
+{
 	for (; t != NULL; t = t->Next()) list.push_back(t);
+}
 /**

src/train_gui.cpp

➞

Show inline comments

@@ @@ -177,25 +177,25 @@ struct CargoSummaryItem { @@
 	/** Used by std::find() and similar functions */
 	inline bool operator == (const CargoSummaryItem &other) const
+	{
 		return !(this->cargo != other.cargo);
+	}
 };
 static const uint TRAIN_DETAILS_MIN_INDENT = 32; ///< Minimum indent level in the train details window
 static const uint TRAIN_DETAILS_MAX_INDENT = 72; ///< Maximum indent level in the train details window; wider than this and we start on a new line
 /** Container for the cargo summary information. */
-typedef SmallVector<CargoSummaryItem, 2> CargoSummary;
+typedef std::vector<CargoSummaryItem> CargoSummary;
 /** Reused container of cargo details */
 static CargoSummary _cargo_summary;
 /**
  * Draw the details cargo tab for the given vehicle at the given position
+ *
  * @param item  Data to draw
  * @param left  The left most coordinate to draw
  * @param right The right most coordinate to draw
  * @param y     The y coordinate
  */
 static void TrainDetailsCargoTab(const CargoSummaryItem *item, int left, int right, int y)

src/vehicle_cmd.cpp

➞

Show inline comments

@@ @@ -337,26 +337,25 @@ static CommandCost RefitVehicle(Vehicle @@
 	CommandCost cost(v->GetExpenseType(false));
 	uint total_capacity = 0;
 	uint total_mail_capacity = 0;
 	num_vehicles = num_vehicles == 0 ? UINT8_MAX : num_vehicles;
 	VehicleSet vehicles_to_refit;
 	if (!only_this) {
 		GetVehicleSet(vehicles_to_refit, v, num_vehicles);
 		/* In this case, we need to check the whole chain. */
 		v = v->First();
+	}
 	static SmallVector<RefitResult, 16> refit_result;
 	refit_result.clear();
 	std::vector<RefitResult> refit_result;
 	v->InvalidateNewGRFCacheOfChain();
 	byte actual_subtype = new_subtype;
 	for (; v != NULL; v = (only_this ? NULL : v->Next())) {
 		/* Reset actual_subtype for every new vehicle */
 		if (!v->IsArticulatedPart()) actual_subtype = new_subtype;
 		if (v->type == VEH_TRAIN && std::find(vehicles_to_refit.begin(), vehicles_to_refit.end(), v->index) == vehicles_to_refit.end() && !only_this) continue;
 		const Engine *e = v->GetEngine();
 		if (!e->CanCarryCargo()) continue;

src/vehicle_func.h

➞

Show inline comments

@@ @@ -166,18 +166,18 @@ static inline uint32 GetCmdSendToDepot(c @@
 CommandCost EnsureNoVehicleOnGround(TileIndex tile);
 CommandCost EnsureNoTrainOnTrackBits(TileIndex tile, TrackBits track_bits);
 extern VehicleID _new_vehicle_id;
 extern uint16 _returned_refit_capacity;
 extern uint16 _returned_mail_refit_capacity;
 bool CanVehicleUseStation(EngineID engine_type, const struct Station *st);
 bool CanVehicleUseStation(const Vehicle *v, const struct Station *st);
 void ReleaseDisastersTargetingVehicle(VehicleID vehicle);
-typedef SmallVector<VehicleID, 2> VehicleSet;
+typedef std::vector<VehicleID> VehicleSet;
 void GetVehicleSet(VehicleSet &set, Vehicle *v, uint8 num_vehicles);
 void CheckCargoCapacity(Vehicle *v);
 #endif /* VEHICLE_FUNC_H */

src/vehicle_gui.cpp

➞

Show inline comments

@@ @@ -224,25 +224,25 @@ static const uint MAX_REFIT_CYCLE = 256; @@
  * For \a v_for only vehicle refittable to \a dest_cargo_type are considered.
  * @param v_from the vehicle to match the subtype from
  * @param v_for  the vehicle to get the subtype for
  * @param dest_cargo_type Destination cargo type.
  * @return the best sub type
  */
 byte GetBestFittingSubType(Vehicle *v_from, Vehicle *v_for, CargoID dest_cargo_type)
+{
 	v_from = v_from->GetFirstEnginePart();
 	v_for = v_for->GetFirstEnginePart();
 	/* Create a list of subtypes used by the various parts of v_for */
-	static SmallVector<StringID, 4> subtypes;
+	static std::vector<StringID> subtypes;
 	subtypes.clear();
 	for (; v_from != NULL; v_from = v_from->HasArticulatedPart() ? v_from->GetNextArticulatedPart() : NULL) {
 		const Engine *e_from = v_from->GetEngine();
 		if (!e_from->CanCarryCargo() || !HasBit(e_from->info.callback_mask, CBM_VEHICLE_CARGO_SUFFIX)) continue;
 		include(subtypes, GetCargoSubtypeText(v_from));
+	}
 	byte ret_refit_cyc = 0;
 	bool success = false;
 	if (subtypes.size() > 0) {
 		/* Check whether any articulated part is refittable to 'dest_cargo_type' with a subtype listed in 'subtypes' */
 		for (Vehicle *v = v_for; v != NULL; v = v->HasArticulatedPart() ? v->GetNextArticulatedPart() : NULL) {
@@ @@ -308,25 +308,25 @@ struct RefitOption { @@
 	/**
 	 * Equality operator for #RefitOption.
 	 * @param other Compare to this #RefitOption.
 	 * @return True if both #RefitOption are equal.
 	 */
 	inline bool operator == (const RefitOption &other) const
+	{
 		return other.cargo == this->cargo && other.string == this->string;
+	}
 };
-typedef SmallVector<RefitOption, 32> SubtypeList; ///< List of refit subtypes associated to a cargo.
+typedef std::vector<RefitOption> SubtypeList; ///< List of refit subtypes associated to a cargo.
 /**
  * Draw the list of available refit options for a consist and highlight the selected refit option (if any).
  * @param list  List of subtype options for each (sorted) cargo.
  * @param sel   Selected refit cargo-type in the window
  * @param pos   Position of the selected item in caller widow
  * @param rows  Number of rows(capacity) in caller window
  * @param delta Step height in caller window
  * @param r     Rectangle of the matrix widget.
  */
 static void DrawVehicleRefitWindow(const SubtypeList list[NUM_CARGO], const int sel[2], uint pos, uint rows, uint delta, const Rect &r)
+{

src/vehiclelist.h

➞

Show inline comments

@@ @@ -43,19 +43,19 @@ struct VehicleListIdentifier { @@
 	 * @param type    List type.
 	 * @param vtype   Vehicle type associated with this list.
 	 * @param company Company associated with this list.
 	 * @param index   Optional type specific index.
 	 */
 	VehicleListIdentifier(VehicleListType type, VehicleType vtype, CompanyID company, uint index = 0) :
 		type(type), vtype(vtype), company(company), index(index) {}
 	VehicleListIdentifier() : type(), vtype(), company(), index() {}
 };
 /** A list of vehicles. */
-typedef SmallVector<const Vehicle *, 32> VehicleList;
+typedef std::vector<const Vehicle *> VehicleList;
 bool GenerateVehicleSortList(VehicleList *list, const VehicleListIdentifier &identifier);
 void BuildDepotVehicleList(VehicleType type, TileIndex tile, VehicleList *engine_list, VehicleList *wagon_list, bool individual_wagons = false);
 uint GetUnitNumberDigits(VehicleList &vehicles);
 #endif /* VEHICLELIST_H */

src/viewport.cpp

➞

Show inline comments

@@ @@ -144,28 +144,28 @@ enum FoundationPart { @@
 };
 /**
  * Mode of "sprite combining"
  * @see StartSpriteCombine
  */
 enum SpriteCombineMode {
 	SPRITE_COMBINE_NONE,     ///< Every #AddSortableSpriteToDraw start its own bounding box
 	SPRITE_COMBINE_PENDING,  ///< %Sprite combining will start with the next unclipped sprite.
 	SPRITE_COMBINE_ACTIVE,   ///< %Sprite combining is active. #AddSortableSpriteToDraw outputs child sprites.
 };
 typedef SmallVector<TileSpriteToDraw, 64> TileSpriteToDrawVector;
 typedef SmallVector<StringSpriteToDraw, 4> StringSpriteToDrawVector;
 typedef SmallVector<ParentSpriteToDraw, 64> ParentSpriteToDrawVector;
 typedef SmallVector<ChildScreenSpriteToDraw, 16> ChildScreenSpriteToDrawVector;
 typedef std::vector<TileSpriteToDraw> TileSpriteToDrawVector;
 typedef std::vector<StringSpriteToDraw> StringSpriteToDrawVector;
 typedef std::vector<ParentSpriteToDraw> ParentSpriteToDrawVector;
 typedef std::vector<ChildScreenSpriteToDraw> ChildScreenSpriteToDrawVector;
 /** Data structure storing rendering information */
 struct ViewportDrawer {
 	DrawPixelInfo dpi;
 	StringSpriteToDrawVector string_sprites_to_draw;
 	TileSpriteToDrawVector tile_sprites_to_draw;
 	ParentSpriteToDrawVector parent_sprites_to_draw;
 	ParentSpriteToSortVector parent_sprites_to_sort; ///< Parent sprite pointer array used for sorting
 	ChildScreenSpriteToDrawVector child_screen_sprites_to_draw;
 	int *last_child;

src/viewport_sprite_sorter.h

➞

Show inline comments

@@ @@ -32,25 +32,25 @@ struct ParentSpriteToDraw { @@
 	SpriteID image;                 ///< sprite to draw
 	PaletteID pal;                  ///< palette to use
 	const SubSprite *sub;           ///< only draw a rectangular part of the sprite
 	int32 left;                     ///< minimal screen X coordinate of sprite (= x + sprite->x_offs), reference point for child sprites
 	int32 top;                      ///< minimal screen Y coordinate of sprite (= y + sprite->y_offs), reference point for child sprites
 	int32 first_child;              ///< the first child to draw.
 	bool comparison_done;           ///< Used during sprite sorting: true if sprite has been compared with all other sprites
 };
-typedef SmallVector<ParentSpriteToDraw*, 64> ParentSpriteToSortVector;
+typedef std::vector<ParentSpriteToDraw*> ParentSpriteToSortVector;
 /** Type for method for checking whether a viewport sprite sorter exists. */
 typedef bool (*VpSorterChecker)();
 /** Type for the actual viewport sprite sorter. */
 typedef void (*VpSpriteSorter)(ParentSpriteToSortVector *psd);
 #ifdef WITH_SSE
 bool ViewportSortParentSpritesSSE41Checker();
 void ViewportSortParentSpritesSSE41(ParentSpriteToSortVector *psdv);
 #endif
 void InitializeSpriteSorter();

src/window.cpp

➞

Show inline comments

@@ @@ -76,48 +76,48 @@ int _scrollbar_start_pos; @@
 int _scrollbar_size;
 byte _scroller_click_timeout = 0;
 bool _scrolling_viewport;  ///< A viewport is being scrolled with the mouse.
 bool _mouse_hovering;      ///< The mouse is hovering over the same point.
 SpecialMouseMode _special_mouse_mode; ///< Mode of the mouse.
 /**
  * List of all WindowDescs.
  * This is a pointer to ensure initialisation order with the various static WindowDesc instances.
  */
-static SmallVector<WindowDesc*, 16> *_window_descs = NULL;
+static std::vector<WindowDesc*> *_window_descs = NULL;
 /** Config file to store WindowDesc */
 char *_windows_file;
 /** Window description constructor. */
 WindowDesc::WindowDesc(WindowPosition def_pos, const char *ini_key, int16 def_width_trad, int16 def_height_trad,
 			WindowClass window_class, WindowClass parent_class, uint32 flags,
 			const NWidgetPart *nwid_parts, int16 nwid_length, HotkeyList *hotkeys) :
 	default_pos(def_pos),
 	cls(window_class),
 	parent_cls(parent_class),
 	ini_key(ini_key),
 	flags(flags),
 	nwid_parts(nwid_parts),
 	nwid_length(nwid_length),
 	hotkeys(hotkeys),
 	pref_sticky(false),
 	pref_width(0),
 	pref_height(0),
 	default_width_trad(def_width_trad),
 	default_height_trad(def_height_trad)
+{
-	if (_window_descs == NULL) _window_descs = new SmallVector<WindowDesc*, 16>();
+	if (_window_descs == NULL) _window_descs = new std::vector<WindowDesc*>();
 	_window_descs->push_back(this);
+}
 WindowDesc::~WindowDesc()
+{
 	_window_descs->erase(std::find(_window_descs->begin(), _window_descs->end(), this));
+}
 /**
  * Determine default width of window.
  * This is either a stored user preferred size, or the build-in default.
  * @return Width in pixels.

src/window_gui.h

➞

Show inline comments

@@ @@ -272,25 +272,25 @@ enum TooltipCloseCondition { @@
 	TCC_NONE,
 };
 /**
  * Data structure for an opened window
  */
 struct Window : ZeroedMemoryAllocator {
 protected:
 	void InitializeData(WindowNumber window_number);
 	void InitializePositionSize(int x, int y, int min_width, int min_height);
 	virtual void FindWindowPlacementAndResize(int def_width, int def_height);
-	SmallVector<int, 4> scheduled_invalidation_data;  ///< Data of scheduled OnInvalidateData() calls.
+	std::vector<int> scheduled_invalidation_data;  ///< Data of scheduled OnInvalidateData() calls.
 public:
 	Window(WindowDesc *desc);
 	virtual ~Window();
 	/**
 	 * Helper allocation function to disallow something.
 	 * Don't allow arrays; arrays of Windows are pointless as you need
 	 * to destruct them all at the same time too, which is kinda hard.
 	 * @param size the amount of space not to allocate
 	 */

0 comments (0 inline, 0 general)