Merge branch 'fuzziqersoftware:master' into master

This commit is contained in:
Maria J. Belmonte
2023-12-23 02:34:06 +01:00
committed by GitHub
+2 -4
View File
@@ -543,6 +543,8 @@ static void on_sync_joining_player_disp_and_inventory(
case Version::GC_NTE:
case Version::GC_V3:
case Version::GC_EP3_TRIAL_EDITION:
case Version::GC_EP3:
if (gc_cmd) {
transcode_inventory_items(gc_cmd);
send_or_enqueue_joining_player_command(target, command, flag, *gc_cmd);
@@ -572,10 +574,6 @@ static void on_sync_joining_player_disp_and_inventory(
}
break;
case Version::GC_EP3_TRIAL_EDITION:
case Version::GC_EP3:
throw runtime_error("Episode 3 should not send 6x70 commands");
case Version::XB_V3:
if (xb_cmd) {
transcode_inventory_items(xb_cmd);