Files
@ r27443:1150c64644d0
Branch filter:
Location: cpp/openttd-patchpack/source/src/newgrf_canal.cpp - annotation
r27443:1150c64644d0
6.0 KiB
text/x-c
Fix: Check max member count in squirrel classes (#10883)
Manual cherry-pick from https://github.com/albertodemichelis/squirrel/commit/23a0620658714b996d20da3d4dd1a0dcf9b0bd98
Manual cherry-pick from https://github.com/albertodemichelis/squirrel/commit/23a0620658714b996d20da3d4dd1a0dcf9b0bd98
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 | r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r9111:983de9c5a848 r9111:983de9c5a848 r6583:63b4cb964287 r6583:63b4cb964287 r6583:63b4cb964287 r6583:63b4cb964287 r20229:c02a750a3deb r8368:229f823c854a r24069:49625df81342 r6583:63b4cb964287 r21383:942c32fb8b0e r21383:942c32fb8b0e r6583:63b4cb964287 r8372:59d73d58fc53 r6583:63b4cb964287 r19738:837a139219f0 r19725:ed67f99e3455 r19738:837a139219f0 r6583:63b4cb964287 r22756:8ffd1846f871 r22756:8ffd1846f871 r22756:8ffd1846f871 r22756:8ffd1846f871 r19725:ed67f99e3455 r23497:a0ab44ebd2fa r23497:a0ab44ebd2fa r19725:ed67f99e3455 r19725:ed67f99e3455 r19725:ed67f99e3455 r19725:ed67f99e3455 r19725:ed67f99e3455 r24069:49625df81342 r19725:ed67f99e3455 r21299:8973364c4b52 r19725:ed67f99e3455 r19725:ed67f99e3455 r23497:a0ab44ebd2fa r19725:ed67f99e3455 r19725:ed67f99e3455 r19725:ed67f99e3455 r19737:d7c69e3b4bd4 r19725:ed67f99e3455 r19725:ed67f99e3455 r19725:ed67f99e3455 r24069:49625df81342 r24069:49625df81342 r19725:ed67f99e3455 r19725:ed67f99e3455 r19725:ed67f99e3455 r6583:63b4cb964287 r8471:0c8cd6eb92d6 r19725:ed67f99e3455 r6583:63b4cb964287 r6583:63b4cb964287 r19725:ed67f99e3455 r6583:63b4cb964287 r6583:63b4cb964287 r11297:fb7ba0ef18bc r16999:6b6eac34f8c2 r19725:ed67f99e3455 r16999:6b6eac34f8c2 r19725:ed67f99e3455 r16999:6b6eac34f8c2 r16999:6b6eac34f8c2 r6583:63b4cb964287 r11297:fb7ba0ef18bc r19725:ed67f99e3455 r8368:229f823c854a r20229:c02a750a3deb r20229:c02a750a3deb r20229:c02a750a3deb r20229:c02a750a3deb r20229:c02a750a3deb r20229:c02a750a3deb r20229:c02a750a3deb r20229:c02a750a3deb r20229:c02a750a3deb r20229:c02a750a3deb r20229:c02a750a3deb r20229:c02a750a3deb r20229:c02a750a3deb r20229:c02a750a3deb r20229:c02a750a3deb r20229:c02a750a3deb r20229:c02a750a3deb r20229:c02a750a3deb r20229:c02a750a3deb r20229:c02a750a3deb r20229:c02a750a3deb r20229:c02a750a3deb r20229:c02a750a3deb r11297:fb7ba0ef18bc r19725:ed67f99e3455 r6583:63b4cb964287 r6583:63b4cb964287 r25655:1030dcb7eb52 r6583:63b4cb964287 r6583:63b4cb964287 r11163:407814b6138f r6583:63b4cb964287 r6583:63b4cb964287 r24069:49625df81342 r24069:49625df81342 r24069:49625df81342 r24069:49625df81342 r24069:49625df81342 r24069:49625df81342 r24069:49625df81342 r24069:49625df81342 r24069:49625df81342 r24069:49625df81342 r19725:ed67f99e3455 r19738:837a139219f0 r21299:8973364c4b52 r19725:ed67f99e3455 r19738:837a139219f0 r19738:837a139219f0 r19738:837a139219f0 r19725:ed67f99e3455 r21299:8973364c4b52 r19725:ed67f99e3455 r24069:49625df81342 r19725:ed67f99e3455 r21299:8973364c4b52 r19725:ed67f99e3455 r6583:63b4cb964287 r17138:5078c9240593 r17138:5078c9240593 r17138:5078c9240593 r17138:5078c9240593 r19725:ed67f99e3455 r17138:5078c9240593 r6583:63b4cb964287 r6583:63b4cb964287 r21299:8973364c4b52 r21299:8973364c4b52 r23607:36c15679007d r6583:63b4cb964287 r11985:d8202dea2203 r6583:63b4cb964287 r15677:fa81b10db8cc r15677:fa81b10db8cc r15677:fa81b10db8cc r15677:fa81b10db8cc r15677:fa81b10db8cc r15677:fa81b10db8cc r15677:fa81b10db8cc r15677:fa81b10db8cc r19725:ed67f99e3455 r15677:fa81b10db8cc r15991:9b390068ea00 r15677:fa81b10db8cc r21299:8973364c4b52 r21299:8973364c4b52 r15677:fa81b10db8cc r15677:fa81b10db8cc r15677:fa81b10db8cc r15677:fa81b10db8cc r15677:fa81b10db8cc r15677:fa81b10db8cc r15677:fa81b10db8cc r15677:fa81b10db8cc r15677:fa81b10db8cc r15677:fa81b10db8cc r15677:fa81b10db8cc r15677:fa81b10db8cc r15677:fa81b10db8cc r15677:fa81b10db8cc r15677:fa81b10db8cc r15677:fa81b10db8cc r15677:fa81b10db8cc | /*
* This file is part of OpenTTD.
* OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
* OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
* See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
*/
/** @file newgrf_canal.cpp Implementation of NewGRF canals. */
#include "stdafx.h"
#include "debug.h"
#include "newgrf_spritegroup.h"
#include "newgrf_canal.h"
#include "water.h"
#include "water_map.h"
#include "spritecache.h"
#include "safeguards.h"
/** Table of canal 'feature' sprite groups */
WaterFeature _water_feature[CF_END];
/** Scope resolver of a canal tile. */
struct CanalScopeResolver : public ScopeResolver {
TileIndex tile; ///< Tile containing the canal.
CanalScopeResolver(ResolverObject &ro, TileIndex tile)
: ScopeResolver(ro), tile(tile)
{
}
uint32 GetRandomBits() const override;
uint32 GetVariable(byte variable, uint32 parameter, bool *available) const override;
};
/** Resolver object for canals. */
struct CanalResolverObject : public ResolverObject {
CanalScopeResolver canal_scope;
CanalFeature feature;
CanalResolverObject(CanalFeature feature, TileIndex tile,
CallbackID callback = CBID_NO_CALLBACK, uint32 callback_param1 = 0, uint32 callback_param2 = 0);
ScopeResolver *GetScope(VarSpriteGroupScope scope = VSG_SCOPE_SELF, byte relative = 0) override
{
switch (scope) {
case VSG_SCOPE_SELF: return &this->canal_scope;
default: return ResolverObject::GetScope(scope, relative);
}
}
GrfSpecFeature GetFeature() const override;
uint32 GetDebugID() const override;
};
/* virtual */ uint32 CanalScopeResolver::GetRandomBits() const
{
/* Return random bits only for water tiles, not station tiles */
return IsTileType(this->tile, MP_WATER) ? GetWaterTileRandomBits(this->tile) : 0;
}
/* virtual */ uint32 CanalScopeResolver::GetVariable(byte variable, uint32 parameter, bool *available) const
{
switch (variable) {
/* Height of tile */
case 0x80: {
int z = GetTileZ(this->tile);
/* Return consistent height within locks */
if (IsTileType(this->tile, MP_WATER) && IsLock(this->tile) && GetLockPart(this->tile) == LOCK_PART_UPPER) z--;
return z;
}
/* Terrain type */
case 0x81: return GetTerrainType(this->tile);
/* Dike map: Connectivity info for river and canal tiles
*
* Assignment of bits to directions defined in agreement with
* http://projects.tt-forums.net/projects/ttdpatch/repository/revisions/2367/entry/trunk/patches/water.asm#L879
* 7
* 3 0
* 6 * 4
* 2 1
* 5
*/
case 0x82: {
uint32 connectivity =
(!IsWateredTile(TILE_ADDXY(tile, -1, 0), DIR_SW) << 0) // NE
+ (!IsWateredTile(TILE_ADDXY(tile, 0, 1), DIR_NW) << 1) // SE
+ (!IsWateredTile(TILE_ADDXY(tile, 1, 0), DIR_NE) << 2) // SW
+ (!IsWateredTile(TILE_ADDXY(tile, 0, -1), DIR_SE) << 3) // NW
+ (!IsWateredTile(TILE_ADDXY(tile, -1, 1), DIR_W) << 4) // E
+ (!IsWateredTile(TILE_ADDXY(tile, 1, 1), DIR_N) << 5) // S
+ (!IsWateredTile(TILE_ADDXY(tile, 1, -1), DIR_E) << 6) // W
+ (!IsWateredTile(TILE_ADDXY(tile, -1, -1), DIR_S) << 7); // N
return connectivity;
}
/* Random data for river or canal tiles, otherwise zero */
case 0x83: return IsTileType(this->tile, MP_WATER) ? GetWaterTileRandomBits(this->tile) : 0;
}
Debug(grf, 1, "Unhandled canal variable 0x{:02X}", variable);
*available = false;
return UINT_MAX;
}
GrfSpecFeature CanalResolverObject::GetFeature() const
{
return GSF_CANALS;
}
uint32 CanalResolverObject::GetDebugID() const
{
return this->feature;
}
/**
* Canal resolver constructor.
* @param feature Which canal feature we want.
* @param tile Tile index of canal.
* @param callback Callback ID.
* @param callback_param1 First parameter (var 10) of the callback.
* @param callback_param2 Second parameter (var 18) of the callback.
*/
CanalResolverObject::CanalResolverObject(CanalFeature feature, TileIndex tile,
CallbackID callback, uint32 callback_param1, uint32 callback_param2)
: ResolverObject(_water_feature[feature].grffile, callback, callback_param1, callback_param2), canal_scope(*this, tile), feature(feature)
{
this->root_spritegroup = _water_feature[feature].group;
}
/**
* Lookup the base sprite to use for a canal.
* @param feature Which canal feature we want.
* @param tile Tile index of canal, if appropriate.
* @return Base sprite returned by GRF, or \c 0 if none.
*/
SpriteID GetCanalSprite(CanalFeature feature, TileIndex tile)
{
CanalResolverObject object(feature, tile);
const SpriteGroup *group = object.Resolve();
if (group == nullptr) return 0;
return group->GetResult();
}
/**
* Run a specific callback for canals.
* @param callback Callback ID.
* @param param1 Callback parameter 1.
* @param param2 Callback parameter 2.
* @param feature For which feature to run the callback.
* @param tile Tile index of canal.
* @return Callback result or #CALLBACK_FAILED if the callback failed.
*/
static uint16 GetCanalCallback(CallbackID callback, uint32 param1, uint32 param2, CanalFeature feature, TileIndex tile)
{
CanalResolverObject object(feature, tile, callback, param1, param2);
return object.ResolveCallback();
}
/**
* Get the new sprite offset for a water tile.
* @param tile Tile index of the canal/water tile.
* @param feature For which feature to get the new sprite offset.
* @param cur_offset Current sprite offset.
* @return New sprite offset.
*/
uint GetCanalSpriteOffset(CanalFeature feature, TileIndex tile, uint cur_offset)
{
if (HasBit(_water_feature[feature].callback_mask, CBM_CANAL_SPRITE_OFFSET)) {
uint16 cb = GetCanalCallback(CBID_CANALS_SPRITE_OFFSET, cur_offset, 0, feature, tile);
if (cb != CALLBACK_FAILED) return cur_offset + cb;
}
return cur_offset;
}
|