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

Don't use registers struct where not strictly required

Browse Source 
The only advantage of `struct registers` is the union hierarchy. If this
is not being actively exploited, it is detrimental to use this struct.
This commit is contained in:
Michał Janiszewski
2018-03-13 23:34:55 +01:00
committed by Michał Janiszewski
parent 789c176517
commit 9b0fe5f09e
2 changed files with 69 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

114
src/openrct2/paint/tile_element/Surface.cpp
View File

@@ -559,7 +559,7 @@ static void viewport_surface_draw_tile_side_bottom(paint_session * session, enum
if (!is_csg_loaded() && edgeStyle >= TERRAIN_EDGE_RCT2_COUNT)
edgeStyle = TERRAIN_EDGE_ROCK;
registers regs{};
sint16 al, ah, cl, ch, dl, dh;
LocationXY8 offset = { 0, 0 };
LocationXY8 bounds = { 0, 0 };
@@ -570,11 +570,11 @@ static void viewport_surface_draw_tile_side_bottom(paint_session * session, enum
switch (edge)
{
case EDGE_BOTTOMLEFT:
regs.al = self.corner_heights.left;
regs.cl = self.corner_heights.bottom;
al = self.corner_heights.left;
cl = self.corner_heights.bottom;
regs.ah = neighbour.corner_heights.top;
regs.ch = neighbour.corner_heights.right;
ah = neighbour.corner_heights.top;
ch = neighbour.corner_heights.right;
offset.x = 30;
bounds.y = 30;
@@ -585,11 +585,11 @@ static void viewport_surface_draw_tile_side_bottom(paint_session * session, enum
break;
case EDGE_BOTTOMRIGHT:
regs.al = self.corner_heights.right;
regs.cl = self.corner_heights.bottom;
al = self.corner_heights.right;
cl = self.corner_heights.bottom;
regs.ah = neighbour.corner_heights.top;
regs.ch = neighbour.corner_heights.left;
ah = neighbour.corner_heights.top;
ch = neighbour.corner_heights.left;
offset.y = 30;
bounds.x = 30;
@@ -604,29 +604,29 @@ static void viewport_surface_draw_tile_side_bottom(paint_session * session, enum
}
if (isWater)
regs.dl = height;
dl = height;
if (neighbour.tile_element == nullptr)
{
regs.ch = 1;
regs.ah = 1;
ch = 1;
ah = 1;
}
else
{
if (isWater)
{
regs.dh = map_get_water_height(neighbour.tile_element);
if (regs.dl == regs.dh)
dh = map_get_water_height(neighbour.tile_element);
if (dl == dh)
{
return;
}
regs.al = regs.dl;
regs.cl = regs.dl;
al = dl;
cl = dl;
}
}
if (regs.al <= regs.ah && regs.cl <= regs.ch)
if (al <= ah && cl <= ch)
{
return;
}
@@ -645,18 +645,18 @@ static void viewport_surface_draw_tile_side_bottom(paint_session * session, enum
base_image_id += 5;
}
uint8 curHeight = Math::Min(regs.ah, regs.ch);
if (regs.ch != regs.ah)
uint8 curHeight = Math::Min(ah, ch);
if (ch != ah)
{
// If bottom part of edge isn't straight, add a filler
uint32 image_offset = 3;
if (regs.ch >= regs.ah)
if (ch >= ah)
{
image_offset = 4;
}
if (curHeight != regs.al && curHeight != regs.cl)
if (curHeight != al && curHeight != cl)
{
uint32 image_id = base_image_id + image_offset;
sub_98196C(session, image_id, offset.x, offset.y, bounds.x, bounds.y, 15, curHeight * 16);
@@ -664,19 +664,19 @@ static void viewport_surface_draw_tile_side_bottom(paint_session * session, enum
}
}
regs.ah = regs.cl;
ah = cl;
for(uint32 tunnelIndex = 0; tunnelIndex < TUNNEL_MAX_COUNT;)
{
if (curHeight >= regs.al || curHeight >= regs.cl)
if (curHeight >= al || curHeight >= cl)
{
// If top of edge isn't straight, add a filler
uint32 image_offset = 1;
if (curHeight >= regs.al)
if (curHeight >= al)
{
image_offset = 2;
if (curHeight >= regs.cl)
if (curHeight >= cl)
{
return;
}
@@ -710,7 +710,7 @@ static void viewport_surface_draw_tile_side_bottom(paint_session * session, enum
uint8 tunnelHeight = stru_97B570[tunnelType][0];
sint16 zOffset = curHeight;
if ((zOffset + tunnelHeight) > regs.ah || (zOffset + tunnelHeight) > regs.al)
if ((zOffset + tunnelHeight) > ah || (zOffset + tunnelHeight) > al)
{
tunnelType = byte_97B5B0[tunnelType];
}
@@ -770,7 +770,7 @@ static void viewport_surface_draw_tile_side_top(paint_session * session, enum ed
if (!is_csg_loaded() && terrain >= TERRAIN_EDGE_RCT2_COUNT)
terrain = TERRAIN_EDGE_ROCK;
registers regs{};
sint16 al, ah, cl, ch, dl = 0, dh;
LocationXY8 offset = { 0, 0 };
LocationXY8 bounds = { 0, 0 };
@@ -778,22 +778,22 @@ static void viewport_surface_draw_tile_side_top(paint_session * session, enum ed
switch (edge)
{
case EDGE_TOPLEFT:
regs.al = self.corner_heights.top;
regs.cl = self.corner_heights.left;
al = self.corner_heights.top;
cl = self.corner_heights.left;
regs.ah = neighbour.corner_heights.right;
regs.ch = neighbour.corner_heights.bottom;
ah = neighbour.corner_heights.right;
ch = neighbour.corner_heights.bottom;
offset.y = -2;
bounds.x = 30;
break;
case EDGE_TOPRIGHT:
regs.al = self.corner_heights.top;
regs.cl = self.corner_heights.right;
al = self.corner_heights.top;
cl = self.corner_heights.right;
regs.ah = neighbour.corner_heights.left;
regs.ch = neighbour.corner_heights.bottom;
ah = neighbour.corner_heights.left;
ch = neighbour.corner_heights.bottom;
offset.x = -2;
bounds.y = 30;
@@ -804,31 +804,31 @@ static void viewport_surface_draw_tile_side_top(paint_session * session, enum ed
}
if(isWater == false)
regs.dl = height;
dl = height;
// save ecx
if (neighbour.tile_element == nullptr)
{
regs.ah = 1;
regs.ch = 1;
ah = 1;
ch = 1;
}
else
{
if (isWater)
{
regs.dh = map_get_water_height(neighbour.tile_element);
if (regs.dl == regs.dh)
dh = map_get_water_height(neighbour.tile_element);
if (dl == dh)
{
return;
}
regs.al = regs.dl;
regs.cl = regs.dl;
al = dl;
cl = dl;
}
}
// al + cl probably are self tile corners, while ah/ch are neighbour tile corners
if (regs.al <= regs.ah && regs.cl <= regs.ch)
if (al <= ah && cl <= ch)
{
return;
}
@@ -848,26 +848,26 @@ static void viewport_surface_draw_tile_side_top(paint_session * session, enum ed
{
if (!(gCurrentViewportFlags & VIEWPORT_FLAG_UNDERGROUND_INSIDE))
{
const uint8 incline = (regs.cl - regs.al) + 1;
const uint8 incline = (cl - al) + 1;
const uint32 image_id = _terrainEdgeSpriteIds[terrain][3] + (edge == EDGE_TOPLEFT ? 3 : 0) + incline; // var_c;
const sint16 y = (regs.dl - regs.al) * 16;
const sint16 y = (dl - al) * 16;
paint_attach_to_previous_ps(session, image_id, 0, y);
return;
}
base_image_id = _terrainEdgeSpriteIds[terrain][1] + (edge == EDGE_TOPLEFT ? 5 : 0); // var_04
}
uint8 cur_height = Math::Min(regs.ch, regs.ah);
if (regs.ch != regs.ah)
uint8 cur_height = Math::Min(ch, ah);
if (ch != ah)
{
// neighbour tile corners aren't level
uint32 image_offset = 3;
if (regs.ch > regs.ah)
if (ch > ah)
{
image_offset = 4;
}
if (cur_height != regs.al && cur_height != regs.cl)
if (cur_height != al && cur_height != cl)
{
const uint32 image_id = base_image_id + image_offset;
sub_98196C(session, image_id, offset.x, offset.y, bounds.x, bounds.y, 15, cur_height * 16);
@@ -875,25 +875,25 @@ static void viewport_surface_draw_tile_side_top(paint_session * session, enum ed
}
}
regs.ah = regs.cl;
ah = cl;
if (isWater)
{
offset.xy = 0;
}
while (cur_height < regs.al && cur_height < regs.ah)
while (cur_height < al && cur_height < ah)
{
sub_98196C(session, base_image_id, offset.x, offset.y, bounds.x, bounds.y, 15, cur_height * 16);
cur_height++;
}
uint32 image_offset = 1;
if (cur_height >= regs.al)
if (cur_height >= al)
{
image_offset = 2;
if (cur_height >= regs.ah)
if (cur_height >= ah)
{
return;
}
@@ -1248,11 +1248,11 @@ void surface_paint(paint_session * session, uint8 direction, uint16 height, cons
}
else
{
registers regs = { 0 };
sint16 bl, bh;
regs.bl = (surfaceShape ^ 0xF) << 2;
regs.bh = regs.bl >> 4;
local_surfaceShape = (regs.bh & 0x3) | (regs.bl & 0xC);
bl = (surfaceShape ^ 0xF) << 2;
bh = bl >> 4;
local_surfaceShape = (bh & 0x3) | (bl & 0xC);
}
}
}

25
src/openrct2/ride/Ride.cpp
View File

@@ -4516,11 +4516,10 @@ static rct_vehicle *vehicle_create_car(
sint32 *remainingDistance,
rct_tile_element *tileElement
) {
registers regs = { 0 };
Ride *ride = get_ride(rideIndex);
rct_ride_entry *rideEntry = get_ride_entry(ride->subtype);
rct_ride_entry_vehicle *vehicleEntry = &rideEntry->vehicles[vehicleEntryIndex];
sint32 edx;
rct_vehicle *vehicle = (rct_vehicle*)create_sprite(1);
vehicle->sprite_identifier = SPRITE_IDENTIFIER_VEHICLE;
@@ -4530,11 +4529,11 @@ static rct_vehicle *vehicle_create_car(
vehicle->vehicle_type = vehicleEntryIndex;
vehicle->is_child = carIndex == 0 ? 0 : 1;
vehicle->var_44 = ror32(vehicleEntry->spacing, 10) & 0xFFFF;
regs.edx = vehicleEntry->spacing >> 1;
*remainingDistance -= regs.edx;
edx = vehicleEntry->spacing >> 1;
*remainingDistance -= edx;
vehicle->remaining_distance = *remainingDistance;
if (!(vehicleEntry->flags & VEHICLE_ENTRY_FLAG_GO_KART)) {
*remainingDistance -= regs.edx;
*remainingDistance -= edx;
}
// loc_6DD9A5:
@@ -4599,33 +4598,33 @@ static rct_vehicle *vehicle_create_car(
sprite_move(chosenLoc.x, chosenLoc.y, z, (rct_sprite*)vehicle);
} else {
regs.dl = 0;
sint16 dl = 0;
if (vehicleEntry->flags & VEHICLE_ENTRY_FLAG_CHAIRLIFT) {
regs.dl = 1;
dl = 1;
}
if (vehicleEntry->flags & VEHICLE_ENTRY_FLAG_GO_KART) {
// Choose which lane Go Kart should start in
regs.dl = 5;
dl = 5;
if (vehicleIndex & 1) {
regs.dl = 6;
dl = 6;
}
}
if (vehicleEntry->flags & VEHICLE_ENTRY_FLAG_MINI_GOLF) {
regs.dl = 9;
dl = 9;
vehicle->var_D3 = 0;
vehicle->mini_golf_current_animation = 0;
vehicle->mini_golf_flags = 0;
}
if (vehicleEntry->flags & VEHICLE_ENTRY_FLAG_4) {
if (!vehicle->is_child) {
regs.dl = 15;
dl = 15;
}
}
if (vehicleEntry->flags & VEHICLE_ENTRY_FLAG_5) {
regs.dl = 16;
dl = 16;
}
vehicle->var_CD = regs.dl;
vehicle->var_CD = dl;
vehicle->track_x = x;
vehicle->track_y = y;