miguel.horta/openttd-cmclient
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

openttd updated to 1.5.0-beta2

Browse Source 
--HG--
branch : openttd
This commit is contained in:
Pavel Stupnikov
2015-03-01 00:30:53 +03:00
parent 0abb47ce90
commit d201932121
682 changed files with 26103 additions and 16553 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/cargopacket.cpp
View File

@@ -1,4 +1,4 @@
/* $Id: cargopacket.cpp 26333 2014-02-11 20:34:48Z frosch $ */
/* $Id: cargopacket.cpp 26575 2014-05-11 12:49:51Z fonsinchen $ */
/*
* This file is part of OpenTTD.
@@ -17,6 +17,8 @@
#include "cargoaction.h"
#include "order_type.h"
#include "safeguards.h"
/* Initialize the cargopacket-pool */
CargoPacketPool _cargopacket_pool("CargoPacket");
INSTANTIATE_POOL_METHODS(CargoPacket)
@@ -357,6 +359,7 @@ void VehicleCargoList::AddToCache(const CargoPacket *cp)
*/
void VehicleCargoList::RemoveFromMeta(const CargoPacket *cp, MoveToAction action, uint count)
{
assert(count <= this->action_counts[action]);
this->AssertCountConsistency();
this->RemoveFromCache(cp, count);
this->action_counts[action] -= count;