From 09fab986ed0b3c58ee5eec45aa41e8e7f1b3912f Mon Sep 17 00:00:00 2001 From: Ted John Date: Sun, 8 May 2016 16:40:24 +0100 Subject: [PATCH] remove old code --- src/scenario.c | 128 ------------------------------------------------- src/scenario.h | 1 - 2 files changed, 129 deletions(-) diff --git a/src/scenario.c b/src/scenario.c index 33eacfe3a4..0cbde6c7a1 100644 --- a/src/scenario.c +++ b/src/scenario.c @@ -819,134 +819,6 @@ void scenario_remove_trackless_rides(rct_s6_data *s6) } } -bool scenario_save_s6(SDL_RWops* rw, rct_s6_data *s6) -{ - uint8 *buffer; - sawyercoding_chunk_header chunkHeader; - int encodedLength; - long fileSize; - uint32 checksum; - - buffer = malloc(0x600000); - if (buffer == NULL) { - log_error("Unable to allocate enough space for a write buffer."); - return false; - } - - // 0: Write header chunk - chunkHeader.encoding = CHUNK_ENCODING_ROTATE; - chunkHeader.length = sizeof(rct_s6_header); - encodedLength = sawyercoding_write_chunk_buffer(buffer, (uint8*)&s6->header, chunkHeader); - SDL_RWwrite(rw, buffer, encodedLength, 1); - - // 1: Write scenario info chunk - if (s6->header.type == S6_TYPE_SCENARIO) { - chunkHeader.encoding = CHUNK_ENCODING_ROTATE; - chunkHeader.length = sizeof(rct_s6_info); - encodedLength = sawyercoding_write_chunk_buffer(buffer, (uint8*)&s6->info, chunkHeader); - SDL_RWwrite(rw, buffer, encodedLength, 1); - } - - // 2: Write packed objects - if (s6->header.num_packed_objects > 0) { - if (!scenario_write_packed_objects(rw)) { - free(buffer); - return false; - } - } - - // 3: Write available objects chunk - chunkHeader.encoding = CHUNK_ENCODING_ROTATE; - chunkHeader.length = 721 * sizeof(rct_object_entry); - encodedLength = sawyercoding_write_chunk_buffer(buffer, (uint8*)s6->objects, chunkHeader); - SDL_RWwrite(rw, buffer, encodedLength, 1); - - // 4: Misc fields (data, rand...) chunk - chunkHeader.encoding = CHUNK_ENCODING_RLECOMPRESSED; - chunkHeader.length = 16; - encodedLength = sawyercoding_write_chunk_buffer(buffer, (uint8*)&s6->elapsed_months, chunkHeader); - SDL_RWwrite(rw, buffer, encodedLength, 1); - - // 5: Map elements + sprites and other fields chunk - chunkHeader.encoding = CHUNK_ENCODING_RLECOMPRESSED; - chunkHeader.length = 0x180000; - encodedLength = sawyercoding_write_chunk_buffer(buffer, (uint8*)s6->map_elements, chunkHeader); - SDL_RWwrite(rw, buffer, encodedLength, 1); - - if (s6->header.type == S6_TYPE_SCENARIO) { - // 6: - chunkHeader.encoding = CHUNK_ENCODING_RLECOMPRESSED; - chunkHeader.length = 0x27104C; - encodedLength = sawyercoding_write_chunk_buffer(buffer, (uint8*)&s6->dword_010E63B8, chunkHeader); - SDL_RWwrite(rw, buffer, encodedLength, 1); - - // 7: - chunkHeader.encoding = CHUNK_ENCODING_RLECOMPRESSED; - chunkHeader.length = 4; - encodedLength = sawyercoding_write_chunk_buffer(buffer, (uint8*)&s6->guests_in_park, chunkHeader); - SDL_RWwrite(rw, buffer, encodedLength, 1); - - // 8: - chunkHeader.encoding = CHUNK_ENCODING_RLECOMPRESSED; - chunkHeader.length = 8; - encodedLength = sawyercoding_write_chunk_buffer(buffer, (uint8*)&s6->last_guests_in_park, chunkHeader); - SDL_RWwrite(rw, buffer, encodedLength, 1); - - // 9: - chunkHeader.encoding = CHUNK_ENCODING_RLECOMPRESSED; - chunkHeader.length = 2; - encodedLength = sawyercoding_write_chunk_buffer(buffer, (uint8*)&s6->park_rating, chunkHeader); - SDL_RWwrite(rw, buffer, encodedLength, 1); - - // 10: - chunkHeader.encoding = CHUNK_ENCODING_RLECOMPRESSED; - chunkHeader.length = 1082; - encodedLength = sawyercoding_write_chunk_buffer(buffer, (uint8*)&s6->active_research_types, chunkHeader); - SDL_RWwrite(rw, buffer, encodedLength, 1); - - // 11: - chunkHeader.encoding = CHUNK_ENCODING_RLECOMPRESSED; - chunkHeader.length = 16; - encodedLength = sawyercoding_write_chunk_buffer(buffer, (uint8*)&s6->current_expenditure, chunkHeader); - SDL_RWwrite(rw, buffer, encodedLength, 1); - - // 12: - chunkHeader.encoding = CHUNK_ENCODING_RLECOMPRESSED; - chunkHeader.length = 4; - encodedLength = sawyercoding_write_chunk_buffer(buffer, (uint8*)&s6->park_value, chunkHeader); - SDL_RWwrite(rw, buffer, encodedLength, 1); - - // 13: - chunkHeader.encoding = CHUNK_ENCODING_RLECOMPRESSED; - chunkHeader.length = 0x761E8; - encodedLength = sawyercoding_write_chunk_buffer(buffer, (uint8*)&s6->completed_company_value, chunkHeader); - SDL_RWwrite(rw, buffer, encodedLength, 1); - } else { - // 6: Everything else... - chunkHeader.encoding = CHUNK_ENCODING_RLECOMPRESSED; - chunkHeader.length = 0x2E8570; - encodedLength = sawyercoding_write_chunk_buffer(buffer, (uint8*)&s6->dword_010E63B8, chunkHeader); - SDL_RWwrite(rw, buffer, encodedLength, 1); - } - - free(buffer); - - // Determine number of bytes written - fileSize = (long)SDL_RWtell(rw); - SDL_RWseek(rw, 0, RW_SEEK_SET); - - // Read all written bytes back into a single buffer - buffer = malloc(fileSize); - SDL_RWread(rw, buffer, fileSize, 1); - checksum = sawyercoding_calculate_checksum(buffer, fileSize); - free(buffer); - - // Append the checksum - SDL_RWseek(rw, fileSize, RW_SEEK_SET); - SDL_RWwrite(rw, &checksum, sizeof(uint32), 1); - return true; -} - static void scenario_objective_check_guests_by() { uint8 objectiveYear = gScenarioObjectiveYear; diff --git a/src/scenario.h b/src/scenario.h index 6054eeea0c..f78aae82f5 100644 --- a/src/scenario.h +++ b/src/scenario.h @@ -474,7 +474,6 @@ unsigned int scenario_rand_max(unsigned int max); int scenario_prepare_for_save(); int scenario_save(SDL_RWops* rw, int flags); int scenario_save_network(SDL_RWops* rw); -bool scenario_save_s6(SDL_RWops* rw, rct_s6_data *s6); int scenario_get_num_packed_objects_to_write(); int scenario_write_packed_objects(SDL_RWops* rw); void scenario_remove_trackless_rides(rct_s6_data *s6);