gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-06 14:27:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r10358) -Codechange: remove the cargopacket leakchecker as it never asserted in almost a week of stresstesting, so I'm pretty sure all cornercases are tested by now.

Browse Source
This commit is contained in:
rubidium 2007-06-27 17:19:05 +00:00
parent 3c5622ee9a
commit 67f46b40ab
3 changed files with 1 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/blitter/factory.hpp
View File

@ -64,6 +64,7 @@ public:
BlitterFactoryBase *b = (*it).second; BlitterFactoryBase *b = (*it).second;
if (strcasecmp(name, b->name) == 0) { if (strcasecmp(name, b->name) == 0) {
Blitter *newb = b->CreateInstance(); Blitter *newb = b->CreateInstance();
delete *GetActiveBlitter();
*GetActiveBlitter() = newb; *GetActiveBlitter() = newb;
return newb; return newb;
} }

2
src/cargopacket.h
View File

@ -11,8 +11,6 @@
* Container for cargo from the same location and time * Container for cargo from the same location and time
*/ */
struct CargoPacket { struct CargoPacket {
bool touched;
typedef uint32 ID; ///< Type for cargopacket identifiers typedef uint32 ID; ///< Type for cargopacket identifiers
ID index; ///< The unique index of this packet ID index; ///< The unique index of this packet

26
src/openttd.cpp
View File

@ -938,31 +938,6 @@ void SwitchMode(int new_mode)
} }
} }
#include "cargopacket.h"
void CheckCargoPacketLeaks()
{
CargoPacket *cp;
FOR_ALL_CARGOPACKETS(cp) cp->touched = false;
Vehicle *v;
FOR_ALL_VEHICLES(v) {
const CargoList::List *packets = v->cargo.Packets();
for (CargoList::List::const_iterator it = packets->begin(); it != packets->end(); it++) (*it)->touched = true;
}
Station *st;
FOR_ALL_STATIONS(st) {
for (CargoID c = 0; c < NUM_CARGO; c++) {
GoodsEntry *ge = &st->goods[c];
const CargoList::List *packets = ge->cargo.Packets();
for (CargoList::List::const_iterator it = packets->begin(); it != packets->end(); it++) (*it)->touched = true;
}
}
FOR_ALL_CARGOPACKETS(cp) assert(cp->touched);
}
/* State controlling game loop. /* State controlling game loop.
* The state must not be changed from anywhere * The state must not be changed from anywhere
@ -997,7 +972,6 @@ void StateGameLoop()
CallWindowTickEvent(); CallWindowTickEvent();
NewsLoop(); NewsLoop();
_current_player = p; _current_player = p;
CheckCargoPacketLeaks();
} }
} }