petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

(svn r20482) -Codechange: move some object related information off the map and unify the relation objects have to towns

Browse Source
This commit is contained in:
rubidium
2010-08-13 12:45:26 +00:00
parent c5ec910980
commit 89b2b9370a
17 changed files with 266 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/town_cmd.cpp
View File

@@ -48,6 +48,7 @@
#include "core/backup_type.hpp"
#include "depot_base.h"
#include "object_map.h"
#include "object_base.h"
#include "table/strings.h"
#include "table/town_land.h"
@@ -71,9 +72,13 @@ Town::~Town()
DeleteWindowById(WC_TOWN_VIEW, this->index);
/* Check no industry is related to us. */
Industry *i;
const Industry *i;
FOR_ALL_INDUSTRIES(i) assert(i->town != this);
/* ... and no object is related to us. */
const Object *o;
FOR_ALL_OBJECTS(o) assert(o->town != this);
/* Check no tile is related to us. */
for (TileIndex tile = 0; tile < MapSize(); ++tile) {
switch (GetTileType(tile)) {
@@ -89,10 +94,6 @@ Town::~Town()
assert(!IsTileOwner(tile, OWNER_TOWN) || ClosestTownFromTile(tile, UINT_MAX) != this);
break;
case MP_OBJECT:
assert(GetObjectType(tile) != OBJECT_STATUE || GetStatueTownID(tile) != this->index);
break;
default:
break;
}
@@ -114,6 +115,12 @@ void Town::PostDestructor(size_t index)
{
InvalidateWindowData(WC_TOWN_DIRECTORY, 0, 0);
UpdateNearestTownForRoadTiles(false);
/* Give objects a new home! */
Object *o;
FOR_ALL_OBJECTS(o) {
if (o->town == NULL) o->town = CalcClosestTownFromTile(o->location.tile, UINT_MAX);
}
}
/**
@@ -2403,7 +2410,21 @@ CommandCost CmdDeleteTown(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32
break;
case MP_OBJECT:
try_clear = GetObjectType(tile) == OBJECT_STATUE && GetStatueTownID(tile) == t->index;
if (Town::GetNumItems() == 1) {
/* No towns will be left, remove it! */
try_clear = true;
} else {
Object *o = Object::GetByTile(tile);
if (o->town == t) {
if (GetObjectType(tile) == OBJECT_STATUE) {
/* Statue... always remove. */
try_clear = true;
} else {
/* Tell to find a new town. */
o->town = NULL;
}
}
}
break;
default: