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

(svn r15350) -Codechange: Create a spec array to hold the data definitions of unmovables objects.

Browse Source 
Note that this is the very basic spec, it will be populated a bit more, later.
This commit is contained in:
belugas 2009-02-05 03:41:42 +00:00
parent 63cc1bd21f
commit bf82545b4a
3 changed files with 33 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/table/unmovable_land.h
View File

@ -92,3 +92,11 @@ static const DrawTileSprites _unmovable_display_datas[] = {
}; };
#undef TILE_SPRITE_LINE #undef TILE_SPRITE_LINE
static const UnmovableSpec _original_unmovable[] = {
{STR_5801_TRANSMITTER, 1, 1},
{STR_5802_LIGHTHOUSE, 1, 1},
{STR_2016_STATUE, 1, 1},
{STR_5805_COMPANY_OWNED_LAND, 10, 2},
{STR_5803_COMPANY_HEADQUARTERS, 1, 1},
};

21
src/unmovable.h
View File

@ -5,6 +5,27 @@
#ifndef UNMOVABLE_H #ifndef UNMOVABLE_H
#define UNMOVABLE_H #define UNMOVABLE_H
#include "unmovable_map.h"
#include "economy_type.h"
#include "economy_func.h"
void UpdateCompanyHQ(Company *c, uint score); void UpdateCompanyHQ(Company *c, uint score);
struct UnmovableSpec {
StringID name;
uint8 buy_cost_multiplier;
uint8 sell_cost_multiplier;
Money GetRemovalCost() const { return (_price.clear_roughland * this->sell_cost_multiplier); }
Money GetBuildingCost() const { return (_price.clear_roughland * this->buy_cost_multiplier); }
};
extern const UnmovableSpec _original_unmovable[];
static inline const UnmovableSpec *GetUnmovableSpec(UnmovableType type)
{
return &_original_unmovable[type];
}
#endif /* UNMOVABLE_H */ #endif /* UNMOVABLE_H */

13
src/unmovable_cmd.cpp
View File

@ -22,6 +22,7 @@
#include "economy_func.h" #include "economy_func.h"
#include "cheat_type.h" #include "cheat_type.h"
#include "landscape_type.h" #include "landscape_type.h"
#include "unmovable.h"
#include "table/strings.h" #include "table/strings.h"
#include "table/sprites.h" #include "table/sprites.h"
@ -132,7 +133,7 @@ CommandCost CmdPurchaseLandArea(TileIndex tile, uint32 flags, uint32 p1, uint32
MarkTileDirtyByTile(tile); MarkTileDirtyByTile(tile);
} }
return cost.AddCost(_price.clear_roughland * 10); return cost.AddCost(GetUnmovableSpec(UNMOVABLE_OWNED_LAND)->GetBuildingCost());
} }
/** Sell a land area. Actually you only sell one tile, so /** Sell a land area. Actually you only sell one tile, so
@ -152,7 +153,7 @@ CommandCost CmdSellLandArea(TileIndex tile, uint32 flags, uint32 p1, uint32 p2,
if (flags & DC_EXEC) DoClearSquare(tile); if (flags & DC_EXEC) DoClearSquare(tile);
return CommandCost(EXPENSES_CONSTRUCTION, - _price.clear_roughland * 2); return CommandCost(EXPENSES_CONSTRUCTION, - GetUnmovableSpec(UNMOVABLE_OWNED_LAND)->GetRemovalCost());
} }
static Foundation GetFoundation_Unmovable(TileIndex tile, Slope tileh); static Foundation GetFoundation_Unmovable(TileIndex tile, Slope tileh);
@ -300,13 +301,7 @@ static void GetAcceptedCargo_Unmovable(TileIndex tile, AcceptedCargo ac)
static void GetTileDesc_Unmovable(TileIndex tile, TileDesc *td) static void GetTileDesc_Unmovable(TileIndex tile, TileDesc *td)
{ {
switch (GetUnmovableType(tile)) { td->str = GetUnmovableSpec(GetUnmovableType(tile))->name;
case UNMOVABLE_TRANSMITTER: td->str = STR_5801_TRANSMITTER; break;
case UNMOVABLE_LIGHTHOUSE: td->str = STR_5802_LIGHTHOUSE; break;
case UNMOVABLE_STATUE: td->str = STR_2016_STATUE; break;
case UNMOVABLE_OWNED_LAND: td->str = STR_5805_COMPANY_OWNED_LAND; break;
default: td->str = STR_5803_COMPANY_HEADQUARTERS; break;
}
td->owner[0] = GetTileOwner(tile); td->owner[0] = GetTileOwner(tile);
} }