cpp/openttd-patchpack/source Changeset - r12297:feee3c26c3b6

Changeset - r12297:feee3c26c3b6

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

smatz - 15 years ago 2009-07-02 12:47:52
smatz@openttd.org

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

2 files changed with 4 insertions and 2 deletions:

src/ai/api/ai_types.hpp

src/subsidy_base.h

0 comments (0 inline, 0 general)

src/ai/api/ai_types.hpp

➞

Show inline comments

@@ @@ -90,6 +90,7 @@ typedef OverflowSafeInt64 Money; //!< Mo @@
 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 @@
 /* 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 */

src/subsidy_base.h

➞

Show inline comments

@@ @@ -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;
+	}

0 comments (0 inline, 0 general)