cpp/openttd-patchpack/source Changeset - r13290:9954cbdc2063

Changeset - r13290:9954cbdc2063

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

frosch - 15 years ago 2009-10-18 18:47:43
frosch@openttd.org

(svn r17809) -Fix: MSVC compilation.

2 files changed with 2 insertions and 2 deletions:

src/cargopacket.cpp

src/cargopacket.h

0 comments (0 inline, 0 general)

src/cargopacket.cpp

➞

Show inline comments

@@ @@ -168,13 +168,13 @@ void CargoList<Tinst>::Truncate(uint max @@
 		++it;
+	}
+}
 template <class Tinst>
 template <class Tother_inst>
-bool CargoList<Tinst>::MoveTo(Tother_inst *dest, uint max_move, CargoList::MoveToAction mta, CargoPayment *payment, uint data)
 bool CargoList<Tinst>::MoveTo(Tother_inst *dest, uint max_move, MoveToAction mta, CargoPayment *payment, uint data)
+{
 	assert(mta == MTA_FINAL_DELIVERY || dest != NULL);
 	assert(mta == MTA_UNLOAD || mta == MTA_CARGO_LOAD || payment != NULL);
 	List::iterator it = packets.begin();
 	while (it != packets.end() && max_move > 0) {

src/cargopacket.h

➞

Show inline comments

@@ @@ -313,13 +313,13 @@ public: @@
+	 *
 	 * @pre mta == MTA_FINAL_DELIVERY || dest != NULL
 	 * @pre mta == MTA_UNLOAD || mta == MTA_CARGO_LOAD || payment != NULL
 	 * @return true if there are still packets that might be moved from this cargo list
 	 */
 	template <class Tother_inst>
-	bool MoveTo(Tother_inst *dest, uint count, CargoList::MoveToAction mta, CargoPayment *payment, uint data = 0);
 	bool MoveTo(Tother_inst *dest, uint count, MoveToAction mta, CargoPayment *payment, uint data = 0);
 	/** Invalidates the cached data and rebuild it */
 	void InvalidateCache();
 };
 /**

0 comments (0 inline, 0 general)