mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r6149) -Codechange: DeleteTown removes a town from the pool 

-Codechange: DestroyTown is called by DeleteTown to remove all things where a town depends on.
  Last 2 changes to prepare for new pool system. Not pretty now, will be soon.
release/0.5
truelight 2006-08-26 18:05:05 +00:00
parent b7ecdc85d8
commit bb9f29ae1f
2 changed files with 45 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
town.h
View File

@ -81,7 +81,6 @@ uint32 GetWorldPopulation(void);
void UpdateTownVirtCoord(Town *t); void UpdateTownVirtCoord(Town *t);
void InitializeTown(void); void InitializeTown(void);
void ShowTownViewWindow(TownID town); void ShowTownViewWindow(TownID town);
void DeleteTown(Town *t);
void ExpandTown(Town *t); void ExpandTown(Town *t);
Town *CreateRandomTown(uint attempts, uint size_mode); Town *CreateRandomTown(uint attempts, uint size_mode);
@ -218,6 +217,14 @@ static inline bool IsValidTownID(uint index)
return index < GetTownPoolSize() && IsValidTown(GetTown(index)); return index < GetTownPoolSize() && IsValidTown(GetTown(index));
} }
void DestroyTown(Town *t);
static inline void DeleteTown(Town *t)
{
DestroyTown(t);
t->xy = 0;
}
#define FOR_ALL_TOWNS_FROM(t, start) for (t = GetTown(start); t != NULL; t = (t->index + 1 < GetTownPoolSize()) ? GetTown(t->index + 1) : NULL) if (IsValidTown(t)) #define FOR_ALL_TOWNS_FROM(t, start) for (t = GetTown(start); t != NULL; t = (t->index + 1 < GetTownPoolSize()) ? GetTown(t->index + 1) : NULL) if (IsValidTown(t))
#define FOR_ALL_TOWNS(t) FOR_ALL_TOWNS_FROM(t, 0) #define FOR_ALL_TOWNS(t) FOR_ALL_TOWNS_FROM(t, 0)

79
town_cmd.c
View File

@ -51,6 +51,43 @@ static void TownPoolNewBlock(uint start_item)
/* Initialize the town-pool */ /* Initialize the town-pool */
MemoryPool _town_pool = { "Towns", TOWN_POOL_MAX_BLOCKS, TOWN_POOL_BLOCK_SIZE_BITS, sizeof(Town), &TownPoolNewBlock, NULL, 0, 0, NULL }; MemoryPool _town_pool = { "Towns", TOWN_POOL_MAX_BLOCKS, TOWN_POOL_BLOCK_SIZE_BITS, sizeof(Town), &TownPoolNewBlock, NULL, 0, 0, NULL };
void DestroyTown(Town *t)
{
Industry *i;
TileIndex tile;
/* Delete town authority window
* and remove from list of sorted towns */
DeleteWindowById(WC_TOWN_VIEW, t->index);
_town_sort_dirty = true;
/* Delete all industries belonging to the town */
FOR_ALL_INDUSTRIES(i) if (i->town == t) DeleteIndustry(i);
/* Go through all tiles and delete those belonging to the town */
for (tile = 0; tile < MapSize(); ++tile) {
switch (GetTileType(tile)) {
case MP_HOUSE:
if (GetTownByTile(tile) == t) DoCommand(tile, 0, 0, DC_EXEC, CMD_LANDSCAPE_CLEAR);
break;
case MP_STREET:
case MP_TUNNELBRIDGE:
if (IsTileOwner(tile, OWNER_TOWN) &&
ClosestTownFromTile(tile, (uint)-1) == t)
DoCommand(tile, 0, 0, DC_EXEC, CMD_LANDSCAPE_CLEAR);
break;
default:
break;
}
}
DeleteName(t->townnametype);
MarkWholeScreenDirty();
}
// Local // Local
static int _grow_town_result; static int _grow_town_result;
@ -1362,48 +1399,6 @@ int32 CmdRenameTown(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
return 0; return 0;
} }
// Called from GUI
void DeleteTown(Town *t)
{
Industry *i;
TileIndex tile;
// Delete town authority window
// and remove from list of sorted towns
DeleteWindowById(WC_TOWN_VIEW, t->index);
_town_sort_dirty = true;
// Delete all industries belonging to the town
FOR_ALL_INDUSTRIES(i) {
if (i->town == t) DeleteIndustry(i);
}
// Go through all tiles and delete those belonging to the town
for (tile = 0; tile < MapSize(); ++tile) {
switch (GetTileType(tile)) {
case MP_HOUSE:
if (GetTownByTile(tile) == t)
DoCommand(tile, 0, 0, DC_EXEC, CMD_LANDSCAPE_CLEAR);
break;
case MP_STREET:
case MP_TUNNELBRIDGE:
if (IsTileOwner(tile, OWNER_TOWN) &&
ClosestTownFromTile(tile, (uint)-1) == t)
DoCommand(tile, 0, 0, DC_EXEC, CMD_LANDSCAPE_CLEAR);
break;
default:
break;
}
}
t->xy = 0;
DeleteName(t->townnametype);
MarkWholeScreenDirty();
}
// Called from GUI // Called from GUI
void ExpandTown(Town *t) void ExpandTown(Town *t)
{ {