gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-02-02 12:24:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r16724) -Fix (r16714): MSVC 64bit warnings (Rubidium)

Browse Source
This commit is contained in:
smatz 2009-07-02 12:47:52 +00:00
parent 6a0855f0d1
commit 1e6a12b75b
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -90,6 +90,7 @@ typedef OverflowSafeInt64 Money; //!< Money, stored in a 32bit/64bit safe way. F
typedef uint16 SignID; //!< The ID of a sign.
typedef uint16 StationID; //!< The ID of a station.
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.
@ -98,6 +99,5 @@ typedef uint16 WaypointID; //!< The ID of a waypoint.
/* Types we defined ourself, as the OpenTTD core doesn't have them (yet) */
typedef uint AIErrorType; //!< The types of errors inside the NoAI framework.
typedef BridgeType BridgeID; //!< The ID of a bridge.
typedef uint16 SubsidyID; //!< The ID of a subsidy.
#endif /* AI_TYPES_HPP */

4
src/subsidy_base.h
View File

@ -8,6 +8,8 @@
#include "cargo_type.h"
#include "company_type.h"
typedef uint16 SubsidyID; ///< ID of a subsidy
/** Struct about subsidies, offered and awarded */
struct Subsidy {
CargoID cargo_type; ///< Cargo type involved in this subsidy, CT_INVALID for invalid subsidy
@ -19,7 +21,7 @@ struct Subsidy {
* Determines index of this subsidy
* @return index (in the Subsidy::array array)
*/
FORCEINLINE size_t Index() const
FORCEINLINE SubsidyID Index() const
{
return this - Subsidy::array;
}