move flags enums into the structs they're scoped to

This commit is contained in:
Martin Michelsen
2022-04-01 21:21:46 -07:00
parent aa1a2e852b
commit 37b8f1cffa
13 changed files with 152 additions and 143 deletions
+9 -9
View File
@@ -13,34 +13,34 @@ uint16_t flags_for_version(GameVersion version, uint8_t sub_version) {
case 0x00: // initial check (before 9E recognition)
switch (version) {
case GameVersion::DC:
return ClientFlag::DEFAULT_V2_DC;
return Client::Flag::DEFAULT_V2_DC;
case GameVersion::GC:
return ClientFlag::DEFAULT_V3_GC;
return Client::Flag::DEFAULT_V3_GC;
case GameVersion::PC:
return ClientFlag::DEFAULT_V2_PC;
return Client::Flag::DEFAULT_V2_PC;
case GameVersion::PATCH:
return ClientFlag::DEFAULT_V2_PC;
return Client::Flag::DEFAULT_V2_PC;
case GameVersion::BB:
return ClientFlag::DEFAULT_V3_BB;
return Client::Flag::DEFAULT_V4_BB;
}
break;
case 0x29: // PSO PC
return ClientFlag::DEFAULT_V2_PC;
return Client::Flag::DEFAULT_V2_PC;
case 0x30: // ???
case 0x31: // PSO Ep1&2 US10, US11, EU10, JP10
case 0x33: // PSO Ep1&2 EU50HZ
case 0x34: // PSO Ep1&2 JP11
return ClientFlag::DEFAULT_V3_GC;
return Client::Flag::DEFAULT_V3_GC;
case 0x32: // PSO Ep1&2 US12, JP12
case 0x35: // PSO Ep1&2 US12, JP12
case 0x36: // PSO Ep1&2 US12, JP12
case 0x39: // PSO Ep1&2 US12, JP12
return ClientFlag::DEFAULT_V3_GC_PLUS;
return Client::Flag::DEFAULT_V3_GC_PLUS;
case 0x40: // PSO Ep3 trial
case 0x41: // PSO Ep3 US
case 0x42: // PSO Ep3 JP
case 0x43: // PSO Ep3 UK
return ClientFlag::DEFAULT_V4;
return Client::Flag::DEFAULT_V3_GC_EP3;
}
return 0;
}