mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r20574) -Codechange: a little over 1 million vehicles should be enough for the forseeable future

This commit is contained in:
rubidium 2010-08-19 20:58:30 +00:00
parent cc658392eb
commit 1fa98e1695
6 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ai/api/ai_types.hpp
View File

@ -97,7 +97,7 @@ typedef uint16 StringID; ///< The ID of a string.
typedef uint16 SubsidyID; ///< The ID of a subsidy.
typedef uint32 TileIndex; ///< The ID of a tile (just named differently).
typedef uint16 TownID; ///< The ID of a town.
typedef uint16 VehicleID; ///< The ID of a vehicle.
typedef uint32 VehicleID; ///< The ID of a vehicle.
/* Types we defined ourself, as the OpenTTD core doesn't have them (yet) */
typedef uint AIErrorType; ///< The types of errors inside the NoAI framework.

2
src/ai/api/ai_vehicle.hpp
View File

@ -97,7 +97,7 @@ public:
VS_INVALID = 0xFF, ///< An invalid vehicle state.
};
static const VehicleID VEHICLE_INVALID = 0xFFFF; ///< Invalid VehicleID.
static const VehicleID VEHICLE_INVALID = 0xFFFFF; ///< Invalid VehicleID.
/**
* Checks whether the given vehicle is valid and owned by you.

4
src/cargopacket.h
View File

@ -23,8 +23,8 @@
typedef uint32 CargoPacketID;
struct CargoPacket;
/** Type of the pool for cargo packets. */
typedef Pool<CargoPacket, CargoPacketID, 1024, 1048576, true, false> CargoPacketPool;
/** Type of the pool for cargo packets for a little over 16 million packets. */
typedef Pool<CargoPacket, CargoPacketID, 1024, 0xFFF000, true, false> CargoPacketPool;
/** The actual pool with cargo packets */
extern CargoPacketPool _cargopacket_pool;

7
src/script/squirrel.hpp
View File

@ -85,6 +85,12 @@ public:
*/
void AddConst(const char *var_name, int value);
/**
* Adds a const to the stack. Depending on the current state this means
* either a const to a class or to the global space.
*/
void AddConst(const char *var_name, uint value) { this->AddConst(var_name, (int)value); }
/**
* Adds a const to the stack. Depending on the current state this means
* either a const to a class or to the global space.
@ -126,6 +132,7 @@ public:
void InsertResult(bool result);
void InsertResult(int result);
void InsertResult(uint result) { this->InsertResult((int)result); }
/**
* Call a method of an instance, in various flavors.

3
src/vehicle_base.h
View File

@ -53,7 +53,8 @@ struct VehicleCache {
uint32 cached_var43; ///< Cache for NewGRF var 43
};
typedef Pool<Vehicle, VehicleID, 512, 64000> VehiclePool;
/** A vehicle pool for a little over 1 million vehicles. */
typedef Pool<Vehicle, VehicleID, 512, 0xFF000> VehiclePool;
extern VehiclePool _vehicle_pool;
/* Some declarations of functions, so we can make them friendly */

4
src/vehicle_type.h
View File

@ -14,7 +14,7 @@
#include "core/enum_type.hpp"
typedef uint16 VehicleID;
typedef uint32 VehicleID;
/** Available vehicle types. */
enum VehicleType {
@ -45,7 +45,7 @@ struct BaseVehicle
VehicleTypeByte type; ///< Type of vehicle
};
static const VehicleID INVALID_VEHICLE = 0xFFFF; ///< Constant representing a non-existing vehicle.
static const VehicleID INVALID_VEHICLE = 0xFFFFF; ///< Constant representing a non-existing vehicle.
/** Pathfinding option states */
enum VehiclePathFinders {