mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix edge conditions

This commit is contained in:
Michał Janiszewski 2017-02-14 22:34:13 +01:00
parent e402701c66
commit a78e922a14
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/openrct2/windows/tile_inspector.c
View File

@ -597,7 +597,7 @@ static void window_tile_inspector_load_tile(rct_window* w)
static void window_tile_inspector_insert_corrupt_element(sint32 elementIndex)
{
openrct2_assert(elementIndex > 0 && elementIndex < windowTileInspectorElementCount,
openrct2_assert(elementIndex >= 0 && elementIndex < windowTileInspectorElementCount,
"elementIndex out of range");
game_do_command(
TILE_INSPECTOR_ANY_INSERT_CORRUPT,
@ -612,7 +612,7 @@ static void window_tile_inspector_insert_corrupt_element(sint32 elementIndex)
static void window_tile_inspector_remove_element(sint32 elementIndex)
{
openrct2_assert(elementIndex > 0 && elementIndex < windowTileInspectorElementCount,
openrct2_assert(elementIndex >= 0 && elementIndex < windowTileInspectorElementCount,
"elementIndex out of range");
game_do_command(
TILE_INSPECTOR_ANY_REMOVE,
@ -627,7 +627,7 @@ static void window_tile_inspector_remove_element(sint32 elementIndex)
static void window_tile_inspector_rotate_element(sint32 elementIndex)
{
openrct2_assert(elementIndex > 0 && elementIndex < windowTileInspectorElementCount,
openrct2_assert(elementIndex >= 0 && elementIndex < windowTileInspectorElementCount,
"elementIndex out of range");
game_do_command(
TILE_INSPECTOR_ANY_ROTATE,
@ -643,9 +643,9 @@ static void window_tile_inspector_rotate_element(sint32 elementIndex)
// Swap element with its parent
static void window_tile_inspector_swap_elements(sint16 first, sint16 second)
{
openrct2_assert(first > 0 && first < windowTileInspectorElementCount,
openrct2_assert(first >= 0 && first < windowTileInspectorElementCount,
"first out of range");
openrct2_assert(second > 0 && second < windowTileInspectorElementCount,
openrct2_assert(second >= 0 && second < windowTileInspectorElementCount,
"second out of range");
game_do_command(
TILE_INSPECTOR_ANY_SWAP,
@ -764,7 +764,7 @@ static void window_tile_inspector_path_set_sloped(sint32 elementIndex, bool slop
static void window_tile_inspector_path_toggle_edge(sint32 elementIndex, sint32 cornerIndex)
{
openrct2_assert(elementIndex > 0 && elementIndex < windowTileInspectorElementCount,
openrct2_assert(elementIndex >= 0 && elementIndex < windowTileInspectorElementCount,
"elementIndex out of range");
openrct2_assert(cornerIndex >= 0 && cornerIndex < 8, "cornerIndex out of range");
game_do_command(

2
src/openrct2/world/map.c
View File

@ -247,7 +247,7 @@ rct_map_element *map_get_nth_element_at(sint32 x, sint32 y, sint32 n)
if (n == 0) {
return mapElement;
}
if (!map_element_is_last_for_tile(mapElement)) {
if (map_element_is_last_for_tile(mapElement)) {
break;
}
mapElement++;