dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r8066) - Codechange: MallocT(), CallocT(), ReallocT() now return the pointer to allocated memory instead of modifying the pointer given as parameter

Browse Source
This commit is contained in:
KUDr
2007-01-11 17:29:39 +00:00
parent 5675956443
commit 28e969924b
49 changed files with 141 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ai/ai.cpp
View File

@@ -51,11 +51,11 @@ static void AI_PutCommandInQueue(PlayerID player, TileIndex tile, uint32 p1, uin
if (_ai_player[player].queue_tail == NULL) {
/* There is no item in the queue yet, create the queue */
MallocT(&_ai_player[player].queue, 1);
_ai_player[player].queue = MallocT<AICommand>(1);
_ai_player[player].queue_tail = _ai_player[player].queue;
} else {
/* Add an item at the end */
MallocT(&_ai_player[player].queue_tail->next, 1);
_ai_player[player].queue_tail->next = MallocT<AICommand>(1);
_ai_player[player].queue_tail = _ai_player[player].queue_tail->next;
}

3
src/ai/default/default.cpp
View File

@@ -3575,7 +3575,6 @@ return_to_loop:;
static void AiStateRemoveStation(Player *p)
{
// Remove stations that aren't in use by any vehicle
byte *in_use;
const Order *ord;
const Station *st;
TileIndex tile;
@@ -3584,7 +3583,7 @@ static void AiStateRemoveStation(Player *p)
p->ai.state = AIS_1;
// Get a list of all stations that are in use by a vehicle
MallocT(&in_use, GetMaxStationIndex() + 1);
byte *in_use = MallocT<byte>(GetMaxStationIndex() + 1);
memset(in_use, 0, GetMaxStationIndex() + 1);
FOR_ALL_ORDERS(ord) {
if (ord->type == OT_GOTO_STATION) in_use[ord->dest] = 1;