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

(svn r17540) -Codechange: move functionality of PlaceProc_Town() to FoundTownWindow::OnPlaceObject()

release/1.0
smatz 2009-09-14 20:40:07 +00:00
parent bc8557d5c0
commit 95dd198053
1 changed files with 27 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
src/town_gui.cpp
View File

@ -874,32 +874,33 @@ static const NWidgetPart _nested_found_town_widgets[] = {
}; };
/** Found a town window class. */ /** Found a town window class. */
struct FoundTownWindow : Window struct FoundTownWindow : Window {
{
private: private:
static TownSize town_size; TownSize town_size; ///< Selected town size
static bool city; TownLayout town_layout; ///< Selected town layout
static TownLayout town_layout; bool city; ///< Are we building a city?
public: public:
FoundTownWindow(const WindowDesc *desc, WindowNumber window_number) : Window() FoundTownWindow(const WindowDesc *desc, WindowNumber window_number) :
Window(),
town_size(TS_MEDIUM),
town_layout(_settings_game.economy.town_layout),
city(false)
{ {
this->InitNested(desc, window_number); this->InitNested(desc, window_number);
town_layout = _settings_game.economy.town_layout;
city = false;
this->UpdateButtons(); this->UpdateButtons();
} }
void UpdateButtons() void UpdateButtons()
{ {
for (int i = TSEW_SIZE_SMALL; i <= TSEW_SIZE_RANDOM; i++) { for (int i = TSEW_SIZE_SMALL; i <= TSEW_SIZE_RANDOM; i++) {
this->SetWidgetLoweredState(i, i == TSEW_SIZE_SMALL + town_size); this->SetWidgetLoweredState(i, i == TSEW_SIZE_SMALL + this->town_size);
} }
this->SetWidgetLoweredState(TSEW_CITY, city); this->SetWidgetLoweredState(TSEW_CITY, this->city);
for (int i = TSEW_LAYOUT_ORIGINAL; i <= TSEW_LAYOUT_RANDOM; i++) { for (int i = TSEW_LAYOUT_ORIGINAL; i <= TSEW_LAYOUT_RANDOM; i++) {
this->SetWidgetLoweredState(i, i == TSEW_LAYOUT_ORIGINAL + town_layout); this->SetWidgetLoweredState(i, i == TSEW_LAYOUT_ORIGINAL + this->town_layout);
} }
this->SetDirty(); this->SetDirty();
@ -914,14 +915,14 @@ public:
{ {
switch (widget) { switch (widget) {
case TSEW_NEWTOWN: case TSEW_NEWTOWN:
HandlePlacePushButton(this, TSEW_NEWTOWN, SPR_CURSOR_TOWN, HT_RECT, PlaceProc_Town); HandlePlacePushButton(this, TSEW_NEWTOWN, SPR_CURSOR_TOWN, HT_RECT, NULL);
break; break;
case TSEW_RANDOMTOWN: { case TSEW_RANDOMTOWN: {
this->HandleButtonClick(TSEW_RANDOMTOWN); this->HandleButtonClick(TSEW_RANDOMTOWN);
_generating_world = true; _generating_world = true;
UpdateNearestTownForRoadTiles(true); UpdateNearestTownForRoadTiles(true);
const Town *t = CreateRandomTown(20, town_size, city, town_layout); const Town *t = CreateRandomTown(20, this->town_size, this->city, this->town_layout);
UpdateNearestTownForRoadTiles(false); UpdateNearestTownForRoadTiles(false);
_generating_world = false; _generating_world = false;
@ -937,7 +938,7 @@ public:
_generating_world = true; _generating_world = true;
UpdateNearestTownForRoadTiles(true); UpdateNearestTownForRoadTiles(true);
if (!GenerateTowns(town_layout)) { if (!GenerateTowns(this->town_layout)) {
ShowErrorMessage(STR_ERROR_NO_SPACE_FOR_TOWN, STR_ERROR_CAN_T_GENERATE_TOWN, 0, 0); ShowErrorMessage(STR_ERROR_NO_SPACE_FOR_TOWN, STR_ERROR_CAN_T_GENERATE_TOWN, 0, 0);
} }
UpdateNearestTownForRoadTiles(false); UpdateNearestTownForRoadTiles(false);
@ -945,19 +946,19 @@ public:
break; break;
case TSEW_SIZE_SMALL: case TSEW_SIZE_MEDIUM: case TSEW_SIZE_LARGE: case TSEW_SIZE_RANDOM: case TSEW_SIZE_SMALL: case TSEW_SIZE_MEDIUM: case TSEW_SIZE_LARGE: case TSEW_SIZE_RANDOM:
town_size = (TownSize)(widget - TSEW_SIZE_SMALL); this->town_size = (TownSize)(widget - TSEW_SIZE_SMALL);
this->UpdateButtons(); this->UpdateButtons();
break; break;
case TSEW_CITY: case TSEW_CITY:
city ^= true; this->city ^= true;
this->SetWidgetLoweredState(TSEW_CITY, city); this->SetWidgetLoweredState(TSEW_CITY, this->city);
this->SetDirty(); this->SetDirty();
break; break;
case TSEW_LAYOUT_ORIGINAL: case TSEW_LAYOUT_BETTER: case TSEW_LAYOUT_GRID2: case TSEW_LAYOUT_ORIGINAL: case TSEW_LAYOUT_BETTER: case TSEW_LAYOUT_GRID2:
case TSEW_LAYOUT_GRID3: case TSEW_LAYOUT_RANDOM: case TSEW_LAYOUT_GRID3: case TSEW_LAYOUT_RANDOM:
town_layout = (TownLayout)(widget - TSEW_LAYOUT_ORIGINAL); this->town_layout = (TownLayout)(widget - TSEW_LAYOUT_ORIGINAL);
this->UpdateButtons(); this->UpdateButtons();
break; break;
} }
@ -972,7 +973,14 @@ public:
virtual void OnPlaceObject(Point pt, TileIndex tile) virtual void OnPlaceObject(Point pt, TileIndex tile)
{ {
_place_proc(tile); uint32 townnameparts;
if (!GenerateTownName(&townnameparts)) {
ShowErrorMessage(STR_ERROR_TOO_MANY_TOWNS, STR_ERROR_CAN_T_BUILD_TOWN_HERE, 0, 0);
return;
}
DoCommandP(tile, this->town_size | this->city << 2 | this->town_layout << 3, townnameparts,
CMD_BUILD_TOWN | CMD_MSG(STR_ERROR_CAN_T_BUILD_TOWN_HERE), CcBuildTown);
} }
virtual void OnPlaceObjectAbort() virtual void OnPlaceObjectAbort()
@ -980,23 +988,8 @@ public:
this->RaiseButtons(); this->RaiseButtons();
this->UpdateButtons(); this->UpdateButtons();
} }
static void PlaceProc_Town(TileIndex tile)
{
uint32 townnameparts;
if (!GenerateTownName(&townnameparts)) {
ShowErrorMessage(STR_ERROR_TOO_MANY_TOWNS, STR_ERROR_CAN_T_BUILD_TOWN_HERE, 0, 0);
return;
}
DoCommandP(tile, town_size | city << 2 | town_layout << 3, townnameparts, CMD_BUILD_TOWN | CMD_MSG(STR_ERROR_CAN_T_BUILD_TOWN_HERE), CcBuildTown);
}
}; };
TownSize FoundTownWindow::town_size = TS_MEDIUM; // select medium-sized towns per default;
bool FoundTownWindow::city;
TownLayout FoundTownWindow::town_layout;
static const WindowDesc _found_town_desc( static const WindowDesc _found_town_desc(
WDP_AUTO, WDP_AUTO, 160, 162, 160, 162, WDP_AUTO, WDP_AUTO, 160, 162, 160, 162,
WC_FOUND_TOWN, WC_NONE, WC_FOUND_TOWN, WC_NONE,