diff --git a/control.cpp b/control.cpp index 49b3e6e..d55d741 100644 --- a/control.cpp +++ b/control.cpp @@ -89,7 +89,7 @@ v4 = (double)v6; (**(void (__stdcall ***)(signed int, _DWORD))dword_1023A3C)(23, LODWORD(v4)); v5 = (double)(3 - v3); (**(void (__stdcall ***)(signed int, _DWORD))dword_1023A3C)(11, LODWORD(v5)); -if ( !light_on((struct component_tag *)&off_1023A20) ) +if ( !light_on((struct component_tag *)&lite4) ) { (**(void (__stdcall ***)(signed int, _DWORD))dword_1023A1C)(19, 0.0); (**(void (__stdcall ***)(signed int, _DWORD))dword_1023A3C)(19, 0.0); @@ -98,7 +98,7 @@ if ( !light_on((struct component_tag *)&off_1023A20) ) } } // 1023A1C: using guessed type int dword_1023A1C; -// 1023A20: using guessed type char *off_1023A20; +// 1023A20: using guessed type char *lite4; // 1023A24: using guessed type int dword_1023A24; // 1023A3C: using guessed type int dword_1023A3C; // 1023BBC: using guessed type int dword_1023BBC; @@ -237,7 +237,7 @@ v6 = TPinballTable::AddScore(dword_1025040, v5); v7 = get_rc_string(21, 0); _sprintf(&Dest, v7, v6); TTextBox::Display(dword_1023E1C, a1, &Dest, 2.0); -if ( !light_on((struct component_tag *)&off_1023884) ) +if ( !light_on((struct component_tag *)&lite56) ) { v8 = (void (__thiscall ***)(_DWORD, signed int, _DWORD))dword_1023A8C; (**(void (__stdcall ***)(signed int, _DWORD))dword_1023A8C)(34, 0.0); @@ -251,7 +251,7 @@ v9 = (void (__thiscall ***)(_DWORD, signed int, _DWORD))dword_1023A94; } } // 100C63A: could not find valid save-restore pair for esi -// 1023884: using guessed type char *off_1023884; +// 1023884: using guessed type char *lite56; // 1023A8C: using guessed type int dword_1023A8C; // 1023A94: using guessed type int dword_1023A94; // 1023CE4: using guessed type int dword_1023CE4; @@ -323,7 +323,7 @@ char Dest; // [esp+Ch] [ebp-44h] if ( a2 == 63 ) { v3 = 0; -if ( light_on((struct component_tag *)&off_1023874) ) +if ( light_on((struct component_tag *)&lite54) ) { v3 = 1; v4 = SpecialAddScore(*(_DWORD *)((char *)dword_1025040 + 302)); @@ -331,9 +331,9 @@ v5 = get_rc_string(10, 0); _sprintf(&Dest, v5, v4); TTextBox::Display(dword_1023E1C, a1, &Dest, 2.0); } -if ( light_on((struct component_tag *)&off_102387C) ) +if ( light_on((struct component_tag *)&lite55) ) v3 |= 2u; -if ( light_on((struct component_tag *)&off_1023884) ) +if ( light_on((struct component_tag *)&lite56) ) v3 |= 4u; if ( v3 ) { @@ -359,9 +359,9 @@ v7 = dword_1023D3C; (*(void (**)(void))(*(_DWORD *)v7 + 20))(); } } -// 1023874: using guessed type char *off_1023874; -// 102387C: using guessed type char *off_102387C; -// 1023884: using guessed type char *off_1023884; +// 1023874: using guessed type char *lite54; +// 102387C: using guessed type char *lite55; +// 1023884: using guessed type char *lite56; // 1023D24: using guessed type int dword_1023D24; // 1023D2C: using guessed type int dword_1023D2C; // 1023D34: using guessed type int dword_1023D34; @@ -408,7 +408,7 @@ if ( a4 == 63 ) { v17 = a3; v5 = (void (__thiscall ***)(_DWORD, signed int, _DWORD))dword_1023A8C; -if ( !light_on((struct component_tag *)&off_1023884) +if ( !light_on((struct component_tag *)&lite56) && ((int (__thiscall *)(_DWORD, signed int, _DWORD))**v5)(v5, 39, 0.0) ) { (**v5)(v5, 34, 0.0); @@ -476,7 +476,7 @@ TPinballTable::AddScore(dword_1025040, v16); // 1023724: using guessed type int dword_1023724; // 102372C: using guessed type int dword_102372C; // 1023734: using guessed type int dword_1023734; -// 1023884: using guessed type char *off_1023884; +// 1023884: using guessed type char *lite56; // 1023A8C: using guessed type int dword_1023A8C; // 1023A94: using guessed type int dword_1023A94; @@ -579,7 +579,7 @@ int v5; // eax if ( a3 == 63 ) { -if ( light_on((struct component_tag *)&off_10238A8) || light_on((struct component_tag *)&off_10238B0) ) +if ( light_on((struct component_tag *)&lite17) || light_on((struct component_tag *)&lite18) ) { table_add_extra_ball(a1, 2.0); (**(void (__stdcall ***)(signed int, _DWORD))dword_10238AC)(20, 0.0); @@ -591,7 +591,7 @@ else } if ( (struct TPinballComponent *)dword_102389C == a4 ) { -if ( light_on((struct component_tag *)&off_1023814) ) +if ( light_on((struct component_tag *)&lite30) ) { (**(void (__stdcall ***)(signed int, _DWORD, int))dword_1023818)(4, 0.0, a2); v4 = (void (__stdcall ***)(signed int))dword_1023828; @@ -600,7 +600,7 @@ LABEL_11: goto LABEL_12; } } -else if ( light_on((struct component_tag *)&off_102381C) ) +else if ( light_on((struct component_tag *)&lite29) ) { (**(void (__stdcall ***)(signed int, _DWORD, int))dword_1023820)(4, 0.0, a2); v4 = (void (__stdcall ***)(signed int))dword_1023830; @@ -612,16 +612,16 @@ TPinballTable::AddScore(dword_1025040, v5); } } // 100CC20: could not find valid save-restore pair for esi -// 1023814: using guessed type char *off_1023814; +// 1023814: using guessed type char *lite30; // 1023818: using guessed type int dword_1023818; -// 102381C: using guessed type char *off_102381C; +// 102381C: using guessed type char *lite29; // 1023820: using guessed type int dword_1023820; // 1023828: using guessed type int dword_1023828; // 1023830: using guessed type int dword_1023830; // 102389C: using guessed type int dword_102389C; -// 10238A8: using guessed type char *off_10238A8; +// 10238A8: using guessed type char *lite17; // 10238AC: using guessed type int dword_10238AC; -// 10238B0: using guessed type char *off_10238B0; +// 10238B0: using guessed type char *lite18; // 10238B4: using guessed type int dword_10238B4; // 1023E04: using guessed type int dword_1023E04; @@ -658,7 +658,7 @@ if ( a2 == 63 ) { if ( (struct TPinballComponent *)dword_10238C0 == a3 ) { -if ( light_on((struct component_tag *)&off_10238CC) ) +if ( light_on((struct component_tag *)&lite27) ) { (**(void (__stdcall ***)(signed int, _DWORD, int))dword_1023AC4)(20, 0.0, a1); v3 = (void (__stdcall ***)(signed int))dword_10238D0; @@ -674,7 +674,7 @@ else { if ( (struct TPinballComponent *)dword_10238C8 != a3 ) return; -if ( light_on((struct component_tag *)&off_10238D4) ) +if ( light_on((struct component_tag *)&lite28) ) { (**(void (__stdcall ***)(signed int, _DWORD, int))dword_1023AC4)(20, 0.0, a1); v3 = (void (__stdcall ***)(signed int))dword_10238D8; @@ -688,9 +688,9 @@ goto LABEL_10; // 100CDA0: could not find valid save-restore pair for esi // 10238C0: using guessed type int dword_10238C0; // 10238C8: using guessed type int dword_10238C8; -// 10238CC: using guessed type char *off_10238CC; +// 10238CC: using guessed type char *lite27; // 10238D0: using guessed type int dword_10238D0; -// 10238D4: using guessed type char *off_10238D4; +// 10238D4: using guessed type char *lite28; // 10238D8: using guessed type int dword_10238D8; // 1023AC4: using guessed type int dword_1023AC4; @@ -705,7 +705,7 @@ char Dest; // [esp+Ch] [ebp-44h] if ( a2 == 63 ) { -if ( light_on((struct component_tag *)&off_10238EC) ) +if ( light_on((struct component_tag *)&lite16) ) { v3 = SpecialAddScore(*(_DWORD *)((char *)dword_1025040 + 306)); v4 = get_rc_string(3, 0); @@ -725,7 +725,7 @@ TTextBox::Display(dword_1023E1C, a1, v6, 2.0); (**(void (__stdcall ***)(signed int, _DWORD))dword_1023978)(45, 11.0); } } -// 10238EC: using guessed type char *off_10238EC; +// 10238EC: using guessed type char *lite16; // 10238F0: using guessed type int dword_10238F0; // 1023978: using guessed type int dword_1023978; // 1023D4C: using guessed type int dword_1023D4C; @@ -1067,13 +1067,13 @@ if ( *(_DWORD *)(dword_1023A9C + 6) + *(_DWORD *)(dword_1023AA4 + 6) + *(_DWORD v5 = (*(int (__thiscall **)(struct TPinballComponent *, _DWORD))(*(_DWORD *)a2 + 8))(a2, 0); goto LABEL_19; } -if ( light_on((struct component_tag *)&off_1023AB0) ) +if ( light_on((struct component_tag *)&lite61) ) { -if ( light_on((struct component_tag *)&off_1023AB8) ) +if ( light_on((struct component_tag *)&lite60) ) { -if ( light_on((struct component_tag *)&off_1023AC0) ) +if ( light_on((struct component_tag *)&lite59) ) { -if ( light_on((struct component_tag *)&off_1023AC8) ) +if ( light_on((struct component_tag *)&lite58) ) { v4 = (*(int (__thiscall **)(struct TPinballComponent *, signed int))(*(_DWORD *)a2 + 8))(a2, 1); TPinballTable::AddScore(dword_1025040, v4); @@ -1120,10 +1120,10 @@ TPinballTable::AddScore(dword_1025040, v5); // 1023A9C: using guessed type int dword_1023A9C; // 1023AA4: using guessed type int dword_1023AA4; // 1023AAC: using guessed type int dword_1023AAC; -// 1023AB0: using guessed type char *off_1023AB0; -// 1023AB8: using guessed type char *off_1023AB8; -// 1023AC0: using guessed type char *off_1023AC0; -// 1023AC8: using guessed type char *off_1023AC8; +// 1023AB0: using guessed type char *lite61; +// 1023AB8: using guessed type char *lite60; +// 1023AC0: using guessed type char *lite59; +// 1023AC8: using guessed type char *lite58; // 1023BBC: using guessed type int dword_1023BBC; // 1023DB4: using guessed type int dword_1023DB4; // 1023DBC: using guessed type int dword_1023DBC; @@ -1287,7 +1287,7 @@ else v3 = (void (__stdcall ***)(signed int, _DWORD, int))dword_1023BAC; } (**v3)(15, 2.0, a1); -if ( !light_on((struct component_tag *)&off_1023BB8) || (v4 = dword_1023E0C, *(_DWORD *)(dword_1023BBC + 82)) ) +if ( !light_on((struct component_tag *)&lite198) || (v4 = dword_1023E0C, *(_DWORD *)(dword_1023BBC + 82)) ) v4 = dword_1023DD4; (*(void (**)(void))(*(_DWORD *)v4 + 20))(); v5 = (*(int (__thiscall **)(struct TPinballComponent *, _DWORD))(*(_DWORD *)a3 + 8))(a3, 0); @@ -1303,7 +1303,7 @@ if ( (**(int (__stdcall ***)(signed int, _DWORD))dword_1023BB4)(37, 0.0) == 3 ) // 1023BA4: using guessed type int dword_1023BA4; // 1023BAC: using guessed type int dword_1023BAC; // 1023BB4: using guessed type int dword_1023BB4; -// 1023BB8: using guessed type char *off_1023BB8; +// 1023BB8: using guessed type char *lite198; // 1023BBC: using guessed type int dword_1023BBC; // 1023DD4: using guessed type int dword_1023DD4; // 1023E0C: using guessed type int dword_1023E0C; @@ -1412,7 +1412,7 @@ int v4; // eax if ( a2 == 63 ) { -if ( !light_on((struct component_tag *)&off_1023C40) ) +if ( !light_on((struct component_tag *)&lite110) ) { (**(void (__stdcall ***)(signed int, _DWORD))dword_1023C44)(15, 3.0); v3 = get_rc_string(93, 0); @@ -1423,7 +1423,7 @@ TPinballTable::AddScore(dword_1025040, v4); AdvanceWormHoleDestination(1); } } -// 1023C40: using guessed type char *off_1023C40; +// 1023C40: using guessed type char *lite110; // 1023C44: using guessed type int dword_1023C44; //----- (0100DCB0) -------------------------------------------------------- @@ -1459,12 +1459,12 @@ AdvanceWormHoleDestination(0); else if ( a1 == 63 ) { v2 = *(_DWORD *)a2; -v3 = light_on((struct component_tag *)&off_102393C); +v3 = light_on((struct component_tag *)&lite20); v4 = (*(int (__thiscall **)(struct TPinballComponent *, BOOL))(v2 + 8))(a2, v3); TPinballTable::AddScore(dword_1025040, v4); } } -// 102393C: using guessed type char *off_102393C; +// 102393C: using guessed type char *lite20; //----- (0100DD7A) -------------------------------------------------------- void __userpurge GravityWellKickoutControl(int a1@, int a2, struct TPinballComponent *a3) @@ -1521,7 +1521,7 @@ void __stdcall SkillShotGate1Control(int a1, struct TPinballComponent *a2) if ( a1 == 63 ) { (**(void (__stdcall ***)(signed int, _DWORD))dword_1023D04)(9, 5.0); -if ( light_on((struct component_tag *)&off_1023CB0) ) +if ( light_on((struct component_tag *)&lite67) ) { (**(void (__stdcall ***)(signed int, _DWORD))dword_1023CE4)(34, 0.0); (**(void (__stdcall ***)(signed int, _DWORD))dword_1023CE4)(20, 0.0); @@ -1536,7 +1536,7 @@ if ( light_on((struct component_tag *)&off_1023CB0) ) // 1023878: using guessed type int dword_1023878; // 1023978: using guessed type int dword_1023978; // 10239B0: using guessed type int dword_10239B0; -// 1023CB0: using guessed type char *off_1023CB0; +// 1023CB0: using guessed type char *lite67; // 1023CB4: using guessed type int dword_1023CB4; // 1023CE4: using guessed type int dword_1023CE4; // 1023D04: using guessed type int dword_1023D04; @@ -1547,14 +1547,14 @@ void __stdcall SkillShotGate2Control(int a1, struct TPinballComponent *a2) { if ( a1 == 63 ) { -if ( light_on((struct component_tag *)&off_1023CB0) ) +if ( light_on((struct component_tag *)&lite67) ) { (**(void (__stdcall ***)(signed int, _DWORD))dword_1023CBC)(19, 0.0); (*(void (**)(void))(*(_DWORD *)dword_1023DF4 + 20))(); } } } -// 1023CB0: using guessed type char *off_1023CB0; +// 1023CB0: using guessed type char *lite67; // 1023CBC: using guessed type int dword_1023CBC; // 1023DF4: using guessed type int dword_1023DF4; @@ -1563,14 +1563,14 @@ void __stdcall SkillShotGate3Control(int a1, struct TPinballComponent *a2) { if ( a1 == 63 ) { -if ( light_on((struct component_tag *)&off_1023CB0) ) +if ( light_on((struct component_tag *)&lite67) ) { (**(void (__stdcall ***)(signed int, _DWORD))dword_1023CC4)(19, 0.0); (*(void (**)(void))(*(_DWORD *)dword_1023DF4 + 20))(); } } } -// 1023CB0: using guessed type char *off_1023CB0; +// 1023CB0: using guessed type char *lite67; // 1023CC4: using guessed type int dword_1023CC4; // 1023DF4: using guessed type int dword_1023DF4; @@ -1579,14 +1579,14 @@ void __stdcall SkillShotGate4Control(int a1, struct TPinballComponent *a2) { if ( a1 == 63 ) { -if ( light_on((struct component_tag *)&off_1023CB0) ) +if ( light_on((struct component_tag *)&lite67) ) { (**(void (__stdcall ***)(signed int, _DWORD))dword_1023CCC)(19, 0.0); (*(void (**)(void))(*(_DWORD *)dword_1023DF4 + 20))(); } } } -// 1023CB0: using guessed type char *off_1023CB0; +// 1023CB0: using guessed type char *lite67; // 1023CCC: using guessed type int dword_1023CCC; // 1023DF4: using guessed type int dword_1023DF4; @@ -1595,14 +1595,14 @@ void __stdcall SkillShotGate5Control(int a1, struct TPinballComponent *a2) { if ( a1 == 63 ) { -if ( light_on((struct component_tag *)&off_1023CB0) ) +if ( light_on((struct component_tag *)&lite67) ) { (**(void (__stdcall ***)(signed int, _DWORD))dword_1023CD4)(19, 0.0); (*(void (**)(void))(*(_DWORD *)dword_1023DF4 + 20))(); } } } -// 1023CB0: using guessed type char *off_1023CB0; +// 1023CB0: using guessed type char *lite67; // 1023CD4: using guessed type int dword_1023CD4; // 1023DF4: using guessed type int dword_1023DF4; @@ -1611,14 +1611,14 @@ void __stdcall SkillShotGate6Control(int a1, struct TPinballComponent *a2) { if ( a1 == 63 ) { -if ( light_on((struct component_tag *)&off_1023CB0) ) +if ( light_on((struct component_tag *)&lite67) ) { (**(void (__stdcall ***)(signed int, _DWORD))dword_1023CDC)(19, 0.0); (*(void (**)(void))(*(_DWORD *)dword_1023DF4 + 20))(); } } } -// 1023CB0: using guessed type char *off_1023CB0; +// 1023CB0: using guessed type char *lite67; // 1023CDC: using guessed type int dword_1023CDC; // 1023DF4: using guessed type int dword_1023DF4; @@ -1976,7 +1976,7 @@ v4 = (struct TPinballComponent *)TPinballTable::AddScore(dword_1025040, v3); GravityWellKickoutControl((int)a2, 64, v4); } LABEL_13: -if ( light_on((struct component_tag *)&off_10239AC) ) +if ( light_on((struct component_tag *)&lite25) ) { v18 = 1; v11 = SpecialAddScore(*(_DWORD *)((char *)dword_1025040 + 302)); @@ -1985,9 +1985,9 @@ _sprintf(&Dest, v12, v11); v2 = 2.0; TTextBox::Display(dword_1023E1C, (int)a2, &Dest, 2.0); } -if ( light_on((struct component_tag *)&off_10239B4) ) +if ( light_on((struct component_tag *)&lite26) ) v18 |= 2u; -if ( light_on((struct component_tag *)&off_10239BC) ) +if ( light_on((struct component_tag *)&lite130) ) { v18 |= 4u; (**(void (__stdcall ***)(signed int, _DWORD))dword_10239C0)(20, 0.0); @@ -2085,10 +2085,10 @@ goto LABEL_13; } // 10238D0: using guessed type int dword_10238D0; // 10238D8: using guessed type int dword_10238D8; -// 10239AC: using guessed type char *off_10239AC; +// 10239AC: using guessed type char *lite25; // 10239B0: using guessed type int dword_10239B0; -// 10239B4: using guessed type char *off_10239B4; -// 10239BC: using guessed type char *off_10239BC; +// 10239B4: using guessed type char *lite26; +// 10239BC: using guessed type char *lite130; // 10239C0: using guessed type int dword_10239C0; // 1023D24: using guessed type int dword_1023D24; // 1023D64: using guessed type int dword_1023D64; @@ -2118,7 +2118,7 @@ v3 = *(int (__stdcall ***)(signed int, _DWORD))dword_1023CF4; dword_1025044 = 0; if ( !(*v3)(37, 0.0) ) (**(void (__stdcall ***)(signed int, _DWORD))dword_1023CF4)(32, 0.0); -if ( !light_on((struct component_tag *)&off_1023D00) ) +if ( !light_on((struct component_tag *)&lite200) ) { (**(void (__stdcall ***)(signed int, _DWORD))dword_1023CE4)(20, 0.0); (**(void (__stdcall ***)(signed int, _DWORD))dword_1023CB4)(19, 0.0); @@ -2149,7 +2149,7 @@ MultiplierLightGroupControl(a1, 65, dword_1023B38); // 1023CB4: using guessed type int dword_1023CB4; // 1023CE4: using guessed type int dword_1023CE4; // 1023CF4: using guessed type int dword_1023CF4; -// 1023D00: using guessed type char *off_1023D00; +// 1023D00: using guessed type char *lite200; // 1023D04: using guessed type int dword_1023D04; // 1025044: using guessed type int dword_1025044; @@ -2339,7 +2339,7 @@ if ( *(_DWORD *)((char *)dword_1025040 + 370) ) (**(void (__stdcall ***)(signed int, _DWORD))dword_1023D0C)(20, 0.0); v2 = dword_1025040; } -if ( light_on((struct component_tag *)&off_1023D00) ) +if ( light_on((struct component_tag *)&lite200) ) { (*(void (**)(void))(*(_DWORD *)dword_1023DEC + 20))(); (**(void (__stdcall ***)(signed int, _DWORD))dword_1023D04)(19, 0.0); @@ -2347,7 +2347,7 @@ v3 = get_rc_string(96, 0); TTextBox::Display(dword_1023E1C, 0, v3, -1.0); (*(void (**)(void))(*(_DWORD *)dword_1023DE4 + 20))(); } -else if ( light_on((struct component_tag *)&off_1023D08) ) +else if ( light_on((struct component_tag *)&lite199) ) { (*(void (**)(void))(*(_DWORD *)dword_1023DEC + 20))(); (**(void (__stdcall ***)(signed int, _DWORD))dword_1023D0C)(20, 0.0); @@ -2483,7 +2483,7 @@ else *(_DWORD *)(dword_1023BBC + 6) = 0; MissionControl(66, 0); (**(void (__cdecl ***)(signed int, _DWORD))dword_1025040)(1012, 0.0); -if ( light_on((struct component_tag *)&off_1023AC8) ) +if ( light_on((struct component_tag *)&lite58) ) (**(void (__stdcall ***)(signed int, _DWORD))dword_1023ACC)(20, 0.0); else *(_DWORD *)((char *)dword_1025040 + 306) = 25000; @@ -2529,7 +2529,7 @@ else // 1023AB4: using guessed type int dword_1023AB4; // 1023ABC: using guessed type int dword_1023ABC; // 1023AC4: using guessed type int dword_1023AC4; -// 1023AC8: using guessed type char *off_1023AC8; +// 1023AC8: using guessed type char *lite58; // 1023ACC: using guessed type int dword_1023ACC; // 1023ADC: using guessed type int dword_1023ADC; // 1023AE4: using guessed type int dword_1023AE4; @@ -2552,9 +2552,9 @@ else // 1023CEC: using guessed type int dword_1023CEC; // 1023CF4: using guessed type int dword_1023CF4; // 1023CFC: using guessed type int dword_1023CFC; -// 1023D00: using guessed type char *off_1023D00; +// 1023D00: using guessed type char *lite200; // 1023D04: using guessed type int dword_1023D04; -// 1023D08: using guessed type char *off_1023D08; +// 1023D08: using guessed type char *lite199; // 1023D0C: using guessed type int dword_1023D0C; // 1023DE4: using guessed type int dword_1023DE4; // 1023DEC: using guessed type int dword_1023DEC; diff --git a/missions.cpp b/missions.cpp index c4261d6..7bcdc94 100644 --- a/missions.cpp +++ b/missions.cpp @@ -166,17 +166,17 @@ return; } } else if ( (struct TPinballComponent *)dword_1023870 == a2 -&& light_on((struct component_tag *)&off_1023884) +&& light_on((struct component_tag *)&lite56) && (**(int (__stdcall ***)(signed int, _DWORD))dword_1023978)(37, 0.0) ) { (**(void (__stdcall ***)(signed int, _DWORD))dword_1023888)(20, 0.0); (**(void (__stdcall ***)(signed int, _DWORD))dword_1023BBC)(19, 0.0); (**(void (__stdcall ***)(signed int, _DWORD))dword_1023CFC)(26, -1.0); -if ( light_on((struct component_tag *)&off_1023EB8) ) +if ( light_on((struct component_tag *)&lite317) ) (**(void (__stdcall ***)(signed int, _DWORD))dword_1023EBC)(20, 0.0); -if ( light_on((struct component_tag *)&off_1023EC0) ) +if ( light_on((struct component_tag *)&lite318) ) (**(void (__stdcall ***)(signed int, _DWORD))dword_1023EC4)(20, 0.0); -if ( light_on((struct component_tag *)&off_1023EC8) ) +if ( light_on((struct component_tag *)&lite319) ) (**(void (__stdcall ***)(signed int, _DWORD))dword_1023ECC)(20, 0.0); v10 = *(_DWORD *)(dword_1023888 + 6); *(_DWORD *)(dword_1023BBC + 6) = v10; @@ -210,17 +210,17 @@ return; } if ( (**(int (__stdcall ***)(signed int, _DWORD))dword_1023978)(37, 0.0) ) { -if ( light_on((struct component_tag *)&off_1023884) ) +if ( light_on((struct component_tag *)&lite56) ) { v8 = get_rc_string(word_1024708[2 * *(_DWORD *)(dword_1023888 + 6)], 1); v9 = get_rc_string(106, 0); _sprintf(&Dest, v9, v8); TTextBox::Display(dword_1023E24, 0, &Dest, -1.0); -if ( light_on((struct component_tag *)&off_1023EC0) ) +if ( light_on((struct component_tag *)&lite318) ) (**(void (__stdcall ***)(signed int, _DWORD))dword_1023EC4)(20, 0.0); -if ( light_on((struct component_tag *)&off_1023EC8) ) +if ( light_on((struct component_tag *)&lite319) ) (**(void (__stdcall ***)(signed int, _DWORD))dword_1023ECC)(20, 0.0); -if ( !light_on((struct component_tag *)&off_1023EB8) ) +if ( !light_on((struct component_tag *)&lite317) ) { v6 = (void (__stdcall ***)(signed int, _DWORD))dword_1023EBC; goto LABEL_28; @@ -230,11 +230,11 @@ else { v7 = get_rc_string(104, 0); TTextBox::Display(dword_1023E24, 0, v7, -1.0); -if ( light_on((struct component_tag *)&off_1023EB8) ) +if ( light_on((struct component_tag *)&lite317) ) (**(void (__stdcall ***)(signed int, _DWORD))dword_1023EBC)(20, 0.0); -if ( light_on((struct component_tag *)&off_1023EC0) ) +if ( light_on((struct component_tag *)&lite318) ) (**(void (__stdcall ***)(signed int, _DWORD))dword_1023EC4)(20, 0.0); -if ( !light_on((struct component_tag *)&off_1023EC8) ) +if ( !light_on((struct component_tag *)&lite319) ) { v6 = (void (__stdcall ***)(signed int, _DWORD))dword_1023ECC; goto LABEL_28; @@ -245,11 +245,11 @@ else { v5 = get_rc_string(105, 0); TTextBox::Display(dword_1023E24, 0, v5, -1.0); -if ( light_on((struct component_tag *)&off_1023EB8) ) +if ( light_on((struct component_tag *)&lite317) ) (**(void (__stdcall ***)(signed int, _DWORD))dword_1023EBC)(20, 0.0); -if ( light_on((struct component_tag *)&off_1023EC8) ) +if ( light_on((struct component_tag *)&lite319) ) (**(void (__stdcall ***)(signed int, _DWORD))dword_1023ECC)(20, 0.0); -if ( !light_on((struct component_tag *)&off_1023EC0) ) +if ( !light_on((struct component_tag *)&lite318) ) { v6 = (void (__stdcall ***)(signed int, _DWORD))dword_1023EC4; LABEL_28: @@ -260,7 +260,7 @@ return; } } // 1023870: using guessed type int dword_1023870; -// 1023884: using guessed type char *off_1023884; +// 1023884: using guessed type char *lite56; // 1023888: using guessed type int dword_1023888; // 1023978: using guessed type int dword_1023978; // 1023A8C: using guessed type int dword_1023A8C; @@ -273,11 +273,11 @@ return; // 1023BBC: using guessed type int dword_1023BBC; // 1023CF4: using guessed type int dword_1023CF4; // 1023CFC: using guessed type int dword_1023CFC; -// 1023EB8: using guessed type char *off_1023EB8; +// 1023EB8: using guessed type char *lite317; // 1023EBC: using guessed type int dword_1023EBC; -// 1023EC0: using guessed type char *off_1023EC0; +// 1023EC0: using guessed type char *lite318; // 1023EC4: using guessed type int dword_1023EC4; -// 1023EC8: using guessed type char *off_1023EC8; +// 1023EC8: using guessed type char *lite319; // 1023ECC: using guessed type int dword_1023ECC; // 1023EEC: using guessed type int dword_1023EEC; // 1024708: using guessed type __int16 word_1024708[]; @@ -777,9 +777,9 @@ else if ( a2 == 63 ) { if ( (struct TPinballComponent *)dword_1023C5C == a3 && *(_DWORD *)(dword_1023758 + 78) ) { -if ( light_on((struct component_tag *)&off_1023EB0) ) +if ( light_on((struct component_tag *)&lite316) ) (**(void (__stdcall ***)(signed int, _DWORD))dword_1023EB4)(20, 0.0); -if ( light_on((struct component_tag *)&off_1023EA0) ) +if ( light_on((struct component_tag *)&lite314) ) (**(void (__stdcall ***)(signed int, _DWORD))dword_1023EA4)(20, 0.0); *(_DWORD *)(dword_1023BBC + 6) = 1; MissionControl(66, 0); @@ -810,9 +810,9 @@ if ( *(_DWORD *)(dword_1023758 + 78) ) { v5 = get_rc_string(123, 0); TTextBox::Display(dword_1023E24, a1, v5, v9); -if ( light_on((struct component_tag *)&off_1023EB0) ) +if ( light_on((struct component_tag *)&lite316) ) (**(void (__stdcall ***)(signed int, _DWORD))dword_1023EB4)(20, 0.0); -if ( !light_on((struct component_tag *)&off_1023EA0) ) +if ( !light_on((struct component_tag *)&lite314) ) { v4 = (void (__stdcall ***)(signed int, _DWORD))dword_1023EA4; goto LABEL_12; @@ -822,9 +822,9 @@ else { v3 = get_rc_string(122, 0); TTextBox::Display(dword_1023E24, a1, v3, v9); -if ( light_on((struct component_tag *)&off_1023EA0) ) +if ( light_on((struct component_tag *)&lite314) ) (**(void (__stdcall ***)(signed int, _DWORD))dword_1023EA4)(20, 0.0); -if ( !light_on((struct component_tag *)&off_1023EB0) ) +if ( !light_on((struct component_tag *)&lite316) ) { v4 = (void (__stdcall ***)(signed int, _DWORD))dword_1023EB4; LABEL_12: @@ -839,9 +839,9 @@ return; // 1023BBC: using guessed type int dword_1023BBC; // 1023C5C: using guessed type int dword_1023C5C; // 1023D14: using guessed type int dword_1023D14; -// 1023EA0: using guessed type char *off_1023EA0; +// 1023EA0: using guessed type char *lite314; // 1023EA4: using guessed type int dword_1023EA4; -// 1023EB0: using guessed type char *off_1023EB0; +// 1023EB0: using guessed type char *lite316; // 1023EB4: using guessed type int dword_1023EB4; //----- (0100F900) -------------------------------------------------------- @@ -1006,7 +1006,7 @@ if ( (struct TPinballComponent *)dword_1023A9C == a3 { goto LABEL_31; } -if ( (struct TPinballComponent *)dword_1023980 != a3 || !light_on((struct component_tag *)&off_102393C) ) +if ( (struct TPinballComponent *)dword_1023980 != a3 || !light_on((struct component_tag *)&lite20) ) return; v7 = *(_DWORD *)(dword_1023888 + 6) - 1; *(_DWORD *)(dword_1023888 + 6) = v7; @@ -1016,9 +1016,9 @@ LABEL_31: MissionControl(67, a3); return; } -if ( light_on((struct component_tag *)&off_1023E48) ) +if ( light_on((struct component_tag *)&lite303) ) (**(void (__stdcall ***)(signed int, _DWORD))dword_1023E4C)(20, 0.0); -if ( light_on((struct component_tag *)&off_1023E50) ) +if ( light_on((struct component_tag *)&lite304) ) (**(void (__stdcall ***)(signed int, _DWORD))dword_1023E54)(20, 0.0); *(_DWORD *)(dword_1023BBC + 6) = 1; MissionControl(66, 0); @@ -1045,15 +1045,15 @@ else if ( a2 != 67 ) { return; } -v3 = light_on((struct component_tag *)&off_102393C); +v3 = light_on((struct component_tag *)&lite20); v11 = -1.0; if ( v3 ) { v6 = get_rc_string(128, 0); TTextBox::Display(dword_1023E24, a1, v6, v11); -if ( light_on((struct component_tag *)&off_1023E48) ) +if ( light_on((struct component_tag *)&lite303) ) (**(void (__stdcall ***)(signed int, _DWORD))dword_1023E4C)(20, 0.0); -if ( !light_on((struct component_tag *)&off_1023E50) ) +if ( !light_on((struct component_tag *)&lite304) ) { v5 = (void (__stdcall ***)(signed int, _DWORD))dword_1023E54; goto LABEL_11; @@ -1063,9 +1063,9 @@ else { v4 = get_rc_string(127, 0); TTextBox::Display(dword_1023E24, a1, v4, v11); -if ( light_on((struct component_tag *)&off_1023E50) ) +if ( light_on((struct component_tag *)&lite304) ) (**(void (__stdcall ***)(signed int, _DWORD))dword_1023E54)(20, 0.0); -if ( !light_on((struct component_tag *)&off_1023E48) ) +if ( !light_on((struct component_tag *)&lite303) ) { v5 = (void (__stdcall ***)(signed int, _DWORD))dword_1023E4C; LABEL_11: @@ -1076,7 +1076,7 @@ return; } } // 1023888: using guessed type int dword_1023888; -// 102393C: using guessed type char *off_102393C; +// 102393C: using guessed type char *lite20; // 1023940: using guessed type int dword_1023940; // 1023980: using guessed type int dword_1023980; // 10239D0: using guessed type int dword_10239D0; @@ -1085,9 +1085,9 @@ return; // 1023AAC: using guessed type int dword_1023AAC; // 1023BBC: using guessed type int dword_1023BBC; // 1023D14: using guessed type int dword_1023D14; -// 1023E48: using guessed type char *off_1023E48; +// 1023E48: using guessed type char *lite303; // 1023E4C: using guessed type int dword_1023E4C; -// 1023E50: using guessed type char *off_1023E50; +// 1023E50: using guessed type char *lite304; // 1023E54: using guessed type int dword_1023E54; //----- (0100FF35) -------------------------------------------------------- diff --git a/partman/loader.cpp b/partman/loader.cpp index fcc4c98..c9864ab 100644 --- a/partman/loader.cpp +++ b/partman/loader.cpp @@ -95,7 +95,7 @@ signed int __stdcall loader_get_sound_id(int a1) v6 = dword_1027C24[v5]; *(float *)&algn_1027C2C[20 * v1] = 0.0; v10 = v6; - if ( v6 > 0 && !dword_102556C ) + if ( v6 > 0 && !play_midi_music ) { v7 = (_WORD *)partman_field(loader_table, v6, 0); if ( v7 ) @@ -117,7 +117,7 @@ signed int __stdcall loader_get_sound_id(int a1) return result; } // 10236D8: using guessed type int sound_count; -// 102556C: using guessed type int dword_102556C; +// 102556C: using guessed type int play_midi_music; // 1027C20: using guessed type int sound_list[]; // 1027C24: using guessed type int dword_1027C24[]; // 1027C28: using guessed type int dword_1027C28[]; diff --git a/pinball.cpp b/pinball.cpp index 9089789..0a1ec07 100644 --- a/pinball.cpp +++ b/pinball.cpp @@ -877,7 +877,7 @@ render_init(0, v16, v17, *v2, v2[1]); gdrv_copy_bitmap(&vscreen, v3[3], v3[4], *(_DWORD *)((char *)v3 + 29), *(_DWORD *)((char *)v3 + 33), v3, 0, 0); gdrv_destroy_bitmap((int)v3); loader_loadfrom((_WORD *)pb_record_table); -if ( dword_102556C ) +if ( play_midi_music ) pb_mode_change(1); else pb_mode_change(3); @@ -899,7 +899,7 @@ return result; // 1024F04: using guessed type int memory_critical_allocation; // 1024F84: using guessed type int time_ticks; // 10253D0: using guessed type float ball_speed_limit; -// 102556C: using guessed type int dword_102556C; +// 102556C: using guessed type int play_midi_music; //----- (0101566E) -------------------------------------------------------- int __stdcall pb_uninit() diff --git a/pinball.h b/pinball.h index f5da5e1..424f69f 100644 --- a/pinball.h +++ b/pinball.h @@ -588,9 +588,9 @@ int dword_10237E8 = 0; // weak int dword_10237F0 = 0; // weak int dword_1023808 = 0; // weak int dword_1023810 = 0; // weak -char *off_1023814 = "lite30"; // weak +char *lite30 = "lite30"; // weak int dword_1023818 = 0; // weak -char *off_102381C = "lite29"; // weak +char *lite29 = "lite29"; // weak int dword_1023820 = 0; // weak int dword_1023828 = 0; // weak int dword_1023830 = 0; // weak @@ -599,30 +599,30 @@ int dword_1023840 = 0; // weak struct TPinballComponent *dword_1023860 = NULL; // idb int dword_1023868 = 0; // weak int dword_1023870 = 0; // weak -char *off_1023874 = "lite54"; // weak +char *lite54 = "lite54"; // weak int dword_1023878 = 0; // weak -char *off_102387C = "lite55"; // weak +char *lite55 = "lite55"; // weak int dword_1023880 = 0; // weak -char *off_1023884 = "lite56"; // weak +char *lite56 = "lite56"; // weak int dword_1023888 = 0; // weak int dword_102389C = 0; // weak int dword_10238A4 = 0; // weak -char *off_10238A8 = "lite17"; // weak +char *lite17 = "lite17"; // weak int dword_10238AC = 0; // weak -char *off_10238B0 = "lite18"; // weak +char *lite18 = "lite18"; // weak int dword_10238B4 = 0; // weak int dword_10238C0 = 0; // weak int dword_10238C8 = 0; // weak -char *off_10238CC = "lite27"; // weak +char *lite27 = "lite27"; // weak int dword_10238D0 = 0; // weak -char *off_10238D4 = "lite28"; // weak +char *lite28 = "lite28"; // weak int dword_10238D8 = 0; // weak int dword_10238E8 = 0; // weak -char *off_10238EC = "lite16"; // weak +char *lite16 = "lite16"; // weak int dword_10238F0 = 0; // weak int dword_1023924 = 0; // weak int dword_1023930 = 0; // weak -char *off_102393C = "lite20"; // weak +char *lite20 = "lite20"; // weak int dword_1023940 = 0; // weak int dword_1023948 = 0; // weak int dword_1023950 = 0; // weak @@ -633,11 +633,11 @@ int dword_1023970 = 0; // weak int dword_1023978 = 0; // weak int dword_1023980 = 0; // weak struct TPinballComponent *dword_10239A8 = NULL; // idb -char *off_10239AC = "lite25"; // weak +char *lite25 = "lite25"; // weak int dword_10239B0 = 0; // weak -char *off_10239B4 = "lite26"; // weak +char *lite26 = "lite26"; // weak int dword_10239B8 = 0; // weak -char *off_10239BC = "lite130"; // weak +char *lite130 = "lite130"; // weak int dword_10239C0 = 0; // weak int dword_10239C8 = 0; // weak int dword_10239D0 = 0; // weak @@ -648,7 +648,7 @@ int dword_1023A04 = 0; // weak int dword_1023A0C = 0; // weak int dword_1023A14 = 0; // weak int dword_1023A1C = 0; // weak -char *off_1023A20 = "lite4"; // weak +char *lite4 = "lite4"; // weak int dword_1023A24 = 0; // weak int dword_1023A2C = 0; // weak int dword_1023A34 = 0; // weak @@ -661,7 +661,7 @@ char **lites[9] = &off_1023A00, &off_1023A08, &off_1023A10, - &off_1023A20, + &lite4, &off_1023A28, &off_1023A30 }; // weak @@ -670,11 +670,11 @@ char **off_1023A4C[6] = &off_1023A00, &off_1023A08, &off_1023A10, - &off_1023A20, + &lite4, &off_1023A28, &off_1023A30 }; // weak -char **off_1023A58[3] = { &off_1023A20, &off_1023A28, &off_1023A30 }; // weak +char **off_1023A58[3] = { &lite4, &off_1023A28, &off_1023A30 }; // weak int dword_1023A74 = 0; // weak int dword_1023A7C = 0; // weak int dword_1023A84 = 0; // weak @@ -683,13 +683,13 @@ int dword_1023A94 = 0; // weak int dword_1023A9C = 0; // weak int dword_1023AA4 = 0; // weak int dword_1023AAC = 0; // weak -char *off_1023AB0 = "lite61"; // weak +char *lite61 = "lite61"; // weak int dword_1023AB4 = 0; // weak -char *off_1023AB8 = "lite60"; // weak +char *lite60 = "lite60"; // weak int dword_1023ABC = 0; // weak -char *off_1023AC0 = "lite59"; // weak +char *lite59 = "lite59"; // weak int dword_1023AC4 = 0; // weak -char *off_1023AC8 = "lite58"; // weak +char *lite58 = "lite58"; // weak int dword_1023ACC = 0; // weak int dword_1023ADC = 0; // weak int dword_1023AE4 = 0; // weak @@ -713,7 +713,7 @@ int dword_1023B9C = 0; // weak int dword_1023BA4 = 0; // weak int dword_1023BAC = 0; // weak int dword_1023BB4 = 0; // weak -char *off_1023BB8 = "lite198"; // weak +char *lite198 = "lite198"; // weak int dword_1023BBC = 0; // weak int dword_1023BC8 = 0; // weak int dword_1023BD0 = 0; // weak @@ -730,14 +730,14 @@ int dword_1023C20 = 0; // weak int dword_1023C28 = 0; // weak int dword_1023C30 = 0; // weak int dword_1023C3C = 0; // weak -char *off_1023C40 = "lite110"; // weak +char *lite110 = "lite110"; // weak int dword_1023C44 = 0; // weak int dword_1023C50 = 0; // weak int dword_1023C5C = 0; // weak int dword_1023C68 = 0; // weak int dword_1023C70 = 0; // weak int dword_1023C7C = 0; // weak -char *off_1023CB0 = "lite67"; // weak +char *lite67 = "lite67"; // weak int dword_1023CB4 = 0; // weak int dword_1023CBC = 0; // weak int dword_1023CC4 = 0; // weak @@ -748,9 +748,9 @@ int dword_1023CE4 = 0; // weak int dword_1023CEC = 0; // weak int dword_1023CF4 = 0; // weak int dword_1023CFC = 0; // weak -char *off_1023D00 = "lite200"; // weak +char *lite200 = "lite200"; // weak int dword_1023D04 = 0; // weak -char *off_1023D08 = "lite199"; // weak +char *lite199 = "lite199"; // weak int dword_1023D0C = 0; // weak int dword_1023D14 = 0; // weak int dword_1023D1C = 0; // weak @@ -789,9 +789,9 @@ TTextBox *dword_1023E24 = NULL; // idb int dword_1023E34 = 0; // weak int dword_1023E3C = 0; // weak int dword_1023E44 = 0; // weak -char *off_1023E48 = "lite303"; // weak +char *lite303 = "lite303"; // weak int dword_1023E4C = 0; // weak -char *off_1023E50 = "lite304"; // weak +char *lite304 = "lite304"; // weak int dword_1023E54 = 0; // weak int dword_1023E5C = 0; // weak int dword_1023E64 = 0; // weak @@ -802,16 +802,16 @@ int dword_1023E84 = 0; // weak int dword_1023E8C = 0; // weak int dword_1023E94 = 0; // weak int dword_1023E9C = 0; // weak -char *off_1023EA0 = "lite314"; // weak +char *lite314 = "lite314"; // weak int dword_1023EA4 = 0; // weak int dword_1023EAC = 0; // weak -char *off_1023EB0 = "lite316"; // weak +char *lite316 = "lite316"; // weak int dword_1023EB4 = 0; // weak -char *off_1023EB8 = "lite317"; // weak +char *lite317 = "lite317"; // weak int dword_1023EBC = 0; // weak -char *off_1023EC0 = "lite318"; // weak +char *lite318 = "lite318"; // weak int dword_1023EC4 = 0; // weak -char *off_1023EC8 = "lite319"; // weak +char *lite319 = "lite319"; // weak int dword_1023ECC = 0; // weak int dword_1023ED4 = 0; // weak int dword_1023EDC = 0; // weak @@ -828,28 +828,28 @@ char **off_1024470[142] = &off_102377C, &off_1023784, &off_102378C, - &off_1023814, - &off_102381C, + &lite30, + &lite29, &off_1023864, - &off_1023874, - &off_102387C, - &off_1023884, - &off_10238B0, - &off_10238CC, - &off_10238D4, - &off_10238EC, + &lite54, + &lite55, + &lite56, + &lite18, + &lite27, + &lite28, + &lite16, &off_1023984, &off_102398C, &off_1023994, &off_102399C, - &off_10239AC, - &off_10239B4, - &off_10239BC, + &lite25, + &lite26, + &lite130, &off_1023A00, &off_1023A08, &off_1023A10, &off_1023A18, - &off_1023A20, + &lite4, &off_1023A28, &off_1023A30, &off_1023A38, @@ -862,10 +862,10 @@ char **off_1024470[142] = &off_1023964, &off_102396C, &off_1023974, - &off_102393C, + &lite20, &off_10239CC, - &off_1023AB0, - &off_1023AC8, + &lite61, + &lite58, &off_1023AF0, &off_1023AF8, &off_1023B00, @@ -885,9 +885,9 @@ char **off_1024470[142] = &off_1023C1C, &off_1023C24, &off_1023C2C, - &off_1023C40, + &lite110, &off_1023C6C, - &off_1023CB0, + &lite67, &off_1023CB8, &off_1023CC0, &off_1023CC8, @@ -895,7 +895,7 @@ char **off_1024470[142] = &off_1023CD8, &off_1023CE0, &off_1023CE8, - &off_1023BB8, + &lite198, &off_1023CF0, &off_1023CF8, &off_1023D10, @@ -924,7 +924,7 @@ char **off_1024470[142] = &off_1023DD0, &off_1023DD8, &off_1023DE0, - &off_1023D08, + &lite199, &off_1023824, &off_102382C, &off_1023E18, @@ -939,8 +939,8 @@ char **off_1024470[142] = &off_1023E30, &off_1023E38, &off_1023E40, - &off_1023E48, - &off_1023E50, + &lite303, + &lite304, &off_1023E58, &off_1023E60, &off_1023E68, @@ -950,12 +950,12 @@ char **off_1024470[142] = &off_1023E88, &off_1023E90, &off_1023E98, - &off_1023EA0, + &lite314, &off_1023EA8, - &off_1023EB0, - &off_1023EB8, - &off_1023EC0, - &off_1023EC8, + &lite316, + &lite317, + &lite318, + &lite319, &off_1023ED0, &off_1023ED8, &off_1023EE0,