Cosmetic edits: unified indentation of switch-case

This commit is contained in:
NovaRain
2024-02-22 08:41:45 +08:00
parent 30cb8b7ee9
commit 0400671f38
8 changed files with 208 additions and 208 deletions
+58 -58
View File
@@ -348,30 +348,30 @@ static void SetExplosionRadius(int arg1, int arg2) {
static void SetExplosionDamage(int pid, int min, int max) { static void SetExplosionDamage(int pid, int min, int max) {
explosionsDamageReset = true; explosionsDamageReset = true;
switch (pid) { switch (pid) {
case fo::ProtoID::PID_DYNAMITE: case fo::ProtoID::PID_DYNAMITE:
SafeWrite32(dynamite_min_dmg_addr, min); SafeWrite32(dynamite_min_dmg_addr, min);
SafeWrite32(dynamite_max_dmg_addr, max); SafeWrite32(dynamite_max_dmg_addr, max);
break; break;
case fo::ProtoID::PID_PLASTIC_EXPLOSIVES: case fo::ProtoID::PID_PLASTIC_EXPLOSIVES:
SafeWrite32(plastic_min_dmg_addr, min); SafeWrite32(plastic_min_dmg_addr, min);
SafeWrite32(plastic_max_dmg_addr, max); SafeWrite32(plastic_max_dmg_addr, max);
break; break;
} }
} }
static int GetExplosionDamage(int pid) { static int GetExplosionDamage(int pid) {
DWORD min = 0, max = 0; DWORD min = 0, max = 0;
switch (pid) { switch (pid) {
case fo::ProtoID::PID_DYNAMITE: case fo::ProtoID::PID_DYNAMITE:
min = *(DWORD*)dynamite_min_dmg_addr; min = *(DWORD*)dynamite_min_dmg_addr;
max = *(DWORD*)dynamite_max_dmg_addr; max = *(DWORD*)dynamite_max_dmg_addr;
break; break;
case fo::ProtoID::PID_PLASTIC_EXPLOSIVES: case fo::ProtoID::PID_PLASTIC_EXPLOSIVES:
min = *(DWORD*)plastic_min_dmg_addr; min = *(DWORD*)plastic_min_dmg_addr;
max = *(DWORD*)plastic_max_dmg_addr; max = *(DWORD*)plastic_max_dmg_addr;
break; break;
default: default:
GetDamage(pid, min, max); GetDamage(pid, min, max);
} }
DWORD arrayId = script::CreateTempArray(2, 0); DWORD arrayId = script::CreateTempArray(2, 0);
@@ -395,47 +395,47 @@ enum MetaruleExplosionsMode {
int __stdcall ExplosionsMetaruleFunc(int mode, int arg1, int arg2) { int __stdcall ExplosionsMetaruleFunc(int mode, int arg1, int arg2) {
switch (mode) { switch (mode) {
case EXPL_FORCE_EXPLOSION_PATTERN: case EXPL_FORCE_EXPLOSION_PATTERN:
if (arg1) { if (arg1) {
explosion_effect_starting_dir = 2; // bottom-right explosion_effect_starting_dir = 2; // bottom-right
SafeWrite8(0x411B54, 4); // bottom-left + 1 SafeWrite8(0x411B54, 4); // bottom-left + 1
} else { } else {
explosion_effect_starting_dir = 0; explosion_effect_starting_dir = 0;
SafeWrite8(0x411B54, 6); // last direction SafeWrite8(0x411B54, 6); // last direction
} }
break; break;
case EXPL_FORCE_EXPLOSION_ART: case EXPL_FORCE_EXPLOSION_ART:
SafeWriteBatch<DWORD>((BYTE)arg1, explosion_art_adr); SafeWriteBatch<DWORD>((BYTE)arg1, explosion_art_adr);
break; break;
case EXPL_FORCE_EXPLOSION_RADIUS: case EXPL_FORCE_EXPLOSION_RADIUS:
SetExplosionRadius(arg1, arg1); SetExplosionRadius(arg1, arg1);
break; break;
case EXPL_FORCE_EXPLOSION_DMGTYPE: case EXPL_FORCE_EXPLOSION_DMGTYPE:
SafeWriteBatch<BYTE>((BYTE)arg1, explosion_dmg_check_adr); SafeWriteBatch<BYTE>((BYTE)arg1, explosion_dmg_check_adr);
break; break;
case EXPL_STATIC_EXPLOSION_RADIUS: case EXPL_STATIC_EXPLOSION_RADIUS:
if (arg1 > 0) set_expl_radius_grenade = arg1; if (arg1 > 0) set_expl_radius_grenade = arg1;
if (arg2 > 0) set_expl_radius_rocket = arg2; if (arg2 > 0) set_expl_radius_rocket = arg2;
SetExplosionRadius(set_expl_radius_grenade, set_expl_radius_rocket); SetExplosionRadius(set_expl_radius_grenade, set_expl_radius_rocket);
break; break;
case EXPL_GET_EXPLOSION_DAMAGE: case EXPL_GET_EXPLOSION_DAMAGE:
return GetExplosionDamage(arg1); return GetExplosionDamage(arg1);
case EXPL_SET_DYNAMITE_EXPLOSION_DAMAGE: case EXPL_SET_DYNAMITE_EXPLOSION_DAMAGE:
SetExplosionDamage(fo::ProtoID::PID_DYNAMITE, arg1, arg2); SetExplosionDamage(fo::ProtoID::PID_DYNAMITE, arg1, arg2);
return 0;
case EXPL_SET_PLASTIC_EXPLOSION_DAMAGE:
SetExplosionDamage(fo::ProtoID::PID_PLASTIC_EXPLOSIVES, arg1, arg2);
return 0;
case EXPL_SET_EXPLOSION_MAX_TARGET:
if (arg1 > 0 && arg1 < 7) {
SafeWrite8(0x423C93, arg1);
explosionMaxTargetReset = true;
} else {
return 0; return 0;
case EXPL_SET_PLASTIC_EXPLOSION_DAMAGE: }
SetExplosionDamage(fo::ProtoID::PID_PLASTIC_EXPLOSIVES, arg1, arg2); break;
return 0; default:
case EXPL_SET_EXPLOSION_MAX_TARGET: return -1;
if (arg1 > 0 && arg1 < 7) {
SafeWrite8(0x423C93, arg1);
explosionMaxTargetReset = true;
} else {
return 0;
}
break;
default:
return -1;
} }
if (mode != EXPL_STATIC_EXPLOSION_RADIUS) explosionsMetaruleReset = true; if (mode != EXPL_STATIC_EXPLOSION_RADIUS) explosionsMetaruleReset = true;
return 0; return 0;
+26 -26
View File
@@ -197,32 +197,32 @@ static void SetPageNum() {
static long __fastcall CheckPage(long button) { static long __fastcall CheckPage(long button) {
switch (button) { switch (button) {
case 0x14B: // left button case 0x14B: // left button
LSPageOffset -= 10; LSPageOffset -= 10;
if (LSPageOffset < 0) LSPageOffset += 10000; // to the last page if (LSPageOffset < 0) LSPageOffset += 10000; // to the last page
__asm call fo::funcoffs::gsound_red_butt_press_; __asm call fo::funcoffs::gsound_red_butt_press_;
break; break;
case 0x149: // fast left PGUP button case 0x149: // fast left PGUP button
LSPageOffset -= 100; LSPageOffset -= 100;
if (LSPageOffset < 0) LSPageOffset += 10000; if (LSPageOffset < 0) LSPageOffset += 10000;
__asm call fo::funcoffs::gsound_red_butt_press_; __asm call fo::funcoffs::gsound_red_butt_press_;
break; break;
case 0x14D: // right button case 0x14D: // right button
LSPageOffset += 10; LSPageOffset += 10;
if (LSPageOffset >= 10000) LSPageOffset -= 10000; // to the first page if (LSPageOffset >= 10000) LSPageOffset -= 10000; // to the first page
__asm call fo::funcoffs::gsound_red_butt_press_; __asm call fo::funcoffs::gsound_red_butt_press_;
break; break;
case 0x151: // fast right PGDN button case 0x151: // fast right PGDN button
LSPageOffset += 100; LSPageOffset += 100;
if (LSPageOffset >= 10000) LSPageOffset -= 10000; if (LSPageOffset >= 10000) LSPageOffset -= 10000;
__asm call fo::funcoffs::gsound_red_butt_press_; __asm call fo::funcoffs::gsound_red_butt_press_;
break; break;
case 'p': // p/P button pressed - start SetPageNum func case 'p': // p/P button pressed - start SetPageNum func
case 'P': case 'P':
SetPageNum(); SetPageNum();
break; break;
default: default:
if (button < 0x500) return 1; // button in down state if (button < 0x500) return 1; // button in down state
} }
LSButtDN = button; LSButtDN = button;
+2 -2
View File
@@ -1203,7 +1203,7 @@ void Graphics::init() {
if (Graphics::mode < 4 || Graphics::mode > 6) { if (Graphics::mode < 4 || Graphics::mode > 6) {
Graphics::mode = 0; Graphics::mode = 0;
} }
IsWindowedMode = (Graphics::mode >= 5); Graphics::IsWindowedMode = (Graphics::mode >= 5);
if (Graphics::mode >= 4) { if (Graphics::mode >= 4) {
dlog("Applying DX9 graphics patch.", DL_INIT); dlog("Applying DX9 graphics patch.", DL_INIT);
@@ -1218,7 +1218,7 @@ void Graphics::init() {
} }
FreeLibrary(h); FreeLibrary(h);
SafeWrite8(0x50FB6B, '2'); // Set call DirectDrawCreate2 SafeWrite8(0x50FB6B, '2'); // Set call DirectDrawCreat2
HookCall(0x44260C, game_init_hook); HookCall(0x44260C, game_init_hook);
MakeJump(fo::funcoffs::GNW95_SetPaletteEntries_ + 1, GNW95_SetPaletteEntries_replacement); // 0x4CB310 MakeJump(fo::funcoffs::GNW95_SetPaletteEntries_ + 1, GNW95_SetPaletteEntries_replacement); // 0x4CB310
+37 -37
View File
@@ -53,45 +53,45 @@ static long __fastcall op_metarule3_ext(long metafunc, long* args) {
long result = 0; long result = 0;
switch (static_cast<MetaruleFunction>(metafunc)) { switch (static_cast<MetaruleFunction>(metafunc)) {
case SET_HORRIGAN_ENCOUNTER: { case SET_HORRIGAN_ENCOUNTER: {
long argValue = args[0]; // arg1 long argValue = args[0]; // arg1
if (argValue <= 0) { // disable Horrigan encounter if (argValue <= 0) { // disable Horrigan encounter
if (*(BYTE*)HorriganEncounterCheck == CodeType::JumpNZ) { if (*(BYTE*)HorriganEncounterCheck == CodeType::JumpNZ) {
SafeWrite8(HorriganEncounterCheck, CodeType::JumpShort); // skip the Horrigan encounter check SafeWrite8(HorriganEncounterCheck, CodeType::JumpShort); // skip the Horrigan encounter check
HorriganEncounterDisabled = true; HorriganEncounterDisabled = true;
}
} else {
if (argValue > 127) argValue = 127;
SafeWrite8(HorriganEncounterDays, static_cast<BYTE>(argValue));
HorriganEncounterSetDays = static_cast<signed char>(argValue);
} }
break; } else {
if (argValue > 127) argValue = 127;
SafeWrite8(HorriganEncounterDays, static_cast<BYTE>(argValue));
HorriganEncounterSetDays = static_cast<signed char>(argValue);
} }
case CLEAR_KEYBOARD_BUFFER: break;
__asm call fo::funcoffs::kb_clear_; }
break; case CLEAR_KEYBOARD_BUFFER:
case PARTY_ORDER_ATTACK: __asm call fo::funcoffs::kb_clear_;
PartyControl::OrderAttackPatch(); break;
break; case PARTY_ORDER_ATTACK:
case GET_CURRENT_SAVE_SLOT: PartyControl::OrderAttackPatch();
result = ExtraSaveSlots::GetSaveSlot(); break;
break; case GET_CURRENT_SAVE_SLOT:
case SET_CURRENT_SAVE_SLOT: result = ExtraSaveSlots::GetSaveSlot();
ExtraSaveSlots::SetSaveSlot(args[0], args[1]); break;
break; case SET_CURRENT_SAVE_SLOT:
case GET_CURRENT_QSAVE_PAGE: ExtraSaveSlots::SetSaveSlot(args[0], args[1]);
result = ExtraSaveSlots::GetQuickSavePage(); break;
break; case GET_CURRENT_QSAVE_PAGE:
case GET_CURRENT_QSAVE_SLOT: result = ExtraSaveSlots::GetQuickSavePage();
result = ExtraSaveSlots::GetQuickSaveSlot(); break;
break; case GET_CURRENT_QSAVE_SLOT:
case SET_CURRENT_QSAVE_SLOT: result = ExtraSaveSlots::GetQuickSaveSlot();
ExtraSaveSlots::SetQuickSaveSlot(args[0], args[1], args[2]); break;
break; case SET_CURRENT_QSAVE_SLOT:
default: ExtraSaveSlots::SetQuickSaveSlot(args[0], args[1], args[2]);
fo::func::debug_printf("\nOPCODE ERROR: metarule3(%d, ...) - metarule function number does not exist.\n > Script: %s, procedure %s.", break;
metafunc, (*fo::ptr::currentProgram)->fileName, fo::func::findCurrentProc(*fo::ptr::currentProgram)); default:
break; fo::func::debug_printf("\nOPCODE ERROR: metarule3(%d, ...) - metarule function number does not exist.\n > Script: %s, procedure %s.",
metafunc, (*fo::ptr::currentProgram)->fileName, fo::func::findCurrentProc(*fo::ptr::currentProgram));
break;
} }
return result; return result;
} }
+22 -22
View File
@@ -359,20 +359,20 @@ void mf_inventory_redraw(OpcodeContext& ctx) {
int mode; int mode;
DWORD loopFlag = GetLoopFlags() & (INVENTORY | INTFACEUSE | INTFACELOOT | BARTER); DWORD loopFlag = GetLoopFlags() & (INVENTORY | INTFACEUSE | INTFACELOOT | BARTER);
switch (loopFlag) { switch (loopFlag) {
case INVENTORY: case INVENTORY:
mode = 0; mode = 0;
break; break;
case INTFACEUSE: case INTFACEUSE:
mode = 1; mode = 1;
break; break;
case INTFACELOOT: case INTFACELOOT:
mode = 2; mode = 2;
break; break;
case BARTER: case BARTER:
mode = 3; mode = 3;
break; break;
default: default:
return; return;
} }
long redrawSide = (ctx.numArgs() > 0) ? ctx.arg(0).rawValue() : -1; // -1 - both long redrawSide = (ctx.numArgs() > 0) ? ctx.arg(0).rawValue() : -1; // -1 - both
if (redrawSide <= 0) { if (redrawSide <= 0) {
@@ -442,14 +442,14 @@ void mf_hide_window(OpcodeContext& ctx) {
void mf_set_window_flag(OpcodeContext& ctx) { void mf_set_window_flag(OpcodeContext& ctx) {
long bitFlag = ctx.arg(1).rawValue(); long bitFlag = ctx.arg(1).rawValue();
switch (bitFlag) { switch (bitFlag) {
case fo::WinFlags::DontMoveTop: case fo::WinFlags::DontMoveTop:
case fo::WinFlags::MoveOnTop: case fo::WinFlags::MoveOnTop:
case fo::WinFlags::Hidden: case fo::WinFlags::Hidden:
case fo::WinFlags::Exclusive: case fo::WinFlags::Exclusive:
case fo::WinFlags::Transparent: case fo::WinFlags::Transparent:
break; break;
default: default:
return; // unsupported set flag return; // unsupported set flag
} }
bool mode = ctx.arg(2).asBool(); bool mode = ctx.arg(2).asBool();
if (ctx.arg(0).isString()) { if (ctx.arg(0).isString()) {
+12 -12
View File
@@ -248,18 +248,18 @@ void mf_test(OpcodeContext& ctx) {
const ScriptValue &arg = ctx.arg(i); const ScriptValue &arg = ctx.arg(i);
sstream << ", "; sstream << ", ";
switch (arg.type()) { switch (arg.type()) {
case DATATYPE_INT: case DATATYPE_INT:
sstream << arg.asInt(); sstream << arg.asInt();
break; break;
case DATATYPE_FLOAT: case DATATYPE_FLOAT:
sstream << arg.asFloat(); sstream << arg.asFloat();
break; break;
case DATATYPE_STR: case DATATYPE_STR:
sstream << '"' << arg.asString() << '"'; sstream << '"' << arg.asString() << '"';
break; break;
default: default:
sstream << "???"; sstream << "???";
break; break;
} }
} }
sstream << ")"; sstream << ")";
+18 -18
View File
@@ -185,30 +185,30 @@ void __stdcall OpcodeContext::handleOpcodeStatic(fo::Program* program, DWORD opc
/* /*
const char* OpcodeContext::getSfallTypeName(DWORD dataType) { const char* OpcodeContext::getSfallTypeName(DWORD dataType) {
switch (dataType) { switch (dataType) {
case DATATYPE_NONE: case DATATYPE_NONE:
return "(none)"; return "(none)";
case DATATYPE_STR: case DATATYPE_STR:
return "string"; return "string";
case DATATYPE_FLOAT: case DATATYPE_FLOAT:
return "float"; return "float";
case DATATYPE_INT: case DATATYPE_INT:
return "integer"; return "integer";
default: default:
return "(unknown)"; return "(unknown)";
} }
} }
*/ */
DataType OpcodeContext::getSfallTypeByScriptType(DWORD varType) { DataType OpcodeContext::getSfallTypeByScriptType(DWORD varType) {
switch (varType & 0xFFFF) { switch (varType & 0xFFFF) {
case VAR_TYPE_STR2: case VAR_TYPE_STR2:
case VAR_TYPE_STR: case VAR_TYPE_STR:
return DATATYPE_STR; return DATATYPE_STR;
case VAR_TYPE_FLOAT: case VAR_TYPE_FLOAT:
return DATATYPE_FLOAT; return DATATYPE_FLOAT;
case VAR_TYPE_INT: case VAR_TYPE_INT:
default: default:
return DATATYPE_INT; return DATATYPE_INT;
} }
} }
+33 -33
View File
@@ -317,39 +317,39 @@ defaultIni:
static void LoadOriginalDll(DWORD fdwReason) { static void LoadOriginalDll(DWORD fdwReason) {
switch (fdwReason) { switch (fdwReason) {
case DLL_PROCESS_ATTACH: case DLL_PROCESS_ATTACH:
char path[MAX_PATH]; char path[MAX_PATH];
CopyMemory(path + GetSystemDirectoryA(path , MAX_PATH - 10), "\\ddraw.dll", 11); // path to original dll CopyMemory(path + GetSystemDirectoryA(path , MAX_PATH - 10), "\\ddraw.dll", 11); // path to original dll
ddraw.dll = LoadLibraryA(path); ddraw.dll = LoadLibraryA(path);
if (ddraw.dll) { if (ddraw.dll) {
ddraw.AcquireDDThreadLock = GetProcAddress(ddraw.dll, "AcquireDDThreadLock"); ddraw.AcquireDDThreadLock = GetProcAddress(ddraw.dll, "AcquireDDThreadLock");
ddraw.CheckFullscreen = GetProcAddress(ddraw.dll, "CheckFullscreen"); ddraw.CheckFullscreen = GetProcAddress(ddraw.dll, "CheckFullscreen");
ddraw.CompleteCreateSysmemSurface = GetProcAddress(ddraw.dll, "CompleteCreateSysmemSurface"); ddraw.CompleteCreateSysmemSurface = GetProcAddress(ddraw.dll, "CompleteCreateSysmemSurface");
ddraw.D3DParseUnknownCommand = GetProcAddress(ddraw.dll, "D3DParseUnknownCommand"); ddraw.D3DParseUnknownCommand = GetProcAddress(ddraw.dll, "D3DParseUnknownCommand");
ddraw.DDGetAttachedSurfaceLcl = GetProcAddress(ddraw.dll, "DDGetAttachedSurfaceLcl"); ddraw.DDGetAttachedSurfaceLcl = GetProcAddress(ddraw.dll, "DDGetAttachedSurfaceLcl");
ddraw.DDInternalLock = GetProcAddress(ddraw.dll, "DDInternalLock"); ddraw.DDInternalLock = GetProcAddress(ddraw.dll, "DDInternalLock");
ddraw.DDInternalUnlock = GetProcAddress(ddraw.dll, "DDInternalUnlock"); ddraw.DDInternalUnlock = GetProcAddress(ddraw.dll, "DDInternalUnlock");
ddraw.DSoundHelp = GetProcAddress(ddraw.dll, "DSoundHelp"); ddraw.DSoundHelp = GetProcAddress(ddraw.dll, "DSoundHelp");
ddraw.DirectDrawCreateClipper = GetProcAddress(ddraw.dll, "DirectDrawCreateClipper"); ddraw.DirectDrawCreateClipper = GetProcAddress(ddraw.dll, "DirectDrawCreateClipper");
ddraw.DirectDrawCreate = GetProcAddress(ddraw.dll, "DirectDrawCreate"); ddraw.DirectDrawCreate = GetProcAddress(ddraw.dll, "DirectDrawCreate");
ddraw.DirectDrawCreateEx = GetProcAddress(ddraw.dll, "DirectDrawCreateEx"); ddraw.DirectDrawCreateEx = GetProcAddress(ddraw.dll, "DirectDrawCreateEx");
ddraw.DirectDrawEnumerateA = GetProcAddress(ddraw.dll, "DirectDrawEnumerateA"); ddraw.DirectDrawEnumerateA = GetProcAddress(ddraw.dll, "DirectDrawEnumerateA");
ddraw.DirectDrawEnumerateExA = GetProcAddress(ddraw.dll, "DirectDrawEnumerateExA"); ddraw.DirectDrawEnumerateExA = GetProcAddress(ddraw.dll, "DirectDrawEnumerateExA");
ddraw.DirectDrawEnumerateExW = GetProcAddress(ddraw.dll, "DirectDrawEnumerateExW"); ddraw.DirectDrawEnumerateExW = GetProcAddress(ddraw.dll, "DirectDrawEnumerateExW");
ddraw.DirectDrawEnumerateW = GetProcAddress(ddraw.dll, "DirectDrawEnumerateW"); ddraw.DirectDrawEnumerateW = GetProcAddress(ddraw.dll, "DirectDrawEnumerateW");
ddraw.DllCanUnloadNow = GetProcAddress(ddraw.dll, "DllCanUnloadNow"); ddraw.DllCanUnloadNow = GetProcAddress(ddraw.dll, "DllCanUnloadNow");
ddraw.DllGetClassObject = GetProcAddress(ddraw.dll, "DllGetClassObject"); ddraw.DllGetClassObject = GetProcAddress(ddraw.dll, "DllGetClassObject");
ddraw.GetDDSurfaceLocal = GetProcAddress(ddraw.dll, "GetDDSurfaceLocal"); ddraw.GetDDSurfaceLocal = GetProcAddress(ddraw.dll, "GetDDSurfaceLocal");
ddraw.GetOLEThunkData = GetProcAddress(ddraw.dll, "GetOLEThunkData"); ddraw.GetOLEThunkData = GetProcAddress(ddraw.dll, "GetOLEThunkData");
ddraw.GetSurfaceFromDC = GetProcAddress(ddraw.dll, "GetSurfaceFromDC"); ddraw.GetSurfaceFromDC = GetProcAddress(ddraw.dll, "GetSurfaceFromDC");
ddraw.RegisterSpecialCase = GetProcAddress(ddraw.dll, "RegisterSpecialCase"); ddraw.RegisterSpecialCase = GetProcAddress(ddraw.dll, "RegisterSpecialCase");
ddraw.ReleaseDDThreadLock = GetProcAddress(ddraw.dll, "ReleaseDDThreadLock"); ddraw.ReleaseDDThreadLock = GetProcAddress(ddraw.dll, "ReleaseDDThreadLock");
ddraw.SetAppCompatData = GetProcAddress(ddraw.dll, "SetAppCompatData"); ddraw.SetAppCompatData = GetProcAddress(ddraw.dll, "SetAppCompatData");
} }
break; break;
case DLL_PROCESS_DETACH: case DLL_PROCESS_DETACH:
if (ddraw.dll) FreeLibrary(ddraw.dll); if (ddraw.dll) FreeLibrary(ddraw.dll);
break; break;
} }
} }