mirror of https://github.com/OpenTTD/OpenTTD.git
(svn r17809) -Fix: MSVC compilation.
This commit is contained in:
parent
e613107e02
commit
fea06c5755
|
@ -171,7 +171,7 @@ void CargoList<Tinst>::Truncate(uint max_remaining)
|
||||||
|
|
||||||
template <class Tinst>
|
template <class Tinst>
|
||||||
template <class Tother_inst>
|
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_FINAL_DELIVERY || dest != NULL);
|
||||||
assert(mta == MTA_UNLOAD || mta == MTA_CARGO_LOAD || payment != NULL);
|
assert(mta == MTA_UNLOAD || mta == MTA_CARGO_LOAD || payment != NULL);
|
||||||
|
|
|
@ -316,7 +316,7 @@ public:
|
||||||
* @return true if there are still packets that might be moved from this cargo list
|
* @return true if there are still packets that might be moved from this cargo list
|
||||||
*/
|
*/
|
||||||
template <class Tother_inst>
|
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 */
|
/** Invalidates the cached data and rebuild it */
|
||||||
void InvalidateCache();
|
void InvalidateCache();
|
||||||
|
|
Loading…
Reference in New Issue