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

refactor track design save: _trackSavedMapElements

This commit is contained in:
Ted John 2016-05-02 03:05:17 +01:00
parent c0fa762fa5
commit cbc1848db4
4 changed files with 51 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/ride/track_design.c
View File

@ -30,7 +30,6 @@ typedef struct {
static rct_track_td6 *track_design_open_from_buffer(uint8 *src, size_t srcLength);
rct_map_element **gTrackSavedMapElements = (rct_map_element**)0x00F63674;
rct_track_td6 *gActiveTrackDesign;
uint8 gTrackDesignPlaceFlags;
bool gTrackDesignSceneryToggle;

3
src/ride/track_design.h
View File

@ -155,8 +155,6 @@ enum {
PTD_OPERATION_CLEAR_OUTLINES
};
extern rct_map_element **gTrackSavedMapElements;
extern rct_track_td6 *gActiveTrackDesign;
extern uint8 gTrackDesignPlaceFlags;
extern bool gTrackDesignSceneryToggle;
@ -191,6 +189,7 @@ void track_design_draw_preview(rct_track_td6 *td6, uint8 *pixels);
///////////////////////////////////////////////////////////////////////////////
// Track design saving
///////////////////////////////////////////////////////////////////////////////
void track_design_save_init();
void track_design_save_reset_scenery();
void track_design_save_select_nearby_scenery(int rideIndex);
void track_design_save_toggle_map_element(int interactionType, int x, int y, rct_map_element *mapElement);

92
src/ride/track_design_save.c
View File

@ -13,6 +13,13 @@
#define TRACK_MAX_SAVED_MAP_ELEMENTS 1500
static size_t _trackSavedMapElementsCount;
#ifdef NO_RCT2
static rct_map_element *_trackSavedMapElements[TRACK_MAX_SAVED_MAP_ELEMENTS];
#else
static rct_map_element **_trackSavedMapElements = (rct_map_element**)0x00F63674;
#endif
static bool track_design_save_should_select_scenery_around(int rideIndex, rct_map_element *mapElement);
static void track_design_save_select_nearby_scenery_for_tile(int rideIndex, int cx, int cy);
static bool track_design_save_contains_map_element(rct_map_element *mapElement);
@ -24,6 +31,15 @@ static bool track_design_save_to_td6_for_maze(uint8 rideIndex, rct_track_td6 *td
static bool track_design_save_to_td6_for_tracked_ride(uint8 rideIndex, rct_track_td6 *td6, uint8 *trackElements);
static bool track_design_save_to_file(rct_track_td6 *track_design, utf8 *path);
void track_design_save_init()
{
_trackSavedMapElementsCount = 0;
memset(_trackSavedMapElements, 0, sizeof(_trackSavedMapElements));
#ifndef NO_RCT2
_trackSavedMapElements[0] = (rct_map_element*)-1;
#endif
}
/**
*
* rct2: 0x006D2B07
@ -71,7 +87,7 @@ void track_design_save_select_nearby_scenery(int rideIndex)
void track_design_save_reset_scenery()
{
RCT2_GLOBAL(0x009DA193, uint8) = 255;
gTrackSavedMapElements[0] = (rct_map_element*)0xFFFFFFFF;
track_design_save_init();
gfx_invalidate_screen();
}
@ -167,14 +183,11 @@ bool track_design_save(uint8 rideIndex)
static bool track_design_save_contains_map_element(rct_map_element *mapElement)
{
rct_map_element **savedMapElement;
savedMapElement = gTrackSavedMapElements;
do {
if (*savedMapElement == mapElement) {
for (size_t i = 0; i < _trackSavedMapElementsCount; i++) {
if (_trackSavedMapElements[i] == mapElement) {
return true;
}
} while (*savedMapElement++ != (rct_map_element*)-1);
}
return false;
}
@ -215,15 +228,6 @@ static void track_design_save_scenery_set_to_null(rct_td6_scenery_element *track
*((uint8*)trackScenery) = 0xFF;
}
static rct_map_element **track_design_save_get_next_spare_map_element()
{
rct_map_element **savedMapElement = gTrackSavedMapElements;
while (*savedMapElement != (rct_map_element*)0xFFFFFFFF) {
savedMapElement++;
}
return savedMapElement;
}
/**
*
* rct2: 0x006D2ED2
@ -235,12 +239,8 @@ static bool track_design_save_can_add_map_element(rct_map_element *mapElement)
return false;
}
// Get number of saved elements so far
rct_map_element **savedMapElement = track_design_save_get_next_spare_map_element();
// Get number of spare elements left
int numSavedElements = savedMapElement - gTrackSavedMapElements;
int spareSavedElements = TRACK_MAX_SAVED_MAP_ELEMENTS - numSavedElements;
int spareSavedElements = TRACK_MAX_SAVED_MAP_ELEMENTS - _trackSavedMapElementsCount;
if (newElementCount > spareSavedElements) {
// No more spare saved elements left
return false;
@ -262,12 +262,14 @@ static bool track_design_save_can_add_map_element(rct_map_element *mapElement)
*/
static void track_design_save_push_map_element(int x, int y, rct_map_element *mapElement)
{
rct_map_element **savedMapElement;
if (_trackSavedMapElementsCount < TRACK_MAX_SAVED_MAP_ELEMENTS) {
_trackSavedMapElements[_trackSavedMapElementsCount++] = mapElement;
map_invalidate_tile_full(x, y);
map_invalidate_tile_full(x, y);
savedMapElement = track_design_save_get_next_spare_map_element();
*savedMapElement = mapElement;
*(savedMapElement + 1) = (rct_map_element*)0xFFFFFFFF;
#ifndef NO_RCT2
_trackSavedMapElements[_trackSavedMapElementsCount] = (rct_map_element*)-1;
#endif
}
}
/**
@ -415,27 +417,31 @@ static void track_design_save_pop_map_element(int x, int y, rct_map_element *map
{
map_invalidate_tile_full(x, y);
// Find map element and total of saved elements
int removeIndex = -1;
int numSavedElements = 0;
rct_map_element **savedMapElement = gTrackSavedMapElements;
while (*savedMapElement != (rct_map_element*)0xFFFFFFFF) {
if (*savedMapElement == mapElement) {
removeIndex = numSavedElements;
// Find index of map element to remove
size_t removeIndex = SIZE_MAX;
for (size_t i = 0; i < _trackSavedMapElementsCount; i++) {
if (_trackSavedMapElements[i] == mapElement) {
removeIndex = i;
}
savedMapElement++;
numSavedElements++;
}
if (removeIndex == -1) {
return;
// Remove map element from list
if (removeIndex != SIZE_MAX) {
size_t remainingNumItems = _trackSavedMapElementsCount - removeIndex - 1;
if (remainingNumItems > 0) {
memmove(
&_trackSavedMapElements[removeIndex],
&_trackSavedMapElements[removeIndex + 1],
remainingNumItems * sizeof(rct_map_element*)
);
}
_trackSavedMapElementsCount--;
#ifdef NO_RCT2
_trackSavedMapElements[_trackSavedMapElementsCount] = NULL;
#else
_trackSavedMapElements[_trackSavedMapElementsCount] = (rct_map_element*)-1;
#endif
}
// Remove item and shift rest up one item
if (removeIndex < numSavedElements - 1) {
memmove(&gTrackSavedMapElements[removeIndex], &gTrackSavedMapElements[removeIndex + 1], (numSavedElements - removeIndex - 1) * sizeof(rct_map_element*));
}
gTrackSavedMapElements[numSavedElements - 1] = (rct_map_element*)0xFFFFFFFF;
}
/**

2
src/windows/ride.c
View File

@ -4643,7 +4643,7 @@ static void setup_scenery_selection(rct_window* w)
RCT2_GLOBAL(0x00F64DE8, uint8) = (uint8)w->number;
RCT2_GLOBAL(0x009DA193, uint8) = 0xFF;
gTrackSavedMapElements[0] = (rct_map_element*)-1;
track_design_save_init();
gGamePaused |= GAME_PAUSED_SAVING_TRACK;
RCT2_GLOBAL(0x009DEA6F, uint8) |= 1;