incentive/psopeeps-newserv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 6xA4 and 6xA5 sizes; closes #605

Browse Source
This commit is contained in:
Martin Michelsen
2025-02-07 08:27:56 -08:00
parent 81d5b23d80
commit 4c55551e12
2 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/CommandFormats.hh
+10 -13
View File
@@ -5558,24 +5558,21 @@ struct G_OlgaFlowBossActions_6xA3 {
G_EntityIDHeader header;
uint8_t unknown_a1 = 0;
uint8_t unknown_a2 = 0;
parray<uint8_t, 2> unknown_a3;
} __packed_ws__(G_OlgaFlowBossActions_6xA3, 8);
parray<uint8_t, 0x0E> unknown_a3;
} __packed_ws__(G_OlgaFlowBossActions_6xA3, 0x14);
// 6xA4: Olga Flow phase 1 boss actions (not valid on pre-V3 or Episode 3)
struct G_OlgaFlowPhase1BossActions_6xA4 {
G_EntityIDHeader header;
uint8_t what = 0;
parray<uint8_t, 3> unknown_a3;
} __packed_ws__(G_OlgaFlowPhase1BossActions_6xA4, 8);
// 6xA5: Olga Flow phase 2 boss actions (not valid on pre-V3 or Episode 3)
struct G_OlgaFlowPhase2BossActions_6xA5 {
struct G_OlgaFlowBossActions_6xA4_6xA5 {
G_EntityIDHeader header;
uint8_t what = 0;
parray<uint8_t, 3> unknown_a3;
} __packed_ws__(G_OlgaFlowPhase2BossActions_6xA5, 8);
parray<uint8_t, 3> pos_bytes;
parray<uint8_t, 3> state_bytes;
uint8_t unused1 = 0;
parray<uint8_t, 4> ext_state_bytes;
parray<uint8_t, 4> unused2;
} __packed_ws__(G_OlgaFlowBossActions_6xA4_6xA5, 0x14);
// 6xA6: Modify trade proposal (not valid on pre-V3)
@@ -5626,7 +5623,7 @@ struct G_BarbaRayBossActions_6xA9 {
G_EntityIDHeader header;
le_uint16_t unknown_a1 = 0;
le_uint16_t unknown_a2 = 0;
} __packed_ws__(G_BarbaRayBossActions_6xA9, 8);
} __packed_ws__(G_BarbaRayBossActions_6xA9, 0x08);
// 6xAA: Barba Ray boss actions (not valid on pre-V3 or Episode 3)
src/ReceiveSubcommands.cc
+2 -2
View File
@@ -5241,8 +5241,8 @@ const SubcommandDefinition subcommand_definitions[0x100] = {
/* 6xA1 */ {NONE, NONE, 0xA1, on_forward_check_game},
/* 6xA2 */ {NONE, NONE, 0xA2, on_entity_drop_item_request},
/* 6xA3 */ {NONE, NONE, 0xA3, forward_subcommand_with_entity_id_transcode_t<G_OlgaFlowBossActions_6xA3>},
/* 6xA4 */ {NONE, NONE, 0xA4, forward_subcommand_with_entity_id_transcode_t<G_OlgaFlowPhase1BossActions_6xA4>},
/* 6xA5 */ {NONE, NONE, 0xA5, forward_subcommand_with_entity_id_transcode_t<G_OlgaFlowPhase2BossActions_6xA5>},
/* 6xA4 */ {NONE, NONE, 0xA4, forward_subcommand_with_entity_id_transcode_t<G_OlgaFlowBossActions_6xA4_6xA5>},
/* 6xA5 */ {NONE, NONE, 0xA5, forward_subcommand_with_entity_id_transcode_t<G_OlgaFlowBossActions_6xA4_6xA5>},
/* 6xA6 */ {NONE, NONE, 0xA6, on_forward_check_game},
/* 6xA7 */ {NONE, NONE, 0xA7, forward_subcommand_m},
/* 6xA8 */ {NONE, NONE, 0xA8, on_gol_dragon_actions},