ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

ULTIMA8: Fix global constructor warning

Browse Source
This commit is contained in:
Matthew Duggan
2021-07-05 07:28:54 +09:00
parent 95745e0d6c
commit 30cf4bc28a
1 changed files with 59 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engines/ultima/ultima8/world/fire_type_table.cpp
+59 -53
View File
@@ -29,64 +29,70 @@
namespace Ultima {
namespace Ultima8 {
static FireType FIRE_TYPE_TABLE_REM[] = {
// Extracted from CRUSADER.EXE 1478:252a
// FType Hign Dmg Num Shots Sh.Mask Cells/Rnd Near Sprite
// Low Dmg Range Shield Cost Accurat Rnd Dur
FireType(0x0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
FireType(0x1, 0x12, 0x19, 0, 1, 0x82, 0x7, 0, 0xc, 1000, 0),
FireType(0x2, 0xa, 0x11, 0, 8, 0x50, 0x7, 0, 0xc, 1000, 0),
FireType(0x3, 0xc8, 0xc8, 10, 1, 0, 0, 1, 0x3, 1000, 1),
FireType(0x4, 0x96, 0x96, 10, 1, 0, 0, 0, 0x1, 1000, 1),
FireType(0x5, 0x19, 0x2d, 0, 1, 0x190, 0x6, 0, 0x4, 1000, 1),
FireType(0x6, 0xf, 0x23, 0, 1, 0x177, 0x6, 1, 0x4, 1000, 1),
FireType(0x7, 0x5, 0x5, 0, 1, 0, 0, 0, 0x1, 1000, 1),
FireType(0x8, 0x5, 0x5, 0, 1, 0, 0, 0, 0x1, 1000, 0),
FireType(0x9, 0xa, 0xf, 0, 1, 0x12c, 0x6, 1, 0x1, 100, 1),
FireType(0xa, 0x2d, 0x50, 10, 3, 0, 0, 0, 0x3, 100, 1),
FireType(0xb, 0xe, 0x14, 0, 1, 0x50, 0x7, 0, 0xc, 1000, 0),
FireType(0xc, 0x5, 0x5, 0, 1, 0, 0, 0, 0x1, 1000, 0),
FireType(0xd, 0xa, 0x11, 0, 5, 0x50, 0x7, 0, 0xc, 1000, 0),
FireType(0xe, 0xfa, 0xfa, 4, 1, 0x9c4, 0x4, 1, 0x3, 1000, 1),
FireType(0xf, 0x23, 0x37, 4, 1, 0x2ee, 0x4, 0, 0x3, 1000, 1),
};
const FireType *_getFireTypeRemorse(uint16 type) {
static const FireType FIRE_TYPE_TABLE_REM[] = {
// Extracted from CRUSADER.EXE 1478:252a
// FType Hign Dmg Num Shots Sh.Mask Cells/Rnd Near Sprite
// Low Dmg Range Shield Cost Accurat Rnd Dur
FireType(0x0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
FireType(0x1, 0x12, 0x19, 0, 1, 0x82, 0x7, 0, 0xc, 1000, 0),
FireType(0x2, 0xa, 0x11, 0, 8, 0x50, 0x7, 0, 0xc, 1000, 0),
FireType(0x3, 0xc8, 0xc8, 10, 1, 0, 0, 1, 0x3, 1000, 1),
FireType(0x4, 0x96, 0x96, 10, 1, 0, 0, 0, 0x1, 1000, 1),
FireType(0x5, 0x19, 0x2d, 0, 1, 0x190, 0x6, 0, 0x4, 1000, 1),
FireType(0x6, 0xf, 0x23, 0, 1, 0x177, 0x6, 1, 0x4, 1000, 1),
FireType(0x7, 0x5, 0x5, 0, 1, 0, 0, 0, 0x1, 1000, 1),
FireType(0x8, 0x5, 0x5, 0, 1, 0, 0, 0, 0x1, 1000, 0),
FireType(0x9, 0xa, 0xf, 0, 1, 0x12c, 0x6, 1, 0x1, 100, 1),
FireType(0xa, 0x2d, 0x50, 10, 3, 0, 0, 0, 0x3, 100, 1),
FireType(0xb, 0xe, 0x14, 0, 1, 0x50, 0x7, 0, 0xc, 1000, 0),
FireType(0xc, 0x5, 0x5, 0, 1, 0, 0, 0, 0x1, 1000, 0),
FireType(0xd, 0xa, 0x11, 0, 5, 0x50, 0x7, 0, 0xc, 1000, 0),
FireType(0xe, 0xfa, 0xfa, 4, 1, 0x9c4, 0x4, 1, 0x3, 1000, 1),
FireType(0xf, 0x23, 0x37, 4, 1, 0x2ee, 0x4, 0, 0x3, 1000, 1),
};
if (type >= ARRAYSIZE(FIRE_TYPE_TABLE_REM))
return nullptr;
return &FIRE_TYPE_TABLE_REM[type];
}
static FireType FIRE_TYPE_TABLE_REG[] = {
// Extracted from REGRET.EXE 1480:2b2e
FireType(0x0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
FireType(0x1, 0x12, 0x19, 0, 1, 0x82, 0x7, 0, 0xc, 1000, 0),
FireType(0x2, 0xf, 0x14, 0, 10, 0x50, 0x7, 0, 0xc, 1000, 0),
FireType(0x3, 0xc8, 0xc8, 10, 1, 0x0, 0x0, 1, 0x3, 1000, 1),
FireType(0x4, 0x96, 0x96, 10, 1, 0x0, 0x0, 0, 0x1, 1000, 1),
FireType(0x5, 0x2d, 0x3c, 0, 1, 0x190, 0x6, 0, 0x4, 1000, 1),
FireType(0x6, 0x19, 0x1e, 0, 1, 0x12c, 0x6, 1, 0x4, 1000, 1),
FireType(0x7, 0x5, 0x5, 0, 1, 0x0, 0x0, 0, 0x1, 1000, 1),
FireType(0x8, 0x5, 0x5, 0, 1, 0x0, 0x0, 0, 0x1, 1000, 0),
FireType(0x9, 0xa, 0xf, 0, 1, 0x12c, 0x6, 1, 0x1, 100, 1),
FireType(0xa, 0x2d, 0x50, 7, 3, 0x0, 0x0, 0, 0x3, 100, 1),
FireType(0xb, 0xe, 0x14, 0, 1, 0x50, 0x7, 0, 0xc, 1000, 0),
FireType(0xc, 0x5, 0x5, 0, 1, 0x0, 0x0, 0, 0x1, 1000, 0),
FireType(0xd, 0xf, 0x14, 0, 10, 0x50, 0x7, 0, 0xc, 1000, 0),
FireType(0xe, 0xfa, 0xfa, 4, 1, 0x9c4, 0x4, 1, 0x3, 1000, 1),
FireType(0xf, 0x32, 0x4b, 4, 1, 0x2ee, 0x4, 0, 0x3, 1000, 1),
FireType(0x10, 0x4b, 0x64, 3, 1, 0x1f4, 0x4, 0, 0x3, 1000, 1),
FireType(0x11, 0x7d, 0x96, 0, 1, 0x4e2, 0x4, 0, 0x3, 1000, 1),
FireType(0x12, 0x14, 0x14, 0, 1, 0x0, 0x0, 0, 0x3, 1000, 1),
FireType(0x13, 0x5, 0x5, 0, 1, 0x0, 0x0, 0, 0x3, 1000, 1),
FireType(0x14, 0x64, 0x7d, 0, 1, 0x384, 0x4, 0, 0x3, 1000, 1),
FireType(0x15, 0x1e, 0x32, 0, 1, 0x15e, 0x7, 0, 0x3, 1000, 1),
FireType(0x16, 0x2d, 0x50, 7, 1, 0x0, 0x0, 1, 0x3, 1000, 1)
};
const FireType *_getFireTypeRegret(uint16 type) {
static const FireType FIRE_TYPE_TABLE_REG[] = {
// Extracted from REGRET.EXE 1480:2b2e
FireType(0x0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
FireType(0x1, 0x12, 0x19, 0, 1, 0x82, 0x7, 0, 0xc, 1000, 0),
FireType(0x2, 0xf, 0x14, 0, 10, 0x50, 0x7, 0, 0xc, 1000, 0),
FireType(0x3, 0xc8, 0xc8, 10, 1, 0x0, 0x0, 1, 0x3, 1000, 1),
FireType(0x4, 0x96, 0x96, 10, 1, 0x0, 0x0, 0, 0x1, 1000, 1),
FireType(0x5, 0x2d, 0x3c, 0, 1, 0x190, 0x6, 0, 0x4, 1000, 1),
FireType(0x6, 0x19, 0x1e, 0, 1, 0x12c, 0x6, 1, 0x4, 1000, 1),
FireType(0x7, 0x5, 0x5, 0, 1, 0x0, 0x0, 0, 0x1, 1000, 1),
FireType(0x8, 0x5, 0x5, 0, 1, 0x0, 0x0, 0, 0x1, 1000, 0),
FireType(0x9, 0xa, 0xf, 0, 1, 0x12c, 0x6, 1, 0x1, 100, 1),
FireType(0xa, 0x2d, 0x50, 7, 3, 0x0, 0x0, 0, 0x3, 100, 1),
FireType(0xb, 0xe, 0x14, 0, 1, 0x50, 0x7, 0, 0xc, 1000, 0),
FireType(0xc, 0x5, 0x5, 0, 1, 0x0, 0x0, 0, 0x1, 1000, 0),
FireType(0xd, 0xf, 0x14, 0, 10, 0x50, 0x7, 0, 0xc, 1000, 0),
FireType(0xe, 0xfa, 0xfa, 4, 1, 0x9c4, 0x4, 1, 0x3, 1000, 1),
FireType(0xf, 0x32, 0x4b, 4, 1, 0x2ee, 0x4, 0, 0x3, 1000, 1),
FireType(0x10, 0x4b, 0x64, 3, 1, 0x1f4, 0x4, 0, 0x3, 1000, 1),
FireType(0x11, 0x7d, 0x96, 0, 1, 0x4e2, 0x4, 0, 0x3, 1000, 1),
FireType(0x12, 0x14, 0x14, 0, 1, 0x0, 0x0, 0, 0x3, 1000, 1),
FireType(0x13, 0x5, 0x5, 0, 1, 0x0, 0x0, 0, 0x3, 1000, 1),
FireType(0x14, 0x64, 0x7d, 0, 1, 0x384, 0x4, 0, 0x3, 1000, 1),
FireType(0x15, 0x1e, 0x32, 0, 1, 0x15e, 0x7, 0, 0x3, 1000, 1),
FireType(0x16, 0x2d, 0x50, 7, 1, 0x0, 0x0, 1, 0x3, 1000, 1)
};
if (type >= ARRAYSIZE(FIRE_TYPE_TABLE_REG))
return nullptr;
return &FIRE_TYPE_TABLE_REG[type];
}
const FireType *FireTypeTable::get(uint16 type) {
if (GAME_IS_REMORSE) {
if (type >= ARRAYSIZE(FIRE_TYPE_TABLE_REM))
return nullptr;
return &FIRE_TYPE_TABLE_REM[type];
return _getFireTypeRemorse(type);
} else {
if (type >= ARRAYSIZE(FIRE_TYPE_TABLE_REG))
return nullptr;
return &FIRE_TYPE_TABLE_REG[type];
return _getFireTypeRegret(type);
}
}