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

(svn r20664) -Codechange: implement the land slope callback for objects

Browse Source
This commit is contained in:
rubidium 2010-08-28 18:55:20 +00:00
parent 9991c8677d
commit ca7fe458a2
2 changed files with 39 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/newgrf_callbacks.h
View File

@ -253,7 +253,7 @@ enum CallbackID {
CBID_AIRPORT_LAYOUT_NAME = 0x156, // 15 bit callback
/** Callback done for each tile of an object to check the slope. */
CBID_OBJECT_LAND_SLOPE_CHECK = 0x157, // 15 bit callback, not implemented
CBID_OBJECT_LAND_SLOPE_CHECK = 0x157, // 15 bit callback
/** Determine the next animation frame for a house. */
CBID_OBJECT_ANIMATION_NEXT_FRAME = 0x158, // 15 bit callback

41
src/object_cmd.cpp
View File

@ -127,7 +127,7 @@ void UpdateCompanyHQ(TileIndex tile, uint score)
}
}
extern CommandCost CheckFlatLand(TileArea tile_area, DoCommandFlag flags);
extern CommandCost CheckBuildableTile(TileIndex tile, uint invalid_dirs, int &allowed_z);
static CommandCost ClearTile_Object(TileIndex tile, DoCommandFlag flags);
/**
@ -161,7 +161,37 @@ CommandCost CmdBuildObject(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3
/* Owned land is special as it can be placed on any slope. */
cost.AddCost(DoCommand(tile, 0, 0, flags, CMD_LANDSCAPE_CLEAR));
} else {
cost.AddCost(CheckFlatLand(ta, flags));
/* Check the surface to build on. */
bool allow_water = (spec->flags & OBJECT_FLAG_BUILT_ON_WATER) != 0;
bool allow_ground = (spec->flags & OBJECT_FLAG_NOT_ON_LAND) == 0;
TILE_AREA_LOOP(t, ta) {
if (IsWaterTile(t)) {
if (!allow_water) return_cmd_error(STR_ERROR_CAN_T_BUILD_ON_WATER);
/* For water tiles we want to "just" check whether the tile is water and
* can be cleared, i.e. it's not filled. We won't be paying though. */
CommandCost ret = DoCommand(t, 0, 0, flags & ~(DC_EXEC | DC_NO_WATER), CMD_LANDSCAPE_CLEAR);
if (ret.Failed()) return ret;
} else {
if (!allow_ground) return_cmd_error(STR_ERROR_MUST_BE_BUILT_ON_WATER);
/* For non-water tiles, we'll have to clear it before building. */
cost.AddCost(DoCommand(t, 0, 0, flags, CMD_LANDSCAPE_CLEAR));
}
}
/* So, now the surface is checked... check the slope of said surface. */
if (spec->callback_mask & CBM_OBJ_SLOPE_CHECK) {
TILE_AREA_LOOP(t, ta) {
TileIndex diff = t - tile;
uint16 callback = GetObjectCallback(CBID_OBJECT_LAND_SLOPE_CHECK, GetTileSlope(t, NULL), TileY(diff) << 4 | TileX(diff), spec, NULL, t);
if (callback != 0) return_cmd_error(STR_ERROR_LAND_SLOPED_IN_WRONG_DIRECTION);
}
} else {
/* Check whether the ground is flat enough. */
int allowed_z = -1;
TILE_AREA_LOOP(t, ta) {
cost.AddCost(CheckBuildableTile(t, 0, allowed_z));
}
}
}
if (cost.Failed()) return cost;
@ -197,7 +227,12 @@ CommandCost CmdBuildObject(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3
break;
}
default: break;
case OBJECT_STATUE:
/* This may never be constructed using this method. */
return CMD_ERROR;
default: // i.e. NewGRF provided.
break;
}
if (flags & DC_EXEC) {