Merge pull request #574 from duncanspumpkin/fix_load_fail

Fix load fail

src/game.c

@@ -532,16 +532,16 @@ static void game_load_or_quit()
 		break;
 	}
 
-	#ifdef _MSC_VER
+#ifdef _MSC_VER
 	__asm mov ebx, 0
-	#else
+#else
 	__asm__ ( "mov ebx, 0 "  );
-	#endif
+#endif
 
 }
 
 /**
- * 
+ *
  *  rct2: 0x00674F40
  */
 static int open_landscape_file_dialog()
@@ -558,7 +558,7 @@ static int open_landscape_file_dialog()
 }
 
 /**
- * 
+ *
  *  rct2: 0x00674EB6
  */
 static int open_load_game_dialog()
@@ -575,14 +575,15 @@ static int open_load_game_dialog()
 }
 
 /**
- * 
+ *
  *  rct2: 0x0066DC0F
  */
 static void load_landscape()
 {
 	if (open_landscape_file_dialog() == 0) {
 		gfx_invalidate_screen();
-	} else {
+	}
+	else {
 		// Set default filename
 		char *esi = (char*)0x0141EF67;
 		while (1) {
@@ -600,7 +601,8 @@ static void load_landscape()
 		if (1) {
 			gfx_invalidate_screen();
 			rct2_endupdate();
-		} else {
+		}
+		else {
 			RCT2_GLOBAL(0x009DEA66, uint16) = 0;
 			rct2_endupdate();
 		}
@@ -648,12 +650,7 @@ int game_load_save(const char *path)
 		}
 	}
 
-	if (!object_read_and_load_entries(file)){
-		fclose(file);
-		RCT2_GLOBAL(0x009AC31B, uint8) = 255;
-		RCT2_GLOBAL(RCT2_ADDRESS_GAME_COMMAND_ERROR_STRING_ID, uint16) = STR_FILE_CONTAINS_INVALID_DATA;
-		return 0;
-	};
+	uint8 load_success = object_read_and_load_entries(file);
 
 	// Read flags (16 bytes)
 	sawyercoding_read_chunk(file, (uint8*)RCT2_ADDRESS_CURRENT_MONTH_YEAR);
@@ -670,6 +667,19 @@ int game_load_save(const char *path)
 	// Check expansion pack
 	// RCT2_CALLPROC_EBPSAFE(0x006757E6);
 
+	if (!load_success){
+		set_load_objects_fail_reason();
+		if (RCT2_GLOBAL(0x9DE518,uint32) & (1<<5)){
+			RCT2_GLOBAL(0x14241BC, uint32) = 2;
+			//call 0x0040705E Sets cursor position and something else. Calls maybe wind func 8 probably pointless
+			RCT2_GLOBAL(0x14241BC, uint32) = 0;
+			RCT2_GLOBAL(0x9DE518, uint32) &= ~(1<<5);
+		}
+		title_load();
+		rct2_endupdate();
+		return 0;//This never gets called
+	}
+
 	// The rest is the same as in scenario load and play
 	RCT2_CALLPROC_EBPSAFE(0x006A9FC0);
 	map_update_tile_pointers();

src/object.h

@@ -48,6 +48,7 @@ extern int object_entry_group_counts[];
 extern int object_entry_group_encoding[];
 
 void object_list_load();
+void set_load_objects_fail_reason();
 int object_read_and_load_entries(FILE *file);
 int object_load_packed(FILE *file);
 void object_unload_all();

src/object_list.c

@@ -22,6 +22,7 @@
 #include "addresses.h"
 #include "object.h"
 #include "util/sawyercoding.h"
+#include "localisation/localisation.h"
 
 #define OBJECT_ENTRY_GROUP_COUNT 11
 #define OBJECT_ENTRY_COUNT 721
@@ -169,6 +170,39 @@ static int check_object_entry(rct_object_entry *entry)
 	return (0xFFFFFFFF & dwords[0] & dwords[1] & dwords[2] & dwords[3]) + 1 != 0;
 }
 
+/* rct2: 0x675827 */
+void set_load_objects_fail_reason(){
+	rct_object_entry* object = RCT2_ADDRESS(0x13CE952, rct_object_entry);
+	int expansion = (object->flags & 0xFF) >> 4;
+	if (expansion == 0
+		|| expansion == 8
+		|| RCT2_GLOBAL(0x9AB4C0, uint16) & (1 << expansion)){
+
+		char* string_buffer = RCT2_ADDRESS(0x9BC677, char);
+
+		format_string(string_buffer, 3323, 0); //Missing object data, ID:
+
+		RCT2_CALLPROC_X(0x6AB344, 0, 0, 0, 0, 0, (int)string_buffer, 0x13CE952);
+		RCT2_GLOBAL(0x9AC31B, uint8) = 0xFF;
+		RCT2_GLOBAL(0x9AC31C, uint16) = 3165;
+		return;
+	}
+
+	char* exapansion_name = &RCT2_ADDRESS(RCT2_ADDRESS_EXPANSION_NAMES, char)[128 * expansion];
+	if (*exapansion_name == '\0'){
+		RCT2_GLOBAL(0x9AC31B, uint8) = 0xFF;
+		RCT2_GLOBAL(0x9AC31C, uint16) = 3325;
+		return;
+	}
+
+	char* string_buffer = RCT2_ADDRESS(0x9BC677, char);
+
+	format_string(string_buffer, 3324, 0); // Requires expansion pack
+	strcat(string_buffer, exapansion_name);
+	RCT2_GLOBAL(0x9AC31B, uint8) = 0xFF;
+	RCT2_GLOBAL(0x9AC31C, uint16) = 3165;
+}
+
 /**
  * 
  *  rct2: 0x006AA0C6
@@ -202,7 +236,7 @@ int object_read_and_load_entries(FILE *file)
 			// Failed to load the object
 			//Destroy progress bar
 
-			memcpy((char*)0x13CE952, entries[i].name, 8);
+			memcpy((char*)0x13CE952, &entries[i], sizeof(rct_object_entry));
 			free(entries);
 			object_unload_all();
 			RCT2_GLOBAL(0x14241BC, uint32) = 0;

src/scenario.c

@@ -19,6 +19,7 @@
  *****************************************************************************/
 
 #include <windows.h>
+#include "title.h"
 #include "addresses.h"
 #include "game.h"
 #include "interface/viewport.h"
@@ -110,7 +111,7 @@ int scenario_load(const char *path)
 					object_list_load();
 			}
 
-			object_read_and_load_entries(file);
+			uint8 load_success = object_read_and_load_entries(file);
 
 			// Read flags (16 bytes). Loads:
 			//	RCT2_ADDRESS_CURRENT_MONTH_YEAR
@@ -147,7 +148,12 @@ int scenario_load(const char *path)
 			sawyercoding_read_chunk(file, (uint8*)RCT2_ADDRESS_COMPLETED_COMPANY_VALUE);
 
 			fclose(file);
-
+			if (!load_success){
+				set_load_objects_fail_reason();
+				title_load();
+				rct2_endupdate();
+				return 0;//This never gets called
+			}
 			// Check expansion pack
 			// RCT2_CALLPROC_EBPSAFE(0x006757E6);
 

src/windows/error.c

@@ -103,6 +103,9 @@ void window_error_open(rct_string_id title, rct_string_id message)
 		dst += get_string_length(dst);
 	}
 
+	printf(_window_error_text+1);
+	printf("\r\n");
+
 	// Check if there is any text to display
 	if (dst == _window_error_text + 1)
 		return;