mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-28 01:04:50 +01:00
Code Issues Releases Wiki Activity

Expose surface element properties

Browse Source
This commit is contained in:
Hielke Morsink
2018-08-11 16:54:13 +02:00
committed by Ted John
parent e8bdb95f13
commit bec9c4da65
2 changed files with 98 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/openrct2/scripting/ScThing.hpp
View File

@@ -36,18 +36,35 @@ namespace OpenRCT2::Scripting
return "unknown";
}
// x getter and setter
int32_t x_get()
{
return _sprite->unknown.x;
}
void x_set(int32_t value)
{
_sprite->unknown.x = value;
}
// y getter and setter
int32_t y_get()
{
return _sprite->unknown.y;
}
int32_t z_get()
void y_set(int32_t value)
{
_sprite->unknown.y = value;
}
// z getter and setter
int16_t z_get()
{
return _sprite->unknown.z;
}
void z_set(int16_t value)
{
_sprite->unknown.z = value;
}
uint8_t tshirtColour_get()
{
@@ -66,12 +83,21 @@ namespace OpenRCT2::Scripting
_sprite->peep.trousers_colour = value;
}
template<typename T> static void dukglue_property_helper(duk_context* ctx, T& var, const char* name)
{
auto getter = []() -> const T { return var; };
auto setter = [&var](T& value) -> void { var = value; };
dukglue_register_property(ctx, getter, setter, name);
}
static void Register(duk_context* ctx)
{
dukglue_register_constructor<ScThing, rct_sprite*>(ctx, "Thing");
dukglue_register_property(ctx, &ScThing::type_get, nullptr, "type");
dukglue_register_property(ctx, &ScThing::x_get, nullptr, "x");
dukglue_register_property(ctx, &ScThing::y_get, nullptr, "y");
dukglue_register_property(ctx, &ScThing::z_get, nullptr, "z");
dukglue_register_property(ctx, &ScThing::x_get, &ScThing::x_set, "x");
//dukglue_property_helper(ctx, _sprite->peep.x, "x");
dukglue_register_property(ctx, &ScThing::y_get, &ScThing::y_set, "y");
dukglue_register_property(ctx, &ScThing::z_get, &ScThing::z_set, "z");
dukglue_register_property(ctx, &ScThing::tshirtColour_get, &ScThing::tshirtColour_set, "tshirtColour");
dukglue_register_property(ctx, &ScThing::trousersColour_get, &ScThing::trousersColour_set, "trousersColour");
}

68
src/openrct2/scripting/ScTile.hpp
View File

@@ -11,6 +11,7 @@
#include "../common.h"
#include "../world/Sprite.h"
#include "../world/Surface.h"
#include <cstdio>
#include <dukglue/dukglue.h>
@@ -100,10 +101,77 @@ namespace OpenRCT2::Scripting
class ScSurfaceElement final : public ScTileElement
{
uint8_t slope_get()
{
return _element->properties.surface.slope & TILE_ELEMENT_SURFACE_SLOPE_MASK;
}
void slope_set(uint8_t value)
{
// TODO: Give warning when value > TILE_ELEMENT_SURFACE_SLOPE_MASK
_element->properties.surface.slope &= ~TILE_ELEMENT_SURFACE_SLOPE_MASK;
_element->properties.surface.slope |= value & TILE_ELEMENT_SURFACE_SLOPE_MASK;
}
uint8_t terrain_get()
{
return surface_get_terrain(_element);
}
void terrain_set(uint8_t value)
{
surface_set_terrain(_element, value);
}
uint8_t waterHeight_get()
{
return surface_get_water_height(_element);
}
void waterHeight_set(uint8_t value)
{
// TODO: Give warning when value > TILE_ELEMENT_SURFACE_WATER_HEIGHT_MASK
_element->properties.surface.terrain &= ~TILE_ELEMENT_SURFACE_WATER_HEIGHT_MASK;
_element->properties.surface.terrain |= value & TILE_ELEMENT_SURFACE_WATER_HEIGHT_MASK;
}
uint8_t grassLength_get()
{
return _element->properties.surface.grass_length;
}
void grassLength_set(uint8_t value)
{
// TODO: Give warning when value > GRASS_LENGTH_CLUMPS_2
_element->properties.surface.grass_length = value;
}
uint8_t ownership_get()
{
return _element->properties.surface.ownership & 0xF0;
}
void ownership_set(uint8_t flags)
{
_element->properties.surface.ownership &= ~0xF0;
_element->properties.surface.ownership |= flags << 4;
}
uint8_t parkFences_get()
{
return _element->properties.surface.ownership & 0xF0;
}
void parkFences_set(uint8_t flags)
{
_element->properties.surface.ownership &= ~0x0F;
_element->properties.surface.ownership |= flags & 0x0F;
}
public:
static void Register(duk_context* ctx)
{
RegisterSharedProperties<ScSurfaceElement>(ctx);
dukglue_register_property(ctx, &slope_get, &slope_set, "slope");
dukglue_register_property(ctx, &terrain_get, &terrain_set, "terrain");
dukglue_register_property(ctx, &waterHeight_get, &waterHeight_set, "waterHeight");
dukglue_register_property(ctx, &grassLength_get, &grassLength_set, "grassLength");
dukglue_register_property(ctx, &ownership_get, &ownership_set, "ownership");
dukglue_register_property(ctx, &waterHeight_get, &parkFences_set, "parkFences");
}
};