diff --git a/Classes/Objlist/Objlist.cpp b/Classes/Objlist/Objlist.cpp index d6b5d36..5d81907 100644 --- a/Classes/Objlist/Objlist.cpp +++ b/Classes/Objlist/Objlist.cpp @@ -1,7 +1,7 @@ #include "pinball.h" //----- (01012E51) -------------------------------------------------------- -int __stdcall objlist_add_object(_DWORD *a1, int a2) +int objlist_add_object(DWORD *a1, int a2) { int v2; // ecx @@ -13,17 +13,17 @@ return ++a1[1]; } //----- (01012E7A) -------------------------------------------------------- -signed int __stdcall objlist_delete_object(int a1, int a2) +signed int objlist_delete_object(int a1, int a2) { int v2; // edx int v3; // ecx -_DWORD *v4; // esi +DWORD *v4; // esi -v2 = *(_DWORD *)(a1 + 4); +v2 = *(DWORD *)(a1 + 4); v3 = v2 - 1; if ( v2 - 1 < 0 ) return 0; -v4 = (_DWORD *)(a1 + 4 * v3 + 8); +v4 = (DWORD *)(a1 + 4 * v3 + 8); while ( *v4 != a2 ) { --v3; @@ -31,17 +31,17 @@ while ( *v4 != a2 ) if ( v3 < 0 ) return 0; } -*(_DWORD *)(a1 + 4 * v3 + 8) = *(_DWORD *)(a1 + 4 * v2 + 4); ---*(_DWORD *)(a1 + 4); +*(DWORD *)(a1 + 4 * v3 + 8) = *(DWORD *)(a1 + 4 * v2 + 4); +--*(DWORD *)(a1 + 4); return 1; } //----- (01012EBE) -------------------------------------------------------- -_DWORD *__stdcall objlist_new(int a1) +DWORD *objlist_new(int a1) { -_DWORD *result; // eax +DWORD *result; // eax -result = (_DWORD *)memoryallocate(4 * a1 + 12); +result = (DWORD *)memoryallocate(4 * a1 + 12); if ( result ) { result[1] = 0; @@ -51,7 +51,7 @@ return result; } //----- (01012EE8) -------------------------------------------------------- -int *__stdcall objlist_grow(int *a1, int a2) +int *objlist_grow(int *a1, int a2) { int *v2; // esi int v3; // eax @@ -75,7 +75,7 @@ return v2; } //----- (01013C6F) -------------------------------------------------------- -void __stdcall objlist_destroy(int a1) +void objlist_destroy(int a1) { if ( a1 ) memoryfree(a1); diff --git a/Classes/Objlist/Objlist_Class.cpp b/Classes/Objlist/Objlist_Class.cpp index ca35d1a..f6bdee6 100644 --- a/Classes/Objlist/Objlist_Class.cpp +++ b/Classes/Objlist/Objlist_Class.cpp @@ -10,15 +10,15 @@ objlist_class *__thiscall objlist_class::objlist_class(objlist_class *this, int objlist_class *v3; // esi v3 = this; -*((_DWORD *)this + 1) = objlist_new(a2); -*(_DWORD *)v3 = a3; +*((DWORD *)this + 1) = objlist_new(a2); +*(DWORD *)v3 = a3; return v3; } //----- (010098F7) -------------------------------------------------------- void __thiscall objlist_class::Grow(objlist_class *this) { - *((_DWORD *)this + 1) = objlist_grow(*((int **)this + 1), *(_DWORD *)this); + *((DWORD *)this + 1) = objlist_grow(*((int **)this + 1), *(DWORD *)this); } //----- (0100ACF3) -------------------------------------------------------- @@ -27,7 +27,7 @@ void __thiscall objlist_class::Add(objlist_class *this, void *a2) objlist_class *v2; // esi v2 = this; - if ( *(_DWORD *)(*((_DWORD *)this + 1) + 4) == **((_DWORD **)this + 1) ) + if ( *(DWORD *)(*((DWORD *)this + 1) + 4) == **((DWORD **)this + 1) ) objlist_class::Grow(this); - objlist_add_object(*((_DWORD **)v2 + 1), (int)a2); + objlist_add_object(*((DWORD **)v2 + 1), (int)a2); } diff --git a/Classes/TBall/TBall.cpp b/Classes/TBall/TBall.cpp index 939cb99..a4b29d9 100644 --- a/Classes/TBall/TBall.cpp +++ b/Classes/TBall/TBall.cpp @@ -10,7 +10,7 @@ bool __thiscall TBall::already_hit(TBall *this, struct TEdgeSegment *a2) int v2; // esi bool result; // al -v2 = *(_DWORD *)((char *)this + 134); +v2 = *(DWORD *)((char *)this + 134); if ( !v2 ) return 0; result = 1; @@ -34,7 +34,7 @@ if ( *(struct TEdgeSegment **)((char *)this + 130) != a2 ) { result = 0; if ( v2 != 5 ) -result = v2 == (_DWORD)a2; +result = v2 == (DWORD)a2; } } return result; @@ -45,11 +45,11 @@ void __thiscall TBall::not_again(TBall *this, struct TEdgeSegment *a2) { signed int v2; // edx -v2 = *(_DWORD *)((char *)this + 134); +v2 = *(DWORD *)((char *)this + 134); if ( v2 < 5 ) { -*(_DWORD *)((char *)this + 4 * v2 + 114) = a2; -++*(_DWORD *)((char *)this + 134); +*(DWORD *)((char *)this + 4 * v2 + 114) = a2; +++*(DWORD *)((char *)this + 134); } } @@ -62,16 +62,16 @@ int v4; // eax v3 = this; if ( a2 == 1024 ) { -render_ball_set(*(_DWORD *)((char *)this + 26), 0, 0.0, 0, 0); -v4 = *(_DWORD *)((char *)v3 + 154); +render_ball_set(*(DWORD *)((char *)this + 26), 0, 0.0, 0, 0); +v4 = *(DWORD *)((char *)v3 + 154); *(float *)((char *)v3 + 42) = 0.0; -*(_DWORD *)((char *)v3 + 106) = 0; +*(DWORD *)((char *)v3 + 106) = 0; *(float *)((char *)v3 + 46) = 0.0; *((_BYTE *)v3 + 5) = 0; -*(_DWORD *)((char *)v3 + 150) = 0; -*(_DWORD *)((char *)v3 + 110) = 1; +*(DWORD *)((char *)v3 + 150) = 0; +*(DWORD *)((char *)v3 + 110) = 1; *(float *)((char *)v3 + 58) = 0.0; -*(_DWORD *)((char *)v3 + 50) = v4; +*(DWORD *)((char *)v3 + 50) = v4; *(float *)((char *)v3 + 54) = 0.0; *(float *)((char *)v3 + 66) = 0.0; *(float *)((char *)v3 + 70) = 0.0; @@ -93,16 +93,16 @@ int v8; // [esp+14h] [ebp-8h] int v9; // [esp+18h] [ebp-4h] v1 = this; -if ( *(_DWORD *)((char *)this + 150) ) +if ( *(DWORD *)((char *)this + 150) ) *(float *)((char *)this + 50) = *(float *)((char *)this + 142) * *(float *)((char *)this + 46) + *(float *)((char *)this + 138) * *(float *)((char *)this + 42) + *(float *)((char *)this + 154) + *(float *)((char *)this + 146); proj_xform_to_2d((float *)((char *)this + 42), &v8); v2 = proj_z_distance((char *)v1 + 42); -v3 = *(_DWORD *)(*(_DWORD *)((char *)v1 + 34) + 4); +v3 = *(DWORD *)(*(DWORD *)((char *)v1 + 34) + 4); v4 = 0; -if ( *(_DWORD *)(v3 + 4) - 1 > 0 ) +if ( *(DWORD *)(v3 + 4) - 1 > 0 ) { v5 = (float *)((char *)v1 + 162); do @@ -112,15 +112,15 @@ break; ++v4; ++v5; } -while ( v4 < *(_DWORD *)(v3 + 4) - 1 ); +while ( v4 < *(DWORD *)(v3 + 4) - 1 ); } -v6 = *(_DWORD *)(v3 + 4 * v4 + 8); -v8 += *(_DWORD *)(v6 + 12) / -2; -v9 += *(_DWORD *)(v6 + 16) / -2; +v6 = *(DWORD *)(v3 + 4 * v4 + 8); +v8 += *(DWORD *)(v6 + 12) / -2; +v9 += *(DWORD *)(v6 + 16) / -2; v7 = v2; -render_ball_set(*(_DWORD *)((char *)v1 + 26), v6, v7, v8, v9); +render_ball_set(*(DWORD *)((char *)v1 + 26), v6, v7, v8, v9); } -// 1008ED8: using guessed type double __stdcall proj_z_distance(_DWORD); +// 1008ED8: using guessed type double proj_z_distance(DWORD); //----- (01019309) -------------------------------------------------------- TBall *__thiscall TBall::TBall(TBall *this, struct TPinballTable *a2) @@ -144,14 +144,14 @@ struct TPinballTable *v17; // [esp+64h] [ebp+8h] v2 = this; TPinballComponent::TPinballComponent(this, a2, -1, 0); *(float *)((char *)v2 + 78) = 0.0; -*(_DWORD *)v2 = &TBall::vftable; +*(DWORD *)v2 = &TBall::vftable; *(float *)((char *)v2 + 70) = 0.0; *((_BYTE *)v2 + 5) = 1; -*(_DWORD *)((char *)v2 + 106) = 0; -*(_DWORD *)((char *)v2 + 134) = 0; +*(DWORD *)((char *)v2 + 106) = 0; +*(DWORD *)((char *)v2 + 134) = 0; *(float *)((char *)v2 + 74) = 0.0; -*(_DWORD *)((char *)v2 + 110) = 1; -*(_DWORD *)((char *)v2 + 150) = 0; +*(DWORD *)((char *)v2 + 110) = 1; +*(DWORD *)((char *)v2 + 150) = 0; *(float *)((char *)v2 + 66) = 0.0; *(float *)((char *)v2 + 58) = 0.0; *(float *)((char *)v2 + 54) = 0.0; @@ -170,9 +170,9 @@ else { v5 = 0; } -*(_DWORD *)((char *)v2 + 34) = v5; +*(DWORD *)((char *)v2 + 34) = v5; v6 = loader_query_handle("ball"); -*(_DWORD *)((char *)v2 + 154) = *(_DWORD *)loader_query_float_attribute(v6, 0, 500); +*(DWORD *)((char *)v2 + 154) = *(DWORD *)loader_query_float_attribute(v6, 0, 500); v15 = loader_query_visual_states(v6); v17 = 0; if ( v15 > 0 ) @@ -193,11 +193,11 @@ v17 = (struct TPinballTable *)((char *)v17 + 1); while ( (signed int)v17 < v15 ); } v10 = render_create_sprite(2, 0, 0, 0, 0, 0); -v11 = *(_DWORD *)((char *)v2 + 154); -*(_DWORD *)((char *)v2 + 26) = v10; -*(_DWORD *)(*(_DWORD *)((char *)v2 + 30) + 282) = v11; -*(_DWORD *)((char *)v2 + 50) = *(_DWORD *)((char *)v2 + 154); +v11 = *(DWORD *)((char *)v2 + 154); +*(DWORD *)((char *)v2 + 26) = v10; +*(DWORD *)(*(DWORD *)((char *)v2 + 30) + 282) = v11; +*(DWORD *)((char *)v2 + 50) = *(DWORD *)((char *)v2 + 154); return v2; } // 1002554: using guessed type void *TBall::vftable; -// 1008ED8: using guessed type double __stdcall proj_z_distance(_DWORD); +// 1008ED8: using guessed type double proj_z_distance(DWORD); diff --git a/Classes/TBlocker/TBlocker.cpp b/Classes/TBlocker/TBlocker.cpp index 26079c9..7e6935e 100644 --- a/Classes/TBlocker/TBlocker.cpp +++ b/Classes/TBlocker/TBlocker.cpp @@ -4,7 +4,7 @@ int __thiscall TBlocker::Message(TBlocker *this, int a2, float a3) { TBlocker *v3; // esi -_DWORD *v4; // ST04_4 +DWORD *v4; // ST04_4 int v6; // ST08_4 double v7; // st7 float v8; // ST00_4 @@ -14,25 +14,25 @@ switch ( a2 ) { case 51: LABEL_7: -if ( *(_DWORD *)((char *)this + 86) ) +if ( *(DWORD *)((char *)this + 86) ) { -timer_kill(*(_DWORD *)((char *)this + 86)); -*(_DWORD *)((char *)v3 + 86) = 0; +timer_kill(*(DWORD *)((char *)this + 86)); +*(DWORD *)((char *)v3 + 86) = 0; } -*(_DWORD *)((char *)v3 + 6) = 0; -v4 = *(_DWORD **)((char *)v3 + 26); +*(DWORD *)((char *)v3 + 6) = 0; +v4 = *(DWORD **)((char *)v3 + 26); *((_BYTE *)v3 + 5) = 0; render_sprite_set_bitmap(v4, 0); if ( a2 == 51 ) -loader_play_sound(*(_DWORD *)((char *)v3 + 94)); +loader_play_sound(*(DWORD *)((char *)v3 + 94)); return 0; case 52: -v6 = *(_DWORD *)((char *)this + 90); +v6 = *(DWORD *)((char *)this + 90); *((_BYTE *)this + 5) = 1; loader_play_sound(v6); render_sprite_set_bitmap( -*(_DWORD **)((char *)v3 + 26), -*(_DWORD *)(*(_DWORD *)(*(_DWORD *)((char *)v3 + 34) + 4) + 8)); +*(DWORD **)((char *)v3 + 26), +*(DWORD *)(*(DWORD *)(*(DWORD *)((char *)v3 + 34) + 4) + 8)); break; case 59: break; @@ -43,21 +43,21 @@ goto LABEL_7; default: return 0; } -if ( *(_DWORD *)((char *)v3 + 86) ) -timer_kill(*(_DWORD *)((char *)v3 + 86)); +if ( *(DWORD *)((char *)v3 + 86) ) +timer_kill(*(DWORD *)((char *)v3 + 86)); if ( a3 <= 0.0 ) v7 = 0.0; else v7 = a3; v8 = v7; -*(_DWORD *)((char *)v3 + 86) = timer_set(v8, (int)v3, (int)TBlocker::TimerExpired); +*(DWORD *)((char *)v3 + 86) = timer_set(v8, (int)v3, (int)TBlocker::TimerExpired); return 0; } //----- (010162FF) -------------------------------------------------------- -void __stdcall TBlocker::TimerExpired(int a1, struct TPinballComponent *a2) +void TBlocker::TimerExpired(int a1, struct TPinballComponent *a2) { -*(_DWORD *)((char *)a2 + 86) = 0; +*(DWORD *)((char *)a2 + 86) = 0; control_handler(60, a2); } @@ -65,23 +65,23 @@ control_handler(60, a2); TBlocker *__thiscall TBlocker::TBlocker(TBlocker *this, struct TPinballTable *a2, int a3) { TBlocker *v3; // esi -_DWORD *v4; // ST04_4 +DWORD *v4; // ST04_4 char v6; // [esp+8h] [ebp-48h] int v7; // [esp+40h] [ebp-10h] int v8; // [esp+44h] [ebp-Ch] v3 = this; TCollisionComponent::TCollisionComponent(this, a2, a3, 1); -*(_DWORD *)v3 = &TBlocker::vftable; +*(DWORD *)v3 = &TBlocker::vftable; loader_query_visual(a3, 0, &v6); -v4 = *(_DWORD **)((char *)v3 + 26); -*(_DWORD *)((char *)v3 + 90) = v7; -*(_DWORD *)((char *)v3 + 94) = v8; -*(_DWORD *)((char *)v3 + 78) = 55; -*(_DWORD *)((char *)v3 + 82) = 5; -*(_DWORD *)((char *)v3 + 66) = 1315859240; -*(_DWORD *)((char *)v3 + 86) = 0; -*(_DWORD *)((char *)v3 + 6) = 0; +v4 = *(DWORD **)((char *)v3 + 26); +*(DWORD *)((char *)v3 + 90) = v7; +*(DWORD *)((char *)v3 + 94) = v8; +*(DWORD *)((char *)v3 + 78) = 55; +*(DWORD *)((char *)v3 + 82) = 5; +*(DWORD *)((char *)v3 + 66) = 1315859240; +*(DWORD *)((char *)v3 + 86) = 0; +*(DWORD *)((char *)v3 + 6) = 0; *((_BYTE *)v3 + 5) = 0; render_sprite_set_bitmap(v4, 0); return v3; diff --git a/Classes/TBlocker/TBlocker.h b/Classes/TBlocker/TBlocker.h index 7acf800..962fdd8 100644 --- a/Classes/TBlocker/TBlocker.h +++ b/Classes/TBlocker/TBlocker.h @@ -10,7 +10,7 @@ /* 130 */ struct TBlocker; -void __stdcall TBlocker::TimerExpired(int, struct TPinballComponent*); // idb +void TBlocker::TimerExpired(int, struct TPinballComponent*); // idb int __thiscall TBlocker::Message(TBlocker* this, int, float); // idb TBlocker* __thiscall TBlocker::TBlocker(TBlocker* this, struct TPinballTable* a2, int a3); diff --git a/Classes/TBumper/TBumper.cpp b/Classes/TBumper/TBumper.cpp index af24f51..e340194 100644 --- a/Classes/TBumper/TBumper.cpp +++ b/Classes/TBumper/TBumper.cpp @@ -1,23 +1,23 @@ #include "TBumper.h" //----- (01015CB2) -------------------------------------------------------- -void __stdcall TBumper::TimerExpired(int a1, void *a2) +void TBumper::TimerExpired(int a1, void *a2) { int v2; // edx int v3; // ecx int v4; // eax -v2 = *(_DWORD *)((char *)a2 + 30); -v3 = 8 * *(_DWORD *)((char *)a2 + 78) + 8; -v4 = *(_DWORD *)(v3 + *(_DWORD *)(*(_DWORD *)((char *)a2 + 34) + 4)); -*(_DWORD *)((char *)a2 + 82) = 0; +v2 = *(DWORD *)((char *)a2 + 30); +v3 = 8 * *(DWORD *)((char *)a2 + 78) + 8; +v4 = *(DWORD *)(v3 + *(DWORD *)(*(DWORD *)((char *)a2 + 34) + 4)); +*(DWORD *)((char *)a2 + 82) = 0; render_sprite_set( -*(_DWORD **)((char *)a2 + 26), +*(DWORD **)((char *)a2 + 26), v4, -*(_DWORD *)(*(_DWORD *)(*(_DWORD *)((char *)a2 + 38) + 4) + v3), -*(_DWORD *)(v4 + 29) - *(_DWORD *)(v2 + 234), -*(_DWORD *)(v4 + 33) - *(_DWORD *)(v2 + 238)); -*(_DWORD *)((char *)a2 + 66) = *(_DWORD *)((char *)a2 + 90); +*(DWORD *)(*(DWORD *)(*(DWORD *)((char *)a2 + 38) + 4) + v3), +*(DWORD *)(v4 + 29) - *(DWORD *)(v2 + 234), +*(DWORD *)(v4 + 33) - *(DWORD *)(v2 + 238)); +*(DWORD *)((char *)a2 + 66) = *(DWORD *)((char *)a2 + 90); } //----- (01015D0F) -------------------------------------------------------- @@ -30,18 +30,18 @@ int v4; // ecx int v5; // eax v1 = this; -v2 = *(_DWORD *)((char *)this + 30); -v3 = 2 * *(_DWORD *)((char *)this + 78) + 1; -*(_DWORD *)((char *)this + 66) = 1315859240; +v2 = *(DWORD *)((char *)this + 30); +v3 = 2 * *(DWORD *)((char *)this + 78) + 1; +*(DWORD *)((char *)this + 66) = 1315859240; v4 = 4 * v3 + 8; -v5 = *(_DWORD *)(v4 + *(_DWORD *)(*(_DWORD *)((char *)v1 + 34) + 4)); +v5 = *(DWORD *)(v4 + *(DWORD *)(*(DWORD *)((char *)v1 + 34) + 4)); render_sprite_set( -*(_DWORD **)((char *)v1 + 26), -*(_DWORD *)(v4 + *(_DWORD *)(*(_DWORD *)((char *)v1 + 34) + 4)), -*(_DWORD *)(*(_DWORD *)(*(_DWORD *)((char *)v1 + 38) + 4) + v4), -*(_DWORD *)(v5 + 29) - *(_DWORD *)(v2 + 234), -*(_DWORD *)(v5 + 33) - *(_DWORD *)(v2 + 238)); -*(_DWORD *)((char *)v1 + 82) = timer_set(*(float *)((char *)v1 + 86), (int)v1, (int)TBumper::TimerExpired); +*(DWORD **)((char *)v1 + 26), +*(DWORD *)(v4 + *(DWORD *)(*(DWORD *)((char *)v1 + 34) + 4)), +*(DWORD *)(*(DWORD *)(*(DWORD *)((char *)v1 + 38) + 4) + v4), +*(DWORD *)(v5 + 29) - *(DWORD *)(v2 + 234), +*(DWORD *)(v5 + 33) - *(DWORD *)(v2 + 238)); +*(DWORD *)((char *)v1 + 82) = timer_set(*(float *)((char *)v1 + 86), (int)v1, (int)TBumper::TimerExpired); } //----- (01015D79) -------------------------------------------------------- @@ -50,7 +50,7 @@ int __thiscall TBumper::Message(TBumper *this, int a2, float a3) TBumper *v3; // esi int v4; // eax int v5; // ecx -_DWORD *v6; // eax +DWORD *v6; // eax char *v7; // eax char *v8; // eax double v9; // st7 @@ -65,8 +65,8 @@ if ( a2 != 11 ) { if ( a2 == 12 ) { -v15 = *(_DWORD *)((char *)this + 78) + 1; -v11 = *(_DWORD *)(*(_DWORD *)(*(_DWORD *)((char *)this + 34) + 4) + 4) - 1; +v15 = *(DWORD *)((char *)this + 78) + 1; +v11 = *(DWORD *)(*(DWORD *)(*(DWORD *)((char *)this + 34) + 4) + 4) - 1; if ( 2 * v15 > v11 ) v15 = v11 / 2; } @@ -78,18 +78,18 @@ if ( a2 != 1020 ) { if ( a2 == 1024 ) { -if ( *(_DWORD *)((char *)this + 82) ) +if ( *(DWORD *)((char *)this + 82) ) { -timer_kill(*(_DWORD *)((char *)this + 82)); -TBumper::TimerExpired(*(_DWORD *)((char *)v3 + 82), (void *)v3); +timer_kill(*(DWORD *)((char *)this + 82)); +TBumper::TimerExpired(*(DWORD *)((char *)v3 + 82), (void *)v3); } -v4 = *(_DWORD *)((char *)v3 + 30); -*(_DWORD *)((char *)v3 + 78) = 0; -*(_DWORD *)((char *)v3 + 6) = 0; +v4 = *(DWORD *)((char *)v3 + 30); +*(DWORD *)((char *)v3 + 78) = 0; +*(DWORD *)((char *)v3 + 6) = 0; v5 = 0; -if ( *(_DWORD *)(v4 + 214) > 0 ) +if ( *(DWORD *)(v4 + 214) > 0 ) { -v6 = (_DWORD *)((char *)v3 + 118); +v6 = (DWORD *)((char *)v3 + 118); do { v6[1] = 0; @@ -97,25 +97,25 @@ v6[1] = 0; ++v5; v6 += 2; } -while ( v5 < *(_DWORD *)(*(_DWORD *)((char *)v3 + 30) + 214) ); +while ( v5 < *(DWORD *)(*(DWORD *)((char *)v3 + 30) + 214) ); } TBumper::TimerExpired(0, (void *)v3); } return 0; } -v7 = (char *)this + 8 * *(_DWORD *)(*(_DWORD *)((char *)this + 30) + 218); -*(_DWORD *)(v7 + 122) = *(_DWORD *)((char *)this + 78); -*(_DWORD *)(v7 + 118) = *(_DWORD *)((char *)this + 6); +v7 = (char *)this + 8 * *(DWORD *)(*(DWORD *)((char *)this + 30) + 218); +*(DWORD *)(v7 + 122) = *(DWORD *)((char *)this + 78); +*(DWORD *)(v7 + 118) = *(DWORD *)((char *)this + 6); v8 = (char *)this + 8 * (unsigned __int64)(signed __int64)_floor(a3); -*(_DWORD *)((char *)v3 + 78) = *(_DWORD *)(v8 + 122); +*(DWORD *)((char *)v3 + 78) = *(DWORD *)(v8 + 122); v9 = (double)*(signed int *)((char *)v3 + 78); -*(_DWORD *)((char *)v3 + 6) = *(_DWORD *)(v8 + 118); +*(DWORD *)((char *)v3 + 6) = *(DWORD *)(v8 + 118); LABEL_16: v10 = v9; TBumper::Message(v3, 11, v10); return 0; } -v15 = *(_DWORD *)((char *)this + 78) - 1; +v15 = *(DWORD *)((char *)this + 78) - 1; if ( v15 < 0 ) v15 = 0; } @@ -123,18 +123,18 @@ v9 = (double)v15; goto LABEL_16; } v12 = (signed __int64)_floor(a3); -if ( 2 * v12 > *(_DWORD *)(*(_DWORD *)(*(_DWORD *)((char *)v3 + 34) + 4) + 4) - 1 ) -v12 = (*(_DWORD *)(*(_DWORD *)(*(_DWORD *)((char *)v3 + 34) + 4) + 4) - 1) / 2; +if ( 2 * v12 > *(DWORD *)(*(DWORD *)(*(DWORD *)((char *)v3 + 34) + 4) + 4) - 1 ) +v12 = (*(DWORD *)(*(DWORD *)(*(DWORD *)((char *)v3 + 34) + 4) + 4) - 1) / 2; if ( v12 < 0 ) v12 = 0; -v13 = *(_DWORD *)((char *)v3 + 78); +v13 = *(DWORD *)((char *)v3 + 78); if ( v12 != v13 ) { if ( v12 >= v13 ) -loader_play_sound(*(_DWORD *)((char *)v3 + 94)); -if ( v12 < *(_DWORD *)((char *)v3 + 78) ) -loader_play_sound(*(_DWORD *)((char *)v3 + 98)); -*(_DWORD *)((char *)v3 + 78) = v12; +loader_play_sound(*(DWORD *)((char *)v3 + 94)); +if ( v12 < *(DWORD *)((char *)v3 + 78) ) +loader_play_sound(*(DWORD *)((char *)v3 + 98)); +*(DWORD *)((char *)v3 + 78) = v12; TBumper::Fire(v3); control_handler(11, v3); } @@ -149,7 +149,7 @@ int result; // eax if ( a2 >= 4 ) result = 0; else -result = *(_DWORD *)((char *)this + 4 * a2 + 102); +result = *(DWORD *)((char *)this + 4 * a2 + 102); return result; } @@ -157,7 +157,7 @@ return result; void __thiscall TBumper::put_scoring(TBumper *this, int a2, int a3) { if ( a2 < 4 ) -*(_DWORD *)((char *)this + 4 * a2 + 102) = a3; +*(DWORD *)((char *)this + 4 * a2 + 102) = a3; } //----- (0101811D) -------------------------------------------------------- @@ -183,14 +183,14 @@ int v7; // [esp+40h] [ebp-Ch] v3 = this; TCollisionComponent::TCollisionComponent(this, a2, a3, 1); -*(_DWORD *)((char *)v3 + 78) = 0; -*(_DWORD *)((char *)v3 + 82) = 0; -*(_DWORD *)v3 = &TBumper::vftable; -*(_DWORD *)((char *)v3 + 86) = *(_DWORD *)loader_query_float_attribute(a3, 0, 407); +*(DWORD *)((char *)v3 + 78) = 0; +*(DWORD *)((char *)v3 + 82) = 0; +*(DWORD *)v3 = &TBumper::vftable; +*(DWORD *)((char *)v3 + 86) = *(DWORD *)loader_query_float_attribute(a3, 0, 407); loader_query_visual(a3, 0, &v5); -*(_DWORD *)((char *)v3 + 94) = v6; -*(_DWORD *)((char *)v3 + 98) = v7; -*(_DWORD *)((char *)v3 + 90) = *(_DWORD *)((char *)v3 + 66); +*(DWORD *)((char *)v3 + 94) = v6; +*(DWORD *)((char *)v3 + 98) = v7; +*(DWORD *)((char *)v3 + 90) = *(DWORD *)((char *)v3 + 66); return v3; } // 100256C: using guessed type void *TBumper::vftable; diff --git a/Classes/TBumper/TBumper.h b/Classes/TBumper/TBumper.h index 7c2a720..e0174d5 100644 --- a/Classes/TBumper/TBumper.h +++ b/Classes/TBumper/TBumper.h @@ -10,7 +10,7 @@ /* 104 */ struct TBumper; -void __stdcall TBumper::TimerExpired(int, void*); // idb +void TBumper::TimerExpired(int, void*); // idb void __thiscall TBumper::Fire(TBumper* this); // idb int __thiscall TBumper::Message(TBumper* this, int, float); // idb int __thiscall TBumper::get_scoring(TBumper* this, int); // idb diff --git a/Classes/TCircle/TCircle.cpp b/Classes/TCircle/TCircle.cpp index 541a27e..e6271b7 100644 --- a/Classes/TCircle/TCircle.cpp +++ b/Classes/TCircle/TCircle.cpp @@ -7,11 +7,11 @@ TCircle *v6; // ebx v6 = this; TEdgeSegment::TEdgeSegment(this, a2, a3, a4); -*(_DWORD *)v6 = &TCircle::vftable; +*(DWORD *)v6 = &TCircle::vftable; *(float *)((char *)v6 + 33) = a6 * a6; -*(_DWORD *)((char *)v6 + 21) = *(_DWORD *)a5; -*(_DWORD *)((char *)v6 + 25) = *((_DWORD *)a5 + 1); -*(_DWORD *)((char *)v6 + 29) = *((_DWORD *)a5 + 2); +*(DWORD *)((char *)v6 + 21) = *(DWORD *)a5; +*(DWORD *)((char *)v6 + 25) = *((DWORD *)a5 + 1); +*(DWORD *)((char *)v6 + 29) = *((DWORD *)a5 + 2); return v6; } // 1002454: using guessed type void *TCircle::vftable; @@ -44,7 +44,7 @@ v8 = a3 * *(float *)((char *)a2 + 58) + *(float *)((char *)a2 + 46); v5 = v7 - *(float *)((char *)this + 21); v6 = v8 - *(float *)((char *)this + 25); normalize_2d(&v5); -(*(void (__stdcall **)(int, float *, float *, _DWORD, TCircle *))(**((_DWORD **)v3 + 1) + 20))( +(*(void (**)(int, float *, float *, DWORD, TCircle *))(**((DWORD **)v3 + 1) + 20))( v4, &v7, &v5, diff --git a/Classes/TCollisionComponent/TCollisionComponent.cpp b/Classes/TCollisionComponent/TCollisionComponent.cpp index 38f5f34..3767497 100644 --- a/Classes/TCollisionComponent/TCollisionComponent.cpp +++ b/Classes/TCollisionComponent/TCollisionComponent.cpp @@ -9,14 +9,14 @@ int v3; // esi int v4; // ebx v1 = this; -v2 = *(_DWORD *)(*(_DWORD *)((char *)this + 46) + 4) - 1; +v2 = *(DWORD *)(*(DWORD *)((char *)this + 46) + 4) - 1; if ( v2 >= 0 ) { v3 = 4 * v2 + 8; -v4 = *(_DWORD *)(*(_DWORD *)((char *)this + 46) + 4); +v4 = *(DWORD *)(*(DWORD *)((char *)this + 46) + 4); do { -(*(void (**)(void))(**(_DWORD **)(v3 + *(_DWORD *)((char *)v1 + 46)) + 4))(); +(*(void (**)(void))(**(DWORD **)(v3 + *(DWORD *)((char *)v1 + 46)) + 4))(); v3 -= 4; --v4; } @@ -25,7 +25,7 @@ while ( v4 ); } //----- (01017883) -------------------------------------------------------- -double __stdcall basic_collision(struct TBall *a1, struct vector_type *a2, struct vector_type *a3, float a4, float a5, float a6, float a7) +double basic_collision(struct TBall *a1, struct vector_type *a2, struct vector_type *a3, float a4, float a5, float a6, float a7) { int v7; // ST30_4 float *v8; // esi @@ -45,10 +45,10 @@ float v23; // [esp+3Ch] [ebp+Ch] float v24; // [esp+3Ch] [ebp+Ch] *(float *)((char *)a1 + 42) = *(float *)a2; -*(_DWORD *)((char *)a1 + 46) = *((_DWORD *)a2 + 1); +*(DWORD *)((char *)a1 + 46) = *((DWORD *)a2 + 1); v21 = *(float *)a3; v22 = *((float *)a3 + 1); -v7 = *((_DWORD *)a3 + 2); +v7 = *((DWORD *)a3 + 2); v8 = (float *)((char *)a1 + 54); v9 = -(v22 * *(float *)((char *)a1 + 58) + *(float *)a3 * *(float *)((char *)a1 + 54)); v23 = v9; @@ -81,7 +81,7 @@ return v24; } //----- (010179A9) -------------------------------------------------------- -struct TEdgeSegment *__stdcall install_wall(float *a1, struct TCollisionComponent *a2, char *a3, unsigned int a4, float a5, void *a6) +struct TEdgeSegment *install_wall(float *a1, struct TCollisionComponent *a2, char *a3, unsigned int a4, float a5, void *a6) { signed __int64 v6; // rax float *v7; // esi @@ -130,7 +130,7 @@ v7 = a1 + 1; v8 = a1 + 1; v45 = v6; v44 = a1 + 1; -if ( !(_DWORD)v6 ) +if ( !(DWORD)v6 ) { v41 = *(int *)v7; v42 = a1[2]; @@ -148,19 +148,19 @@ v12 = 0; v46 = v12; if ( !v12 ) goto LABEL_14; -*(_DWORD *)((char *)v12 + 13) = a6; +*(DWORD *)((char *)v12 + 13) = a6; LABEL_13: -(*(void (__thiscall **)(TCircle *))(*(_DWORD *)v12 + 8))(v12); +(*(void (__thiscall **)(TCircle *))(*(DWORD *)v12 + 8))(v12); LABEL_14: objlist_class::Add((struct TCollisionComponent *)((char *)v10 + 42), (void *)v12); return v46; } -if ( (_DWORD)v6 == 1 ) +if ( (DWORD)v6 == 1 ) { -v37 = *(_DWORD *)v7; -v38 = *((_DWORD *)a1 + 2); -v39 = *((_DWORD *)a1 + 3); -v40 = *((_DWORD *)a1 + 4); +v37 = *(DWORD *)v7; +v38 = *((DWORD *)a1 + 2); +v39 = *((DWORD *)a1 + 3); +v40 = *((DWORD *)a1 + 4); v13 = (TLine *)operator new(0x55u); v10 = a2; if ( v13 ) @@ -170,19 +170,19 @@ v12 = 0; v46 = v12; if ( v12 ) { -*(_DWORD *)((char *)v12 + 13) = a6; +*(DWORD *)((char *)v12 + 13) = a6; TLine::Offset(v12, a5); goto LABEL_13; } } else { -*((float *)&v6 + 1) = v7[2 * (_DWORD)v6 - 2]; +*((float *)&v6 + 1) = v7[2 * (DWORD)v6 - 2]; v47 = 0; v33 = 0.0; v34 = *((float *)&v6 + 1); v30 = 0.0; -v35 = v7[2 * (_DWORD)v6 - 1]; +v35 = v7[2 * (DWORD)v6 - 1]; if ( (signed int)v6 > 0 ) { while ( 1 ) @@ -225,17 +225,17 @@ v20 = 0; } if ( v20 ) { -*(_DWORD *)((char *)v20 + 13) = a6; -(*(void (__thiscall **)(TCircle *))(*(_DWORD *)v20 + 8))(v20); +*(DWORD *)((char *)v20 + 13) = a6; +(*(void (__thiscall **)(TCircle *))(*(DWORD *)v20 + 8))(v20); objlist_class::Add((struct TCollisionComponent *)((char *)a2 + 42), (void *)v20); } } } -v37 = *(_DWORD *)v7; -v38 = *((_DWORD *)v7 + 1); +v37 = *(DWORD *)v7; +v38 = *((DWORD *)v7 + 1); v21 = (int)(v7 + 2); -v39 = *((_DWORD *)v7 + 2); -v40 = *((_DWORD *)v7 + 3); +v39 = *((DWORD *)v7 + 2); +v40 = *((DWORD *)v7 + 3); v22 = (TLine *)operator new(0x55u); if ( v22 ) v23 = TLine::TLine(v22, a2, a3, a4, (struct vector_type *)&v37, (struct vector_type *)&v39); @@ -244,9 +244,9 @@ v23 = 0; v46 = v23; if ( v23 ) { -*(_DWORD *)((char *)v23 + 13) = a6; +*(DWORD *)((char *)v23 + 13) = a6; TLine::Offset(v23, a5); -(*(void (__thiscall **)(TLine *))(*(_DWORD *)v23 + 8))(v23); +(*(void (__thiscall **)(TLine *))(*(DWORD *)v23 + 8))(v23); objlist_class::Add((struct TCollisionComponent *)((char *)a2 + 42), (void *)v23); } v47 = (float *)((char *)v47 + 1); @@ -272,7 +272,7 @@ double v7; // st7 int v8; // esi v6 = this; -if ( *(_DWORD *)(*(_DWORD *)((char *)this + 30) + 370) ) +if ( *(DWORD *)(*(DWORD *)((char *)this + 30) + 370) ) { basic_collision(a2, a3, a4, *(float *)((char *)this + 54), *(float *)((char *)this + 58), 1000000000.0, 0.0); return; @@ -289,11 +289,11 @@ if ( v7 <= *(float *)((char *)v6 + 66) ) { if ( v7 <= 0.2 ) return; -v8 = *(_DWORD *)((char *)v6 + 70); +v8 = *(DWORD *)((char *)v6 + 70); } else { -v8 = *(_DWORD *)((char *)v6 + 74); +v8 = *(DWORD *)((char *)v6 + 74); } if ( v8 ) loader_play_sound(v8); @@ -308,7 +308,7 @@ int v6; // esi int v8; // esi v4 = this; -if ( *(_DWORD *)(*(_DWORD *)((char *)this + 30) + 370) ) +if ( *(DWORD *)(*(DWORD *)((char *)this + 30) + 370) ) { basic_collision(a2, a3, a4, *(float *)((char *)this + 54), *(float *)((char *)this + 58), 1000000000.0, 0.0); return 0; @@ -325,13 +325,13 @@ if ( v5 <= *(float *)((char *)v4 + 66) ) { if ( v5 > 0.2 ) { -v8 = *(_DWORD *)((char *)v4 + 70); +v8 = *(DWORD *)((char *)v4 + 70); if ( v8 ) loader_play_sound(v8); } return 0; } -v6 = *(_DWORD *)((char *)v4 + 74); +v6 = *(DWORD *)((char *)v4 + 74); if ( v6 ) loader_play_sound(v6); return 1; @@ -355,9 +355,9 @@ unsigned int v16; // [esp+48h] [ebp-14h] v4 = this; TPinballComponent::TPinballComponent(this, a2, a3, 1); -*(_DWORD *)v4 = &TCollisionComponent::vftable; +*(DWORD *)v4 = &TCollisionComponent::vftable; objlist_class::objlist_class((TCollisionComponent *)((char *)v4 + 42), 4, 4); -v5 = *(_DWORD *)((char *)v4 + 10) == 0; +v5 = *(DWORD *)((char *)v4 + 10) == 0; *((_BYTE *)v4 + 5) = 1; if ( !v5 ) *((_BYTE *)v4 + 4) = 1; @@ -376,13 +376,13 @@ v8 = (float *)loader_query_float_attribute(a3, 0, 600); install_wall(v8, v4, (char *)v4 + 5, v7, v6, 0); } } -*(_DWORD *)((char *)v4 + 66) = v13; -*(_DWORD *)((char *)v4 + 54) = v11; -*(_DWORD *)((char *)v4 + 58) = v10; -*(_DWORD *)((char *)v4 + 62) = v14; -*(_DWORD *)((char *)v4 + 74) = v15; -*(_DWORD *)((char *)v4 + 70) = v12; -*(_DWORD *)((char *)v4 + 22) = a3; +*(DWORD *)((char *)v4 + 66) = v13; +*(DWORD *)((char *)v4 + 54) = v11; +*(DWORD *)((char *)v4 + 58) = v10; +*(DWORD *)((char *)v4 + 62) = v14; +*(DWORD *)((char *)v4 + 74) = v15; +*(DWORD *)((char *)v4 + 70) = v12; +*(DWORD *)((char *)v4 + 22) = a3; return v4; } // 10024EC: using guessed type void *TCollisionComponent::vftable; @@ -396,20 +396,20 @@ int v3; // eax void *v4; // edi v1 = this; -v2 = *(_DWORD *)((char *)this + 46); -*(_DWORD *)this = &TCollisionComponent::vftable; -if ( *(_DWORD *)(v2 + 4) ) +v2 = *(DWORD *)((char *)this + 46); +*(DWORD *)this = &TCollisionComponent::vftable; +if ( *(DWORD *)(v2 + 4) ) { do { -v3 = *(_DWORD *)((char *)v1 + 46); +v3 = *(DWORD *)((char *)v1 + 46); v4 = *(void **)(v3 + 8); -objlist_delete_object(*(_DWORD *)((char *)v1 + 46), *(_DWORD *)(v3 + 8)); +objlist_delete_object(*(DWORD *)((char *)v1 + 46), *(DWORD *)(v3 + 8)); operator delete(v4); } -while ( *(_DWORD *)(*(_DWORD *)((char *)v1 + 46) + 4) ); +while ( *(DWORD *)(*(DWORD *)((char *)v1 + 46) + 4) ); } -objlist_destroy(*(_DWORD *)((char *)v1 + 46)); +objlist_destroy(*(DWORD *)((char *)v1 + 46)); return TPinballComponent::~TPinballComponent(v1); } // 10024EC: using guessed type void *TCollisionComponent::vftable; diff --git a/Classes/TComponentGroup/TComponentGroup.cpp b/Classes/TComponentGroup/TComponentGroup.cpp index 742811d..de3798e 100644 --- a/Classes/TComponentGroup/TComponentGroup.cpp +++ b/Classes/TComponentGroup/TComponentGroup.cpp @@ -1,9 +1,9 @@ #include "TComponentGroup.h" //----- (010159DC) -------------------------------------------------------- -void __stdcall TComponentGroup::NotifyTimerExpired(int a1, struct TPinballComponent *a2) +void TComponentGroup::NotifyTimerExpired(int a1, struct TPinballComponent *a2) { -*(_DWORD *)((char *)a2 + 50) = 0; +*(DWORD *)((char *)a2 + 50) = 0; control_handler(61, a2); } @@ -18,24 +18,24 @@ int v6; // ebx v3 = this; if ( a2 == 48 ) { -if ( *(_DWORD *)((char *)this + 50) ) +if ( *(DWORD *)((char *)this + 50) ) { -timer_kill(*(_DWORD *)((char *)this + 50)); -*(_DWORD *)((char *)v3 + 50) = 0; +timer_kill(*(DWORD *)((char *)this + 50)); +*(DWORD *)((char *)v3 + 50) = 0; } if ( a3 > 0.0 ) -*(_DWORD *)((char *)v3 + 50) = timer_set(a3, (int)v3, (int)TComponentGroup::NotifyTimerExpired); +*(DWORD *)((char *)v3 + 50) = timer_set(a3, (int)v3, (int)TComponentGroup::NotifyTimerExpired); } else if ( a2 <= 1007 || a2 > 1011 && a2 != 1020 && a2 != 1022 ) { -v4 = *(_DWORD *)(*(_DWORD *)((char *)this + 46) + 4) - 1; +v4 = *(DWORD *)(*(DWORD *)((char *)this + 46) + 4) - 1; if ( v4 >= 0 ) { v5 = 4 * v4 + 8; -v6 = *(_DWORD *)(*(_DWORD *)((char *)this + 46) + 4); +v6 = *(DWORD *)(*(DWORD *)((char *)this + 46) + 4); do { -(***(void (__stdcall ****)(int, _DWORD))(v5 + *(_DWORD *)((char *)v3 + 46)))(a2, LODWORD(a3)); +(***(void (****)(int, DWORD))(v5 + *(DWORD *)((char *)v3 + 46)))(a2, LODWORD(a3)); v5 -= 4; --v6; } @@ -62,21 +62,21 @@ TComponentGroup* __thiscall TComponentGroup::TComponentGroup(TComponentGroup* th { TComponentGroup* v3; // esi int v4; // eax - signed __int16* i; // edi + signed int* i; // edi struct TPinballComponent* v6; // eax int v8; // [esp+Ch] [ebp-4h] int v9; // [esp+1Ch] [ebp+Ch] v3 = this; TPinballComponent::TPinballComponent(this, a2, a3, 0); - *(_DWORD*)v3 = &TComponentGroup::vftable; + *(DWORD*)v3 = &TComponentGroup::vftable; objlist_class::objlist_class((TComponentGroup*)((char*)v3 + 42), 4, 4); - *(_DWORD*)((char*)v3 + 50) = 0; + *(DWORD*)((char*)v3 + 50) = 0; if (a3 > 0) { v4 = loader_query_iattribute(a3, 1027, &v8); v9 = 0; - for (i = (signed __int16*)v4; v9 < v8; ++i) + for (i = (signed int*)v4; v9 < v8; ++i) { v6 = TPinballTable::find_component(a2, *i); if (v6) @@ -95,14 +95,14 @@ TZmapList* __thiscall TComponentGroup::~TComponentGroup(TComponentGroup* this) int v2; // eax v1 = this; - v2 = *(_DWORD*)((char*)this + 50); - *(_DWORD*)this = &TComponentGroup::vftable; + v2 = *(DWORD*)((char*)this + 50); + *(DWORD*)this = &TComponentGroup::vftable; if (v2) { timer_kill(v2); - *(_DWORD*)((char*)v1 + 50) = 0; + *(DWORD*)((char*)v1 + 50) = 0; } - objlist_destroy(*(_DWORD*)((char*)v1 + 46)); + objlist_destroy(*(DWORD*)((char*)v1 + 46)); return TPinballComponent::~TPinballComponent(v1); } // 10024D8: using guessed type void *TComponentGroup::vftable; diff --git a/Classes/TDemo/TDemo.cpp b/Classes/TDemo/TDemo.cpp index 87eab20..624920d 100644 --- a/Classes/TDemo/TDemo.cpp +++ b/Classes/TDemo/TDemo.cpp @@ -1,50 +1,50 @@ #include "TDemo.h" //----- (01016D62) -------------------------------------------------------- -void __stdcall TDemo::PlungerRelease(int a1, void *a2) +void TDemo::PlungerRelease(int a1, void *a2) { -void (__stdcall ***v2)(signed int, _DWORD); // ecx +void (***v2)(signed int, DWORD); // ecx -v2 = *(void (__stdcall ****)(signed int, _DWORD))((char *)a2 + 30); -*(_DWORD *)((char *)a2 + 110) = 0; +v2 = *(void (****)(signed int, DWORD))((char *)a2 + 30); +*(DWORD *)((char *)a2 + 110) = 0; (**v2)(1005, LODWORD(time_next)); } // 1025634: using guessed type float time_next; //----- (01016D8D) -------------------------------------------------------- -void __stdcall TDemo::UnFlipRight(int a1, void *a2) +void TDemo::UnFlipRight(int a1, void *a2) { -if ( *(_DWORD *)((char *)a2 + 98) ) -(***(void (__stdcall ****)(signed int, _DWORD))((char *)a2 + 30))(1003, LODWORD(time_next)); -*(_DWORD *)((char *)a2 + 98) = 0; +if ( *(DWORD *)((char *)a2 + 98) ) +(***(void (****)(signed int, DWORD))((char *)a2 + 30))(1003, LODWORD(time_next)); +*(DWORD *)((char *)a2 + 98) = 0; } // 1025634: using guessed type float time_next; //----- (01016DC0) -------------------------------------------------------- -void __stdcall TDemo::UnFlipLeft(int a1, void *a2) +void TDemo::UnFlipLeft(int a1, void *a2) { -if ( *(_DWORD *)((char *)a2 + 94) ) -(***(void (__stdcall ****)(signed int, _DWORD))((char *)a2 + 30))(1001, LODWORD(time_next)); -*(_DWORD *)((char *)a2 + 94) = 0; +if ( *(DWORD *)((char *)a2 + 94) ) +(***(void (****)(signed int, DWORD))((char *)a2 + 30))(1001, LODWORD(time_next)); +*(DWORD *)((char *)a2 + 94) = 0; } // 1025634: using guessed type float time_next; //----- (01016DF3) -------------------------------------------------------- -void __stdcall TDemo::FlipRight(int a1, void *a2) +void TDemo::FlipRight(int a1, void *a2) { double v2; // st7 float v3; // ST08_4 -if ( !*(_DWORD *)((char *)a2 + 98) ) +if ( !*(DWORD *)((char *)a2 + 98) ) { -if ( *(_DWORD *)((char *)a2 + 106) ) +if ( *(DWORD *)((char *)a2 + 106) ) { -timer_kill(*(_DWORD *)((char *)a2 + 106)); -*(_DWORD *)((char *)a2 + 106) = 0; +timer_kill(*(DWORD *)((char *)a2 + 106)); +*(DWORD *)((char *)a2 + 106) = 0; } -(***(void (__stdcall ****)(signed int, _DWORD))((char *)a2 + 30))(1002, LODWORD(time_next)); +(***(void (****)(signed int, DWORD))((char *)a2 + 30))(1002, LODWORD(time_next)); v2 = *(float *)((char *)a2 + 86) + *(float *)((char *)a2 + 90); -*(_DWORD *)((char *)a2 + 98) = 1; +*(DWORD *)((char *)a2 + 98) = 1; v3 = v2 - (double)_rand() * 0.00003051850947599719 * (*(float *)((char *)a2 + 90) + *(float *)((char *)a2 + 90)); timer_set(v3, (int)a2, (int)TDemo::UnFlipRight); } @@ -52,21 +52,21 @@ timer_set(v3, (int)a2, (int)TDemo::UnFlipRight); // 1025634: using guessed type float time_next; //----- (01016E70) -------------------------------------------------------- -void __stdcall TDemo::FlipLeft(int a1, void *a2) +void TDemo::FlipLeft(int a1, void *a2) { double v2; // st7 float v3; // ST08_4 -if ( !*(_DWORD *)((char *)a2 + 94) ) +if ( !*(DWORD *)((char *)a2 + 94) ) { -if ( *(_DWORD *)((char *)a2 + 102) ) +if ( *(DWORD *)((char *)a2 + 102) ) { -timer_kill(*(_DWORD *)((char *)a2 + 102)); -*(_DWORD *)((char *)a2 + 102) = 0; +timer_kill(*(DWORD *)((char *)a2 + 102)); +*(DWORD *)((char *)a2 + 102) = 0; } -(***(void (__stdcall ****)(signed int, _DWORD))((char *)a2 + 30))(1000, LODWORD(time_next)); +(***(void (****)(signed int, DWORD))((char *)a2 + 30))(1000, LODWORD(time_next)); v2 = *(float *)((char *)a2 + 86) + *(float *)((char *)a2 + 90); -*(_DWORD *)((char *)a2 + 94) = 1; +*(DWORD *)((char *)a2 + 94) = 1; v3 = v2 - (double)_rand() * 0.00003051850947599719 * (*(float *)((char *)a2 + 90) + *(float *)((char *)a2 + 90)); timer_set(v3, (int)a2, (int)TDemo::UnFlipLeft); } @@ -74,16 +74,16 @@ timer_set(v3, (int)a2, (int)TDemo::UnFlipLeft); // 1025634: using guessed type float time_next; //----- (01016EED) -------------------------------------------------------- -void __stdcall TDemo::NewGameRestartTimer(int a1, void *a2) +void TDemo::NewGameRestartTimer(int a1, void *a2) { int v2; // ecx float v3; // ST04_4 pb_replay_level(1); -v2 = *(_DWORD *)((char *)a2 + 30); +v2 = *(DWORD *)((char *)a2 + 30); v3 = (double)*(signed int *)(v2 + 214); -(**(void (__stdcall ***)(signed int, _DWORD))v2)(1014, LODWORD(v3)); -*(_DWORD *)((char *)a2 + 114) = 0; +(**(void (***)(signed int, DWORD))v2)(1014, LODWORD(v3)); +*(DWORD *)((char *)a2 + 114) = 0; } //----- (01016F21) -------------------------------------------------------- @@ -103,15 +103,15 @@ float v16; // ST08_4 double v17; // ST20_8 float v18; // ST08_4 -v6 = *(_DWORD *)((char *)a6 + 13); +v6 = *(DWORD *)((char *)a6 + 13); v7 = this; TBall::not_again(a2, a6); v8 = v6 - 1400; v9 = *(float *)((char *)a2 + 70) - a5; -*(_DWORD *)((char *)a2 + 42) = *(_DWORD *)a3; -v10 = *((_DWORD *)a3 + 1); +*(DWORD *)((char *)a2 + 42) = *(DWORD *)a3; +v10 = *((DWORD *)a3 + 1); *(float *)((char *)a2 + 70) = v9; -*(_DWORD *)((char *)a2 + 46) = v10; +*(DWORD *)((char *)a2 + 46) = v10; if ( v8 ) { v11 = v8 - 1; @@ -123,11 +123,11 @@ if ( v12 ) v13 = v12 - 1; if ( v13 ) { -if ( v13 == 1 && !*(_DWORD *)((char *)v7 + 110) ) +if ( v13 == 1 && !*(DWORD *)((char *)v7 + 110) ) { -(***(void (__stdcall ****)(signed int, _DWORD))((char *)v7 + 30))(1004, *(float *)((char *)a2 + 78)); +(***(void (****)(signed int, DWORD))((char *)v7 + 30))(1004, *(float *)((char *)a2 + 78)); v14 = (double)_rand() * 0.00003051850947599719 + 2.0; -*(_DWORD *)((char *)v7 + 110) = timer_set(v14, (int)v7, (int)TDemo::PlungerRelease); +*(DWORD *)((char *)v7 + 110) = timer_set(v14, (int)v7, (int)TDemo::PlungerRelease); } } else @@ -135,12 +135,12 @@ else TDemo::FlipRight(0, (void *)v7); } } -else if ( !*(_DWORD *)((char *)v7 + 106) && !*(_DWORD *)((char *)v7 + 98) ) +else if ( !*(DWORD *)((char *)v7 + 106) && !*(DWORD *)((char *)v7 + 98) ) { v15 = *(float *)((char *)v7 + 78) + *(float *)((char *)v7 + 82); v16 = v15 - (double)_rand() * 0.00003051850947599719 * (*(float *)((char *)v7 + 82) + *(float *)((char *)v7 + 82)); -*(_DWORD *)((char *)v7 + 106) = timer_set(v16, (int)v7, (int)TDemo::FlipRight); +*(DWORD *)((char *)v7 + 106) = timer_set(v16, (int)v7, (int)TDemo::FlipRight); } } else @@ -148,11 +148,11 @@ else TDemo::FlipLeft(0, (void *)v7); } } -else if ( !*(_DWORD *)((char *)v7 + 102) && !*(_DWORD *)((char *)v7 + 94) ) +else if ( !*(DWORD *)((char *)v7 + 102) && !*(DWORD *)((char *)v7 + 94) ) { v17 = *(float *)((char *)v7 + 78) + *(float *)((char *)v7 + 82); v18 = v17 - (double)_rand() * 0.00003051850947599719 * (*(float *)((char *)v7 + 82) + *(float *)((char *)v7 + 82)); -*(_DWORD *)((char *)v7 + 102) = timer_set(v18, (int)v7, (int)TDemo::FlipLeft); +*(DWORD *)((char *)v7 + 102) = timer_set(v18, (int)v7, (int)TDemo::FlipLeft); } } @@ -167,32 +167,32 @@ v3 = this; switch ( a2 ) { case 1014: -if ( *(_DWORD *)((char *)this + 114) ) -timer_kill(*(_DWORD *)((char *)this + 114)); -*(_DWORD *)((char *)v3 + 114) = 0; +if ( *(DWORD *)((char *)this + 114) ) +timer_kill(*(DWORD *)((char *)this + 114)); +*(DWORD *)((char *)v3 + 114) = 0; break; case 1022: -if ( *(_DWORD *)((char *)this + 114) ) -timer_kill(*(_DWORD *)((char *)this + 114)); +if ( *(DWORD *)((char *)this + 114) ) +timer_kill(*(DWORD *)((char *)this + 114)); v5 = *((_BYTE *)v3 + 5) == 0; -*(_DWORD *)((char *)v3 + 114) = 0; +*(DWORD *)((char *)v3 + 114) = 0; if ( !v5 ) -*(_DWORD *)((char *)v3 + 114) = timer_set(5.0, (int)v3, (int)TDemo::NewGameRestartTimer); +*(DWORD *)((char *)v3 + 114) = timer_set(5.0, (int)v3, (int)TDemo::NewGameRestartTimer); break; case 1024: -if ( *(_DWORD *)((char *)this + 102) ) -timer_kill(*(_DWORD *)((char *)this + 102)); -v4 = *(_DWORD *)((char *)v3 + 106); -*(_DWORD *)((char *)v3 + 102) = 0; +if ( *(DWORD *)((char *)this + 102) ) +timer_kill(*(DWORD *)((char *)this + 102)); +v4 = *(DWORD *)((char *)v3 + 106); +*(DWORD *)((char *)v3 + 102) = 0; if ( v4 ) timer_kill(v4); -v5 = *(_DWORD *)((char *)v3 + 94) == 0; -*(_DWORD *)((char *)v3 + 106) = 0; +v5 = *(DWORD *)((char *)v3 + 94) == 0; +*(DWORD *)((char *)v3 + 106) = 0; if ( !v5 ) TDemo::UnFlipLeft(0, (void *)v3); -if ( *(_DWORD *)((char *)v3 + 98) ) +if ( *(DWORD *)((char *)v3 + 98) ) TDemo::UnFlipRight(0, (void *)v3); -if ( *(_DWORD *)((char *)v3 + 110) ) +if ( *(DWORD *)((char *)v3 + 110) ) TDemo::PlungerRelease(0, (void *)v3); break; } @@ -203,7 +203,7 @@ return 0; TDemo *__thiscall TDemo::TDemo(TDemo *this, struct TPinballTable *a2, int a3) { TDemo *v3; // esi -_DWORD *v4; // eax +DWORD *v4; // eax float *v5; // eax float *v6; // eax float *v7; // eax @@ -214,24 +214,24 @@ unsigned int v12; // [esp+48h] [ebp-14h] v3 = this; TCollisionComponent::TCollisionComponent(this, a2, a3, 0); -*(_DWORD *)v3 = &TDemo::vftable; -*(_DWORD *)((char *)v3 + 114) = 0; -*(_DWORD *)((char *)v3 + 110) = 0; -*(_DWORD *)((char *)v3 + 102) = 0; -*(_DWORD *)((char *)v3 + 106) = 0; -*(_DWORD *)((char *)v3 + 6) = 0; +*(DWORD *)v3 = &TDemo::vftable; +*(DWORD *)((char *)v3 + 114) = 0; +*(DWORD *)((char *)v3 + 110) = 0; +*(DWORD *)((char *)v3 + 102) = 0; +*(DWORD *)((char *)v3 + 106) = 0; +*(DWORD *)((char *)v3 + 6) = 0; *((_BYTE *)v3 + 4) = 0; *((_BYTE *)v3 + 5) = 0; -*(_DWORD *)((char *)v3 + 98) = 0; -*(_DWORD *)((char *)v3 + 94) = 0; -*(_DWORD *)((char *)a2 + 230) = v3; -v4 = (_DWORD *)loader_query_float_attribute(a3, 0, 407); +*(DWORD *)((char *)v3 + 98) = 0; +*(DWORD *)((char *)v3 + 94) = 0; +*(DWORD *)((char *)a2 + 230) = v3; +v4 = (DWORD *)loader_query_float_attribute(a3, 0, 407); if ( v4 ) { -*(_DWORD *)((char *)v3 + 78) = *v4; -*(_DWORD *)((char *)v3 + 82) = v4[1]; -*(_DWORD *)((char *)v3 + 86) = v4[2]; -*(_DWORD *)((char *)v3 + 90) = v4[3]; +*(DWORD *)((char *)v3 + 78) = *v4; +*(DWORD *)((char *)v3 + 82) = v4[1]; +*(DWORD *)((char *)v3 + 86) = v4[2]; +*(DWORD *)((char *)v3 + 90) = v4[3]; } else { @@ -242,15 +242,15 @@ else } loader_query_visual(a3, 0, &v11); v5 = (float *)loader_query_float_attribute(a3, 0, 1400); -*(_DWORD *)((char *)v3 + 118) = install_wall(v5, v3, (char *)v3 + 5, v12, 0.0, (void *)0x578); +*(DWORD *)((char *)v3 + 118) = install_wall(v5, v3, (char *)v3 + 5, v12, 0.0, (void *)0x578); v6 = (float *)loader_query_float_attribute(a3, 0, 1401); install_wall(v6, v3, (char *)v3 + 5, v12, 0.0, (void *)0x579); v7 = (float *)loader_query_float_attribute(a3, 0, 1402); -*(_DWORD *)((char *)v3 + 122) = install_wall(v7, v3, (char *)v3 + 5, v12, 0.0, (void *)0x57A); +*(DWORD *)((char *)v3 + 122) = install_wall(v7, v3, (char *)v3 + 5, v12, 0.0, (void *)0x57A); v8 = (float *)loader_query_float_attribute(a3, 0, 1403); install_wall(v8, v3, (char *)v3 + 5, v12, 0.0, (void *)0x57B); v9 = (float *)loader_query_float_attribute(a3, 0, 1404); -*(_DWORD *)((char *)v3 + 126) = install_wall(v9, v3, (char *)v3 + 5, v12, *(float *)((char *)a2 + 282), (void *)0x57C); +*(DWORD *)((char *)v3 + 126) = install_wall(v9, v3, (char *)v3 + 5, v12, *(float *)((char *)a2 + 282), (void *)0x57C); return v3; } // 10026E8: using guessed type void *TDemo::vftable; diff --git a/Classes/TDemo/TDemo.h b/Classes/TDemo/TDemo.h index 58ebf9c..3438678 100644 --- a/Classes/TDemo/TDemo.h +++ b/Classes/TDemo/TDemo.h @@ -10,12 +10,12 @@ /* 128 */ struct TDemo; -void __stdcall TDemo::PlungerRelease(int, void*); // idb -void __stdcall TDemo::UnFlipRight(int, void*); // idb -void __stdcall TDemo::UnFlipLeft(int, void*); // idb -void __stdcall TDemo::FlipRight(int, void*); // idb -void __stdcall TDemo::FlipLeft(int, void*); // idb -void __stdcall TDemo::NewGameRestartTimer(int, void*); // idb +void TDemo::PlungerRelease(int, void*); // idb +void TDemo::UnFlipRight(int, void*); // idb +void TDemo::UnFlipLeft(int, void*); // idb +void TDemo::FlipRight(int, void*); // idb +void TDemo::FlipLeft(int, void*); // idb +void TDemo::NewGameRestartTimer(int, void*); // idb void __thiscall TDemo::Collision(TDemo* this, struct TBall*, struct vector_type*, struct vector_type*, float, struct TEdgeSegment*); // idb int __thiscall TDemo::Message(TDemo* this, int, float); // idb TDemo* __thiscall TDemo::TDemo(TDemo* this, struct TPinballTable* a2, int a3); diff --git a/Classes/TDrain/TDrain.cpp b/Classes/TDrain/TDrain.cpp index f6e7e09..b0bf6cc 100644 --- a/Classes/TDrain/TDrain.cpp +++ b/Classes/TDrain/TDrain.cpp @@ -8,18 +8,18 @@ TDrain *v3; // esi v3 = this; if ( a2 == 1024 ) { -if ( *(_DWORD *)((char *)this + 86) ) +if ( *(DWORD *)((char *)this + 86) ) { -timer_kill(*(_DWORD *)((char *)this + 86)); -*(_DWORD *)((char *)v3 + 86) = 0; +timer_kill(*(DWORD *)((char *)this + 86)); +*(DWORD *)((char *)v3 + 86) = 0; } -*(_DWORD *)(*(_DWORD *)((char *)v3 + 30) + 78) = 0; +*(DWORD *)(*(DWORD *)((char *)v3 + 30) + 78) = 0; } return 0; } //----- (010172D8) -------------------------------------------------------- -void __stdcall TDrain::TimerCallback(int a1, struct TPinballComponent *a2) +void TDrain::TimerCallback(int a1, struct TPinballComponent *a2) { control_handler(60, a2); } @@ -30,9 +30,9 @@ void __thiscall TDrain::Collision(TDrain *this, struct TBall *a2, struct vector_ TDrain *v6; // esi v6 = this; -(**(void (__stdcall ***)(signed int, _DWORD))a2)(1024, 0.0); -*(_DWORD *)(*(_DWORD *)((char *)v6 + 30) + 78) = 1; -*(_DWORD *)((char *)v6 + 86) = timer_set(*(float *)((char *)v6 + 78), (int)v6, (int)TDrain::TimerCallback); +(**(void (***)(signed int, DWORD))a2)(1024, 0.0); +*(DWORD *)(*(DWORD *)((char *)v6 + 30) + 78) = 1; +*(DWORD *)((char *)v6 + 86) = timer_set(*(float *)((char *)v6 + 78), (int)v6, (int)TDrain::TimerCallback); control_handler(63, v6); } @@ -43,9 +43,9 @@ TDrain *v3; // esi v3 = this; TCollisionComponent::TCollisionComponent(this, a2, a3, 1); -*(_DWORD *)((char *)v3 + 86) = 0; -*(_DWORD *)v3 = &TDrain::vftable; -*(_DWORD *)((char *)v3 + 78) = *(_DWORD *)loader_query_float_attribute(a3, 0, 407); +*(DWORD *)((char *)v3 + 86) = 0; +*(DWORD *)v3 = &TDrain::vftable; +*(DWORD *)((char *)v3 + 78) = *(DWORD *)loader_query_float_attribute(a3, 0, 407); return v3; } // 1002720: using guessed type void *TDrain::vftable; diff --git a/Classes/TDrain/TDrain.h b/Classes/TDrain/TDrain.h index 6089baa..3c2f495 100644 --- a/Classes/TDrain/TDrain.h +++ b/Classes/TDrain/TDrain.h @@ -11,7 +11,7 @@ struct TDrain int __thiscall TDrain::Message(TDrain* this, int, float); // idb -void __stdcall TDrain::TimerCallback(int, struct TPinballComponent*); // idb +void TDrain::TimerCallback(int, struct TPinballComponent*); // idb void __thiscall TDrain::Collision(TDrain* this, struct TBall*, struct vector_type*, struct vector_type*, float, struct TEdgeSegment*); // idb TDrain* __thiscall TDrain::TDrain(TDrain* this, struct TPinballTable* a2, int a3); diff --git a/Classes/TEdgeBox/TEdgeBox.cpp b/Classes/TEdgeBox/TEdgeBox.cpp index 2119a12..3576da4 100644 --- a/Classes/TEdgeBox/TEdgeBox.cpp +++ b/Classes/TEdgeBox/TEdgeBox.cpp @@ -21,8 +21,8 @@ void __thiscall TEdgeBox::~TEdgeBox(TEdgeBox *this) TEdgeBox *v1; // esi v1 = this; - objlist_destroy(*((_DWORD *)this + 3)); - objlist_destroy(*((_DWORD *)v1 + 1)); + objlist_destroy(*((DWORD *)this + 3)); + objlist_destroy(*((DWORD *)v1 + 1)); } //----- (0100B90E) -------------------------------------------------------- @@ -34,10 +34,10 @@ TEdgeBox *result; // eax v2 = this; if ( a2 & 2 ) { -`vector destructor iterator'( +destroy( (void *)this, 0x10u, -*((_DWORD *)this - 1), +*((DWORD *)this - 1), (void (__thiscall *)(void *))TEdgeBox::~TEdgeBox); if ( a2 & 1 ) operator delete((char *)v2 - 4); diff --git a/Classes/TEdgeManager/TEdgeManager.cpp b/Classes/TEdgeManager/TEdgeManager.cpp index 551663d..ac17eae 100644 --- a/Classes/TEdgeManager/TEdgeManager.cpp +++ b/Classes/TEdgeManager/TEdgeManager.cpp @@ -14,7 +14,7 @@ double v6; // [esp+Ch] [ebp-8h] double v7; // [esp+Ch] [ebp-8h] v2 = this; -v6 = (double)(*((_DWORD *)this + 4) - 1); +v6 = (double)(*((DWORD *)this + 4) - 1); if ( _floor((a2 - *((float *)this + 6)) * *((float *)this + 2)) >= v6 ) v3 = v6; else @@ -25,7 +25,7 @@ v4 = 0.0; } else { -v7 = (double)(*((_DWORD *)v2 + 4) - 1); +v7 = (double)(*((DWORD *)v2 + 4) - 1); if ( _floor((a2 - *((float *)v2 + 6)) * *((float *)v2 + 2)) >= v7 ) v4 = v7; else @@ -44,7 +44,7 @@ double v6; // [esp+Ch] [ebp-8h] double v7; // [esp+Ch] [ebp-8h] v2 = this; -v6 = (double)(*((_DWORD *)this + 5) - 1); +v6 = (double)(*((DWORD *)this + 5) - 1); if ( _floor((a2 - *((float *)this + 7)) * *((float *)this + 3)) >= v6 ) v3 = v6; else @@ -55,7 +55,7 @@ v4 = 0.0; } else { -v7 = (double)(*((_DWORD *)v2 + 5) - 1); +v7 = (double)(*((DWORD *)v2 + 5) - 1); if ( _floor((a2 - *((float *)v2 + 7)) * *((float *)v2 + 3)) >= v7 ) v4 = v7; else @@ -69,7 +69,7 @@ int __thiscall TEdgeManager::increment_box_x(TEdgeManager *this, int a2) { int result; // eax -result = *((_DWORD *)this + 4) - 1; +result = *((DWORD *)this + 4) - 1; if ( a2 + 1 < result ) result = a2 + 1; return result; @@ -80,7 +80,7 @@ int __thiscall TEdgeManager::increment_box_y(TEdgeManager *this, int a2) { int result; // eax -result = *((_DWORD *)this + 5) - 1; +result = *((DWORD *)this + 5) - 1; if ( a2 + 1 < result ) result = a2 + 1; return result; @@ -88,7 +88,7 @@ return result; //----- (0100B2A0) -------------------------------------------------------- -void __stdcall `vector constructor iterator`(void *a1, unsigned int a2, int a3, void *(__thiscall *a4)(void *)) +void create(void *a1, unsigned int a2, int a3, void *(__thiscall *a4)(void *)) { char *v4; // esi int v5; // edi @@ -108,7 +108,7 @@ while ( v5 ); } //----- (0100B2E5) -------------------------------------------------------- -void __stdcall `vector destructor iterator`(void *a1, unsigned int a2, int a3, void (__thiscall *a4)(void *)) +void destroy(void *a1, unsigned int a2, int a3, void (__thiscall *a4)(void *)) { char *v4; // edi int v5; // esi @@ -143,20 +143,20 @@ struct TBall *v11; // [esp+24h] [ebp+8h] v3 = a2; v4 = this; v5 = TEdgeManager::box_x(this, *(float *)((char *)a2 + 42)); -v6 = *((_DWORD *)v4 + 8) - + 16 * (v5 + (unsigned __int64)TEdgeManager::box_y(v4, *(float *)((char *)a2 + 46)) * *((_DWORD *)v4 + 4)); -v7 = *(_DWORD *)(*(_DWORD *)(v6 + 12) + 4) - 1; +v6 = *((DWORD *)v4 + 8) + + 16 * (v5 + (unsigned __int64)TEdgeManager::box_y(v4, *(float *)((char *)a2 + 46)) * *((DWORD *)v4 + 4)); +v7 = *(DWORD *)(*(DWORD *)(v6 + 12) + 4) - 1; if ( v7 >= 0 ) { v8 = 4 * v7 + 8; -v11 = *(struct TBall **)(*(_DWORD *)(v6 + 12) + 4); +v11 = *(struct TBall **)(*(DWORD *)(v6 + 12) + 4); do { -v9 = *(_DWORD *)(v8 + *(_DWORD *)(v6 + 12)); -if ( **(_BYTE **)v9 && *(_DWORD *)((_BYTE *)v3 + 110) & *(_DWORD *)(v9 + 4) ) +v9 = *(DWORD *)(v8 + *(DWORD *)(v6 + 12)); +if ( **(_BYTE **)v9 && *(DWORD *)((_BYTE *)v3 + 110) & *(DWORD *)(v9 + 4) ) { -if ( (*(int (__thiscall **)(_DWORD, struct TBall *, char *))(**(_DWORD **)(v9 + 8) + 24))( -*(_DWORD *)(v9 + 8), +if ( (*(int (__thiscall **)(DWORD, struct TBall *, char *))(**(DWORD **)(v9 + 8) + 24))( +*(DWORD *)(v9 + 8), v3, &v10) ) { @@ -171,7 +171,7 @@ while ( v11 ); } //----- (0100B3AE) -------------------------------------------------------- -int __userpurge TEdgeManager::TestGridBox@(TEdgeManager *this@, double a2@, int a3, int a4, float *a5, struct TEdgeSegment **a6, struct ray_type *a7, struct TBall *a8, int a9) +int TEdgeManager::TestGridBox(TEdgeManager *this, double a2@, int a3, int a4, float *a5, struct TEdgeSegment **a6, struct ray_type *a7, struct TBall *a8, int a9) { int v9; // edi int v10; // eax @@ -184,21 +184,21 @@ int v17; // [esp+Ch] [ebp+Ch] if ( a3 >= 0 && a3 < 10 && a4 >= 0 && a4 < 15 ) { -v9 = *((_DWORD *)this + 8) + 16 * (a3 + a4 * *((_DWORD *)this + 4)); -v10 = *(_DWORD *)(*(_DWORD *)(v9 + 4) + 4) - 1; +v9 = *((DWORD *)this + 8) + 16 * (a3 + a4 * *((DWORD *)this + 4)); +v10 = *(DWORD *)(*(DWORD *)(v9 + 4) + 4) - 1; if ( v10 >= 0 ) { v17 = 4 * v10 + 8; v11 = (int **)((char *)this + 4 * a9 + 36); -v16 = *(_DWORD *)(*(_DWORD *)(v9 + 4) + 4); +v16 = *(DWORD *)(*(DWORD *)(v9 + 4) + 4); do { -v12 = *(int **)(v17 + *(_DWORD *)(v9 + 4)); +v12 = *(int **)(v17 + *(DWORD *)(v9 + 4)); if ( !*((_BYTE *)v12 + 12) ) { if ( *(_BYTE *)v12[2] ) { -if ( *(int *)((char *)v12 + 17) & *((_DWORD *)a7 + 10) ) +if ( *(int *)((char *)v12 + 17) & *((DWORD *)a7 + 10) ) { LOBYTE(v13) = TBall::already_hit(a8, (struct TEdgeSegment *)v12); if ( !v13 ) @@ -499,7 +499,7 @@ TEdgeManager *__thiscall TEdgeManager::TEdgeManager(TEdgeManager *this, float a2 double v5; // st7 TEdgeManager *v6; // esi double v7; // st6 -_DWORD *v8; // eax +DWORD *v8; // eax int v9; // edi v5 = a4 * 0.1; @@ -508,9 +508,9 @@ v6 = this; *(float *)this = v5; v7 = a5 * 0.06666667; *((float *)this + 7) = a3; -*((_DWORD *)this + 4) = 10; +*((DWORD *)this + 4) = 10; *((float *)this + 1) = v7; -*((_DWORD *)this + 5) = 15; +*((DWORD *)this + 5) = 15; *((float *)this + 2) = 1.0 / v5; *((float *)this + 3) = 1.0 / v7; v8 = operator new(0x964u); @@ -518,13 +518,13 @@ if ( v8 ) { v9 = (int)(v8 + 1); *v8 = 150; -`vector constructor iterator`(v8 + 1, 0x10u, 150, (void *(__thiscall *)(void *))TEdgeBox::TEdgeBox); +create(v8 + 1, 0x10u, 150, (void *(__thiscall *)(void *))TEdgeBox::TEdgeBox); } else { v9 = 0; } -*((_DWORD *)v6 + 8) = v9; +*((DWORD *)v6 + 8) = v9; return v6; } diff --git a/Classes/TEdgeManager/TEdgeManager.h b/Classes/TEdgeManager/TEdgeManager.h index e130dfe..35c3636 100644 --- a/Classes/TEdgeManager/TEdgeManager.h +++ b/Classes/TEdgeManager/TEdgeManager.h @@ -15,7 +15,7 @@ signed __int64 __thiscall TEdgeManager::box_y(TEdgeManager* this, float a2); int __thiscall TEdgeManager::increment_box_x(TEdgeManager* this, int); // idb int __thiscall TEdgeManager::increment_box_y(TEdgeManager* this, int); // idb void __thiscall TEdgeManager::FieldEffects(TEdgeManager* this, struct TBall*, struct vector_type*); // idb -// int __userpurge TEdgeManager::TestGridBox@(TEdgeManager *this@, double a2@, int a3, int a4, float *a5, struct TEdgeSegment **a6, struct ray_type *a7, struct TBall *a8, int a9); +// int TEdgeManager::TestGridBox(TEdgeManager *this, double a2@, int a3, int a4, float *a5, struct TEdgeSegment **a6, struct ray_type *a7, struct TBall *a8, int a9); double __thiscall TEdgeManager::FindCollisionDistance(TEdgeManager* this, struct ray_type* a2, struct TBall* a3, struct TEdgeSegment** a4); TEdgeManager* __thiscall TEdgeManager::TEdgeManager(TEdgeManager* this, float a2, float a3, float a4, float a5); void __thiscall TEdgeManager::add_edge_to_box(TEdgeManager* this, int, int, struct TEdgeSegment*); // idb diff --git a/Classes/TEdgeSegment/TEdgeSegment.cpp b/Classes/TEdgeSegment/TEdgeSegment.cpp index 114835b..885f479 100644 --- a/Classes/TEdgeSegment/TEdgeSegment.cpp +++ b/Classes/TEdgeSegment/TEdgeSegment.cpp @@ -6,10 +6,10 @@ TEdgeSegment *__thiscall TEdgeSegment::TEdgeSegment(TEdgeSegment *this, struct T TEdgeSegment *result; // eax result = this; -*((_DWORD *)this + 1) = a2; -*((_DWORD *)this + 2) = a3; -*(_DWORD *)this = &TEdgeSegment::vftable; -*(_DWORD *)((char *)this + 17) = a4; +*((DWORD *)this + 1) = a2; +*((DWORD *)this + 2) = a3; +*(DWORD *)this = &TEdgeSegment::vftable; +*(DWORD *)((char *)this + 17) = a4; *((_BYTE *)this + 12) = 0; return result; } diff --git a/Classes/TFlagSpinner/TFlagSpinner.cpp b/Classes/TFlagSpinner/TFlagSpinner.cpp index 1900a38..a3463d9 100644 --- a/Classes/TFlagSpinner/TFlagSpinner.cpp +++ b/Classes/TFlagSpinner/TFlagSpinner.cpp @@ -1,9 +1,9 @@ #include "TFlagSpinner.h" //----- (01015F34) -------------------------------------------------------- -void __stdcall TFlagSpinner::SpinTimer(int a1, void *a2) +void TFlagSpinner::SpinTimer(int a1, void *a2) { -*(_DWORD *)((char *)a2 + 102) = 0; +*(DWORD *)((char *)a2 + 102) = 0; TFlagSpinner::NextFrame((TFlagSpinner *)a2); } @@ -21,36 +21,36 @@ char v9; // c0 float v10; // ST0C_4 v1 = this; -*(_DWORD *)((char *)v1 + 98) += *(_DWORD *)((char *)this + 94); -v2 = *(_DWORD *)((char *)this + 34); -v3 = *(_DWORD *)((char *)this + 98); -v4 = *(_DWORD *)(*(_DWORD *)(v2 + 4) + 4); +*(DWORD *)((char *)v1 + 98) += *(DWORD *)((char *)this + 94); +v2 = *(DWORD *)((char *)this + 34); +v3 = *(DWORD *)((char *)this + 98); +v4 = *(DWORD *)(*(DWORD *)(v2 + 4) + 4); if ( v3 < v4 ) { if ( v3 < 0 ) -*(_DWORD *)((char *)v1 + 98) = v4 - 1; +*(DWORD *)((char *)v1 + 98) = v4 - 1; } else { -*(_DWORD *)((char *)v1 + 98) = 0; +*(DWORD *)((char *)v1 + 98) = 0; } -v5 = *(_DWORD *)(*(_DWORD *)(v2 + 4) + 4 * *(_DWORD *)((char *)v1 + 98) + 8); -if ( !*(_DWORD *)(*(_DWORD *)((char *)v1 + 30) + 370) ) +v5 = *(DWORD *)(*(DWORD *)(v2 + 4) + 4 * *(DWORD *)((char *)v1 + 98) + 8); +if ( !*(DWORD *)(*(DWORD *)((char *)v1 + 30) + 370) ) { control_handler(63, v1); -if ( *(_DWORD *)((char *)v1 + 70) ) -loader_play_sound(*(_DWORD *)((char *)v1 + 70)); -if ( !*(_DWORD *)((char *)v1 + 98) ) +if ( *(DWORD *)((char *)v1 + 70) ) +loader_play_sound(*(DWORD *)((char *)v1 + 70)); +if ( !*(DWORD *)((char *)v1 + 98) ) control_handler(62, v1); } render_sprite_set( -*(_DWORD **)((char *)v1 + 26), +*(DWORD **)((char *)v1 + 26), v5, -*(_DWORD *)(*(_DWORD *)(*(_DWORD *)((char *)v1 + 38) + 4) + 4 * *(_DWORD *)((char *)v1 + 98) + 8), -*(_DWORD *)(v5 + 29) - *(_DWORD *)(*(_DWORD *)((char *)v1 + 30) + 234), -*(_DWORD *)(v5 + 33) - *(_DWORD *)(*(_DWORD *)((char *)v1 + 30) + 238)); +*(DWORD *)(*(DWORD *)(*(DWORD *)((char *)v1 + 38) + 4) + 4 * *(DWORD *)((char *)v1 + 98) + 8), +*(DWORD *)(v5 + 29) - *(DWORD *)(*(DWORD *)((char *)v1 + 30) + 234), +*(DWORD *)(v5 + 33) - *(DWORD *)(*(DWORD *)((char *)v1 + 30) + 238)); v6 = *(float *)((char *)v1 + 90) * *(float *)((char *)v1 + 78); -v7 = *(_DWORD *)((char *)v1 + 86); +v7 = *(DWORD *)((char *)v1 + 86); *(float *)((char *)v1 + 78) = v6; if ( !v9 ) { @@ -68,19 +68,19 @@ int v4; // eax v3 = this; if ( a2 == 1024 ) { -if ( *(_DWORD *)((char *)this + 102) ) +if ( *(DWORD *)((char *)this + 102) ) { -timer_kill(*(_DWORD *)((char *)this + 102)); -*(_DWORD *)((char *)v3 + 102) = 0; +timer_kill(*(DWORD *)((char *)this + 102)); +*(DWORD *)((char *)v3 + 102) = 0; } -*(_DWORD *)((char *)v3 + 98) = 0; -v4 = *(_DWORD *)(*(_DWORD *)(*(_DWORD *)((char *)v3 + 34) + 4) + 8); +*(DWORD *)((char *)v3 + 98) = 0; +v4 = *(DWORD *)(*(DWORD *)(*(DWORD *)((char *)v3 + 34) + 4) + 8); render_sprite_set( -*(_DWORD **)((char *)v3 + 26), -*(_DWORD *)(*(_DWORD *)(*(_DWORD *)((char *)v3 + 34) + 4) + 8), -*(_DWORD *)(*(_DWORD *)(*(_DWORD *)((char *)v3 + 38) + 4) + 8), -*(_DWORD *)(v4 + 29) - *(_DWORD *)(*(_DWORD *)((char *)v3 + 30) + 234), -*(_DWORD *)(v4 + 33) - *(_DWORD *)(*(_DWORD *)((char *)v3 + 30) + 238)); +*(DWORD **)((char *)v3 + 26), +*(DWORD *)(*(DWORD *)(*(DWORD *)((char *)v3 + 34) + 4) + 8), +*(DWORD *)(*(DWORD *)(*(DWORD *)((char *)v3 + 38) + 4) + 8), +*(DWORD *)(v4 + 29) - *(DWORD *)(*(DWORD *)((char *)v3 + 30) + 234), +*(DWORD *)(v4 + 33) - *(DWORD *)(*(DWORD *)((char *)v3 + 30) + 238)); } return 0; } @@ -93,7 +93,7 @@ int result; // eax if ( a2 >= 2 ) result = 0; else -result = *(_DWORD *)((char *)this + 4 * a2 + 110); +result = *(DWORD *)((char *)this + 4 * a2 + 110); return result; } @@ -101,7 +101,7 @@ return result; void __thiscall TFlagSpinner::put_scoring(TFlagSpinner *this, int a2, int a3) { if ( a2 < 2 ) -*(_DWORD *)((char *)this + 4 * a2 + 110) = a3; +*(DWORD *)((char *)this + 4 * a2 + 110) = a3; } //----- (01018150) -------------------------------------------------------- @@ -111,20 +111,20 @@ int v6; // eax TFlagSpinner *v7; // edi *(float *)((char *)a2 + 42) = *(float *)a3; -v6 = *((_DWORD *)a3 + 1); +v6 = *((DWORD *)a3 + 1); v7 = this; *(float *)((char *)a2 + 70) = *(float *)((char *)a2 + 70) - a5; -*(_DWORD *)((char *)a2 + 46) = v6; +*(DWORD *)((char *)a2 + 46) = v6; TBall::not_again(a2, a6); -*(_DWORD *)((char *)v7 + 94) = 2 * (*(_DWORD *)((char *)v7 + 106) != (_DWORD)a6) - 1; +*(DWORD *)((char *)v7 + 94) = 2 * (*(DWORD *)((char *)v7 + 106) != (DWORD)a6) - 1; if ( *(float *)((char *)a2 + 66) == 0.0 ) -*(_DWORD *)((char *)v7 + 78) = *(_DWORD *)((char *)v7 + 86); +*(DWORD *)((char *)v7 + 78) = *(DWORD *)((char *)v7 + 86); else *(float *)((char *)v7 + 78) = *(float *)((char *)a2 + 66) * 20.0; if ( *(float *)((char *)v7 + 78) < (double)*(float *)((char *)v7 + 86) ) -*(_DWORD *)((char *)v7 + 78) = *(_DWORD *)((char *)v7 + 86); +*(DWORD *)((char *)v7 + 78) = *(DWORD *)((char *)v7 + 86); if ( *(float *)((char *)v7 + 78) > (double)*(float *)((char *)v7 + 82) ) -*(_DWORD *)((char *)v7 + 78) = *(_DWORD *)((char *)v7 + 82); +*(DWORD *)((char *)v7 + 78) = *(DWORD *)((char *)v7 + 82); TFlagSpinner::NextFrame(v7); } @@ -136,9 +136,9 @@ TLine *v4; // eax TLine *v5; // edi TLine *v6; // eax TLine *v7; // eax -_DWORD *v8; // eax -_DWORD *v9; // eax -_DWORD *v10; // eax +DWORD *v8; // eax +DWORD *v9; // eax +DWORD *v10; // eax char v12; // [esp+Ch] [ebp-60h] int *v13; // [esp+18h] [ebp-54h] unsigned int v14; // [esp+40h] [ebp-2Ch] @@ -149,8 +149,8 @@ int v18; // [esp+64h] [ebp-8h] v3 = this; TCollisionComponent::TCollisionComponent(this, a2, a3, 0); -*(_DWORD *)v3 = &TFlagSpinner::vftable; -*(_DWORD *)((char *)v3 + 102) = 0; +*(DWORD *)v3 = &TFlagSpinner::vftable; +*(DWORD *)((char *)v3 + 102) = 0; loader_query_visual(a3, 0, &v12); v15 = *v13; v16 = v13[1]; @@ -163,7 +163,7 @@ else v5 = 0; if ( v5 ) { -(*(void (__thiscall **)(TLine *))(*(_DWORD *)v5 + 8))(v5); +(*(void (__thiscall **)(TLine *))(*(DWORD *)v5 + 8))(v5); objlist_class::Add((TFlagSpinner *)((char *)v3 + 42), (void *)v5); } v6 = (TLine *)operator new(0x55u); @@ -171,24 +171,24 @@ if ( v6 ) v7 = TLine::TLine(v6, v3, (char *)v3 + 5, v14, (struct vector_type *)&v15, (struct vector_type *)&v17); else v7 = 0; -*(_DWORD *)((char *)v3 + 106) = v7; +*(DWORD *)((char *)v3 + 106) = v7; if ( v7 ) { -(*(void (__thiscall **)(TLine *))(*(_DWORD *)v7 + 8))(v7); +(*(void (__thiscall **)(TLine *))(*(DWORD *)v7 + 8))(v7); objlist_class::Add((TFlagSpinner *)((char *)v3 + 42), *(void **)((char *)v3 + 106)); } -*(_DWORD *)((char *)v3 + 90) = 1059481190; -*(_DWORD *)((char *)v3 + 82) = 1195593728; -*(_DWORD *)((char *)v3 + 86) = 1084227584; -v8 = (_DWORD *)loader_query_float_attribute(a3, 0, 1202); +*(DWORD *)((char *)v3 + 90) = 1059481190; +*(DWORD *)((char *)v3 + 82) = 1195593728; +*(DWORD *)((char *)v3 + 86) = 1084227584; +v8 = (DWORD *)loader_query_float_attribute(a3, 0, 1202); if ( v8 ) -*(_DWORD *)((char *)v3 + 90) = *v8; -v9 = (_DWORD *)loader_query_float_attribute(a3, 0, 1200); +*(DWORD *)((char *)v3 + 90) = *v8; +v9 = (DWORD *)loader_query_float_attribute(a3, 0, 1200); if ( v9 ) -*(_DWORD *)((char *)v3 + 82) = *v9; -v10 = (_DWORD *)loader_query_float_attribute(a3, 0, 1201); +*(DWORD *)((char *)v3 + 82) = *v9; +v10 = (DWORD *)loader_query_float_attribute(a3, 0, 1201); if ( v10 ) -*(_DWORD *)((char *)v3 + 86) = *v10; +*(DWORD *)((char *)v3 + 86) = *v10; return v3; } // 1002588: using guessed type void *TFlagSpinner::vftable; diff --git a/Classes/TFlagSpinner/TFlagSpinner.h b/Classes/TFlagSpinner/TFlagSpinner.h index 00bdca7..b171a64 100644 --- a/Classes/TFlagSpinner/TFlagSpinner.h +++ b/Classes/TFlagSpinner/TFlagSpinner.h @@ -10,7 +10,7 @@ /* 105 */ struct TFlagSpinner; -void __stdcall TFlagSpinner::SpinTimer(int, void*); // idb +void TFlagSpinner::SpinTimer(int, void*); // idb void __thiscall TFlagSpinner::NextFrame(TFlagSpinner* this); // idb int __thiscall TFlagSpinner::Message(TFlagSpinner* this, int, float); // idb int __thiscall TFlagSpinner::get_scoring(TFlagSpinner* this, int); // idb diff --git a/Classes/TFlipper/TFlipper.cpp b/Classes/TFlipper/TFlipper.cpp index f38d770..ce2a765 100644 --- a/Classes/TFlipper/TFlipper.cpp +++ b/Classes/TFlipper/TFlipper.cpp @@ -9,14 +9,14 @@ void *v2; // ST00_4 v1 = this; v2 = *(void **)((char *)this + 82); -*(_DWORD *)this = &TFlipper::vftable; +*(DWORD *)this = &TFlipper::vftable; operator delete(v2); return TCollisionComponent::~TCollisionComponent(v1); } // 1002838: using guessed type void *TFlipper::vftable; //----- (0101C070) -------------------------------------------------------- -void __stdcall TFlipper::TimerExpired(int a1, void *a2) +void TFlipper::TimerExpired(int a1, void *a2) { char *v2; // esi double v3; // st7 @@ -35,8 +35,8 @@ float v14; // [esp+24h] [ebp+Ch] v2 = (char *)a2; v13 = 0; v3 = _floor((time_now - *(float *)((char *)a2 + 102)) / *(float *)((char *)a2 + 98) + 0.5); -v4 = *(_DWORD *)((char *)a2 + 34); -v14 = (double)*(signed int *)(*(_DWORD *)(v4 + 4) + 4); +v4 = *(DWORD *)((char *)a2 + 34); +v14 = (double)*(signed int *)(*(DWORD *)(v4 + 4) + 4); if ( v3 > v14 ) v3 = v14; if ( v3 < 0.0 ) @@ -44,24 +44,24 @@ v3 = 0.0; v5 = (signed __int64)v3; if ( !(unsigned int)(signed __int64)v3 ) LODWORD(v5) = 1; -v6 = *(_DWORD *)(v2 + 6); +v6 = *(DWORD *)(v2 + 6); if ( v6 == 1 ) { -*(_DWORD *)(v2 + 78) += v5; -v7 = *(_DWORD *)(*(_DWORD *)(v4 + 4) + 4) - 1; -if ( *(_DWORD *)(v2 + 78) >= v7 ) +*(DWORD *)(v2 + 78) += v5; +v7 = *(DWORD *)(*(DWORD *)(v4 + 4) + 4) - 1; +if ( *(DWORD *)(v2 + 78) >= v7 ) { -*(_DWORD *)(v2 + 78) = v7; +*(DWORD *)(v2 + 78) = v7; v13 = 1; } } if ( v6 == 2 ) { -*(_DWORD *)(v2 + 78) -= v5; +*(DWORD *)(v2 + 78) -= v5; v8 = 0; -if ( *(_DWORD *)(v2 + 78) <= 0 ) +if ( *(DWORD *)(v2 + 78) <= 0 ) { -*(_DWORD *)(v2 + 78) = 0; +*(DWORD *)(v2 + 78) = 0; v13 = 1; } } @@ -70,20 +70,20 @@ else v8 = 0; } if ( v13 ) -*(_DWORD *)(v2 + 6) = 0; +*(DWORD *)(v2 + 6) = 0; else v8 = timer_set(*(float *)(v2 + 98), (int)v2, (int)TFlipper::TimerExpired); -v9 = *(_DWORD *)(v2 + 78); -v10 = *(_DWORD *)(v2 + 30); -*(_DWORD *)(v2 + 86) = v8; +v9 = *(DWORD *)(v2 + 78); +v10 = *(DWORD *)(v2 + 30); +*(DWORD *)(v2 + 86) = v8; v11 = 4 * v9 + 8; -v12 = *(_DWORD *)(v11 + *(_DWORD *)(*(_DWORD *)(v2 + 34) + 4)); +v12 = *(DWORD *)(v11 + *(DWORD *)(*(DWORD *)(v2 + 34) + 4)); render_sprite_set( -*(_DWORD **)(v2 + 26), -*(_DWORD *)(v11 + *(_DWORD *)(*(_DWORD *)(v2 + 34) + 4)), -*(_DWORD *)(*(_DWORD *)(*(_DWORD *)(v2 + 38) + 4) + v11), -*(_DWORD *)(v12 + 29) - *(_DWORD *)(v10 + 234), -*(_DWORD *)(v12 + 33) - *(_DWORD *)(v10 + 238)); +*(DWORD **)(v2 + 26), +*(DWORD *)(v11 + *(DWORD *)(*(DWORD *)(v2 + 34) + 4)), +*(DWORD *)(*(DWORD *)(*(DWORD *)(v2 + 38) + 4) + v11), +*(DWORD *)(v12 + 29) - *(DWORD *)(v10 + 234), +*(DWORD *)(v12 + 33) - *(DWORD *)(v10 + 238)); } // 1025630: using guessed type float time_now; @@ -103,8 +103,8 @@ v4 = this; if ( a2 == 1 ) { control_handler(1, this); -*(_DWORD *)((char *)v4 + 98) = *(_DWORD *)((char *)v4 + 90); -v6 = *(_DWORD *)((char *)v4 + 74); +*(DWORD *)((char *)v4 + 98) = *(DWORD *)((char *)v4 + 90); +v6 = *(DWORD *)((char *)v4 + 74); LABEL_15: if ( v6 ) loader_play_sound(v6); @@ -112,8 +112,8 @@ goto LABEL_17; } if ( a2 == 2 ) { -*(_DWORD *)((char *)this + 98) = *(_DWORD *)((char *)this + 94); -v6 = *(_DWORD *)((char *)this + 70); +*(DWORD *)((char *)this + 98) = *(DWORD *)((char *)this + 94); +v6 = *(DWORD *)((char *)this + 70); goto LABEL_15; } if ( a2 <= 1008 ) @@ -122,16 +122,16 @@ if ( a2 <= 1011 ) { LABEL_12: v3 = 2; -*(_DWORD *)((char *)this + 98) = *(_DWORD *)((char *)this + 94); +*(DWORD *)((char *)this + 98) = *(DWORD *)((char *)this + 94); LABEL_17: -if ( *(_DWORD *)((char *)v4 + 86) ) +if ( *(DWORD *)((char *)v4 + 86) ) { -timer_kill(*(_DWORD *)((char *)v4 + 86)); -*(_DWORD *)((char *)v4 + 86) = 0; +timer_kill(*(DWORD *)((char *)v4 + 86)); +*(DWORD *)((char *)v4 + 86) = 0; } -if ( *(_DWORD *)((char *)v4 + 6) ) +if ( *(DWORD *)((char *)v4 + 6) ) { -v8 = a3 - *(float *)(*(_DWORD *)((char *)v4 + 82) + 201); +v8 = a3 - *(float *)(*(DWORD *)((char *)v4 + 82) + 201); v7 = v8 - _floor(v8 / *(float *)((char *)v4 + 98)) * *(float *)((char *)v4 + 98); if ( v7 < 0.0 ) v7 = 0.0; @@ -141,9 +141,9 @@ else v7 = *(float *)((char *)v4 + 98); } v9 = v7; -*(_DWORD *)((char *)v4 + 6) = v3; +*(DWORD *)((char *)v4 + 6) = v3; *(float *)((char *)v4 + 102) = a3; -*(_DWORD *)((char *)v4 + 86) = timer_set(v9, (int)v4, (int)TFlipper::TimerExpired); +*(DWORD *)((char *)v4 + 86) = timer_set(v9, (int)v4, (int)TFlipper::TimerExpired); goto LABEL_24; } if ( a2 != 1020 ) @@ -157,13 +157,13 @@ goto LABEL_8; goto LABEL_12; } LABEL_8: -if ( *(_DWORD *)((char *)this + 6) ) +if ( *(DWORD *)((char *)this + 6) ) { -if ( *(_DWORD *)((char *)this + 86) ) -timer_kill(*(_DWORD *)((char *)this + 86)); -*(_DWORD *)((char *)v4 + 78) = -1; -v5 = *(_DWORD *)((char *)v4 + 86); -*(_DWORD *)((char *)v4 + 6) = 2; +if ( *(DWORD *)((char *)this + 86) ) +timer_kill(*(DWORD *)((char *)this + 86)); +*(DWORD *)((char *)v4 + 78) = -1; +v5 = *(DWORD *)((char *)v4 + 86); +*(DWORD *)((char *)v4 + 6) = 2; TFlipper::TimerExpired(v5, (void *)v4); LABEL_24: TFlipperEdge::SetMotion(*(TFlipperEdge **)((char *)v4 + 82), v3, a3); @@ -174,7 +174,7 @@ return 0; //----- (0101C2AD) -------------------------------------------------------- void __thiscall TFlipper::port_draw(TFlipper *this) { -(*(void (**)(void))(**(_DWORD **)((char *)this + 82) + 4))(); +(*(void (**)(void))(**(DWORD **)((char *)this + 82) + 4))(); } //----- (0101C59D) -------------------------------------------------------- @@ -206,14 +206,14 @@ float *v25; // [esp+7Ch] [ebp+Ch] v3 = a3; v4 = this; TCollisionComponent::TCollisionComponent(this, a2, a3, 0); -*(_DWORD *)v4 = &TFlipper::vftable; +*(DWORD *)v4 = &TFlipper::vftable; loader_query_visual(a3, 0, &v18); -*(_DWORD *)((char *)v4 + 74) = v21; -*(_DWORD *)((char *)v4 + 70) = v22; -*(_DWORD *)((char *)v4 + 54) = v19; +*(DWORD *)((char *)v4 + 74) = v21; +*(DWORD *)((char *)v4 + 70) = v22; +*(DWORD *)((char *)v4 + 54) = v19; v5 = v18; -*(_DWORD *)((char *)v4 + 86) = 0; -*(_DWORD *)((char *)v4 + 58) = v5; +*(DWORD *)((char *)v4 + 86) = 0; +*(DWORD *)((char *)v4 + 58) = v5; v23 = (TFlipperEdge *)operator new(0xE9u); if ( v23 ) { @@ -234,14 +234,14 @@ else { v15 = 0; } -*(_DWORD *)((char *)v4 + 82) = v15; +*(DWORD *)((char *)v4 + 82) = v15; if ( v15 ) { -v16 = *(_DWORD *)((char *)v4 + 34); -*(float *)((char *)v4 + 90) = *(float *)((char *)v15 + 213) / (double)(*(_DWORD *)(*(_DWORD *)(v16 + 4) + 4) - 1); -*(float *)((char *)v4 + 94) = *(float *)((char *)v15 + 217) / (double)(*(_DWORD *)(*(_DWORD *)(v16 + 4) + 4) - 1); +v16 = *(DWORD *)((char *)v4 + 34); +*(float *)((char *)v4 + 90) = *(float *)((char *)v15 + 213) / (double)(*(DWORD *)(*(DWORD *)(v16 + 4) + 4) - 1); +*(float *)((char *)v4 + 94) = *(float *)((char *)v15 + 217) / (double)(*(DWORD *)(*(DWORD *)(v16 + 4) + 4) - 1); } -*(_DWORD *)((char *)v4 + 78) = 0; +*(DWORD *)((char *)v4 + 78) = 0; *(float *)((char *)v4 + 102) = 0.0; return v4; } diff --git a/Classes/TFlipper/TFlipper.h b/Classes/TFlipper/TFlipper.h index 5c712cc..b462d4c 100644 --- a/Classes/TFlipper/TFlipper.h +++ b/Classes/TFlipper/TFlipper.h @@ -11,7 +11,7 @@ struct TFlipper; TZmapList* __thiscall TFlipper::~TFlipper(TFlipper* this); -void __stdcall TFlipper::TimerExpired(int, void*); // idb +void TFlipper::TimerExpired(int, void*); // idb int __thiscall TFlipper::Message(TFlipper* this, int, float); // idb void __thiscall TFlipper::port_draw(TFlipper* __hidden this); // idb TFlipper* __thiscall TFlipper::TFlipper(TFlipper* this, struct TPinballTable* a2, int a3); diff --git a/Classes/TFlipperEdge/TFlipperEdge.cpp b/Classes/TFlipperEdge/TFlipperEdge.cpp index 39836c4..eafa20e 100644 --- a/Classes/TFlipperEdge/TFlipperEdge.cpp +++ b/Classes/TFlipperEdge/TFlipperEdge.cpp @@ -64,7 +64,7 @@ int v2; // edx double v4; // st7 double v5; // st7 -v2 = *(_DWORD *)((char *)this + 21); +v2 = *(DWORD *)((char *)this + 21); if ( !v2 ) return *(float *)((char *)this + 77); v4 = (*(float *)((char *)this + 77) - *(float *)((char *)this + 73)) @@ -93,10 +93,10 @@ TFlipperEdge *v1; // esi v1 = this; line_init((int)&lineA, A1, flt_1025718, A2, flt_10256B8); line_init((int)&lineB, B1, flt_10256F4, B2, flt_1025700); -dword_102566C = *(_DWORD *)((char *)v1 + 53); -circlebase = *(_DWORD *)((char *)v1 + 33); -dword_1025664 = *(_DWORD *)((char *)v1 + 37); -dword_102567C = *(_DWORD *)((char *)v1 + 57); +dword_102566C = *(DWORD *)((char *)v1 + 53); +circlebase = *(DWORD *)((char *)v1 + 33); +dword_1025664 = *(DWORD *)((char *)v1 + 37); +dword_102567C = *(DWORD *)((char *)v1 + 57); circleT1 = T1; dword_1025674 = dword_102570C; } @@ -122,21 +122,21 @@ v2 = this; v3 = TFlipperEdge::flipper_angle(this, a2); SinCos(v3, &flipper_sin_angle, &flipper_cos_angle); v4 = flipper_cos_angle; -A1 = *(_DWORD *)((char *)v2 + 101); -*((_DWORD *)&A1 + 1) = *(_DWORD *)((char *)v2 + 105); -*((_DWORD *)&A1 + 2) = *(_DWORD *)((char *)v2 + 109); -A2 = *(_DWORD *)((char *)v2 + 113); -*((_DWORD *)&A2 + 1) = *(_DWORD *)((char *)v2 + 117); -*((_DWORD *)&A2 + 2) = *(_DWORD *)((char *)v2 + 121); -B1 = *(_DWORD *)((char *)v2 + 125); -*((_DWORD *)&B1 + 1) = *(_DWORD *)((char *)v2 + 129); -*((_DWORD *)&B1 + 2) = *(_DWORD *)((char *)v2 + 133); -B2 = *(_DWORD *)((char *)v2 + 137); -*((_DWORD *)&B2 + 1) = *(_DWORD *)((char *)v2 + 141); -*((_DWORD *)&B2 + 2) = *(_DWORD *)((char *)v2 + 145); -T1 = *(_DWORD *)((char *)v2 + 153); -*((_DWORD *)&T1 + 1) = *(_DWORD *)((char *)v2 + 157); -*((_DWORD *)&T1 + 2) = *(_DWORD *)((char *)v2 + 161); +A1 = *(DWORD *)((char *)v2 + 101); +*((DWORD *)&A1 + 1) = *(DWORD *)((char *)v2 + 105); +*((DWORD *)&A1 + 2) = *(DWORD *)((char *)v2 + 109); +A2 = *(DWORD *)((char *)v2 + 113); +*((DWORD *)&A2 + 1) = *(DWORD *)((char *)v2 + 117); +*((DWORD *)&A2 + 2) = *(DWORD *)((char *)v2 + 121); +B1 = *(DWORD *)((char *)v2 + 125); +*((DWORD *)&B1 + 1) = *(DWORD *)((char *)v2 + 129); +*((DWORD *)&B1 + 2) = *(DWORD *)((char *)v2 + 133); +B2 = *(DWORD *)((char *)v2 + 137); +*((DWORD *)&B2 + 1) = *(DWORD *)((char *)v2 + 141); +*((DWORD *)&B2 + 2) = *(DWORD *)((char *)v2 + 145); +T1 = *(DWORD *)((char *)v2 + 153); +*((DWORD *)&T1 + 1) = *(DWORD *)((char *)v2 + 157); +*((DWORD *)&T1 + 2) = *(DWORD *)((char *)v2 + 161); v5 = v4; RotatePt((struct vector_type *)&A1, flipper_sin_angle, v5, (TFlipperEdge *)((char *)v2 + 33)); RotatePt((struct vector_type *)&A2, flipper_sin_angle, flipper_cos_angle, (TFlipperEdge *)((char *)v2 + 33)); @@ -181,7 +181,7 @@ v10 = *(float *)((char *)this + 37) - a3, v10 * v10 + v9 * v9 <= *(float *)((char *)this + 53)) || (*(float *)&dword_102570C - a3) * (*(float *)&dword_102570C - a3) + (T1 - a2) * (T1 - a2) < *(float *)((char *)this + 57) ) { -v11 = *(_DWORD *)((char *)this + 21); +v11 = *(DWORD *)((char *)this + 21); if ( *(float *)((char *)this + 69) < 0.0 ) { v19 = v11 - 1; @@ -251,20 +251,20 @@ double __thiscall TFlipperEdge::FindCollisionDistance(TFlipperEdge *this, struct { struct ray_type *v2; // esi TFlipperEdge *v3; // ebx -_DWORD *v4; // eax +DWORD *v4; // eax double result; // st7 int v6; // eax int v7; // ecx float *v8; // esi double v9; // st7 float *v10; // eax -_DWORD *v11; // edi +DWORD *v11; // edi char *v12; // esi float v13; // eax char *v14; // esi -_DWORD *v15; // edi -_DWORD *v16; // edi -_DWORD *v17; // esi +DWORD *v15; // edi +DWORD *v16; // edi +DWORD *v17; // esi double v18; // st7 float v19; // eax double v20; // st7 @@ -272,12 +272,12 @@ int v21; // eax int v22; // esi int v23; // eax int v24; // edx -_DWORD *v25; // esi +DWORD *v25; // esi double v26; // st7 -_DWORD *v27; // esi +DWORD *v27; // esi double v28; // st7 -_DWORD *v29; // edi -_DWORD *v30; // esi +DWORD *v29; // edi +DWORD *v30; // esi double v31; // st7 double v32; // st7 float v33; // eax @@ -285,7 +285,7 @@ double v34; // st7 double v35; // st6 double v36; // st5 double v37; // st4 -__int16 v38; // fps +int v38; // fps double v39; // st6 char v40; // ah bool v41; // c0 @@ -315,14 +315,14 @@ float v63; // [esp+80h] [ebp-4h] v2 = a2; v3 = this; if ( *((float *)a2 + 8) > (double)*(float *)((char *)this + 205) ) -*(_DWORD *)((char *)this + 21) = 0; -v4 = (_DWORD *)((char *)this + 197); -if ( *(_DWORD *)((char *)this + 197) ) +*(DWORD *)((char *)this + 21) = 0; +v4 = (DWORD *)((char *)this + 197); +if ( *(DWORD *)((char *)this + 197) ) { *v4 = 0; return 1000000000.0; } -if ( *(_DWORD *)((char *)this + 21) ) +if ( *(DWORD *)((char *)this + 21) ) { v18 = *(float *)((char *)this + 181) * *((float *)a2 + 6); v63 = *(float *)a2; @@ -346,19 +346,19 @@ v22 = (int)v2 + 12; v53 = *(float *)v22; v22 += 4; v54 = *(float *)v22; -v55 = *(_DWORD *)(v22 + 4); -v23 = *((_DWORD *)a2 + 7); +v55 = *(DWORD *)(v22 + 4); +v23 = *((DWORD *)a2 + 7); v50 = *(float *)a2; v51 = *((float *)a2 + 1); -v52 = *((_DWORD *)a2 + 2); +v52 = *((DWORD *)a2 + 2); v57 = v23; v56 = v60; result = distance_to_flipper((struct ray_type *)&v50, (struct ray_type *)&v44); if ( result < 1000000000.0 ) { -*(_DWORD *)((char *)v3 + 221) = *(_DWORD *)&v44; -*(_DWORD *)((char *)v3 + 225) = v45; -*(_DWORD *)((char *)v3 + 229) = v46; +*(DWORD *)((char *)v3 + 221) = *(DWORD *)&v44; +*(DWORD *)((char *)v3 + 225) = v45; +*(DWORD *)((char *)v3 + 229) = v46; v35 = *(float *)((char *)v3 + 221) - v53 * 0.00001; *(float *)((char *)v3 + 221) = v35; v36 = *(float *)((char *)v3 + 225) - v54 * 0.00001; @@ -383,15 +383,15 @@ goto LABEL_47; LABEL_49: v43 = 0; } -v15 = (_DWORD *)((char *)v3 + 89); -if ( *(_DWORD *)((char *)v3 + 21) == 2 ) +v15 = (DWORD *)((char *)v3 + 89); +if ( *(DWORD *)((char *)v3 + 21) == 2 ) { v14 = (char *)&lineB; -*(_DWORD *)((char *)v3 + 81) = v43 == 0; +*(DWORD *)((char *)v3 + 81) = v43 == 0; } else { -*(_DWORD *)((char *)v3 + 81) = v43; +*(DWORD *)((char *)v3 + 81) = v43; v14 = (char *)&lineA; } goto LABEL_25; @@ -403,14 +403,14 @@ if ( *((float *)a2 + 9) + *((float *)a2 + 8) <= v61 ) return 1000000000.0; v2 = a2; } -v24 = *(_DWORD *)((char *)v3 + 21); +v24 = *(DWORD *)((char *)v3 + 21); if ( v24 != 1 || v21 == 5 ) { if ( v24 != 2 || v21 == 4 ) { v31 = *(float *)((char *)v3 + 33) - v63; -*(_DWORD *)((char *)v3 + 81) = 0; -*(_DWORD *)((char *)v3 + 85) = 1; +*(DWORD *)((char *)v3 + 81) = 0; +*(DWORD *)((char *)v3 + 85) = 1; v53 = v31; v54 = *(float *)((char *)v3 + 37) - v62; normalize_2d(&v53); @@ -439,27 +439,27 @@ v53 = -lineA; v26 = flt_1025684; } v54 = -v26; -*(_DWORD *)((char *)v3 + 89) = *v25; +*(DWORD *)((char *)v3 + 89) = *v25; v27 = v25 + 1; -*(_DWORD *)((char *)v3 + 93) = *v27; -*(_DWORD *)((char *)v3 + 97) = v27[1]; -*(_DWORD *)((char *)v3 + 85) = 0; -*(_DWORD *)((char *)v3 + 81) = 1; +*(DWORD *)((char *)v3 + 93) = *v27; +*(DWORD *)((char *)v3 + 97) = v27[1]; +*(DWORD *)((char *)v3 + 85) = 0; +*(DWORD *)((char *)v3 + 81) = 1; v57 = 990057071; v50 = *(float *)a2 - v53 * 5.0; v51 = *((float *)a2 + 1) - v54 * 5.0; v56 = *((float *)a2 + 6) + 10.0; v28 = distance_to_flipper((struct ray_type *)&v50, (struct ray_type *)&v44); -*(_DWORD *)((char *)v3 + 185) = *(_DWORD *)&v47; -*(_DWORD *)((char *)v3 + 189) = v48; -*(_DWORD *)((char *)v3 + 193) = v49; +*(DWORD *)((char *)v3 + 185) = *(DWORD *)&v47; +*(DWORD *)((char *)v3 + 189) = v48; +*(DWORD *)((char *)v3 + 193) = v49; if ( v28 >= 1000000000.0 ) return 1000000000.0; v10 = (float *)((char *)v3 + 221); v12 = &v44; -v11 = (_DWORD *)((char *)v3 + 221); +v11 = (DWORD *)((char *)v3 + 221); LABEL_41: -*v11 = *(_DWORD *)v12; +*v11 = *(DWORD *)v12; v30 = v12 + 4; v29 = v11 + 1; *v29 = *v30; @@ -469,12 +469,12 @@ v29[1] = v30[1]; return 0.0; } *v4 = 0; -*(_DWORD *)((char *)this + 81) = 0; -*(_DWORD *)((char *)this + 85) = 0; +*(DWORD *)((char *)this + 81) = 0; +*(DWORD *)((char *)this + 85) = 0; TFlipperEdge::set_control_points(this, *((float *)a2 + 8)); TFlipperEdge::build_edges_in_motion(v3); *(float *)&v6 = COERCE_FLOAT(TFlipperEdge::is_ball_inside(v3, *(float *)a2, *((float *)a2 + 1))); -v7 = *((_DWORD *)a2 + 7); +v7 = *((DWORD *)a2 + 7); v61 = *(float *)&v6; v57 = v7; if ( *(float *)&v6 != 0.0 ) @@ -482,18 +482,18 @@ if ( *(float *)&v6 != 0.0 ) if ( Distance_Squared( *(float *)a2, *((float *)a2 + 1), -*((_DWORD *)a2 + 2), +*((DWORD *)a2 + 2), *(float *)((char *)v3 + 33), *(float *)((char *)v3 + 37), -*(_DWORD *)((char *)v3 + 41)) >= *(float *)((char *)v3 + 61) ) +*(DWORD *)((char *)v3 + 41)) >= *(float *)((char *)v3 + 61) ) { if ( Distance_Squared( *(float *)a2, *((float *)a2 + 1), -*((_DWORD *)a2 + 2), +*((DWORD *)a2 + 2), T1, *((float *)&T1 + 1), -*((_DWORD *)&T1 + 2)) >= *(float *)((char *)v3 + 65) ) +*((DWORD *)&T1 + 2)) >= *(float *)((char *)v3 + 65) ) { if ( LODWORD(v61) == 4 ) { @@ -537,44 +537,44 @@ return 1000000000.0; } LABEL_20: v10 = (float *)((char *)v3 + 221); -*(_DWORD *)((char *)v3 + 221) = *(_DWORD *)&v44; -*(_DWORD *)((char *)v3 + 225) = v45; -*(_DWORD *)((char *)v3 + 229) = v46; -v11 = (_DWORD *)((char *)v3 + 185); +*(DWORD *)((char *)v3 + 221) = *(DWORD *)&v44; +*(DWORD *)((char *)v3 + 225) = v45; +*(DWORD *)((char *)v3 + 229) = v46; +v11 = (DWORD *)((char *)v3 + 185); v12 = &v47; goto LABEL_41; } v53 = *((float *)a2 + 3); v54 = *((float *)a2 + 4); -v55 = *((_DWORD *)a2 + 5); +v55 = *((DWORD *)a2 + 5); v13 = *((float *)a2 + 6); v50 = *(float *)a2; v51 = *((float *)a2 + 1); -v52 = *((_DWORD *)a2 + 2); +v52 = *((DWORD *)a2 + 2); v56 = v13; result = distance_to_flipper((struct ray_type *)&v50, (struct ray_type *)&v44); v14 = &v44; if ( result == 0.0 ) { -*(_DWORD *)((char *)v3 + 221) = *(_DWORD *)&v44; -*(_DWORD *)((char *)v3 + 225) = v45; -*(_DWORD *)((char *)v3 + 229) = v46; +*(DWORD *)((char *)v3 + 221) = *(DWORD *)&v44; +*(DWORD *)((char *)v3 + 225) = v45; +*(DWORD *)((char *)v3 + 229) = v46; *(float *)((char *)v3 + 221) = *(float *)((char *)v3 + 221) - v53 * 0.00001; *(float *)((char *)v3 + 225) = *(float *)((char *)v3 + 225) - v54 * 0.00001; } else { -v15 = (_DWORD *)((char *)v3 + 221); +v15 = (DWORD *)((char *)v3 + 221); LABEL_25: -*v15 = *(_DWORD *)v14; +*v15 = *(DWORD *)v14; v17 = v14 + 4; v16 = v15 + 1; *v16 = *v17; v16[1] = v17[1]; } -*(_DWORD *)((char *)v3 + 185) = *(_DWORD *)&v47; -*(_DWORD *)((char *)v3 + 189) = v48; -*(_DWORD *)((char *)v3 + 193) = v49; +*(DWORD *)((char *)v3 + 185) = *(DWORD *)&v47; +*(DWORD *)((char *)v3 + 189) = v48; +*(DWORD *)((char *)v3 + 193) = v49; return result; } // 1025684: using guessed type float flt_1025684; @@ -604,11 +604,11 @@ float v19; // ST14_4 float v20; // [esp+14h] [ebp-4h] v3 = this; -v4 = *(_DWORD *)((char *)this + 21); -*(_DWORD *)((char *)this + 197) = 1; +v4 = *(DWORD *)((char *)this + 21); +*(DWORD *)((char *)this + 197) = 1; if ( !v4 ) goto LABEL_4; -if ( *(_DWORD *)((char *)this + 81) ) +if ( *(DWORD *)((char *)this + 81) ) { v5 = *(float *)((char *)this + 221) - *(float *)((char *)this + 33); v6 = *(float *)((char *)this + 225) - *(float *)((char *)this + 37); @@ -645,7 +645,7 @@ v19, v18); return; } -if ( !v4 || !*(_DWORD *)((char *)this + 85) ) +if ( !v4 || !*(DWORD *)((char *)this + 85) ) goto LABEL_4; v12 = (TFlipperEdge *)((char *)this + 221); v13 = *(float *)((char *)v3 + 221) - *(float *)((char *)v3 + 33); @@ -673,28 +673,28 @@ switch ( a2 ) { case 1: v5 = TFlipperEdge::flipper_angle(this, a3); -v6 = *(_DWORD *)((char *)this + 69); +v6 = *(DWORD *)((char *)this + 69); *(float *)((char *)this + 73) = v5; -*(_DWORD *)((char *)this + 77) = v6; -v4 = *(_DWORD *)((char *)this + 213); +*(DWORD *)((char *)this + 77) = v6; +v4 = *(DWORD *)((char *)this + 213); goto LABEL_7; case 2: v3 = TFlipperEdge::flipper_angle(this, a3); -v4 = *(_DWORD *)((char *)this + 217); +v4 = *(DWORD *)((char *)this + 217); *(float *)((char *)this + 73) = v3; *(float *)((char *)this + 77) = 0.0; LABEL_7: -*(_DWORD *)((char *)this + 209) = v4; +*(DWORD *)((char *)this + 209) = v4; break; case 1024: -*(_DWORD *)((char *)this + 21) = 0; +*(DWORD *)((char *)this + 21) = 0; *(float *)((char *)this + 77) = 0.0; return; } -if ( !*(_DWORD *)((char *)this + 21) ) +if ( !*(DWORD *)((char *)this + 21) ) *(float *)((char *)this + 201) = a3; v7 = *(float *)((char *)this + 209); -*(_DWORD *)((char *)this + 21) = a2; +*(DWORD *)((char *)this + 21) = a2; *(float *)((char *)this + 205) = v7 + *(float *)((char *)this + 201); } @@ -758,7 +758,7 @@ v13 = this; TEdgeSegment::TEdgeSegment(this, a2, a3, a4); *(float *)((char *)v13 + 25) = a12; *(float *)((char *)v13 + 29) = a13; -*(_DWORD *)v13 = &TFlipperEdge::vftable; +*(DWORD *)v13 = &TFlipperEdge::vftable; v46 = *(float *)a6; v47 = *((float *)a6 + 1); v48 = *((float *)a6 + 2); @@ -776,10 +776,10 @@ v15 = v48 + *(float *)((char *)a5 + 282); v16 = v46; *(float *)((char *)v13 + 153) = v49; v52 = v15; -*(_DWORD *)((char *)v13 + 157) = LODWORD(v50); +*(DWORD *)((char *)v13 + 157) = LODWORD(v50); *(float *)((char *)v13 + 45) = v15; v17 = *(float *)((char *)v13 + 49) * 1.01; -*(_DWORD *)((char *)v13 + 161) = HIDWORD(v50); +*(DWORD *)((char *)v13 + 161) = HIDWORD(v50); *(float *)((char *)v13 + 65) = v17 * v17; *(float *)((char *)v13 + 165) = v36; *(float *)((char *)v13 + 169) = v37; @@ -807,7 +807,7 @@ v43 = 0.0; cross(&v39, &v41, &v33); if ( v35 < 0.0 ) *(float *)((char *)v13 + 69) = -*(float *)((char *)v13 + 69); -*(_DWORD *)((char *)v13 + 21) = 0; +*(DWORD *)((char *)v13 + 21) = 0; *(float *)((char *)v13 + 77) = 0.0; v44 = v53; v45 = v51; @@ -849,9 +849,9 @@ v50 = v30; v31 = Distance((struct vector_type *)&v39, (struct vector_type *)&v33); *(float *)((char *)v13 + 181) = v50 / (v31 / *(float *)((char *)v13 + 49) + v31 / *(float *)((char *)v13 + 49)); TFlipperEdge::place_in_grid(v13); -*(_DWORD *)((char *)v13 + 197) = 0; +*(DWORD *)((char *)v13 + 197) = 0; *(float *)((char *)v13 + 201) = 0.0; -*(_DWORD *)((char *)v13 + 81) = 0; +*(DWORD *)((char *)v13 + 81) = 0; *(float *)((char *)v13 + 205) = 0.0; result = v13; *(float *)((char *)v13 + 209) = 0.0; diff --git a/Classes/TGate/TGate.cpp b/Classes/TGate/TGate.cpp index 9aef649..aa345af 100644 --- a/Classes/TGate/TGate.cpp +++ b/Classes/TGate/TGate.cpp @@ -5,25 +5,25 @@ int __thiscall TGate::Message(TGate *this, int a2, float a3) { TGate *v3; // esi int v4; // eax -_DWORD *v5; // ST00_4 +DWORD *v5; // ST00_4 v3 = this; if ( a2 != 1020 ) { if ( a2 == 53 ) { -v5 = *(_DWORD **)((char *)this + 26); +v5 = *(DWORD **)((char *)this + 26); *((_BYTE *)this + 5) = 0; render_sprite_set_bitmap(v5, 0); -loader_play_sound(*(_DWORD *)((char *)v3 + 82)); +loader_play_sound(*(DWORD *)((char *)v3 + 82)); } else if ( a2 == 54 || a2 == 1024 ) { -v4 = *(_DWORD *)((char *)this + 34); +v4 = *(DWORD *)((char *)this + 34); *((_BYTE *)this + 5) = 1; -render_sprite_set_bitmap(*(_DWORD **)((char *)this + 26), *(_DWORD *)(*(_DWORD *)(v4 + 4) + 8)); +render_sprite_set_bitmap(*(DWORD **)((char *)this + 26), *(DWORD *)(*(DWORD *)(v4 + 4) + 8)); if ( a2 == 54 ) -loader_play_sound(*(_DWORD *)((char *)v3 + 78)); +loader_play_sound(*(DWORD *)((char *)v3 + 78)); } control_handler(a2, v3); } @@ -41,13 +41,13 @@ int v8; // [esp+40h] [ebp-Ch] v3 = this; TCollisionComponent::TCollisionComponent(this, a2, a3, 1); -*(_DWORD *)v3 = &TGate::vftable; +*(DWORD *)v3 = &TGate::vftable; loader_query_visual(a3, 0, &v6); -*(_DWORD *)((char *)v3 + 78) = v7; -*(_DWORD *)((char *)v3 + 82) = v8; -v4 = *(_DWORD *)((char *)v3 + 34); +*(DWORD *)((char *)v3 + 78) = v7; +*(DWORD *)((char *)v3 + 82) = v8; +v4 = *(DWORD *)((char *)v3 + 34); *((_BYTE *)v3 + 5) = 1; -render_sprite_set_bitmap(*(_DWORD **)((char *)v3 + 26), *(_DWORD *)(*(_DWORD *)(v4 + 4) + 8)); +render_sprite_set_bitmap(*(DWORD **)((char *)v3 + 26), *(DWORD *)(*(DWORD *)(v4 + 4) + 8)); control_handler(1024, v3); return v3; } diff --git a/Classes/THole/THole.cpp b/Classes/THole/THole.cpp index 0f6bc7a..ca13088 100644 --- a/Classes/THole/THole.cpp +++ b/Classes/THole/THole.cpp @@ -1,10 +1,10 @@ #include "../../pinball.h" //----- (010169A4) -------------------------------------------------------- -void __stdcall THole::TimerExpired(int a1, void *a2) +void THole::TimerExpired(int a1, void *a2) { -*(_DWORD *)((char *)a2 + 86) = 0; -*(_DWORD *)((char *)a2 + 82) = 1; +*(DWORD *)((char *)a2 + 86) = 0; +*(DWORD *)((char *)a2 + 82) = 1; } //----- (010169C0) -------------------------------------------------------- @@ -22,12 +22,12 @@ float v11; // [esp+4h] [ebp-Ch] float v12; // [esp+8h] [ebp-8h] v3 = this; -if ( *(_DWORD *)((char *)this + 78) ) +if ( *(DWORD *)((char *)this + 78) ) { -if ( *(_DWORD *)((char *)this + 82) ) +if ( *(DWORD *)((char *)this + 82) ) { v4 = *(float *)((char *)a2 + 62) -- *(float *)(*(_DWORD *)((char *)this + 30) + 270) +- *(float *)(*(DWORD *)((char *)this + 30) + 270) * *(float *)((char *)a2 + 74) * *(float *)((char *)this + 98); *(float *)((char *)a2 + 62) = v4; @@ -35,18 +35,18 @@ v5 = v4 + *(float *)((char *)a2 + 50); *(float *)((char *)a2 + 50) = v5; if ( v5 <= *(float *)((char *)this + 102) ) { -v6 = *(_DWORD *)((char *)this + 102); -*(_DWORD *)((char *)this + 78) = 0; -*(_DWORD *)((char *)this + 82) = 0; -*(_DWORD *)((char *)a2 + 50) = v6; -v7 = *(_DWORD *)((char *)this + 106); +v6 = *(DWORD *)((char *)this + 102); +*(DWORD *)((char *)this + 78) = 0; +*(DWORD *)((char *)this + 82) = 0; +*(DWORD *)((char *)a2 + 50) = v6; +v7 = *(DWORD *)((char *)this + 106); *(float *)((char *)a2 + 62) = 0.0; -*(_DWORD *)((char *)a2 + 110) = v7; +*(DWORD *)((char *)a2 + 110) = v7; *(float *)((char *)a2 + 58) = 0.0; -*(_DWORD *)((char *)a2 + 106) = 0; +*(DWORD *)((char *)a2 + 106) = 0; *(float *)((char *)a2 + 54) = 0.0; *(float *)((char *)a2 + 66) = 0.0; -loader_play_sound(*(_DWORD *)((char *)this + 70)); +loader_play_sound(*(DWORD *)((char *)this + 70)); control_handler(58, v3); } } @@ -80,12 +80,12 @@ int __thiscall THole::Message(THole *this, int a2, float a3) THole *v3; // esi v3 = this; -if ( a2 == 1024 && *(_DWORD *)((char *)this + 78) ) +if ( a2 == 1024 && *(DWORD *)((char *)this + 78) ) { -if ( *(_DWORD *)((char *)this + 86) ) -timer_kill(*(_DWORD *)((char *)this + 86)); -*(_DWORD *)((char *)v3 + 86) = 0; -*(_DWORD *)((char *)v3 + 82) = 1; +if ( *(DWORD *)((char *)this + 86) ) +timer_kill(*(DWORD *)((char *)this + 86)); +*(DWORD *)((char *)v3 + 86) = 0; +*(DWORD *)((char *)v3 + 82) = 1; } return 0; } @@ -97,20 +97,20 @@ THole *v6; // esi int v7; // ecx v6 = this; -if ( !*(_DWORD *)((char *)this + 78) ) +if ( !*(DWORD *)((char *)this + 78) ) { -*(_DWORD *)((char *)this + 82) = 0; -*(_DWORD *)((char *)this + 66) = 1315859240; -*(_DWORD *)((char *)this + 78) = 1; -*(_DWORD *)((char *)a2 + 106) = this; -*(_DWORD *)((char *)a2 + 42) = *(_DWORD *)((char *)this + 114); -v7 = *(_DWORD *)((char *)this + 118); +*(DWORD *)((char *)this + 82) = 0; +*(DWORD *)((char *)this + 66) = 1315859240; +*(DWORD *)((char *)this + 78) = 1; +*(DWORD *)((char *)a2 + 106) = this; +*(DWORD *)((char *)a2 + 42) = *(DWORD *)((char *)this + 114); +v7 = *(DWORD *)((char *)this + 118); *(float *)((char *)a2 + 62) = 0.0; -*(_DWORD *)((char *)a2 + 46) = v7; -*(_DWORD *)((char *)v6 + 86) = timer_set(0.5, (int)v6, (int)THole::TimerExpired); -if ( !*(_DWORD *)(*(_DWORD *)((char *)v6 + 30) + 370) ) +*(DWORD *)((char *)a2 + 46) = v7; +*(DWORD *)((char *)v6 + 86) = timer_set(0.5, (int)v6, (int)THole::TimerExpired); +if ( !*(DWORD *)(*(DWORD *)((char *)v6 + 30) + 370) ) { -loader_play_sound(*(_DWORD *)((char *)v6 + 74)); +loader_play_sound(*(DWORD *)((char *)v6 + 74)); control_handler(57, v6); } } @@ -120,8 +120,8 @@ control_handler(57, v6); THole *__thiscall THole::THole(THole *this, struct TPinballTable *a2, int a3) { THole *v3; // ebx -_DWORD *v4; // eax -_DWORD *v5; // eax +DWORD *v4; // eax +DWORD *v5; // eax int v6; // eax float *v7; // edi double v8; // st7 @@ -129,7 +129,7 @@ TCircle *v9; // eax float *v10; // eax unsigned int v11; // ecx char v13; // [esp+14h] [ebp-5Ch] -_DWORD *v14; // [esp+20h] [ebp-50h] +DWORD *v14; // [esp+20h] [ebp-50h] unsigned int v15; // [esp+48h] [ebp-28h] int v16; // [esp+5Ch] [ebp-14h] int v17; // [esp+60h] [ebp-10h] @@ -141,33 +141,33 @@ TCircle *v22; // [esp+78h] [ebp+8h] v3 = this; TCollisionComponent::TCollisionComponent(this, a2, a3, 0); -*(_DWORD *)v3 = &THole::vftable; -*(_DWORD *)((char *)v3 + 94) = 1028443341; -*(_DWORD *)((char *)v3 + 6) = 0; -*(_DWORD *)((char *)v3 + 86) = 0; -*(_DWORD *)((char *)v3 + 78) = 0; -v4 = (_DWORD *)loader_query_float_attribute(a3, 0, 407); +*(DWORD *)v3 = &THole::vftable; +*(DWORD *)((char *)v3 + 94) = 1028443341; +*(DWORD *)((char *)v3 + 6) = 0; +*(DWORD *)((char *)v3 + 86) = 0; +*(DWORD *)((char *)v3 + 78) = 0; +v4 = (DWORD *)loader_query_float_attribute(a3, 0, 407); if ( v4 ) -*(_DWORD *)((char *)v3 + 90) = *v4; +*(DWORD *)((char *)v3 + 90) = *v4; else -*(_DWORD *)((char *)v3 + 90) = 1048576000; -v5 = (_DWORD *)loader_query_float_attribute(a3, 0, 701); +*(DWORD *)((char *)v3 + 90) = 1048576000; +v5 = (DWORD *)loader_query_float_attribute(a3, 0, 701); if ( v5 ) -*(_DWORD *)((char *)v3 + 98) = *v5; +*(DWORD *)((char *)v3 + 98) = *v5; else -*(_DWORD *)((char *)v3 + 98) = 1056964608; +*(DWORD *)((char *)v3 + 98) = 1056964608; v21 = *(float *)loader_query_float_attribute(a3, 0, 306); -*(_DWORD *)((char *)v3 + 110) = *(_DWORD *)loader_query_float_attribute(a3, 0, 305); +*(DWORD *)((char *)v3 + 110) = *(DWORD *)loader_query_float_attribute(a3, 0, 305); loader_query_visual(a3, 0, &v13); v6 = (int)v14; -*(_DWORD *)((char *)v3 + 114) = *v14; +*(DWORD *)((char *)v3 + 114) = *v14; v7 = (float *)(v6 + 8); -*(_DWORD *)((char *)v3 + 118) = *(_DWORD *)(v6 + 4); +*(DWORD *)((char *)v3 + 118) = *(DWORD *)(v6 + 4); v8 = v21 * *(float *)(v6 + 8); v20 = (struct vector_type *)v6; *(float *)((char *)v3 + 126) = v8; if ( 0.0 == v8 ) -*(_DWORD *)((char *)v3 + 126) = 981668463; +*(DWORD *)((char *)v3 + 126) = 981668463; v9 = (TCircle *)operator new(0x25u); if ( v9 ) v22 = TCircle::TCircle(v9, v3, (char *)v3 + 5, v15, v20, *(float *)((char *)v3 + 126)); @@ -175,21 +175,21 @@ else v22 = 0; if ( v22 ) { -(*(void (**)(void))(*(_DWORD *)v22 + 8))(); +(*(void (**)(void))(*(DWORD *)v22 + 8))(); objlist_class::Add((THole *)((char *)v3 + 42), (void *)v22); } *(float *)((char *)v3 + 126) = *v7 * *v7; -*(_DWORD *)((char *)v3 + 102) = *(_DWORD *)(loader_query_float_attribute(a3, 0, 408) + 8); +*(DWORD *)((char *)v3 + 102) = *(DWORD *)(loader_query_float_attribute(a3, 0, 408) + 8); v10 = (float *)loader_query_float_attribute(a3, 0, 1304); -*(_DWORD *)((char *)v3 + 106) = (signed __int64)_floor(*v10); -v19 = *(_DWORD *)((char *)v3 + 126); -v16 = *(_DWORD *)((char *)v3 + 114); -v17 = *(_DWORD *)((char *)v3 + 118); -*(_DWORD *)((char *)v3 + 130) = (char *)v3 + 5; +*(DWORD *)((char *)v3 + 106) = (signed __int64)_floor(*v10); +v19 = *(DWORD *)((char *)v3 + 126); +v16 = *(DWORD *)((char *)v3 + 114); +v17 = *(DWORD *)((char *)v3 + 118); +*(DWORD *)((char *)v3 + 130) = (char *)v3 + 5; v11 = v15; -v18 = *(_DWORD *)((char *)v3 + 122); -*(_DWORD *)((char *)v3 + 138) = v3; -*(_DWORD *)((char *)v3 + 134) = v11; +v18 = *(DWORD *)((char *)v3 + 122); +*(DWORD *)((char *)v3 + 138) = v3; +*(DWORD *)((char *)v3 + 134) = v11; edges_insert_circle((struct circle_type *)&v16, 0, (THole *)((char *)v3 + 130)); return v3; } diff --git a/Classes/THole/THole.h b/Classes/THole/THole.h index f8a9a37..ceb941e 100644 --- a/Classes/THole/THole.h +++ b/Classes/THole/THole.h @@ -10,7 +10,7 @@ /* 112 */ struct THole; -void __stdcall THole::TimerExpired(int, void*); // idb +void THole::TimerExpired(int, void*); // idb int __thiscall THole::FieldEffect(THole* this, struct TBall*, struct vector_type*); // idb int __thiscall THole::Message(THole* this, int, float); // idb void __thiscall THole::Collision(THole* this, struct TBall*, struct vector_type*, struct vector_type*, float, struct TEdgeSegment*); // idb diff --git a/Classes/TKickback/TKickback.cpp b/Classes/TKickback/TKickback.cpp index 47a7dbc..9e6c51c 100644 --- a/Classes/TKickback/TKickback.cpp +++ b/Classes/TKickback/TKickback.cpp @@ -1,40 +1,40 @@ #include "../../pinball.h" //----- (0101663F) -------------------------------------------------------- -void __stdcall TKickback::TimerExpired(int a1, struct TPinballComponent *a2) +void TKickback::TimerExpired(int a1, struct TPinballComponent *a2) { int v2; // eax int v3; // ST10_4 int v4; // eax int v5; // eax -if ( *(_DWORD *)((char *)a2 + 90) ) +if ( *(DWORD *)((char *)a2 + 90) ) { *(float *)((char *)a2 + 66) = 0.0; v2 = timer_set(*(float *)((char *)a2 + 82), (int)a2, (int)TKickback::TimerExpired); -v3 = *(_DWORD *)((char *)a2 + 74); -*(_DWORD *)((char *)a2 + 86) = v2; +v3 = *(DWORD *)((char *)a2 + 74); +*(DWORD *)((char *)a2 + 86) = v2; loader_play_sound(v3); -v4 = *(_DWORD *)((char *)a2 + 34); +v4 = *(DWORD *)((char *)a2 + 34); if ( v4 ) render_sprite_set( -*(_DWORD **)((char *)a2 + 26), -*(_DWORD *)(*(_DWORD *)(v4 + 4) + 12), -*(_DWORD *)(*(_DWORD *)(*(_DWORD *)((char *)a2 + 38) + 4) + 12), -*(_DWORD *)(*(_DWORD *)(*(_DWORD *)(v4 + 4) + 12) + 29) - *(_DWORD *)(*(_DWORD *)((char *)a2 + 30) + 234), -*(_DWORD *)(*(_DWORD *)(*(_DWORD *)(v4 + 4) + 12) + 33) - *(_DWORD *)(*(_DWORD *)((char *)a2 + 30) + 238)); +*(DWORD **)((char *)a2 + 26), +*(DWORD *)(*(DWORD *)(v4 + 4) + 12), +*(DWORD *)(*(DWORD *)(*(DWORD *)((char *)a2 + 38) + 4) + 12), +*(DWORD *)(*(DWORD *)(*(DWORD *)(v4 + 4) + 12) + 29) - *(DWORD *)(*(DWORD *)((char *)a2 + 30) + 234), +*(DWORD *)(*(DWORD *)(*(DWORD *)(v4 + 4) + 12) + 33) - *(DWORD *)(*(DWORD *)((char *)a2 + 30) + 238)); } else { -v5 = *(_DWORD *)((char *)a2 + 34); +v5 = *(DWORD *)((char *)a2 + 34); if ( v5 ) render_sprite_set( -*(_DWORD **)((char *)a2 + 26), -*(_DWORD *)(*(_DWORD *)(v5 + 4) + 8), -*(_DWORD *)(*(_DWORD *)(*(_DWORD *)((char *)a2 + 38) + 4) + 8), -*(_DWORD *)(*(_DWORD *)(*(_DWORD *)(v5 + 4) + 8) + 29) - *(_DWORD *)(*(_DWORD *)((char *)a2 + 30) + 234), -*(_DWORD *)(*(_DWORD *)(*(_DWORD *)(v5 + 4) + 8) + 33) - *(_DWORD *)(*(_DWORD *)((char *)a2 + 30) + 238)); -*(_DWORD *)((char *)a2 + 86) = 0; +*(DWORD **)((char *)a2 + 26), +*(DWORD *)(*(DWORD *)(v5 + 4) + 8), +*(DWORD *)(*(DWORD *)(*(DWORD *)((char *)a2 + 38) + 4) + 8), +*(DWORD *)(*(DWORD *)(*(DWORD *)(v5 + 4) + 8) + 29) - *(DWORD *)(*(DWORD *)((char *)a2 + 30) + 234), +*(DWORD *)(*(DWORD *)(*(DWORD *)(v5 + 4) + 8) + 33) - *(DWORD *)(*(DWORD *)((char *)a2 + 30) + 238)); +*(DWORD *)((char *)a2 + 86) = 0; control_handler(60, a2); } } @@ -45,14 +45,14 @@ int __thiscall TKickback::Message(TKickback *this, int a2, float a3) TKickback *v3; // esi v3 = this; -if ( (a2 == 1011 || a2 == 1024) && *(_DWORD *)((char *)this + 86) ) +if ( (a2 == 1011 || a2 == 1024) && *(DWORD *)((char *)this + 86) ) { -timer_kill(*(_DWORD *)((char *)this + 86)); -if ( *(_DWORD *)((char *)v3 + 34) ) -render_sprite_set_bitmap(*(_DWORD **)((char *)v3 + 26), 0); -*(_DWORD *)((char *)v3 + 86) = 0; -*(_DWORD *)((char *)v3 + 90) = 0; -*(_DWORD *)((char *)v3 + 66) = 1315859240; +timer_kill(*(DWORD *)((char *)this + 86)); +if ( *(DWORD *)((char *)v3 + 34) ) +render_sprite_set_bitmap(*(DWORD **)((char *)v3 + 26), 0); +*(DWORD *)((char *)v3 + 86) = 0; +*(DWORD *)((char *)v3 + 90) = 0; +*(DWORD *)((char *)v3 + 66) = 1315859240; } return 0; } @@ -64,7 +64,7 @@ TKickback *v6; // esi float v7; // ST10_4 v6 = this; -if ( *(_DWORD *)(*(_DWORD *)((char *)this + 30) + 370) ) +if ( *(DWORD *)(*(DWORD *)((char *)this + 30) + 370) ) { basic_collision( a2, @@ -77,15 +77,15 @@ a4, } else { -if ( !*(_DWORD *)((char *)this + 90) ) +if ( !*(DWORD *)((char *)this + 90) ) { v7 = *(float *)((char *)this + 78); -*(_DWORD *)((char *)this + 66) = 1315859240; -*(_DWORD *)((char *)this + 90) = 1; -*(_DWORD *)((char *)this + 86) = timer_set(v7, (int)this, (int)TKickback::TimerExpired); +*(DWORD *)((char *)this + 66) = 1315859240; +*(DWORD *)((char *)this + 90) = 1; +*(DWORD *)((char *)this + 86) = timer_set(v7, (int)this, (int)TKickback::TimerExpired); } if ( TCollisionComponent::DefaultCollision(v6, a2, a3, a4) ) -*(_DWORD *)((char *)v6 + 90) = 0; +*(DWORD *)((char *)v6 + 90) = 0; } } @@ -96,13 +96,13 @@ TKickback *v3; // esi v3 = this; TCollisionComponent::TCollisionComponent(this, a2, a3, 1); -*(_DWORD *)((char *)v3 + 6) = 0; -*(_DWORD *)((char *)v3 + 86) = 0; -*(_DWORD *)((char *)v3 + 90) = 0; -*(_DWORD *)v3 = &TKickback::vftable; -*(_DWORD *)((char *)v3 + 78) = 1060320051; -*(_DWORD *)((char *)v3 + 82) = 1036831949; -*(_DWORD *)((char *)v3 + 66) = 1315859240; +*(DWORD *)((char *)v3 + 6) = 0; +*(DWORD *)((char *)v3 + 86) = 0; +*(DWORD *)((char *)v3 + 90) = 0; +*(DWORD *)v3 = &TKickback::vftable; +*(DWORD *)((char *)v3 + 78) = 1060320051; +*(DWORD *)((char *)v3 + 82) = 1036831949; +*(DWORD *)((char *)v3 + 66) = 1315859240; return v3; } // 1002668: using guessed type void *TKickback::vftable; diff --git a/Classes/TKickback/TKickback.h b/Classes/TKickback/TKickback.h index fbb891c..53d7ffe 100644 --- a/Classes/TKickback/TKickback.h +++ b/Classes/TKickback/TKickback.h @@ -10,7 +10,7 @@ /* 110 */ struct TKickback; -void __stdcall TKickback::TimerExpired(int, struct TPinballComponent*); // idb +void TKickback::TimerExpired(int, struct TPinballComponent*); // idb int __thiscall TKickback::Message(TKickback* this, int, float); // idb void __thiscall TKickback::Collision(TKickback* this, struct TBall*, struct vector_type*, struct vector_type*, float, struct TEdgeSegment*); // idb TKickback* __thiscall TKickback::TKickback(TKickback* this, struct TPinballTable* a2, int a3); diff --git a/Classes/TKickout/TKickout.cpp b/Classes/TKickout/TKickout.cpp index f9c0447..098d474 100644 --- a/Classes/TKickout/TKickout.cpp +++ b/Classes/TKickout/TKickout.cpp @@ -6,38 +6,38 @@ void __thiscall TKickout::Collision(TKickout *this, struct TBall *a2, struct vec struct TPinballComponent *v6; // esi v6 = this; -if ( !*(_DWORD *)((char *)this + 78) ) +if ( !*(DWORD *)((char *)this + 78) ) { -*(_DWORD *)((char *)this + 102) = a2; -*(_DWORD *)((char *)this + 66) = 1315859240; -*(_DWORD *)((char *)this + 78) = 1; -*(_DWORD *)((char *)a2 + 106) = this; -*(_DWORD *)((char *)a2 + 42) = *(_DWORD *)((char *)this + 110); -*(_DWORD *)((char *)a2 + 46) = *(_DWORD *)((char *)this + 114); -*(_DWORD *)((char *)this + 126) = *(_DWORD *)((char *)a2 + 50); -*(_DWORD *)((char *)a2 + 50) = *(_DWORD *)((char *)this + 98); -if ( *(_DWORD *)(*(_DWORD *)((char *)this + 30) + 370) ) +*(DWORD *)((char *)this + 102) = a2; +*(DWORD *)((char *)this + 66) = 1315859240; +*(DWORD *)((char *)this + 78) = 1; +*(DWORD *)((char *)a2 + 106) = this; +*(DWORD *)((char *)a2 + 42) = *(DWORD *)((char *)this + 110); +*(DWORD *)((char *)a2 + 46) = *(DWORD *)((char *)this + 114); +*(DWORD *)((char *)this + 126) = *(DWORD *)((char *)a2 + 50); +*(DWORD *)((char *)a2 + 50) = *(DWORD *)((char *)this + 98); +if ( *(DWORD *)(*(DWORD *)((char *)this + 30) + 370) ) { -(**(void (__thiscall ***)(TKickout *, signed int, _DWORD))this)(this, 55, 0.1); +(**(void (__thiscall ***)(TKickout *, signed int, DWORD))this)(this, 55, 0.1); } else { -loader_play_sound(*(_DWORD *)((char *)this + 70)); +loader_play_sound(*(DWORD *)((char *)this + 70)); control_handler(63, v6); } } } //----- (010167BE) -------------------------------------------------------- -void __stdcall TKickout::ResetTimerExpired(int a1, void *a2) +void TKickout::ResetTimerExpired(int a1, void *a2) { -if ( !*(_DWORD *)((char *)a2 + 82) ) +if ( !*(DWORD *)((char *)a2 + 82) ) *((_BYTE *)a2 + 5) = 1; -*(_DWORD *)((char *)a2 + 86) = 0; +*(DWORD *)((char *)a2 + 86) = 0; } //----- (010167DD) -------------------------------------------------------- -void __stdcall TKickout::TimerExpired(int a1, void *a2) +void TKickout::TimerExpired(int a1, void *a2) { double v2; // st7 float v3; // ST08_4 @@ -45,25 +45,25 @@ int v4; // eax int v5; // ecx int v6; // ST10_4 -if ( *(_DWORD *)((char *)a2 + 78) ) +if ( *(DWORD *)((char *)a2 + 78) ) { v2 = *(float *)((char *)a2 + 94); -*(_DWORD *)((char *)a2 + 78) = 0; +*(DWORD *)((char *)a2 + 78) = 0; v3 = v2; -*(_DWORD *)((char *)a2 + 86) = timer_set(v3, (int)a2, (int)TKickout::ResetTimerExpired); -v4 = *(_DWORD *)((char *)a2 + 102); +*(DWORD *)((char *)a2 + 86) = timer_set(v3, (int)a2, (int)TKickout::ResetTimerExpired); +v4 = *(DWORD *)((char *)a2 + 102); if ( v4 ) { -v5 = *(_DWORD *)((char *)a2 + 126); -*(_DWORD *)((char *)a2 + 102) = 0; -*(_DWORD *)(v4 + 50) = v5; +v5 = *(DWORD *)((char *)a2 + 126); +*(DWORD *)((char *)a2 + 102) = 0; +*(DWORD *)(v4 + 50) = v5; throw_ball( (struct TBall *)v4, (struct vector_type *)((char *)a2 + 130), *(float *)((char *)a2 + 142), *(float *)((char *)a2 + 146), *(float *)((char *)a2 + 150)); -v6 = *(_DWORD *)((char *)a2 + 74); +v6 = *(DWORD *)((char *)a2 + 74); *((_BYTE *)a2 + 5) = 0; loader_play_sound(v6); } @@ -80,7 +80,7 @@ float v7; // [esp+4h] [ebp-Ch] float v8; // [esp+8h] [ebp-8h] v3 = this; -if ( *(_DWORD *)((char *)this + 78) ) +if ( *(DWORD *)((char *)this + 78) ) return 0; v5 = *(float *)((char *)this + 110) - *(float *)((char *)a2 + 42); v7 = v5; @@ -102,11 +102,11 @@ TKickout *v3; // esi v3 = this; if ( a2 == 55 ) { -if ( *(_DWORD *)((char *)this + 78) ) +if ( *(DWORD *)((char *)this + 78) ) { if ( a3 < 0.0 ) a3 = *(float *)((char *)this + 90); -*(_DWORD *)((char *)this + 86) = timer_set(a3, (int)this, (int)TKickout::TimerExpired); +*(DWORD *)((char *)this + 86) = timer_set(a3, (int)this, (int)TKickout::TimerExpired); } } else @@ -115,14 +115,14 @@ if ( a2 != 1011 ) { if ( a2 != 1024 ) return 0; -if ( *(_DWORD *)((char *)this + 78) ) +if ( *(DWORD *)((char *)this + 78) ) { -if ( *(_DWORD *)((char *)this + 86) ) -timer_kill(*(_DWORD *)((char *)this + 86)); +if ( *(DWORD *)((char *)this + 86) ) +timer_kill(*(DWORD *)((char *)this + 86)); TKickout::TimerExpired(0, (void *)v3); } } -if ( *(_DWORD *)((char *)v3 + 82) ) +if ( *(DWORD *)((char *)v3 + 82) ) *((_BYTE *)v3 + 5) = 0; } return 0; @@ -136,7 +136,7 @@ int result; // eax if ( a2 >= 5 ) result = 0; else -result = *(_DWORD *)((char *)this + 4 * a2 + 166); +result = *(DWORD *)((char *)this + 4 * a2 + 166); return result; } @@ -144,7 +144,7 @@ return result; void __thiscall TKickout::put_scoring(TKickout *this, int a2, int a3) { if ( a2 < 5 ) -*(_DWORD *)((char *)this + 4 * a2 + 166) = a3; +*(DWORD *)((char *)this + 4 * a2 + 166) = a3; } //----- (01019884) -------------------------------------------------------- @@ -181,20 +181,20 @@ struct vector_type *v32; // [esp+78h] [ebp+10h] v4 = this; TCollisionComponent::TCollisionComponent(this, a2, a3, 0); -*(_DWORD *)v4 = &TKickout::vftable; -*(_DWORD *)((char *)v4 + 82) = a4 == 0; +*(DWORD *)v4 = &TKickout::vftable; +*(DWORD *)((char *)v4 + 82) = a4 == 0; if ( !a4 ) *((_BYTE *)v4 + 5) = 0; -*(_DWORD *)((char *)v4 + 90) = 1069547520; -*(_DWORD *)((char *)v4 + 94) = 1028443341; -*(_DWORD *)((char *)v4 + 6) = 0; -*(_DWORD *)((char *)v4 + 86) = 0; -*(_DWORD *)((char *)v4 + 78) = 0; +*(DWORD *)((char *)v4 + 90) = 1069547520; +*(DWORD *)((char *)v4 + 94) = 1028443341; +*(DWORD *)((char *)v4 + 6) = 0; +*(DWORD *)((char *)v4 + 86) = 0; +*(DWORD *)((char *)v4 + 78) = 0; v30 = *(float *)loader_query_float_attribute(a3, 0, 306); -*(_DWORD *)((char *)v4 + 106) = *(_DWORD *)loader_query_float_attribute(a3, 0, 305); +*(DWORD *)((char *)v4 + 106) = *(DWORD *)loader_query_float_attribute(a3, 0, 305); loader_query_visual(a3, 0, &v15); -*(_DWORD *)((char *)v4 + 70) = v17; -*(_DWORD *)((char *)v4 + 74) = v24; +*(DWORD *)((char *)v4 + 70) = v17; +*(DWORD *)((char *)v4 + 74) = v24; v5 = v16; *(float *)((char *)v4 + 110) = *v16; v6 = v5 + 2; @@ -203,7 +203,7 @@ v7 = v30 * v5[2]; v32 = (struct vector_type *)v5; *(float *)((char *)v4 + 122) = v7; if ( 0.0 == v7 ) -*(_DWORD *)((char *)v4 + 122) = 981668463; +*(DWORD *)((char *)v4 + 122) = 981668463; v8 = (TCircle *)operator new(0x25u); if ( v8 ) v31 = TCircle::TCircle(v8, v4, (char *)v4 + 5, v25, v32, *(float *)((char *)v4 + 122)); @@ -211,29 +211,29 @@ else v31 = 0; if ( v31 ) { -(*(void (**)(void))(*(_DWORD *)v31 + 8))(); +(*(void (**)(void))(*(DWORD *)v31 + 8))(); objlist_class::Add((TKickout *)((char *)v4 + 42), (void *)v31); } *(float *)((char *)v4 + 122) = *v6 * *v6; v9 = loader_query_float_attribute(a3, 0, 408); v10 = v19 * 0.01; -*(_DWORD *)((char *)v4 + 98) = *(_DWORD *)(v9 + 8); +*(DWORD *)((char *)v4 + 98) = *(DWORD *)(v9 + 8); v11 = v23; *(float *)((char *)v4 + 150) = v10; -*(_DWORD *)((char *)v4 + 130) = v20; -*(_DWORD *)((char *)v4 + 134) = v21; -*(_DWORD *)((char *)v4 + 142) = v11; +*(DWORD *)((char *)v4 + 130) = v20; +*(DWORD *)((char *)v4 + 134) = v21; +*(DWORD *)((char *)v4 + 142) = v11; v12 = v18; -*(_DWORD *)((char *)v4 + 138) = v22; -*(_DWORD *)((char *)v4 + 146) = v12; -v29 = *(_DWORD *)((char *)v4 + 122); -v26 = *(_DWORD *)((char *)v4 + 110); -v27 = *(_DWORD *)((char *)v4 + 114); -*(_DWORD *)((char *)v4 + 154) = (char *)v4 + 5; +*(DWORD *)((char *)v4 + 138) = v22; +*(DWORD *)((char *)v4 + 146) = v12; +v29 = *(DWORD *)((char *)v4 + 122); +v26 = *(DWORD *)((char *)v4 + 110); +v27 = *(DWORD *)((char *)v4 + 114); +*(DWORD *)((char *)v4 + 154) = (char *)v4 + 5; v13 = v25; -v28 = *(_DWORD *)((char *)v4 + 118); -*(_DWORD *)((char *)v4 + 162) = v4; -*(_DWORD *)((char *)v4 + 158) = v13; +v28 = *(DWORD *)((char *)v4 + 118); +*(DWORD *)((char *)v4 + 162) = v4; +*(DWORD *)((char *)v4 + 158) = v13; edges_insert_circle((struct circle_type *)&v26, 0, (TKickout *)((char *)v4 + 154)); return v4; } diff --git a/Classes/TKickout/TKickout.h b/Classes/TKickout/TKickout.h index 4334662..002f7dc 100644 --- a/Classes/TKickout/TKickout.h +++ b/Classes/TKickout/TKickout.h @@ -11,8 +11,8 @@ struct TKickout; void __thiscall TKickout::Collision(TKickout* this, struct TBall*, struct vector_type*, struct vector_type*, float, struct TEdgeSegment*); // idb -void __stdcall TKickout::ResetTimerExpired(int, void*); // idb -void __stdcall TKickout::TimerExpired(int, void*); // idb +void TKickout::ResetTimerExpired(int, void*); // idb +void TKickout::TimerExpired(int, void*); // idb int __thiscall TKickout::FieldEffect(TKickout* this, struct TBall*, struct vector_type*); // idb int __thiscall TKickout::Message(TKickout* this, int, float); // idb int __thiscall TKickout::get_scoring(TKickout* this, int); // idb diff --git a/Classes/TLight/TLight.cpp b/Classes/TLight/TLight.cpp index 9f8feff..f4f3d79 100644 --- a/Classes/TLight/TLight.cpp +++ b/Classes/TLight/TLight.cpp @@ -8,60 +8,60 @@ void __thiscall TLight::Reset(TLight *this) { TLight *v1; // esi - _DWORD *v2; // ST00_4 + DWORD *v2; // ST00_4 int v3; // eax v1 = this; - if ( *(_DWORD *)((char *)this + 110) ) - timer_kill(*(_DWORD *)((char *)this + 110)); - if ( *(_DWORD *)((char *)v1 + 114) ) - timer_kill(*(_DWORD *)((char *)v1 + 114)); - if ( *(_DWORD *)((char *)v1 + 82) ) + if ( *(DWORD *)((char *)this + 110) ) + timer_kill(*(DWORD *)((char *)this + 110)); + if ( *(DWORD *)((char *)v1 + 114) ) + timer_kill(*(DWORD *)((char *)v1 + 114)); + if ( *(DWORD *)((char *)v1 + 82) ) flasher_stop((TLight *)((char *)v1 + 42), -1); - v2 = *(_DWORD **)((char *)v1 + 26); + v2 = *(DWORD **)((char *)v1 + 26); *(float *)((char *)v1 + 122) = 1.0; - *(_DWORD *)((char *)v1 + 110) = 0; - *(_DWORD *)((char *)v1 + 114) = 0; - *(_DWORD *)((char *)v1 + 78) = 0; - *(_DWORD *)((char *)v1 + 98) = 0; - *(_DWORD *)((char *)v1 + 86) = 0; - *(_DWORD *)((char *)v1 + 90) = 0; - *(_DWORD *)((char *)v1 + 82) = 0; - *(_DWORD *)((char *)v1 + 94) = 0; + *(DWORD *)((char *)v1 + 110) = 0; + *(DWORD *)((char *)v1 + 114) = 0; + *(DWORD *)((char *)v1 + 78) = 0; + *(DWORD *)((char *)v1 + 98) = 0; + *(DWORD *)((char *)v1 + 86) = 0; + *(DWORD *)((char *)v1 + 90) = 0; + *(DWORD *)((char *)v1 + 82) = 0; + *(DWORD *)((char *)v1 + 94) = 0; render_sprite_set_bitmap(v2, 0); - *(_DWORD *)((char *)v1 + 42) = *(_DWORD *)((char *)v1 + 26); - v3 = *(_DWORD *)((char *)v1 + 34); - *(_DWORD *)((char *)v1 + 46) = 0; + *(DWORD *)((char *)v1 + 42) = *(DWORD *)((char *)v1 + 26); + v3 = *(DWORD *)((char *)v1 + 34); + *(DWORD *)((char *)v1 + 46) = 0; if ( v3 ) - *(_DWORD *)((char *)v1 + 50) = *(_DWORD *)(*(_DWORD *)(v3 + 4) + 8); - *(_DWORD *)((char *)v1 + 58) = 0; - *(_DWORD *)((char *)v1 + 54) = 0; - *(_DWORD *)((char *)v1 + 6) = 0; + *(DWORD *)((char *)v1 + 50) = *(DWORD *)(*(DWORD *)(v3 + 4) + 8); + *(DWORD *)((char *)v1 + 58) = 0; + *(DWORD *)((char *)v1 + 54) = 0; + *(DWORD *)((char *)v1 + 6) = 0; } //----- (01009A2A) -------------------------------------------------------- -void __stdcall TLight::TimerExpired(int a1, void *a2) +void TLight::TimerExpired(int a1, void *a2) { bool v2; // zf - void (__thiscall **v3)(void *, signed int, _DWORD); // eax + void (__thiscall **v3)(void *, signed int, DWORD); // eax - if ( *(_DWORD *)((char *)a2 + 82) ) + if ( *(DWORD *)((char *)a2 + 82) ) flasher_stop((struct flasher_type *)((char *)a2 + 42), -1); render_sprite_set_bitmap( - *(_DWORD **)((char *)a2 + 26), - *(_DWORD *)((char *)a2 + 4 * *(_DWORD *)((char *)a2 + 78) + 46)); - v2 = *(_DWORD *)((char *)a2 + 94) == 0; - *(_DWORD *)((char *)a2 + 86) = 0; - *(_DWORD *)((char *)a2 + 90) = 0; - *(_DWORD *)((char *)a2 + 82) = 0; - *(_DWORD *)((char *)a2 + 110) = 0; + *(DWORD **)((char *)a2 + 26), + *(DWORD *)((char *)a2 + 4 * *(DWORD *)((char *)a2 + 78) + 46)); + v2 = *(DWORD *)((char *)a2 + 94) == 0; + *(DWORD *)((char *)a2 + 86) = 0; + *(DWORD *)((char *)a2 + 90) = 0; + *(DWORD *)((char *)a2 + 82) = 0; + *(DWORD *)((char *)a2 + 110) = 0; if ( !v2 ) { - v3 = *(void (__thiscall ***)(void *, signed int, _DWORD))a2; - *(_DWORD *)((char *)a2 + 94) = 0; + v3 = *(void (__thiscall ***)(void *, signed int, DWORD))a2; + *(DWORD *)((char *)a2 + 94) = 0; (*v3)(a2, 20, 0.0); } - if ( *(_DWORD *)((char *)a2 + 18) ) + if ( *(DWORD *)((char *)a2 + 18) ) control_handler(60, (struct TPinballComponent *)a2); } @@ -71,13 +71,13 @@ void __thiscall TLight::schedule_timeout(TLight *this, float a2) TLight *v2; // esi v2 = this; -*(_DWORD *)((char *)this + 62) = *(_DWORD *)((char *)this + 102); -*(_DWORD *)((char *)this + 66) = *(_DWORD *)((char *)this + 106); -if ( *(_DWORD *)((char *)this + 110) ) -timer_kill(*(_DWORD *)((char *)this + 110)); -*(_DWORD *)((char *)v2 + 110) = 0; +*(DWORD *)((char *)this + 62) = *(DWORD *)((char *)this + 102); +*(DWORD *)((char *)this + 66) = *(DWORD *)((char *)this + 106); +if ( *(DWORD *)((char *)this + 110) ) +timer_kill(*(DWORD *)((char *)this + 110)); +*(DWORD *)((char *)v2 + 110) = 0; if ( a2 > 0.0 ) -*(_DWORD *)((char *)v2 + 110) = timer_set(a2, (int)v2, (int)TLight::TimerExpired); +*(DWORD *)((char *)v2 + 110) = timer_set(a2, (int)v2, (int)TLight::TimerExpired); } //----- (01009AE3) -------------------------------------------------------- @@ -101,7 +101,7 @@ char *v18; // eax char *v19; // eax float v20; // ST04_4 int v21; // ecx -_DWORD *v22; // eax +DWORD *v22; // eax int v23; // [esp+1Ch] [ebp+Ch] v3 = this; @@ -109,45 +109,45 @@ if ( a2 > 1020 ) { if ( a2 == 1024 ) { -(*(void (__thiscall **)(TLight *))(*(_DWORD *)this + 20))(this); +(*(void (__thiscall **)(TLight *))(*(DWORD *)this + 20))(this); v21 = 0; -if ( *(_DWORD *)(*(_DWORD *)((char *)v3 + 30) + 214) > 0 ) +if ( *(DWORD *)(*(DWORD *)((char *)v3 + 30) + 214) > 0 ) { -v22 = (_DWORD *)((char *)v3 + 146); +v22 = (DWORD *)((char *)v3 + 146); do { -*(v22 - 3) = *(_DWORD *)((char *)v3 + 82); -*v22 = *(_DWORD *)((char *)v3 + 98); -*(v22 - 4) = *(_DWORD *)((char *)v3 + 78); -*(v22 - 5) = *(_DWORD *)((char *)v3 + 6); +*(v22 - 3) = *(DWORD *)((char *)v3 + 82); +*v22 = *(DWORD *)((char *)v3 + 98); +*(v22 - 4) = *(DWORD *)((char *)v3 + 78); +*(v22 - 5) = *(DWORD *)((char *)v3 + 6); ++v21; v22 += 6; } -while ( v21 < *(_DWORD *)(*(_DWORD *)((char *)v3 + 30) + 214) ); +while ( v21 < *(DWORD *)(*(DWORD *)((char *)v3 + 30) + 214) ); } } } else if ( a2 == 1020 ) { -v18 = (char *)this + 24 * *(_DWORD *)(*(_DWORD *)((char *)this + 30) + 218); -*(_DWORD *)(v18 + 134) = *(_DWORD *)((char *)this + 82); -*(_DWORD *)(v18 + 146) = *(_DWORD *)((char *)this + 98); -*(_DWORD *)(v18 + 130) = *(_DWORD *)((char *)this + 78); -*(_DWORD *)(v18 + 126) = *(_DWORD *)((char *)this + 6); -(*(void (__thiscall **)(TLight *))(*(_DWORD *)this + 20))(this); +v18 = (char *)this + 24 * *(DWORD *)(*(DWORD *)((char *)this + 30) + 218); +*(DWORD *)(v18 + 134) = *(DWORD *)((char *)this + 82); +*(DWORD *)(v18 + 146) = *(DWORD *)((char *)this + 98); +*(DWORD *)(v18 + 130) = *(DWORD *)((char *)this + 78); +*(DWORD *)(v18 + 126) = *(DWORD *)((char *)this + 6); +(*(void (__thiscall **)(TLight *))(*(DWORD *)this + 20))(this); v19 = (char *)v3 + 24 * (unsigned __int64)(signed __int64)_floor(a3); -*(_DWORD *)((char *)v3 + 82) = *(_DWORD *)(v19 + 134); -*(_DWORD *)((char *)v3 + 98) = *(_DWORD *)(v19 + 146); -*(_DWORD *)((char *)v3 + 78) = *(_DWORD *)(v19 + 130); -*(_DWORD *)((char *)v3 + 6) = *(_DWORD *)(v19 + 126); -if ( *(_DWORD *)((char *)v3 + 98) ) +*(DWORD *)((char *)v3 + 82) = *(DWORD *)(v19 + 134); +*(DWORD *)((char *)v3 + 98) = *(DWORD *)(v19 + 146); +*(DWORD *)((char *)v3 + 78) = *(DWORD *)(v19 + 130); +*(DWORD *)((char *)v3 + 6) = *(DWORD *)(v19 + 126); +if ( *(DWORD *)((char *)v3 + 98) ) { v20 = (double)*(signed int *)((char *)v3 + 98); TLight::Message(v3, 11, v20); } -if ( *(_DWORD *)((char *)v3 + 78) ) +if ( *(DWORD *)((char *)v3 + 78) ) TLight::Message(v3, 1, 0.0); -if ( *(_DWORD *)((char *)v3 + 82) ) +if ( *(DWORD *)((char *)v3 + 82) ) TLight::Message(v3, 4, 0.0); } else @@ -155,30 +155,30 @@ else switch ( a2 ) { case 0: -v4 = *(_DWORD *)((char *)this + 82) == 0; -*(_DWORD *)((char *)this + 78) = 0; -if ( v4 && !*(_DWORD *)((char *)this + 86) && !*(_DWORD *)((char *)this + 90) ) -render_sprite_set_bitmap(*(_DWORD **)((char *)this + 26), *(_DWORD *)((char *)this + 46)); +v4 = *(DWORD *)((char *)this + 82) == 0; +*(DWORD *)((char *)this + 78) = 0; +if ( v4 && !*(DWORD *)((char *)this + 86) && !*(DWORD *)((char *)this + 90) ) +render_sprite_set_bitmap(*(DWORD **)((char *)this + 26), *(DWORD *)((char *)this + 46)); return 0; case 1: -v4 = *(_DWORD *)((char *)this + 82) == 0; -*(_DWORD *)((char *)this + 78) = 1; -if ( v4 && !*(_DWORD *)((char *)this + 86) && !*(_DWORD *)((char *)this + 90) ) -render_sprite_set_bitmap(*(_DWORD **)((char *)this + 26), *(_DWORD *)((char *)this + 50)); +v4 = *(DWORD *)((char *)this + 82) == 0; +*(DWORD *)((char *)this + 78) = 1; +if ( v4 && !*(DWORD *)((char *)this + 86) && !*(DWORD *)((char *)this + 90) ) +render_sprite_set_bitmap(*(DWORD **)((char *)this + 26), *(DWORD *)((char *)this + 50)); return 0; case 2: -return *(_DWORD *)((char *)v3 + 78); +return *(DWORD *)((char *)v3 + 78); case 3: -return *(_DWORD *)((char *)this + 82); +return *(DWORD *)((char *)this + 82); case 4: TLight::schedule_timeout(this, 0.0); -if ( !*(_DWORD *)((char *)v3 + 82) || !*(_DWORD *)((char *)v3 + 70) ) +if ( !*(DWORD *)((char *)v3 + 82) || !*(DWORD *)((char *)v3 + 70) ) { -v5 = *(_DWORD *)((char *)v3 + 78); -*(_DWORD *)((char *)v3 + 82) = 1; -*(_DWORD *)((char *)v3 + 90) = 0; -*(_DWORD *)((char *)v3 + 86) = 0; -*(_DWORD *)((char *)v3 + 94) = 0; +v5 = *(DWORD *)((char *)v3 + 78); +*(DWORD *)((char *)v3 + 82) = 1; +*(DWORD *)((char *)v3 + 90) = 0; +*(DWORD *)((char *)v3 + 86) = 0; +*(DWORD *)((char *)v3 + 94) = 0; flasher_start((TLight *)((char *)v3 + 42), v5); } return 0; @@ -187,88 +187,88 @@ case 5: *(float *)((char *)this + 66) = a3 * *(float *)((char *)this + 106); return 0; case 6: -*(_DWORD *)((char *)this + 62) = *(_DWORD *)((char *)this + 102); -*(_DWORD *)((char *)this + 66) = *(_DWORD *)((char *)this + 106); +*(DWORD *)((char *)this + 62) = *(DWORD *)((char *)this + 102); +*(DWORD *)((char *)this + 66) = *(DWORD *)((char *)this + 106); return 0; case 7: -if ( !*(_DWORD *)((char *)this + 82) ) -flasher_start((TLight *)((char *)this + 42), *(_DWORD *)((char *)this + 78)); -*(_DWORD *)((char *)v3 + 82) = 1; -*(_DWORD *)((char *)v3 + 90) = 0; -*(_DWORD *)((char *)v3 + 94) = 0; +if ( !*(DWORD *)((char *)this + 82) ) +flasher_start((TLight *)((char *)this + 42), *(DWORD *)((char *)this + 78)); +*(DWORD *)((char *)v3 + 82) = 1; +*(DWORD *)((char *)v3 + 90) = 0; +*(DWORD *)((char *)v3 + 94) = 0; goto LABEL_28; case 8: -if ( !*(_DWORD *)((char *)this + 86) ) +if ( !*(DWORD *)((char *)this + 86) ) { -if ( *(_DWORD *)((char *)this + 82) ) +if ( *(DWORD *)((char *)this + 82) ) { flasher_stop((TLight *)((char *)this + 42), 0); -*(_DWORD *)((char *)v3 + 82) = 0; +*(DWORD *)((char *)v3 + 82) = 0; } else { -render_sprite_set_bitmap(*(_DWORD **)((char *)this + 26), *(_DWORD *)((char *)this + 46)); +render_sprite_set_bitmap(*(DWORD **)((char *)this + 26), *(DWORD *)((char *)this + 46)); } -*(_DWORD *)((char *)v3 + 86) = 1; -*(_DWORD *)((char *)v3 + 90) = 0; +*(DWORD *)((char *)v3 + 86) = 1; +*(DWORD *)((char *)v3 + 90) = 0; } goto LABEL_29; case 9: -if ( !*(_DWORD *)((char *)this + 90) ) +if ( !*(DWORD *)((char *)this + 90) ) { -if ( *(_DWORD *)((char *)this + 82) ) +if ( *(DWORD *)((char *)this + 82) ) { flasher_stop((TLight *)((char *)this + 42), 1); -*(_DWORD *)((char *)v3 + 82) = 0; +*(DWORD *)((char *)v3 + 82) = 0; } else { -render_sprite_set_bitmap(*(_DWORD **)((char *)this + 26), *(_DWORD *)((char *)this + 50)); +render_sprite_set_bitmap(*(DWORD **)((char *)this + 26), *(DWORD *)((char *)this + 50)); } -*(_DWORD *)((char *)v3 + 90) = 1; +*(DWORD *)((char *)v3 + 90) = 1; LABEL_28: -*(_DWORD *)((char *)v3 + 86) = 0; +*(DWORD *)((char *)v3 + 86) = 0; } LABEL_29: TLight::schedule_timeout(v3, a3); return 0; case 11: v7 = (signed __int64)_floor(a3); -v8 = *(_DWORD *)((char *)v3 + 34); -*(_DWORD *)((char *)v3 + 98) = v7; -v9 = *(_DWORD *)(*(_DWORD *)(v8 + 4) + 4); +v8 = *(DWORD *)((char *)v3 + 34); +*(DWORD *)((char *)v3 + 98) = v7; +v9 = *(DWORD *)(*(DWORD *)(v8 + 4) + 4); if ( (signed int)v7 > v9 ) -*(_DWORD *)((char *)v3 + 98) = v9; +*(DWORD *)((char *)v3 + 98) = v9; v10 = 0; -if ( *(_DWORD *)((char *)v3 + 98) < 0 ) -*(_DWORD *)((char *)v3 + 98) = 0; -v4 = *(_DWORD *)((char *)v3 + 82) == 0; -v11 = *(_DWORD *)((char *)v3 + 98); -*(_DWORD *)((char *)v3 + 46) = 0; -*(_DWORD *)((char *)v3 + 50) = *(_DWORD *)(*(_DWORD *)(v8 + 4) + 4 * v11 + 8); +if ( *(DWORD *)((char *)v3 + 98) < 0 ) +*(DWORD *)((char *)v3 + 98) = 0; +v4 = *(DWORD *)((char *)v3 + 82) == 0; +v11 = *(DWORD *)((char *)v3 + 98); +*(DWORD *)((char *)v3 + 46) = 0; +*(DWORD *)((char *)v3 + 50) = *(DWORD *)(*(DWORD *)(v8 + 4) + 4 * v11 + 8); if ( v4 ) { -if ( !*(_DWORD *)((char *)v3 + 86) ) +if ( !*(DWORD *)((char *)v3 + 86) ) { -if ( *(_DWORD *)((char *)v3 + 90) ) +if ( *(DWORD *)((char *)v3 + 90) ) v10 = 1; else -v10 = *(_DWORD *)((char *)v3 + 78); +v10 = *(DWORD *)((char *)v3 + 78); } } else { -v10 = *(_DWORD *)((char *)v3 + 74); +v10 = *(DWORD *)((char *)v3 + 74); } -render_sprite_set_bitmap(*(_DWORD **)((char *)v3 + 26), *(_DWORD *)((char *)v3 + 4 * v10 + 46)); +render_sprite_set_bitmap(*(DWORD **)((char *)v3 + 26), *(DWORD *)((char *)v3 + 4 * v10 + 46)); return 0; case 12: -v23 = *(_DWORD *)((char *)this + 98) + 1; -if ( v23 > *(_DWORD *)(*(_DWORD *)(*(_DWORD *)((char *)this + 34) + 4) + 4) ) -v23 = *(_DWORD *)(*(_DWORD *)(*(_DWORD *)((char *)this + 34) + 4) + 4); +v23 = *(DWORD *)((char *)this + 98) + 1; +if ( v23 > *(DWORD *)(*(DWORD *)(*(DWORD *)((char *)this + 34) + 4) + 4) ) +v23 = *(DWORD *)(*(DWORD *)(*(DWORD *)((char *)this + 34) + 4) + 4); goto LABEL_32; case 13: -v23 = *(_DWORD *)((char *)this + 98) - 1; +v23 = *(DWORD *)((char *)this + 98) - 1; if ( v23 < 0 ) v23 = 0; LABEL_32: @@ -276,42 +276,42 @@ LABEL_32: TLight::Message(this, 11, v6); return 0; case 14: -if ( *(_DWORD *)((char *)this + 110) ) -timer_kill(*(_DWORD *)((char *)this + 110)); -v4 = *(_DWORD *)((char *)v3 + 82) == 0; -*(_DWORD *)((char *)v3 + 110) = 0; +if ( *(DWORD *)((char *)this + 110) ) +timer_kill(*(DWORD *)((char *)this + 110)); +v4 = *(DWORD *)((char *)v3 + 82) == 0; +*(DWORD *)((char *)v3 + 110) = 0; if ( !v4 ) flasher_stop((TLight *)((char *)v3 + 42), -1); -v12 = *(_DWORD *)((char *)v3 + 78); -*(_DWORD *)((char *)v3 + 82) = 0; -*(_DWORD *)((char *)v3 + 86) = 0; -*(_DWORD *)((char *)v3 + 90) = 0; -render_sprite_set_bitmap(*(_DWORD **)((char *)v3 + 26), *(_DWORD *)((char *)v3 + 4 * v12 + 46)); +v12 = *(DWORD *)((char *)v3 + 78); +*(DWORD *)((char *)v3 + 82) = 0; +*(DWORD *)((char *)v3 + 86) = 0; +*(DWORD *)((char *)v3 + 90) = 0; +render_sprite_set_bitmap(*(DWORD **)((char *)v3 + 26), *(DWORD *)((char *)v3 + 4 * v12 + 46)); return 0; case 15: -v13 = *(_DWORD *)((char *)this + 114); -*(_DWORD *)((char *)this + 94) = 0; +v13 = *(DWORD *)((char *)this + 114); +*(DWORD *)((char *)this + 94) = 0; if ( v13 ) timer_kill(v13); -*(_DWORD *)((char *)v3 + 114) = 0; +*(DWORD *)((char *)v3 + 114) = 0; TLight::Message(v3, 1, 0.0); TLight::Message(v3, 7, a3); return 0; case 16: -if ( *(_DWORD *)((char *)this + 114) ) -timer_kill(*(_DWORD *)((char *)this + 114)); -*(_DWORD *)((char *)v3 + 114) = 0; +if ( *(DWORD *)((char *)this + 114) ) +timer_kill(*(DWORD *)((char *)this + 114)); +*(DWORD *)((char *)v3 + 114) = 0; TLight::Message(v3, 7, a3); -*(_DWORD *)((char *)v3 + 94) = 1; +*(DWORD *)((char *)v3 + 94) = 1; return 0; case 17: v17 = (signed __int64)_floor(a3); TLight::Message(v3, v17 != 0, 0.0); -return *(_DWORD *)((char *)v3 + 78); +return *(DWORD *)((char *)v3 + 78); case 18: TLight::Message(this, 17, a3); TLight::Message(v3, 14, 0.0); -return *(_DWORD *)((char *)v3 + 78); +return *(DWORD *)((char *)v3 + 78); case 19: TLight::Message(this, 1, 0.0); goto LABEL_62; @@ -321,15 +321,15 @@ LABEL_62: TLight::Message(v3, 14, 0.0); return 0; case 21: -v15 = (double)(*(_DWORD *)((char *)this + 78) == 0); +v15 = (double)(*(DWORD *)((char *)this + 78) == 0); TLight::Message(this, 17, v15); -return *(_DWORD *)((char *)v3 + 78); +return *(DWORD *)((char *)v3 + 78); case 22: -v16 = (double)(*(_DWORD *)((char *)this + 78) == 0); +v16 = (double)(*(DWORD *)((char *)this + 78) == 0); TLight::Message(this, 18, v16); -return *(_DWORD *)((char *)v3 + 78); +return *(DWORD *)((char *)v3 + 78); case 23: -*(_DWORD *)((char *)this + 6) = (signed __int64)_floor(a3); +*(DWORD *)((char *)this + 6) = (signed __int64)_floor(a3); break; default: return 0; @@ -349,11 +349,11 @@ double v7; // st7 v3 = this; TPinballComponent::TPinballComponent(this, a2, a3, 1); -*(_DWORD *)v3 = &TLight::vftable; -*(_DWORD *)((char *)v3 + 110) = 0; -*(_DWORD *)((char *)v3 + 82) = 0; -*(_DWORD *)((char *)v3 + 114) = 0; -*(_DWORD *)((char *)v3 + 70) = 0; +*(DWORD *)v3 = &TLight::vftable; +*(DWORD *)((char *)v3 + 110) = 0; +*(DWORD *)((char *)v3 + 82) = 0; +*(DWORD *)((char *)v3 + 114) = 0; +*(DWORD *)((char *)v3 + 70) = 0; TLight::Reset(v3); v4 = (float *)loader_query_float_attribute(a3, 0, 900); v5 = *v4; diff --git a/Classes/TLight/TLight.h b/Classes/TLight/TLight.h index 4a9f0e2..2f4e416 100644 --- a/Classes/TLight/TLight.h +++ b/Classes/TLight/TLight.h @@ -11,7 +11,7 @@ struct TLight; void __thiscall TLight::Reset(TLight* __hidden this); // idb -void __stdcall TLight::TimerExpired(int, void*); // idb +void TLight::TimerExpired(int, void*); // idb void __thiscall TLight::schedule_timeout(TLight* this, float); // idb int __thiscall TLight::Message(TLight* this, int, float); // idb TLight* __thiscall TLight::TLight(TLight* this, struct TPinballTable* a2, int a3); diff --git a/Classes/TLightBargraph/TLightBargraph.cpp b/Classes/TLightBargraph/TLightBargraph.cpp index aa207f3..fed85a9 100644 --- a/Classes/TLightBargraph/TLightBargraph.cpp +++ b/Classes/TLightBargraph/TLightBargraph.cpp @@ -10,8 +10,8 @@ TZmapList *__thiscall TLightBargraph::~TLightBargraph(TLightBargraph *this) int v2; // eax v1 = this; - v2 = *(_DWORD *)((char *)this + 138); - *(_DWORD *)this = &TLightBargraph::vftable; + v2 = *(DWORD *)((char *)this + 138); + *(DWORD *)this = &TLightBargraph::vftable; if ( v2 ) memoryfree(v2); return TLightGroup::~TLightGroup(v1); @@ -22,36 +22,36 @@ TZmapList *__thiscall TLightBargraph::~TLightBargraph(TLightBargraph *this) void __thiscall TLightBargraph::Reset(TLightBargraph *this) { TLightBargraph *v1; // edi - _DWORD *v2; // esi + DWORD *v2; // esi v1 = this; - v2 = (_DWORD *)((char *)this + 142); - if ( *(_DWORD *)((char *)this + 142) ) + v2 = (DWORD *)((char *)this + 142); + if ( *(DWORD *)((char *)this + 142) ) { - timer_kill(*(_DWORD *)((char *)this + 142)); + timer_kill(*(DWORD *)((char *)this + 142)); *v2 = 0; } - *(_DWORD *)((char *)v1 + 146) = 0; + *(DWORD *)((char *)v1 + 146) = 0; TLightGroup::Reset(v1); } //----- (0100AAD9) -------------------------------------------------------- -void __stdcall TLightBargraph::BargraphTimerExpired(int a1, void *a2) +void TLightBargraph::BargraphTimerExpired(int a1, void *a2) { int v2; // eax float v3; // ST04_4 - v2 = *(_DWORD *)((char *)a2 + 146); - *(_DWORD *)((char *)a2 + 142) = 0; + v2 = *(DWORD *)((char *)a2 + 146); + *(DWORD *)((char *)a2 + 142) = 0; if ( v2 ) { v3 = (double)(v2 - 1); - (**(void (__thiscall ***)(void *, signed int, _DWORD))a2)(a2, 45, LODWORD(v3)); + (**(void (__thiscall ***)(void *, signed int, DWORD))a2)(a2, 45, LODWORD(v3)); control_handler(60, (struct TPinballComponent *)a2); } else { - (**(void (__thiscall ***)(void *, signed int, _DWORD))a2)(a2, 20, 0.0); + (**(void (__thiscall ***)(void *, signed int, DWORD))a2)(a2, 20, 0.0); control_handler(47, (struct TPinballComponent *)a2); } } @@ -61,8 +61,8 @@ int __thiscall TLightBargraph::Message(TLightBargraph *this, int a2, float a3) { TLightBargraph *v3; // esi int v4; // ecx -_DWORD *v5; // eax -_DWORD *v6; // edi +DWORD *v5; // eax +DWORD *v6; // edi float v7; // ST0C_4 int v8; // ebx int v9; // eax @@ -74,15 +74,15 @@ v3 = this; switch ( a2 ) { case 37: -return *(_DWORD *)((char *)this + 146); +return *(DWORD *)((char *)this + 146); case 45: -if ( *(_DWORD *)((char *)this + 142) ) +if ( *(DWORD *)((char *)this + 142) ) { -timer_kill(*(_DWORD *)((char *)this + 142)); -*(_DWORD *)((char *)v3 + 142) = 0; +timer_kill(*(DWORD *)((char *)this + 142)); +*(DWORD *)((char *)v3 + 142) = 0; } v8 = (signed __int64)_floor(a3); -v9 = 2 * *(_DWORD *)(*(_DWORD *)((char *)v3 + 46) + 4); +v9 = 2 * *(DWORD *)(*(DWORD *)((char *)v3 + 46) + 4); if ( v8 >= v9 ) v8 = v9 - 1; if ( v8 >= 0 ) @@ -91,34 +91,34 @@ v10 = (double)(v8 / 2); TLightGroup::Message(v3, 45, v10); if ( !(v8 & 1) ) TLightGroup::Message(v3, 46, 0.0); -v11 = *(_DWORD *)((char *)v3 + 138); +v11 = *(DWORD *)((char *)v3 + 138); if ( v11 ) -*(_DWORD *)((char *)v3 + 142) = timer_set( +*(DWORD *)((char *)v3 + 142) = timer_set( *(float *)(v11 + 4 * v8), (int)v3, (int)TLightBargraph::BargraphTimerExpired); -*(_DWORD *)((char *)v3 + 146) = v8; +*(DWORD *)((char *)v3 + 146) = v8; } else { TLightGroup::Message(v3, 20, 0.0); -*(_DWORD *)((char *)v3 + 146) = 0; +*(DWORD *)((char *)v3 + 146) = 0; } break; case 1011: -(*(void (**)(void))(*(_DWORD *)this + 20))(); +(*(void (**)(void))(*(DWORD *)this + 20))(); break; case 1020: -v6 = (_DWORD *)((char *)this + 142); -if ( *(_DWORD *)((char *)this + 142) ) +v6 = (DWORD *)((char *)this + 142); +if ( *(DWORD *)((char *)this + 142) ) { -timer_kill(*(_DWORD *)((char *)this + 142)); +timer_kill(*(DWORD *)((char *)this + 142)); *v6 = 0; } -*(_DWORD *)((char *)v3 + 4 * *(_DWORD *)(*(_DWORD *)((char *)v3 + 30) + 218) + 150) = *(_DWORD *)((char *)v3 + 146); -(*(void (__thiscall **)(TLightBargraph *))(*(_DWORD *)v3 + 20))(v3); -v13 = *(_DWORD *)((char *)v3 + 4 * (unsigned __int64)(signed __int64)_floor(a3) + 150); -*(_DWORD *)((char *)v3 + 146) = v13; +*(DWORD *)((char *)v3 + 4 * *(DWORD *)(*(DWORD *)((char *)v3 + 30) + 218) + 150) = *(DWORD *)((char *)v3 + 146); +(*(void (__thiscall **)(TLightBargraph *))(*(DWORD *)v3 + 20))(v3); +v13 = *(DWORD *)((char *)v3 + 4 * (unsigned __int64)(signed __int64)_floor(a3) + 150); +*(DWORD *)((char *)v3 + 146) = v13; if ( v13 ) { v7 = (double)v13; @@ -126,18 +126,18 @@ TLightBargraph::Message(v3, 45, v7); } break; case 1024: -(*(void (**)(void))(*(_DWORD *)this + 20))(); +(*(void (**)(void))(*(DWORD *)this + 20))(); v4 = 0; -if ( *(_DWORD *)(*(_DWORD *)((char *)v3 + 30) + 214) > 0 ) +if ( *(DWORD *)(*(DWORD *)((char *)v3 + 30) + 214) > 0 ) { -v5 = (_DWORD *)((char *)v3 + 150); +v5 = (DWORD *)((char *)v3 + 150); do { -*v5 = *(_DWORD *)((char *)v3 + 146); +*v5 = *(DWORD *)((char *)v3 + 146); ++v4; ++v5; } -while ( v4 < *(_DWORD *)(*(_DWORD *)((char *)v3 + 30) + 214) ); +while ( v4 < *(DWORD *)(*(DWORD *)((char *)v3 + 30) + 214) ); } TLightGroup::Message(v3, 1024, a3); break; @@ -159,21 +159,21 @@ int i; // eax v3 = this; TLightGroup::TLightGroup(this, a2, a3); -*(_DWORD *)v3 = &TLightBargraph::vftable; -*(_DWORD *)((char *)v3 + 138) = 0; +*(DWORD *)v3 = &TLightBargraph::vftable; +*(DWORD *)((char *)v3 + 138) = 0; TLightBargraph::Reset(v3); if ( a3 > 0 ) { v4 = (float *)loader_query_float_attribute(a3, 0, 904); if ( v4 ) { -v5 = 2 * *(_DWORD *)(*(_DWORD *)((char *)v3 + 46) + 4); -v6 = memoryallocate(8 * *(_DWORD *)(*(_DWORD *)((char *)v3 + 46) + 4)); -*(_DWORD *)((char *)v3 + 138) = v6; +v5 = 2 * *(DWORD *)(*(DWORD *)((char *)v3 + 46) + 4); +v6 = memoryallocate(8 * *(DWORD *)(*(DWORD *)((char *)v3 + 46) + 4)); +*(DWORD *)((char *)v3 + 138) = v6; if ( v6 ) { for ( i = 0; i < v5; ++v4 ) -*(float *)(*(_DWORD *)((char *)v3 + 138) + 4 * i++) = *v4; +*(float *)(*(DWORD *)((char *)v3 + 138) + 4 * i++) = *v4; } } } diff --git a/Classes/TLightBargraph/TLightBargraph.h b/Classes/TLightBargraph/TLightBargraph.h index 3f020dd..6485115 100644 --- a/Classes/TLightBargraph/TLightBargraph.h +++ b/Classes/TLightBargraph/TLightBargraph.h @@ -12,7 +12,7 @@ struct TLightBargraph; TZmapList* __thiscall TLightBargraph::~TLightBargraph(TLightBargraph* this); void __thiscall TLightBargraph::Reset(TLightBargraph* this); // idb -void __stdcall TLightBargraph::BargraphTimerExpired(int, void*); // idb +void TLightBargraph::BargraphTimerExpired(int, void*); // idb int __thiscall TLightBargraph::Message(TLightBargraph* this, int, float); // idb TLightBargraph* __thiscall TLightBargraph::TLightBargraph(TLightBargraph* this, struct TPinballTable* a2, int a3); TLightBargraph* __thiscall TLightBargraph::`vector deleting destructor'(TLightBargraph *this, char a2); diff --git a/Classes/TLightRollover/TLightRollover.cpp b/Classes/TLightRollover/TLightRollover.cpp index 9be3014..7de5103 100644 --- a/Classes/TLightRollover/TLightRollover.cpp +++ b/Classes/TLightRollover/TLightRollover.cpp @@ -1,10 +1,10 @@ #include "TLightRollover.h" //----- (010164D1) -------------------------------------------------------- -void __stdcall TLightRollover::delay_expired(int a1, void *a2) +void TLightRollover::delay_expired(int a1, void *a2) { -render_sprite_set_bitmap(*(_DWORD **)((char *)a2 + 26), 0); -*(_DWORD *)((char *)a2 + 91) = 0; +render_sprite_set_bitmap(*(DWORD **)((char *)a2 + 26), 0); +*(DWORD *)((char *)a2 + 91) = 0; } //----- (010164F2) -------------------------------------------------------- @@ -19,10 +19,10 @@ int v10; // eax v6 = this; *(float *)((char *)a2 + 42) = *(float *)a3; v7 = *(float *)((char *)a2 + 70); -*(_DWORD *)((char *)a2 + 46) = *((_DWORD *)a3 + 1); +*(DWORD *)((char *)a2 + 46) = *((DWORD *)a3 + 1); *(float *)((char *)a2 + 70) = v7 - a5; TBall::not_again(a2, a6); -if ( !*(_DWORD *)(*(_DWORD *)((char *)v6 + 30) + 370) ) +if ( !*(DWORD *)(*(DWORD *)((char *)v6 + 30) + 370) ) { if ( *((_BYTE *)v6 + 78) ) { @@ -30,22 +30,22 @@ timer_set(0.1, (int)v6, (int)TRollover::TimerExpired); v8 = *((_BYTE *)v6 + 78) == 0; *((_BYTE *)v6 + 5) = 0; v9 = v8; -v8 = *(_DWORD *)((char *)v6 + 91) == 0; +v8 = *(DWORD *)((char *)v6 + 91) == 0; *((_BYTE *)v6 + 78) = v9; if ( v8 ) -*(_DWORD *)((char *)v6 + 91) = timer_set( +*(DWORD *)((char *)v6 + 91) = timer_set( *(float *)((char *)v6 + 87), (int)v6, (int)TLightRollover::delay_expired); } else { -loader_play_sound(*(_DWORD *)((char *)v6 + 70)); +loader_play_sound(*(DWORD *)((char *)v6 + 70)); control_handler(63, v6); *((_BYTE *)v6 + 78) = *((_BYTE *)v6 + 78) == 0; -v10 = *(_DWORD *)((char *)v6 + 34); +v10 = *(DWORD *)((char *)v6 + 34); if ( v10 ) -render_sprite_set_bitmap(*(_DWORD **)((char *)v6 + 26), *(_DWORD *)(*(_DWORD *)(v10 + 4) + 8)); +render_sprite_set_bitmap(*(DWORD **)((char *)v6 + 26), *(DWORD *)(*(DWORD *)(v10 + 4) + 8)); } } } @@ -59,14 +59,14 @@ int v4; // eax v3 = this; if ( a2 == 1024 ) { -v4 = *(_DWORD *)((char *)this + 91); +v4 = *(DWORD *)((char *)this + 91); *((_BYTE *)this + 5) = 1; *((_BYTE *)this + 78) = 0; if ( v4 ) timer_kill(v4); -*(_DWORD *)((char *)v3 + 91) = 0; -if ( *(_DWORD *)((char *)v3 + 34) ) -render_sprite_set_bitmap(*(_DWORD **)((char *)v3 + 26), 0); +*(DWORD *)((char *)v3 + 91) = 0; +if ( *(DWORD *)((char *)v3 + 34) ) +render_sprite_set_bitmap(*(DWORD **)((char *)v3 + 26), 0); } return 0; } @@ -79,14 +79,14 @@ bool v4; // zf v3 = this; TRollover::TRollover(this, a2, a3, 0); -v4 = *(_DWORD *)((char *)v3 + 34) == 0; -*(_DWORD *)v3 = &TLightRollover::vftable; +v4 = *(DWORD *)((char *)v3 + 34) == 0; +*(DWORD *)v3 = &TLightRollover::vftable; *((_BYTE *)v3 + 78) = 0; -*(_DWORD *)((char *)v3 + 91) = 0; +*(DWORD *)((char *)v3 + 91) = 0; if ( !v4 ) -render_sprite_set_bitmap(*(_DWORD **)((char *)v3 + 26), 0); +render_sprite_set_bitmap(*(DWORD **)((char *)v3 + 26), 0); TRollover::build_walls(v3, a3); -*(_DWORD *)((char *)v3 + 87) = *(_DWORD *)loader_query_float_attribute(a3, 0, 407); +*(DWORD *)((char *)v3 + 87) = *(DWORD *)loader_query_float_attribute(a3, 0, 407); return v3; } // 1002630: using guessed type void *TLightRollover::vftable; diff --git a/Classes/TLightRollover/TLightRollover.h b/Classes/TLightRollover/TLightRollover.h index da528b9..398b978 100644 --- a/Classes/TLightRollover/TLightRollover.h +++ b/Classes/TLightRollover/TLightRollover.h @@ -10,7 +10,7 @@ /* 109 */ struct TLightRollover; -void __stdcall TLightRollover::delay_expired(int, void*); // idb +void TLightRollover::delay_expired(int, void*); // idb void __thiscall TLightRollover::Collision(TLightRollover* this, struct TBall*, struct vector_type*, struct vector_type*, float, struct TEdgeSegment*); // idb int __thiscall TLightRollover::Message(TLightRollover* this, int, float); // idb TLightRollover* __thiscall TLightRollover::TLightRollover(TLightRollover* this, struct TPinballTable* a2, int a3); diff --git a/Classes/TLine/TLine.cpp b/Classes/TLine/TLine.cpp index e2a83fa..a6ca357 100644 --- a/Classes/TLine/TLine.cpp +++ b/Classes/TLine/TLine.cpp @@ -11,7 +11,7 @@ TEdgeSegment::TEdgeSegment(this, a2, a3, a4); *(float *)((char *)v8 + 73) = a6; *(float *)((char *)v8 + 77) = a7; *(float *)((char *)v8 + 81) = a8; -*(_DWORD *)v8 = &TLine::vftable; +*(DWORD *)v8 = &TLine::vftable; line_init((int)v8 + 21, a5, a6, a7, a8); return v8; } @@ -32,10 +32,10 @@ float v8; // ST10_4 v6 = this; TEdgeSegment::TEdgeSegment(this, a2, a3, a4); -*(_DWORD *)v6 = &TLine::vftable; -*(_DWORD *)((char *)v6 + 69) = *(_DWORD *)a5; -*(_DWORD *)((char *)v6 + 73) = *((_DWORD *)a5 + 1); -*(_DWORD *)((char *)v6 + 77) = *(_DWORD *)a6; +*(DWORD *)v6 = &TLine::vftable; +*(DWORD *)((char *)v6 + 69) = *(DWORD *)a5; +*(DWORD *)((char *)v6 + 73) = *((DWORD *)a5 + 1); +*(DWORD *)((char *)v6 + 77) = *(DWORD *)a6; v7 = *((float *)a6 + 1); *(float *)((char *)v6 + 81) = *((float *)a6 + 1); v8 = v7; @@ -47,7 +47,7 @@ return v6; //----- (0101C7E6) -------------------------------------------------------- void __thiscall TLine::EdgeCollision(TLine *this, struct TBall *a2, float a3) { -(*(void (__stdcall **)(struct TBall *, char *, char *, _DWORD, TLine *))(**((_DWORD **)this + 1) + 20))( +(*(void (**)(struct TBall *, char *, char *, DWORD, TLine *))(**((DWORD **)this + 1) + 20))( a2, (char *)this + 57, (char *)this + 21, diff --git a/Classes/TOneWay/TOneWay.cpp b/Classes/TOneWay/TOneWay.cpp index 47edbe0..ea40365 100644 --- a/Classes/TOneWay/TOneWay.cpp +++ b/Classes/TOneWay/TOneWay.cpp @@ -8,7 +8,7 @@ int result; // eax if ( a2 >= 6 ) result = 0; else -result = *(_DWORD *)((char *)this + 4 * a2 + 86); +result = *(DWORD *)((char *)this + 4 * a2 + 86); return result; } @@ -16,7 +16,7 @@ return result; void __thiscall TOneway::put_scoring(TOneway *this, int a2, int a3) { if ( a2 < 6 ) -*(_DWORD *)((char *)this + 4 * a2 + 86) = a3; +*(DWORD *)((char *)this + 4 * a2 + 86) = a3; } //----- (01018032) -------------------------------------------------------- @@ -32,18 +32,18 @@ if ( a6 == *(struct TEdgeSegment **)((char *)this + 82) ) { TBall::not_again(a2, a6); v8 = *(float *)((char *)a2 + 70) - a5; -*(_DWORD *)((char *)a2 + 42) = *(_DWORD *)a3; -v9 = *((_DWORD *)a3 + 1); +*(DWORD *)((char *)a2 + 42) = *(DWORD *)a3; +v9 = *((DWORD *)a3 + 1); *(float *)((char *)a2 + 70) = v8; -*(_DWORD *)((char *)a2 + 46) = v9; -if ( !*(_DWORD *)(*(_DWORD *)((char *)v6 + 30) + 370) ) +*(DWORD *)((char *)a2 + 46) = v9; +if ( !*(DWORD *)(*(DWORD *)((char *)v6 + 30) + 370) ) { -if ( *(_DWORD *)((char *)v6 + 74) ) -loader_play_sound(*(_DWORD *)((char *)v6 + 74)); +if ( *(DWORD *)((char *)v6 + 74) ) +loader_play_sound(*(DWORD *)((char *)v6 + 74)); control_handler(63, v6); } } -else if ( *(_DWORD *)(*(_DWORD *)((char *)this + 30) + 370) ) +else if ( *(DWORD *)(*(DWORD *)((char *)this + 30) + 370) ) { basic_collision(a2, a3, a4, *(float *)((char *)this + 54), *(float *)((char *)this + 58), 1000000000.0, 0.0); } @@ -56,7 +56,7 @@ a4, *(float *)((char *)this + 66), *(float *)((char *)this + 62)) > 0.2 ) { -v7 = *(_DWORD *)((char *)v6 + 70); +v7 = *(DWORD *)((char *)v6 + 70); if ( v7 ) loader_play_sound(v7); } @@ -83,7 +83,7 @@ int v17; // [esp+68h] [ebp-8h] v3 = 0; v4 = this; TCollisionComponent::TCollisionComponent(this, a2, a3, 0); -*(_DWORD *)v4 = &TOneway::vftable; +*(DWORD *)v4 = &TOneway::vftable; loader_query_visual(a3, 0, &v10); if ( v11 == 2 ) { @@ -97,7 +97,7 @@ v3 = TLine::TLine(v5, v4, (char *)v4 + 5, v13, (struct vector_type *)&v16, (stru if ( v3 ) { TLine::Offset(v3, *(float *)((char *)a2 + 282)); -(*(void (__thiscall **)(TLine *))(*(_DWORD *)v3 + 8))(v3); +(*(void (__thiscall **)(TLine *))(*(DWORD *)v3 + 8))(v3); objlist_class::Add((TOneway *)((char *)v4 + 42), (void *)v3); } v6 = (TLine *)operator new(0x55u); @@ -105,12 +105,12 @@ if ( v6 ) v7 = TLine::TLine(v6, v4, (char *)v4 + 5, v13, (struct vector_type *)&v14, (struct vector_type *)&v16); else v7 = 0; -*(_DWORD *)((char *)v4 + 82) = v7; +*(DWORD *)((char *)v4 + 82) = v7; if ( v7 ) { v8 = -(*(float *)((char *)a2 + 282) * 0.8); TLine::Offset(v7, v8); -(*(void (**)(void))(**(_DWORD **)((char *)v4 + 82) + 8))(); +(*(void (**)(void))(**(DWORD **)((char *)v4 + 82) + 8))(); objlist_class::Add((TOneway *)((char *)v4 + 42), *(void **)((char *)v4 + 82)); } } diff --git a/Classes/TPinballComponent/TPinballComponent.cpp b/Classes/TPinballComponent/TPinballComponent.cpp index 7489467..d3a7b78 100644 --- a/Classes/TPinballComponent/TPinballComponent.cpp +++ b/Classes/TPinballComponent/TPinballComponent.cpp @@ -7,7 +7,7 @@ //----- (010145F5) -------------------------------------------------------- void* TPinballComponent::operator new(size_t SizeOfElements) { - return _calloc(1u, SizeOfElements); + return calloc(1u, SizeOfElements); } //----- (010159A9) -------------------------------------------------------- diff --git a/Classes/TPinballComponent/TPinballComponent.h b/Classes/TPinballComponent/TPinballComponent.h index 6542d34..3cd0845 100644 --- a/Classes/TPinballComponent/TPinballComponent.h +++ b/Classes/TPinballComponent/TPinballComponent.h @@ -28,7 +28,7 @@ struct TPinballComponent { void* operator new(size_t SizeOfElements); // idb int Message(int, float); // idb - int __stdcall TPinballComponent::get_scoring(int a2); + int TPinballComponent::get_scoring(int a2); TPinballComponent* TPinballComponent::TPinballComponent(TPinballTable* a2, int a3, int a4); TZmapList* TPinballComponent::~TPinballComponent(); diff --git a/Classes/TPinballTable/TPinballTable.cpp b/Classes/TPinballTable/TPinballTable.cpp index c8f4e0d..ff0c497 100644 --- a/Classes/TPinballTable/TPinballTable.cpp +++ b/Classes/TPinballTable/TPinballTable.cpp @@ -1,42 +1,42 @@ #include "TPinballTable.h" //----- (01017467) -------------------------------------------------------- -void __stdcall TPinballTable::LightShow_timeout(int a1, void *a2) +void TPinballTable::LightShow_timeout(int a1, void *a2) { -void (__stdcall **v2)(signed int, _DWORD); // eax +void (**v2)(signed int, DWORD); // eax -v2 = *(void (__stdcall ***)(signed int, _DWORD))a2; -*(_DWORD *)((char *)a2 + 90) = 0; +v2 = *(void (***)(signed int, DWORD))a2; +*(DWORD *)((char *)a2 + 90) = 0; (*v2)(1013, 0.0); } //----- (0101748B) -------------------------------------------------------- -void __stdcall TPinballTable::EndGame_timeout(int a1, void *a2) +void TPinballTable::EndGame_timeout(int a1, void *a2) { char *v2; // esi int v3; // eax int v4; // edi -void (__thiscall ***v5)(_DWORD, signed int, _DWORD); // esi +void (__thiscall ***v5)(DWORD, signed int, DWORD); // esi char *v6; // eax char *v7; // [esp+28h] [ebp+Ch] v2 = (char *)a2; -*(_DWORD *)((char *)a2 + 94) = 0; +*(DWORD *)((char *)a2 + 94) = 0; pb_end_game(); -v3 = *(_DWORD *)(*(_DWORD *)((char *)a2 + 254) + 4) - 1; +v3 = *(DWORD *)(*(DWORD *)((char *)a2 + 254) + 4) - 1; if ( v3 >= 0 ) { v4 = 4 * v3 + 8; -v7 = *(char **)(*(_DWORD *)((char *)a2 + 254) + 4); +v7 = *(char **)(*(DWORD *)((char *)a2 + 254) + 4); do { -(***(void (__stdcall ****)(signed int, _DWORD))(v4 + *(_DWORD *)(v2 + 254)))(1022, 0.0); +(***(void (****)(signed int, DWORD))(v4 + *(DWORD *)(v2 + 254)))(1022, 0.0); v4 -= 4; --v7; } while ( v7 ); } -v5 = *(void (__thiscall ****)(_DWORD, signed int, _DWORD))(v2 + 230); +v5 = *(void (__thiscall ****)(DWORD, signed int, DWORD))(v2 + 230); if ( v5 ) (**v5)(v5, 1022, 0.0); control_handler(67, MissTextBox); @@ -47,62 +47,62 @@ TTextBox::Display(InfoTextBox, 1022, v6, -1.0); //----- (01017526) -------------------------------------------------------- int __thiscall TPinballTable::AddScore(TPinballTable *this, int a2) { -_DWORD *v2; // eax -_DWORD *v3; // eax +DWORD *v2; // eax +DWORD *v3; // eax int v4; // esi int *v5; // eax signed int v6; // edx -if ( *(_DWORD *)((char *)this + 318) ) +if ( *(DWORD *)((char *)this + 318) ) { -v2 = (_DWORD *)((char *)this + 314); +v2 = (DWORD *)((char *)this + 314); *v2 += a2; -if ( *(_DWORD *)((char *)this + 314) > 5000000 ) +if ( *(DWORD *)((char *)this + 314) > 5000000 ) *v2 = 5000000; } -if ( *(_DWORD *)((char *)this + 310) ) +if ( *(DWORD *)((char *)this + 310) ) { -v3 = (_DWORD *)((char *)this + 306); +v3 = (DWORD *)((char *)this + 306); *v3 += a2; -if ( *(_DWORD *)((char *)this + 306) > 5000000 ) +if ( *(DWORD *)((char *)this + 306) > 5000000 ) *v3 = 5000000; } -v4 = *(_DWORD *)((char *)this + 298) + a2 * dword_1024758[*(_DWORD *)((char *)this + 294)]; +v4 = *(DWORD *)((char *)this + 298) + a2 * dword_1024758[*(DWORD *)((char *)this + 294)]; v5 = (int *)((char *)this + 82); *v5 += v4; -v6 = *(_DWORD *)((char *)this + 82); +v6 = *(DWORD *)((char *)this + 82); if ( v6 > 1000000000 ) { -++*(_DWORD *)((char *)this + 86); +++*(DWORD *)((char *)this + 86); *v5 = v6 - 1000000000; } -score_set(*(_DWORD **)((char *)this + 50), *v5); +score_set(*(DWORD **)((char *)this + 50), *v5); return v4; } //----- (010175AA) -------------------------------------------------------- -void __userpurge TPinballTable::ChangeBallCount(TPinballTable *this@, int a2@, int a3) +void TPinballTable::ChangeBallCount(TPinballTable *this, int a2, int a3) { TPinballTable *v3; // esi v3 = this; -*(_DWORD *)((char *)this + 326) = a3; +*(DWORD *)((char *)this + 326) = a3; if ( a3 <= 0 ) { -score_erase(a2, *(_DWORD **)((char *)this + 54), 1); +score_erase(a2, *(DWORD **)((char *)this + 54), 1); } else { -score_set(*(_DWORD **)((char *)this + 54), *(_DWORD *)((char *)this + 330) - a3 + 1); +score_set(*(DWORD **)((char *)this + 54), *(DWORD *)((char *)this + 330) - a3 + 1); score_update(a2, *(int **)((char *)v3 + 54)); } } //----- (010175EF) -------------------------------------------------------- -void __stdcall TPinballTable::replay_timer_callback(int a1, void *a2) +void TPinballTable::replay_timer_callback(int a1, void *a2) { -*(_DWORD *)((char *)a2 + 354) = 0; -*(_DWORD *)((char *)a2 + 358) = 0; +*(DWORD *)((char *)a2 + 354) = 0; +*(DWORD *)((char *)a2 + 358) = 0; } //----- (0101760E) -------------------------------------------------------- @@ -114,14 +114,14 @@ int v3; // esi int v4; // ebx v1 = this; -v2 = *(_DWORD *)(*(_DWORD *)((char *)this + 254) + 4) - 1; +v2 = *(DWORD *)(*(DWORD *)((char *)this + 254) + 4) - 1; if ( v2 >= 0 ) { v3 = 4 * v2 + 8; -v4 = *(_DWORD *)(*(_DWORD *)((char *)this + 254) + 4); +v4 = *(DWORD *)(*(DWORD *)((char *)this + 254) + 4); do { -(*(void (**)(void))(**(_DWORD **)(v3 + *(_DWORD *)((char *)v1 + 254)) + 4))(); +(*(void (**)(void))(**(DWORD **)(v3 + *(DWORD *)((char *)v1 + 254)) + 4))(); v3 -= 4; --v4; } @@ -142,8 +142,8 @@ int v8; // [esp+10h] [ebp-4h] v8 = 0; v2 = this; -v7 = *(_DWORD *)(*(_DWORD *)((char *)this + 254) + 4); -if ( *(_DWORD *)(*(_DWORD *)((char *)this + 254) + 4) <= 0 ) +v7 = *(DWORD *)(*(DWORD *)((char *)this + 254) + 4); +if ( *(DWORD *)(*(DWORD *)((char *)this + 254) + 4) <= 0 ) { LABEL_6: MessageBoxA(0, "Table cant find:", lpString2, 0x2000u); @@ -154,7 +154,7 @@ else v3 = 8; while ( 1 ) { -v4 = *(_DWORD *)(v3 + *(_DWORD *)((char *)v2 + 254)); +v4 = *(DWORD *)(v3 + *(DWORD *)((char *)v2 + 254)); v5 = *(const CHAR **)(v4 + 10); if ( v5 ) { @@ -181,8 +181,8 @@ int v5; // edx struct TPinballComponent *result; // eax char DstBuf; // [esp+8h] [ebp-CCh] -v2 = *(_DWORD *)((char *)this + 254); -v3 = *(_DWORD *)(v2 + 4); +v2 = *(DWORD *)((char *)this + 254); +v3 = *(DWORD *)(v2 + 4); v4 = 0; if ( v3 <= 0 ) { @@ -197,7 +197,7 @@ v5 = v2 + 8; while ( 1 ) { result = *(struct TPinballComponent **)v5; -if ( Val == *(_DWORD *)(*(_DWORD *)v5 + 22) ) +if ( Val == *(DWORD *)(*(DWORD *)v5 + 22) ) break; ++v4; v5 += 4; @@ -209,24 +209,24 @@ return result; } //----- (01017738) -------------------------------------------------------- -void __stdcall TPinballTable::tilt_timeout(int a1, void *a2) +void TPinballTable::tilt_timeout(int a1, void *a2) { int v2; // eax -_DWORD *v3; // edi +DWORD *v3; // edi int v4; // ebx char v5; // [esp+14h] [ebp-Ch] -*(_DWORD *)((char *)a2 + 98) = 0; -if ( *(_DWORD *)((char *)a2 + 370) ) +*(DWORD *)((char *)a2 + 98) = 0; +if ( *(DWORD *)((char *)a2 + 370) ) { -v2 = *(_DWORD *)((char *)a2 + 262); -v3 = (_DWORD *)(v2 + 8); -if ( *(_DWORD *)(v2 + 4) > 0 ) +v2 = *(DWORD *)((char *)a2 + 262); +v3 = (DWORD *)(v2 + 8); +if ( *(DWORD *)(v2 + 4) > 0 ) { -v4 = *(_DWORD *)(v2 + 4); +v4 = *(DWORD *)(v2 + 4); do { -(*(void (__stdcall **)(_DWORD, char *, char *, _DWORD, _DWORD))(**(_DWORD **)((char *)a2 + 226) + 20))( +(*(void (**)(DWORD, char *, char *, DWORD, DWORD))(**(DWORD **)((char *)a2 + 226) + 20))( *v3, &v5, &v5, @@ -241,7 +241,7 @@ while ( v4 ); } //----- (01017791) -------------------------------------------------------- -void __userpurge TPinballTable::tilt(TPinballTable *this@, int a2@, float a3) +void TPinballTable::tilt(TPinballTable *this, int a2, float a3) { TPinballTable *v3; // esi int v4; // ST14_4 @@ -251,37 +251,37 @@ signed int v7; // ebx int v8; // [esp+20h] [ebp-4h] v3 = this; -if ( !*(_DWORD *)((char *)this + 370) && !*(_DWORD *)((char *)this + 78) ) +if ( !*(DWORD *)((char *)this + 370) && !*(DWORD *)((char *)this + 78) ) { v4 = a2; TTextBox::Clear(InfoTextBox, a2); TTextBox::Clear(MissTextBox, a2); v5 = get_rc_string(35, 0); TTextBox::Display(InfoTextBox, a2, v5, -1.0); -loader_play_sound(*(_DWORD *)((char *)v3 + 74)); -*(_DWORD *)((char *)v3 + 98) = timer_set(30.0, (int)v3, (int)TPinballTable::tilt_timeout); -v6 = *(_DWORD *)(*(_DWORD *)((char *)v3 + 254) + 4); -v8 = *(_DWORD *)(*(_DWORD *)((char *)v3 + 254) + 4); -(**(void (__thiscall ***)(TPinballTable *, signed int, _DWORD, int))v3)(v3, 1011, -1.0, v4); +loader_play_sound(*(DWORD *)((char *)v3 + 74)); +*(DWORD *)((char *)v3 + 98) = timer_set(30.0, (int)v3, (int)TPinballTable::tilt_timeout); +v6 = *(DWORD *)(*(DWORD *)((char *)v3 + 254) + 4); +v8 = *(DWORD *)(*(DWORD *)((char *)v3 + 254) + 4); +(**(void (__thiscall ***)(TPinballTable *, signed int, DWORD, int))v3)(v3, 1011, -1.0, v4); if ( v6 > 0 ) { v7 = 8; do { -(***(void (__stdcall ****)(signed int, _DWORD))(v7 + *(_DWORD *)((char *)v3 + 254)))(1011, LODWORD(a3)); +(***(void (****)(signed int, DWORD))(v7 + *(DWORD *)((char *)v3 + 254)))(1011, LODWORD(a3)); v7 += 4; --v8; } while ( v8 ); } -(***(void (__stdcall ****)(signed int))((char *)v3 + 266))(8); -*(_DWORD *)((char *)v3 + 370) = 1; +(***(void (****)(signed int))((char *)v3 + 266))(8); +*(DWORD *)((char *)v3 + 370) = 1; table_control_handler(1011); } } //----- (010187D6) -------------------------------------------------------- -int __userpurge TPinballTable::Message@(TPinballTable *this@, int a2@, int a3, float a4) +int TPinballTable::Message(TPinballTable *this, int a2, int a3, float a4) { TPinballTable *v4; // esi int v5; // eax @@ -290,28 +290,28 @@ int v7; // ebx int v8; // eax int v9; // eax signed __int64 v10; // rax -_DWORD *v11; // ST14_4 +DWORD *v11; // ST14_4 bool v12; // zf bool v13; // sf unsigned __int8 v14; // of -_DWORD *v15; // edi +DWORD *v15; // edi signed int v16; // eax int v17; // edi float v18; // ST10_4 char *v19; // eax -void (__thiscall ***v20)(_DWORD, signed int, _DWORD); // esi +void (__thiscall ***v20)(DWORD, signed int, DWORD); // esi float v21; // ST10_4 signed int v22; // ebx int v23; // ecx int v24; // eax int v25; // ST18_4 -_DWORD *v26; // ST14_4 +DWORD *v26; // ST14_4 int v27; // edi float v28; // ST28_4 char *v29; // eax char *v30; // eax -void (__thiscall ***v31)(_DWORD, signed int, _DWORD); // esi -void (__thiscall ***v32)(_DWORD, signed int, _DWORD); // esi +void (__thiscall ***v31)(DWORD, signed int, DWORD); // esi +void (__thiscall ***v32)(DWORD, signed int, DWORD); // esi int v33; // eax int v34; // edi int v35; // ebx @@ -319,60 +319,60 @@ char *v36; // eax float v38; // [esp+18h] [ebp-18h] int v39; // [esp+2Ch] [ebp-4h] signed int v40; // [esp+3Ch] [ebp+Ch] -_DWORD **v41; // [esp+3Ch] [ebp+Ch] +DWORD **v41; // [esp+3Ch] [ebp+Ch] signed int v42; // [esp+3Ch] [ebp+Ch] v4 = this; switch ( a3 ) { case 1000: -if ( !*(_DWORD *)((char *)this + 370) ) +if ( !*(DWORD *)((char *)this + 370) ) { -v32 = *(void (__thiscall ****)(_DWORD, signed int, _DWORD))((char *)this + 42); +v32 = *(void (__thiscall ****)(DWORD, signed int, DWORD))((char *)this + 42); goto LABEL_73; } goto LABEL_81; case 1001: -if ( !*(_DWORD *)((char *)this + 370) ) +if ( !*(DWORD *)((char *)this + 370) ) { -v31 = *(void (__thiscall ****)(_DWORD, signed int, _DWORD))((char *)this + 42); +v31 = *(void (__thiscall ****)(DWORD, signed int, DWORD))((char *)this + 42); goto LABEL_70; } goto LABEL_81; case 1002: -if ( !*(_DWORD *)((char *)this + 370) ) +if ( !*(DWORD *)((char *)this + 370) ) { -v32 = *(void (__thiscall ****)(_DWORD, signed int, _DWORD))((char *)this + 46); +v32 = *(void (__thiscall ****)(DWORD, signed int, DWORD))((char *)this + 46); LABEL_73: (**v32)(v32, 1, LODWORD(a4)); } goto LABEL_81; case 1003: -if ( !*(_DWORD *)((char *)this + 370) ) +if ( !*(DWORD *)((char *)this + 370) ) { -v31 = *(void (__thiscall ****)(_DWORD, signed int, _DWORD))((char *)this + 46); +v31 = *(void (__thiscall ****)(DWORD, signed int, DWORD))((char *)this + 46); LABEL_70: (**v31)(v31, 2, LODWORD(a4)); } goto LABEL_81; case 1004: case 1005: -(***(void (__thiscall ****)(_DWORD, int, _DWORD))((char *)this + 222))( -*(_DWORD *)((char *)this + 222), +(***(void (__thiscall ****)(DWORD, int, DWORD))((char *)this + 222))( +*(DWORD *)((char *)this + 222), a3, LODWORD(a4)); goto LABEL_81; case 1008: case 1009: case 1010: -v33 = *(_DWORD *)(*(_DWORD *)((char *)this + 254) + 4) - 1; +v33 = *(DWORD *)(*(DWORD *)((char *)this + 254) + 4) - 1; if ( v33 >= 0 ) { v34 = 4 * v33 + 8; -v35 = *(_DWORD *)(*(_DWORD *)((char *)this + 254) + 4); +v35 = *(DWORD *)(*(DWORD *)((char *)this + 254) + 4); do { -(***(void (__stdcall ****)(int, _DWORD))(v34 + *(_DWORD *)((char *)v4 + 254)))(a3, LODWORD(a4)); +(***(void (****)(int, DWORD))(v34 + *(DWORD *)((char *)v4 + 254)))(a3, LODWORD(a4)); v34 -= 4; --v35; } @@ -380,97 +380,97 @@ while ( v35 ); } goto LABEL_81; case 1012: -(***(void (__stdcall ****)(signed int, _DWORD))((char *)this + 266))(14, 0.0); -if ( *(_DWORD *)((char *)v4 + 370) ) +(***(void (****)(signed int, DWORD))((char *)this + 266))(14, 0.0); +if ( *(DWORD *)((char *)v4 + 370) ) { -*(_DWORD *)((char *)v4 + 370) = 0; -if ( *(_DWORD *)((char *)v4 + 98) ) -timer_kill(*(_DWORD *)((char *)v4 + 98)); -*(_DWORD *)((char *)v4 + 98) = 0; +*(DWORD *)((char *)v4 + 370) = 0; +if ( *(DWORD *)((char *)v4 + 98) ) +timer_kill(*(DWORD *)((char *)v4 + 98)); +*(DWORD *)((char *)v4 + 98) = 0; } goto LABEL_81; case 1013: -(***(void (__stdcall ****)(signed int, _DWORD))((char *)this + 266))(34, 0.0); -(***(void (__stdcall ****)(signed int, _DWORD))((char *)v4 + 266))(20, 0.0); -(***(void (__stdcall ****)(signed int, _DWORD))((char *)v4 + 222))(1016, 0.0); -if ( *(_BYTE *)(*(_DWORD *)((char *)v4 + 230) + 5) ) +(***(void (****)(signed int, DWORD))((char *)this + 266))(34, 0.0); +(***(void (****)(signed int, DWORD))((char *)v4 + 266))(20, 0.0); +(***(void (****)(signed int, DWORD))((char *)v4 + 222))(1016, 0.0); +if ( *(_BYTE *)(*(DWORD *)((char *)v4 + 230) + 5) ) v19 = get_rc_string(30, 0); else v19 = get_rc_string(26, 0); TTextBox::Display(InfoTextBox, 0, v19, -1.0); -v20 = *(void (__thiscall ****)(_DWORD, signed int, _DWORD))((char *)v4 + 230); +v20 = *(void (__thiscall ****)(DWORD, signed int, DWORD))((char *)v4 + 230); if ( v20 ) (**v20)(v20, 1014, 0.0); goto LABEL_81; case 1014: -if ( *(_DWORD *)((char *)this + 94) ) +if ( *(DWORD *)((char *)this + 94) ) { -timer_kill(*(_DWORD *)((char *)this + 94)); +timer_kill(*(DWORD *)((char *)this + 94)); TPinballTable::EndGame_timeout(0, (void *)v4); pb_mode_change(1); } -if ( *(_DWORD *)((char *)v4 + 90) ) +if ( *(DWORD *)((char *)v4 + 90) ) { -timer_kill(*(_DWORD *)((char *)v4 + 90)); -*(_DWORD *)((char *)v4 + 90) = 0; +timer_kill(*(DWORD *)((char *)v4 + 90)); +*(DWORD *)((char *)v4 + 90) = 0; TPinballTable::Message(v4, 1013, 0.0); } else { -*(_DWORD *)((char *)v4 + 62) = 0; +*(DWORD *)((char *)v4 + 62) = 0; TPinballTable::Message(v4, 1024, 0.0); -v9 = *(_DWORD *)(*(_DWORD *)((char *)v4 + 262) + 8); +v9 = *(DWORD *)(*(DWORD *)((char *)v4 + 262) + 8); *(float *)(v9 + 46) = 0.0; *(float *)(v9 + 42) = 0.0; -*(_DWORD *)(v9 + 50) = -1085485875; +*(DWORD *)(v9 + 50) = -1085485875; v10 = (signed __int64)_floor(a4); -*(_DWORD *)((char *)v4 + 214) = v10; +*(DWORD *)((char *)v4 + 214) = v10; if ( (signed int)v10 >= 1 ) { if ( (signed int)v10 > 4 ) -*(_DWORD *)((char *)v4 + 214) = 4; +*(DWORD *)((char *)v4 + 214) = 4; } else { -*(_DWORD *)((char *)v4 + 214) = 1; +*(DWORD *)((char *)v4 + 214) = 1; } -v11 = *(_DWORD **)((char *)v4 + 102); -*(_DWORD *)((char *)v4 + 218) = 0; -*(_DWORD *)((char *)v4 + 50) = v11; -*(_DWORD *)((char *)v4 + 82) = 0; +v11 = *(DWORD **)((char *)v4 + 102); +*(DWORD *)((char *)v4 + 218) = 0; +*(DWORD *)((char *)v4 + 50) = v11; +*(DWORD *)((char *)v4 + 82) = 0; score_set(v11, 0); -v14 = __OFSUB__(*(_DWORD *)((char *)v4 + 214), 1); -v12 = *(_DWORD *)((char *)v4 + 214) == 1; -v13 = *(_DWORD *)((char *)v4 + 214) - 1 < 0; -*(_DWORD *)((char *)v4 + 294) = 0; +v14 = __OFSUB__(*(DWORD *)((char *)v4 + 214), 1); +v12 = *(DWORD *)((char *)v4 + 214) == 1; +v13 = *(DWORD *)((char *)v4 + 214) - 1 < 0; +*(DWORD *)((char *)v4 + 294) = 0; v40 = 1; if ( !((unsigned __int8)(v13 ^ v14) | v12) ) { -v15 = (_DWORD *)((char *)v4 + 134); +v15 = (DWORD *)((char *)v4 + 134); do { -score_set((_DWORD *)*(v15 - 1), 0); +score_set((DWORD *)*(v15 - 1), 0); ++v40; *v15 = 0; v15[1] = 0; -v15[3] = *(_DWORD *)((char *)v4 + 330); -v15[4] = *(_DWORD *)((char *)v4 + 334); -v15[5] = *(_DWORD *)((char *)v4 + 342); -v15[2] = *(_DWORD *)((char *)v4 + 314); +v15[3] = *(DWORD *)((char *)v4 + 330); +v15[4] = *(DWORD *)((char *)v4 + 334); +v15[5] = *(DWORD *)((char *)v4 + 342); +v15[2] = *(DWORD *)((char *)v4 + 314); v15 += 7; } -while ( v40 < *(_DWORD *)((char *)v4 + 214) ); +while ( v40 < *(DWORD *)((char *)v4 + 214) ); } -*(_DWORD *)((char *)v4 + 326) = *(_DWORD *)((char *)v4 + 330); +*(DWORD *)((char *)v4 + 326) = *(DWORD *)((char *)v4 + 330); Sound_Idle(); -TPinballTable::ChangeBallCount(v4, 0, *(_DWORD *)((char *)v4 + 326)); -score_set(*(_DWORD **)((char *)v4 + 58), *(_DWORD *)((char *)v4 + 218) + 1); +TPinballTable::ChangeBallCount(v4, 0, *(DWORD *)((char *)v4 + 326)); +score_set(*(DWORD **)((char *)v4 + 58), *(DWORD *)((char *)v4 + 218) + 1); score_update(0, *(int **)((char *)v4 + 58)); Sound_Idle(); -v16 = *(_DWORD *)((char *)v4 + 214); +v16 = *(DWORD *)((char *)v4 + 214); if ( v16 < 4 ) { -v41 = (_DWORD **)((char *)v4 + 28 * v16 + 102); +v41 = (DWORD **)((char *)v4 + 28 * v16 + 102); v17 = 4 - v16; do { @@ -481,66 +481,66 @@ v41 += 7; while ( v17 ); } Sound_Idle(); -*(_DWORD *)((char *)v4 + 318) = 0; -*(_DWORD *)((char *)v4 + 310) = 0; -*(_DWORD *)((char *)v4 + 322) = 0; +*(DWORD *)((char *)v4 + 318) = 0; +*(DWORD *)((char *)v4 + 310) = 0; +*(DWORD *)((char *)v4 + 322) = 0; TTextBox::Clear(InfoTextBox, 0); Sound_Idle(); TTextBox::Clear(MissTextBox, 0); Sound_Idle(); -(***(void (__stdcall ****)(signed int, _DWORD))((char *)v4 + 266))(28, 0.2); -v18 = loader_play_sound(*(_DWORD *)((char *)v4 + 66)); -*(_DWORD *)((char *)v4 + 90) = timer_set(v18, (int)v4, (int)TPinballTable::LightShow_timeout); +(***(void (****)(signed int, DWORD))((char *)v4 + 266))(28, 0.2); +v18 = loader_play_sound(*(DWORD *)((char *)v4 + 66)); +*(DWORD *)((char *)v4 + 90) = timer_set(v18, (int)v4, (int)TPinballTable::LightShow_timeout); } goto LABEL_81; case 1018: -if ( *(_DWORD *)((char *)this + 358) ) -timer_kill(*(_DWORD *)((char *)this + 358)); +if ( *(DWORD *)((char *)this + 358) ) +timer_kill(*(DWORD *)((char *)this + 358)); v21 = _floor(a4); -*(_DWORD *)((char *)v4 + 358) = timer_set(v21, (int)v4, (int)TPinballTable::replay_timer_callback); -*(_DWORD *)((char *)v4 + 354) = 1; +*(DWORD *)((char *)v4 + 358) = timer_set(v21, (int)v4, (int)TPinballTable::replay_timer_callback); +*(DWORD *)((char *)v4 + 354) = 1; goto LABEL_81; case 1021: -v22 = *(_DWORD *)((char *)this + 214); +v22 = *(DWORD *)((char *)this + 214); if ( v22 > 1 ) { -v23 = *(_DWORD *)((char *)this + 218); +v23 = *(DWORD *)((char *)this + 218); v39 = (v23 + 1) % v22; v24 = (int)v4 + 28 * v39; -if ( *(_DWORD *)(v24 + 118) <= 0 ) +if ( *(DWORD *)(v24 + 118) <= 0 ) goto LABEL_81; -*(_DWORD *)((char *)v4 + 28 * v23 + 106) = *(_DWORD *)((char *)v4 + 82); -*(_DWORD *)((char *)v4 + 28 * *(_DWORD *)((char *)v4 + 218) + 110) = *(_DWORD *)((char *)v4 + 86); -*(_DWORD *)((char *)v4 + 28 * *(_DWORD *)((char *)v4 + 218) + 118) = *(_DWORD *)((char *)v4 + 326); -*(_DWORD *)((char *)v4 + 28 * *(_DWORD *)((char *)v4 + 218) + 122) = *(_DWORD *)((char *)v4 + 334); -*(_DWORD *)((char *)v4 + 28 * *(_DWORD *)((char *)v4 + 218) + 126) = *(_DWORD *)((char *)v4 + 342); -*(_DWORD *)((char *)v4 + 28 * *(_DWORD *)((char *)v4 + 218) + 114) = *(_DWORD *)((char *)v4 + 314); -*(_DWORD *)((char *)v4 + 82) = *(_DWORD *)(v24 + 106); -v25 = *(_DWORD *)((char *)v4 + 82); -*(_DWORD *)((char *)v4 + 86) = *(_DWORD *)(v24 + 110); -*(_DWORD *)((char *)v4 + 326) = *(_DWORD *)(v24 + 118); -*(_DWORD *)((char *)v4 + 334) = *(_DWORD *)(v24 + 122); -*(_DWORD *)((char *)v4 + 342) = *(_DWORD *)(v24 + 126); -*(_DWORD *)((char *)v4 + 314) = *(_DWORD *)(v24 + 114); -v26 = *(_DWORD **)(v24 + 102); -*(_DWORD *)((char *)v4 + 50) = v26; +*(DWORD *)((char *)v4 + 28 * v23 + 106) = *(DWORD *)((char *)v4 + 82); +*(DWORD *)((char *)v4 + 28 * *(DWORD *)((char *)v4 + 218) + 110) = *(DWORD *)((char *)v4 + 86); +*(DWORD *)((char *)v4 + 28 * *(DWORD *)((char *)v4 + 218) + 118) = *(DWORD *)((char *)v4 + 326); +*(DWORD *)((char *)v4 + 28 * *(DWORD *)((char *)v4 + 218) + 122) = *(DWORD *)((char *)v4 + 334); +*(DWORD *)((char *)v4 + 28 * *(DWORD *)((char *)v4 + 218) + 126) = *(DWORD *)((char *)v4 + 342); +*(DWORD *)((char *)v4 + 28 * *(DWORD *)((char *)v4 + 218) + 114) = *(DWORD *)((char *)v4 + 314); +*(DWORD *)((char *)v4 + 82) = *(DWORD *)(v24 + 106); +v25 = *(DWORD *)((char *)v4 + 82); +*(DWORD *)((char *)v4 + 86) = *(DWORD *)(v24 + 110); +*(DWORD *)((char *)v4 + 326) = *(DWORD *)(v24 + 118); +*(DWORD *)((char *)v4 + 334) = *(DWORD *)(v24 + 122); +*(DWORD *)((char *)v4 + 342) = *(DWORD *)(v24 + 126); +*(DWORD *)((char *)v4 + 314) = *(DWORD *)(v24 + 114); +v26 = *(DWORD **)(v24 + 102); +*(DWORD *)((char *)v4 + 50) = v26; score_set(v26, v25); -*(_DWORD *)(*(_DWORD *)((char *)v4 + 50) + 4) = 1; -TPinballTable::ChangeBallCount(v4, 0, *(_DWORD *)((char *)v4 + 326)); -score_set(*(_DWORD **)((char *)v4 + 58), v39 + 1); +*(DWORD *)(*(DWORD *)((char *)v4 + 50) + 4) = 1; +TPinballTable::ChangeBallCount(v4, 0, *(DWORD *)((char *)v4 + 326)); +score_set(*(DWORD **)((char *)v4 + 58), v39 + 1); score_update(0, *(int **)((char *)v4 + 58)); v27 = 0; -if ( *(_DWORD *)(*(_DWORD *)((char *)v4 + 254) + 4) > 0 ) +if ( *(DWORD *)(*(DWORD *)((char *)v4 + 254) + 4) > 0 ) { v42 = 8; do { v28 = (double)v39; -(***(void (__stdcall ****)(signed int, _DWORD))(v42 + *(_DWORD *)((char *)v4 + 254)))(1020, LODWORD(v28)); +(***(void (****)(signed int, DWORD))(v42 + *(DWORD *)((char *)v4 + 254)))(1020, LODWORD(v28)); v42 += 4; ++v27; } -while ( v27 < *(_DWORD *)(*(_DWORD *)((char *)v4 + 254) + 4) ); +while ( v27 < *(DWORD *)(*(DWORD *)((char *)v4 + 254) + 4) ); } if ( v39 ) { @@ -548,38 +548,38 @@ switch ( v39 ) { case 1: v38 = -1.0; -if ( *(_BYTE *)(*(_DWORD *)((char *)v4 + 230) + 5) ) +if ( *(_BYTE *)(*(DWORD *)((char *)v4 + 230) + 5) ) v29 = get_rc_string(31, 0); else v29 = get_rc_string(27, 0); break; case 2: v38 = -1.0; -if ( *(_BYTE *)(*(_DWORD *)((char *)v4 + 230) + 5) ) +if ( *(_BYTE *)(*(DWORD *)((char *)v4 + 230) + 5) ) v29 = get_rc_string(32, 0); else v29 = get_rc_string(28, 0); break; case 3: v38 = -1.0; -if ( *(_BYTE *)(*(_DWORD *)((char *)v4 + 230) + 5) ) +if ( *(_BYTE *)(*(DWORD *)((char *)v4 + 230) + 5) ) v29 = get_rc_string(33, 0); else v29 = get_rc_string(29, 0); break; default: LABEL_59: -*(_DWORD *)((char *)v4 + 318) = 0; -*(_DWORD *)((char *)v4 + 310) = 0; -*(_DWORD *)((char *)v4 + 322) = 0; -*(_DWORD *)((char *)v4 + 218) = v39; +*(DWORD *)((char *)v4 + 318) = 0; +*(DWORD *)((char *)v4 + 310) = 0; +*(DWORD *)((char *)v4 + 322) = 0; +*(DWORD *)((char *)v4 + 218) = v39; goto LABEL_81; } } else { v38 = -1.0; -if ( *(_BYTE *)(*(_DWORD *)((char *)v4 + 230) + 5) ) +if ( *(_BYTE *)(*(DWORD *)((char *)v4 + 230) + 5) ) v29 = get_rc_string(30, 0); else v29 = get_rc_string(26, 0); @@ -587,7 +587,7 @@ v29 = get_rc_string(26, 0); TTextBox::Display(InfoTextBox, 0, v29, v38); goto LABEL_59; } -if ( *(_BYTE *)(*(_DWORD *)((char *)this + 230) + 5) ) +if ( *(_BYTE *)(*(DWORD *)((char *)this + 230) + 5) ) v30 = get_rc_string(30, 0); else v30 = get_rc_string(26, 0); @@ -596,52 +596,52 @@ LABEL_81: table_control_handler(a3); return 0; case 1022: -loader_play_sound(*(_DWORD *)((char *)this + 70)); +loader_play_sound(*(DWORD *)((char *)this + 70)); TTextBox::Clear(MissTextBox, a2); v36 = get_rc_string(34, 0); TTextBox::Display(InfoTextBox, a2, v36, -1.0); -*(_DWORD *)((char *)v4 + 94) = timer_set(3.0, (int)v4, (int)TPinballTable::EndGame_timeout); +*(DWORD *)((char *)v4 + 94) = timer_set(3.0, (int)v4, (int)TPinballTable::EndGame_timeout); goto LABEL_81; case 1024: -v5 = *(_DWORD *)(*(_DWORD *)((char *)this + 254) + 4) - 1; +v5 = *(DWORD *)(*(DWORD *)((char *)this + 254) + 4) - 1; if ( v5 >= 0 ) { v6 = 4 * v5 + 8; -v7 = *(_DWORD *)(*(_DWORD *)((char *)this + 254) + 4); +v7 = *(DWORD *)(*(DWORD *)((char *)this + 254) + 4); do { -(***(void (__stdcall ****)(signed int, _DWORD))(v6 + *(_DWORD *)((char *)v4 + 254)))(1024, 0.0); +(***(void (****)(signed int, DWORD))(v6 + *(DWORD *)((char *)v4 + 254)))(1024, 0.0); v6 -= 4; --v7; } while ( v7 ); } -if ( *(_DWORD *)((char *)v4 + 358) ) -timer_kill(*(_DWORD *)((char *)v4 + 358)); -v8 = *(_DWORD *)((char *)v4 + 90); -*(_DWORD *)((char *)v4 + 358) = 0; +if ( *(DWORD *)((char *)v4 + 358) ) +timer_kill(*(DWORD *)((char *)v4 + 358)); +v8 = *(DWORD *)((char *)v4 + 90); +*(DWORD *)((char *)v4 + 358) = 0; if ( v8 ) { timer_kill(v8); -(***(void (__stdcall ****)(signed int, _DWORD))((char *)v4 + 266))(34, 0.0); +(***(void (****)(signed int, DWORD))((char *)v4 + 266))(34, 0.0); } -*(_DWORD *)((char *)v4 + 90) = 0; -*(_DWORD *)((char *)v4 + 294) = 0; -*(_DWORD *)((char *)v4 + 298) = 0; -*(_DWORD *)((char *)v4 + 302) = 0; -*(_DWORD *)((char *)v4 + 306) = 10000; -*(_DWORD *)((char *)v4 + 310) = 0; -*(_DWORD *)((char *)v4 + 314) = 20000; -*(_DWORD *)((char *)v4 + 318) = 0; -*(_DWORD *)((char *)v4 + 322) = 0; -*(_DWORD *)((char *)v4 + 334) = 0; -*(_DWORD *)((char *)v4 + 338) = 0; -*(_DWORD *)((char *)v4 + 342) = 0; -*(_DWORD *)((char *)v4 + 346) = 0; -*(_DWORD *)((char *)v4 + 350) = 0; -*(_DWORD *)((char *)v4 + 354) = 0; -*(_DWORD *)((char *)v4 + 358) = 0; -*(_DWORD *)((char *)v4 + 370) = 0; +*(DWORD *)((char *)v4 + 90) = 0; +*(DWORD *)((char *)v4 + 294) = 0; +*(DWORD *)((char *)v4 + 298) = 0; +*(DWORD *)((char *)v4 + 302) = 0; +*(DWORD *)((char *)v4 + 306) = 10000; +*(DWORD *)((char *)v4 + 310) = 0; +*(DWORD *)((char *)v4 + 314) = 20000; +*(DWORD *)((char *)v4 + 318) = 0; +*(DWORD *)((char *)v4 + 322) = 0; +*(DWORD *)((char *)v4 + 334) = 0; +*(DWORD *)((char *)v4 + 338) = 0; +*(DWORD *)((char *)v4 + 342) = 0; +*(DWORD *)((char *)v4 + 346) = 0; +*(DWORD *)((char *)v4 + 350) = 0; +*(DWORD *)((char *)v4 + 354) = 0; +*(DWORD *)((char *)v4 + 358) = 0; +*(DWORD *)((char *)v4 + 370) = 0; goto LABEL_81; default: goto LABEL_81; @@ -657,7 +657,7 @@ int i; // ecx signed int v5; // [esp+Ch] [ebp-4h] v1 = this; -*(_DWORD *)this = &TPinballTable::vftable; +*(DWORD *)this = &TPinballTable::vftable; v2 = (int *)((char *)this + 102); v5 = 4; do @@ -671,25 +671,25 @@ v2 += 7; --v5; } while ( v5 ); -if ( *(_DWORD *)((char *)v1 + 58) ) +if ( *(DWORD *)((char *)v1 + 58) ) { -objlist_destroy(*(_DWORD *)((char *)v1 + 58)); -*(_DWORD *)((char *)v1 + 58) = 0; +objlist_destroy(*(DWORD *)((char *)v1 + 58)); +*(DWORD *)((char *)v1 + 58) = 0; } -if ( *(_DWORD *)((char *)v1 + 54) ) +if ( *(DWORD *)((char *)v1 + 54) ) { -objlist_destroy(*(_DWORD *)((char *)v1 + 54)); -*(_DWORD *)((char *)v1 + 54) = 0; +objlist_destroy(*(DWORD *)((char *)v1 + 54)); +*(DWORD *)((char *)v1 + 54) = 0; } -for ( i = *(_DWORD *)((char *)v1 + 266); ; i = *(_DWORD *)(*(_DWORD *)((char *)v1 + 254) + 8) ) +for ( i = *(DWORD *)((char *)v1 + 266); ; i = *(DWORD *)(*(DWORD *)((char *)v1 + 254) + 8) ) { if ( i ) -(*(void (__stdcall **)(signed int))(*(_DWORD *)i + 16))(1); -if ( !*(_DWORD *)(*(_DWORD *)((char *)v1 + 254) + 4) ) +(*(void (**)(signed int))(*(DWORD *)i + 16))(1); +if ( !*(DWORD *)(*(DWORD *)((char *)v1 + 254) + 4) ) break; } -objlist_destroy(*(_DWORD *)((char *)v1 + 262)); -objlist_destroy(*(_DWORD *)((char *)v1 + 254)); +objlist_destroy(*(DWORD *)((char *)v1 + 262)); +objlist_destroy(*(DWORD *)((char *)v1 + 254)); return TPinballComponent::~TPinballComponent(v1); } // 1002790: using guessed type void *TPinballTable::vftable; @@ -715,13 +715,13 @@ TBall *v3; // eax TTableLayer *v4; // eax TLightGroup *v5; // eax TLightGroup *v6; // eax -_DWORD *v7; // eax +DWORD *v7; // eax int v8; // ebx void **v9; // edi int v10; // eax -__int16 *v11; // ebx -__int16 v12; // ax -signed __int16 *v13; // ebx +int *v11; // ebx +int v12; // ax +signed int *v13; // ebx int v14; // edi TWall *v15; // eax TOneway *v16; // eax @@ -763,20 +763,20 @@ int i; // [esp+10h] [ebp-4h] v1 = 0; v2 = this; TPinballComponent::TPinballComponent(this, 0, -1, 0); -*(_DWORD *)v2 = &TPinballTable::vftable; +*(DWORD *)v2 = &TPinballTable::vftable; objlist_class::objlist_class((TPinballTable *)((char *)v2 + 250), 32, 16); objlist_class::objlist_class((TPinballTable *)((char *)v2 + 258), 3, 1); -*(_DWORD *)((char *)v2 + 50) = 0; -*(_DWORD *)((char *)v2 + 54) = 0; -*(_DWORD *)((char *)v2 + 58) = 0; -*(_DWORD *)((char *)v2 + 78) = 0; +*(DWORD *)((char *)v2 + 50) = 0; +*(DWORD *)((char *)v2 + 54) = 0; +*(DWORD *)((char *)v2 + 58) = 0; +*(DWORD *)((char *)v2 + 78) = 0; *((_BYTE *)v2 + 5) = 1; -*(_DWORD *)((char *)v2 + 370) = 0; -*(_DWORD *)((char *)v2 + 94) = 0; -*(_DWORD *)((char *)v2 + 90) = 0; -*(_DWORD *)((char *)v2 + 358) = 0; -*(_DWORD *)((char *)v2 + 98) = 0; -*(_DWORD *)((char *)v2 + 346) = 0; +*(DWORD *)((char *)v2 + 370) = 0; +*(DWORD *)((char *)v2 + 94) = 0; +*(DWORD *)((char *)v2 + 90) = 0; +*(DWORD *)((char *)v2 + 358) = 0; +*(DWORD *)((char *)v2 + 98) = 0; +*(DWORD *)((char *)v2 + 346) = 0; v3 = (TBall *)TPinballComponent::operator new(0x16Au); if ( v3 ) v1 = TBall::TBall(v3, v2); @@ -791,10 +791,10 @@ if ( v5 ) v6 = TLightGroup::TLightGroup(v5, v2, 0); else v6 = 0; -*(_DWORD *)((char *)v2 + 266) = v6; +*(DWORD *)((char *)v2 + 266) = v6; v7 = score_create("score1", render_background_bitmap); -*(_DWORD *)((char *)v2 + 50) = v7; -*(_DWORD *)((char *)v2 + 102) = v7; +*(DWORD *)((char *)v2 + 50) = v7; +*(DWORD *)((char *)v2 + 102) = v7; v8 = 1; v9 = (void **)((char *)v2 + 130); do @@ -803,12 +803,12 @@ do v9 += 7; } while ( v8 < 4 ); -*(_DWORD *)((char *)v2 + 218) = 0; -*(_DWORD *)((char *)v2 + 330) = 3; -*(_DWORD *)((char *)v2 + 54) = score_create("ballcount1", render_background_bitmap); -*(_DWORD *)((char *)v2 + 58) = score_create("player_number1", render_background_bitmap); +*(DWORD *)((char *)v2 + 218) = 0; +*(DWORD *)((char *)v2 + 330) = 3; +*(DWORD *)((char *)v2 + 54) = score_create("ballcount1", render_background_bitmap); +*(DWORD *)((char *)v2 + 58) = score_create("player_number1", render_background_bitmap); v10 = loader_query_handle("table_objects"); -v11 = (__int16 *)loader_query_iattribute(v10, 1025, &v50); +v11 = (int *)loader_query_iattribute(v10, 1025, &v50); if ( v50 > 0 ) { for ( i = 0; i < v50 / 2; ++i ) @@ -831,7 +831,7 @@ if ( v17 ) v18 = TPlunger::TPlunger(v17, v2, v14); else v18 = 0; -*(_DWORD *)((char *)v2 + 222) = v18; +*(DWORD *)((char *)v2 + 222) = v18; break; case 1002: v19 = (TLight *)TPinballComponent::operator new(0xDEu); @@ -839,7 +839,7 @@ if ( v19 ) v20 = TLight::TLight(v19, v2, v14); else v20 = 0; -objlist_class::Add((objlist_class *)(*(_DWORD *)((char *)v2 + 266) + 42), (void *)v20); +objlist_class::Add((objlist_class *)(*(DWORD *)((char *)v2 + 266) + 42), (void *)v20); break; case 1003: v23 = (TFlipper *)TPinballComponent::operator new(0x6Au); @@ -847,7 +847,7 @@ if ( v23 ) v24 = TFlipper::TFlipper(v23, v2, v14); else v24 = 0; -*(_DWORD *)((char *)v2 + 42) = v24; +*(DWORD *)((char *)v2 + 42) = v24; break; case 1004: v25 = (TFlipper *)TPinballComponent::operator new(0x6Au); @@ -855,7 +855,7 @@ if ( v25 ) v26 = TFlipper::TFlipper(v25, v2, v14); else v26 = 0; -*(_DWORD *)((char *)v2 + 46) = v26; +*(DWORD *)((char *)v2 + 46) = v26; break; case 1005: v27 = (TBumper *)TPinballComponent::operator new(0x96u); @@ -873,7 +873,7 @@ if ( v37 ) v38 = TDrain::TDrain(v37, v2, v14); else v38 = 0; -*(_DWORD *)((char *)v2 + 226) = v38; +*(DWORD *)((char *)v2 + 226) = v38; break; case 1011: v30 = (TBlocker *)TPinballComponent::operator new(0x72u); diff --git a/Classes/TPinballTable/TPinballTable.h b/Classes/TPinballTable/TPinballTable.h index e988f96..ac5490a 100644 --- a/Classes/TPinballTable/TPinballTable.h +++ b/Classes/TPinballTable/TPinballTable.h @@ -10,15 +10,15 @@ /* 117 */ struct TPinballTable; -void __stdcall TPinballTable::LightShow_timeout(int, void*); // idb -void __stdcall TPinballTable::EndGame_timeout(int, void*); // idb +void TPinballTable::LightShow_timeout(int, void*); // idb +void TPinballTable::EndGame_timeout(int, void*); // idb int __thiscall TPinballTable::AddScore(TPinballTable* this, int); // idb -// void __userpurge TPinballTable::ChangeBallCount(TPinballTable *this@, int a2@, int a3); -void __stdcall TPinballTable::replay_timer_callback(int, void*); // idb +// void TPinballTable::ChangeBallCount(TPinballTable *this, int a2, int a3); +void TPinballTable::replay_timer_callback(int, void*); // idb void __thiscall TPinballTable::port_draw(TPinballTable* __hidden this); // idb -void __stdcall TPinballTable::tilt_timeout(int, void*); // idb -// void __userpurge TPinballTable::tilt(TPinballTable *this@, int a2@, float a3); -// int __userpurge TPinballTable::Message@(TPinballTable *this@, int a2@, int a3, float a4); +void TPinballTable::tilt_timeout(int, void*); // idb +// void TPinballTable::tilt(TPinballTable *this, int a2, float a3); +// int TPinballTable::Message(TPinballTable *this, int a2, int a3, float a4); TZmapList* __thiscall TPinballTable::~TPinballTable(TPinballTable* this); TPinballTable* __thiscall TPinballTable::`vector deleting destructor'(TPinballTable *this, char a2); TPinballTable* __thiscall TPinballTable::TPinballTable(TPinballTable* this); diff --git a/Classes/TPlunger/TPlunger.cpp b/Classes/TPlunger/TPlunger.cpp index 17f65fd..ec3a342 100644 --- a/Classes/TPlunger/TPlunger.cpp +++ b/Classes/TPlunger/TPlunger.cpp @@ -1,17 +1,17 @@ #include "TPlunger.h" //----- (010172F0) -------------------------------------------------------- -void __stdcall TPlunger::BallFeedTimer(int a1, void *a2) +void TPlunger::BallFeedTimer(int a1, void *a2) { -void (__stdcall **v2)(signed int, _DWORD); // eax +void (**v2)(signed int, DWORD); // eax -v2 = *(void (__stdcall ***)(signed int, _DWORD))a2; -*(_DWORD *)((char *)a2 + 78) = 0; +v2 = *(void (***)(signed int, DWORD))a2; +*(DWORD *)((char *)a2 + 78) = 0; (*v2)(1015, 0.0); } //----- (01017314) -------------------------------------------------------- -void __stdcall TPlunger::PullbackTimer(int a1, void *a2) +void TPlunger::PullbackTimer(int a1, void *a2) { char *v2; // esi double v3; // st7 @@ -25,30 +25,30 @@ v3 = (double)*(signed int *)((char *)a2 + 90) + *(float *)((char *)a2 + 62); v6 = (double)*(signed int *)((char *)a2 + 86); if ( v3 <= v6 ) { -*(_DWORD *)(v2 + 78) = timer_set(*(float *)(v2 + 94), (int)v2, (int)TPlunger::PullbackTimer); +*(DWORD *)(v2 + 78) = timer_set(*(float *)(v2 + 94), (int)v2, (int)TPlunger::PullbackTimer); } else { -*(_DWORD *)(v2 + 78) = 0; +*(DWORD *)(v2 + 78) = 0; *(float *)(v2 + 62) = v6; } v4 = 4 * (unsigned __int64)(signed __int64)_floor( -(double)(*(_DWORD *)(*(_DWORD *)(*(_DWORD *)(v2 + 34) + 4) + 4) - 1) +(double)(*(DWORD *)(*(DWORD *)(*(DWORD *)(v2 + 34) + 4) + 4) - 1) * (*(float *)(v2 + 62) / (double)*(signed int *)(v2 + 86))) + 8; -v5 = *(_DWORD *)(v4 + *(_DWORD *)(*(_DWORD *)(v2 + 34) + 4)); +v5 = *(DWORD *)(v4 + *(DWORD *)(*(DWORD *)(v2 + 34) + 4)); render_sprite_set( -*(_DWORD **)(v2 + 26), -*(_DWORD *)(v4 + *(_DWORD *)(*(_DWORD *)(v2 + 34) + 4)), -*(_DWORD *)(*(_DWORD *)(*(_DWORD *)(v2 + 38) + 4) + v4), -*(_DWORD *)(v5 + 29) - *(_DWORD *)(*(_DWORD *)(v2 + 30) + 234), -*(_DWORD *)(v5 + 33) - *(_DWORD *)(*(_DWORD *)(v2 + 30) + 238)); +*(DWORD **)(v2 + 26), +*(DWORD *)(v4 + *(DWORD *)(*(DWORD *)(v2 + 34) + 4)), +*(DWORD *)(*(DWORD *)(*(DWORD *)(v2 + 38) + 4) + v4), +*(DWORD *)(v5 + 29) - *(DWORD *)(*(DWORD *)(v2 + 30) + 234), +*(DWORD *)(v5 + 33) - *(DWORD *)(*(DWORD *)(v2 + 30) + 238)); } //----- (010173C8) -------------------------------------------------------- -void __stdcall TPlunger::PlungerReleasedTimer(int a1, void *a2) +void TPlunger::PlungerReleasedTimer(int a1, void *a2) { *(float *)((char *)a2 + 66) = 1000000000.0; *(float *)((char *)a2 + 62) = 0.0; @@ -71,11 +71,11 @@ v3 = this; switch ( a2 ) { case 1004: -if ( !*(_DWORD *)((char *)this + 78) ) +if ( !*(DWORD *)((char *)this + 78) ) { -v7 = *(_DWORD *)((char *)this + 74); +v7 = *(DWORD *)((char *)this + 74); *(float *)((char *)this + 62) = 0.0; -*(_DWORD *)((char *)this + 66) = 1315859240; +*(DWORD *)((char *)this + 66) = 1315859240; loader_play_sound(v7); TPlunger::PullbackTimer(0, (void *)v3); } @@ -85,24 +85,24 @@ case 1009: case 1010: goto LABEL_12; case 1015: -v6 = *(_DWORD *)(*(_DWORD *)(*(_DWORD *)((char *)this + 30) + 254) + 8); -(**(void (__thiscall ***)(_DWORD, signed int, _DWORD))v6)( -*(_DWORD *)(*(_DWORD *)(*(_DWORD *)((char *)this + 30) + 254) + 8), +v6 = *(DWORD *)(*(DWORD *)(*(DWORD *)((char *)this + 30) + 254) + 8); +(**(void (__thiscall ***)(DWORD, signed int, DWORD))v6)( +*(DWORD *)(*(DWORD *)(*(DWORD *)((char *)this + 30) + 254) + 8), 1024, 0.0); -*(_DWORD *)(v6 + 42) = *(_DWORD *)(*(_DWORD *)((char *)v3 + 30) + 286); -*(_DWORD *)(v6 + 46) = *(_DWORD *)(*(_DWORD *)((char *)v3 + 30) + 290); +*(DWORD *)(v6 + 42) = *(DWORD *)(*(DWORD *)((char *)v3 + 30) + 286); +*(DWORD *)(v6 + 46) = *(DWORD *)(*(DWORD *)((char *)v3 + 30) + 290); *(_BYTE *)(v6 + 5) = 1; -*(_DWORD *)(*(_DWORD *)((char *)v3 + 30) + 78) = 0; +*(DWORD *)(*(DWORD *)((char *)v3 + 30) + 78) = 0; pb_tilt_no_more(a2); control_handler(a2, v3); return 0; case 1016: -if ( *(_DWORD *)((char *)this + 82) ) -timer_kill(*(_DWORD *)((char *)this + 82)); +if ( *(DWORD *)((char *)this + 82) ) +timer_kill(*(DWORD *)((char *)this + 82)); v4 = timer_set(0.95999998, (int)v3, (int)TPlunger::BallFeedTimer); -v5 = *(_DWORD *)((char *)v3 + 98); -*(_DWORD *)((char *)v3 + 82) = v4; +v5 = *(DWORD *)((char *)v3 + 98); +*(DWORD *)((char *)v3 + 82) = v4; loader_play_sound(v5); control_handler(a2, v3); return 0; @@ -112,24 +112,24 @@ case 1017: v8 = 0.2; goto LABEL_17; case 1024: -if ( *(_DWORD *)((char *)this + 82) ) -timer_kill(*(_DWORD *)((char *)this + 82)); -*(_DWORD *)((char *)v3 + 82) = 0; +if ( *(DWORD *)((char *)this + 82) ) +timer_kill(*(DWORD *)((char *)this + 82)); +*(DWORD *)((char *)v3 + 82) = 0; LABEL_12: -v9 = *(_DWORD *)((char *)v3 + 78); +v9 = *(DWORD *)((char *)v3 + 78); *(float *)((char *)v3 + 66) = 0.0; if ( v9 ) timer_kill(v9); -*(_DWORD *)((char *)v3 + 78) = 0; +*(DWORD *)((char *)v3 + 78) = 0; if ( a2 == 1005 ) -loader_play_sound(*(_DWORD *)((char *)v3 + 102)); -v10 = *(_DWORD *)(*(_DWORD *)(*(_DWORD *)((char *)v3 + 34) + 4) + 8); +loader_play_sound(*(DWORD *)((char *)v3 + 102)); +v10 = *(DWORD *)(*(DWORD *)(*(DWORD *)((char *)v3 + 34) + 4) + 8); render_sprite_set( -*(_DWORD **)((char *)v3 + 26), -*(_DWORD *)(*(_DWORD *)(*(_DWORD *)((char *)v3 + 34) + 4) + 8), -*(_DWORD *)(*(_DWORD *)(*(_DWORD *)((char *)v3 + 38) + 4) + 8), -*(_DWORD *)(v10 + 29) - *(_DWORD *)(*(_DWORD *)((char *)v3 + 30) + 234), -*(_DWORD *)(v10 + 33) - *(_DWORD *)(*(_DWORD *)((char *)v3 + 30) + 238)); +*(DWORD **)((char *)v3 + 26), +*(DWORD *)(*(DWORD *)(*(DWORD *)((char *)v3 + 34) + 4) + 8), +*(DWORD *)(*(DWORD *)(*(DWORD *)((char *)v3 + 38) + 4) + 8), +*(DWORD *)(v10 + 29) - *(DWORD *)(*(DWORD *)((char *)v3 + 30) + 234), +*(DWORD *)(v10 + 33) - *(DWORD *)(*(DWORD *)((char *)v3 + 30) + 238)); v8 = *(float *)((char *)v3 + 94); LABEL_17: v11 = v8; @@ -148,8 +148,8 @@ TPlunger *v6; // esi float v7; // ST18_4 v6 = this; -if ( *(_DWORD *)(*(_DWORD *)((char *)this + 30) + 370) ) -(**(void (__stdcall ***)(signed int, _DWORD))this)(1017, 0.0); +if ( *(DWORD *)(*(DWORD *)((char *)this + 30) + 370) ) +(**(void (***)(signed int, DWORD))this)(1017, 0.0); v7 = (double)_rand() * 0.00003051850947599719 * *(float *)((char *)v6 + 62) * 0.1 + *(float *)((char *)v6 + 62); basic_collision(a2, a3, a4, *(float *)((char *)v6 + 54), *(float *)((char *)v6 + 58), *(float *)((char *)v6 + 66), v7); } @@ -161,7 +161,7 @@ TPlunger *v3; // esi int v4; // eax int v5; // eax signed __int64 v6; // rax -_DWORD *v7; // eax +DWORD *v7; // eax char v9; // [esp+8h] [ebp-48h] int v10; // [esp+38h] [ebp-18h] int v11; // [esp+40h] [ebp-10h] @@ -169,26 +169,26 @@ int v12; // [esp+44h] [ebp-Ch] v3 = this; TCollisionComponent::TCollisionComponent(this, a2, a3, 1); -*(_DWORD *)v3 = &TPlunger::vftable; +*(DWORD *)v3 = &TPlunger::vftable; loader_query_visual(a3, 0, &v9); v4 = v11; *(float *)((char *)v3 + 62) = 0.0; -*(_DWORD *)((char *)v3 + 82) = 0; -*(_DWORD *)((char *)v3 + 78) = 0; -*(_DWORD *)((char *)v3 + 98) = v4; -*(_DWORD *)((char *)v3 + 102) = v12; -*(_DWORD *)((char *)v3 + 74) = v10; -v5 = *(_DWORD *)((char *)v3 + 34); -*(_DWORD *)((char *)v3 + 66) = 1315859240; -*(_DWORD *)((char *)v3 + 86) = 100; -v6 = (signed __int64)(100.0 / ((double)*(signed int *)(*(_DWORD *)(v5 + 4) + 4) * 8.0)); +*(DWORD *)((char *)v3 + 82) = 0; +*(DWORD *)((char *)v3 + 78) = 0; +*(DWORD *)((char *)v3 + 98) = v4; +*(DWORD *)((char *)v3 + 102) = v12; +*(DWORD *)((char *)v3 + 74) = v10; +v5 = *(DWORD *)((char *)v3 + 34); +*(DWORD *)((char *)v3 + 66) = 1315859240; +*(DWORD *)((char *)v3 + 86) = 100; +v6 = (signed __int64)(100.0 / ((double)*(signed int *)(*(DWORD *)(v5 + 4) + 4) * 8.0)); *(float *)((char *)v3 + 54) = 0.5; *(float *)((char *)v3 + 58) = 0.5; -*(_DWORD *)((char *)v3 + 90) = v6; -*(_DWORD *)((char *)v3 + 94) = 1020054733; -v7 = (_DWORD *)loader_query_float_attribute(a3, 0, 601); -*(_DWORD *)((char *)a2 + 286) = *v7; -*(_DWORD *)((char *)a2 + 290) = v7[1]; +*(DWORD *)((char *)v3 + 90) = v6; +*(DWORD *)((char *)v3 + 94) = 1020054733; +v7 = (DWORD *)loader_query_float_attribute(a3, 0, 601); +*(DWORD *)((char *)a2 + 286) = *v7; +*(DWORD *)((char *)a2 + 290) = v7[1]; return v3; } // 1002750: using guessed type void *TPlunger::vftable; diff --git a/Classes/TPlunger/TPlunger.h b/Classes/TPlunger/TPlunger.h index 6dd19aa..245b170 100644 --- a/Classes/TPlunger/TPlunger.h +++ b/Classes/TPlunger/TPlunger.h @@ -10,9 +10,9 @@ /* 118 */ struct TPlunger; -void __stdcall TPlunger::BallFeedTimer(int, void*); // idb -void __stdcall TPlunger::PullbackTimer(int, void*); // idb -void __stdcall TPlunger::PlungerReleasedTimer(int, void*); // idb +void TPlunger::BallFeedTimer(int, void*); // idb +void TPlunger::PullbackTimer(int, void*); // idb +void TPlunger::PlungerReleasedTimer(int, void*); // idb int __thiscall TPlunger::Message(TPlunger* this, int, float); // idb void __thiscall TPlunger::Collision(TPlunger* this, struct TBall*, struct vector_type*, struct vector_type*, float, struct TEdgeSegment*); // idb TPlunger* __thiscall TPlunger::TPlunger(TPlunger* this, struct TPinballTable* a2, int a3); diff --git a/Classes/TPopupTarget/TPopupTarget.cpp b/Classes/TPopupTarget/TPopupTarget.cpp index 2d5f5e4..a4f3ecc 100644 --- a/Classes/TPopupTarget/TPopupTarget.cpp +++ b/Classes/TPopupTarget/TPopupTarget.cpp @@ -1,18 +1,18 @@ #include "TPopupTarget.h" //----- (010160B3) -------------------------------------------------------- -void __stdcall TPopupTarget::TimerExpired(int a1, void *a2) +void TPopupTarget::TimerExpired(int a1, void *a2) { int v2; // eax int v3; // esi -*(_DWORD *)((char *)a2 + 78) = 0; -v2 = *(_DWORD *)((char *)a2 + 34); +*(DWORD *)((char *)a2 + 78) = 0; +v2 = *(DWORD *)((char *)a2 + 34); *((_BYTE *)a2 + 5) = 1; -render_sprite_set_bitmap(*(_DWORD **)((char *)a2 + 26), *(_DWORD *)(*(_DWORD *)(v2 + 4) + 8)); +render_sprite_set_bitmap(*(DWORD **)((char *)a2 + 26), *(DWORD *)(*(DWORD *)(v2 + 4) + 8)); if ( a1 ) { -v3 = *(_DWORD *)((char *)a2 + 70); +v3 = *(DWORD *)((char *)a2 + 70); if ( v3 ) loader_play_sound(v3); } @@ -24,7 +24,7 @@ int __thiscall TPopupTarget::Message(TPopupTarget *this, int a2, float a3) TPopupTarget *v3; // esi int v4; // eax int v5; // ecx -_DWORD *v6; // eax +DWORD *v6; // eax int v7; // eax __int64 v8; // ST04_8 @@ -34,37 +34,37 @@ switch ( a2 ) case 49: v8 = *(unsigned int *)((char *)this + 26); *((_BYTE *)this + 5) = 0; -render_sprite_set_bitmap((_DWORD *)v8, SHIDWORD(v8)); +render_sprite_set_bitmap((DWORD *)v8, SHIDWORD(v8)); break; case 50: -*(_DWORD *)((char *)this + 78) = timer_set( +*(DWORD *)((char *)this + 78) = timer_set( *(float *)((char *)this + 82), (int)this, (int)TPopupTarget::TimerExpired); break; case 1020: -*(_DWORD *)((char *)this + 4 * *(_DWORD *)(*(_DWORD *)((char *)this + 30) + 218) + 98) = *(_DWORD *)((char *)this + 6); -v7 = *(_DWORD *)((char *)this + 4 * (unsigned __int64)(signed __int64)_floor(a3) + 98); -*(_DWORD *)((char *)v3 + 6) = v7; +*(DWORD *)((char *)this + 4 * *(DWORD *)(*(DWORD *)((char *)this + 30) + 218) + 98) = *(DWORD *)((char *)this + 6); +v7 = *(DWORD *)((char *)this + 4 * (unsigned __int64)(signed __int64)_floor(a3) + 98); +*(DWORD *)((char *)v3 + 6) = v7; TPopupTarget::Message(v3, 50 - (v7 != 0), 0.0); break; case 1024: -v4 = *(_DWORD *)((char *)this + 30); -*(_DWORD *)((char *)this + 6) = 0; +v4 = *(DWORD *)((char *)this + 30); +*(DWORD *)((char *)this + 6) = 0; v5 = 0; -if ( *(_DWORD *)(v4 + 214) > 0 ) +if ( *(DWORD *)(v4 + 214) > 0 ) { -v6 = (_DWORD *)((char *)v3 + 98); +v6 = (DWORD *)((char *)v3 + 98); do { *v6 = 0; ++v5; ++v6; } -while ( v5 < *(_DWORD *)(*(_DWORD *)((char *)v3 + 30) + 214) ); +while ( v5 < *(DWORD *)(*(DWORD *)((char *)v3 + 30) + 214) ); } -if ( *(_DWORD *)((char *)v3 + 78) ) -timer_kill(*(_DWORD *)((char *)v3 + 78)); +if ( *(DWORD *)((char *)v3 + 78) ) +timer_kill(*(DWORD *)((char *)v3 + 78)); TPopupTarget::TimerExpired(0, (void *)v3); break; } @@ -79,7 +79,7 @@ int result; // eax if ( a2 >= 3 ) result = 0; else -result = *(_DWORD *)((char *)this + 4 * a2 + 86); +result = *(DWORD *)((char *)this + 4 * a2 + 86); return result; } @@ -87,7 +87,7 @@ return result; void __thiscall TPopupTarget::put_scoring(TPopupTarget *this, int a2, int a3) { if ( a2 < 3 ) -*(_DWORD *)((char *)this + 4 * a2 + 86) = a3; +*(DWORD *)((char *)this + 4 * a2 + 86) = a3; } //----- (010181ED) -------------------------------------------------------- @@ -96,7 +96,7 @@ void __thiscall TPopupTarget::Collision(TPopupTarget *this, struct TBall *a2, st TPopupTarget *v6; // esi v6 = this; -if ( *(_DWORD *)(*(_DWORD *)((char *)this + 30) + 370) ) +if ( *(DWORD *)(*(DWORD *)((char *)this + 30) + 370) ) { basic_collision(a2, a3, a4, *(float *)((char *)this + 54), *(float *)((char *)this + 58), 1000000000.0, 0.0); } @@ -109,9 +109,9 @@ a4, *(float *)((char *)this + 66), *(float *)((char *)this + 62)) > *(float *)((char *)this + 66) ) { -if ( *(_DWORD *)((char *)v6 + 74) ) -loader_play_sound(*(_DWORD *)((char *)v6 + 74)); -(**(void (__thiscall ***)(TPopupTarget *, signed int, _DWORD))v6)(v6, 49, 0.0); +if ( *(DWORD *)((char *)v6 + 74) ) +loader_play_sound(*(DWORD *)((char *)v6 + 74)); +(**(void (__thiscall ***)(TPopupTarget *, signed int, DWORD))v6)(v6, 49, 0.0); control_handler(63, v6); } } @@ -124,10 +124,10 @@ int v4; // eax v3 = this; TCollisionComponent::TCollisionComponent(this, a2, a3, 1); -*(_DWORD *)v3 = &TPopupTarget::vftable; -v4 = *(_DWORD *)loader_query_float_attribute(a3, 0, 407); -*(_DWORD *)((char *)v3 + 78) = 0; -*(_DWORD *)((char *)v3 + 82) = v4; +*(DWORD *)v3 = &TPopupTarget::vftable; +v4 = *(DWORD *)loader_query_float_attribute(a3, 0, 407); +*(DWORD *)((char *)v3 + 78) = 0; +*(DWORD *)((char *)v3 + 82) = v4; return v3; } // 10025A4: using guessed type void *TPopupTarget::vftable; diff --git a/Classes/TPopupTarget/TPopupTarget.h b/Classes/TPopupTarget/TPopupTarget.h index 1531fea..a0c2264 100644 --- a/Classes/TPopupTarget/TPopupTarget.h +++ b/Classes/TPopupTarget/TPopupTarget.h @@ -10,7 +10,7 @@ /* 106 */ struct TPopupTarget; -void __stdcall TPopupTarget::TimerExpired(int, void*); // idb +void TPopupTarget::TimerExpired(int, void*); // idb int __thiscall TPopupTarget::Message(TPopupTarget* this, int, float); // idb int __thiscall TPopupTarget::get_scoring(TPopupTarget* this, int); // idb void __thiscall TPopupTarget::put_scoring(TPopupTarget* this, int, int); // idb diff --git a/Classes/TRamp/TRamp.cpp b/Classes/TRamp/TRamp.cpp index d1c3466..964a854 100644 --- a/Classes/TRamp/TRamp.cpp +++ b/Classes/TRamp/TRamp.cpp @@ -8,7 +8,7 @@ int result; // eax if ( a2 >= 4 ) result = 0; else -result = *(_DWORD *)((char *)this + 4 * a2 + 78); +result = *(DWORD *)((char *)this + 4 * a2 + 78); return result; } @@ -16,7 +16,7 @@ return result; void __thiscall TRamp::put_scoring(TRamp *this, int a2, int a3) { if ( a2 < 4 ) -*(_DWORD *)((char *)this + 4 * a2 + 78) = a3; +*(DWORD *)((char *)this + 4 * a2 + 78) = a3; } //----- (01016C24) -------------------------------------------------------- @@ -25,7 +25,7 @@ void __thiscall TRamp::Collision(TRamp *this, struct TBall *a2, struct vector_ty TRamp *v6; // edi double v7; // st7 int v8; // eax -_DWORD *v9; // eax +DWORD *v9; // eax double v10; // st7 double v11; // st6 double v12; // st6 @@ -34,48 +34,48 @@ double v13; // st7 v6 = this; TBall::not_again(a2, a6); v7 = *(float *)((char *)a2 + 70) - a5; -*(_DWORD *)((char *)a2 + 42) = *(_DWORD *)a3; -v8 = *((_DWORD *)a3 + 1); +*(DWORD *)((char *)a2 + 42) = *(DWORD *)a3; +v8 = *((DWORD *)a3 + 1); *(float *)((char *)a2 + 70) = v7; -*(_DWORD *)((char *)a2 + 46) = v8; -v9 = *(_DWORD **)((char *)a6 + 13); +*(DWORD *)((char *)a2 + 46) = v8; +v9 = *(DWORD **)((char *)a6 + 13); if ( v9 ) { -*(_DWORD *)((char *)a2 + 150) = 1; -*(_DWORD *)((char *)a2 + 138) = *v9; +*(DWORD *)((char *)a2 + 150) = 1; +*(DWORD *)((char *)a2 + 138) = *v9; v10 = *(float *)((char *)a2 + 138) * *(float *)((char *)a2 + 42); v11 = *(float *)((char *)a2 + 46); -*(_DWORD *)((char *)a2 + 142) = v9[1]; +*(DWORD *)((char *)a2 + 142) = v9[1]; v12 = v11 * *(float *)((char *)a2 + 142); -*(_DWORD *)((char *)a2 + 146) = v9[2]; -*(_DWORD *)((char *)a2 + 94) = v9[11]; -*(_DWORD *)((char *)a2 + 98) = v9[12]; +*(DWORD *)((char *)a2 + 146) = v9[2]; +*(DWORD *)((char *)a2 + 94) = v9[11]; +*(DWORD *)((char *)a2 + 98) = v9[12]; *(float *)((char *)a2 + 50) = v10 + v12 + *(float *)((char *)a2 + 154) + *(float *)((char *)a2 + 146); -*(_DWORD *)((char *)a2 + 110) = *(_DWORD *)((char *)v6 + 106); +*(DWORD *)((char *)a2 + 110) = *(DWORD *)((char *)v6 + 106); return; } if ( a6 == *(struct TEdgeSegment **)((char *)v6 + 134) ) { -if ( !*(_DWORD *)(*(_DWORD *)((char *)v6 + 30) + 370) ) +if ( !*(DWORD *)(*(DWORD *)((char *)v6 + 30) + 370) ) { -loader_play_sound(*(_DWORD *)((char *)v6 + 70)); +loader_play_sound(*(DWORD *)((char *)v6 + 70)); control_handler(63, v6); } } else { -*(_DWORD *)((char *)a2 + 150) = 0; +*(DWORD *)((char *)a2 + 150) = 0; if ( a6 == *(struct TEdgeSegment **)((char *)v6 + 126) ) { -*(_DWORD *)((char *)a2 + 110) = *(_DWORD *)((char *)v6 + 138); -if ( !*(_DWORD *)((char *)v6 + 110) ) +*(DWORD *)((char *)a2 + 110) = *(DWORD *)((char *)v6 + 138); +if ( !*(DWORD *)((char *)v6 + 110) ) return; v13 = *(float *)((char *)a2 + 154) + *(float *)((char *)v6 + 146); } else { -*(_DWORD *)((char *)a2 + 110) = *(_DWORD *)((char *)v6 + 142); -if ( !*(_DWORD *)((char *)v6 + 110) ) +*(DWORD *)((char *)a2 + 110) = *(DWORD *)((char *)v6 + 142); +if ( !*(DWORD *)((char *)v6 + 110) ) return; v13 = *(float *)((char *)a2 + 154) + *(float *)((char *)v6 + 150); } @@ -101,7 +101,7 @@ TRamp *__thiscall TRamp::TRamp(TRamp *this, struct TPinballTable *a2, void *a3) { void *v3; // ebx TRamp *v4; // esi -_DWORD *v5; // eax +DWORD *v5; // eax float *v6; // eax float *v7; // edi signed __int64 v8; // rax @@ -188,30 +188,30 @@ float v88; // [esp+A4h] [ebp-4h] v3 = a3; v4 = this; TCollisionComponent::TCollisionComponent(this, a2, (int)a3, 0); -*(_DWORD *)v4 = &TRamp::vftable; -*(_DWORD *)((char *)v4 + 6) = 0; +*(DWORD *)v4 = &TRamp::vftable; +*(DWORD *)((char *)v4 + 6) = 0; *((_BYTE *)v4 + 4) = 1; loader_query_visual((int)v3, 0, &v73); -*(_DWORD *)((char *)v4 + 106) = v74; -v5 = (_DWORD *)loader_query_float_attribute((int)v3, 0, 701); +*(DWORD *)((char *)v4 + 106) = v74; +v5 = (DWORD *)loader_query_float_attribute((int)v3, 0, 701); if ( v5 ) -*(_DWORD *)((char *)v4 + 118) = *v5; +*(DWORD *)((char *)v4 + 118) = *v5; else -*(_DWORD *)((char *)v4 + 118) = 1045220557; +*(DWORD *)((char *)v4 + 118) = 1045220557; v6 = (float *)loader_query_float_attribute((int)v3, 0, 1305); if ( v6 ) -*(_DWORD *)((char *)v4 + 110) = (signed __int64)_floor(*v6); +*(DWORD *)((char *)v4 + 110) = (signed __int64)_floor(*v6); else -*(_DWORD *)((char *)v4 + 110) = 0; +*(DWORD *)((char *)v4 + 110) = 0; v7 = (float *)loader_query_float_attribute((int)a3, 0, 1300); v8 = (signed __int64)_floor(*v7); v9 = a3; -*(_DWORD *)((char *)v4 + 114) = v8; -*(_DWORD *)((char *)v4 + 122) = v7 + 1; +*(DWORD *)((char *)v4 + 114) = v8; +*(DWORD *)((char *)v4 + 122) = v7 + 1; v10 = loader_query_float_attribute((int)v9, 0, 1303); v11 = _floor(*(float *)v10); -v75 = *(_DWORD *)(v10 + 8); -v76 = *(_DWORD *)(v10 + 12); +v75 = *(DWORD *)(v10 + 8); +v76 = *(DWORD *)(v10 + 12); v86 = *(float *)(v10 + 16); v87 = *(float *)(v10 + 20); v12 = (TLine *)operator new(0x55u); @@ -225,70 +225,70 @@ v4, (struct vector_type *)&v75); else v13 = 0; -*(_DWORD *)((char *)v4 + 134) = v13; +*(DWORD *)((char *)v4 + 134) = v13; objlist_class::Add((TRamp *)((char *)v4 + 42), (void *)v13); if ( v13 ) { -v14 = *(_DWORD *)v13; -*(_DWORD *)((char *)v13 + 13) = 0; +v14 = *(DWORD *)v13; +*(DWORD *)((char *)v13 + 13) = 0; (*(void (__thiscall **)(TLine *))(v14 + 8))(v13); } v15 = loader_query_float_attribute((int)a3, 0, 1301); -*(_DWORD *)((char *)v4 + 138) = (signed __int64)_floor(*(float *)v15); +*(DWORD *)((char *)v4 + 138) = (signed __int64)_floor(*(float *)v15); v16 = _floor(*(float *)(v15 + 4)); -v17 = *(_DWORD *)((char *)v4 + 138); +v17 = *(DWORD *)((char *)v4 + 138); v78 = (signed __int64)v16; v15 += 12; -*(_DWORD *)((char *)v4 + 138) = 1 << v17; -*(_DWORD *)((char *)v4 + 146) = *(_DWORD *)(v15 + 16); +*(DWORD *)((char *)v4 + 138) = 1 << v17; +*(DWORD *)((char *)v4 + 146) = *(DWORD *)(v15 + 16); find_closest_edge( *(struct ramp_plane_type **)((char *)v4 + 122), -*(_DWORD *)((char *)v4 + 114), +*(DWORD *)((char *)v4 + 114), (struct wall_point_type *)v15, &a2, &v80); v18 = (TLine *)operator new(0x55u); if ( v18 ) -v19 = TLine::TLine(v18, v4, (char *)v4 + 5, *(_DWORD *)((char *)v4 + 106), v80, a2); +v19 = TLine::TLine(v18, v4, (char *)v4 + 5, *(DWORD *)((char *)v4 + 106), v80, a2); else v19 = 0; -*(_DWORD *)((char *)v4 + 126) = v19; +*(DWORD *)((char *)v4 + 126) = v19; objlist_class::Add((TRamp *)((char *)v4 + 42), (void *)v19); if ( v19 ) { -v20 = *(_DWORD *)v19; -*(_DWORD *)((char *)v19 + 13) = 0; +v20 = *(DWORD *)v19; +*(DWORD *)((char *)v19 + 13) = 0; (*(void (__thiscall **)(TLine *))(v20 + 8))(v19); } v21 = loader_query_float_attribute((int)a3, 0, 1302); -*(_DWORD *)((char *)v4 + 142) = (signed __int64)_floor(*(float *)v21); +*(DWORD *)((char *)v4 + 142) = (signed __int64)_floor(*(float *)v21); v22 = _floor(*(float *)(v21 + 4)); -v23 = *(_DWORD *)((char *)v4 + 142); +v23 = *(DWORD *)((char *)v4 + 142); v77 = (signed __int64)v22; v21 += 12; -*(_DWORD *)((char *)v4 + 142) = 1 << v23; -*(_DWORD *)((char *)v4 + 150) = *(_DWORD *)(v21 + 16); +*(DWORD *)((char *)v4 + 142) = 1 << v23; +*(DWORD *)((char *)v4 + 150) = *(DWORD *)(v21 + 16); find_closest_edge( *(struct ramp_plane_type **)((char *)v4 + 122), -*(_DWORD *)((char *)v4 + 114), +*(DWORD *)((char *)v4 + 114), (struct wall_point_type *)v21, &v81, &v84); v24 = (TLine *)operator new(0x55u); if ( v24 ) -v25 = TLine::TLine(v24, v4, (char *)v4 + 5, *(_DWORD *)((char *)v4 + 106), v84, v81); +v25 = TLine::TLine(v24, v4, (char *)v4 + 5, *(DWORD *)((char *)v4 + 106), v84, v81); else v25 = 0; -*(_DWORD *)((char *)v4 + 130) = v25; +*(DWORD *)((char *)v4 + 130) = v25; objlist_class::Add((TRamp *)((char *)v4 + 42), (void *)v25); if ( v25 ) { -v26 = *(_DWORD *)v25; -*(_DWORD *)((char *)v25 + 13) = 0; +v26 = *(DWORD *)v25; +*(DWORD *)((char *)v25 + 13) = 0; (*(void (__thiscall **)(TLine *))(v26 + 8))(v25); } -v27 = *(_DWORD *)((char *)v4 + 114) == 0; -v28 = *(_DWORD *)((char *)v4 + 114) < 0; +v27 = *(DWORD *)((char *)v4 + 114) == 0; +v28 = *(DWORD *)((char *)v4 + 114) < 0; v86 = 1000000000.0; v82 = 0; v85 = 1000000000.0; @@ -298,7 +298,7 @@ if ( !v28 && !v27 ) { do { -v29 = *(_DWORD *)((char *)v4 + 122); +v29 = *(DWORD *)((char *)v4 + 122); v83 = 52 * v82; v30 = v29 + 52 * v82; v31 = v30 + 28; @@ -486,8 +486,8 @@ objlist_class::Add((TRamp *)((char *)v4 + 42), a3); if ( a3 ) { v55 = a3; -*(_DWORD *)((char *)a3 + 13) = v83 + *(_DWORD *)((char *)v4 + 122); -(*(void (**)(void))(*(_DWORD *)v55 + 8))(); +*(DWORD *)((char *)a3 + 13) = v83 + *(DWORD *)((char *)v4 + 122); +(*(void (**)(void))(*(DWORD *)v55 + 8))(); } } if ( v79 != a2 || (struct vector_type *)v31 != v80 ) @@ -520,8 +520,8 @@ objlist_class::Add((TRamp *)((char *)v4 + 42), a3); if ( a3 ) { v58 = a3; -*(_DWORD *)((char *)a3 + 13) = v83 + *(_DWORD *)((char *)v4 + 122); -(*(void (**)(void))(*(_DWORD *)v58 + 8))(); +*(DWORD *)((char *)a3 + 13) = v83 + *(DWORD *)((char *)v4 + 122); +(*(void (**)(void))(*(DWORD *)v58 + 8))(); } } if ( (struct TPinballTable *)v31 != a2 || (struct vector_type *)v32 != v80 ) @@ -562,31 +562,31 @@ v61 = 0; objlist_class::Add((TRamp *)((char *)v4 + 42), (void *)v61); if ( v61 ) { -*(_DWORD *)((char *)v61 + 13) = v83 + *(_DWORD *)((char *)v4 + 122); -(*(void (__thiscall **)(TLine *))(*(_DWORD *)v61 + 8))(v61); +*(DWORD *)((char *)v61 + 13) = v83 + *(DWORD *)((char *)v4 + 122); +(*(void (__thiscall **)(TLine *))(*(DWORD *)v61 + 8))(v61); } } v62 = v83; -*(float *)(v83 + *(_DWORD *)((char *)v4 + 122) + 44) = cos(*(float *)(v83 + *(_DWORD *)((char *)v4 + 122) + 40)) -* sin(*(float *)(v83 + *(_DWORD *)((char *)v4 + 122) + 36)) -* *(float *)(*(_DWORD *)((char *)v4 + 30) + 270); -v63 = (float *)(v62 + *(_DWORD *)((char *)v4 + 122)); -v64 = *(_DWORD *)((char *)v4 + 30); +*(float *)(v83 + *(DWORD *)((char *)v4 + 122) + 44) = cos(*(float *)(v83 + *(DWORD *)((char *)v4 + 122) + 40)) +* sin(*(float *)(v83 + *(DWORD *)((char *)v4 + 122) + 36)) +* *(float *)(*(DWORD *)((char *)v4 + 30) + 270); +v63 = (float *)(v62 + *(DWORD *)((char *)v4 + 122)); +v64 = *(DWORD *)((char *)v4 + 30); v65 = sin(v63[10]); ++v82; v63[12] = v65 * sin(v63[9]) * *(float *)(v64 + 270); } -while ( v82 < *(_DWORD *)((char *)v4 + 114) ); +while ( v82 < *(DWORD *)((char *)v4 + 114) ); } v66 = v87; v67 = v88; -*(_DWORD *)((char *)v4 + 94) = (char *)v4 + 5; +*(DWORD *)((char *)v4 + 94) = (char *)v4 + 5; v68 = (int)v74; v69 = v67; v70 = v85; -*(_DWORD *)((char *)v4 + 102) = v4; +*(DWORD *)((char *)v4 + 102) = v4; v71 = v70; -*(_DWORD *)((char *)v4 + 98) = v68; +*(DWORD *)((char *)v4 + 98) = v68; edges_insert_square(v86, v71, v69, v66, 0, (TRamp *)((char *)v4 + 94)); return v4; } diff --git a/Classes/TRollover/TRollover.cpp b/Classes/TRollover/TRollover.cpp index 6b1387d..457036a 100644 --- a/Classes/TRollover/TRollover.cpp +++ b/Classes/TRollover/TRollover.cpp @@ -1,7 +1,7 @@ #include "TRollover.h" //----- (0101644B) -------------------------------------------------------- -void __stdcall TRollover::TimerExpired(int a1, void *a2) +void TRollover::TimerExpired(int a1, void *a2) { *((_BYTE *)a2 + 5) = 1; } @@ -13,11 +13,11 @@ int v3; // eax if ( a2 == 1024 ) { -v3 = *(_DWORD *)((char *)this + 34); +v3 = *(DWORD *)((char *)this + 34); *((_BYTE *)this + 5) = 1; *((_BYTE *)this + 78) = 0; if ( v3 ) -render_sprite_set_bitmap(*(_DWORD **)((char *)this + 26), *(_DWORD *)(*(_DWORD *)(v3 + 4) + 8)); +render_sprite_set_bitmap(*(DWORD **)((char *)this + 26), *(DWORD *)(*(DWORD *)(v3 + 4) + 8)); } return 0; } @@ -30,7 +30,7 @@ int result; // eax if ( a2 >= 2 ) result = 0; else -result = *(_DWORD *)((char *)this + 4 * a2 + 79); +result = *(DWORD *)((char *)this + 4 * a2 + 79); return result; } @@ -38,7 +38,7 @@ return result; void __thiscall TRollover::put_scoring(TRollover *this, int a2, int a3) { if ( a2 < 2 ) -*(_DWORD *)((char *)this + 4 * a2 + 79) = a3; +*(DWORD *)((char *)this + 4 * a2 + 79) = a3; } //----- (010182E4) -------------------------------------------------------- @@ -74,11 +74,11 @@ bool v10; // cl v6 = this; *(float *)((char *)a2 + 42) = *(float *)a3; v7 = *(float *)((char *)a2 + 70); -*(_DWORD *)((char *)a2 + 46) = *((_DWORD *)a3 + 1); +*(DWORD *)((char *)a2 + 46) = *((DWORD *)a3 + 1); *(float *)((char *)a2 + 70) = v7 - a5; TBall::not_again(a2, a6); v8 = 0; -if ( !*(_DWORD *)(*(_DWORD *)((char *)v6 + 30) + 370) ) +if ( !*(DWORD *)(*(DWORD *)((char *)v6 + 30) + 370) ) { if ( *((_BYTE *)v6 + 78) ) { @@ -87,17 +87,17 @@ timer_set(0.1, (int)v6, (int)TRollover::TimerExpired); } else { -loader_play_sound(*(_DWORD *)((char *)v6 + 70)); +loader_play_sound(*(DWORD *)((char *)v6 + 70)); control_handler(63, v6); } -v9 = *(_DWORD *)((char *)v6 + 34); +v9 = *(DWORD *)((char *)v6 + 34); v10 = *((_BYTE *)v6 + 78) == 0; *((_BYTE *)v6 + 78) = v10; if ( v9 ) { if ( !v10 ) -v8 = *(_DWORD *)(*(_DWORD *)(v9 + 4) + 8); -render_sprite_set_bitmap(*(_DWORD **)((char *)v6 + 26), v8); +v8 = *(DWORD *)(*(DWORD *)(v9 + 4) + 8); +render_sprite_set_bitmap(*(DWORD **)((char *)v6 + 26), v8); } } } @@ -109,7 +109,7 @@ TRollover *v4; // esi v4 = this; TCollisionComponent::TCollisionComponent(this, a2, a3, a4); -*(_DWORD *)v4 = &TRollover::vftable; +*(DWORD *)v4 = &TRollover::vftable; return v4; } // 1002614: using guessed type void *TRollover::vftable; @@ -122,11 +122,11 @@ int v4; // eax v3 = this; TCollisionComponent::TCollisionComponent(this, a2, a3, 0); -v4 = *(_DWORD *)((char *)v3 + 34); -*(_DWORD *)v3 = &TRollover::vftable; +v4 = *(DWORD *)((char *)v3 + 34); +*(DWORD *)v3 = &TRollover::vftable; *((_BYTE *)v3 + 78) = 0; if ( v4 ) -render_sprite_set_bitmap(*(_DWORD **)((char *)v3 + 26), *(_DWORD *)(*(_DWORD *)(v4 + 4) + 8)); +render_sprite_set_bitmap(*(DWORD **)((char *)v3 + 26), *(DWORD *)(*(DWORD *)(v4 + 4) + 8)); TRollover::build_walls(v3, a3); return v3; } diff --git a/Classes/TRollover/TRollover.h b/Classes/TRollover/TRollover.h index 3297673..8ea6d4e 100644 --- a/Classes/TRollover/TRollover.h +++ b/Classes/TRollover/TRollover.h @@ -10,7 +10,7 @@ /* 108 */ struct TRollover; -void __stdcall TRollover::TimerExpired(int, void*); // idb +void TRollover::TimerExpired(int, void*); // idb int __thiscall TRollover::Message(TRollover* this, int, float); // idb int __thiscall TRollover::get_scoring(TRollover* this, int); // idb void __thiscall TRollover::put_scoring(TRollover* this, int, int); // idb diff --git a/Classes/TSink/TSink.cpp b/Classes/TSink/TSink.cpp index 5775a3b..d76d532 100644 --- a/Classes/TSink/TSink.cpp +++ b/Classes/TSink/TSink.cpp @@ -1,24 +1,24 @@ #include "TSink.h" //----- (01017130) -------------------------------------------------------- -void __stdcall TSink::TimerExpired(int a1, void *a2) +void TSink::TimerExpired(int a1, void *a2) { int v2; // eax -v2 = *(_DWORD *)(*(_DWORD *)(*(_DWORD *)((char *)a2 + 30) + 262) + 8); -*(_DWORD *)(v2 + 106) = 0; +v2 = *(DWORD *)(*(DWORD *)(*(DWORD *)((char *)a2 + 30) + 262) + 8); +*(DWORD *)(v2 + 106) = 0; *(_BYTE *)(v2 + 5) = 1; -*(_DWORD *)(v2 + 42) = *(_DWORD *)((char *)a2 + 86); -*(_DWORD *)(v2 + 46) = *(_DWORD *)((char *)a2 + 90); +*(DWORD *)(v2 + 42) = *(DWORD *)((char *)a2 + 86); +*(DWORD *)(v2 + 46) = *(DWORD *)((char *)a2 + 90); throw_ball( (struct TBall *)v2, (struct vector_type *)((char *)a2 + 98), *(float *)((char *)a2 + 110), *(float *)((char *)a2 + 114), *(float *)((char *)a2 + 118)); -if ( *(_DWORD *)((char *)a2 + 126) ) -loader_play_sound(*(_DWORD *)((char *)a2 + 126)); -*(_DWORD *)((char *)a2 + 78) = 0; +if ( *(DWORD *)((char *)a2 + 126) ) +loader_play_sound(*(DWORD *)((char *)a2 + 126)); +*(DWORD *)((char *)a2 + 78) = 0; } //----- (01017197) -------------------------------------------------------- @@ -27,7 +27,7 @@ int __thiscall TSink::Message(TSink *this, int a2, float a3) TSink *v3; // esi int v4; // eax int v5; // ecx -_DWORD *v6; // eax +DWORD *v6; // eax v3 = this; switch ( a2 ) @@ -35,29 +35,29 @@ switch ( a2 ) case 56: if ( a3 < 0.0 ) a3 = *(float *)((char *)this + 82); -*(_DWORD *)((char *)this + 78) = timer_set(a3, (int)this, (int)TSink::TimerExpired); +*(DWORD *)((char *)this + 78) = timer_set(a3, (int)this, (int)TSink::TimerExpired); break; case 1020: -*(_DWORD *)((char *)this + 4 * *(_DWORD *)(*(_DWORD *)((char *)this + 30) + 218) + 142) = *(_DWORD *)((char *)this + 6); -*(_DWORD *)((char *)this + 6) = *(_DWORD *)((char *)this + 4 * (unsigned __int64)(signed __int64)_floor(a3) + 142); +*(DWORD *)((char *)this + 4 * *(DWORD *)(*(DWORD *)((char *)this + 30) + 218) + 142) = *(DWORD *)((char *)this + 6); +*(DWORD *)((char *)this + 6) = *(DWORD *)((char *)this + 4 * (unsigned __int64)(signed __int64)_floor(a3) + 142); break; case 1024: -if ( *(_DWORD *)((char *)this + 78) ) -timer_kill(*(_DWORD *)((char *)this + 78)); -v4 = *(_DWORD *)((char *)v3 + 30); -*(_DWORD *)((char *)v3 + 78) = 0; -*(_DWORD *)((char *)v3 + 6) = 0; +if ( *(DWORD *)((char *)this + 78) ) +timer_kill(*(DWORD *)((char *)this + 78)); +v4 = *(DWORD *)((char *)v3 + 30); +*(DWORD *)((char *)v3 + 78) = 0; +*(DWORD *)((char *)v3 + 6) = 0; v5 = 0; -if ( *(_DWORD *)(v4 + 214) > 0 ) +if ( *(DWORD *)(v4 + 214) > 0 ) { -v6 = (_DWORD *)((char *)v3 + 142); +v6 = (DWORD *)((char *)v3 + 142); do { *v6 = 0; ++v5; ++v6; } -while ( v5 < *(_DWORD *)(*(_DWORD *)((char *)v3 + 30) + 214) ); +while ( v5 < *(DWORD *)(*(DWORD *)((char *)v3 + 30) + 214) ); } break; } @@ -72,7 +72,7 @@ int result; // eax if ( a2 >= 3 ) result = 0; else -result = *(_DWORD *)((char *)this + 4 * a2 + 130); +result = *(DWORD *)((char *)this + 4 * a2 + 130); return result; } @@ -80,7 +80,7 @@ return result; void __thiscall TSink::put_scoring(TSink *this, int a2, int a3) { if ( a2 < 3 ) -*(_DWORD *)((char *)this + 4 * a2 + 130) = a3; +*(DWORD *)((char *)this + 4 * a2 + 130) = a3; } //----- (010184ED) -------------------------------------------------------- @@ -88,21 +88,21 @@ void __thiscall TSink::Collision(TSink *this, struct TBall *a2, struct vector_ty { TSink *v6; // esi int v7; // eax -_DWORD *v8; // ST14_4 +DWORD *v8; // ST14_4 v6 = this; -v7 = *(_DWORD *)((char *)this + 30); -*(_DWORD *)((char *)this + 78) = 0; -if ( *(_DWORD *)(v7 + 370) ) +v7 = *(DWORD *)((char *)this + 30); +*(DWORD *)((char *)this + 78) = 0; +if ( *(DWORD *)(v7 + 370) ) { basic_collision(a2, a3, a4, *(float *)((char *)this + 54), *(float *)((char *)this + 58), 1000000000.0, 0.0); } else { -v8 = *(_DWORD **)((char *)a2 + 26); +v8 = *(DWORD **)((char *)a2 + 26); *((_BYTE *)a2 + 5) = 0; render_sprite_set_bitmap(v8, 0); -loader_play_sound(*(_DWORD *)((char *)v6 + 122)); +loader_play_sound(*(DWORD *)((char *)v6 + 122)); control_handler(63, v6); } } @@ -114,7 +114,7 @@ TSink *v3; // ebx int v4; // eax int v5; // eax int v6; // eax -_DWORD *v7; // eax +DWORD *v7; // eax char v9; // [esp+Ch] [ebp-48h] int v10; // [esp+24h] [ebp-30h] float v11; // [esp+28h] [ebp-2Ch] @@ -127,25 +127,25 @@ int v17; // [esp+48h] [ebp-Ch] v3 = this; TCollisionComponent::TCollisionComponent(this, a2, a3, 1); -*(_DWORD *)v3 = &TSink::vftable; -*(_DWORD *)((char *)v3 + 6) = 0; -*(_DWORD *)((char *)v3 + 78) = 0; +*(DWORD *)v3 = &TSink::vftable; +*(DWORD *)((char *)v3 + 6) = 0; +*(DWORD *)((char *)v3 + 78) = 0; loader_query_visual(a3, 0, &v9); v4 = v15; *(float *)((char *)v3 + 118) = v11 * 0.01; -*(_DWORD *)((char *)v3 + 98) = v12; -*(_DWORD *)((char *)v3 + 110) = v4; -*(_DWORD *)((char *)v3 + 114) = v10; +*(DWORD *)((char *)v3 + 98) = v12; +*(DWORD *)((char *)v3 + 110) = v4; +*(DWORD *)((char *)v3 + 114) = v10; v5 = v16; -*(_DWORD *)((char *)v3 + 102) = v13; -*(_DWORD *)((char *)v3 + 122) = v5; +*(DWORD *)((char *)v3 + 102) = v13; +*(DWORD *)((char *)v3 + 122) = v5; v6 = v17; -*(_DWORD *)((char *)v3 + 106) = v14; -*(_DWORD *)((char *)v3 + 126) = v6; -v7 = (_DWORD *)loader_query_float_attribute(a3, 0, 601); -*(_DWORD *)((char *)v3 + 86) = *v7; -*(_DWORD *)((char *)v3 + 90) = v7[1]; -*(_DWORD *)((char *)v3 + 82) = *(_DWORD *)loader_query_float_attribute(a3, 0, 407); +*(DWORD *)((char *)v3 + 106) = v14; +*(DWORD *)((char *)v3 + 126) = v6; +v7 = (DWORD *)loader_query_float_attribute(a3, 0, 601); +*(DWORD *)((char *)v3 + 86) = *v7; +*(DWORD *)((char *)v3 + 90) = v7[1]; +*(DWORD *)((char *)v3 + 82) = *(DWORD *)loader_query_float_attribute(a3, 0, 407); return v3; } // 1002704: using guessed type void *TSink::vftable; diff --git a/Classes/TSink/TSink.h b/Classes/TSink/TSink.h index b73acac..489b04c 100644 --- a/Classes/TSink/TSink.h +++ b/Classes/TSink/TSink.h @@ -10,7 +10,7 @@ /* 114 */ struct TSink; -void __stdcall TSink::TimerExpired(int, void*); // idb +void TSink::TimerExpired(int, void*); // idb int __thiscall TSink::Message(TSink* this, int, float); // idb int __thiscall TSink::get_scoring(TSink* this, int); // idb void __thiscall TSink::put_scoring(TSink* this, int, int); // idb diff --git a/Classes/TSoloTarget/TSoloTarget.cpp b/Classes/TSoloTarget/TSoloTarget.cpp index 94fa3ca..da0ab35 100644 --- a/Classes/TSoloTarget/TSoloTarget.cpp +++ b/Classes/TSoloTarget/TSoloTarget.cpp @@ -16,22 +16,22 @@ if ( a2 > 50 ) { if ( a2 != 1024 ) return 0; -if ( *(_DWORD *)((char *)this + 82) ) -timer_kill(*(_DWORD *)((char *)this + 82)); -*(_DWORD *)((char *)v3 + 82) = 0; +if ( *(DWORD *)((char *)this + 82) ) +timer_kill(*(DWORD *)((char *)this + 82)); +*(DWORD *)((char *)v3 + 82) = 0; v4 = a2 == 50; } *((_BYTE *)v3 + 5) = v4 || a2 == 1024; -v5 = *(_DWORD *)((char *)v3 + 34); +v5 = *(DWORD *)((char *)v3 + 34); if ( v5 ) { v6 = 4 * (3 - *((char *)v3 + 5)); render_sprite_set( -*(_DWORD **)((char *)v3 + 26), -*(_DWORD *)(v6 + *(_DWORD *)(v5 + 4)), -*(_DWORD *)(*(_DWORD *)(*(_DWORD *)((char *)v3 + 38) + 4) + v6), -*(_DWORD *)(*(_DWORD *)(v6 + *(_DWORD *)(v5 + 4)) + 29) - *(_DWORD *)(*(_DWORD *)((char *)v3 + 30) + 234), -*(_DWORD *)(*(_DWORD *)(v6 + *(_DWORD *)(v5 + 4)) + 33) - *(_DWORD *)(*(_DWORD *)((char *)v3 + 30) + 238)); +*(DWORD **)((char *)v3 + 26), +*(DWORD *)(v6 + *(DWORD *)(v5 + 4)), +*(DWORD *)(*(DWORD *)(*(DWORD *)((char *)v3 + 38) + 4) + v6), +*(DWORD *)(*(DWORD *)(v6 + *(DWORD *)(v5 + 4)) + 29) - *(DWORD *)(*(DWORD *)((char *)v3 + 30) + 234), +*(DWORD *)(*(DWORD *)(v6 + *(DWORD *)(v5 + 4)) + 33) - *(DWORD *)(*(DWORD *)((char *)v3 + 30) + 238)); } } return 0; @@ -45,7 +45,7 @@ int result; // eax if ( a2 >= 1 ) result = 0; else -result = *(_DWORD *)((char *)this + 4 * a2 + 94); +result = *(DWORD *)((char *)this + 4 * a2 + 94); return result; } @@ -53,14 +53,14 @@ return result; void __thiscall TSoloTarget::put_scoring(TSoloTarget *this, int a2, int a3) { if ( a2 < 1 ) -*(_DWORD *)((char *)this + 4 * a2 + 94) = a3; +*(DWORD *)((char *)this + 4 * a2 + 94) = a3; } //----- (0101620B) -------------------------------------------------------- -void __stdcall TSoloTarget::TimerExpired(int a1, void *a2) +void TSoloTarget::TimerExpired(int a1, void *a2) { -(**(void (__thiscall ***)(void *, signed int, _DWORD))a2)(a2, 50, 0.0); -*(_DWORD *)((char *)a2 + 82) = 0; +(**(void (__thiscall ***)(void *, signed int, DWORD))a2)(a2, 50, 0.0); +*(DWORD *)((char *)a2 + 82) = 0; } //----- (01018295) -------------------------------------------------------- @@ -71,8 +71,8 @@ TSoloTarget *v6; // esi v6 = this; if ( TCollisionComponent::DefaultCollision(this, a2, a3, a4) ) { -(**(void (__thiscall ***)(TSoloTarget *, signed int, _DWORD))v6)(v6, 49, 0.0); -*(_DWORD *)((char *)v6 + 82) = timer_set(*(float *)((char *)v6 + 86), (int)v6, (int)TSoloTarget::TimerExpired); +(**(void (__thiscall ***)(TSoloTarget *, signed int, DWORD))v6)(v6, 49, 0.0); +*(DWORD *)((char *)v6 + 82) = timer_set(*(float *)((char *)v6 + 86), (int)v6, (int)TSoloTarget::TimerExpired); control_handler(63, v6); } } @@ -86,11 +86,11 @@ int v6; // [esp+40h] [ebp-10h] v3 = this; TCollisionComponent::TCollisionComponent(this, a2, a3, 1); -*(_DWORD *)((char *)v3 + 82) = 0; -*(_DWORD *)v3 = &TSoloTarget::vftable; -*(_DWORD *)((char *)v3 + 86) = 1036831949; +*(DWORD *)((char *)v3 + 82) = 0; +*(DWORD *)v3 = &TSoloTarget::vftable; +*(DWORD *)((char *)v3 + 86) = 1036831949; loader_query_visual(a3, 0, &v5); -*(_DWORD *)((char *)v3 + 90) = v6; +*(DWORD *)((char *)v3 + 90) = v6; TSoloTarget::Message(v3, 50, 0.0); return v3; } diff --git a/Classes/TSoloTarget/TSoloTarget.h b/Classes/TSoloTarget/TSoloTarget.h index 6e8b2c5..59d6047 100644 --- a/Classes/TSoloTarget/TSoloTarget.h +++ b/Classes/TSoloTarget/TSoloTarget.h @@ -10,7 +10,7 @@ /* 107 */ struct TSoloTarget; -void __stdcall TSoloTarget::TimerExpired(int, void*); // idb +void TSoloTarget::TimerExpired(int, void*); // idb int __thiscall TSoloTarget::Message(TSoloTarget* this, int, float); // idb int __thiscall TSoloTarget::get_scoring(TSoloTarget* this, int); // idb void __thiscall TSoloTarget::put_scoring(TSoloTarget* this, int, int); // idb diff --git a/Classes/TSound/TSound.cpp b/Classes/TSound/TSound.cpp index 4bea9c3..dda4262 100644 --- a/Classes/TSound/TSound.cpp +++ b/Classes/TSound/TSound.cpp @@ -19,7 +19,7 @@ return v2; //----- (0101797E) -------------------------------------------------------- double __thiscall TSound::Play(TSound *this) { -return loader_play_sound(*(_DWORD *)((char *)this + 42)); +return loader_play_sound(*(DWORD *)((char *)this + 42)); } //----- (0101AA18) -------------------------------------------------------- @@ -31,9 +31,9 @@ int v6; // [esp+3Ch] [ebp-10h] v3 = this; TPinballComponent::TPinballComponent(this, a2, a3, 1); -*(_DWORD *)v3 = &TSound::vftable; +*(DWORD *)v3 = &TSound::vftable; loader_query_visual(a3, 0, &v5); -*(_DWORD *)((char *)v3 + 42) = v6; +*(DWORD *)((char *)v3 + 42) = v6; return v3; } // 10027A4: using guessed type void *TSound::vftable; diff --git a/Classes/TTableLayer/TTableLayer.cpp b/Classes/TTableLayer/TTableLayer.cpp index 69d4524..5f2122a 100644 --- a/Classes/TTableLayer/TTableLayer.cpp +++ b/Classes/TTableLayer/TTableLayer.cpp @@ -26,10 +26,10 @@ struct TPinballTable *v2; // edi TTableLayer *v3; // esi float *v4; // eax int v5; // eax -_DWORD *v6; // eax +DWORD *v6; // eax int v7; // eax -_DWORD *v8; // eax -_DWORD *v9; // eax +DWORD *v8; // eax +DWORD *v9; // eax float *v10; // ecx float *v11; // edi double v12; // st7 @@ -57,7 +57,7 @@ int v34; // [esp+54h] [ebp-2Ch] unsigned int v35; // [esp+58h] [ebp-28h] int v36; // [esp+5Ch] [ebp-24h] int v37; // [esp+60h] [ebp-20h] -_DWORD *v38; // [esp+64h] [ebp-1Ch] +DWORD *v38; // [esp+64h] [ebp-1Ch] struct zmap_header_type *v39; // [esp+68h] [ebp-18h] int v40; // [esp+6Ch] [ebp-14h] int v41; // [esp+70h] [ebp-10h] @@ -70,52 +70,52 @@ struct TPinballTable *v46; // [esp+88h] [ebp+8h] v2 = a2; v3 = this; TCollisionComponent::TCollisionComponent(this, a2, -1, 0); -*(_DWORD *)v3 = &TTableLayer::vftable; +*(DWORD *)v3 = &TTableLayer::vftable; v45 = (struct TPinballTable *)loader_query_handle("table"); loader_query_visual((int)v45, 0, &v30); v4 = (float *)loader_query_float_attribute((int)v45, 0, 700); proj_recenter(COERCE_INT(*v4), COERCE_INT(v4[1])); render_set_background_zmap(v39, 0, 0); v5 = (int)v38; -*(_DWORD *)((char *)v3 + 78) = v38; +*(DWORD *)((char *)v3 + 78) = v38; v40 = 0; v41 = 0; -v42 = *(_DWORD *)(v5 + 12); -v43 = *(_DWORD *)(v5 + 16); +v42 = *(DWORD *)(v5 + 12); +v43 = *(DWORD *)(v5 + 16); render_create_sprite(0, v5, (int)v39, 0, 0, &v40); -*(_DWORD *)(*(_DWORD *)((char *)v3 + 30) + 66) = v36; -*(_DWORD *)(*(_DWORD *)((char *)v3 + 30) + 70) = v37; -*(_DWORD *)(*(_DWORD *)((char *)v3 + 30) + 74) = v34; -v6 = (_DWORD *)loader_query_float_attribute((int)v45, 0, 305); +*(DWORD *)(*(DWORD *)((char *)v3 + 30) + 66) = v36; +*(DWORD *)(*(DWORD *)((char *)v3 + 30) + 70) = v37; +*(DWORD *)(*(DWORD *)((char *)v3 + 30) + 74) = v34; +v6 = (DWORD *)loader_query_float_attribute((int)v45, 0, 305); if ( v6 ) { -*(_DWORD *)(*(_DWORD *)((char *)v3 + 30) + 270) = *v6; -*(_DWORD *)(*(_DWORD *)((char *)v3 + 30) + 274) = v6[1]; -*(_DWORD *)(*(_DWORD *)((char *)v3 + 30) + 278) = v6[2]; +*(DWORD *)(*(DWORD *)((char *)v3 + 30) + 270) = *v6; +*(DWORD *)(*(DWORD *)((char *)v3 + 30) + 274) = v6[1]; +*(DWORD *)(*(DWORD *)((char *)v3 + 30) + 278) = v6[2]; } else { -*(_DWORD *)(*(_DWORD *)((char *)v3 + 30) + 270) = 1103626240; -*(_DWORD *)(*(_DWORD *)((char *)v3 + 30) + 274) = 1056964608; -*(_DWORD *)(*(_DWORD *)((char *)v3 + 30) + 278) = 1070141400; +*(DWORD *)(*(DWORD *)((char *)v3 + 30) + 270) = 1103626240; +*(DWORD *)(*(DWORD *)((char *)v3 + 30) + 274) = 1056964608; +*(DWORD *)(*(DWORD *)((char *)v3 + 30) + 278) = 1070141400; } -v7 = *(_DWORD *)((char *)v3 + 30); +v7 = *(DWORD *)((char *)v3 + 30); *(float *)((char *)v3 + 98) = cos(*(float *)(v7 + 278)) * sin(*(float *)(v7 + 274)) * *(float *)(v7 + 270); *(float *)((char *)v3 + 102) = sin(*(float *)(v7 + 278)) * sin(*(float *)(v7 + 274)) * *(float *)(v7 + 270); -v8 = (_DWORD *)loader_query_float_attribute((int)v45, 0, 701); +v8 = (DWORD *)loader_query_float_attribute((int)v45, 0, 701); if ( v8 ) -*(_DWORD *)((char *)v3 + 110) = *v8; +*(DWORD *)((char *)v3 + 110) = *v8; else -*(_DWORD *)((char *)v3 + 110) = 1045220557; +*(DWORD *)((char *)v3 + 110) = 1045220557; v9 = v38; -*(_DWORD *)((char *)v2 + 234) = *(_DWORD *)((char *)v38 + 29); -*(_DWORD *)((char *)v2 + 238) = *(_DWORD *)((char *)v9 + 33); -*(_DWORD *)((char *)v2 + 242) = v9[3]; +*(DWORD *)((char *)v2 + 234) = *(DWORD *)((char *)v38 + 29); +*(DWORD *)((char *)v2 + 238) = *(DWORD *)((char *)v9 + 33); +*(DWORD *)((char *)v2 + 242) = v9[3]; v10 = v32; -*(_DWORD *)((char *)v2 + 246) = v9[4]; +*(DWORD *)((char *)v2 + 246) = v9[4]; v44 = v31; -*(_DWORD *)((char *)v3 + 66) = v33; -*(_DWORD *)((char *)v3 + 62) = 1097859072; +*(DWORD *)((char *)v3 + 66) = v33; +*(DWORD *)((char *)v3 + 62) = 1097859072; v11 = v10; v46 = (struct TPinballTable *)v10; if ( v10[2] >= (double)v10[4] ) @@ -205,7 +205,7 @@ v23 = (TLine *)operator new(0x55u); v24 = v23 ? TLine::TLine(v23, v3, (char *)v3 + 5, v35, v11[2], v11[3], *v11, v11[1]) : 0; if ( v24 ) { -(*(void (__thiscall **)(TLine *))(*(_DWORD *)v24 + 8))(v24); +(*(void (__thiscall **)(TLine *))(*(DWORD *)v24 + 8))(v24); objlist_class::Add((TTableLayer *)((char *)v3 + 42), (void *)v24); } v46 = (struct TPinballTable *)((char *)v46 + 8); @@ -215,12 +215,12 @@ v11 = (float *)v46; } } v25 = *(float *)((char *)v3 + 90); -*(_DWORD *)((char *)v3 + 118) = -1; +*(DWORD *)((char *)v3 + 118) = -1; v26 = v25; v27 = *(float *)((char *)v3 + 94); -*(_DWORD *)((char *)v3 + 114) = (char *)v3 + 5; +*(DWORD *)((char *)v3 + 114) = (char *)v3 + 5; v28 = v27; -*(_DWORD *)((char *)v3 + 122) = v3; +*(DWORD *)((char *)v3 + 122) = v3; edges_insert_square( *(float *)((char *)v3 + 86), *(float *)((char *)v3 + 82), @@ -238,7 +238,7 @@ TZmapList *__thiscall TTableLayer::~TTableLayer(TTableLayer *this) TCollisionComponent *v1; // esi v1 = this; -*(_DWORD *)this = &TTableLayer::vftable; +*(DWORD *)this = &TTableLayer::vftable; if ( edge_manager ) TEdgeManager::destroy(edge_manager, 1); return TCollisionComponent::~TCollisionComponent(v1); diff --git a/Classes/TTextBox/TTextBox.cpp b/Classes/TTextBox/TTextBox.cpp index 995cb81..3edf307 100644 --- a/Classes/TTextBox/TTextBox.cpp +++ b/Classes/TTextBox/TTextBox.cpp @@ -6,7 +6,7 @@ TTextBox *__thiscall TTextBox::TTextBox(TTextBox *this, struct TPinballTable *a2 TTextBox *v3; // esi bool v4; // zf bool v5; // sf -signed __int16 *v6; // eax +signed int *v6; // eax int v7; // ecx int v8; // ecx @@ -14,27 +14,27 @@ v3 = this; TPinballComponent::TPinballComponent(this, a2, a3, 1); v4 = a3 == 0; v5 = a3 < 0; -*(_DWORD *)v3 = &TTextBox::vftable; -*(_DWORD *)((char *)v3 + 42) = 0; -*(_DWORD *)((char *)v3 + 46) = 0; -*(_DWORD *)((char *)v3 + 50) = 0; -*(_DWORD *)((char *)v3 + 54) = 0; -*(_DWORD *)((char *)v3 + 62) = render_background_bitmap; -*(_DWORD *)((char *)v3 + 66) = score_msg_fontp; -*(_DWORD *)((char *)v3 + 70) = 0; -*(_DWORD *)((char *)v3 + 74) = 0; -*(_DWORD *)((char *)v3 + 58) = 0; +*(DWORD *)v3 = &TTextBox::vftable; +*(DWORD *)((char *)v3 + 42) = 0; +*(DWORD *)((char *)v3 + 46) = 0; +*(DWORD *)((char *)v3 + 50) = 0; +*(DWORD *)((char *)v3 + 54) = 0; +*(DWORD *)((char *)v3 + 62) = render_background_bitmap; +*(DWORD *)((char *)v3 + 66) = score_msg_fontp; +*(DWORD *)((char *)v3 + 70) = 0; +*(DWORD *)((char *)v3 + 74) = 0; +*(DWORD *)((char *)v3 + 58) = 0; if ( !v5 && !v4 ) { -v6 = (signed __int16 *)loader_query_iattribute(a3, 1500, &a2); +v6 = (signed int *)loader_query_iattribute(a3, 1500, &a2); v7 = *v6; ++v6; -*(_DWORD *)((char *)v3 + 42) = v7; +*(DWORD *)((char *)v3 + 42) = v7; v8 = *v6; ++v6; -*(_DWORD *)((char *)v3 + 46) = v8; -*(_DWORD *)((char *)v3 + 50) = *v6; -*(_DWORD *)((char *)v3 + 54) = v6[1]; +*(DWORD *)((char *)v3 + 46) = v8; +*(DWORD *)((char *)v3 + 50) = *v6; +*(DWORD *)((char *)v3 + 54) = v6[1]; } return v3; } @@ -42,73 +42,73 @@ return v3; // 10253C4: using guessed type struct score_msg_font_type *score_msg_fontp; //----- (01014143) -------------------------------------------------------- -void __usercall TTextBox::Clear(TTextBox *this@, int a2@) +void TTextBox::Clear(TTextBox *this, int a2) { TTextBox *v2; // esi -_DWORD *v3; // edx +DWORD *v3; // edx int v4; // eax TTextBoxMessage *v5; // ecx int v6; // edi v2 = this; -v3 = *(_DWORD **)((char *)this + 62); +v3 = *(DWORD **)((char *)this + 62); if ( v3 ) gdrv_copy_bitmap( &vscreen, -*(_DWORD *)((char *)this + 50), -*(_DWORD *)((char *)this + 54), -*(_DWORD *)((char *)this + 42), -*(_DWORD *)((char *)this + 46), +*(DWORD *)((char *)this + 50), +*(DWORD *)((char *)this + 54), +*(DWORD *)((char *)this + 42), +*(DWORD *)((char *)this + 46), v3, -*(_DWORD *)((char *)this + 42), -*(_DWORD *)((char *)this + 46)); +*(DWORD *)((char *)this + 42), +*(DWORD *)((char *)this + 46)); else gdrv_fill_bitmap( a2, &vscreen, -*(_DWORD *)((char *)this + 50), -*(_DWORD *)((char *)this + 54), -*(_DWORD *)((char *)this + 42), -*(_DWORD *)((char *)this + 46), +*(DWORD *)((char *)this + 50), +*(DWORD *)((char *)this + 54), +*(DWORD *)((char *)this + 42), +*(DWORD *)((char *)this + 46), 0); gdrv_blit( (int)&vscreen, -*(_DWORD *)((char *)v2 + 42), -*(_DWORD *)((char *)v2 + 46), -*(_DWORD *)((char *)v2 + 42) + xDest, -*(_DWORD *)((char *)v2 + 46) + yDest, -*(_DWORD *)((char *)v2 + 50), -*(_DWORD *)((char *)v2 + 54)); -v4 = *(_DWORD *)((char *)v2 + 58); +*(DWORD *)((char *)v2 + 42), +*(DWORD *)((char *)v2 + 46), +*(DWORD *)((char *)v2 + 42) + xDest, +*(DWORD *)((char *)v2 + 46) + yDest, +*(DWORD *)((char *)v2 + 50), +*(DWORD *)((char *)v2 + 54)); +v4 = *(DWORD *)((char *)v2 + 58); if ( v4 ) { if ( v4 != -1 ) -timer_kill(*(_DWORD *)((char *)v2 + 58)); -*(_DWORD *)((char *)v2 + 58) = 0; +timer_kill(*(DWORD *)((char *)v2 + 58)); +*(DWORD *)((char *)v2 + 58) = 0; } -while ( *(_DWORD *)((char *)v2 + 70) ) +while ( *(DWORD *)((char *)v2 + 70) ) { v5 = *(TTextBoxMessage **)((char *)v2 + 70); -v6 = *(_DWORD *)v5; +v6 = *(DWORD *)v5; if ( v5 ) TTextBoxMessage::destroy(v5, 1); -*(_DWORD *)((char *)v2 + 70) = v6; +*(DWORD *)((char *)v2 + 70) = v6; } } //----- (010141E1) -------------------------------------------------------- -void __userpurge TTextBox::TimerExpired(int a1@, int a2, TTextBox *a3) +void TTextBox::TimerExpired(int a1, int a2, TTextBox *a3) { TTextBoxMessage *v3; // ecx int v4; // edi v3 = *(TTextBoxMessage **)((char *)a3 + 70); -*(_DWORD *)((char *)a3 + 58) = 0; +*(DWORD *)((char *)a3 + 58) = 0; if ( v3 ) { -v4 = *(_DWORD *)v3; +v4 = *(DWORD *)v3; TTextBoxMessage::destroy(v3, 1); -*(_DWORD *)((char *)a3 + 70) = v4; +*(DWORD *)((char *)a3 + 70) = v4; TTextBox::Draw(a3, a1); control_handler(60, a3); } @@ -123,23 +123,23 @@ TTextBoxMessage *v3; // ecx int v4; // edi v1 = this; -v2 = *(_DWORD *)((char *)this + 58); -*(_DWORD *)this = &TTextBox::vftable; +v2 = *(DWORD *)((char *)this + 58); +*(DWORD *)this = &TTextBox::vftable; if ( v2 ) { if ( v2 != -1 ) timer_kill(v2); -*(_DWORD *)((char *)v1 + 58) = 0; +*(DWORD *)((char *)v1 + 58) = 0; } -if ( *(_DWORD *)((char *)v1 + 70) ) +if ( *(DWORD *)((char *)v1 + 70) ) { do { v3 = *(TTextBoxMessage **)((char *)v1 + 70); -v4 = *(_DWORD *)v3; +v4 = *(DWORD *)v3; if ( v3 ) TTextBoxMessage::destroy(v3, 1); -*(_DWORD *)((char *)v1 + 70) = v4; +*(DWORD *)((char *)v1 + 70) = v4; } while ( v4 ); } @@ -148,16 +148,16 @@ return TPinballComponent::~TPinballComponent(v1); // 10023B4: using guessed type void *TTextBox::vftable; //----- (01014269) -------------------------------------------------------- -void __usercall TTextBox::Draw(TTextBox *this@, int a2@) +void TTextBox::Draw(TTextBox *this, int a2) { TTextBox *v2; // esi -_DWORD *v3; // edx +DWORD *v3; // edx float *v4; // edi int v5; // ebx double v6; // st7 int v7; // eax float v8; // ST14_4 -_DWORD *v9; // ecx +DWORD *v9; // ecx _BYTE *v10; // ebx int v11; // edi int v12; // eax @@ -165,7 +165,7 @@ int v13; // eax char *v14; // edx char v15; // al int v16; // eax -_DWORD *v17; // edi +DWORD *v17; // edi int v18; // [esp-10h] [ebp-34h] int v19; // [esp-Ch] [ebp-30h] _BYTE *v20; // [esp+18h] [ebp-Ch] @@ -174,61 +174,61 @@ int i; // [esp+1Ch] [ebp-8h] _BYTE *v23; // [esp+20h] [ebp-4h] v2 = this; -v3 = *(_DWORD **)((char *)this + 62); +v3 = *(DWORD **)((char *)this + 62); if ( v3 ) gdrv_copy_bitmap( &vscreen, -*(_DWORD *)((char *)this + 50), -*(_DWORD *)((char *)this + 54), -*(_DWORD *)((char *)this + 42), -*(_DWORD *)((char *)this + 46), +*(DWORD *)((char *)this + 50), +*(DWORD *)((char *)this + 54), +*(DWORD *)((char *)this + 42), +*(DWORD *)((char *)this + 46), v3, -*(_DWORD *)((char *)this + 42), -*(_DWORD *)((char *)this + 46)); +*(DWORD *)((char *)this + 42), +*(DWORD *)((char *)this + 46)); else gdrv_fill_bitmap( a2, &vscreen, -*(_DWORD *)((char *)this + 50), -*(_DWORD *)((char *)this + 54), -*(_DWORD *)((char *)this + 42), -*(_DWORD *)((char *)this + 46), +*(DWORD *)((char *)this + 50), +*(DWORD *)((char *)this + 54), +*(DWORD *)((char *)this + 42), +*(DWORD *)((char *)this + 46), 0); -while ( *(_DWORD *)((char *)v2 + 70) ) +while ( *(DWORD *)((char *)v2 + 70) ) { v4 = *(float **)((char *)v2 + 70); if ( v4[2] == -1.0 ) { -v5 = *(_DWORD *)v4; -if ( !*(_DWORD *)v4 ) +v5 = *(DWORD *)v4; +if ( !*(DWORD *)v4 ) { -*(_DWORD *)((char *)v2 + 58) = -1; +*(DWORD *)((char *)v2 + 58) = -1; LABEL_18: -v9 = *(_DWORD **)((char *)v2 + 66); +v9 = *(DWORD **)((char *)v2 + 66); if ( !v9 ) { gdrv_blit( (int)&vscreen, -*(_DWORD *)((char *)v2 + 42), -*(_DWORD *)((char *)v2 + 46), -*(_DWORD *)((char *)v2 + 42) + xDest, -*(_DWORD *)((char *)v2 + 46) + yDest, -*(_DWORD *)((char *)v2 + 50), -*(_DWORD *)((char *)v2 + 54)); +*(DWORD *)((char *)v2 + 42), +*(DWORD *)((char *)v2 + 46), +*(DWORD *)((char *)v2 + 42) + xDest, +*(DWORD *)((char *)v2 + 46) + yDest, +*(DWORD *)((char *)v2 + 50), +*(DWORD *)((char *)v2 + 54)); grtext_draw_ttext_in_box( -*(LPCSTR *)(*(_DWORD *)((char *)v2 + 70) + 4), -xDest + *(_DWORD *)((char *)v2 + 42), -yDest + *(_DWORD *)((char *)v2 + 46), -*(_DWORD *)((char *)v2 + 50), -*(_DWORD *)((char *)v2 + 54), +*(LPCSTR *)(*(DWORD *)((char *)v2 + 70) + 4), +xDest + *(DWORD *)((char *)v2 + 42), +yDest + *(DWORD *)((char *)v2 + 46), +*(DWORD *)((char *)v2 + 50), +*(DWORD *)((char *)v2 + 54), 255); return; } -v10 = *(_BYTE **)(*(_DWORD *)((char *)v2 + 70) + 4); -for ( i = *(_DWORD *)((char *)v2 + 46); ; i += v9[1] ) +v10 = *(_BYTE **)(*(DWORD *)((char *)v2 + 70) + 4); +for ( i = *(DWORD *)((char *)v2 + 46); ; i += v9[1] ) { v15 = *v10; -if ( !*v10 || i + v9[1] > *(_DWORD *)((char *)v2 + 46) + *(_DWORD *)((char *)v2 + 54) ) +if ( !*v10 || i + v9[1] > *(DWORD *)((char *)v2 + 46) + *(DWORD *)((char *)v2 + 54) ) break; v11 = 0; v20 = 0; @@ -241,8 +241,8 @@ break; v12 = v9[v16 + 2]; if ( v12 ) { -v13 = *(_DWORD *)(v12 + 12) + *v9 + v11; -if ( v13 > *(_DWORD *)((char *)v2 + 50) ) +v13 = *(DWORD *)(v12 + 12) + *v9 + v11; +if ( v13 > *(DWORD *)((char *)v2 + 50) ) { if ( v20 ) v23 = v20; @@ -260,10 +260,10 @@ v14 = v23; } v15 = *v14; } -v21 = *(_DWORD *)((char *)v2 + 42); +v21 = *(DWORD *)((char *)v2 + 42); while ( v10 < v23 ) { -v17 = (_DWORD *)v9[(*v10++ & 0x7F) + 2]; +v17 = (DWORD *)v9[(*v10++ & 0x7F) + 2]; if ( v17 ) { v19 = v17[4]; @@ -272,7 +272,7 @@ if ( render_background_bitmap ) gdrv_copy_bitmap_w_transparency(&vscreen, v18, v19, v21, i, v17, 0, 0); else gdrv_copy_bitmap(&vscreen, v18, v19, v21, i, v17, 0, 0); -v9 = *(_DWORD **)((char *)v2 + 66); +v9 = *(DWORD **)((char *)v2 + 66); v21 += v17[3] + *v9; } } @@ -280,14 +280,14 @@ while ( (*v10 & 0x7F) == 32 ) ++v10; if ( (*v10 & 0x7F) == 10 ) ++v10; -v9 = *(_DWORD **)((char *)v2 + 66); +v9 = *(DWORD **)((char *)v2 + 66); } break; } } else { -v6 = TTextBoxMessage::TimeLeft((TTextBoxMessage *)*(_DWORD *)((char *)v2 + 70)); +v6 = TTextBoxMessage::TimeLeft((TTextBoxMessage *)*(DWORD *)((char *)v2 + 70)); if ( v6 >= -2.0 ) { if ( v6 >= 0.25 ) @@ -299,27 +299,27 @@ else { v7 = timer_set(0.25, (int)v2, (int)TTextBox::TimerExpired); } -*(_DWORD *)((char *)v2 + 58) = v7; +*(DWORD *)((char *)v2 + 58) = v7; goto LABEL_18; } -v5 = *(_DWORD *)v4; +v5 = *(DWORD *)v4; } if ( v4 ) TTextBoxMessage::destroy((TTextBoxMessage *)v4, 1); -*(_DWORD *)((char *)v2 + 70) = v5; +*(DWORD *)((char *)v2 + 70) = v5; } gdrv_blit( (int)&vscreen, -*(_DWORD *)((char *)v2 + 42), -*(_DWORD *)((char *)v2 + 46), -*(_DWORD *)((char *)v2 + 42) + xDest, -*(_DWORD *)((char *)v2 + 46) + yDest, -*(_DWORD *)((char *)v2 + 50), -*(_DWORD *)((char *)v2 + 54)); +*(DWORD *)((char *)v2 + 42), +*(DWORD *)((char *)v2 + 46), +*(DWORD *)((char *)v2 + 42) + xDest, +*(DWORD *)((char *)v2 + 46) + yDest, +*(DWORD *)((char *)v2 + 50), +*(DWORD *)((char *)v2 + 54)); } //----- (010144B7) -------------------------------------------------------- -void __userpurge TTextBox::Display(TTextBox *this@, int a2@, char *a3, float a4) +void TTextBox::Display(TTextBox *this, int a2, char *a3, float a4) { TTextBox *v4; // esi const char **v5; // ecx @@ -333,10 +333,10 @@ bool v11; // zf v4 = this; if ( a3 ) { -if ( !*(_DWORD *)((char *)this + 70) +if ( !*(DWORD *)((char *)this + 70) || (v5 = *(const char ***)((char *)this + 74), v6 = a2, v7 = strcmp(a3, v5[1]), a2 = v6, v7) ) { -if ( *(_DWORD *)((char *)v4 + 58) == -1 ) +if ( *(DWORD *)((char *)v4 + 58) == -1 ) TTextBox::Clear(v4, a2); v9 = (TTextBoxMessage *)operator new(0x10u); if ( v9 ) @@ -345,14 +345,14 @@ else v10 = 0; if ( v10 ) { -if ( *((_DWORD *)v10 + 1) ) +if ( *((DWORD *)v10 + 1) ) { -if ( *(_DWORD *)((char *)v4 + 70) ) -**(_DWORD **)((char *)v4 + 74) = v10; +if ( *(DWORD *)((char *)v4 + 70) ) +**(DWORD **)((char *)v4 + 74) = v10; else -*(_DWORD *)((char *)v4 + 70) = v10; -v11 = *(_DWORD *)((char *)v4 + 58) == 0; -*(_DWORD *)((char *)v4 + 74) = v10; +*(DWORD *)((char *)v4 + 70) = v10; +v11 = *(DWORD *)((char *)v4 + 58) == 0; +*(DWORD *)((char *)v4 + 74) = v10; if ( v11 ) TTextBox::Draw(v4, a2); } @@ -365,15 +365,15 @@ TTextBoxMessage::destroy(v10, 1); else { TTextBoxMessage::Refresh((TTextBoxMessage *)v5, a4); -if ( *(_DWORD *)((char *)v4 + 74) == *(_DWORD *)((char *)v4 + 70) ) +if ( *(DWORD *)((char *)v4 + 74) == *(DWORD *)((char *)v4 + 70) ) { -v8 = *(_DWORD *)((char *)v4 + 58); +v8 = *(DWORD *)((char *)v4 + 58); if ( v8 && v8 != -1 ) -timer_kill(*(_DWORD *)((char *)v4 + 58)); +timer_kill(*(DWORD *)((char *)v4 + 58)); if ( a4 == -1.0 ) -*(_DWORD *)((char *)v4 + 58) = -1; +*(DWORD *)((char *)v4 + 58) = -1; else -*(_DWORD *)((char *)v4 + 58) = timer_set(a4, (int)v4, (int)TTextBox::TimerExpired); +*(DWORD *)((char *)v4 + 58) = timer_set(a4, (int)v4, (int)TTextBox::TimerExpired); } } } @@ -392,7 +392,7 @@ return v2; } //----- (01019168) -------------------------------------------------------- -int __stdcall TTextBox::Message(int a2, float a3) +int TTextBox::Message(int a2, float a3) { return 0; } diff --git a/Classes/TTextBox/TTextbox.h b/Classes/TTextBox/TTextbox.h index 409fee1..d4286b9 100644 --- a/Classes/TTextBox/TTextbox.h +++ b/Classes/TTextBox/TTextbox.h @@ -11,13 +11,13 @@ struct TTextBox; TTextBox* __thiscall TTextBox::TTextBox(TTextBox* this, struct TPinballTable* a2, int a3); -// void __usercall TTextBox::Clear(TTextBox *this@, int a2@); -// void __userpurge TTextBox::TimerExpired(int a1@, int a2, TTextBox *a3); +// void TTextBox::Clear(TTextBox *this, int a2); +// void TTextBox::TimerExpired(int a1, int a2, TTextBox *a3); TZmapList* __thiscall TTextBox::~TTextBox(TTextBox* this); -// void __usercall TTextBox::Draw(TTextBox *this@, int a2@); -// void __userpurge TTextBox::Display(TTextBox *this@, int a2@, char *a3, float a4); +// void TTextBox::Draw(TTextBox *this, int a2); +// void TTextBox::Display(TTextBox *this, int a2, char *a3, float a4); TTextBox* __thiscall TTextBox::destroy(TTextBox *this, char a2); -int __stdcall TTextBox::Message(int a2, float a3); +int TTextBox::Message(int a2, float a3); void* TTextBox::vftable = &TTextBox::Message; // weak diff --git a/Classes/TTextBoxMessage/TTextBoxMessage.cpp b/Classes/TTextBoxMessage/TTextBoxMessage.cpp index 6f7b116..48b7b07 100644 --- a/Classes/TTextBoxMessage/TTextBoxMessage.cpp +++ b/Classes/TTextBoxMessage/TTextBoxMessage.cpp @@ -7,14 +7,14 @@ TTextBoxMessage *v3; // esi char *v4; // edx v3 = this; -*(_DWORD *)this = 0; +*(DWORD *)this = 0; *((float *)this + 2) = a3; -*((_DWORD *)this + 3) = time_ticks - (unsigned __int64)(signed __int64)(a3 * -1000.0); +*((DWORD *)this + 3) = time_ticks - (unsigned __int64)(signed __int64)(a3 * -1000.0); if ( a2 ) -*((_DWORD *)this + 1) = memoryallocate(strlen(a2) + 1); +*((DWORD *)this + 1) = memoryallocate(strlen(a2) + 1); else -*((_DWORD *)this + 1) = 0; -v4 = (char *)*((_DWORD *)v3 + 1); +*((DWORD *)this + 1) = 0; +v4 = (char *)*((DWORD *)v3 + 1); if ( v4 ) strcpy(v4, a2); return v3; @@ -24,7 +24,7 @@ return v3; //----- (01013B60) -------------------------------------------------------- double __thiscall TTextBoxMessage::TimeLeft(TTextBoxMessage *this) { -return (double)(*((_DWORD *)this + 3) - time_ticks) * 0.001; +return (double)(*((DWORD *)this + 3) - time_ticks) * 0.001; } // 1024F84: using guessed type int time_ticks; @@ -32,7 +32,7 @@ return (double)(*((_DWORD *)this + 3) - time_ticks) * 0.001; void __thiscall TTextBoxMessage::Refresh(TTextBoxMessage *this, float a2) { *((float *)this + 2) = a2; -*((_DWORD *)this + 3) = time_ticks - (unsigned __int64)(signed __int64)(a2 * -1000.0); +*((DWORD *)this + 3) = time_ticks - (unsigned __int64)(signed __int64)(a2 * -1000.0); } // 1024F84: using guessed type int time_ticks; @@ -42,8 +42,8 @@ TTextBoxMessage *__thiscall TTextBoxMessage::destroy(TTextBoxMessage *this, char TTextBoxMessage *v2; // esi v2 = this; -if ( *((_DWORD *)this + 1) ) -memoryfree(*((_DWORD *)this + 1)); +if ( *((DWORD *)this + 1) ) +memoryfree(*((DWORD *)this + 1)); if ( a2 & 1 ) operator delete((void *)v2); return v2; diff --git a/Classes/TTimer/TTimer.cpp b/Classes/TTimer/TTimer.cpp index 5e25935..db1cec8 100644 --- a/Classes/TTimer/TTimer.cpp +++ b/Classes/TTimer/TTimer.cpp @@ -1,9 +1,9 @@ #include "../../pinball.h" //----- (0101798C) -------------------------------------------------------- -void __stdcall TTimer::TimerExpired(int a1, struct TPinballComponent *a2) +void TTimer::TimerExpired(int a1, struct TPinballComponent *a2) { -*(_DWORD *)((char *)a2 + 42) = 0; +*(DWORD *)((char *)a2 + 42) = 0; control_handler(60, a2); } @@ -15,16 +15,16 @@ TTimer *v3; // esi v3 = this; if ( a2 == 59 ) { -if ( *(_DWORD *)((char *)this + 42) ) -timer_kill(*(_DWORD *)((char *)this + 42)); -*(_DWORD *)((char *)v3 + 42) = timer_set(a3, (int)v3, (int)TTimer::TimerExpired); +if ( *(DWORD *)((char *)this + 42) ) +timer_kill(*(DWORD *)((char *)this + 42)); +*(DWORD *)((char *)v3 + 42) = timer_set(a3, (int)v3, (int)TTimer::TimerExpired); } else if ( a2 == 1011 || a2 == 1022 || a2 == 1024 ) { -if ( *(_DWORD *)((char *)this + 42) ) +if ( *(DWORD *)((char *)this + 42) ) { -timer_kill(*(_DWORD *)((char *)this + 42)); -*(_DWORD *)((char *)v3 + 42) = 0; +timer_kill(*(DWORD *)((char *)this + 42)); +*(DWORD *)((char *)v3 + 42) = 0; } } return 0; @@ -37,8 +37,8 @@ TTimer *v3; // esi v3 = this; TPinballComponent::TPinballComponent(this, a2, a3, 1); -*(_DWORD *)((char *)v3 + 42) = 0; -*(_DWORD *)v3 = &TTimer::vftable; +*(DWORD *)((char *)v3 + 42) = 0; +*(DWORD *)v3 = &TTimer::vftable; return v3; } // 10027BC: using guessed type void *TTimer::vftable; diff --git a/Classes/TTimer/TTimer.h b/Classes/TTimer/TTimer.h index 9012b87..6614ae0 100644 --- a/Classes/TTimer/TTimer.h +++ b/Classes/TTimer/TTimer.h @@ -10,7 +10,7 @@ /* 129 */ struct TTimer; -void __stdcall TTimer::TimerExpired(int, struct TPinballComponent*); // idb +void TTimer::TimerExpired(int, struct TPinballComponent*); // idb int __thiscall TTimer::Message(TTimer* this, int, float); // idb TTimer* __thiscall TTimer::TTimer(TTimer* this, struct TPinballTable* a2, int a3); diff --git a/Classes/TTripwire/TTripwire.cpp b/Classes/TTripwire/TTripwire.cpp index aac35a4..b8be05d 100644 --- a/Classes/TTripwire/TTripwire.cpp +++ b/Classes/TTripwire/TTripwire.cpp @@ -9,12 +9,12 @@ double v7; // st7 v6 = this; *(float *)((char *)a2 + 42) = *(float *)a3; v7 = *(float *)((char *)a2 + 70); -*(_DWORD *)((char *)a2 + 46) = *((_DWORD *)a3 + 1); +*(DWORD *)((char *)a2 + 46) = *((DWORD *)a3 + 1); *(float *)((char *)a2 + 70) = v7 - a5; TBall::not_again(a2, a6); -if ( !*(_DWORD *)(*(_DWORD *)((char *)v6 + 30) + 370) ) +if ( !*(DWORD *)(*(DWORD *)((char *)v6 + 30) + 370) ) { -loader_play_sound(*(_DWORD *)((char *)v6 + 70)); +loader_play_sound(*(DWORD *)((char *)v6 + 70)); control_handler(63, v6); } } @@ -26,7 +26,7 @@ TTripwire *v3; // esi v3 = this; TRollover::TRollover(this, a2, a3, 1); -*(_DWORD *)v3 = &TTripwire::vftable; +*(DWORD *)v3 = &TTripwire::vftable; return v3; } // 100264C: using guessed type void *TTripwire::vftable; diff --git a/Classes/TWall/TWall.cpp b/Classes/TWall/TWall.cpp index 076baeb..53dcb7a 100644 --- a/Classes/TWall/TWall.cpp +++ b/Classes/TWall/TWall.cpp @@ -1,11 +1,11 @@ #include "TWall.h" //----- (01015ACE) -------------------------------------------------------- -void __stdcall TWall::TimerExpired(int a1, void *a2) +void TWall::TimerExpired(int a1, void *a2) { -render_sprite_set_bitmap(*(_DWORD **)((char *)a2 + 26), 0); -*(_DWORD *)((char *)a2 + 78) = 0; -*(_DWORD *)((char *)a2 + 6) = 0; +render_sprite_set_bitmap(*(DWORD **)((char *)a2 + 26), 0); +*(DWORD *)((char *)a2 + 78) = 0; +*(DWORD *)((char *)a2 + 6) = 0; } //----- (01015AF3) -------------------------------------------------------- @@ -14,10 +14,10 @@ int __thiscall TWall::Message(TWall *this, int a2, float a3) TWall *v3; // esi v3 = this; -if ( a2 == 1024 && *(_DWORD *)((char *)this + 78) ) +if ( a2 == 1024 && *(DWORD *)((char *)this + 78) ) { -timer_kill(*(_DWORD *)((char *)this + 78)); -TWall::TimerExpired(*(_DWORD *)((char *)v3 + 78), (void *)v3); +timer_kill(*(DWORD *)((char *)this + 78)); +TWall::TimerExpired(*(DWORD *)((char *)v3 + 78), (void *)v3); } return 0; } @@ -30,7 +30,7 @@ int result; // eax if ( a2 >= 1 ) result = 0; else -result = *(_DWORD *)((char *)this + 4 * a2 + 86); +result = *(DWORD *)((char *)this + 4 * a2 + 86); return result; } @@ -38,7 +38,7 @@ return result; void __thiscall TWall::put_scoring(TWall *this, int a2, int a3) { if ( a2 < 1 ) -*(_DWORD *)((char *)this + 4 * a2 + 86) = a3; +*(DWORD *)((char *)this + 4 * a2 + 86) = a3; } //----- (01017FDE) -------------------------------------------------------- @@ -49,10 +49,10 @@ TWall *v6; // esi v6 = this; if ( TCollisionComponent::DefaultCollision(this, a2, a3, a4) ) { -if ( *(_DWORD *)((char *)v6 + 82) ) +if ( *(DWORD *)((char *)v6 + 82) ) { -render_sprite_set_bitmap(*(_DWORD **)((char *)v6 + 26), *(_DWORD *)((char *)v6 + 82)); -*(_DWORD *)((char *)v6 + 78) = timer_set(0.1, (int)v6, (int)TWall::TimerExpired); +render_sprite_set_bitmap(*(DWORD **)((char *)v6 + 26), *(DWORD *)((char *)v6 + 82)); +*(DWORD *)((char *)v6 + 78) = timer_set(0.1, (int)v6, (int)TWall::TimerExpired); } control_handler(63, v6); } @@ -62,19 +62,19 @@ control_handler(63, v6); TWall *__thiscall TWall::TWall(TWall *this, struct TPinballTable *a2, int a3) { TWall *v3; // esi -_DWORD *v4; // eax +DWORD *v4; // eax int v5; // eax v3 = this; TCollisionComponent::TCollisionComponent(this, a2, a3, 1); -v4 = *(_DWORD **)((char *)v3 + 26); -*(_DWORD *)v3 = &TWall::vftable; +v4 = *(DWORD **)((char *)v3 + 26); +*(DWORD *)v3 = &TWall::vftable; if ( v4 ) render_sprite_set_bitmap(v4, 0); -v5 = *(_DWORD *)((char *)v3 + 34); +v5 = *(DWORD *)((char *)v3 + 34); if ( v5 ) -*(_DWORD *)((char *)v3 + 82) = *(_DWORD *)(*(_DWORD *)(v5 + 4) + 8); -*(_DWORD *)((char *)v3 + 78) = 0; +*(DWORD *)((char *)v3 + 82) = *(DWORD *)(*(DWORD *)(v5 + 4) + 8); +*(DWORD *)((char *)v3 + 78) = 0; return v3; } // 1002508: using guessed type void *TWall::vftable; diff --git a/Classes/TWall/TWall.h b/Classes/TWall/TWall.h index 72eb7a7..a54659e 100644 --- a/Classes/TWall/TWall.h +++ b/Classes/TWall/TWall.h @@ -10,7 +10,7 @@ /* 102 */ struct TWall; -void __stdcall TWall::TimerExpired(int, void*); // idb +void TWall::TimerExpired(int, void*); // idb int __thiscall TWall::Message(TWall* this, int, float); // idb int __thiscall TWall::get_scoring(TWall* this, int); // idb void __thiscall TWall::put_scoring(TWall* this, int, int); // idb diff --git a/Classes/TZmapList/TZmapList.cpp b/Classes/TZmapList/TZmapList.cpp index 46d672b..e78f9b9 100644 --- a/Classes/TZmapList/TZmapList.cpp +++ b/Classes/TZmapList/TZmapList.cpp @@ -15,7 +15,7 @@ TZmapList *__thiscall TZmapList::destroy(TZmapList *this, char a2) TZmapList *v2; // esi v2 = this; -objlist_destroy(*((_DWORD *)this + 1)); +objlist_destroy(*((DWORD *)this + 1)); if ( a2 & 1 ) operator delete((void *)v2); return v2; diff --git a/Classes/TlightGroup/TLightGroup.cpp b/Classes/TlightGroup/TLightGroup.cpp index 4b0cda7..25d332d 100644 --- a/Classes/TlightGroup/TLightGroup.cpp +++ b/Classes/TlightGroup/TLightGroup.cpp @@ -10,7 +10,7 @@ TZmapList *__thiscall TLightGroup::~TLightGroup(TLightGroup *this) TLightGroup *v1; // esi v1 = this; - objlist_destroy(*(_DWORD *)((char *)this + 46)); + objlist_destroy(*(DWORD *)((char *)this + 46)); return TPinballComponent::~TPinballComponent(v1); } @@ -22,31 +22,31 @@ void __thiscall TLightGroup::Reset(TLightGroup *this) int v3; // eax v1 = this; - if ( *(_DWORD *)((char *)this + 70) ) - timer_kill(*(_DWORD *)((char *)this + 70)); - v2 = *(_DWORD *)((char *)v1 + 66); - *(_DWORD *)((char *)v1 + 70) = 0; + if ( *(DWORD *)((char *)this + 70) ) + timer_kill(*(DWORD *)((char *)this + 70)); + v2 = *(DWORD *)((char *)v1 + 66); + *(DWORD *)((char *)v1 + 70) = 0; if ( v2 ) timer_kill(v2); - v3 = *(_DWORD *)((char *)v1 + 54); - *(_DWORD *)((char *)v1 + 66) = 0; - *(_DWORD *)((char *)v1 + 58) = 0; - *(_DWORD *)((char *)v1 + 62) = 0; - *(_DWORD *)((char *)v1 + 50) = v3; + v3 = *(DWORD *)((char *)v1 + 54); + *(DWORD *)((char *)v1 + 66) = 0; + *(DWORD *)((char *)v1 + 58) = 0; + *(DWORD *)((char *)v1 + 62) = 0; + *(DWORD *)((char *)v1 + 50) = v3; } //----- (0100A027) -------------------------------------------------------- -void __stdcall TLightGroup::TimerExpired(int a1, void *a2) +void TLightGroup::TimerExpired(int a1, void *a2) { double v2; // st7 - void (__stdcall **v3)(_DWORD, _DWORD); // eax + void (**v3)(DWORD, DWORD); // eax float v4; // ST04_4 v2 = *(float *)((char *)a2 + 50); - v3 = *(void (__stdcall ***)(_DWORD, _DWORD))a2; - *(_DWORD *)((char *)a2 + 70) = 0; + v3 = *(void (***)(DWORD, DWORD))a2; + *(DWORD *)((char *)a2 + 70) = 0; v4 = v2; - (*v3)(*(_DWORD *)((char *)a2 + 58), LODWORD(v4)); + (*v3)(*(DWORD *)((char *)a2 + 58), LODWORD(v4)); } //----- (0100A04A) -------------------------------------------------------- @@ -55,23 +55,23 @@ void __thiscall TLightGroup::reschedule_animation(TLightGroup *this, float a2) TLightGroup *v2; // esi v2 = this; -if ( *(_DWORD *)((char *)this + 70) ) -timer_kill(*(_DWORD *)((char *)this + 70)); -*(_DWORD *)((char *)v2 + 70) = 0; +if ( *(DWORD *)((char *)this + 70) ) +timer_kill(*(DWORD *)((char *)this + 70)); +*(DWORD *)((char *)v2 + 70) = 0; if ( a2 > 0.0 ) { *(float *)((char *)v2 + 50) = a2; LABEL_7: -*(_DWORD *)((char *)v2 + 70) = timer_set(*(float *)((char *)v2 + 50), (int)v2, (int)TLightGroup::TimerExpired); +*(DWORD *)((char *)v2 + 70) = timer_set(*(float *)((char *)v2 + 50), (int)v2, (int)TLightGroup::TimerExpired); return; } if ( a2 < 0.0 ) { -*(_DWORD *)((char *)v2 + 50) = *(_DWORD *)((char *)v2 + 54); +*(DWORD *)((char *)v2 + 50) = *(DWORD *)((char *)v2 + 54); goto LABEL_7; } -*(_DWORD *)((char *)v2 + 58) = 0; -*(_DWORD *)((char *)v2 + 62) = 0; +*(DWORD *)((char *)v2 + 58) = 0; +*(DWORD *)((char *)v2 + 62) = 0; } //----- (0100A0B4) -------------------------------------------------------- @@ -82,13 +82,13 @@ int __thiscall TLightGroup::next_light_up(TLightGroup *this) int result; // eax int v4; // ecx - v1 = *(_DWORD *)((char *)this + 46); - v2 = *(_DWORD *)(v1 + 4); + v1 = *(DWORD *)((char *)this + 46); + v2 = *(DWORD *)(v1 + 4); result = 0; if ( v2 <= 0 ) return -1; v4 = v1 + 8; - while ( *(_DWORD *)(*(_DWORD *)v4 + 78) ) + while ( *(DWORD *)(*(DWORD *)v4 + 78) ) { ++result; v4 += 4; @@ -105,12 +105,12 @@ int __thiscall TLightGroup::next_light_down(TLightGroup *this) int result; // eax int v3; // ecx - v1 = *(_DWORD *)((char *)this + 46); - result = *(_DWORD *)(v1 + 4) - 1; + v1 = *(DWORD *)((char *)this + 46); + result = *(DWORD *)(v1 + 4) - 1; if ( result < 0 ) return -1; v3 = v1 + 4 * result + 8; - while ( !*(_DWORD *)(*(_DWORD *)v3 + 78) ) + while ( !*(DWORD *)(*(DWORD *)v3 + 78) ) { --result; v3 -= 4; @@ -128,21 +128,21 @@ void __thiscall TLightGroup::start_animation(TLightGroup *this) int v3; // esi int v4; // ebx int v5; // ecx - void (__stdcall **v6)(signed int, float); // eax + void (**v6)(signed int, float); // eax float v7; // [esp+0h] [ebp-10h] v1 = this; - v2 = *(_DWORD *)(*(_DWORD *)((char *)this + 46) + 4) - 1; + v2 = *(DWORD *)(*(DWORD *)((char *)this + 46) + 4) - 1; if ( v2 >= 0 ) { v3 = 4 * v2 + 8; - v4 = *(_DWORD *)(*(_DWORD *)((char *)this + 46) + 4); + v4 = *(DWORD *)(*(DWORD *)((char *)this + 46) + 4); do { - v5 = *(_DWORD *)(v3 + *(_DWORD *)((char *)v1 + 46)); - v6 = *(void (__stdcall ***)(signed int, float))v5; + v5 = *(DWORD *)(v3 + *(DWORD *)((char *)v1 + 46)); + v6 = *(void (***)(signed int, float))v5; v7 = 0.0; - if ( *(_DWORD *)(v5 + 78) ) + if ( *(DWORD *)(v5 + 78) ) (*v6)(9, COERCE_FLOAT(LODWORD(v7))); else (*v6)(8, COERCE_FLOAT(LODWORD(v7))); @@ -154,9 +154,9 @@ void __thiscall TLightGroup::start_animation(TLightGroup *this) } //----- (0100A149) -------------------------------------------------------- -void __stdcall TLightGroup::NotifyTimerExpired(int a1, void *a2) +void TLightGroup::NotifyTimerExpired(int a1, void *a2) { - *(_DWORD *)((char *)a2 + 66) = 0; + *(DWORD *)((char *)a2 + 66) = 0; control_handler(61, (struct TPinballComponent *)a2); } @@ -191,20 +191,20 @@ int v27; // ecx int j; // ebx double v29; // st7 int v30; // eax -void (__stdcall ***v31)(int, _DWORD); // ecx +void (***v31)(int, DWORD); // ecx int v32; // eax int v33; // ecx signed int v34; // ebx float v35; // ST10_4 int v36; // eax int v37; // eax -void (__thiscall ***v38)(_DWORD, signed int, _DWORD); // edi -void (__thiscall **v39)(_DWORD, signed int, _DWORD); // ST24_4 +void (__thiscall ***v38)(DWORD, signed int, DWORD); // edi +void (__thiscall **v39)(DWORD, signed int, DWORD); // ST24_4 float v40; // ST10_4 int v41; // eax int v42; // eax -void (__thiscall ***v43)(_DWORD, signed int, _DWORD); // edi -void (__thiscall **v44)(_DWORD, signed int, _DWORD); // ebx +void (__thiscall ***v43)(DWORD, signed int, DWORD); // edi +void (__thiscall **v44)(DWORD, signed int, DWORD); // ebx float v45; // ST10_4 int v46; // ecx int v47; // ebx @@ -241,7 +241,7 @@ int v77; // eax int v78; // eax int v79; // edi int v80; // ecx -_DWORD *v81; // eax +DWORD *v81; // eax char *v82; // eax char *v83; // eax int v84; // [esp+20h] [ebp-14h] @@ -275,16 +275,16 @@ if ( a2 != 1011 ) { if ( a2 == 1020 ) { -v82 = (char *)this + 16 * *(_DWORD *)(*(_DWORD *)((char *)this + 30) + 218); -*(_DWORD *)(v82 + 74) = *(_DWORD *)((char *)this + 6); -*(_DWORD *)(v82 + 78) = *(_DWORD *)((char *)this + 58); -*(_DWORD *)(v82 + 82) = *(_DWORD *)((char *)this + 50); -(*(void (**)(void))(*(_DWORD *)this + 20))(); +v82 = (char *)this + 16 * *(DWORD *)(*(DWORD *)((char *)this + 30) + 218); +*(DWORD *)(v82 + 74) = *(DWORD *)((char *)this + 6); +*(DWORD *)(v82 + 78) = *(DWORD *)((char *)this + 58); +*(DWORD *)(v82 + 82) = *(DWORD *)((char *)this + 50); +(*(void (**)(void))(*(DWORD *)this + 20))(); v83 = (char *)v4 + 16 * (unsigned __int64)(signed __int64)_floor(a3); -*(_DWORD *)((char *)v4 + 6) = *(_DWORD *)(v83 + 74); -*(_DWORD *)((char *)v4 + 58) = *(_DWORD *)(v83 + 78); -v25 = *(_DWORD *)((char *)v4 + 6) == 0; -*(_DWORD *)((char *)v4 + 50) = *(_DWORD *)(v83 + 82); +*(DWORD *)((char *)v4 + 6) = *(DWORD *)(v83 + 74); +*(DWORD *)((char *)v4 + 58) = *(DWORD *)(v83 + 78); +v25 = *(DWORD *)((char *)v4 + 6) == 0; +*(DWORD *)((char *)v4 + 50) = *(DWORD *)(v83 + 82); if ( !v25 ) TLightGroup::TimerExpired(0, (void *)v4); } @@ -292,33 +292,33 @@ else if ( a2 != 1022 ) { if ( a2 == 1024 ) { -(*(void (**)(void))(*(_DWORD *)this + 20))(); +(*(void (**)(void))(*(DWORD *)this + 20))(); v80 = 0; -if ( *(_DWORD *)(*(_DWORD *)((char *)v4 + 30) + 214) > 0 ) +if ( *(DWORD *)(*(DWORD *)((char *)v4 + 30) + 214) > 0 ) { -v81 = (_DWORD *)((char *)v4 + 78); +v81 = (DWORD *)((char *)v4 + 78); do { -*(v81 - 1) = *(_DWORD *)((char *)v4 + 6); -*v81 = *(_DWORD *)((char *)v4 + 58); -v81[1] = *(_DWORD *)((char *)v4 + 50); +*(v81 - 1) = *(DWORD *)((char *)v4 + 6); +*v81 = *(DWORD *)((char *)v4 + 58); +v81[1] = *(DWORD *)((char *)v4 + 50); ++v80; v81 += 4; } -while ( v80 < *(_DWORD *)(*(_DWORD *)((char *)v4 + 30) + 214) ); +while ( v80 < *(DWORD *)(*(DWORD *)((char *)v4 + 30) + 214) ); } } else { LABEL_145: - v78 = *(_DWORD *)(*(_DWORD *)((char *)this + 46) + 4) - 1; + v78 = *(DWORD *)(*(DWORD *)((char *)this + 46) + 4) - 1; if ( v78 >= 0 ) { v79 = 4 * v78 + 8; -v102 = *(_DWORD *)(*(_DWORD *)((char *)this + 46) + 4); +v102 = *(DWORD *)(*(DWORD *)((char *)this + 46) + 4); do { -(***(void (__stdcall ****)(int, _DWORD))(v79 + *(_DWORD *)((char *)v4 + 46)))(v3, LODWORD(a3)); +(***(void (****)(int, DWORD))(v79 + *(DWORD *)((char *)v4 + 46)))(v3, LODWORD(a3)); v79 -= 4; --v102; } @@ -333,112 +333,112 @@ else if ( a2 < 1008 ) switch ( a2 ) { case 24: -v10 = *(_DWORD *)((char *)this + 46); -v11 = *(_DWORD *)(v10 + 4); -v12 = *(_DWORD *)(v10 + 4 * v11 + 4); +v10 = *(DWORD *)((char *)this + 46); +v11 = *(DWORD *)(v10 + 4); +v12 = *(DWORD *)(v10 + 4 * v11 + 4); v90 = v11; v95 = v12; -if ( *(_DWORD *)(v12 + 82) || *(_DWORD *)(v12 + 90) || *(_DWORD *)(v12 + 86) ) +if ( *(DWORD *)(v12 + 82) || *(DWORD *)(v12 + 90) || *(DWORD *)(v12 + 86) ) return 0; -if ( *(_DWORD *)((char *)v4 + 58) ) +if ( *(DWORD *)((char *)v4 + 58) ) { TLightGroup::Message(v4, 34, 0.0); v12 = v95; v11 = v90; } -*(_DWORD *)((char *)v4 + 62) = 1; -*(_DWORD *)((char *)v4 + 58) = v3; -v89 = *(_DWORD *)(v12 + 6); -v96 = *(_DWORD *)(v12 + 78); -for ( i = v11 - 1; i > 0; *(_DWORD *)(v14 + 6) = *(_DWORD *)(v15 + 6) ) +*(DWORD *)((char *)v4 + 62) = 1; +*(DWORD *)((char *)v4 + 58) = v3; +v89 = *(DWORD *)(v12 + 6); +v96 = *(DWORD *)(v12 + 78); +for ( i = v11 - 1; i > 0; *(DWORD *)(v14 + 6) = *(DWORD *)(v15 + 6) ) { -v13 = *(_DWORD *)((char *)v4 + 46); -v14 = *(_DWORD *)(4 * i + v13 + 8); -v15 = *(_DWORD *)(4 * i + v13 + 4); -(**(void (__thiscall ***)(int, bool, _DWORD))v14)(v14, *(_DWORD *)(v15 + 78) != 0, 0.0); +v13 = *(DWORD *)((char *)v4 + 46); +v14 = *(DWORD *)(4 * i + v13 + 8); +v15 = *(DWORD *)(4 * i + v13 + 4); +(**(void (__thiscall ***)(int, bool, DWORD))v14)(v14, *(DWORD *)(v15 + 78) != 0, 0.0); --i; } -v16 = *(_DWORD *)(*(_DWORD *)((char *)v4 + 46) + 8); +v16 = *(DWORD *)(*(DWORD *)((char *)v4 + 46) + 8); goto LABEL_19; case 25: -v17 = *(_DWORD *)((char *)this + 46); -v18 = *(_DWORD *)(v17 + 4); -v19 = 4 * *(_DWORD *)(v17 + 4); -v20 = *(_DWORD *)(v19 + v17 + 4); +v17 = *(DWORD *)((char *)this + 46); +v18 = *(DWORD *)(v17 + 4); +v19 = 4 * *(DWORD *)(v17 + 4); +v20 = *(DWORD *)(v19 + v17 + 4); v92 = v18; v84 = v19; -if ( *(_DWORD *)(v20 + 82) || *(_DWORD *)(v20 + 90) || *(_DWORD *)(v20 + 86) ) +if ( *(DWORD *)(v20 + 82) || *(DWORD *)(v20 + 90) || *(DWORD *)(v20 + 86) ) return 0; -if ( *(_DWORD *)((char *)v4 + 58) ) +if ( *(DWORD *)((char *)v4 + 58) ) { TLightGroup::Message(v4, 34, 0.0); v18 = v92; } -v21 = *(_DWORD *)(*(_DWORD *)((char *)v4 + 46) + 8); -*(_DWORD *)((char *)v4 + 62) = 1; -*(_DWORD *)((char *)v4 + 58) = a2; -v89 = *(_DWORD *)(v21 + 6); -v96 = *(_DWORD *)(v21 + 78); +v21 = *(DWORD *)(*(DWORD *)((char *)v4 + 46) + 8); +*(DWORD *)((char *)v4 + 62) = 1; +*(DWORD *)((char *)v4 + 58) = a2; +v89 = *(DWORD *)(v21 + 6); +v96 = *(DWORD *)(v21 + 78); if ( v18 - 1 > 0 ) { v93 = 12; v85 = v18 - 1; do { -v22 = *(_DWORD *)((char *)v4 + 46); -v23 = *(_DWORD *)(v93 + v22 - 4); -v24 = *(_DWORD *)(v93 + v22); -(**(void (__thiscall ***)(int, bool, _DWORD))v23)(v23, *(_DWORD *)(v24 + 78) != 0, 0.0); +v22 = *(DWORD *)((char *)v4 + 46); +v23 = *(DWORD *)(v93 + v22 - 4); +v24 = *(DWORD *)(v93 + v22); +(**(void (__thiscall ***)(int, bool, DWORD))v23)(v23, *(DWORD *)(v24 + 78) != 0, 0.0); v93 += 4; v25 = v85-- == 1; -*(_DWORD *)(v23 + 6) = *(_DWORD *)(v24 + 6); +*(DWORD *)(v23 + 6) = *(DWORD *)(v24 + 6); } while ( !v25 ); } -v16 = *(_DWORD *)(v84 + *(_DWORD *)((char *)v4 + 46) + 4); +v16 = *(DWORD *)(v84 + *(DWORD *)((char *)v4 + 46) + 4); LABEL_19: - (**(void (__thiscall ***)(int, bool, _DWORD))v16)(v16, v96 != 0, 0.0); -*(_DWORD *)(v16 + 6) = v89; + (**(void (__thiscall ***)(int, bool, DWORD))v16)(v16, v96 != 0, 0.0); +*(DWORD *)(v16 + 6) = v89; goto LABEL_20; case 26: -if ( *(_DWORD *)((char *)this + 62) || !*(_DWORD *)((char *)this + 58) ) +if ( *(DWORD *)((char *)this + 62) || !*(DWORD *)((char *)this + 58) ) TLightGroup::start_animation(this); -v26 = *(_DWORD *)((char *)v4 + 46); -*(_DWORD *)((char *)v4 + 58) = a2; -*(_DWORD *)((char *)v4 + 62) = 0; -v27 = *(_DWORD *)(v26 + 4); -v97 = *(_DWORD *)(*(_DWORD *)(v26 + 4 * v27 + 4) + 90); +v26 = *(DWORD *)((char *)v4 + 46); +*(DWORD *)((char *)v4 + 58) = a2; +*(DWORD *)((char *)v4 + 62) = 0; +v27 = *(DWORD *)(v26 + 4); +v97 = *(DWORD *)(*(DWORD *)(v26 + 4 * v27 + 4) + 90); for ( j = v27 - 1; ; --j ) { v29 = 0.0; -v30 = *(_DWORD *)((char *)v4 + 46); +v30 = *(DWORD *)((char *)v4 + 46); if ( j <= 0 ) break; -(***(void (__thiscall ****)(_DWORD, int, _DWORD))(v30 + 4 * j + 8))( -*(_DWORD *)(v30 + 4 * j + 8), -(*(_DWORD *)(*(_DWORD *)(v30 + 4 * j + 4) + 90) != 0) + 8, +(***(void (__thiscall ****)(DWORD, int, DWORD))(v30 + 4 * j + 8))( +*(DWORD *)(v30 + 4 * j + 8), +(*(DWORD *)(*(DWORD *)(v30 + 4 * j + 4) + 90) != 0) + 8, 0.0); } -v31 = *(void (__stdcall ****)(int, _DWORD))(v30 + 8); +v31 = *(void (****)(int, DWORD))(v30 + 8); goto LABEL_44; case 27: -if ( *(_DWORD *)((char *)this + 62) || !*(_DWORD *)((char *)this + 58) ) +if ( *(DWORD *)((char *)this + 62) || !*(DWORD *)((char *)this + 58) ) TLightGroup::start_animation(this); -v32 = *(_DWORD *)((char *)v4 + 46); -*(_DWORD *)((char *)v4 + 58) = a2; -*(_DWORD *)((char *)v4 + 62) = 0; -v33 = *(_DWORD *)(v32 + 4); -v97 = *(_DWORD *)(*(_DWORD *)(v32 + 8) + 90); -v94 = *(_DWORD *)(v32 + 4); +v32 = *(DWORD *)((char *)v4 + 46); +*(DWORD *)((char *)v4 + 58) = a2; +*(DWORD *)((char *)v4 + 62) = 0; +v33 = *(DWORD *)(v32 + 4); +v97 = *(DWORD *)(*(DWORD *)(v32 + 8) + 90); +v94 = *(DWORD *)(v32 + 4); if ( v33 - 1 > 0 ) { v34 = 12; v86 = v33 - 1; do { -(***(void (__thiscall ****)(_DWORD, int, _DWORD))(v34 + *(_DWORD *)((char *)v4 + 46) - 4))( -*(_DWORD *)(v34 + *(_DWORD *)((char *)v4 + 46) - 4), -(*(_DWORD *)(*(_DWORD *)(v34 + *(_DWORD *)((char *)v4 + 46)) + 90) != 0) + 8, +(***(void (__thiscall ****)(DWORD, int, DWORD))(v34 + *(DWORD *)((char *)v4 + 46) - 4))( +*(DWORD *)(v34 + *(DWORD *)((char *)v4 + 46) - 4), +(*(DWORD *)(*(DWORD *)(v34 + *(DWORD *)((char *)v4 + 46)) + 90) != 0) + 8, 0.0); v34 += 4; --v86; @@ -446,18 +446,18 @@ v34 += 4; while ( v86 ); } v29 = 0.0; -v31 = *(void (__stdcall ****)(int, _DWORD))(*(_DWORD *)((char *)v4 + 46) + 4 * v94 + 4); +v31 = *(void (****)(int, DWORD))(*(DWORD *)((char *)v4 + 46) + 4 * v94 + 4); LABEL_44: v35 = v29; (**v31)((v97 != 0) + 8, LODWORD(v35)); goto LABEL_20; case 28: -if ( *(_DWORD *)((char *)this + 62) || !*(_DWORD *)((char *)this + 58) ) +if ( *(DWORD *)((char *)this + 62) || !*(DWORD *)((char *)this + 58) ) TLightGroup::start_animation(this); -v36 = *(_DWORD *)((char *)v4 + 46); -*(_DWORD *)((char *)v4 + 58) = a2; -*(_DWORD *)((char *)v4 + 62) = 0; -v37 = *(_DWORD *)(v36 + 4) - 1; +v36 = *(DWORD *)((char *)v4 + 46); +*(DWORD *)((char *)v4 + 58) = a2; +*(DWORD *)((char *)v4 + 62) = 0; +v37 = *(DWORD *)(v36 + 4) - 1; if ( v37 > 0 ) { v98 = 8; @@ -466,7 +466,7 @@ do { if ( _rand() % 100 > 70 ) { -v38 = *(void (__thiscall ****)(_DWORD, signed int, _DWORD))(v98 + *(_DWORD *)((char *)v4 + 46)); +v38 = *(void (__thiscall ****)(DWORD, signed int, DWORD))(v98 + *(DWORD *)((char *)v4 + 46)); v39 = *v38; v40 = (double)_rand() * 0.00003051850947599719 * a3 * 3.0 + 0.1; (*v39)(v38, 9, LODWORD(v40)); @@ -478,19 +478,19 @@ while ( v87 ); } goto LABEL_20; case 29: -if ( *(_DWORD *)((char *)this + 62) || !*(_DWORD *)((char *)this + 58) ) +if ( *(DWORD *)((char *)this + 62) || !*(DWORD *)((char *)this + 58) ) TLightGroup::start_animation(this); -v41 = *(_DWORD *)((char *)v4 + 46); -*(_DWORD *)((char *)v4 + 58) = a2; -*(_DWORD *)((char *)v4 + 62) = 0; -v42 = *(_DWORD *)(v41 + 4) - 1; +v41 = *(DWORD *)((char *)v4 + 46); +*(DWORD *)((char *)v4 + 58) = a2; +*(DWORD *)((char *)v4 + 62) = 0; +v42 = *(DWORD *)(v41 + 4) - 1; if ( v42 > 0 ) { v99 = 8; v88 = v42; do { -v43 = *(void (__thiscall ****)(_DWORD, signed int, _DWORD))(v99 + *(_DWORD *)((char *)v4 + 46)); +v43 = *(void (__thiscall ****)(DWORD, signed int, DWORD))(v99 + *(DWORD *)((char *)v4 + 46)); v44 = *v43; v45 = (double)(_rand() % 100 > 70); (*v44)(v43, 18, LODWORD(v45)); @@ -503,16 +503,16 @@ LABEL_20: TLightGroup::reschedule_animation(v4, a3); return 0; case 30: -v46 = *(_DWORD *)((char *)this + 46); +v46 = *(DWORD *)((char *)this + 46); v47 = 0; -v48 = *(_DWORD *)(v46 + 4) - 1; +v48 = *(DWORD *)(v46 + 4) - 1; if ( v48 < 0 ) return 0; v49 = v46 + 4 * v48 + 8; v50 = v48 + 1; do { -if ( !*(_DWORD *)(*(_DWORD *)v49 + 78) ) +if ( !*(DWORD *)(*(DWORD *)v49 + 78) ) ++v47; v49 -= 4; --v50; @@ -521,15 +521,15 @@ while ( v50 ); if ( !v47 ) return 0; v51 = _rand(); -v52 = *(_DWORD *)((char *)v4 + 46); +v52 = *(DWORD *)((char *)v4 + 46); HIDWORD(v53) = v51 % v47; -LODWORD(v53) = *(_DWORD *)(v52 + 4) - 1; +LODWORD(v53) = *(DWORD *)(v52 + 4) - 1; if ( (signed int)v53 < 0 ) goto LABEL_74; v103 = v52 + 4 * v53 + 8; while ( 1 ) { -if ( !*(_DWORD *)(*(_DWORD *)v103 + 78) ) +if ( !*(DWORD *)(*(DWORD *)v103 + 78) ) { v54 = HIDWORD(v53)--; if ( !v54 ) @@ -541,23 +541,23 @@ if ( (signed int)v53 < 0 ) goto LABEL_74; } LABEL_73: - (***(void (__fastcall ****)(_DWORD, _DWORD, signed int, _DWORD))(v52 + 4 * v53 + 8))( -*(_DWORD *)(v52 + 4 * v53 + 8), + (***(void (__fastcall ****)(DWORD, DWORD, signed int, DWORD))(v52 + 4 * v53 + 8))( +*(DWORD *)(v52 + 4 * v53 + 8), HIDWORD(v53), 1, 0.0); goto LABEL_74; case 31: -v55 = *(_DWORD *)((char *)this + 46); +v55 = *(DWORD *)((char *)this + 46); v56 = 0; -v57 = *(_DWORD *)(v55 + 4) - 1; +v57 = *(DWORD *)(v55 + 4) - 1; if ( v57 < 0 ) return 0; v58 = v55 + 4 * v57 + 8; v59 = v57 + 1; do { -if ( *(_DWORD *)(*(_DWORD *)v58 + 78) ) +if ( *(DWORD *)(*(DWORD *)v58 + 78) ) ++v56; v58 -= 4; --v59; @@ -566,9 +566,9 @@ while ( v59 ); if ( !v56 ) return 0; v60 = _rand(); -v61 = *(_DWORD *)((char *)v4 + 46); +v61 = *(DWORD *)((char *)v4 + 46); HIDWORD(v62) = v60 % v56; -LODWORD(v62) = *(_DWORD *)(v61 + 4) - 1; +LODWORD(v62) = *(DWORD *)(v61 + 4) - 1; if ( (signed int)v62 < 0 ) goto LABEL_74; v104 = v61 + 4 * v62 + 8; @@ -577,50 +577,50 @@ case 32: v64 = TLightGroup::next_light_up(this); if ( v64 < 0 ) return 0; -(***(void (__stdcall ****)(signed int, _DWORD))(*(_DWORD *)((char *)v4 + 46) + 4 * v64 + 8))(1, 0.0); +(***(void (****)(signed int, DWORD))(*(DWORD *)((char *)v4 + 46) + 4 * v64 + 8))(1, 0.0); goto LABEL_90; case 33: v66 = TLightGroup::next_light_down(this); if ( v66 < 0 ) return 0; -(***(void (__stdcall ****)(_DWORD, _DWORD))(*(_DWORD *)((char *)v4 + 46) + 4 * v66 + 8))(0, 0.0); +(***(void (****)(DWORD, DWORD))(*(DWORD *)((char *)v4 + 46) + 4 * v66 + 8))(0, 0.0); LABEL_90: -if ( *(_DWORD *)((char *)v4 + 58) ) +if ( *(DWORD *)((char *)v4 + 58) ) TLightGroup::start_animation(v4); return 1; case 34: -if ( *(_DWORD *)((char *)this + 70) ) -timer_kill(*(_DWORD *)((char *)this + 70)); -v68 = *(_DWORD *)((char *)v4 + 58); -*(_DWORD *)((char *)v4 + 70) = 0; +if ( *(DWORD *)((char *)this + 70) ) +timer_kill(*(DWORD *)((char *)this + 70)); +v68 = *(DWORD *)((char *)v4 + 58); +*(DWORD *)((char *)v4 + 70) = 0; if ( v68 == 26 || v68 == 27 || v68 == 28 ) TLightGroup::Message(v4, 14, 0.0); -*(_DWORD *)((char *)v4 + 58) = 0; -*(_DWORD *)((char *)v4 + 62) = 0; +*(DWORD *)((char *)v4 + 58) = 0; +*(DWORD *)((char *)v4 + 62) = 0; return 0; case 35: v53 = (signed __int64)_floor(a3); -v52 = *(_DWORD *)((char *)v4 + 46); -if ( (signed int)v53 < *(_DWORD *)(v52 + 4) && (signed int)v53 >= 0 ) +v52 = *(DWORD *)((char *)v4 + 46); +if ( (signed int)v53 < *(DWORD *)(v52 + 4) && (signed int)v53 >= 0 ) goto LABEL_73; return 0; case 36: v62 = (signed __int64)_floor(a3); -v61 = *(_DWORD *)((char *)v4 + 46); -if ( (signed int)v62 < *(_DWORD *)(v61 + 4) && (signed int)v62 >= 0 ) +v61 = *(DWORD *)((char *)v4 + 46); +if ( (signed int)v62 < *(DWORD *)(v61 + 4) && (signed int)v62 >= 0 ) goto LABEL_117; return 0; case 37: -v5 = *(_DWORD *)((char *)this + 46); +v5 = *(DWORD *)((char *)this + 46); result = 0; -v7 = *(_DWORD *)(v5 + 4) - 1; +v7 = *(DWORD *)(v5 + 4) - 1; if ( v7 >= 0 ) { v8 = v5 + 4 * v7 + 8; -v9 = *(_DWORD *)(v5 + 4); +v9 = *(DWORD *)(v5 + 4); do { -if ( *(_DWORD *)(*(_DWORD *)v8 + 78) ) +if ( *(DWORD *)(*(DWORD *)v8 + 78) ) ++result; v8 -= 4; --v9; @@ -629,47 +629,47 @@ while ( v9 ); } return result; case 38: -return *(_DWORD *)(*(_DWORD *)((char *)this + 46) + 4); +return *(DWORD *)(*(DWORD *)((char *)this + 46) + 4); case 39: -return *(_DWORD *)((char *)this + 58); +return *(DWORD *)((char *)this + 58); case 40: -return *(_DWORD *)((char *)this + 62); +return *(DWORD *)((char *)this + 62); case 41: v65 = TLightGroup::next_light_up(this); if ( v65 < 0 ) return 0; -if ( *(_DWORD *)((char *)v4 + 58) || *(_DWORD *)((char *)v4 + 62) ) +if ( *(DWORD *)((char *)v4 + 58) || *(DWORD *)((char *)v4 + 62) ) TLightGroup::Message(v4, 34, 0.0); -(***(void (__stdcall ****)(signed int, _DWORD))(*(_DWORD *)((char *)v4 + 46) + 4 * v65 + 8))(15, LODWORD(a3)); +(***(void (****)(signed int, DWORD))(*(DWORD *)((char *)v4 + 46) + 4 * v65 + 8))(15, LODWORD(a3)); return 1; case 42: v67 = TLightGroup::next_light_down(this); if ( v67 < 0 ) return 0; -if ( *(_DWORD *)((char *)v4 + 58) || *(_DWORD *)((char *)v4 + 62) ) +if ( *(DWORD *)((char *)v4 + 58) || *(DWORD *)((char *)v4 + 62) ) TLightGroup::Message(v4, 34, 0.0); -(***(void (__stdcall ****)(signed int, _DWORD))(*(_DWORD *)((char *)v4 + 46) + 4 * v67 + 8))(16, LODWORD(a3)); +(***(void (****)(signed int, DWORD))(*(DWORD *)((char *)v4 + 46) + 4 * v67 + 8))(16, LODWORD(a3)); return 1; case 43: -if ( *(_DWORD *)((char *)this + 66) ) -timer_kill(*(_DWORD *)((char *)this + 66)); -*(_DWORD *)((char *)v4 + 66) = 0; +if ( *(DWORD *)((char *)this + 66) ) +timer_kill(*(DWORD *)((char *)this + 66)); +*(DWORD *)((char *)v4 + 66) = 0; if ( a3 > 0.0 ) -*(_DWORD *)((char *)v4 + 66) = timer_set(a3, (int)v4, (int)TLightGroup::NotifyTimerExpired); +*(DWORD *)((char *)v4 + 66) = timer_set(a3, (int)v4, (int)TLightGroup::NotifyTimerExpired); return 0; case 44: -v69 = *(_DWORD *)(*(_DWORD *)((char *)this + 46) + 4) - 1; +v69 = *(DWORD *)(*(DWORD *)((char *)this + 46) + 4) - 1; if ( v69 >= 0 ) { v70 = 4 * v69 + 8; -v100 = *(_DWORD *)(*(_DWORD *)((char *)this + 46) + 4); +v100 = *(DWORD *)(*(DWORD *)((char *)this + 46) + 4); do { -v71 = *(_DWORD *)(v70 + *(_DWORD *)((char *)v4 + 46)); -if ( *(_DWORD *)(v71 + 78) ) +v71 = *(DWORD *)(v70 + *(DWORD *)((char *)v4 + 46)); +if ( *(DWORD *)(v71 + 78) ) { -(**(void (__stdcall ***)(_DWORD, _DWORD))v71)(0, 0.0); -(***(void (__stdcall ****)(signed int, _DWORD))(v70 + *(_DWORD *)((char *)v4 + 46)))(16, LODWORD(a3)); +(**(void (***)(DWORD, DWORD))v71)(0, 0.0); +(***(void (****)(signed int, DWORD))(v70 + *(DWORD *)((char *)v4 + 46)))(16, LODWORD(a3)); } v70 -= 4; --v100; @@ -682,7 +682,7 @@ control_handler(a2, this); v72 = (signed __int64)_floor(a3); if ( (signed int)v72 >= 0 ) { -v73 = *(_DWORD *)(*(_DWORD *)((char *)v4 + 46) + 4); +v73 = *(DWORD *)(*(DWORD *)((char *)v4 + 46) + 4); if ( (signed int)v72 <= v73 ) { v74 = v73 - 1; @@ -693,8 +693,8 @@ v101 = v74 - v72; v74 = v72; do { -(***(void (__fastcall ****)(_DWORD, _DWORD, signed int, _DWORD))(v105 + *(_DWORD *)((char *)v4 + 46)))( -*(_DWORD *)(v105 + *(_DWORD *)((char *)v4 + 46)), +(***(void (__fastcall ****)(DWORD, DWORD, signed int, DWORD))(v105 + *(DWORD *)((char *)v4 + 46)))( +*(DWORD *)(v105 + *(DWORD *)((char *)v4 + 46)), HIDWORD(v72), 20, 0.0); @@ -709,8 +709,8 @@ v75 = 4 * v74 + 8; v76 = v74 + 1; do { -(***(void (__fastcall ****)(_DWORD, _DWORD, signed int, _DWORD))(v75 + *(_DWORD *)((char *)v4 + 46)))( -*(_DWORD *)(v75 + *(_DWORD *)((char *)v4 + 46)), +(***(void (__fastcall ****)(DWORD, DWORD, signed int, DWORD))(v75 + *(DWORD *)((char *)v4 + 46)))( +*(DWORD *)(v75 + *(DWORD *)((char *)v4 + 46)), HIDWORD(v72), 19, 0.0); @@ -725,14 +725,14 @@ return 0; case 46: v77 = TLightGroup::next_light_down(this); if ( v77 >= 0 ) -(***(void (__stdcall ****)(signed int, _DWORD))(*(_DWORD *)((char *)v4 + 46) + 4 * v77 + 8))(4, 0.0); +(***(void (****)(signed int, DWORD))(*(DWORD *)((char *)v4 + 46) + 4 * v77 + 8))(4, 0.0); return 0; default: goto LABEL_145; } while ( 1 ) { -if ( *(_DWORD *)(*(_DWORD *)v104 + 78) ) +if ( *(DWORD *)(*(DWORD *)v104 + 78) ) { v63 = HIDWORD(v62)--; if ( !v63 ) @@ -744,13 +744,13 @@ if ( (signed int)v62 < 0 ) goto LABEL_74; } LABEL_117: - (***(void (__fastcall ****)(_DWORD, _DWORD, _DWORD, _DWORD))(v61 + 4 * v62 + 8))( -*(_DWORD *)(v61 + 4 * v62 + 8), + (***(void (__fastcall ****)(DWORD, DWORD, DWORD, DWORD))(v61 + 4 * v62 + 8))( +*(DWORD *)(v61 + 4 * v62 + 8), HIDWORD(v62), 0, 0.0); LABEL_74: -if ( *(_DWORD *)((char *)v4 + 58) ) +if ( *(DWORD *)((char *)v4 + 58) ) TLightGroup::start_animation(v4); } return 0; @@ -760,22 +760,22 @@ return 0; TLightGroup *__thiscall TLightGroup::TLightGroup(TLightGroup *this, struct TPinballTable *a2, int a3) { TLightGroup *v3; // esi -signed __int16 *v4; // ebx +signed int *v4; // ebx struct TPinballComponent *v5; // eax int v7; // [esp+Ch] [ebp-4h] int i; // [esp+1Ch] [ebp+Ch] v3 = this; TPinballComponent::TPinballComponent(this, a2, a3, 0); -*(_DWORD *)v3 = &TLightGroup::vftable; +*(DWORD *)v3 = &TLightGroup::vftable; objlist_class::objlist_class((TLightGroup *)((char *)v3 + 42), 4, 4); -*(_DWORD *)((char *)v3 + 70) = 0; -*(_DWORD *)((char *)v3 + 66) = 0; +*(DWORD *)((char *)v3 + 70) = 0; +*(DWORD *)((char *)v3 + 66) = 0; TLightGroup::Reset(v3); if ( a3 > 0 ) { -*(_DWORD *)((char *)v3 + 54) = *(_DWORD *)loader_query_float_attribute(a3, 0, 903); -v4 = (signed __int16 *)loader_query_iattribute(a3, 1027, &v7); +*(DWORD *)((char *)v3 + 54) = *(DWORD *)loader_query_float_attribute(a3, 0, 903); +v4 = (signed int *)loader_query_iattribute(a3, 1027, &v7); for ( i = 0; i < v7; ++v4 ) { v5 = TPinballTable::find_component(a2, *v4); diff --git a/Classes/TlightGroup/TLightGroup.h b/Classes/TlightGroup/TLightGroup.h index 344ab0f..5eb3a32 100644 --- a/Classes/TlightGroup/TLightGroup.h +++ b/Classes/TlightGroup/TLightGroup.h @@ -12,12 +12,12 @@ struct TLightGroup; TZmapList* __thiscall TLightGroup::~TLightGroup(TLightGroup* this); void __thiscall TLightGroup::Reset(TLightGroup* __hidden this); // idb -void __stdcall TLightGroup::TimerExpired(int, void*); // idb +void TLightGroup::TimerExpired(int, void*); // idb void __thiscall TLightGroup::reschedule_animation(TLightGroup* this, float); // idb int __thiscall TLightGroup::next_light_up(TLightGroup* __hidden this); // idb int __thiscall TLightGroup::next_light_down(TLightGroup* __hidden this); // idb void __thiscall TLightGroup::start_animation(TLightGroup* __hidden this); // idb -void __stdcall TLightGroup::NotifyTimerExpired(int, void*); // idb +void TLightGroup::NotifyTimerExpired(int, void*); // idb int __thiscall TLightGroup::Message(TLightGroup* this, int, float); // idb TLightGroup* __thiscall TLightGroup::TLightGroup(TLightGroup* this, struct TPinballTable* a2, int a3); TLightGroup* __thiscall TLightGroup::`vector deleting destructor`(TLightGroup *this, char a2); diff --git a/Forms/about.cpp b/Forms/about.cpp index e3933cc..b2193d8 100644 --- a/Forms/about.cpp +++ b/Forms/about.cpp @@ -5,7 +5,7 @@ #include "../pinball.h" //----- (0100789A) -------------------------------------------------------- -INT __stdcall a_dialog(HINSTANCE hInstance, HWND hWnd, int a3) +INT a_dialog(HINSTANCE hInstance, HWND hWnd, int a3) { CHAR *v3; // eax CHAR *v4; // eax diff --git a/Forms/help.cpp b/Forms/help.cpp index ab65b07..edef549 100644 --- a/Forms/help.cpp +++ b/Forms/help.cpp @@ -1,7 +1,7 @@ #include "../pinball.h" //----- (0100772D) -------------------------------------------------------- -void __stdcall help_introduction(int a1, int a2) +void help_introduction(int a1, int a2) { CHAR *v2; // ebx CHAR *v3; // eax @@ -33,7 +33,7 @@ void __stdcall help_introduction(int a1, int a2) } //----- (0101CF1A) -------------------------------------------------------- -HWND __stdcall HtmlHelpA(HWND hwndCaller, LPCSTR pszFile, UINT uCommand, DWORD_PTR dwData) +HWND HtmlHelpA(HWND hwndCaller, LPCSTR pszFile, UINT uCommand, DWORD_PTR dwData) { HMODULE v4; // ecx FARPROC v5; // eax @@ -50,20 +50,20 @@ if ( hModule || (v4 = LoadLibraryA("hhctrl.ocx"), (hModule = v4) != 0) ) LABEL_13: v5 = (FARPROC)pHtmlHelpA; if ( pHtmlHelpA ) -return (HWND)((int (__stdcall *)(HWND, LPCSTR, UINT, DWORD_PTR))v5)(hwndCaller, pszFile, uCommand, dwData); +return (HWND)((int (*)(HWND, LPCSTR, UINT, DWORD_PTR))v5)(hwndCaller, pszFile, uCommand, dwData); v5 = GetProcAddress(v4, (LPCSTR)0xE); -pHtmlHelpA = (HWND (__stdcall *)(HWND, const char *, unsigned int, unsigned int))v5; +pHtmlHelpA = (HWND (*)(HWND, const char *, unsigned int, unsigned int))v5; if ( v5 ) -return (HWND)((int (__stdcall *)(HWND, LPCSTR, UINT, DWORD_PTR))v5)(hwndCaller, pszFile, uCommand, dwData); +return (HWND)((int (*)(HWND, LPCSTR, UINT, DWORD_PTR))v5)(hwndCaller, pszFile, uCommand, dwData); } dword_1025728 = 1; return 0; } -// 1025720: using guessed type HWND (__stdcall *pHtmlHelpA)(HWND, const char *, unsigned int, unsigned int); +// 1025720: using guessed type HWND (*pHtmlHelpA)(HWND, const char *, unsigned int, unsigned int); // 1025728: using guessed type int dword_1025728; //----- (0101CEB6) -------------------------------------------------------- -int __stdcall sub_101CEB6(LPBYTE lpData) +int sub_101CEB6(LPBYTE lpData) { signed int v1; // esi DWORD cbData; // [esp+4h] [ebp-8h] diff --git a/Forms/highscore.cpp b/Forms/highscore.cpp index d84cc7e..8359a48 100644 --- a/Forms/highscore.cpp +++ b/Forms/highscore.cpp @@ -5,7 +5,7 @@ #include "../pinball.h" //----- (01004C3C) -------------------------------------------------------- -int __stdcall high_score_clear_table(int a1) +int high_score_clear_table(int a1) { int result; // eax signed int v2; // ecx @@ -14,7 +14,7 @@ int __stdcall high_score_clear_table(int a1) v2 = 5; do { - *(_DWORD *)(result + 32) = -999; + *(DWORD *)(result + 32) = -999; *(_BYTE *)result = 0; result += 36; --v2; @@ -24,15 +24,15 @@ int __stdcall high_score_clear_table(int a1) } //----- (01004C60) -------------------------------------------------------- -signed int __stdcall high_score_get_score_position(int a1, int a2) +signed int high_score_get_score_position(int a1, int a2) { signed int result; // eax - _DWORD *v3; // ecx + DWORD *v3; // ecx if ( a2 <= 0 ) return -1; result = 0; - v3 = (_DWORD *)(a1 + 32); + v3 = (DWORD *)(a1 + 32); while ( a2 <= *v3 ) { ++result; @@ -44,7 +44,7 @@ signed int __stdcall high_score_get_score_position(int a1, int a2) } //----- (01004C8D) -------------------------------------------------------- -int __stdcall high_score_place_new_score_into(int a1, int a2, LPCSTR lpString, int a4) +int high_score_place_new_score_into(int a1, int a2, LPCSTR lpString, int a4) { char *v4; // edi int v5; // eax @@ -65,7 +65,7 @@ int __stdcall high_score_place_new_score_into(int a1, int a2, LPCSTR lpString, i while ( v5 ); } v6 = a1 + 36 * a4; - *(_DWORD *)(v6 + 32) = a2; + *(DWORD *)(v6 + 32) = a2; if ( lstrlenA(lpString) >= 31 ) *((_BYTE *)lpString + 31) = 0; lstrcpyA((LPSTR)v6, lpString); @@ -75,13 +75,13 @@ int __stdcall high_score_place_new_score_into(int a1, int a2, LPCSTR lpString, i } //----- (01004CF9) -------------------------------------------------------- -char *__stdcall scramble_number_string(int Val, char *DstBuf) +char *scramble_number_string(int Val, char *DstBuf) { return __ltoa(Val, DstBuf, 10); } //----- (01004D18) -------------------------------------------------------- -signed int __stdcall high_score_read(int a1, int a2) +signed int high_score_read(int a1, int a2) { int i; // eax CHAR *dwDisposition; // [esp+10h] [ebp-30h] @@ -111,10 +111,10 @@ signed int __stdcall high_score_read(int a1, int a2) __itoa(Val, &DstBuf, 10); lstrcatA(&DstBuf, ".Score"); options_get_string((DWORD)dwDisposition, &DstBuf, lpString2, WindowName, 300); - *((_DWORD *)lpString1 + 8) = _atol(lpString2); + *((DWORD *)lpString1 + 8) = _atol(lpString2); for ( i = lstrlenA(lpString1); --i >= 0; v7 += lpString1[i] ) ; - v7 += *((_DWORD *)lpString1 + 8); + v7 += *((DWORD *)lpString1 + 8); ++Val; lpString1 += 36; } @@ -129,7 +129,7 @@ signed int __stdcall high_score_read(int a1, int a2) } //----- (01004E87) -------------------------------------------------------- -int __stdcall high_score_write(LPCSTR lpString, int a2) +int high_score_write(LPCSTR lpString, int a2) { LPCSTR v2; // ebx int i; // eax @@ -153,11 +153,11 @@ int __stdcall high_score_write(LPCSTR lpString, int a2) options_set_string(phkResult, &DstBuf, v2); __itoa(Val, &DstBuf, 10); lstrcatA(&DstBuf, ".Score"); - __ltoa(*((_DWORD *)v2 + 8), v8, 10); + __ltoa(*((DWORD *)v2 + 8), v8, 10); options_set_string(phkResult, &DstBuf, v8); for ( i = lstrlenA(v2); --i >= 0; v7 += v2[i] ) ; - v7 += *((_DWORD *)v2 + 8); + v7 += *((DWORD *)v2 + 8); ++Val; v2 += 36; } @@ -169,7 +169,7 @@ int __stdcall high_score_write(LPCSTR lpString, int a2) } //----- (01004F99) -------------------------------------------------------- -char *__stdcall score_string_format(int a1, char *a2) +char *score_string_format(int a1, char *a2) { char *result; // eax DWORD dwDisposition; // [esp+4h] [ebp-20h] @@ -236,7 +236,7 @@ char *__stdcall score_string_format(int a1, char *a2) } //----- (010050E2) -------------------------------------------------------- -void __stdcall hsdlg_show_score(HWND hDlg, LPCSTR lpString, int a3, int a4) +void hsdlg_show_score(HWND hDlg, LPCSTR lpString, int a3, int a4) { HWND v4; // eax HWND v5; // eax @@ -256,7 +256,7 @@ void __stdcall hsdlg_show_score(HWND hDlg, LPCSTR lpString, int a3, int a4) } //----- (01005159) -------------------------------------------------------- -void __stdcall show_high_scores(HWND hDlg, LPCSTR lpString) +void show_high_scores(HWND hDlg, LPCSTR lpString) { LPCSTR v2; // edi signed int v3; // ebx @@ -272,7 +272,7 @@ void __stdcall show_high_scores(HWND hDlg, LPCSTR lpString) hsdlg_show_score(hDlg, " ", high_score_dlg_score, v4); v3 = 1; } - hsdlg_show_score(hDlg, v2, *((_DWORD *)v2 + 8), v4++ + v3); + hsdlg_show_score(hDlg, v2, *((DWORD *)v2 + 8), v4++ + v3); v2 += 36; } while ( v4 < 5 ); @@ -280,7 +280,7 @@ void __stdcall show_high_scores(HWND hDlg, LPCSTR lpString) // 1028270: using guessed type int high_score_dlg_enter_name; //----- (010051B5) -------------------------------------------------------- -BOOL __stdcall HighScore(HWND hWnd, UINT a2, WPARAM a3, LPARAM a4) +BOOL HighScore(HWND hWnd, UINT a2, WPARAM a3, LPARAM a4) { CHAR *v4; // eax CHAR *v5; // eax @@ -376,7 +376,7 @@ BOOL __stdcall HighScore(HWND hWnd, UINT a2, WPARAM a3, LPARAM a4) // 1028270: using guessed type int high_score_dlg_enter_name; //----- (01005412) -------------------------------------------------------- -INT_PTR __stdcall show_high_score_dialog(const CHAR *a1) +INT_PTR show_high_score_dialog(const CHAR *a1) { high_score_dlg_enter_name = 0; high_score_dlg_score = 0; @@ -386,7 +386,7 @@ INT_PTR __stdcall show_high_score_dialog(const CHAR *a1) // 1028270: using guessed type int high_score_dlg_enter_name; //----- (01005452) -------------------------------------------------------- -INT_PTR __stdcall show_and_set_high_score_dialog(const CHAR *a1, int a2, int a3, const CHAR *a4) +INT_PTR show_and_set_high_score_dialog(const CHAR *a1, int a2, int a3, const CHAR *a4) { INT_PTR result; // eax diff --git a/Forms/options.cpp b/Forms/options.cpp index a3f084f..82afb01 100644 --- a/Forms/options.cpp +++ b/Forms/options.cpp @@ -5,7 +5,7 @@ #include "pinball.h" //----- (010034B6) -------------------------------------------------------- -CHAR *__stdcall options_path_init(LPCSTR lpString) +CHAR *options_path_init(LPCSTR lpString) { int v1; // eax CHAR *result; // eax @@ -19,7 +19,7 @@ CHAR *__stdcall options_path_init(LPCSTR lpString) } //----- (010034E7) -------------------------------------------------------- -void __stdcall options_path_uninit() +void options_path_uninit() { if ( lpString2 ) memoryfree((int)lpString2); @@ -27,7 +27,7 @@ void __stdcall options_path_uninit() } //----- (01003503) -------------------------------------------------------- -LPCSTR __stdcall options_path(LPCSTR lpString2) +LPCSTR options_path(LPCSTR lpString2) { CHAR *v1; // eax @@ -49,7 +49,7 @@ LPCSTR __stdcall options_path(LPCSTR lpString2) } //----- (0100356C) -------------------------------------------------------- -void __stdcall options_path_free() +void options_path_free() { if ( lpString1 ) memoryfree((int)lpString1); @@ -57,7 +57,7 @@ void __stdcall options_path_free() } //----- (01003588) -------------------------------------------------------- -HKEY __stdcall options_get_int(DWORD cbData, LPCSTR lpValueName, HKEY phkResult) +HKEY options_get_int(DWORD cbData, LPCSTR lpValueName, HKEY phkResult) { HKEY result; // eax const CHAR *v4; // eax @@ -65,7 +65,7 @@ HKEY __stdcall options_get_int(DWORD cbData, LPCSTR lpValueName, HKEY phkResult) BYTE Data[4]; // [esp+8h] [ebp-4h] result = phkResult; - *(_DWORD *)Data = phkResult; + *(DWORD *)Data = phkResult; if ( lpString2 ) { v4 = options_path((LPCSTR)cbData); @@ -82,7 +82,7 @@ HKEY __stdcall options_get_int(DWORD cbData, LPCSTR lpValueName, HKEY phkResult) } //----- (01003601) -------------------------------------------------------- -void __stdcall options_get_string(DWORD dwDisposition, LPCSTR lpValueName, LPSTR lpString1, LPCSTR lpString2, int iMaxLength) +void options_get_string(DWORD dwDisposition, LPCSTR lpValueName, LPSTR lpString1, LPCSTR lpString2, int iMaxLength) { const CHAR *v5; // edi const CHAR *v6; // eax @@ -103,7 +103,7 @@ void __stdcall options_get_string(DWORD dwDisposition, LPCSTR lpValueName, LPSTR } //----- (0100367C) -------------------------------------------------------- -void __stdcall options_set_int(HKEY phkResult, LPCSTR lpValueName, BYTE Data) +void options_set_int(HKEY phkResult, LPCSTR lpValueName, BYTE Data) { const CHAR *v3; // eax DWORD dwDisposition; // [esp+4h] [ebp-4h] @@ -121,7 +121,7 @@ void __stdcall options_set_int(HKEY phkResult, LPCSTR lpValueName, BYTE Data) } //----- (010036E3) -------------------------------------------------------- -void __stdcall options_set_string(HKEY phkResult, LPCSTR lpValueName, LPCSTR lpString) +void options_set_string(HKEY phkResult, LPCSTR lpValueName, LPCSTR lpString) { const CHAR *v3; // eax int v4; // eax @@ -141,7 +141,7 @@ void __stdcall options_set_string(HKEY phkResult, LPCSTR lpValueName, LPCSTR lpS } //----- (010055F3) -------------------------------------------------------- -void __stdcall options_uninit() +void options_uninit() { options_set_int(0, "Sounds", (BYTE)options); options_set_int(0, "Music", (BYTE)phkResult); @@ -156,7 +156,7 @@ void __stdcall options_uninit() } //----- (010056A9) -------------------------------------------------------- -HMENU __stdcall options_menu_set(UINT uIDEnableItem, int a2) +HMENU options_menu_set(UINT uIDEnableItem, int a2) { HMENU result; // eax @@ -167,7 +167,7 @@ HMENU __stdcall options_menu_set(UINT uIDEnableItem, int a2) } //----- (010056D3) -------------------------------------------------------- -HMENU __stdcall options_menu_check(UINT uIDCheckItem, int a2) +HMENU options_menu_check(UINT uIDCheckItem, int a2) { HMENU result; // eax @@ -178,7 +178,7 @@ HMENU __stdcall options_menu_check(UINT uIDCheckItem, int a2) } //----- (010056FF) -------------------------------------------------------- -HMENU __stdcall options_toggle(UINT uIDCheckItem) +HMENU options_toggle(UINT uIDCheckItem) { HMENU result; // eax int v2; // ST08_4 @@ -222,18 +222,18 @@ HMENU __stdcall options_toggle(UINT uIDCheckItem) } //----- (0100580C) -------------------------------------------------------- -unsigned int __stdcall get_vk_key_name(__int16 a1, LPSTR lpString) +unsigned int get_vk_key_name(int a1, LPSTR lpString) { LONG v2; // eax - v2 = MapVirtualKeyA((unsigned __int16)a1, 0) << 16; - if ( (unsigned __int16)a1 >= 0x21u && (unsigned __int16)a1 <= 0x2Eu ) + v2 = MapVirtualKeyA((unsigned int)a1, 0) << 16; + if ( (unsigned int)a1 >= 0x21u && (unsigned int)a1 <= 0x2Eu ) v2 |= 0x1000000u; return GetKeyNameTextA(v2, lpString, 19) != 0 ? (unsigned int)lpString : 0; } //----- (01005850) -------------------------------------------------------- -BOOL __stdcall KeyMapDlgProc(HWND a1, UINT a2, WPARAM a3, LPARAM a4) +BOOL KeyMapDlgProc(HWND a1, UINT a2, WPARAM a3, LPARAM a4) { unsigned int v5; // eax LRESULT v6; // eax @@ -247,21 +247,21 @@ BOOL __stdcall KeyMapDlgProc(HWND a1, UINT a2, WPARAM a3, LPARAM a4) LRESULT v14; // eax unsigned int v15; // eax LRESULT v16; // eax - unsigned __int16 v17; // ax - unsigned __int16 v18; // ax - unsigned __int16 v19; // ax - unsigned __int16 v20; // ax - unsigned __int16 v21; // ax - unsigned __int16 v22; // ax + unsigned int v17; // ax + unsigned int v18; // ax + unsigned int v19; // ax + unsigned int v20; // ax + unsigned int v21; // ax + unsigned int v22; // ax HKEY v23; // ebx - __int16 *v24; // edi + int *v24; // edi HKEY *v25; // esi CHAR *v26; // eax CHAR *v27; // eax - __int16 v28; // cx - __int16 v29; // dx + int v28; // cx + int v29; // dx INT_PTR v30; // eax - __int16 v31; // [esp+Ch] [ebp-B0h] + int v31; // [esp+Ch] [ebp-B0h] HKEY v32; // [esp+10h] [ebp-ACh] HKEY v33; // [esp+14h] [ebp-A8h] HKEY v34; // [esp+18h] [ebp-A4h] @@ -270,7 +270,7 @@ BOOL __stdcall KeyMapDlgProc(HWND a1, UINT a2, WPARAM a3, LPARAM a4) HKEY v37; // [esp+24h] [ebp-98h] INT_PTR nResult; // [esp+28h] [ebp-94h] WPARAM v39; // [esp+2Ch] [ebp-90h] - __int16 *i; // [esp+30h] [ebp-8Ch] + int *i; // [esp+30h] [ebp-8Ch] LPARAM v41; // [esp+34h] [ebp-88h] WPARAM wParam; // [esp+38h] [ebp-84h] HWND hDlg; // [esp+3Ch] [ebp-80h] @@ -300,54 +300,54 @@ BOOL __stdcall KeyMapDlgProc(HWND a1, UINT a2, WPARAM a3, LPARAM a4) if ( v29 ) { wParam = 128; - nResult = (unsigned __int16)v30; + nResult = (unsigned int)v30; do { - if ( nResult == MapVirtualKeyA((unsigned __int16)wParam, 2u) ) + if ( nResult == MapVirtualKeyA((unsigned int)wParam, 2u) ) break; ++wParam; } - while ( (unsigned __int16)wParam < 0x100u ); + while ( (unsigned int)wParam < 0x100u ); LOWORD(v30) = wParam; - if ( (_WORD)wParam != 256 ) + if ( (WORD)wParam != 256 ) { - *(_WORD *)lParam = (unsigned __int8)v39; + *(WORD *)lParam = (unsigned __int8)v39; v39 = wParam; nResult = wParam; LABEL_32: - v41 = (unsigned __int16)v30; + v41 = (unsigned int)v30; while ( 1 ) { if ( v31 || get_vk_key_name(v30, lParam) ) { - wParam = (unsigned __int16)SendDlgItemMessageA(hDlg, 401, 0x14Au, 0xFFFFFFFF, (LPARAM)lParam); + wParam = (unsigned int)SendDlgItemMessageA(hDlg, 401, 0x14Au, 0xFFFFFFFF, (LPARAM)lParam); SendDlgItemMessageA(hDlg, 401, 0x151u, wParam, v41); if ( (HKEY)v41 == dword_1028238 ) SendDlgItemMessageA(hDlg, 401, 0x14Eu, wParam, 0); - wParam = (unsigned __int16)SendDlgItemMessageA(hDlg, 402, 0x14Au, 0xFFFFFFFF, (LPARAM)lParam); + wParam = (unsigned int)SendDlgItemMessageA(hDlg, 402, 0x14Au, 0xFFFFFFFF, (LPARAM)lParam); SendDlgItemMessageA(hDlg, 402, 0x151u, wParam, v41); if ( (HKEY)v41 == dword_102823C ) SendDlgItemMessageA(hDlg, 402, 0x14Eu, wParam, 0); - wParam = (unsigned __int16)SendDlgItemMessageA(hDlg, 403, 0x14Au, 0xFFFFFFFF, (LPARAM)lParam); + wParam = (unsigned int)SendDlgItemMessageA(hDlg, 403, 0x14Au, 0xFFFFFFFF, (LPARAM)lParam); SendDlgItemMessageA(hDlg, 403, 0x151u, wParam, v41); if ( (HKEY)v41 == dword_1028240 ) SendDlgItemMessageA(hDlg, 403, 0x14Eu, wParam, 0); - wParam = (unsigned __int16)SendDlgItemMessageA(hDlg, 404, 0x14Au, 0xFFFFFFFF, (LPARAM)lParam); + wParam = (unsigned int)SendDlgItemMessageA(hDlg, 404, 0x14Au, 0xFFFFFFFF, (LPARAM)lParam); SendDlgItemMessageA(hDlg, 404, 0x151u, wParam, v41); if ( (HKEY)v41 == dword_1028244 ) SendDlgItemMessageA(hDlg, 404, 0x14Eu, wParam, 0); - wParam = (unsigned __int16)SendDlgItemMessageA(hDlg, 405, 0x14Au, 0xFFFFFFFF, (LPARAM)lParam); + wParam = (unsigned int)SendDlgItemMessageA(hDlg, 405, 0x14Au, 0xFFFFFFFF, (LPARAM)lParam); SendDlgItemMessageA(hDlg, 405, 0x151u, wParam, v41); if ( (HKEY)v41 == dword_1028248 ) SendDlgItemMessageA(hDlg, 405, 0x14Eu, wParam, 0); - wParam = (unsigned __int16)SendDlgItemMessageA(hDlg, 406, 0x14Au, 0xFFFFFFFF, (LPARAM)lParam); + wParam = (unsigned int)SendDlgItemMessageA(hDlg, 406, 0x14Au, 0xFFFFFFFF, (LPARAM)lParam); SendDlgItemMessageA(hDlg, 406, 0x151u, wParam, v41); if ( (HKEY)v41 == dword_102824C ) SendDlgItemMessageA(hDlg, 406, 0x14Eu, wParam, 0); } ++v39; ++v41; - if ( (unsigned __int16)v39 > (unsigned __int16)nResult ) + if ( (unsigned int)v39 > (unsigned int)nResult ) break; LOWORD(v30) = v39; } @@ -365,7 +365,7 @@ BOOL __stdcall KeyMapDlgProc(HWND a1, UINT a2, WPARAM a3, LPARAM a4) ++i; LOWORD(nResult) = *i; } - if ( (unsigned __int16)v30 <= (unsigned __int16)nResult ) + if ( (unsigned int)v30 <= (unsigned int)nResult ) goto LABEL_32; } LABEL_49: @@ -376,8 +376,8 @@ BOOL __stdcall KeyMapDlgProc(HWND a1, UINT a2, WPARAM a3, LPARAM a4) } if ( a2 != 273 ) return 0; - nResult = (unsigned __int16)a3; - switch ( (unsigned __int16)a3 ) + nResult = (unsigned int)a3; + switch ( (unsigned int)a3 ) { case 1u: v39 = 0; @@ -394,15 +394,15 @@ BOOL __stdcall KeyMapDlgProc(HWND a1, UINT a2, WPARAM a3, LPARAM a4) v22 = SendDlgItemMessageA(hDlg, 406, 0x147u, 0, 0); v23 = (HKEY)SendDlgItemMessageA(hDlg, 406, 0x150u, v22, 0); v37 = v23; - v24 = (__int16 *)1; + v24 = (int *)1; v25 = &v32; while ( !v39 ) { - for ( i = v24; (signed int)i < 6; i = (__int16 *)((char *)i + 1) ) + for ( i = v24; (signed int)i < 6; i = (int *)((char *)i + 1) ) { if ( v39 ) break; - if ( *v25 == *(&v32 + (_DWORD)i) ) + if ( *v25 == *(&v32 + (DWORD)i) ) { v26 = get_rc_string(43, 0); lstrcpyA(&String1, v26); @@ -411,7 +411,7 @@ BOOL __stdcall KeyMapDlgProc(HWND a1, UINT a2, WPARAM a3, LPARAM a4) v39 = 1; } } - v24 = (__int16 *)((char *)v24 + 1); + v24 = (int *)((char *)v24 + 1); ++v25; if ( (signed int)v24 - 1 >= 5 ) { @@ -456,16 +456,16 @@ BOOL __stdcall KeyMapDlgProc(HWND a1, UINT a2, WPARAM a3, LPARAM a4) } return 1; } -// 1023508: using guessed type __int16 vk_list; +// 1023508: using guessed type int vk_list; //----- (01005F45) -------------------------------------------------------- -INT_PTR __stdcall options_keyboard() +INT_PTR options_keyboard() { return DialogBoxParamA(hinst, "KEYMAPPER", hwnd_frame, KeyMapDlgProc, 0); } //----- (01005F69) -------------------------------------------------------- -void __stdcall options_init(HMENU a1) +void options_init(HMENU a1) { CHAR *v1; // eax CHAR *v2; // edi @@ -476,12 +476,12 @@ void __stdcall options_init(HMENU a1) fullscreen_toggle = 0; dword_1028228 = (HKEY)5; application_priority = (HKEY)2; - *(_DWORD *)&dword_1028250 = 90; - *(_DWORD *)&dword_1028254 = 191; - *(_DWORD *)&dword_1028258 = 32; - *(_DWORD *)&dword_102825C = 88; - *(_DWORD *)&dword_1028260 = 190; - *(_DWORD *)&dword_1028264 = 38; + *(DWORD *)&dword_1028250 = 90; + *(DWORD *)&dword_1028254 = 191; + *(DWORD *)&dword_1028258 = 32; + *(DWORD *)&dword_102825C = 88; + *(DWORD *)&dword_1028260 = 190; + *(DWORD *)&dword_1028264 = 38; get_rc_int(159, (int *)&dword_1028250); get_rc_int(160, (int *)&dword_1028254); get_rc_int(161, (int *)&dword_1028258); @@ -532,7 +532,7 @@ void __stdcall options_init(HMENU a1) } //----- (010067F3) -------------------------------------------------------- -int __stdcall FindShiftKeys() +int FindShiftKeys() { signed int v0; // esi int v1; // eax diff --git a/Forms/winmain.cpp b/Forms/winmain.cpp index c1d4a9c..5db4600 100644 --- a/Forms/winmain.cpp +++ b/Forms/winmain.cpp @@ -1,7 +1,7 @@ #include "../pinball.h" //----- (01007918) -------------------------------------------------------- -void __usercall winmain_pause(int a1) { +void winmain_pause(int a1) { if (fullscrn_screen_mode) { if (single_step) @@ -17,7 +17,7 @@ void __usercall winmain_pause(int a1) { // 1024FF4: using guessed type int no_time_loss; //----- (01007949) -------------------------------------------------------- -void __usercall winmain_end_pause(int a1) +void winmain_end_pause(int a1) { if (single_step) { @@ -32,7 +32,7 @@ void __usercall winmain_end_pause(int a1) // 1024FF4: using guessed type int no_time_loss; //----- (01007976) -------------------------------------------------------- -HCURSOR __usercall winmain_new_game(int a1) +HCURSOR winmain_new_game(int a1) { HCURSOR v1; // eax HCURSOR v2; // edi @@ -45,7 +45,7 @@ HCURSOR __usercall winmain_new_game(int a1) } //----- (010079A9) -------------------------------------------------------- -void __stdcall __noreturn winmain_memalloc_failure() +void winmain_memalloc_failure() { CHAR* v0; // ST08_4 CHAR* v1; // eax diff --git a/control.cpp b/control.cpp index d55d741..3539ef4 100644 --- a/control.cpp +++ b/control.cpp @@ -2,9 +2,9 @@ #include "pinball.h" //----- (0100C01D) -------------------------------------------------------- -void __stdcall control_make_links(struct TPinballTable *a1) +void control_make_links(struct TPinballTable *a1) { -_DWORD *v1; // esi +DWORD *v1; // esi struct TPinballComponent *v2; // edi int v3; // ebx unsigned int v4; // esi @@ -19,15 +19,15 @@ v2 = make_component_link((struct component_tag *)*(v1 - 2)); v3 = 0; if ( v2 ) { -*(_DWORD *)((char *)v2 + 18) = v1 - 1; +*(DWORD *)((char *)v2 + 18) = v1 - 1; if ( *v1 > 0 ) { do { -(*(void (__thiscall **)(struct TPinballComponent *, int, _DWORD))(*(_DWORD *)v2 + 12))( +(*(void (__thiscall **)(struct TPinballComponent *, int, DWORD))(*(DWORD *)v2 + 12))( v2, v3, -*(_DWORD *)(v1[1] + 4 * v3)); +*(DWORD *)(v1[1] + 4 * v3)); ++v3; } while ( v3 < *v1 ); @@ -48,13 +48,13 @@ while ( v4 < 142 ); // 1024470: using guessed type char **off_1024470[142]; //----- (0100C0BE) -------------------------------------------------------- -void __stdcall table_control_handler(int a1) +void table_control_handler(int a1) { -void (__stdcall **v1)(signed int, _DWORD); // eax +void (**v1)(signed int, DWORD); // eax if ( a1 == 1011 ) { -v1 = *(void (__stdcall ***)(signed int, _DWORD))dword_1023CEC; +v1 = *(void (***)(signed int, DWORD))dword_1023CEC; dword_1025044 = 0; (*v1)(7, 0.0); } @@ -63,7 +63,7 @@ dword_1025044 = 0; // 1025044: using guessed type int dword_1025044; //----- (0100C397) -------------------------------------------------------- -void __stdcall AdvanceWormHoleDestination(int a1) +void AdvanceWormHoleDestination(int a1) { int v1; // eax int v2; // esi @@ -72,10 +72,10 @@ float v4; // ST18_4 float v5; // ST18_4 int v6; // [esp+28h] [ebp+8h] -v1 = *(_DWORD *)(dword_1023BBC + 6); +v1 = *(DWORD *)(dword_1023BBC + 6); if ( v1 != 16 && v1 != 22 && v1 != 23 ) { -v2 = *(_DWORD *)(dword_1023A24 + 6); +v2 = *(DWORD *)(dword_1023A24 + 6); if ( a1 || v2 ) { v3 = v2 + 1; @@ -86,13 +86,13 @@ v3 = 1; v6 = 1; } v4 = (double)v6; -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023A3C)(23, LODWORD(v4)); +(**(void (***)(signed int, DWORD))dword_1023A3C)(23, LODWORD(v4)); v5 = (double)(3 - v3); -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023A3C)(11, LODWORD(v5)); +(**(void (***)(signed int, DWORD))dword_1023A3C)(11, LODWORD(v5)); 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); +(**(void (***)(signed int, DWORD))dword_1023A1C)(19, 0.0); +(**(void (***)(signed int, DWORD))dword_1023A3C)(19, 0.0); } } } @@ -104,149 +104,149 @@ if ( !light_on((struct component_tag *)&lite4) ) // 1023BBC: using guessed type int dword_1023BBC; //----- (0100C44B) -------------------------------------------------------- -void __stdcall FlipperRebounderControl1(int a1, struct TPinballComponent *a2) +void FlipperRebounderControl1(int a1, struct TPinballComponent *a2) { int v2; // eax if ( a1 == 63 ) { -(**(void (__stdcall ***)(signed int, _DWORD))dword_10237D4)(9, 0.1); -v2 = (*(int (__stdcall **)(_DWORD))(*(_DWORD *)a2 + 8))(0); +(**(void (***)(signed int, DWORD))dword_10237D4)(9, 0.1); +v2 = (*(int (**)(DWORD))(*(DWORD *)a2 + 8))(0); TPinballTable::AddScore(dword_1025040, v2); } } // 10237D4: using guessed type int dword_10237D4; //----- (0100C48B) -------------------------------------------------------- -void __stdcall FlipperRebounderControl2(int a1, struct TPinballComponent *a2) +void FlipperRebounderControl2(int a1, struct TPinballComponent *a2) { int v2; // eax if ( a1 == 63 ) { -(**(void (__stdcall ***)(signed int, _DWORD))dword_10237DC)(9, 0.1); -v2 = (*(int (__stdcall **)(_DWORD))(*(_DWORD *)a2 + 8))(0); +(**(void (***)(signed int, DWORD))dword_10237DC)(9, 0.1); +v2 = (*(int (**)(DWORD))(*(DWORD *)a2 + 8))(0); TPinballTable::AddScore(dword_1025040, v2); } } // 10237DC: using guessed type int dword_10237DC; //----- (0100C4CB) -------------------------------------------------------- -void __stdcall RebounderControl(int a1, struct TPinballComponent *a2) +void RebounderControl(int a1, struct TPinballComponent *a2) { int v2; // eax if ( a1 == 63 ) { -v2 = (*(int (__stdcall **)(_DWORD))(*(_DWORD *)a2 + 8))(0); +v2 = (*(int (**)(DWORD))(*(DWORD *)a2 + 8))(0); TPinballTable::AddScore(dword_1025040, v2); } } //----- (0100C4F5) -------------------------------------------------------- -void __stdcall BumperControl(int a1, struct TPinballComponent *a2) +void BumperControl(int a1, struct TPinballComponent *a2) { int v2; // eax if ( a1 == 63 ) { -v2 = (*(int (__stdcall **)(_DWORD))(*(_DWORD *)a2 + 8))(*(_DWORD *)((char *)a2 + 78)); +v2 = (*(int (**)(DWORD))(*(DWORD *)a2 + 8))(*(DWORD *)((char *)a2 + 78)); TPinballTable::AddScore(dword_1025040, v2); } } //----- (0100C520) -------------------------------------------------------- -void __stdcall LeftKickerControl(int a1, struct TPinballComponent *a2) +void LeftKickerControl(int a1, struct TPinballComponent *a2) { if ( a1 == 60 ) -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023808)(54, 0.0); +(**(void (***)(signed int, DWORD))dword_1023808)(54, 0.0); } // 1023808: using guessed type int dword_1023808; //----- (0100C546) -------------------------------------------------------- -void __stdcall RightKickerControl(int a1, struct TPinballComponent *a2) +void RightKickerControl(int a1, struct TPinballComponent *a2) { if ( a1 == 60 ) -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023810)(54, 0.0); +(**(void (***)(signed int, DWORD))dword_1023810)(54, 0.0); } // 1023810: using guessed type int dword_1023810; //----- (0100C56C) -------------------------------------------------------- -void __stdcall LeftKickerGateControl(int a1, struct TPinballComponent *a2) +void LeftKickerGateControl(int a1, struct TPinballComponent *a2) { float vars0; // [esp+Ch] [ebp+0h] if ( a1 == 53 ) { -(**(void (__stdcall ***)(signed int, _DWORD, _DWORD))dword_1023818)(15, 5.0, LODWORD(vars0)); +(**(void (***)(signed int, DWORD, DWORD))dword_1023818)(15, 5.0, LODWORD(vars0)); vars0 = 5.0; -(**(void (__stdcall ***)(signed int))dword_1023828)(7); +(**(void (***)(signed int))dword_1023828)(7); } else if ( a1 == 54 ) { -(**(void (__stdcall ***)(signed int, _DWORD, _DWORD))dword_1023818)(20, 0.0, LODWORD(vars0)); +(**(void (***)(signed int, DWORD, DWORD))dword_1023818)(20, 0.0, LODWORD(vars0)); vars0 = 0.0; -(**(void (__stdcall ***)(signed int))dword_1023828)(20); +(**(void (***)(signed int))dword_1023828)(20); } } // 1023818: using guessed type int dword_1023818; // 1023828: using guessed type int dword_1023828; //----- (0100C5D3) -------------------------------------------------------- -void __stdcall RightKickerGateControl(int a1, struct TPinballComponent *a2) +void RightKickerGateControl(int a1, struct TPinballComponent *a2) { float vars0; // [esp+Ch] [ebp+0h] if ( a1 == 53 ) { -(**(void (__stdcall ***)(signed int, _DWORD, _DWORD))dword_1023820)(15, 5.0, LODWORD(vars0)); +(**(void (***)(signed int, DWORD, DWORD))dword_1023820)(15, 5.0, LODWORD(vars0)); vars0 = 5.0; -(**(void (__stdcall ***)(signed int))dword_1023830)(7); +(**(void (***)(signed int))dword_1023830)(7); } else if ( a1 == 54 ) { -(**(void (__stdcall ***)(signed int, _DWORD, _DWORD))dword_1023820)(20, 0.0, LODWORD(vars0)); +(**(void (***)(signed int, DWORD, DWORD))dword_1023820)(20, 0.0, LODWORD(vars0)); vars0 = 0.0; -(**(void (__stdcall ***)(signed int))dword_1023830)(20); +(**(void (***)(signed int))dword_1023830)(20); } } // 1023820: using guessed type int dword_1023820; // 1023830: using guessed type int dword_1023830; //----- (0100C63A) -------------------------------------------------------- -void __userpurge DeploymentChuteToEscapeChuteOneWayControl(int a1@, int a2@, int a3, struct TPinballComponent *a4) +void DeploymentChuteToEscapeChuteOneWayControl(int a1, int a2, int a3, struct TPinballComponent *a4) { int v4; // esi int v5; // eax int v6; // ST30_4 CHAR *v7; // eax -void (__thiscall ***v8)(_DWORD, signed int, _DWORD); // esi -void (__thiscall ***v9)(_DWORD, signed int, _DWORD); // esi +void (__thiscall ***v8)(DWORD, signed int, DWORD); // esi +void (__thiscall ***v9)(DWORD, signed int, DWORD); // esi int v10; // [esp+30h] [ebp-4Ch] char Dest; // [esp+38h] [ebp-44h] if ( a3 == 63 ) { v10 = a2; -v4 = (**(int (__stdcall ***)(signed int, _DWORD))dword_1023CE4)(37, 0.0); +v4 = (**(int (***)(signed int, DWORD))dword_1023CE4)(37, 0.0); if ( v4 ) { -(*(void (__stdcall **)(int))(*(_DWORD *)dword_1023DFC + 20))(v10); -v5 = (*(int (__thiscall **)(struct TPinballComponent *, int))(*(_DWORD *)a4 + 8))(a4, v4 - 1); +(*(void (**)(int))(*(DWORD *)dword_1023DFC + 20))(v10); +v5 = (*(int (__thiscall **)(struct TPinballComponent *, int))(*(DWORD *)a4 + 8))(a4, v4 - 1); 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 *)&lite56) ) { -v8 = (void (__thiscall ***)(_DWORD, signed int, _DWORD))dword_1023A8C; -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023A8C)(34, 0.0); +v8 = (void (__thiscall ***)(DWORD, signed int, DWORD))dword_1023A8C; +(**(void (***)(signed int, DWORD))dword_1023A8C)(34, 0.0); (**v8)(v8, 20, 0.0); -v9 = (void (__thiscall ***)(_DWORD, signed int, _DWORD))dword_1023A94; -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023A94)(34, 0.0); +v9 = (void (__thiscall ***)(DWORD, signed int, DWORD))dword_1023A94; +(**(void (***)(signed int, DWORD))dword_1023A94)(34, 0.0); (**v9)(v9, 20, 0.0); } -(**(void (__stdcall ***)(signed int))dword_1023CE4)(44); +(**(void (***)(signed int))dword_1023CE4)(44); } } } @@ -258,32 +258,32 @@ v9 = (void (__thiscall ***)(_DWORD, signed int, _DWORD))dword_1023A94; // 1023DFC: using guessed type int dword_1023DFC; //----- (0100C73E) -------------------------------------------------------- -void __stdcall DeploymentChuteToTableOneWayControl(int a1, struct TPinballComponent *a2) +void DeploymentChuteToTableOneWayControl(int a1, struct TPinballComponent *a2) { if ( a1 == 63 ) -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023CE4)(20, 0.0); +(**(void (***)(signed int, DWORD))dword_1023CE4)(20, 0.0); } // 1023CE4: using guessed type int dword_1023CE4; //----- (0100C764) -------------------------------------------------------- -void __stdcall DrainBallBlockerControl(int a1, struct TPinballComponent *a2) +void DrainBallBlockerControl(int a1, struct TPinballComponent *a2) { -void (__thiscall **v2)(struct TPinballComponent *, signed int, _DWORD); // eax +void (__thiscall **v2)(struct TPinballComponent *, signed int, DWORD); // eax double v3; // st7 float v4; // ST08_4 -void (__thiscall ***v5)(_DWORD, signed int, float); // ecx -void (__thiscall **v6)(struct TPinballComponent *, signed int, _DWORD); // eax +void (__thiscall ***v5)(DWORD, signed int, float); // ecx +void (__thiscall **v6)(struct TPinballComponent *, signed int, DWORD); // eax float v7; // ST08_4 signed int v8; // [esp+4h] [ebp-Ch] float v9; // [esp+8h] [ebp-8h] if ( a1 == 52 ) { -v6 = *(void (__thiscall ***)(struct TPinballComponent *, signed int, _DWORD))a2; +v6 = *(void (__thiscall ***)(struct TPinballComponent *, signed int, DWORD))a2; v7 = (double)*(signed int *)((char *)a2 + 78); -*(_DWORD *)((char *)a2 + 6) = 1; +*(DWORD *)((char *)a2 + 6) = 1; (*v6)(a2, 52, LODWORD(v7)); -v5 = (void (__thiscall ***)(_DWORD, signed int, float))dword_1023868; +v5 = (void (__thiscall ***)(DWORD, signed int, float))dword_1023868; v9 = (double)*(signed int *)((char *)a2 + 78); v8 = 9; } @@ -291,18 +291,18 @@ else { if ( a1 != 60 ) return; -v2 = *(void (__thiscall ***)(struct TPinballComponent *, signed int, _DWORD))a2; -if ( *(_DWORD *)((char *)a2 + 6) != 1 ) +v2 = *(void (__thiscall ***)(struct TPinballComponent *, signed int, DWORD))a2; +if ( *(DWORD *)((char *)a2 + 6) != 1 ) { -*(_DWORD *)((char *)a2 + 6) = 0; +*(DWORD *)((char *)a2 + 6) = 0; (*v2)(a2, 51, 0.0); return; } v3 = (double)*(signed int *)((char *)a2 + 82); -*(_DWORD *)((char *)a2 + 6) = 2; +*(DWORD *)((char *)a2 + 6) = 2; v4 = v3; (*v2)(a2, 59, LODWORD(v4)); -v5 = (void (__thiscall ***)(_DWORD, signed int, float))dword_1023868; +v5 = (void (__thiscall ***)(DWORD, signed int, float))dword_1023868; v9 = (double)*(signed int *)((char *)a2 + 82); v8 = 7; } @@ -311,7 +311,7 @@ v8 = 7; // 1023868: using guessed type int dword_1023868; //----- (0100C7E9) -------------------------------------------------------- -void __userpurge LaunchRampControl(int a1@, int a2, struct TPinballComponent *a3) +void LaunchRampControl(int a1, int a2, struct TPinballComponent *a3) { signed int v3; // esi int v4; // ST08_4 @@ -326,7 +326,7 @@ v3 = 0; if ( light_on((struct component_tag *)&lite54) ) { v3 = 1; -v4 = SpecialAddScore(*(_DWORD *)((char *)dword_1025040 + 302)); +v4 = SpecialAddScore(*(DWORD *)((char *)dword_1025040 + 302)); v5 = get_rc_string(10, 0); _sprintf(&Dest, v5, v4); TTextBox::Display(dword_1023E1C, a1, &Dest, 2.0); @@ -352,11 +352,11 @@ v7 = dword_1023D2C; } else { -v6 = (*(int (__thiscall **)(struct TPinballComponent *, _DWORD))(*(_DWORD *)a3 + 8))(a3, 0); +v6 = (*(int (__thiscall **)(struct TPinballComponent *, DWORD))(*(DWORD *)a3 + 8))(a3, 0); TPinballTable::AddScore(dword_1025040, v6); v7 = dword_1023D3C; } -(*(void (**)(void))(*(_DWORD *)v7 + 20))(); +(*(void (**)(void))(*(DWORD *)v7 + 20))(); } } // 1023874: using guessed type char *lite54; @@ -368,35 +368,35 @@ v7 = dword_1023D3C; // 1023D3C: using guessed type int dword_1023D3C; //----- (0100C8D7) -------------------------------------------------------- -void __stdcall LaunchRampHoleControl(int a1, struct TPinballComponent *a2) +void LaunchRampHoleControl(int a1, struct TPinballComponent *a2) { if ( a1 == 58 ) -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023878)(7, 5.0); +(**(void (***)(signed int, DWORD))dword_1023878)(7, 5.0); } // 1023878: using guessed type int dword_1023878; //----- (0100C901) -------------------------------------------------------- -void __stdcall SpaceWarpRolloverControl(int a1, struct TPinballComponent *a2) +void SpaceWarpRolloverControl(int a1, struct TPinballComponent *a2) { if ( a1 == 63 ) { -(**(void (__stdcall ***)(signed int, _DWORD))dword_10238D0)(19, 0.0); -(**(void (__stdcall ***)(signed int, _DWORD))dword_10238D8)(19, 0.0); +(**(void (***)(signed int, DWORD))dword_10238D0)(19, 0.0); +(**(void (***)(signed int, DWORD))dword_10238D8)(19, 0.0); } } // 10238D0: using guessed type int dword_10238D0; // 10238D8: using guessed type int dword_10238D8; //----- (0100C939) -------------------------------------------------------- -void __userpurge ReentryLanesRolloverControl(int a1@, int a2@, int a3@, int a4, struct TPinballComponent *a5) +void ReentryLanesRolloverControl(int a1, int a2, int a3, int a4, struct TPinballComponent *a5) { -void (__thiscall ***v5)(_DWORD, signed int, _DWORD); // esi -void (__thiscall ***v6)(_DWORD, signed int, _DWORD); // esi +void (__thiscall ***v5)(DWORD, signed int, DWORD); // esi +void (__thiscall ***v6)(DWORD, signed int, DWORD); // esi struct TPinballComponent *v7; // esi int v8; // ecx -void (__stdcall **v9)(signed int, _DWORD); // eax +void (**v9)(signed int, DWORD); // eax int v10; // ST58_4 -void (__thiscall ***v11)(_DWORD, signed int, _DWORD, int, int); // esi +void (__thiscall ***v11)(DWORD, signed int, DWORD, int, int); // esi int v12; // ebx bool v13; // zf int v14; // ebx @@ -407,14 +407,14 @@ int v17; // [esp+60h] [ebp-4h] if ( a4 == 63 ) { v17 = a3; -v5 = (void (__thiscall ***)(_DWORD, signed int, _DWORD))dword_1023A8C; +v5 = (void (__thiscall ***)(DWORD, signed int, DWORD))dword_1023A8C; if ( !light_on((struct component_tag *)&lite56) -&& ((int (__thiscall *)(_DWORD, signed int, _DWORD))**v5)(v5, 39, 0.0) ) +&& ((int (__thiscall *)(DWORD, signed int, DWORD))**v5)(v5, 39, 0.0) ) { (**v5)(v5, 34, 0.0); (**v5)(v5, 20, 0.0); -v6 = (void (__thiscall ***)(_DWORD, signed int, _DWORD))dword_1023A94; -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023A94)(34, 0.0); +v6 = (void (__thiscall ***)(DWORD, signed int, DWORD))dword_1023A94; +(**(void (***)(signed int, DWORD))dword_1023A94)(34, 0.0); (**v6)(v6, 20, 0.0); } v7 = a5; @@ -428,10 +428,10 @@ v8 = dword_1023714; if ( (struct TPinballComponent *)dword_1023734 != a5 ) v8 = dword_102371C; } -if ( !*(_DWORD *)(v8 + 82) ) +if ( !*(DWORD *)(v8 + 82) ) { -v9 = *(void (__stdcall ***)(signed int, _DWORD))v8; -if ( *(_DWORD *)(v8 + 78) ) +v9 = *(void (***)(signed int, DWORD))v8; +if ( *(DWORD *)(v8 + 78) ) { (*v9)(20, 0.0); } @@ -439,29 +439,29 @@ else { v10 = a1; (*v9)(19, 0.0); -v11 = (void (__thiscall ***)(_DWORD, signed int, _DWORD, int, int))dword_1023724; -v12 = (**(int (__thiscall ***)(int, signed int, _DWORD))dword_1023724)(dword_1023724, 37, 0.0); -v13 = v12 == (**(int (__stdcall ***)(signed int, _DWORD))dword_1023724)(38, 0.0); +v11 = (void (__thiscall ***)(DWORD, signed int, DWORD, int, int))dword_1023724; +v12 = (**(int (__thiscall ***)(int, signed int, DWORD))dword_1023724)(dword_1023724, 37, 0.0); +v13 = v12 == (**(int (***)(signed int, DWORD))dword_1023724)(38, 0.0); v14 = v10; if ( v13 ) { (**v11)(v11, 7, 5.0, a2, v17); -((void (__thiscall *)(void (__thiscall ***)(_DWORD, signed int, _DWORD, int, int), _DWORD, _DWORD))**v11)( +((void (__thiscall *)(void (__thiscall ***)(DWORD, signed int, DWORD, int, int), DWORD, DWORD))**v11)( v11, 0, 0.0); -if ( *(_DWORD *)(dword_10236E4 + 78) < 3 ) +if ( *(DWORD *)(dword_10236E4 + 78) < 3 ) { -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023704)(12, 0.0); +(**(void (***)(signed int, DWORD))dword_1023704)(12, 0.0); v15 = get_rc_string(5, 0); TTextBox::Display(dword_1023E1C, v14, v15, 2.0); } -(**(void (__cdecl ***)(signed int, _DWORD))dword_1023704)(48, 60.0); +(**(void (__cdecl ***)(signed int, DWORD))dword_1023704)(48, 60.0); } v7 = a5; } } -v16 = (*(int (__thiscall **)(struct TPinballComponent *, _DWORD))(*(_DWORD *)v7 + 8))(v7, 0); +v16 = (*(int (__thiscall **)(struct TPinballComponent *, DWORD))(*(DWORD *)v7 + 8))(v7, 0); TPinballTable::AddScore(dword_1025040, v16); } } @@ -481,26 +481,26 @@ TPinballTable::AddScore(dword_1025040, v16); // 1023A94: using guessed type int dword_1023A94; //----- (0100CABF) -------------------------------------------------------- -void __stdcall BumperGroupControl(int a1, struct TPinballComponent *a2) +void BumperGroupControl(int a1, struct TPinballComponent *a2) { if ( a1 == 61 ) { -if ( *(_DWORD *)((char *)a2 + 78) ) +if ( *(DWORD *)((char *)a2 + 78) ) { -(**(void (__thiscall ***)(struct TPinballComponent *, signed int, _DWORD))a2)(a2, 48, 60.0); -(**(void (__thiscall ***)(struct TPinballComponent *, signed int, _DWORD))a2)(a2, 13, 0.0); +(**(void (__thiscall ***)(struct TPinballComponent *, signed int, DWORD))a2)(a2, 48, 60.0); +(**(void (__thiscall ***)(struct TPinballComponent *, signed int, DWORD))a2)(a2, 13, 0.0); } } } //----- (0100CAFE) -------------------------------------------------------- -void __userpurge LaunchLanesRolloverControl(int a1@, int a2@, int a3@, int a4, struct TPinballComponent *a5) +void LaunchLanesRolloverControl(int a1, int a2, int a3, int a4, struct TPinballComponent *a5) { struct TPinballComponent *v5; // esi int v6; // ecx -void (__stdcall **v7)(signed int, _DWORD); // eax +void (**v7)(signed int, DWORD); // eax int v8; // ST30_4 -void (__thiscall ***v9)(_DWORD, signed int, _DWORD, int, int); // esi +void (__thiscall ***v9)(DWORD, signed int, DWORD, int, int); // esi int v10; // ebx bool v11; // zf int v12; // ebx @@ -522,10 +522,10 @@ v6 = dword_1023780; if ( (struct TPinballComponent *)dword_10237A0 != a5 ) v6 = dword_1023788; } -if ( !*(_DWORD *)(v6 + 82) ) +if ( !*(DWORD *)(v6 + 82) ) { -v7 = *(void (__stdcall ***)(signed int, _DWORD))v6; -if ( *(_DWORD *)(v6 + 78) ) +v7 = *(void (***)(signed int, DWORD))v6; +if ( *(DWORD *)(v6 + 78) ) { (*v7)(20, 0.0); } @@ -533,29 +533,29 @@ else { v8 = a1; (*v7)(19, 0.0); -v9 = (void (__thiscall ***)(_DWORD, signed int, _DWORD, int, int))dword_1023790; -v10 = (**(int (__thiscall ***)(int, signed int, _DWORD))dword_1023790)(dword_1023790, 37, 0.0); -v11 = v10 == (**(int (__stdcall ***)(signed int, _DWORD))dword_1023790)(38, 0.0); +v9 = (void (__thiscall ***)(DWORD, signed int, DWORD, int, int))dword_1023790; +v10 = (**(int (__thiscall ***)(int, signed int, DWORD))dword_1023790)(dword_1023790, 37, 0.0); +v11 = v10 == (**(int (***)(signed int, DWORD))dword_1023790)(38, 0.0); v12 = v8; if ( v11 ) { (**v9)(v9, 7, 5.0, a2, v15); -((void (__thiscall *)(void (__thiscall ***)(_DWORD, signed int, _DWORD, int, int), _DWORD, _DWORD))**v9)( +((void (__thiscall *)(void (__thiscall ***)(DWORD, signed int, DWORD, int, int), DWORD, DWORD))**v9)( v9, 0, 0.0); -if ( *(_DWORD *)(dword_1023758 + 78) < 3 ) +if ( *(DWORD *)(dword_1023758 + 78) < 3 ) { -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023770)(12, 0.0); +(**(void (***)(signed int, DWORD))dword_1023770)(12, 0.0); v13 = get_rc_string(6, 0); TTextBox::Display(dword_1023E1C, v12, v13, 2.0); } -(**(void (__cdecl ***)(signed int, _DWORD))dword_1023770)(48, 60.0); +(**(void (__cdecl ***)(signed int, DWORD))dword_1023770)(48, 60.0); } v5 = a5; } } -v14 = (*(int (__thiscall **)(struct TPinballComponent *, _DWORD))(*(_DWORD *)v5 + 8))(v5, 0); +v14 = (*(int (__thiscall **)(struct TPinballComponent *, DWORD))(*(DWORD *)v5 + 8))(v5, 0); TPinballTable::AddScore(dword_1025040, v14); } } @@ -572,9 +572,9 @@ TPinballTable::AddScore(dword_1025040, v14); // 10237A0: using guessed type int dword_10237A0; //----- (0100CC20) -------------------------------------------------------- -void __userpurge OutLaneRolloverControl(int a1@, int a2@, int a3, struct TPinballComponent *a4) +void OutLaneRolloverControl(int a1, int a2, int a3, struct TPinballComponent *a4) { -void (__stdcall ***v4)(signed int); // ecx +void (***v4)(signed int); // ecx int v5; // eax if ( a3 == 63 ) @@ -582,19 +582,19 @@ if ( a3 == 63 ) 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); -(**(void (__stdcall ***)(signed int, _DWORD))dword_10238B4)(20, 0.0); +(**(void (***)(signed int, DWORD))dword_10238AC)(20, 0.0); +(**(void (***)(signed int, DWORD))dword_10238B4)(20, 0.0); } else { -(*(void (**)(void))(*(_DWORD *)dword_1023E04 + 20))(); +(*(void (**)(void))(*(DWORD *)dword_1023E04 + 20))(); } if ( (struct TPinballComponent *)dword_102389C == a4 ) { 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; +(**(void (***)(signed int, DWORD, int))dword_1023818)(4, 0.0, a2); +v4 = (void (***)(signed int))dword_1023828; LABEL_11: (**v4)(4); goto LABEL_12; @@ -602,12 +602,12 @@ goto LABEL_12; } 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; +(**(void (***)(signed int, DWORD, int))dword_1023820)(4, 0.0, a2); +v4 = (void (***)(signed int))dword_1023830; goto LABEL_11; } LABEL_12: -v5 = (*(int (__thiscall **)(struct TPinballComponent *, _DWORD))(*(_DWORD *)a4 + 8))(a4, 0); +v5 = (*(int (__thiscall **)(struct TPinballComponent *, DWORD))(*(DWORD *)a4 + 8))(a4, 0); TPinballTable::AddScore(dword_1025040, v5); } } @@ -626,20 +626,20 @@ TPinballTable::AddScore(dword_1025040, v5); // 1023E04: using guessed type int dword_1023E04; //----- (0100CD12) -------------------------------------------------------- -void __stdcall ExtraBallLightControl(int a1, struct TPinballComponent *a2) +void ExtraBallLightControl(int a1, struct TPinballComponent *a2) { if ( a1 == 19 ) { -(**(void (__stdcall ***)(signed int, _DWORD))dword_10238AC)(9, 55.0); -(**(void (__stdcall ***)(signed int, _DWORD))dword_10238B4)(9, 55.0); +(**(void (***)(signed int, DWORD))dword_10238AC)(9, 55.0); +(**(void (***)(signed int, DWORD))dword_10238B4)(9, 55.0); dword_102504C = 1; } else if ( a1 == 60 ) { if ( dword_102504C ) { -(**(void (__stdcall ***)(signed int, _DWORD))dword_10238AC)(7, 5.0); -(**(void (__stdcall ***)(signed int, _DWORD))dword_10238B4)(7, 5.0); +(**(void (***)(signed int, DWORD))dword_10238AC)(7, 5.0); +(**(void (***)(signed int, DWORD))dword_10238B4)(7, 5.0); dword_102504C = 0; } } @@ -649,9 +649,9 @@ dword_102504C = 0; // 102504C: using guessed type int dword_102504C; //----- (0100CDA0) -------------------------------------------------------- -void __userpurge ReturnLaneRolloverControl(int a1@, int a2, struct TPinballComponent *a3) +void ReturnLaneRolloverControl(int a1, int a2, struct TPinballComponent *a3) { -void (__stdcall ***v3)(signed int); // ecx +void (***v3)(signed int); // ecx int v4; // eax if ( a2 == 63 ) @@ -660,11 +660,11 @@ if ( (struct TPinballComponent *)dword_10238C0 == a3 ) { 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; +(**(void (***)(signed int, DWORD, int))dword_1023AC4)(20, 0.0, a1); +v3 = (void (***)(signed int))dword_10238D0; LABEL_8: (**v3)(20); -v4 = (*(int (__thiscall **)(struct TPinballComponent *, signed int))(*(_DWORD *)a3 + 8))(a3, 1); +v4 = (*(int (__thiscall **)(struct TPinballComponent *, signed int))(*(DWORD *)a3 + 8))(a3, 1); LABEL_10: TPinballTable::AddScore(dword_1025040, v4); return; @@ -676,12 +676,12 @@ if ( (struct TPinballComponent *)dword_10238C8 != a3 ) return; 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; +(**(void (***)(signed int, DWORD, int))dword_1023AC4)(20, 0.0, a1); +v3 = (void (***)(signed int))dword_10238D8; goto LABEL_8; } } -v4 = (*(int (__thiscall **)(struct TPinballComponent *, _DWORD))(*(_DWORD *)a3 + 8))(a3, 0); +v4 = (*(int (__thiscall **)(struct TPinballComponent *, DWORD))(*(DWORD *)a3 + 8))(a3, 0); goto LABEL_10; } } @@ -695,7 +695,7 @@ goto LABEL_10; // 1023AC4: using guessed type int dword_1023AC4; //----- (0100CE40) -------------------------------------------------------- -void __userpurge BonusLaneRolloverControl(int a1@, int a2, struct TPinballComponent *a3) +void BonusLaneRolloverControl(int a1, int a2, struct TPinballComponent *a3) { int v3; // ST08_4 CHAR *v4; // eax @@ -707,22 +707,22 @@ if ( a2 == 63 ) { if ( light_on((struct component_tag *)&lite16) ) { -v3 = SpecialAddScore(*(_DWORD *)((char *)dword_1025040 + 306)); +v3 = SpecialAddScore(*(DWORD *)((char *)dword_1025040 + 306)); v4 = get_rc_string(3, 0); _sprintf(&Dest, v4, v3); TTextBox::Display(dword_1023E1C, a1, &Dest, 2.0); -(**(void (__stdcall ***)(signed int, _DWORD))dword_10238F0)(20, 0.0); -(*(void (**)(void))(*(_DWORD *)dword_1023D4C + 20))(); +(**(void (***)(signed int, DWORD))dword_10238F0)(20, 0.0); +(*(void (**)(void))(*(DWORD *)dword_1023D4C + 20))(); } else { -v5 = (*(int (__thiscall **)(struct TPinballComponent *, _DWORD))(*(_DWORD *)a3 + 8))(a3, 0); +v5 = (*(int (__thiscall **)(struct TPinballComponent *, DWORD))(*(DWORD *)a3 + 8))(a3, 0); TPinballTable::AddScore(dword_1025040, v5); -(*(void (**)(void))(*(_DWORD *)dword_1023D54 + 20))(); +(*(void (**)(void))(*(DWORD *)dword_1023D54 + 20))(); v6 = get_rc_string(44, 0); TTextBox::Display(dword_1023E1C, a1, v6, 2.0); } -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023978)(45, 11.0); +(**(void (***)(signed int, DWORD))dword_1023978)(45, 11.0); } } // 10238EC: using guessed type char *lite16; @@ -732,24 +732,24 @@ TTextBox::Display(dword_1023E1C, a1, v6, 2.0); // 1023D54: using guessed type int dword_1023D54; //----- (0100CF36) -------------------------------------------------------- -void __userpurge FuelRollover1Control(int a1@, int a2, struct TPinballComponent *a3) +void FuelRollover1Control(int a1, int a2, struct TPinballComponent *a3) { char *v3; // eax int v4; // eax if ( a2 == 63 ) { -if ( (**(int (__stdcall ***)(signed int, _DWORD))dword_1023978)(37, 0.0) > 1 ) +if ( (**(int (***)(signed int, DWORD))dword_1023978)(37, 0.0) > 1 ) { -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023948)(8, 0.050000001); +(**(void (***)(signed int, DWORD))dword_1023948)(8, 0.050000001); } else { -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023978)(45, 1.0); +(**(void (***)(signed int, DWORD))dword_1023978)(45, 1.0); v3 = get_rc_string(44, 0); TTextBox::Display(dword_1023E1C, a1, v3, 2.0); } -v4 = (*(int (__stdcall **)(_DWORD))(*(_DWORD *)a3 + 8))(0); +v4 = (*(int (**)(DWORD))(*(DWORD *)a3 + 8))(0); TPinballTable::AddScore(dword_1025040, v4); } } @@ -757,24 +757,24 @@ TPinballTable::AddScore(dword_1025040, v4); // 1023978: using guessed type int dword_1023978; //----- (0100CFC0) -------------------------------------------------------- -void __userpurge FuelRollover2Control(int a1@, int a2, struct TPinballComponent *a3) +void FuelRollover2Control(int a1, int a2, struct TPinballComponent *a3) { char *v3; // eax int v4; // eax if ( a2 == 63 ) { -if ( (**(int (__stdcall ***)(signed int, _DWORD))dword_1023978)(37, 0.0) > 3 ) +if ( (**(int (***)(signed int, DWORD))dword_1023978)(37, 0.0) > 3 ) { -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023950)(8, 0.050000001); +(**(void (***)(signed int, DWORD))dword_1023950)(8, 0.050000001); } else { -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023978)(45, 3.0); +(**(void (***)(signed int, DWORD))dword_1023978)(45, 3.0); v3 = get_rc_string(44, 0); TTextBox::Display(dword_1023E1C, a1, v3, 2.0); } -v4 = (*(int (__stdcall **)(_DWORD))(*(_DWORD *)a3 + 8))(0); +v4 = (*(int (**)(DWORD))(*(DWORD *)a3 + 8))(0); TPinballTable::AddScore(dword_1025040, v4); } } @@ -782,24 +782,24 @@ TPinballTable::AddScore(dword_1025040, v4); // 1023978: using guessed type int dword_1023978; //----- (0100D04E) -------------------------------------------------------- -void __userpurge FuelRollover3Control(int a1@, int a2, struct TPinballComponent *a3) +void FuelRollover3Control(int a1, int a2, struct TPinballComponent *a3) { char *v3; // eax int v4; // eax if ( a2 == 63 ) { -if ( (**(int (__stdcall ***)(signed int, _DWORD))dword_1023978)(37, 0.0) > 5 ) +if ( (**(int (***)(signed int, DWORD))dword_1023978)(37, 0.0) > 5 ) { -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023958)(8, 0.050000001); +(**(void (***)(signed int, DWORD))dword_1023958)(8, 0.050000001); } else { -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023978)(45, 5.0); +(**(void (***)(signed int, DWORD))dword_1023978)(45, 5.0); v3 = get_rc_string(44, 0); TTextBox::Display(dword_1023E1C, a1, v3, 2.0); } -v4 = (*(int (__stdcall **)(_DWORD))(*(_DWORD *)a3 + 8))(0); +v4 = (*(int (**)(DWORD))(*(DWORD *)a3 + 8))(0); TPinballTable::AddScore(dword_1025040, v4); } } @@ -807,24 +807,24 @@ TPinballTable::AddScore(dword_1025040, v4); // 1023978: using guessed type int dword_1023978; //----- (0100D0DC) -------------------------------------------------------- -void __userpurge FuelRollover4Control(int a1@, int a2, struct TPinballComponent *a3) +void FuelRollover4Control(int a1, int a2, struct TPinballComponent *a3) { char *v3; // eax int v4; // eax if ( a2 == 63 ) { -if ( (**(int (__stdcall ***)(signed int, _DWORD))dword_1023978)(37, 0.0) > 7 ) +if ( (**(int (***)(signed int, DWORD))dword_1023978)(37, 0.0) > 7 ) { -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023960)(8, 0.050000001); +(**(void (***)(signed int, DWORD))dword_1023960)(8, 0.050000001); } else { -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023978)(45, 7.0); +(**(void (***)(signed int, DWORD))dword_1023978)(45, 7.0); v3 = get_rc_string(44, 0); TTextBox::Display(dword_1023E1C, a1, v3, 2.0); } -v4 = (*(int (__stdcall **)(_DWORD))(*(_DWORD *)a3 + 8))(0); +v4 = (*(int (**)(DWORD))(*(DWORD *)a3 + 8))(0); TPinballTable::AddScore(dword_1025040, v4); } } @@ -832,24 +832,24 @@ TPinballTable::AddScore(dword_1025040, v4); // 1023978: using guessed type int dword_1023978; //----- (0100D16A) -------------------------------------------------------- -void __userpurge FuelRollover5Control(int a1@, int a2, struct TPinballComponent *a3) +void FuelRollover5Control(int a1, int a2, struct TPinballComponent *a3) { char *v3; // eax int v4; // eax if ( a2 == 63 ) { -if ( (**(int (__stdcall ***)(signed int, _DWORD))dword_1023978)(37, 0.0) > 9 ) +if ( (**(int (***)(signed int, DWORD))dword_1023978)(37, 0.0) > 9 ) { -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023968)(8, 0.050000001); +(**(void (***)(signed int, DWORD))dword_1023968)(8, 0.050000001); } else { -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023978)(45, 9.0); +(**(void (***)(signed int, DWORD))dword_1023978)(45, 9.0); v3 = get_rc_string(44, 0); TTextBox::Display(dword_1023E1C, a1, v3, 2.0); } -v4 = (*(int (__stdcall **)(_DWORD))(*(_DWORD *)a3 + 8))(0); +v4 = (*(int (**)(DWORD))(*(DWORD *)a3 + 8))(0); TPinballTable::AddScore(dword_1025040, v4); } } @@ -857,24 +857,24 @@ TPinballTable::AddScore(dword_1025040, v4); // 1023978: using guessed type int dword_1023978; //----- (0100D1F8) -------------------------------------------------------- -void __userpurge FuelRollover6Control(int a1@, int a2, struct TPinballComponent *a3) +void FuelRollover6Control(int a1, int a2, struct TPinballComponent *a3) { char *v3; // eax int v4; // eax if ( a2 == 63 ) { -if ( (**(int (__stdcall ***)(signed int, _DWORD))dword_1023978)(37, 0.0) > 11 ) +if ( (**(int (***)(signed int, DWORD))dword_1023978)(37, 0.0) > 11 ) { -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023970)(8, 0.050000001); +(**(void (***)(signed int, DWORD))dword_1023970)(8, 0.050000001); } else { -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023978)(45, 11.0); +(**(void (***)(signed int, DWORD))dword_1023978)(45, 11.0); v3 = get_rc_string(44, 0); TTextBox::Display(dword_1023E1C, a1, v3, 2.0); } -v4 = (*(int (__stdcall **)(_DWORD))(*(_DWORD *)a3 + 8))(0); +v4 = (*(int (**)(DWORD))(*(DWORD *)a3 + 8))(0); TPinballTable::AddScore(dword_1025040, v4); } } @@ -882,7 +882,7 @@ TPinballTable::AddScore(dword_1025040, v4); // 1023978: using guessed type int dword_1023978; //----- (0100D286) -------------------------------------------------------- -void __stdcall HyperspaceLightGroupControl(int a1, struct TPinballComponent *a2) +void HyperspaceLightGroupControl(int a1, struct TPinballComponent *a2) { struct TPinballComponent *v2; // esi @@ -891,27 +891,27 @@ if ( a1 ) if ( a1 == 41 ) { v2 = a2; -(**(void (__thiscall ***)(struct TPinballComponent *, signed int, _DWORD))a2)(a2, 41, 2.0); +(**(void (__thiscall ***)(struct TPinballComponent *, signed int, DWORD))a2)(a2, 41, 2.0); LABEL_7: -(**(void (__thiscall ***)(struct TPinballComponent *, signed int, _DWORD))v2)(v2, 43, 60.0); +(**(void (__thiscall ***)(struct TPinballComponent *, signed int, DWORD))v2)(v2, 43, 60.0); return; } if ( a1 == 61 ) { v2 = a2; -(**(void (__thiscall ***)(struct TPinballComponent *, signed int, _DWORD))a2)(a2, 33, 0.0); -if ( (**(int (__thiscall ***)(struct TPinballComponent *, signed int, _DWORD))v2)(v2, 37, 0.0) ) +(**(void (__thiscall ***)(struct TPinballComponent *, signed int, DWORD))a2)(a2, 33, 0.0); +if ( (**(int (__thiscall ***)(struct TPinballComponent *, signed int, DWORD))v2)(v2, 37, 0.0) ) goto LABEL_7; } } else { -(**(void (__thiscall ***)(struct TPinballComponent *, _DWORD, _DWORD))a2)(a2, 0, 0.0); +(**(void (__thiscall ***)(struct TPinballComponent *, DWORD, DWORD))a2)(a2, 0, 0.0); } } //----- (0100D303) -------------------------------------------------------- -void __userpurge WormHoleControl(int a1@, int a2@, int a3@, int a4, struct TPinballComponent *a5) +void WormHoleControl(int a1, int a2, int a3, int a4, struct TPinballComponent *a5) { int v5; // ebx int v6; // edi @@ -934,21 +934,21 @@ v18 = a1; v5 = 0; if ( (struct TPinballComponent *)dword_10239EC != a5 ) { -LOBYTE(v5) = dword_10239F4 != (_DWORD)a5; +LOBYTE(v5) = dword_10239F4 != (DWORD)a5; ++v5; } v17 = a2; -v6 = *(_DWORD *)(dword_1023A24 + 6); +v6 = *(DWORD *)(dword_1023A24 + 6); v7 = v5 + 1; if ( v6 ) { -*(_DWORD *)(dword_1023A24 + 6) = 0; -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023A1C)(20, 0.0); -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023A3C)(20, 0.0); -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023C44)(20, 0.0); +*(DWORD *)(dword_1023A24 + 6) = 0; +(**(void (***)(signed int, DWORD))dword_1023A1C)(20, 0.0); +(**(void (***)(signed int, DWORD))dword_1023A3C)(20, 0.0); +(**(void (***)(signed int, DWORD))dword_1023C44)(20, 0.0); if ( v6 == v7 ) { -if ( *(_DWORD *)((char *)dword_1025040 + 346) ) +if ( *(DWORD *)((char *)dword_1025040 + 346) ) { table_bump_ball_sink_lock(v7); TPinballTable::AddScore(dword_1025040, 10000); @@ -958,18 +958,18 @@ else v11 = get_rc_string(49, 0); TTextBox::Display(dword_1023E1C, v7, v11, 2.0); table_set_replay(v7, 4.0); -v12 = (*(int (__thiscall **)(struct TPinballComponent *, signed int))(*(_DWORD *)a5 + 8))(a5, 1); +v12 = (*(int (__thiscall **)(struct TPinballComponent *, signed int))(*(DWORD *)a5 + 8))(a5, 1); TPinballTable::AddScore(dword_1025040, v12); v13 = v7 - 1; -(**(void (__stdcall ***)(signed int, _DWORD))off_1023A4C[v13][1])(16, *(float *)((char *)a5 + 82)); +(**(void (***)(signed int, DWORD))off_1023A4C[v13][1])(16, *(float *)((char *)a5 + 82)); v14 = (double)(2 - v13); -(**(void (__stdcall ***)(signed int, _DWORD))off_1023A58[v13][1])(11, LODWORD(v14)); -(**(void (__stdcall ***)(signed int, _DWORD))off_1023A58[v13][1])(16, *(float *)((char *)a5 + 82)); -(**(void (__stdcall ***)(signed int, _DWORD))off_1023A40[v13][1])(56, *(float *)((char *)a5 + 82)); +(**(void (***)(signed int, DWORD))off_1023A58[v13][1])(11, LODWORD(v14)); +(**(void (***)(signed int, DWORD))off_1023A58[v13][1])(16, *(float *)((char *)a5 + 82)); +(**(void (***)(signed int, DWORD))off_1023A40[v13][1])(56, *(float *)((char *)a5 + 82)); } return; } -v15 = (*(int (__thiscall **)(struct TPinballComponent *, signed int, int, int, int))(*(_DWORD *)a5 + 8))( +v15 = (*(int (__thiscall **)(struct TPinballComponent *, signed int, int, int, int))(*(DWORD *)a5 + 8))( a5, 2, v17, @@ -978,11 +978,11 @@ v18); TPinballTable::AddScore(dword_1025040, v15); v9 = v6 - 1; v10 = v6 - 1; -(**(void (__stdcall ***)(signed int, _DWORD))off_1023A4C[v10][1])(16, *(float *)((char *)a5 + 82)); +(**(void (***)(signed int, DWORD))off_1023A4C[v10][1])(16, *(float *)((char *)a5 + 82)); } else { -v8 = (*(int (__thiscall **)(struct TPinballComponent *, _DWORD, int, int, int))(*(_DWORD *)a5 + 8))( +v8 = (*(int (__thiscall **)(struct TPinballComponent *, DWORD, int, int, int))(*(DWORD *)a5 + 8))( a5, 0, v17, @@ -991,11 +991,11 @@ v18); TPinballTable::AddScore(dword_1025040, v8); v9 = v7 - 1; v10 = v9; -(**(void (__stdcall ***)(signed int, _DWORD))off_1023A4C[v9][1])(16, *(float *)((char *)a5 + 82)); +(**(void (***)(signed int, DWORD))off_1023A4C[v9][1])(16, *(float *)((char *)a5 + 82)); } -(**(void (__stdcall ***)(signed int))off_1023A58[v10][1])(11); -(**(void (__cdecl ***)(signed int, _DWORD))off_1023A58[v10][1])(16, *(float *)((char *)a5 + 82)); -(**(void (__stdcall ***)(signed int, _DWORD))off_1023A40[v10][1])(56, *(float *)((char *)a5 + 82)); +(**(void (***)(signed int))off_1023A58[v10][1])(11); +(**(void (__cdecl ***)(signed int, DWORD))off_1023A58[v10][1])(16, *(float *)((char *)a5 + 82)); +(**(void (***)(signed int, DWORD))off_1023A40[v10][1])(56, *(float *)((char *)a5 + 82)); v16 = get_rc_string(49, 0); TTextBox::Display(dword_1023E1C, v9, v16, 2.0); } @@ -1014,57 +1014,57 @@ TTextBox::Display(dword_1023E1C, v9, v16, 2.0); // 1023C44: using guessed type int dword_1023C44; //----- (0100D53A) -------------------------------------------------------- -void __stdcall LeftFlipperControl(int a1, struct TPinballComponent *a2) +void LeftFlipperControl(int a1, struct TPinballComponent *a2) { if ( a1 == 1 ) { -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023724)(24, 0.0); -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023790)(24, 0.0); +(**(void (***)(signed int, DWORD))dword_1023724)(24, 0.0); +(**(void (***)(signed int, DWORD))dword_1023790)(24, 0.0); } } // 1023724: using guessed type int dword_1023724; // 1023790: using guessed type int dword_1023790; //----- (0100D572) -------------------------------------------------------- -void __stdcall RightFlipperControl(int a1, struct TPinballComponent *a2) +void RightFlipperControl(int a1, struct TPinballComponent *a2) { if ( a1 == 1 ) { -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023724)(25, 0.0); -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023790)(25, 0.0); +(**(void (***)(signed int, DWORD))dword_1023724)(25, 0.0); +(**(void (***)(signed int, DWORD))dword_1023790)(25, 0.0); } } // 1023724: using guessed type int dword_1023724; // 1023790: using guessed type int dword_1023790; //----- (0100D5AA) -------------------------------------------------------- -void __stdcall JackpotLightControl(int a1, struct TPinballComponent *a2) +void JackpotLightControl(int a1, struct TPinballComponent *a2) { if ( a1 == 60 ) -*(_DWORD *)((char *)dword_1025040 + 318) = 0; +*(DWORD *)((char *)dword_1025040 + 318) = 0; } //----- (0100D5CA) -------------------------------------------------------- -void __stdcall BonusLightControl(int a1, struct TPinballComponent *a2) +void BonusLightControl(int a1, struct TPinballComponent *a2) { if ( a1 == 60 ) -*(_DWORD *)((char *)dword_1025040 + 310) = 0; +*(DWORD *)((char *)dword_1025040 + 310) = 0; } //----- (0100D5EA) -------------------------------------------------------- -void __stdcall BoosterTargetControl(int a1, struct TPinballComponent *a2) +void BoosterTargetControl(int a1, struct TPinballComponent *a2) { int v2; // eax int v3; // ecx int v4; // eax int v5; // eax -if ( a1 == 63 && !*(_DWORD *)((char *)a2 + 6) ) +if ( a1 == 63 && !*(DWORD *)((char *)a2 + 6) ) { -*(_DWORD *)((char *)a2 + 6) = 1; -if ( *(_DWORD *)(dword_1023A9C + 6) + *(_DWORD *)(dword_1023AA4 + 6) + *(_DWORD *)(dword_1023AAC + 6) != 3 ) +*(DWORD *)((char *)a2 + 6) = 1; +if ( *(DWORD *)(dword_1023A9C + 6) + *(DWORD *)(dword_1023AA4 + 6) + *(DWORD *)(dword_1023AAC + 6) != 3 ) { -v5 = (*(int (__thiscall **)(struct TPinballComponent *, _DWORD))(*(_DWORD *)a2 + 8))(a2, 0); +v5 = (*(int (__thiscall **)(struct TPinballComponent *, DWORD))(*(DWORD *)a2 + 8))(a2, 0); goto LABEL_19; } if ( light_on((struct component_tag *)&lite61) ) @@ -1075,7 +1075,7 @@ if ( light_on((struct component_tag *)&lite59) ) { if ( light_on((struct component_tag *)&lite58) ) { -v4 = (*(int (__thiscall **)(struct TPinballComponent *, signed int))(*(_DWORD *)a2 + 8))(a2, 1); +v4 = (*(int (__thiscall **)(struct TPinballComponent *, signed int))(*(DWORD *)a2 + 8))(a2, 1); TPinballTable::AddScore(dword_1025040, v4); } else @@ -1098,21 +1098,21 @@ v3 = dword_1023DB4; } else { -v2 = *(_DWORD *)(dword_1023BBC + 6); +v2 = *(DWORD *)(dword_1023BBC + 6); if ( v2 == 15 || v2 == 29 ) goto LABEL_17; table_set_flag_lights(0); v3 = dword_1023DC4; } -(*(void (**)(void))(*(_DWORD *)v3 + 20))(); +(*(void (**)(void))(*(DWORD *)v3 + 20))(); LABEL_17: -*(_DWORD *)(dword_1023A9C + 6) = 0; -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023A9C)(50, 0.0); -*(_DWORD *)(dword_1023AA4 + 6) = 0; -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023AA4)(50, 0.0); -*(_DWORD *)(dword_1023AAC + 6) = 0; -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023AAC)(50, 0.0); -v5 = (*(int (__thiscall **)(struct TPinballComponent *, signed int))(*(_DWORD *)a2 + 8))(a2, 1); +*(DWORD *)(dword_1023A9C + 6) = 0; +(**(void (***)(signed int, DWORD))dword_1023A9C)(50, 0.0); +*(DWORD *)(dword_1023AA4 + 6) = 0; +(**(void (***)(signed int, DWORD))dword_1023AA4)(50, 0.0); +*(DWORD *)(dword_1023AAC + 6) = 0; +(**(void (***)(signed int, DWORD))dword_1023AAC)(50, 0.0); +v5 = (*(int (__thiscall **)(struct TPinballComponent *, signed int))(*(DWORD *)a2 + 8))(a2, 1); LABEL_19: TPinballTable::AddScore(dword_1025040, v5); } @@ -1131,7 +1131,7 @@ TPinballTable::AddScore(dword_1025040, v5); // 1023DCC: using guessed type int dword_1023DCC; //----- (0100D73E) -------------------------------------------------------- -void __stdcall MedalLightGroupControl(int a1, struct TPinballComponent *a2) +void MedalLightGroupControl(int a1, struct TPinballComponent *a2) { struct TPinballComponent *v2; // esi @@ -1140,27 +1140,27 @@ if ( a1 ) if ( a1 == 41 ) { v2 = a2; -(**(void (__thiscall ***)(struct TPinballComponent *, signed int, _DWORD))a2)(a2, 41, 2.0); +(**(void (__thiscall ***)(struct TPinballComponent *, signed int, DWORD))a2)(a2, 41, 2.0); LABEL_7: -(**(void (__thiscall ***)(struct TPinballComponent *, signed int, _DWORD))v2)(v2, 43, 30.0); +(**(void (__thiscall ***)(struct TPinballComponent *, signed int, DWORD))v2)(v2, 43, 30.0); return; } if ( a1 == 61 ) { v2 = a2; -(**(void (__thiscall ***)(struct TPinballComponent *, signed int, _DWORD))a2)(a2, 33, 0.0); -if ( (**(int (__thiscall ***)(struct TPinballComponent *, signed int, _DWORD))v2)(v2, 37, 0.0) ) +(**(void (__thiscall ***)(struct TPinballComponent *, signed int, DWORD))a2)(a2, 33, 0.0); +if ( (**(int (__thiscall ***)(struct TPinballComponent *, signed int, DWORD))v2)(v2, 37, 0.0) ) goto LABEL_7; } } else { -(**(void (__thiscall ***)(struct TPinballComponent *, _DWORD, _DWORD))a2)(a2, 0, 0.0); +(**(void (__thiscall ***)(struct TPinballComponent *, DWORD, DWORD))a2)(a2, 0, 0.0); } } //----- (0100D7BB) -------------------------------------------------------- -void __userpurge MultiplierLightGroupControl(int a1@, int a2, struct TPinballComponent *a3) +void MultiplierLightGroupControl(int a1, int a2, struct TPinballComponent *a3) { struct TPinballComponent *v3; // esi double v4; // st7 @@ -1173,16 +1173,16 @@ if ( a2 ) if ( a2 == 41 ) { v3 = a3; -(**(void (__thiscall ***)(struct TPinballComponent *, signed int, _DWORD))a3)(a3, 41, 2.0); +(**(void (__thiscall ***)(struct TPinballComponent *, signed int, DWORD))a3)(a3, 41, 2.0); goto LABEL_13; } if ( a2 != 61 ) { if ( a2 == 64 ) { -*(_DWORD *)((char *)dword_1025040 + 294) = 4; -(**(void (__thiscall ***)(struct TPinballComponent *, signed int, _DWORD))a3)(a3, 19, 0.0); -(**(void (__thiscall ***)(struct TPinballComponent *, signed int, _DWORD))a3)(a3, 43, 30.0); +*(DWORD *)((char *)dword_1025040 + 294) = 4; +(**(void (__thiscall ***)(struct TPinballComponent *, signed int, DWORD))a3)(a3, 19, 0.0); +(**(void (__thiscall ***)(struct TPinballComponent *, signed int, DWORD))a3)(a3, 43, 30.0); v5 = get_rc_string(59, 0); TTextBox::Display(dword_1023E1C, a1, v5, 2.0); return; @@ -1190,36 +1190,36 @@ return; if ( a2 != 65 ) return; v3 = a3; -*(_DWORD *)((char *)dword_1025040 + 294) = 0; -(**(void (__thiscall ***)(struct TPinballComponent *, signed int, _DWORD))a3)(a3, 20, 0.0); +*(DWORD *)((char *)dword_1025040 + 294) = 0; +(**(void (__thiscall ***)(struct TPinballComponent *, signed int, DWORD))a3)(a3, 20, 0.0); v4 = -1.0; goto LABEL_14; } -v6 = *(_DWORD *)((char *)dword_1025040 + 294); +v6 = *(DWORD *)((char *)dword_1025040 + 294); if ( v6 ) -*(_DWORD *)((char *)dword_1025040 + 294) = v6 - 1; +*(DWORD *)((char *)dword_1025040 + 294) = v6 - 1; v3 = a3; -(**(void (__thiscall ***)(struct TPinballComponent *, signed int, _DWORD))a3)(a3, 33, 0.0); -if ( (**(int (__thiscall ***)(struct TPinballComponent *, signed int, _DWORD))v3)(v3, 37, 0.0) ) +(**(void (__thiscall ***)(struct TPinballComponent *, signed int, DWORD))a3)(a3, 33, 0.0); +if ( (**(int (__thiscall ***)(struct TPinballComponent *, signed int, DWORD))v3)(v3, 37, 0.0) ) { LABEL_13: v4 = 30.0; LABEL_14: v7 = v4; -(**(void (__thiscall ***)(struct TPinballComponent *, signed int, _DWORD))v3)(v3, 43, LODWORD(v7)); +(**(void (__thiscall ***)(struct TPinballComponent *, signed int, DWORD))v3)(v3, 43, LODWORD(v7)); return; } } else { -(**(void (__thiscall ***)(struct TPinballComponent *, _DWORD, _DWORD))a3)(a3, 0, 0.0); +(**(void (__thiscall ***)(struct TPinballComponent *, DWORD, DWORD))a3)(a3, 0, 0.0); } } //----- (0100D8DE) -------------------------------------------------------- -void __userpurge FuelSpotTargetControl(int a1@, int a2, struct TPinballComponent *a3) +void FuelSpotTargetControl(int a1, int a2, struct TPinballComponent *a3) { -void (__stdcall ***v3)(signed int, _DWORD); // ecx +void (***v3)(signed int, DWORD); // ecx int v4; // eax char *v5; // eax @@ -1227,28 +1227,28 @@ if ( a2 == 63 ) { if ( (struct TPinballComponent *)dword_1023B48 == a3 ) { -v3 = (void (__stdcall ***)(signed int, _DWORD))dword_1023B60; +v3 = (void (***)(signed int, DWORD))dword_1023B60; } else { -v3 = (void (__stdcall ***)(signed int, _DWORD))dword_1023B68; +v3 = (void (***)(signed int, DWORD))dword_1023B68; if ( (struct TPinballComponent *)dword_1023B50 != a3 ) -v3 = (void (__stdcall ***)(signed int, _DWORD))dword_1023B70; +v3 = (void (***)(signed int, DWORD))dword_1023B70; } (**v3)(15, 2.0); -v4 = (*(int (__thiscall **)(struct TPinballComponent *, _DWORD))(*(_DWORD *)a3 + 8))(a3, 0); +v4 = (*(int (__thiscall **)(struct TPinballComponent *, DWORD))(*(DWORD *)a3 + 8))(a3, 0); TPinballTable::AddScore(dword_1025040, v4); -if ( (**(int (__stdcall ***)(signed int, _DWORD))dword_1023B78)(37, 0.0) == 3 ) +if ( (**(int (***)(signed int, DWORD))dword_1023B78)(37, 0.0) == 3 ) { -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023B78)(16, 2.0); -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023978)(45, 11.0); -(*(void (**)(void))(*(_DWORD *)dword_1023D54 + 20))(); +(**(void (***)(signed int, DWORD))dword_1023B78)(16, 2.0); +(**(void (***)(signed int, DWORD))dword_1023978)(45, 11.0); +(*(void (**)(void))(*(DWORD *)dword_1023D54 + 20))(); v5 = get_rc_string(44, 0); TTextBox::Display(dword_1023E1C, a1, v5, 2.0); } else { -(*(void (**)(void))(*(_DWORD *)dword_1023E0C + 20))(); +(*(void (**)(void))(*(DWORD *)dword_1023E0C + 20))(); } } } @@ -1263,9 +1263,9 @@ else // 1023E0C: using guessed type int dword_1023E0C; //----- (0100D9C2) -------------------------------------------------------- -void __userpurge MissionSpotTargetControl(int a1@, int a2, struct TPinballComponent *a3) +void MissionSpotTargetControl(int a1, int a2, struct TPinballComponent *a3) { -void (__stdcall ***v3)(signed int, _DWORD, int); // ecx +void (***v3)(signed int, DWORD, int); // ecx int v4; // ecx int v5; // eax @@ -1273,27 +1273,27 @@ if ( a2 == 63 ) { if ( (struct TPinballComponent *)dword_1023B84 == a3 ) { -*(_DWORD *)(dword_1023B9C + 6) |= 1u; -v3 = (void (__stdcall ***)(signed int, _DWORD, int))dword_1023B9C; +*(DWORD *)(dword_1023B9C + 6) |= 1u; +v3 = (void (***)(signed int, DWORD, int))dword_1023B9C; } else if ( (struct TPinballComponent *)dword_1023B8C == a3 ) { -*(_DWORD *)(dword_1023B9C + 6) |= 2u; -v3 = (void (__stdcall ***)(signed int, _DWORD, int))dword_1023BA4; +*(DWORD *)(dword_1023B9C + 6) |= 2u; +v3 = (void (***)(signed int, DWORD, int))dword_1023BA4; } else { -*(_DWORD *)(dword_1023B9C + 6) |= 4u; -v3 = (void (__stdcall ***)(signed int, _DWORD, int))dword_1023BAC; +*(DWORD *)(dword_1023B9C + 6) |= 4u; +v3 = (void (***)(signed int, DWORD, int))dword_1023BAC; } (**v3)(15, 2.0, a1); -if ( !light_on((struct component_tag *)&lite198) || (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); +(*(void (**)(void))(*(DWORD *)v4 + 20))(); +v5 = (*(int (__thiscall **)(struct TPinballComponent *, DWORD))(*(DWORD *)a3 + 8))(a3, 0); TPinballTable::AddScore(dword_1025040, v5); -if ( (**(int (__stdcall ***)(signed int, _DWORD))dword_1023BB4)(37, 0.0) == 3 ) -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023BB4)(16, 2.0); +if ( (**(int (***)(signed int, DWORD))dword_1023BB4)(37, 0.0) == 3 ) +(**(void (***)(signed int, DWORD))dword_1023BB4)(16, 2.0); } } // 100D9C2: could not find valid save-restore pair for esi @@ -1309,40 +1309,40 @@ if ( (**(int (__stdcall ***)(signed int, _DWORD))dword_1023BB4)(37, 0.0) == 3 ) // 1023E0C: using guessed type int dword_1023E0C; //----- (0100DA94) -------------------------------------------------------- -void __stdcall LeftHazardSpotTargetControl(int a1, struct TPinballComponent *a2) +void LeftHazardSpotTargetControl(int a1, struct TPinballComponent *a2) { -void (__stdcall ***v2)(signed int, _DWORD); // ecx +void (***v2)(signed int, DWORD); // ecx int v3; // eax if ( a1 == 63 ) { if ( (struct TPinballComponent *)dword_1023BC8 == a2 ) { -*(_DWORD *)(dword_1023BF8 + 6) |= 1u; -v2 = (void (__stdcall ***)(signed int, _DWORD))dword_1023BF8; +*(DWORD *)(dword_1023BF8 + 6) |= 1u; +v2 = (void (***)(signed int, DWORD))dword_1023BF8; } else if ( (struct TPinballComponent *)dword_1023BD0 == a2 ) { -*(_DWORD *)(dword_1023BF8 + 6) |= 2u; -v2 = (void (__stdcall ***)(signed int, _DWORD))dword_1023C00; +*(DWORD *)(dword_1023BF8 + 6) |= 2u; +v2 = (void (***)(signed int, DWORD))dword_1023C00; } else { -*(_DWORD *)(dword_1023BF8 + 6) |= 4u; -v2 = (void (__stdcall ***)(signed int, _DWORD))dword_1023C08; +*(DWORD *)(dword_1023BF8 + 6) |= 4u; +v2 = (void (***)(signed int, DWORD))dword_1023C08; } (**v2)(15, 2.0); -v3 = (*(int (__thiscall **)(struct TPinballComponent *, _DWORD))(*(_DWORD *)a2 + 8))(a2, 0); +v3 = (*(int (__thiscall **)(struct TPinballComponent *, DWORD))(*(DWORD *)a2 + 8))(a2, 0); TPinballTable::AddScore(dword_1025040, v3); -if ( (**(int (__stdcall ***)(signed int, _DWORD))dword_1023C28)(37, 0.0) == 3 ) +if ( (**(int (***)(signed int, DWORD))dword_1023C28)(37, 0.0) == 3 ) { -(*(void (**)(void))(*(_DWORD *)dword_1023DDC + 20))(); -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023808)(53, 0.0); -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023C28)(16, 2.0); +(*(void (**)(void))(*(DWORD *)dword_1023DDC + 20))(); +(**(void (***)(signed int, DWORD))dword_1023808)(53, 0.0); +(**(void (***)(signed int, DWORD))dword_1023C28)(16, 2.0); } else { -(*(void (**)(void))(*(_DWORD *)dword_1023E0C + 20))(); +(*(void (**)(void))(*(DWORD *)dword_1023E0C + 20))(); } } } @@ -1357,40 +1357,40 @@ else // 1023E0C: using guessed type int dword_1023E0C; //----- (0100DB68) -------------------------------------------------------- -void __stdcall RightHazardSpotTargetControl(int a1, struct TPinballComponent *a2) +void RightHazardSpotTargetControl(int a1, struct TPinballComponent *a2) { -void (__stdcall ***v2)(signed int, _DWORD); // ecx +void (***v2)(signed int, DWORD); // ecx int v3; // eax if ( a1 == 63 ) { if ( (struct TPinballComponent *)dword_1023BE0 == a2 ) { -*(_DWORD *)(dword_1023C10 + 6) |= 1u; -v2 = (void (__stdcall ***)(signed int, _DWORD))dword_1023C10; +*(DWORD *)(dword_1023C10 + 6) |= 1u; +v2 = (void (***)(signed int, DWORD))dword_1023C10; } else if ( (struct TPinballComponent *)dword_1023BE8 == a2 ) { -*(_DWORD *)(dword_1023C10 + 6) |= 2u; -v2 = (void (__stdcall ***)(signed int, _DWORD))dword_1023C18; +*(DWORD *)(dword_1023C10 + 6) |= 2u; +v2 = (void (***)(signed int, DWORD))dword_1023C18; } else { -*(_DWORD *)(dword_1023C10 + 6) |= 4u; -v2 = (void (__stdcall ***)(signed int, _DWORD))dword_1023C20; +*(DWORD *)(dword_1023C10 + 6) |= 4u; +v2 = (void (***)(signed int, DWORD))dword_1023C20; } (**v2)(15, 2.0); -v3 = (*(int (__thiscall **)(struct TPinballComponent *, _DWORD))(*(_DWORD *)a2 + 8))(a2, 0); +v3 = (*(int (__thiscall **)(struct TPinballComponent *, DWORD))(*(DWORD *)a2 + 8))(a2, 0); TPinballTable::AddScore(dword_1025040, v3); -if ( (**(int (__stdcall ***)(signed int, _DWORD))dword_1023C30)(37, 0.0) == 3 ) +if ( (**(int (***)(signed int, DWORD))dword_1023C30)(37, 0.0) == 3 ) { -(*(void (**)(void))(*(_DWORD *)dword_1023DDC + 20))(); -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023810)(53, 0.0); -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023C30)(16, 2.0); +(*(void (**)(void))(*(DWORD *)dword_1023DDC + 20))(); +(**(void (***)(signed int, DWORD))dword_1023810)(53, 0.0); +(**(void (***)(signed int, DWORD))dword_1023C30)(16, 2.0); } else { -(*(void (**)(void))(*(_DWORD *)dword_1023E0C + 20))(); +(*(void (**)(void))(*(DWORD *)dword_1023E0C + 20))(); } } } @@ -1405,7 +1405,7 @@ else // 1023E0C: using guessed type int dword_1023E0C; //----- (0100DC3C) -------------------------------------------------------- -void __userpurge WormHoleDestinationControl(int a1@, int a2, struct TPinballComponent *a3) +void WormHoleDestinationControl(int a1, int a2, struct TPinballComponent *a3) { char *v3; // eax int v4; // eax @@ -1414,11 +1414,11 @@ if ( a2 == 63 ) { if ( !light_on((struct component_tag *)&lite110) ) { -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023C44)(15, 3.0); +(**(void (***)(signed int, DWORD))dword_1023C44)(15, 3.0); v3 = get_rc_string(93, 0); TTextBox::Display(dword_1023E1C, a1, v3, 2.0); } -v4 = (*(int (__stdcall **)(_DWORD))(*(_DWORD *)a3 + 8))(0); +v4 = (*(int (**)(DWORD))(*(DWORD *)a3 + 8))(0); TPinballTable::AddScore(dword_1025040, v4); AdvanceWormHoleDestination(1); } @@ -1427,7 +1427,7 @@ AdvanceWormHoleDestination(1); // 1023C44: using guessed type int dword_1023C44; //----- (0100DCB0) -------------------------------------------------------- -void __userpurge BlackHoleKickoutControl(int a1@, int a2, struct TPinballComponent *a3) +void BlackHoleKickoutControl(int a1, int a2, struct TPinballComponent *a3) { int v3; // eax int v4; // ST08_4 @@ -1436,17 +1436,17 @@ char Dest; // [esp+Ch] [ebp-44h] if ( a2 == 63 ) { -v3 = (*(int (__thiscall **)(struct TPinballComponent *, _DWORD))(*(_DWORD *)a3 + 8))(a3, 0); +v3 = (*(int (__thiscall **)(struct TPinballComponent *, DWORD))(*(DWORD *)a3 + 8))(a3, 0); v4 = TPinballTable::AddScore(dword_1025040, v3); v5 = get_rc_string(80, 0); _sprintf(&Dest, v5, v4); TTextBox::Display(dword_1023E1C, a1, &Dest, 2.0); -(**(void (__thiscall ***)(struct TPinballComponent *, signed int, _DWORD))a3)(a3, 55, -1.0); +(**(void (__thiscall ***)(struct TPinballComponent *, signed int, DWORD))a3)(a3, 55, -1.0); } } //----- (0100DD33) -------------------------------------------------------- -void __stdcall FlagControl(int a1, struct TPinballComponent *a2) +void FlagControl(int a1, struct TPinballComponent *a2) { int v2; // edi BOOL v3; // eax @@ -1458,7 +1458,7 @@ AdvanceWormHoleDestination(0); } else if ( a1 == 63 ) { -v2 = *(_DWORD *)a2; +v2 = *(DWORD *)a2; v3 = light_on((struct component_tag *)&lite20); v4 = (*(int (__thiscall **)(struct TPinballComponent *, BOOL))(v2 + 8))(a2, v3); TPinballTable::AddScore(dword_1025040, v4); @@ -1467,28 +1467,28 @@ TPinballTable::AddScore(dword_1025040, v4); // 102393C: using guessed type char *lite20; //----- (0100DD7A) -------------------------------------------------------- -void __userpurge GravityWellKickoutControl(int a1@, int a2, struct TPinballComponent *a3) +void GravityWellKickoutControl(int a1, int a2, struct TPinballComponent *a3) { CHAR *v3; // eax CHAR *v4; // eax int v5; // eax int v6; // ST0C_4 CHAR *v7; // eax -void (__thiscall **v8)(struct TPinballComponent *, signed int, _DWORD); // edi +void (__thiscall **v8)(struct TPinballComponent *, signed int, DWORD); // edi char Dest; // [esp+18h] [ebp-44h] switch ( a2 ) { case 63: -v5 = (*(int (__thiscall **)(struct TPinballComponent *, _DWORD))(*(_DWORD *)a3 + 8))(a3, 0); +v5 = (*(int (__thiscall **)(struct TPinballComponent *, DWORD))(*(DWORD *)a3 + 8))(a3, 0); v6 = TPinballTable::AddScore(dword_1025040, v5); v7 = get_rc_string(81, 0); _sprintf(&Dest, v7, v6); TTextBox::Display(dword_1023E1C, a1, &Dest, 2.0); -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023C70)(20, 0.0); -v8 = *(void (__thiscall ***)(struct TPinballComponent *, signed int, _DWORD))a3; +(**(void (***)(signed int, DWORD))dword_1023C70)(20, 0.0); +v8 = *(void (__thiscall ***)(struct TPinballComponent *, signed int, DWORD))a3; *((_BYTE *)a3 + 5) = 0; -(*(void (**)(void))(*(_DWORD *)dword_1023E14 + 20))(); +(*(void (**)(void))(*(DWORD *)dword_1023E14 + 20))(); (*v8)(a3, 55, 0.0); break; case 64: @@ -1503,7 +1503,7 @@ v3 = get_rc_string(45, 0); _sprintf(&Dest, v3); } TTextBox::Display(dword_1023E1C, a1, &Dest, 2.0); -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023C70)(4, 0.0); +(**(void (***)(signed int, DWORD))dword_1023C70)(4, 0.0); *(_BYTE *)(dword_1023C68 + 5) = 1; break; case 1024: @@ -1516,20 +1516,20 @@ break; // 1023E14: using guessed type int dword_1023E14; //----- (0100DEA5) -------------------------------------------------------- -void __stdcall SkillShotGate1Control(int a1, struct TPinballComponent *a2) +void SkillShotGate1Control(int a1, struct TPinballComponent *a2) { if ( a1 == 63 ) { -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023D04)(9, 5.0); +(**(void (***)(signed int, DWORD))dword_1023D04)(9, 5.0); 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); -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023CB4)(19, 0.0); -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023878)(7, 5.0); -(**(void (__stdcall ***)(signed int, _DWORD))dword_10239B0)(7, 5.0); -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023978)(45, 11.0); -(*(void (**)(void))(*(_DWORD *)dword_1023DF4 + 20))(); +(**(void (***)(signed int, DWORD))dword_1023CE4)(34, 0.0); +(**(void (***)(signed int, DWORD))dword_1023CE4)(20, 0.0); +(**(void (***)(signed int, DWORD))dword_1023CB4)(19, 0.0); +(**(void (***)(signed int, DWORD))dword_1023878)(7, 5.0); +(**(void (***)(signed int, DWORD))dword_10239B0)(7, 5.0); +(**(void (***)(signed int, DWORD))dword_1023978)(45, 11.0); +(*(void (**)(void))(*(DWORD *)dword_1023DF4 + 20))(); } } } @@ -1543,14 +1543,14 @@ if ( light_on((struct component_tag *)&lite67) ) // 1023DF4: using guessed type int dword_1023DF4; //----- (0100DF6A) -------------------------------------------------------- -void __stdcall SkillShotGate2Control(int a1, struct TPinballComponent *a2) +void SkillShotGate2Control(int a1, struct TPinballComponent *a2) { if ( a1 == 63 ) { if ( light_on((struct component_tag *)&lite67) ) { -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023CBC)(19, 0.0); -(*(void (**)(void))(*(_DWORD *)dword_1023DF4 + 20))(); +(**(void (***)(signed int, DWORD))dword_1023CBC)(19, 0.0); +(*(void (**)(void))(*(DWORD *)dword_1023DF4 + 20))(); } } } @@ -1559,14 +1559,14 @@ if ( light_on((struct component_tag *)&lite67) ) // 1023DF4: using guessed type int dword_1023DF4; //----- (0100DFAB) -------------------------------------------------------- -void __stdcall SkillShotGate3Control(int a1, struct TPinballComponent *a2) +void SkillShotGate3Control(int a1, struct TPinballComponent *a2) { if ( a1 == 63 ) { if ( light_on((struct component_tag *)&lite67) ) { -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023CC4)(19, 0.0); -(*(void (**)(void))(*(_DWORD *)dword_1023DF4 + 20))(); +(**(void (***)(signed int, DWORD))dword_1023CC4)(19, 0.0); +(*(void (**)(void))(*(DWORD *)dword_1023DF4 + 20))(); } } } @@ -1575,14 +1575,14 @@ if ( light_on((struct component_tag *)&lite67) ) // 1023DF4: using guessed type int dword_1023DF4; //----- (0100DFEC) -------------------------------------------------------- -void __stdcall SkillShotGate4Control(int a1, struct TPinballComponent *a2) +void SkillShotGate4Control(int a1, struct TPinballComponent *a2) { if ( a1 == 63 ) { if ( light_on((struct component_tag *)&lite67) ) { -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023CCC)(19, 0.0); -(*(void (**)(void))(*(_DWORD *)dword_1023DF4 + 20))(); +(**(void (***)(signed int, DWORD))dword_1023CCC)(19, 0.0); +(*(void (**)(void))(*(DWORD *)dword_1023DF4 + 20))(); } } } @@ -1591,14 +1591,14 @@ if ( light_on((struct component_tag *)&lite67) ) // 1023DF4: using guessed type int dword_1023DF4; //----- (0100E02D) -------------------------------------------------------- -void __stdcall SkillShotGate5Control(int a1, struct TPinballComponent *a2) +void SkillShotGate5Control(int a1, struct TPinballComponent *a2) { if ( a1 == 63 ) { if ( light_on((struct component_tag *)&lite67) ) { -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023CD4)(19, 0.0); -(*(void (**)(void))(*(_DWORD *)dword_1023DF4 + 20))(); +(**(void (***)(signed int, DWORD))dword_1023CD4)(19, 0.0); +(*(void (**)(void))(*(DWORD *)dword_1023DF4 + 20))(); } } } @@ -1607,14 +1607,14 @@ if ( light_on((struct component_tag *)&lite67) ) // 1023DF4: using guessed type int dword_1023DF4; //----- (0100E06E) -------------------------------------------------------- -void __stdcall SkillShotGate6Control(int a1, struct TPinballComponent *a2) +void SkillShotGate6Control(int a1, struct TPinballComponent *a2) { if ( a1 == 63 ) { if ( light_on((struct component_tag *)&lite67) ) { -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023CDC)(19, 0.0); -(*(void (**)(void))(*(_DWORD *)dword_1023DF4 + 20))(); +(**(void (***)(signed int, DWORD))dword_1023CDC)(19, 0.0); +(*(void (**)(void))(*(DWORD *)dword_1023DF4 + 20))(); } } } @@ -1623,41 +1623,41 @@ if ( light_on((struct component_tag *)&lite67) ) // 1023DF4: using guessed type int dword_1023DF4; //----- (0100E0AF) -------------------------------------------------------- -void __stdcall ShootAgainLightControl(int a1, struct TPinballComponent *a2) +void ShootAgainLightControl(int a1, struct TPinballComponent *a2) { if ( a1 == 60 ) { -if ( *(_DWORD *)((char *)a2 + 6) ) +if ( *(DWORD *)((char *)a2 + 6) ) { -*(_DWORD *)((char *)a2 + 6) = 0; +*(DWORD *)((char *)a2 + 6) = 0; } else { -(**(void (__thiscall ***)(struct TPinballComponent *, signed int, _DWORD))a2)(a2, 16, 5.0); -*(_DWORD *)((char *)a2 + 6) = 1; +(**(void (__thiscall ***)(struct TPinballComponent *, signed int, DWORD))a2)(a2, 16, 5.0); +*(DWORD *)((char *)a2 + 6) = 1; } } } //----- (0100E0ED) -------------------------------------------------------- -void __stdcall EscapeChuteSinkControl(int a1, struct TPinballComponent *a2) +void EscapeChuteSinkControl(int a1, struct TPinballComponent *a2) { if ( a1 == 63 ) -(**(void (__stdcall ***)(signed int, _DWORD))a2)(56, *(float *)((char *)a2 + 82)); +(**(void (***)(signed int, DWORD))a2)(56, *(float *)((char *)a2 + 82)); } //----- (0100E111) -------------------------------------------------------- -int __usercall cheat_bump_rank@(int a1@) +int cheat_bump_rank(int a1) { -void (__thiscall ***v1)(_DWORD, signed int, _DWORD); // esi +void (__thiscall ***v1)(DWORD, signed int, DWORD); // esi int result; // eax int v3; // edi CHAR *v4; // ST10_4 CHAR *v5; // eax char Dest; // [esp+1Ch] [ebp-44h] -v1 = (void (__thiscall ***)(_DWORD, signed int, _DWORD))dword_1023CF4; -result = (**(int (__stdcall ***)(signed int, _DWORD))dword_1023CF4)(37, 0.0); +v1 = (void (__thiscall ***)(DWORD, signed int, DWORD))dword_1023CF4; +result = (**(int (***)(signed int, DWORD))dword_1023CF4)(37, 0.0); v3 = result; if ( result < 9 ) { @@ -1666,22 +1666,22 @@ v4 = get_rc_string(word_10246EC[2 * v3], 1); v5 = get_rc_string(83, 0); _sprintf(&Dest, v5, v4); TTextBox::Display(dword_1023E24, a1, &Dest, 8.0); -result = (*(int (**)(void))(*(_DWORD *)dword_1023D1C + 20))(); +result = (*(int (**)(void))(*(DWORD *)dword_1023D1C + 20))(); } return result; } // 1023CF4: using guessed type int dword_1023CF4; // 1023D1C: using guessed type int dword_1023D1C; -// 10246EC: using guessed type __int16 word_10246EC[]; +// 10246EC: using guessed type int word_10246EC[]; //----- (0100E1B0) -------------------------------------------------------- -void __userpurge pbctrl_bdoor_controller(int a1@, int a2) +void pbctrl_bdoor_controller(int a1, int a2) { signed int v2; // eax int v3; // eax bool v4; // zf -if ( !*(_DWORD *)(dword_1023BBC + 6) ) +if ( !*(DWORD *)(dword_1023BBC + 6) ) { if ( a2 <= 77 ) { @@ -1870,7 +1870,7 @@ goto LABEL_77; cheat_bump_rank(a1); } LABEL_76: -*(_DWORD *)((char *)dword_1025040 + 62) = 1; +*(DWORD *)((char *)dword_1025040 + 62) = 1; goto LABEL_77; } dword_1025044 = 1; @@ -1878,7 +1878,7 @@ break; default: goto LABEL_77; } -*(_DWORD *)((char *)dword_1025040 + 62) = 1; +*(DWORD *)((char *)dword_1025040 + 62) = 1; goto LABEL_77; } } @@ -1889,34 +1889,34 @@ goto LABEL_77; //----- (01011EC9) -------------------------------------------------------- -void __stdcall control_handler(int a1, struct TPinballComponent *a2) +void control_handler(int a1, struct TPinballComponent *a2) { int v2; // esi int v3; // edi -v2 = *(_DWORD *)((char *)a2 + 18); +v2 = *(DWORD *)((char *)a2 + 18); v3 = 0; if ( v2 ) { -if ( a1 == 1019 && *(_DWORD *)(v2 + 4) > 0 ) +if ( a1 == 1019 && *(DWORD *)(v2 + 4) > 0 ) { do { -(*(void (__thiscall **)(struct TPinballComponent *, int, _DWORD))(*(_DWORD *)a2 + 12))( +(*(void (__thiscall **)(struct TPinballComponent *, int, DWORD))(*(DWORD *)a2 + 12))( a2, v3, -*(_DWORD *)(*(_DWORD *)(v2 + 8) + 4 * v3)); +*(DWORD *)(*(DWORD *)(v2 + 8) + 4 * v3)); ++v3; } -while ( v3 < *(_DWORD *)(v2 + 4) ); +while ( v3 < *(DWORD *)(v2 + 4) ); } -(*(void (__stdcall **)(int, struct TPinballComponent *))v2)(a1, a2); +(*(void (**)(int, struct TPinballComponent *))v2)(a1, a2); } MissionControl(a1, a2); } //----- (01011F1A) -------------------------------------------------------- -void __stdcall HyperspaceKickOutControl(int a1, struct TPinballComponent *a2) +void HyperspaceKickOutControl(int a1, struct TPinballComponent *a2) { double v2; // st7 int v3; // eax @@ -1930,7 +1930,7 @@ int v10; // eax int v11; // ST30_4 CHAR *v12; // eax TPinballTable *v13; // eax -_DWORD *v14; // eax +DWORD *v14; // eax int v15; // ecx int v16; // [esp+30h] [ebp-5Ch] int v17; // [esp+40h] [ebp-4Ch] @@ -1942,24 +1942,24 @@ v18 = 0; if ( a1 == 63 ) { v2 = 0.0; -v17 = (**(int (__stdcall ***)(signed int, _DWORD))dword_10239A8)(37, 0.0); +v17 = (**(int (***)(signed int, DWORD))dword_10239A8)(37, 0.0); HyperspaceLightGroupControl(41, dword_10239A8); if ( v17 ) { if ( v17 == 1 ) { -v8 = SpecialAddScore(*(_DWORD *)((char *)dword_1025040 + 314)); +v8 = SpecialAddScore(*(DWORD *)((char *)dword_1025040 + 314)); v9 = get_rc_string(14, 0); _sprintf(&Dest, v9, v8); v2 = 2.0; TTextBox::Display(dword_1023E1C, (int)a2, &Dest, 2.0); -*(_DWORD *)((char *)dword_1025040 + 314) = 20000; +*(DWORD *)((char *)dword_1025040 + 314) = 20000; goto LABEL_13; } if ( v17 == 2 ) { DrainBallBlockerControl(52, dword_1023860); -v7 = (*(int (__thiscall **)(struct TPinballComponent *, signed int))(*(_DWORD *)a2 + 8))(a2, 2); +v7 = (*(int (__thiscall **)(struct TPinballComponent *, signed int))(*(DWORD *)a2 + 8))(a2, 2); v16 = TPinballTable::AddScore(dword_1025040, v7); v6 = get_rc_string(2, 0); } @@ -1970,8 +1970,8 @@ if ( v17 != 3 ) if ( v17 == 4 ) { v2 = 0.0; -(**(void (__stdcall ***)(_DWORD, _DWORD))dword_10239A8)(0, 0.0); -v3 = (*(int (__thiscall **)(struct TPinballComponent *, signed int))(*(_DWORD *)a2 + 8))(a2, 4); +(**(void (***)(DWORD, DWORD))dword_10239A8)(0, 0.0); +v3 = (*(int (__thiscall **)(struct TPinballComponent *, signed int))(*(DWORD *)a2 + 8))(a2, 4); v4 = (struct TPinballComponent *)TPinballTable::AddScore(dword_1025040, v3); GravityWellKickoutControl((int)a2, 64, v4); } @@ -1979,7 +1979,7 @@ LABEL_13: if ( light_on((struct component_tag *)&lite25) ) { v18 = 1; -v11 = SpecialAddScore(*(_DWORD *)((char *)dword_1025040 + 302)); +v11 = SpecialAddScore(*(DWORD *)((char *)dword_1025040 + 302)); v12 = get_rc_string(10, 0); _sprintf(&Dest, v12, v11); v2 = 2.0; @@ -1990,27 +1990,27 @@ v18 |= 2u; if ( light_on((struct component_tag *)&lite130) ) { v18 |= 4u; -(**(void (__stdcall ***)(signed int, _DWORD))dword_10239C0)(20, 0.0); +(**(void (***)(signed int, DWORD))dword_10239C0)(20, 0.0); MultiplierLightGroupControl((int)a2, 64, dword_1023B38); -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023B0C)(19, 0.0); +(**(void (***)(signed int, DWORD))dword_1023B0C)(19, 0.0); table_set_jackpot((int)a2); table_set_bonus((int)a2); table_set_flag_lights((int)a2); table_set_bonus_hold((int)a2); -(**(void (__stdcall ***)(signed int, _DWORD))dword_10238D0)(19, 0.0); +(**(void (***)(signed int, DWORD))dword_10238D0)(19, 0.0); v2 = 0.0; -(**(void (__stdcall ***)(signed int, _DWORD))dword_10238D8)(19, 0.0); +(**(void (***)(signed int, DWORD))dword_10238D8)(19, 0.0); ExtraBallLightControl(19, 0); DrainBallBlockerControl(52, dword_1023860); v13 = dword_1025040; -if ( *(_DWORD *)((char *)dword_1025040 + 346) ) +if ( *(DWORD *)((char *)dword_1025040 + 346) ) { table_set_multiball((int)a2); v13 = dword_1025040; } -if ( *(_DWORD *)((char *)v13 + 314) < 100000 ) -*(_DWORD *)((char *)v13 + 314) = 100000; -v14 = (_DWORD *)((char *)v13 + 306); +if ( *(DWORD *)((char *)v13 + 314) < 100000 ) +*(DWORD *)((char *)v13 + 314) = 100000; +v14 = (DWORD *)((char *)v13 + 306); if ( *v14 < 100000 ) *v14 = 100000; GravityWellKickoutControl((int)a2, 64, 0); @@ -2025,12 +2025,12 @@ else { if ( v18 <= 1 || v18 > 3 ) { -(*(void (**)(void))(*(_DWORD *)dword_1023D6C + 20))(); +(*(void (**)(void))(*(DWORD *)dword_1023D6C + 20))(); v19 = v2; -(*(void (**)(void))(*(_DWORD *)dword_1023D74 + 20))(); -(*(void (**)(void))(*(_DWORD *)dword_1023D7C + 20))(); +(*(void (**)(void))(*(DWORD *)dword_1023D74 + 20))(); +(*(void (**)(void))(*(DWORD *)dword_1023D7C + 20))(); LABEL_42: -(**(void (__stdcall ***)(signed int, _DWORD))dword_10239B0)(7, 5.0); +(**(void (***)(signed int, DWORD))dword_10239B0)(7, 5.0); (**(void (__thiscall ***)(struct TPinballComponent *, signed int, float))a2)( a2, 55, @@ -2061,19 +2061,19 @@ v15 = dword_1023D84; break; } } -(*(void (**)(void))(*(_DWORD *)v15 + 20))(); +(*(void (**)(void))(*(DWORD *)v15 + 20))(); v19 = v2; goto LABEL_42; } ExtraBallLightControl(19, 0); -v5 = (*(int (__thiscall **)(struct TPinballComponent *, signed int))(*(_DWORD *)a2 + 8))(a2, 3); +v5 = (*(int (__thiscall **)(struct TPinballComponent *, signed int))(*(DWORD *)a2 + 8))(a2, 3); v16 = TPinballTable::AddScore(dword_1025040, v5); v6 = get_rc_string(8, 0); } } else { -v10 = (*(int (__thiscall **)(struct TPinballComponent *, _DWORD))(*(_DWORD *)a2 + 8))(a2, 0); +v10 = (*(int (__thiscall **)(struct TPinballComponent *, DWORD))(*(DWORD *)a2 + 8))(a2, 0); v16 = TPinballTable::AddScore(dword_1025040, v10); v6 = get_rc_string(12, 0); } @@ -2102,11 +2102,11 @@ goto LABEL_13; // 1023DA4: using guessed type int dword_1023DA4; //----- (01012285) -------------------------------------------------------- -void __userpurge PlungerControl(int a1@, int a2, struct TPinballComponent *a3) +void PlungerControl(int a1, int a2, struct TPinballComponent *a3) { -int (__stdcall **v3)(signed int, _DWORD); // eax -void (__thiscall ***v4)(_DWORD, signed int, _DWORD); // esi -void (__thiscall ***v5)(_DWORD, signed int, _DWORD); // esi +int (**v3)(signed int, DWORD); // eax +void (__thiscall ***v4)(DWORD, signed int, DWORD); // esi +void (__thiscall ***v5)(DWORD, signed int, DWORD); // esi if ( a2 == 1015 ) { @@ -2114,31 +2114,31 @@ MissionControl(67, 0); } else if ( a2 == 1016 ) { -v3 = *(int (__stdcall ***)(signed int, _DWORD))dword_1023CF4; +v3 = *(int (***)(signed int, DWORD))dword_1023CF4; dword_1025044 = 0; if ( !(*v3)(37, 0.0) ) -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023CF4)(32, 0.0); +(**(void (***)(signed int, DWORD))dword_1023CF4)(32, 0.0); 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); -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023CE4)(26, 0.25); -v4 = (void (__thiscall ***)(_DWORD, signed int, _DWORD))dword_1023A8C; -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023A8C)(20, 0.0); +(**(void (***)(signed int, DWORD))dword_1023CE4)(20, 0.0); +(**(void (***)(signed int, DWORD))dword_1023CB4)(19, 0.0); +(**(void (***)(signed int, DWORD))dword_1023CE4)(26, 0.25); +v4 = (void (__thiscall ***)(DWORD, signed int, DWORD))dword_1023A8C; +(**(void (***)(signed int, DWORD))dword_1023A8C)(20, 0.0); (**v4)(v4, 32, 0.2); (**v4)(v4, 26, 0.2); -v5 = (void (__thiscall ***)(_DWORD, signed int, _DWORD))dword_1023A94; -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023A94)(20, 0.0); +v5 = (void (__thiscall ***)(DWORD, signed int, DWORD))dword_1023A94; +(**(void (***)(signed int, DWORD))dword_1023A94)(20, 0.0); (**v5)(v5, 32, 0.2); (**v5)(v5, 26, 0.2); -*(_DWORD *)((char *)dword_1025040 + 302) = 25000; +*(DWORD *)((char *)dword_1025040 + 302) = 25000; MultiplierLightGroupControl(a1, 65, dword_1023B38); -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023978)(19, 0.0); -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023D04)(19, 0.0); -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023808)(53, 0.0); -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023810)(53, 0.0); +(**(void (***)(signed int, DWORD))dword_1023978)(19, 0.0); +(**(void (***)(signed int, DWORD))dword_1023D04)(19, 0.0); +(**(void (***)(signed int, DWORD))dword_1023808)(53, 0.0); +(**(void (***)(signed int, DWORD))dword_1023810)(53, 0.0); } -*(_DWORD *)(dword_1023D04 + 6) = 0; +*(DWORD *)(dword_1023D04 + 6) = 0; } } // 1023808: using guessed type int dword_1023808; @@ -2154,7 +2154,7 @@ MultiplierLightGroupControl(a1, 65, dword_1023B38); // 1025044: using guessed type int dword_1025044; //----- (0101240D) -------------------------------------------------------- -void __userpurge MedalTargetControl(int a1@, int a2@, int a3@, int a4, struct TPinballComponent *a5) +void MedalTargetControl(int a1, int a2, int a3, int a4, struct TPinballComponent *a5) { int v5; // eax char *v6; // eax @@ -2164,13 +2164,13 @@ int v9; // eax int v10; // eax float v11; // [esp+24h] [ebp-4h] -if ( a4 == 63 && !*(_DWORD *)((char *)a5 + 6) ) +if ( a4 == 63 && !*(DWORD *)((char *)a5 + 6) ) { -*(_DWORD *)((char *)a5 + 6) = 1; -if ( *(_DWORD *)(dword_1023ADC + 6) + *(_DWORD *)(dword_1023AE4 + 6) + *(_DWORD *)(dword_1023AEC + 6) == 3 ) +*(DWORD *)((char *)a5 + 6) = 1; +if ( *(DWORD *)(dword_1023ADC + 6) + *(DWORD *)(dword_1023AE4 + 6) + *(DWORD *)(dword_1023AEC + 6) == 3 ) { MedalLightGroupControl(41, dword_1023B0C); -v5 = (**(int (__stdcall ***)(signed int, _DWORD, int, int))dword_1023B0C)(37, 0.0, a2, a3) - 1; +v5 = (**(int (***)(signed int, DWORD, int, int))dword_1023B0C)(37, 0.0, a2, a3) - 1; if ( v5 ) { if ( v5 != 1 ) @@ -2179,22 +2179,22 @@ v6 = get_rc_string(55, 0); TTextBox::Display(dword_1023E1C, a1, v6, 2.0); table_add_extra_ball(a1, 4.0); LABEL_10: -*(_DWORD *)(dword_1023ADC + 6) = 0; -(**(void (__cdecl ***)(signed int, _DWORD))dword_1023ADC)(50, 0.0); -*(_DWORD *)(dword_1023AE4 + 6) = 0; -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023AE4)(50, 0.0); -*(_DWORD *)(dword_1023AEC + 6) = 0; -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023AEC)(50, 0.0); +*(DWORD *)(dword_1023ADC + 6) = 0; +(**(void (__cdecl ***)(signed int, DWORD))dword_1023ADC)(50, 0.0); +*(DWORD *)(dword_1023AE4 + 6) = 0; +(**(void (***)(signed int, DWORD))dword_1023AE4)(50, 0.0); +*(DWORD *)(dword_1023AEC + 6) = 0; +(**(void (***)(signed int, DWORD))dword_1023AEC)(50, 0.0); return; } -v7 = (*(int (__thiscall **)(struct TPinballComponent *, signed int))(*(_DWORD *)a5 + 8))(a5, 2); +v7 = (*(int (__thiscall **)(struct TPinballComponent *, signed int))(*(DWORD *)a5 + 8))(a5, 2); TPinballTable::AddScore(dword_1025040, v7); v11 = 2.0; v8 = get_rc_string(54, 0); } else { -v9 = (*(int (__thiscall **)(struct TPinballComponent *, signed int))(*(_DWORD *)a5 + 8))(a5, 1); +v9 = (*(int (__thiscall **)(struct TPinballComponent *, signed int))(*(DWORD *)a5 + 8))(a5, 1); TPinballTable::AddScore(dword_1025040, v9); v11 = 2.0; v8 = get_rc_string(53, 0); @@ -2202,7 +2202,7 @@ v8 = get_rc_string(53, 0); TTextBox::Display(dword_1023E1C, a1, v8, v11); goto LABEL_10; } -v10 = (*(int (__thiscall **)(struct TPinballComponent *, _DWORD))(*(_DWORD *)a5 + 8))(a5, 0); +v10 = (*(int (__thiscall **)(struct TPinballComponent *, DWORD))(*(DWORD *)a5 + 8))(a5, 0); TPinballTable::AddScore(dword_1025040, v10); } } @@ -2213,28 +2213,28 @@ TPinballTable::AddScore(dword_1025040, v10); // 1023AEC: using guessed type int dword_1023AEC; //----- (01012570) -------------------------------------------------------- -void __userpurge MultiplierTargetControl(int a1@, int a2@, int a3@, int a4, struct TPinballComponent *a5) +void MultiplierTargetControl(int a1, int a2, int a3, int a4, struct TPinballComponent *a5) { int v5; // eax int v6; // eax -int (__stdcall **v7)(signed int, _DWORD); // eax +int (**v7)(signed int, DWORD); // eax int v8; // eax int v9; // eax char *v10; // eax -void (__stdcall **v11)(signed int); // eax +void (**v11)(signed int); // eax int v12; // eax float vars0; // [esp+28h] [ebp+0h] -if ( a4 == 63 && !*(_DWORD *)((char *)a5 + 6) ) +if ( a4 == 63 && !*(DWORD *)((char *)a5 + 6) ) { -*(_DWORD *)((char *)a5 + 6) = 1; -v5 = *(_DWORD *)a5; -if ( *(_DWORD *)(dword_1023B20 + 6) + *(_DWORD *)(dword_1023B28 + 6) + *(_DWORD *)(dword_1023B30 + 6) == 3 ) +*(DWORD *)((char *)a5 + 6) = 1; +v5 = *(DWORD *)a5; +if ( *(DWORD *)(dword_1023B20 + 6) + *(DWORD *)(dword_1023B28 + 6) + *(DWORD *)(dword_1023B30 + 6) == 3 ) { -v6 = (*(int (__stdcall **)(signed int, int, int, _DWORD))(v5 + 8))(1, a3, a2, LODWORD(vars0)); +v6 = (*(int (**)(signed int, int, int, DWORD))(v5 + 8))(1, a3, a2, LODWORD(vars0)); TPinballTable::AddScore(dword_1025040, v6); MultiplierLightGroupControl(a1, 41, dword_1023B38); -v7 = *(int (__stdcall ***)(signed int, _DWORD))dword_1023B38; +v7 = *(int (***)(signed int, DWORD))dword_1023B38; vars0 = 0.0; v8 = (*v7)(37, 0.0) - 1; vars0 = 2.0; @@ -2245,39 +2245,39 @@ if ( v9 ) { if ( v9 == 1 ) { -*(_DWORD *)((char *)dword_1025040 + 294) = 3; +*(DWORD *)((char *)dword_1025040 + 294) = 3; v10 = get_rc_string(58, 0); } else { -*(_DWORD *)((char *)dword_1025040 + 294) = 4; +*(DWORD *)((char *)dword_1025040 + 294) = 4; v10 = get_rc_string(59, 0); } } else { -*(_DWORD *)((char *)dword_1025040 + 294) = 2; +*(DWORD *)((char *)dword_1025040 + 294) = 2; v10 = get_rc_string(57, 0); } } else { -*(_DWORD *)((char *)dword_1025040 + 294) = 1; +*(DWORD *)((char *)dword_1025040 + 294) = 1; v10 = get_rc_string(56, 0); } TTextBox::Display(dword_1023E1C, a1, v10, vars0); -*(_DWORD *)(dword_1023B20 + 6) = 0; -v11 = *(void (__stdcall ***)(signed int))dword_1023B20; +*(DWORD *)(dword_1023B20 + 6) = 0; +v11 = *(void (***)(signed int))dword_1023B20; vars0 = 0.0; (*v11)(50); -*(_DWORD *)(dword_1023B28 + 6) = 0; -(**(void (__cdecl ***)(signed int, _DWORD))dword_1023B28)(50, 0.0); -*(_DWORD *)(dword_1023B30 + 6) = 0; -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023B30)(50, 0.0); +*(DWORD *)(dword_1023B28 + 6) = 0; +(**(void (__cdecl ***)(signed int, DWORD))dword_1023B28)(50, 0.0); +*(DWORD *)(dword_1023B30 + 6) = 0; +(**(void (***)(signed int, DWORD))dword_1023B30)(50, 0.0); } else { -v12 = (*(int (__stdcall **)(_DWORD))(v5 + 8))(0); +v12 = (*(int (**)(DWORD))(v5 + 8))(0); TPinballTable::AddScore(dword_1025040, v12); } } @@ -2289,7 +2289,7 @@ TPinballTable::AddScore(dword_1025040, v12); // 1023B30: using guessed type int dword_1023B30; //----- (010126BA) -------------------------------------------------------- -void __stdcall BallDrainControl(int a1, struct TPinballComponent *a2) +void BallDrainControl(int a1, struct TPinballComponent *a2) { TPinballTable *v2; // esi char *v3; // eax @@ -2307,77 +2307,77 @@ char Dest; // [esp+1F8h] [ebp-44h] if ( a1 == 60 ) { -if ( *(_DWORD *)(dword_1023D0C + 6) ) +if ( *(DWORD *)(dword_1023D0C + 6) ) { -(**(void (__stdcall ***)(signed int, _DWORD))dword_1025040)(1022, 0.0); +(**(void (***)(signed int, DWORD))dword_1025040)(1022, 0.0); if ( pb_chk_highscore() ) { -(*(void (**)(void))(*(_DWORD *)dword_1023DFC + 20))(); -(***(void (__stdcall ****)(signed int, _DWORD))((char *)dword_1025040 + 266))(16, 3.0); +(*(void (**)(void))(*(DWORD *)dword_1023DFC + 20))(); +(***(void (****)(signed int, DWORD))((char *)dword_1025040 + 266))(16, 3.0); v11 = get_rc_string(177, 0); TTextBox::Display(dword_1023E24, 0, v11, -1.0); } } else { -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023A84)(1016, 0.0); +(**(void (***)(signed int, DWORD))dword_1023A84)(1016, 0.0); } } else if ( a1 == 63 ) { if ( dword_1025044 ) { -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023C7C)(1024, 0.0); -(**(void (__stdcall ***)(signed int, _DWORD))dword_10239FC)(56, 0.0); +(**(void (***)(signed int, DWORD))dword_1023C7C)(1024, 0.0); +(**(void (***)(signed int, DWORD))dword_10239FC)(56, 0.0); } else { v2 = dword_1025040; -if ( *(_DWORD *)((char *)dword_1025040 + 370) ) +if ( *(DWORD *)((char *)dword_1025040 + 370) ) { -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023D04)(20, 0.0); -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023D0C)(20, 0.0); +(**(void (***)(signed int, DWORD))dword_1023D04)(20, 0.0); +(**(void (***)(signed int, DWORD))dword_1023D0C)(20, 0.0); v2 = dword_1025040; } if ( light_on((struct component_tag *)&lite200) ) { -(*(void (**)(void))(*(_DWORD *)dword_1023DEC + 20))(); -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023D04)(19, 0.0); +(*(void (**)(void))(*(DWORD *)dword_1023DEC + 20))(); +(**(void (***)(signed int, DWORD))dword_1023D04)(19, 0.0); v3 = get_rc_string(96, 0); TTextBox::Display(dword_1023E1C, 0, v3, -1.0); -(*(void (**)(void))(*(_DWORD *)dword_1023DE4 + 20))(); +(*(void (**)(void))(*(DWORD *)dword_1023DE4 + 20))(); } else if ( light_on((struct component_tag *)&lite199) ) { -(*(void (**)(void))(*(_DWORD *)dword_1023DEC + 20))(); -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023D0C)(20, 0.0); -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023D04)(19, 0.0); +(*(void (**)(void))(*(DWORD *)dword_1023DEC + 20))(); +(**(void (***)(signed int, DWORD))dword_1023D0C)(20, 0.0); +(**(void (***)(signed int, DWORD))dword_1023D04)(19, 0.0); v4 = get_rc_string(95, 0); TTextBox::Display(dword_1023E1C, 0, v4, 2.0); -(*(void (**)(void))(*(_DWORD *)dword_1023DE4 + 20))(); ---*(_DWORD *)((char *)dword_1025040 + 350); +(*(void (**)(void))(*(DWORD *)dword_1023DE4 + 20))(); +--*(DWORD *)((char *)dword_1025040 + 350); } -else if ( *(_DWORD *)((char *)v2 + 338) ) +else if ( *(DWORD *)((char *)v2 + 338) ) { -(*(void (**)(void))(*(_DWORD *)dword_1023DEC + 20))(); ---*(_DWORD *)((char *)dword_1025040 + 338); +(*(void (**)(void))(*(DWORD *)dword_1023DEC + 20))(); +--*(DWORD *)((char *)dword_1025040 + 338); } else { -if ( !*(_DWORD *)((char *)v2 + 370) ) +if ( !*(DWORD *)((char *)v2 + 370) ) { -v5 = SpecialAddScore(*(_DWORD *)((char *)v2 + 306)); +v5 = SpecialAddScore(*(DWORD *)((char *)v2 + 306)); v6 = get_rc_string(94, 0); _sprintf(&Dest, v6, v5); TTextBox::Display(dword_1023E1C, 0, &Dest, 2.0); v2 = dword_1025040; } -v7 = *(_DWORD *)((char *)v2 + 334); +v7 = *(DWORD *)((char *)v2 + 334); if ( v7 ) { -*(_DWORD *)((char *)v2 + 334) = v7 - 1; -(*(void (**)(void))(*(_DWORD *)dword_1023DE4 + 20))(); -v8 = *(_DWORD *)((char *)dword_1025040 + 218); +*(DWORD *)((char *)v2 + 334) = v7 - 1; +(*(void (**)(void))(*(DWORD *)dword_1023DE4 + 20))(); +v8 = *(DWORD *)((char *)dword_1025040 + 218); if ( v8 ) { v9 = v8 - 1; @@ -2401,92 +2401,92 @@ TTextBox::Display(dword_1023E1C, 0, v10, -1.0); } else { -TPinballTable::ChangeBallCount(v2, 0, *(_DWORD *)((char *)v2 + 326) - 1); -if ( *(_DWORD *)((char *)dword_1025040 + 218) + 1 != *(_DWORD *)((char *)dword_1025040 + 214) -|| *(_DWORD *)((char *)dword_1025040 + 326) ) +TPinballTable::ChangeBallCount(v2, 0, *(DWORD *)((char *)v2 + 326) - 1); +if ( *(DWORD *)((char *)dword_1025040 + 218) + 1 != *(DWORD *)((char *)dword_1025040 + 214) +|| *(DWORD *)((char *)dword_1025040 + 326) ) { -(**(void (__stdcall ***)(signed int, _DWORD))dword_1025040)(1021, 0.0); -*(_DWORD *)(dword_1023D0C + 6) = 0; +(**(void (***)(signed int, DWORD))dword_1025040)(1021, 0.0); +*(DWORD *)(dword_1023D0C + 6) = 0; } else { -*(_DWORD *)(dword_1023D0C + 6) = 1; +*(DWORD *)(dword_1023D0C + 6) = 1; } -(*(void (**)(void))(*(_DWORD *)dword_1023DEC + 20))(); +(*(void (**)(void))(*(DWORD *)dword_1023DEC + 20))(); } -(**(void (__stdcall ***)(signed int, _DWORD, int, int))dword_1023724)(20, 0.0, v12, v13); -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023790)(20, 0.0); -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023818)(20, 0.0); -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023820)(20, 0.0); -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023868)(20, 0.0); -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023878)(20, 0.0); -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023880)(20, 0.0); -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023888)(20, 0.0); -(**(void (__stdcall ***)(signed int, _DWORD))dword_10238AC)(20, 0.0); -(**(void (__stdcall ***)(signed int, _DWORD))dword_10238B4)(20, 0.0); -(**(void (__stdcall ***)(signed int, _DWORD))dword_10238D0)(20, 0.0); -(**(void (__stdcall ***)(signed int, _DWORD))dword_10238D8)(20, 0.0); -(**(void (__stdcall ***)(signed int, _DWORD))dword_10238F0)(20, 0.0); -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023940)(20, 0.0); -(**(void (__stdcall ***)(signed int, _DWORD))dword_10239A8)(20, 0.0); -(**(void (__stdcall ***)(signed int, _DWORD))dword_10239B0)(20, 0.0); -(**(void (__stdcall ***)(signed int, _DWORD))dword_10239B8)(20, 0.0); -(**(void (__stdcall ***)(signed int, _DWORD))dword_10239C0)(20, 0.0); -(**(void (__stdcall ***)(signed int, _DWORD))dword_10239D0)(20, 0.0); -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023A1C)(20, 0.0); -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023A3C)(20, 0.0); -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023A8C)(20, 0.0); -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023A94)(20, 0.0); -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023ABC)(20, 0.0); -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023AC4)(20, 0.0); -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023AB4)(20, 0.0); -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023B0C)(20, 0.0); -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023B38)(20, 0.0); -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023B78)(20, 0.0); -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023BB4)(20, 0.0); -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023C28)(20, 0.0); -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023C30)(20, 0.0); -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023C44)(20, 0.0); -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023CE4)(20, 0.0); -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023CEC)(20, 0.0); -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023BBC)(20, 0.0); -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023828)(20, 0.0); -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023830)(20, 0.0); -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023978)(20, 0.0); -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023978)(1024, 0.0); +(**(void (***)(signed int, DWORD, int, int))dword_1023724)(20, 0.0, v12, v13); +(**(void (***)(signed int, DWORD))dword_1023790)(20, 0.0); +(**(void (***)(signed int, DWORD))dword_1023818)(20, 0.0); +(**(void (***)(signed int, DWORD))dword_1023820)(20, 0.0); +(**(void (***)(signed int, DWORD))dword_1023868)(20, 0.0); +(**(void (***)(signed int, DWORD))dword_1023878)(20, 0.0); +(**(void (***)(signed int, DWORD))dword_1023880)(20, 0.0); +(**(void (***)(signed int, DWORD))dword_1023888)(20, 0.0); +(**(void (***)(signed int, DWORD))dword_10238AC)(20, 0.0); +(**(void (***)(signed int, DWORD))dword_10238B4)(20, 0.0); +(**(void (***)(signed int, DWORD))dword_10238D0)(20, 0.0); +(**(void (***)(signed int, DWORD))dword_10238D8)(20, 0.0); +(**(void (***)(signed int, DWORD))dword_10238F0)(20, 0.0); +(**(void (***)(signed int, DWORD))dword_1023940)(20, 0.0); +(**(void (***)(signed int, DWORD))dword_10239A8)(20, 0.0); +(**(void (***)(signed int, DWORD))dword_10239B0)(20, 0.0); +(**(void (***)(signed int, DWORD))dword_10239B8)(20, 0.0); +(**(void (***)(signed int, DWORD))dword_10239C0)(20, 0.0); +(**(void (***)(signed int, DWORD))dword_10239D0)(20, 0.0); +(**(void (***)(signed int, DWORD))dword_1023A1C)(20, 0.0); +(**(void (***)(signed int, DWORD))dword_1023A3C)(20, 0.0); +(**(void (***)(signed int, DWORD))dword_1023A8C)(20, 0.0); +(**(void (***)(signed int, DWORD))dword_1023A94)(20, 0.0); +(**(void (***)(signed int, DWORD))dword_1023ABC)(20, 0.0); +(**(void (***)(signed int, DWORD))dword_1023AC4)(20, 0.0); +(**(void (***)(signed int, DWORD))dword_1023AB4)(20, 0.0); +(**(void (***)(signed int, DWORD))dword_1023B0C)(20, 0.0); +(**(void (***)(signed int, DWORD))dword_1023B38)(20, 0.0); +(**(void (***)(signed int, DWORD))dword_1023B78)(20, 0.0); +(**(void (***)(signed int, DWORD))dword_1023BB4)(20, 0.0); +(**(void (***)(signed int, DWORD))dword_1023C28)(20, 0.0); +(**(void (***)(signed int, DWORD))dword_1023C30)(20, 0.0); +(**(void (***)(signed int, DWORD))dword_1023C44)(20, 0.0); +(**(void (***)(signed int, DWORD))dword_1023CE4)(20, 0.0); +(**(void (***)(signed int, DWORD))dword_1023CEC)(20, 0.0); +(**(void (***)(signed int, DWORD))dword_1023BBC)(20, 0.0); +(**(void (***)(signed int, DWORD))dword_1023828)(20, 0.0); +(**(void (***)(signed int, DWORD))dword_1023830)(20, 0.0); +(**(void (***)(signed int, DWORD))dword_1023978)(20, 0.0); +(**(void (***)(signed int, DWORD))dword_1023978)(1024, 0.0); GravityWellKickoutControl(0, 1024, 0); -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023C70)(20, 0.0); -*(_DWORD *)(dword_1023A24 + 6) = 0; -*(_DWORD *)(dword_1023B9C + 6) = 0; -*(_DWORD *)(dword_1023BA4 + 6) = 0; -*(_DWORD *)(dword_1023BAC + 6) = 0; -*(_DWORD *)(dword_1023BB4 + 6) = 0; -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023CFC)(34, 0.0); -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023CF4)(34, 0.0); -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023704)(1024, 0.0); -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023770)(1024, 0.0); -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023808)(1024, 0.0); -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023810)(1024, 0.0); -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023860)(1024, 0.0); -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023A9C)(1024, 0.0); -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023AA4)(1024, 0.0); -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023AAC)(1024, 0.0); -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023ADC)(1024, 0.0); -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023AE4)(1024, 0.0); -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023AEC)(1024, 0.0); -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023B20)(1024, 0.0); -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023B28)(1024, 0.0); -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023B30)(1024, 0.0); -if ( *(_DWORD *)(dword_1023D0C + 6) ) -*(_DWORD *)(dword_1023BBC + 6) = 32; +(**(void (***)(signed int, DWORD))dword_1023C70)(20, 0.0); +*(DWORD *)(dword_1023A24 + 6) = 0; +*(DWORD *)(dword_1023B9C + 6) = 0; +*(DWORD *)(dword_1023BA4 + 6) = 0; +*(DWORD *)(dword_1023BAC + 6) = 0; +*(DWORD *)(dword_1023BB4 + 6) = 0; +(**(void (***)(signed int, DWORD))dword_1023CFC)(34, 0.0); +(**(void (***)(signed int, DWORD))dword_1023CF4)(34, 0.0); +(**(void (***)(signed int, DWORD))dword_1023704)(1024, 0.0); +(**(void (***)(signed int, DWORD))dword_1023770)(1024, 0.0); +(**(void (***)(signed int, DWORD))dword_1023808)(1024, 0.0); +(**(void (***)(signed int, DWORD))dword_1023810)(1024, 0.0); +(**(void (***)(signed int, DWORD))dword_1023860)(1024, 0.0); +(**(void (***)(signed int, DWORD))dword_1023A9C)(1024, 0.0); +(**(void (***)(signed int, DWORD))dword_1023AA4)(1024, 0.0); +(**(void (***)(signed int, DWORD))dword_1023AAC)(1024, 0.0); +(**(void (***)(signed int, DWORD))dword_1023ADC)(1024, 0.0); +(**(void (***)(signed int, DWORD))dword_1023AE4)(1024, 0.0); +(**(void (***)(signed int, DWORD))dword_1023AEC)(1024, 0.0); +(**(void (***)(signed int, DWORD))dword_1023B20)(1024, 0.0); +(**(void (***)(signed int, DWORD))dword_1023B28)(1024, 0.0); +(**(void (***)(signed int, DWORD))dword_1023B30)(1024, 0.0); +if ( *(DWORD *)(dword_1023D0C + 6) ) +*(DWORD *)(dword_1023BBC + 6) = 32; else -*(_DWORD *)(dword_1023BBC + 6) = 0; +*(DWORD *)(dword_1023BBC + 6) = 0; MissionControl(66, 0); -(**(void (__cdecl ***)(signed int, _DWORD))dword_1025040)(1012, 0.0); +(**(void (__cdecl ***)(signed int, DWORD))dword_1025040)(1012, 0.0); if ( light_on((struct component_tag *)&lite58) ) -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023ACC)(20, 0.0); +(**(void (***)(signed int, DWORD))dword_1023ACC)(20, 0.0); else -*(_DWORD *)((char *)dword_1025040 + 306) = 25000; +*(DWORD *)((char *)dword_1025040 + 306) = 25000; } } } diff --git a/geometry/edges.cpp b/geometry/edges.cpp index 6455fc8..8567a86 100644 --- a/geometry/edges.cpp +++ b/geometry/edges.cpp @@ -5,7 +5,7 @@ #include "../pinball.h" //----- (0100B9C7) -------------------------------------------------------- -void __stdcall edges_insert_circle(struct circle_type *a1, struct TEdgeSegment *a2, struct field_effect_type *a3) +void edges_insert_circle(struct circle_type *a1, struct TEdgeSegment *a2, struct field_effect_type *a3) { struct circle_type *v3; // ebx long double v4; // st7 @@ -108,22 +108,22 @@ void __stdcall edges_insert_circle(struct circle_type *a1, struct TEdgeSegment * v25 = v28; v26 = v29; v27 = v30; - v11 = Distance_Squared(v28, v29, v30, *(float *)v3, *((float *)v3 + 1), *((_DWORD *)v3 + 2)); + v11 = Distance_Squared(v28, v29, v30, *(float *)v3, *((float *)v3 + 1), *((DWORD *)v3 + 2)); if ( v11 > v40 ) { v12 = *(float *)v3; v25 = v25 + *(float *)edge_manager; - v13 = Distance_Squared(v25, v26, v27, v12, *((float *)v3 + 1), *((_DWORD *)v3 + 2)); + v13 = Distance_Squared(v25, v26, v27, v12, *((float *)v3 + 1), *((DWORD *)v3 + 2)); if ( v13 > v40 ) { v14 = *(float *)v3; v26 = v26 + *((float *)edge_manager + 1); - v15 = Distance_Squared(v25, v26, v27, v14, *((float *)v3 + 1), *((_DWORD *)v3 + 2)); + v15 = Distance_Squared(v25, v26, v27, v14, *((float *)v3 + 1), *((DWORD *)v3 + 2)); if ( v15 > v40 ) { v16 = *(float *)v3; v25 = v25 - *(float *)edge_manager; - v17 = Distance_Squared(v25, v26, v27, v16, *((float *)v3 + 1), *((_DWORD *)v3 + 2)); + v17 = Distance_Squared(v25, v26, v27, v16, *((float *)v3 + 1), *((DWORD *)v3 + 2)); if ( v17 > v40 ) { v19 = v28; @@ -131,7 +131,7 @@ void __stdcall edges_insert_circle(struct circle_type *a1, struct TEdgeSegment * v21 = v30; v22 = 1.0; v23 = 0.0; - v24 = *(_DWORD *)edge_manager; + v24 = *(DWORD *)edge_manager; if ( ray_intersect_circle(&v19, (float *)v3) >= 1000000000.0 ) { v22 = -1.0; @@ -140,7 +140,7 @@ void __stdcall edges_insert_circle(struct circle_type *a1, struct TEdgeSegment * { v22 = 0.0; v23 = 1.0; - v24 = *((_DWORD *)edge_manager + 1); + v24 = *((DWORD *)edge_manager + 1); if ( ray_intersect_circle(&v19, (float *)v3) >= 1000000000.0 ) { v23 = -1.0; @@ -149,7 +149,7 @@ void __stdcall edges_insert_circle(struct circle_type *a1, struct TEdgeSegment * { v23 = 0.0; v22 = -1.0; - v24 = *(_DWORD *)edge_manager; + v24 = *(DWORD *)edge_manager; if ( ray_intersect_circle(&v19, (float *)v3) >= 1000000000.0 ) { v22 = 1.0; @@ -158,7 +158,7 @@ void __stdcall edges_insert_circle(struct circle_type *a1, struct TEdgeSegment * { v22 = 0.0; v23 = -1.0; - v24 = *((_DWORD *)edge_manager + 1); + v24 = *((DWORD *)edge_manager + 1); if ( ray_intersect_circle(&v19, (float *)v3) >= 1000000000.0 ) { v23 = 1.0; @@ -202,7 +202,7 @@ void __stdcall edges_insert_circle(struct circle_type *a1, struct TEdgeSegment * } //----- (0100BE21) -------------------------------------------------------- -void __stdcall edges_insert_square(float a1, float a2, float a3, float a4, struct TEdgeSegment *a5, struct field_effect_type *a6) +void edges_insert_square(float a1, float a2, float a3, float a4, struct TEdgeSegment *a5, struct field_effect_type *a6) { double v6; // st7 double v7; // st7 @@ -273,7 +273,7 @@ void __stdcall edges_insert_square(float a1, float a2, float a3, float a4, struc } //----- (01016B27) -------------------------------------------------------- -void __stdcall find_closest_edge(struct ramp_plane_type *a1, int a2, struct wall_point_type *a3, struct vector_type **a4, struct vector_type **a5) +void find_closest_edge(struct ramp_plane_type *a1, int a2, struct wall_point_type *a3, struct vector_type **a4, struct vector_type **a5) { int v5; // ecx char *v6; // esi @@ -292,10 +292,10 @@ float v18; // [esp+28h] [ebp+Ch] float v19; // [esp+28h] [ebp+Ch] struct wall_point_type *v20; // [esp+2Ch] [ebp+10h] -v14 = *(_DWORD *)a3; -v15 = *((_DWORD *)a3 + 1); -v5 = *((_DWORD *)a3 + 2); -v13 = *((_DWORD *)a3 + 3); +v14 = *(DWORD *)a3; +v15 = *((DWORD *)a3 + 1); +v5 = *((DWORD *)a3 + 2); +v13 = *((DWORD *)a3 + 3); v16 = 1000000000.0; v12 = v5; if ( a2 > 0 ) diff --git a/geometry/geometry.cpp b/geometry/geometry.cpp index fa31012..1764df3 100644 --- a/geometry/geometry.cpp +++ b/geometry/geometry.cpp @@ -5,7 +5,7 @@ #include "../pinball.h" //----- (0100400B) -------------------------------------------------------- -signed int __stdcall rectangle_clip(int *a1, int *a2, _DWORD *a3) +signed int rectangle_clip(int *a1, int *a2, DWORD *a3) { int v3; // edi int v4; // edx @@ -57,7 +57,7 @@ signed int __stdcall rectangle_clip(int *a1, int *a2, _DWORD *a3) } //----- (010040C2) -------------------------------------------------------- -int __stdcall enclosing_box(_DWORD *a1, _DWORD *a2, _DWORD *a3) +int enclosing_box(DWORD *a1, DWORD *a2, DWORD *a3) { int v3; // esi int v4; // edi @@ -108,7 +108,7 @@ int __stdcall enclosing_box(_DWORD *a1, _DWORD *a2, _DWORD *a3) } //----- (010077C4) -------------------------------------------------------- -BOOL __stdcall center_in(HWND hWnd, HWND a2) +BOOL center_in(HWND hWnd, HWND a2) { HWND v2; // eax LONG v3; // ebx @@ -155,7 +155,7 @@ BOOL __stdcall center_in(HWND hWnd, HWND a2) // 1024EF4: using guessed type int fullscrn_display_changed; //----- (01008AE9) -------------------------------------------------------- -double __stdcall normalize_2d(float *a1) +double normalize_2d(float *a1) { double result; // st7 @@ -169,7 +169,7 @@ double __stdcall normalize_2d(float *a1) } //----- (01008B34) -------------------------------------------------------- -double __stdcall ray_intersect_circle(float *a1, float *a2) +double ray_intersect_circle(float *a1, float *a2) { double v2; // st7 double v3; // st7 @@ -198,7 +198,7 @@ double __stdcall ray_intersect_circle(float *a1, float *a2) } //----- (01008BEB) -------------------------------------------------------- -int __stdcall line_init(int a1, float a2, float a3, float a4, float a5) +int line_init(int a1, float a2, float a3, float a4, float a5) { float *v5; // esi int v6; // edx @@ -233,18 +233,18 @@ int __stdcall line_init(int a1, float a2, float a3, float a4, float a5) if ( v10 ) { *(float *)(v6 + 28) = v9; - *(_DWORD *)(v6 + 32) = result; + *(DWORD *)(v6 + 32) = result; } else { *(float *)(v6 + 32) = v9; - *(_DWORD *)(v6 + 28) = result; + *(DWORD *)(v6 + 28) = result; } return result; } //----- (01008C8F) -------------------------------------------------------- -double __stdcall ray_intersect_line(float *a1, float *a2) +double ray_intersect_line(float *a1, float *a2) { double v2; // st7 double result; // st7 @@ -287,7 +287,7 @@ double __stdcall ray_intersect_line(float *a1, float *a2) } //----- (01008D4E) -------------------------------------------------------- -float *__stdcall proj_matrix_vector_multiply(float *a1, float *a2, float *a3) +float *proj_matrix_vector_multiply(float *a1, float *a2, float *a3) { double v3; // st7 double v4; // st6 @@ -305,7 +305,7 @@ float *__stdcall proj_matrix_vector_multiply(float *a1, float *a2, float *a3) } //----- (01008DB8) -------------------------------------------------------- -float *__stdcall cross(float *a1, float *a2, float *a3) +float *cross(float *a1, float *a2, float *a3) { float *v3; // ecx float *result; // eax @@ -319,7 +319,7 @@ float *__stdcall cross(float *a1, float *a2, float *a3) } //----- (01008DFF) -------------------------------------------------------- -double __stdcall magnitude(float *a1) +double magnitude(float *a1) { long double v1; // st7 double result; // st7 @@ -333,7 +333,7 @@ double __stdcall magnitude(float *a1) } //----- (01008E4B) -------------------------------------------------------- -int __stdcall proj_init(int a1, int a2, int a3, int a4) +int proj_init(int a1, int a2, int a3, int a4) { float *v4; // edx float *v5; // eax @@ -347,7 +347,7 @@ int __stdcall proj_init(int a1, int a2, int a3, int a4) v6 = 4; do { - *v5 = *(float *)((char *)v5 + a1 - (_DWORD)&proj_matrix); + *v5 = *(float *)((char *)v5 + a1 - (DWORD)&proj_matrix); v5 += 4; --v6; } @@ -374,7 +374,7 @@ int __stdcall proj_init(int a1, int a2, int a3, int a4) // 102819C: using guessed type float flt_102819C; //----- (01008EBA) -------------------------------------------------------- -int __stdcall proj_recenter(int a1, int a2) +int proj_recenter(int a1, int a2) { int result; // eax @@ -387,7 +387,7 @@ int __stdcall proj_recenter(int a1, int a2) // 102813C: using guessed type int proj_centerx; //----- (01008ED8) -------------------------------------------------------- -void __stdcall proj_z_distance(float *a1) +void proj_z_distance(float *a1) { char v1; // [esp+0h] [ebp-Ch] @@ -396,7 +396,7 @@ void __stdcall proj_z_distance(float *a1) } //----- (01008F03) -------------------------------------------------------- -double __stdcall proj_xform_to_2d(float *a1, _DWORD *a2) +double proj_xform_to_2d(float *a1, DWORD *a2) { double v2; // st7 double v3; // st6 @@ -422,7 +422,7 @@ double __stdcall proj_xform_to_2d(float *a1, _DWORD *a2) //----- (01013340) -------------------------------------------------------- -BOOL __stdcall overlapping_box(struct rectangle_type *a1, struct rectangle_type *a2, struct rectangle_type *a3) +BOOL overlapping_box(struct rectangle_type *a1, struct rectangle_type *a2, struct rectangle_type *a3) { int v3; // esi int v4; // edi @@ -430,39 +430,39 @@ int v5; // esi int v6; // esi int v7; // edi -if ( *(_DWORD *)a1 >= *(_DWORD *)a2 ) +if ( *(DWORD *)a1 >= *(DWORD *)a2 ) { -*(_DWORD *)a3 = *(_DWORD *)a2; -v3 = *((_DWORD *)a1 + 2) - *(_DWORD *)a2; -v4 = *(_DWORD *)a1; +*(DWORD *)a3 = *(DWORD *)a2; +v3 = *((DWORD *)a1 + 2) - *(DWORD *)a2; +v4 = *(DWORD *)a1; } else { -*(_DWORD *)a3 = *(_DWORD *)a1; -v3 = *((_DWORD *)a2 + 2) - *(_DWORD *)a1; -v4 = *(_DWORD *)a2; +*(DWORD *)a3 = *(DWORD *)a1; +v3 = *((DWORD *)a2 + 2) - *(DWORD *)a1; +v4 = *(DWORD *)a2; } -*((_DWORD *)a3 + 2) = v3 + v4 + 1; -v5 = *((_DWORD *)a1 + 1); -if ( v5 >= *((_DWORD *)a2 + 1) ) +*((DWORD *)a3 + 2) = v3 + v4 + 1; +v5 = *((DWORD *)a1 + 1); +if ( v5 >= *((DWORD *)a2 + 1) ) { -*((_DWORD *)a3 + 1) = *((_DWORD *)a2 + 1); -v6 = *((_DWORD *)a1 + 3) - *((_DWORD *)a2 + 1); -v7 = *((_DWORD *)a1 + 1); +*((DWORD *)a3 + 1) = *((DWORD *)a2 + 1); +v6 = *((DWORD *)a1 + 3) - *((DWORD *)a2 + 1); +v7 = *((DWORD *)a1 + 1); } else { -*((_DWORD *)a3 + 1) = v5; -v6 = *((_DWORD *)a2 + 3) - *((_DWORD *)a1 + 1); -v7 = *((_DWORD *)a2 + 1); +*((DWORD *)a3 + 1) = v5; +v6 = *((DWORD *)a2 + 3) - *((DWORD *)a1 + 1); +v7 = *((DWORD *)a2 + 1); } -*((_DWORD *)a3 + 3) = v6 + v7 + 1; -return *((_DWORD *)a3 + 2) <= *((_DWORD *)a2 + 2) + *((_DWORD *)a1 + 2) -&& *((_DWORD *)a3 + 3) <= *((_DWORD *)a2 + 3) + *((_DWORD *)a1 + 3); +*((DWORD *)a3 + 3) = v6 + v7 + 1; +return *((DWORD *)a3 + 2) <= *((DWORD *)a2 + 2) + *((DWORD *)a1 + 2) +&& *((DWORD *)a3 + 3) <= *((DWORD *)a2 + 3) + *((DWORD *)a1 + 3); } //----- (01015935) -------------------------------------------------------- -void __stdcall throw_ball(struct TBall *a1, struct vector_type *a2, float a3, float a4, float a5) +void throw_ball(struct TBall *a1, struct vector_type *a2, float a3, float a4, float a5) { struct TBall *v5; // ebx int v6; // eax @@ -470,10 +470,10 @@ float v7; // ST04_4 struct TBall *v8; // [esp+18h] [ebp+8h] v5 = a1; -*(_DWORD *)((char *)a1 + 106) = 0; -*(_DWORD *)((char *)a1 + 54) = *(_DWORD *)a2; -*(_DWORD *)((char *)a1 + 58) = *((_DWORD *)a2 + 1); -*(_DWORD *)((char *)a1 + 62) = *((_DWORD *)a2 + 2); +*(DWORD *)((char *)a1 + 106) = 0; +*(DWORD *)((char *)a1 + 54) = *(DWORD *)a2; +*(DWORD *)((char *)a1 + 58) = *((DWORD *)a2 + 1); +*(DWORD *)((char *)a1 + 62) = *((DWORD *)a2 + 2); v6 = _rand(); v7 = (1.0 - ((double)v6 * 0.00003051850947599719 + (double)v6 * 0.00003051850947599719)) * a3; RotateVector((struct TBall *)((char *)a1 + 54), v7); @@ -487,7 +487,7 @@ v8 = (struct TBall *)_rand(); } //----- (0101B43A) -------------------------------------------------------- -double __stdcall distance_to_flipper(struct ray_type *a1, struct ray_type *a2) +double distance_to_flipper(struct ray_type *a1, struct ray_type *a2) { signed int v2; // edi double v3; // st7 @@ -496,8 +496,8 @@ double v5; // st7 double v6; // st7 float *v7; // eax double v8; // st7 -_DWORD *v10; // esi -_DWORD *v11; // esi +DWORD *v10; // esi +DWORD *v11; // esi float v12; // [esp+8h] [ebp-4h] v12 = 1000000000.0; @@ -556,22 +556,22 @@ v8 = *((float *)a2 + 1) - *(float *)&dword_1025674; normalize_2d(v7); return v12; } -*((_DWORD *)a2 + 3) = lineB; -*((_DWORD *)a2 + 4) = *((_DWORD *)&lineB + 1); -*((_DWORD *)a2 + 5) = *((_DWORD *)&lineB + 2); +*((DWORD *)a2 + 3) = lineB; +*((DWORD *)a2 + 4) = *((DWORD *)&lineB + 1); +*((DWORD *)a2 + 5) = *((DWORD *)&lineB + 2); v10 = &unk_10256E4; } else { -*((_DWORD *)a2 + 3) = lineA; -*((_DWORD *)a2 + 4) = *((_DWORD *)&lineA + 1); -*((_DWORD *)a2 + 5) = *((_DWORD *)&lineA + 2); +*((DWORD *)a2 + 3) = lineA; +*((DWORD *)a2 + 4) = *((DWORD *)&lineA + 1); +*((DWORD *)a2 + 5) = *((DWORD *)&lineA + 2); v10 = &unk_10256A4; } -*(_DWORD *)a2 = *v10; +*(DWORD *)a2 = *v10; v11 = v10 + 1; -*((_DWORD *)a2 + 1) = *v11; -*((_DWORD *)a2 + 2) = v11[1]; +*((DWORD *)a2 + 1) = *v11; +*((DWORD *)a2 + 2) = v11[1]; return v12; } return 1000000000.0; @@ -580,7 +580,7 @@ return 1000000000.0; // 1025674: using guessed type int dword_1025674; //----- (0101CBB1) -------------------------------------------------------- -void __stdcall RotatePt(struct vector_type *a1, float a2, float a3, struct vector_type *a4) +void RotatePt(struct vector_type *a1, float a2, float a3, struct vector_type *a4) { double v4; // st7 double v5; // st6 @@ -592,7 +592,7 @@ v5 = *((float *)a1 + 1) - *((float *)a4 + 1); } //----- (0101CBF5) -------------------------------------------------------- -long double __stdcall Distance(struct vector_type *a1, struct vector_type *a2) +long double Distance(struct vector_type *a1, struct vector_type *a2) { double v2; // st7 double v3; // st6 @@ -603,19 +603,19 @@ return sqrt(v3 * v3 + v2 * v2); } //----- (0101CC23) -------------------------------------------------------- -double __stdcall Distance_Squared(float a1, float a2, int a3, float a4, float a5, int a6) +double Distance_Squared(float a1, float a2, int a3, float a4, float a5, int a6) { return (a2 - a5) * (a2 - a5) + (a1 - a4) * (a1 - a4); } //----- (0101CC4B) -------------------------------------------------------- -double __stdcall DotProduct(const struct vector_type *a1, const struct vector_type *a2) +double DotProduct(const struct vector_type *a1, const struct vector_type *a2) { return *((float *)a1 + 1) * *((float *)a2 + 1) + *(float *)a1 * *(float *)a2; } //----- (0101CC6B) -------------------------------------------------------- -void __stdcall SinCos(float a1, float *a2, float *a3) +void SinCos(float a1, float *a2, float *a3) { *a2 = sin(a1); *a3 = cos(a1); diff --git a/graphics/flasher.cpp b/graphics/flasher.cpp index f9b7f57..0a69024 100644 --- a/graphics/flasher.cpp +++ b/graphics/flasher.cpp @@ -5,32 +5,32 @@ #include "../pinball.h" //----- (01009910) -------------------------------------------------------- -void __stdcall flasher_callback(int a1, void *a2) +void flasher_callback(int a1, void *a2) { int v2; // eax - v2 = 1 - *((_DWORD *)a2 + 8); - *((_DWORD *)a2 + 8) = v2; - render_sprite_set_bitmap(*(_DWORD **)a2, *((_DWORD *)a2 + v2 + 1)); - *((_DWORD *)a2 + 7) = timer_set(*((float *)a2 + *((_DWORD *)a2 + 8) + 5), (int)a2, (int)flasher_callback); + v2 = 1 - *((DWORD *)a2 + 8); + *((DWORD *)a2 + 8) = v2; + render_sprite_set_bitmap(*(DWORD **)a2, *((DWORD *)a2 + v2 + 1)); + *((DWORD *)a2 + 7) = timer_set(*((float *)a2 + *((DWORD *)a2 + 8) + 5), (int)a2, (int)flasher_callback); } //----- (01009950) -------------------------------------------------------- -void __stdcall flasher_start(struct flasher_type *a1, int a2) +void flasher_start(struct flasher_type *a1, int a2) { - *((_DWORD *)a1 + 8) = a2; + *((DWORD *)a1 + 8) = a2; flasher_callback(0, (void *)a1); } //----- (0100996F) -------------------------------------------------------- -void __stdcall flasher_stop(struct flasher_type *a1, int a2) +void flasher_stop(struct flasher_type *a1, int a2) { - if ( *((_DWORD *)a1 + 7) ) - timer_kill(*((_DWORD *)a1 + 7)); - *((_DWORD *)a1 + 7) = 0; + if ( *((DWORD *)a1 + 7) ) + timer_kill(*((DWORD *)a1 + 7)); + *((DWORD *)a1 + 7) = 0; if ( a2 >= 0 ) { - *((_DWORD *)a1 + 8) = a2; - render_sprite_set_bitmap(*(_DWORD **)a1, *((_DWORD *)a1 + a2 + 1)); + *((DWORD *)a1 + 8) = a2; + render_sprite_set_bitmap(*(DWORD **)a1, *((DWORD *)a1 + a2 + 1)); } } \ No newline at end of file diff --git a/graphics/fullscreen.cpp b/graphics/fullscreen.cpp index 76d5d9d..e9c93b6 100644 --- a/graphics/fullscreen.cpp +++ b/graphics/fullscreen.cpp @@ -55,7 +55,7 @@ LONG sub_100399D() } //----- (010039C5) -------------------------------------------------------- -BOOL __stdcall fullscrn_set_menu_mode(int a1) +BOOL fullscrn_set_menu_mode(int a1) { BOOL result; // eax @@ -145,7 +145,7 @@ int sub_1003B66() // 1024EF4: using guessed type int fullscrn_display_changed; //----- (01003BE4) -------------------------------------------------------- -LONG __stdcall fullscrn_set_screen_mode(int a1) +LONG fullscrn_set_screen_mode(int a1) { LONG result; // eax @@ -178,14 +178,14 @@ LONG __stdcall fullscrn_set_screen_mode(int a1) // 1024EEC: using guessed type int dword_1024EEC; //----- (01003C87) -------------------------------------------------------- -void __stdcall fullscrn_force_redraw() +void fullscrn_force_redraw() { BYTE1(dword_1024EEC) |= 0x80u; } // 1024EEC: using guessed type int dword_1024EEC; //----- (01003C94) -------------------------------------------------------- -signed int __stdcall fullscrn_displaychange() +signed int fullscrn_displaychange() { signed int v0; // esi signed int result; // eax @@ -228,7 +228,7 @@ signed int __stdcall fullscrn_displaychange() // 1024EF4: using guessed type int fullscrn_display_changed; //----- (01003D65) -------------------------------------------------------- -BOOL __stdcall fullscrn_init(int a1, int a2, int a3, HWND a4, int a5, int a6) +BOOL fullscrn_init(int a1, int a2, int a3, HWND a4, int a5, int a6) { HWND v6; // eax int v7; // ebx @@ -269,7 +269,7 @@ BOOL __stdcall fullscrn_init(int a1, int a2, int a3, HWND a4, int a5, int a6) // 1024EF8: using guessed type int dword_1024EF8; //----- (01003E53) -------------------------------------------------------- -LONG __stdcall fullscrn_shutdown() +LONG fullscrn_shutdown() { LONG result; // eax @@ -280,7 +280,7 @@ LONG __stdcall fullscrn_shutdown() // 1024EF4: using guessed type int fullscrn_display_changed; //----- (01003E69) -------------------------------------------------------- -BOOL __stdcall fullscrn_activate(int a1) +BOOL fullscrn_activate(int a1) { BOOL result; // eax @@ -297,15 +297,15 @@ BOOL __stdcall fullscrn_activate(int a1) // 1024EE4: using guessed type int fullscrn_screen_mode; //----- (01003EA2) -------------------------------------------------------- -int __stdcall fullscrn_convert_mouse_pos(int a1) +int fullscrn_convert_mouse_pos(int a1) { - return (unsigned __int16)(a1 - xDest) | ((unsigned __int16)(HIWORD(a1) - yDest) << 16); + return (unsigned int)(a1 - xDest) | ((unsigned int)(HIWORD(a1) - yDest) << 16); } //----- (01003ECF) -------------------------------------------------------- -_DWORD *__stdcall fullscrn_getminmaxinfo(_DWORD *a1) +DWORD *fullscrn_getminmaxinfo(DWORD *a1) { - _DWORD *result; // eax + DWORD *result; // eax result = a1; a1[2] = X.right - X.left; @@ -316,7 +316,7 @@ _DWORD *__stdcall fullscrn_getminmaxinfo(_DWORD *a1) } //----- (01003F98) -------------------------------------------------------- -void __stdcall fullscrn_paint() +void fullscrn_paint() { int v0; // ST04_4 int v1; // eax diff --git a/graphics/graphics.cpp b/graphics/graphics.cpp index 361f6b2..4d058e2 100644 --- a/graphics/graphics.cpp +++ b/graphics/graphics.cpp @@ -5,11 +5,11 @@ #include "../pinball.h" //----- (01003803) -------------------------------------------------------- -int __stdcall grtext_draw_ttext_in_box(LPCSTR lpString, int mode, int a3, COLORREF color, int a5, int a6) +int grtext_draw_ttext_in_box(LPCSTR lpString, int mode, int a3, COLORREF color, int a5, int a6) { HDC v6; // ebx CHAR *v7; // eax - unsigned __int16 v8; // ax + unsigned int v8; // ax int v9; // eax struct tagRECT rc; // [esp+Ch] [ebp-10h] int modea; // [esp+28h] [ebp+Ch] @@ -46,10 +46,10 @@ int __stdcall grtext_draw_ttext_in_box(LPCSTR lpString, int mode, int a3, COLORR //----- (01004154) -------------------------------------------------------- -int __stdcall DibSetUsage(int a1, HPALETTE hpal, int a3) +int DibSetUsage(int a1, HPALETTE hpal, int a3) { signed int v4; // edi - unsigned __int16 v5; // cx + unsigned int v5; // cx char *v6; // esi signed int i; // eax _BYTE *v8; // eax @@ -61,19 +61,19 @@ int __stdcall DibSetUsage(int a1, HPALETTE hpal, int a3) hpal = (HPALETTE)GetStockObject(15); if ( !a1 ) return 0; - v4 = *(_DWORD *)(a1 + 32); + v4 = *(DWORD *)(a1 + 32); if ( !v4 ) { - v5 = *(_WORD *)(a1 + 14); + v5 = *(WORD *)(a1 + 14); if ( v5 <= 8u ) v4 = 1 << v5; } if ( v4 == 3 ) { - if ( *(_DWORD *)(a1 + 16) != 3 ) + if ( *(DWORD *)(a1 + 16) != 3 ) { LABEL_12: - v6 = (char *)(a1 + *(_DWORD *)a1); + v6 = (char *)(a1 + *(DWORD *)a1); if ( (unsigned int)a3 <= 0 || (unsigned int)a3 > 2 ) { if ( v4 >= 256 ) @@ -85,7 +85,7 @@ int __stdcall DibSetUsage(int a1, HPALETTE hpal, int a3) v8 = v6 + 1; do { - v9 = pPalEntries[(_DWORD)hpala].peRed; + v9 = pPalEntries[(DWORD)hpala].peRed; hpala = (HPALETTE)((char *)hpala + 1); v8[1] = v9; *v8 = v8[(char *)pPalEntries - v6]; @@ -99,7 +99,7 @@ int __stdcall DibSetUsage(int a1, HPALETTE hpal, int a3) else { for ( i = 0; i < v4; v6 += 2 ) - *(_WORD *)v6 = i++; + *(WORD *)v6 = i++; } return 1; } @@ -112,14 +112,14 @@ int __stdcall DibSetUsage(int a1, HPALETTE hpal, int a3) // 1004154: using guessed type struct tagPALETTEENTRY pPalEntries[256]; //----- (0100423A) -------------------------------------------------------- -_DWORD *__stdcall DibCreate(int a1, int a2, int a3) +DWORD *DibCreate(int a1, int a2, int a3) { unsigned int v3; // edi HGLOBAL v4; // eax - _DWORD *v5; // esi - _DWORD *result; // eax - _DWORD *i; // ecx - _DWORD *v8; // ecx + DWORD *v5; // esi + DWORD *result; // eax + DWORD *i; // ecx + DWORD *v8; // ecx int v9; // [esp+18h] [ebp+Ch] v3 = a3 * ((a2 * a1 / 8 + 3) & 0xFFFFFFFC); @@ -132,8 +132,8 @@ _DWORD *__stdcall DibCreate(int a1, int a2, int a3) v5[1] = a2; *v5 = 40; v5[2] = a3; - *((_WORD *)v5 + 6) = 1; - *((_WORD *)v5 + 7) = a1; + *((WORD *)v5 + 6) = 1; + *((WORD *)v5 + 7) = a1; v5[4] = 0; v5[6] = 0; v5[7] = 0; @@ -189,7 +189,7 @@ _DWORD *__stdcall DibCreate(int a1, int a2, int a3) } //----- (01004380) -------------------------------------------------------- -int __stdcall gdrv_init(int a1, HWND a2) +int gdrv_init(int a1, HWND a2) { gdrv_hinst = a1; gdrv_hwnd = a2; @@ -200,7 +200,7 @@ int __stdcall gdrv_init(int a1, HWND a2) // 1028284: using guessed type int gdrv_hinst; //----- (010043B9) -------------------------------------------------------- -int __stdcall gdrv_display_palette(int a1) +int gdrv_display_palette(int a1) { HWND v1; // eax HDC v2; // eax @@ -242,12 +242,12 @@ int __stdcall gdrv_display_palette(int a1) { if ( v6 ) { - v7[(_DWORD)v12] = v7[1]; - v7[(_DWORD)&pPalEntries - v6] = *v7; - v7[(_DWORD)((char *)&pPalEntries - v6 + 1)] = *(v7 - 1); + v7[(DWORD)v12] = v7[1]; + v7[(DWORD)&pPalEntries - v6] = *v7; + v7[(DWORD)((char *)&pPalEntries - v6 + 1)] = *(v7 - 1); v3 = v10; } - v7[(_DWORD)((char *)&pPalEntries - v6 + 2)] = 4; + v7[(DWORD)((char *)&pPalEntries - v6 + 2)] = 4; v7 += 4; --v11; } @@ -269,7 +269,7 @@ int __stdcall gdrv_display_palette(int a1) // 102345A: using guessed type char byte_102345A; //----- (01004508) -------------------------------------------------------- -int __stdcall gdrv_uninit() +int gdrv_uninit() { if ( gdrv_palette_handle ) DeleteObject(gdrv_palette_handle); @@ -277,64 +277,64 @@ int __stdcall gdrv_uninit() } //----- (01004520) -------------------------------------------------------- -int __stdcall gdrv_create_bitmap_dib(int a1, int a2, int a3) +int gdrv_create_bitmap_dib(int a1, int a2, int a3) { int v3; // edi - _DWORD *v4; // eax - _DWORD *v5; // eax + DWORD *v4; // eax + DWORD *v5; // eax int v6; // ecx v3 = a2; v4 = DibCreate(8, a2, a3); - *(_DWORD *)a1 = v4; + *(DWORD *)a1 = v4; DibSetUsage((int)v4, (HPALETTE)gdrv_palette_handle, 1); - *(_DWORD *)(a1 + 12) = a2; - *(_DWORD *)(a1 + 20) = a2; + *(DWORD *)(a1 + 12) = a2; + *(DWORD *)(a1 + 20) = a2; if ( a2 % 4 ) v3 = 4 - a2 % 4 + a2; - v5 = *(_DWORD **)a1; - *(_DWORD *)(a1 + 20) = v3; - *(_DWORD *)(a1 + 16) = a3; + v5 = *(DWORD **)a1; + *(DWORD *)(a1 + 20) = v3; + *(DWORD *)(a1 + 16) = a3; *(_BYTE *)(a1 + 24) = 2; if ( v5[4] == 3 ) v6 = (int)v5 + *v5 + 12; else v6 = (int)&v5[v5[8]] + *v5; - *(_DWORD *)(a1 + 8) = v6; - *(_DWORD *)(a1 + 4) = v6; + *(DWORD *)(a1 + 8) = v6; + *(DWORD *)(a1 + 4) = v6; return 0; } //----- (0100459A) -------------------------------------------------------- -int __stdcall gdrv_create_bitmap(int a1, int a2, int a3) +int gdrv_create_bitmap(int a1, int a2, int a3) { return gdrv_create_bitmap_dib(a1, a2, a3); } //----- (010045AA) -------------------------------------------------------- -signed int __stdcall gdrv_create_raw_bitmap(int a1, int a2, int a3, int a4) +signed int gdrv_create_raw_bitmap(int a1, int a2, int a3, int a4) { unsigned int v4; // ST04_4 int v5; // eax - *(_DWORD *)a1 = 0; - *(_DWORD *)(a1 + 12) = a2; - *(_DWORD *)(a1 + 20) = a2; + *(DWORD *)a1 = 0; + *(DWORD *)(a1 + 12) = a2; + *(DWORD *)(a1 + 20) = a2; if ( a4 && a2 % 4 ) - *(_DWORD *)(a1 + 20) = a2 - a2 % 4 + 4; - v4 = a3 * *(_DWORD *)(a1 + 20); - *(_DWORD *)(a1 + 16) = a3; + *(DWORD *)(a1 + 20) = a2 - a2 % 4 + 4; + v4 = a3 * *(DWORD *)(a1 + 20); + *(DWORD *)(a1 + 16) = a3; *(_BYTE *)(a1 + 24) = 1; v5 = memoryallocate(v4); - *(_DWORD *)(a1 + 8) = v5; + *(DWORD *)(a1 + 8) = v5; if ( !v5 ) return -1; - *(_DWORD *)(a1 + 4) = v5; + *(DWORD *)(a1 + 4) = v5; return 0; } //----- (0100460C) -------------------------------------------------------- -signed int __stdcall gdrv_destroy_bitmap(int a1) +signed int gdrv_destroy_bitmap(int a1) { HGLOBAL v2; // eax HGLOBAL v3; // eax @@ -343,7 +343,7 @@ signed int __stdcall gdrv_destroy_bitmap(int a1) return -1; if ( *(_BYTE *)(a1 + 24) == 1 ) { - memoryfree(*(_DWORD *)(a1 + 8)); + memoryfree(*(DWORD *)(a1 + 8)); } else if ( *(_BYTE *)(a1 + 24) == 2 ) { @@ -358,7 +358,7 @@ signed int __stdcall gdrv_destroy_bitmap(int a1) } //----- (01004664) -------------------------------------------------------- -UINT __stdcall gdrv_start_blit_sequence() +UINT gdrv_start_blit_sequence() { HDC v0; // eax @@ -371,7 +371,7 @@ UINT __stdcall gdrv_start_blit_sequence() // 102828C: using guessed type int gdrv_sequence_handle; //----- (0100469C) -------------------------------------------------------- -int __stdcall gdrv_blit_sequence(int a1, int xSrc, int a3, int xDest, int yDest, int DestWidth, int DestHeight) +int gdrv_blit_sequence(int a1, int xSrc, int a3, int xDest, int yDest, int DestWidth, int DestHeight) { int result; // eax @@ -383,7 +383,7 @@ int __stdcall gdrv_blit_sequence(int a1, int xSrc, int a3, int xDest, int yDest, DestWidth, DestHeight, xSrc, - *(_DWORD *)(a1 + 16) - a3 - DestHeight, + *(DWORD *)(a1 + 16) - a3 - DestHeight, DestWidth, DestHeight, *(const void **)(a1 + 8), @@ -395,13 +395,13 @@ int __stdcall gdrv_blit_sequence(int a1, int xSrc, int a3, int xDest, int yDest, // 1024EFC: using guessed type int gdrv_use_wing; //----- (010046ED) -------------------------------------------------------- -int __stdcall gdrv_end_blit_sequence() +int gdrv_end_blit_sequence() { return ReleaseDC(gdrv_hwnd, gdrv_sequence_hdc); } //----- (01004705) -------------------------------------------------------- -HDC __stdcall gdrv_blit(int a1, int xSrc, int a3, int xDest, int yDest, int DestWidth, int DestHeight) +HDC gdrv_blit(int a1, int xSrc, int a3, int xDest, int yDest, int DestWidth, int DestHeight) { HDC result; // eax HDC v8; // esi @@ -420,7 +420,7 @@ HDC __stdcall gdrv_blit(int a1, int xSrc, int a3, int xDest, int yDest, int Dest DestWidth, DestHeight, xSrc, - *(_DWORD *)(a1 + 16) - a3 - DestHeight, + *(DWORD *)(a1 + 16) - a3 - DestHeight, DestWidth, DestHeight, *(const void **)(a1 + 8), @@ -434,7 +434,7 @@ HDC __stdcall gdrv_blit(int a1, int xSrc, int a3, int xDest, int yDest, int Dest // 1024EFC: using guessed type int gdrv_use_wing; //----- (01004787) -------------------------------------------------------- -int __stdcall gdrv_blat(int a1, int xDest, int yDest) +int gdrv_blat(int a1, int xDest, int yDest) { HDC v3; // edi @@ -446,12 +446,12 @@ int __stdcall gdrv_blat(int a1, int xDest, int yDest) v3, xDest, yDest, - *(_DWORD *)(a1 + 12), - *(_DWORD *)(a1 + 16), + *(DWORD *)(a1 + 12), + *(DWORD *)(a1 + 16), 0, 0, - *(_DWORD *)(a1 + 12), - *(_DWORD *)(a1 + 16), + *(DWORD *)(a1 + 12), + *(DWORD *)(a1 + 16), *(const void **)(a1 + 8), *(const BITMAPINFO **)a1, 1u, @@ -461,9 +461,9 @@ int __stdcall gdrv_blat(int a1, int xDest, int yDest) // 1024EFC: using guessed type int gdrv_use_wing; //----- (010047FA) -------------------------------------------------------- -int __userpurge gdrv_fill_bitmap@(int a1@, _DWORD *a2, unsigned int a3, int a4, int a5, int a6, char a7) +int gdrv_fill_bitmap(int a1, DWORD *a2, unsigned int a3, int a4, int a5, int a6, char a7) { -_DWORD *v7; // esi +DWORD *v7; // esi int v8; // eax int result; // eax unsigned int v10; // ecx @@ -506,11 +506,11 @@ return result; } //----- (01004870) -------------------------------------------------------- -char *__stdcall gdrv_copy_bitmap(_DWORD *a1, int a2, int a3, int a4, int a5, _DWORD *a6, int a7, int a8) +char *gdrv_copy_bitmap(DWORD *a1, int a2, int a3, int a4, int a5, DWORD *a6, int a7, int a8) { - _DWORD *v8; // edx + DWORD *v8; // edx int v9; // ecx - _DWORD *v10; // esi + DWORD *v10; // esi int v11; // eax char *result; // eax _BYTE *v13; // ecx @@ -554,11 +554,11 @@ char *__stdcall gdrv_copy_bitmap(_DWORD *a1, int a2, int a3, int a4, int a5, _DW } //----- (010048EC) -------------------------------------------------------- -_BYTE *__stdcall gdrv_copy_bitmap_w_transparency(_DWORD *a1, int a2, int a3, int a4, int a5, _DWORD *a6, int a7, int a8) +_BYTE *gdrv_copy_bitmap_w_transparency(DWORD *a1, int a2, int a3, int a4, int a5, DWORD *a6, int a7, int a8) { - _DWORD *v8; // edx + DWORD *v8; // edx int v9; // ecx - _DWORD *v10; // esi + DWORD *v10; // esi int v11; // eax _BYTE *result; // eax _BYTE *v13; // ecx @@ -604,7 +604,7 @@ _BYTE *__stdcall gdrv_copy_bitmap_w_transparency(_DWORD *a1, int a2, int a3, int //----- (01003F10) -------------------------------------------------------- -HBRUSH __userpurge sub_1003F10@(LONG a1@, LONG a2@, int a3, int a4) +HBRUSH sub_1003F10(LONG a1, LONG a2, int a3, int a4) { HBRUSH result; // eax HDC v5; // esi @@ -634,7 +634,7 @@ return result; } //----- (0100496C) -------------------------------------------------------- -int __stdcall zdrv_pad(int a1) +int zdrv_pad(int a1) { int result; // eax @@ -645,42 +645,42 @@ int __stdcall zdrv_pad(int a1) } //----- (01004989) -------------------------------------------------------- -signed int __stdcall zdrv_create_zmap(int a1, int a2, int a3) +signed int zdrv_create_zmap(int a1, int a2, int a3) { - __int16 v3; // ax + int v3; // ax int v4; // eax v3 = zdrv_pad(a2); - *(_WORD *)(a1 + 4) = v3; + *(WORD *)(a1 + 4) = v3; v4 = memoryallocate(2 * a3 * v3); - *(_DWORD *)(a1 + 6) = v4; + *(DWORD *)(a1 + 6) = v4; if ( !v4 ) return -1; - *(_DWORD *)(a1 + 10) = v4; - *(_WORD *)a1 = a2; - *(_WORD *)(a1 + 2) = a3; + *(DWORD *)(a1 + 10) = v4; + *(WORD *)a1 = a2; + *(WORD *)(a1 + 2) = a3; return 0; } //----- (010049D6) -------------------------------------------------------- -signed int __stdcall zdrv_destroy_zmap(_DWORD *a1) +signed int zdrv_destroy_zmap(DWORD *a1) { int v2; // edi if ( !a1 ) return -1; - if ( *(_DWORD *)((char *)a1 + 6) ) - memoryfree(*(_DWORD *)((char *)a1 + 6)); + if ( *(DWORD *)((char *)a1 + 6) ) + memoryfree(*(DWORD *)((char *)a1 + 6)); *a1 = 0; a1[1] = 0; v2 = (int)(a1 + 2); - *(_DWORD *)v2 = 0; - *(_WORD *)(v2 + 4) = 0; + *(DWORD *)v2 = 0; + *(WORD *)(v2 + 4) = 0; return 0; } //----- (01004A08) -------------------------------------------------------- -int __userpurge zdrv_fill@(int a1@, int a2, unsigned int a3, int a4, int a5, int a6, __int16 a7) +int zdrv_fill(int a1, int a2, unsigned int a3, int a4, int a5, int a6, int a7) { int result; // eax int v8; // esi @@ -695,7 +695,7 @@ int v16; // [esp+Ch] [ebp+8h] result = a4; v8 = a2; -v9 = (char *)(*(_DWORD *)(a2 + 6) + 2 * (a5 + *(signed __int16 *)(a2 + 4) * (*(signed __int16 *)(a2 + 2) - a4 - a6))); +v9 = (char *)(*(DWORD *)(a2 + 6) + 2 * (a5 + *(signed int *)(a2 + 4) * (*(signed int *)(a2 + 2) - a4 - a6))); if ( a4 > 0 ) { v10 = a3; @@ -713,13 +713,13 @@ memset32(v9, a1, v12); v13 = &v9[4 * v12]; for ( i = v11; i; --i ) { -*(_WORD *)v13 = a7; +*(WORD *)v13 = a7; v13 += 2; } v10 = a3; v9 += 2 * a3; } -result = *(signed __int16 *)(v8 + 4) - v10; +result = *(signed int *)(v8 + 4) - v10; v15 = v16-- == 1; v9 += 2 * result; } @@ -729,13 +729,13 @@ return result; } //----- (01004A76) -------------------------------------------------------- -_WORD *__stdcall zdrv_paint(int a1, int a2, _DWORD *a3, int a4, int a5, int a6, int a7, int a8, _DWORD *a9, int a10, int a11, int a12, int a13, int a14) +WORD *zdrv_paint(int a1, int a2, DWORD *a3, int a4, int a5, int a6, int a7, int a8, DWORD *a9, int a10, int a11, int a12, int a13, int a14) { int v14; // ecx - _DWORD *v15; // ebx + DWORD *v15; // ebx int v16; // eax - _WORD *v17; // edi - _WORD *result; // eax + WORD *v17; // edi + WORD *result; // eax bool v19; // zf int v20; // [esp+18h] [ebp+Ch] int v21; // [esp+24h] [ebp+18h] @@ -751,10 +751,10 @@ _WORD *__stdcall zdrv_paint(int a1, int a2, _DWORD *a3, int a4, int a5, int a6, v14 = -v14; v23 = (_BYTE *)(a10 + a9[2] + a9[5] * (v16 - a2 - a11)); v22 = (_BYTE *)(a4 + a3[2] + a3[5] * (v14 - a2 - a5)); - v17 = (_WORD *)(*(_DWORD *)(a12 + 6) - + 2 * (a13 + *(signed __int16 *)(a12 + 4) * (*(signed __int16 *)(a12 + 2) - a2 - a14))); - result = (_WORD *)(*(_DWORD *)(a6 + 6) - + 2 * (a7 + *(signed __int16 *)(a6 + 4) * (*(signed __int16 *)(a6 + 2) - a2 - a8))); + v17 = (WORD *)(*(DWORD *)(a12 + 6) + + 2 * (a13 + *(signed int *)(a12 + 4) * (*(signed int *)(a12 + 2) - a2 - a14))); + result = (WORD *)(*(DWORD *)(a6 + 6) + + 2 * (a7 + *(signed int *)(a6 + 4) * (*(signed int *)(a6 + 2) - a2 - a8))); if ( a2 ) { v21 = a2; @@ -781,9 +781,9 @@ _WORD *__stdcall zdrv_paint(int a1, int a2, _DWORD *a3, int a4, int a5, int a6, } v23 += v15[5] - a1; v22 += a3[5] - a1; - v17 += *(signed __int16 *)(a12 + 4) - a1; + v17 += *(signed int *)(a12 + 4) - a1; v19 = v21-- == 1; - result += *(signed __int16 *)(a6 + 4) - a1; + result += *(signed int *)(a6 + 4) - a1; if ( v19 ) break; v15 = a9; @@ -793,14 +793,14 @@ _WORD *__stdcall zdrv_paint(int a1, int a2, _DWORD *a3, int a4, int a5, int a6, } //----- (01004B75) -------------------------------------------------------- -unsigned __int16 *__stdcall zdrv_paint_flat(int a1, int a2, _DWORD *a3, int a4, int a5, int a6, int a7, int a8, _DWORD *a9, int a10, int a11, unsigned __int16 a12) +unsigned int *zdrv_paint_flat(int a1, int a2, DWORD *a3, int a4, int a5, int a6, int a7, int a8, DWORD *a9, int a10, int a11, unsigned int a12) { - _DWORD *v12; // esi + DWORD *v12; // esi int v13; // ecx - _DWORD *v14; // edi + DWORD *v14; // edi int v15; // eax int v16; // ecx - unsigned __int16 *result; // eax + unsigned int *result; // eax bool v18; // zf int v19; // [esp+18h] [ebp+Ch] _BYTE *v20; // [esp+1Ch] [ebp+10h] @@ -818,8 +818,8 @@ unsigned __int16 *__stdcall zdrv_paint_flat(int a1, int a2, _DWORD *a3, int a4, v16 = a3[2] + a3[5] * (v13 - a2 - a5); v20 = (_BYTE *)(a10 + a9[2] + a9[5] * (v15 - a2 - a11)); v21 = (_BYTE *)(a4 + v16); - result = (unsigned __int16 *)(*(_DWORD *)(a6 + 6) - + 2 * (a7 + *(signed __int16 *)(a6 + 4) * (*(signed __int16 *)(a6 + 2) - a2 - a8))); + result = (unsigned int *)(*(DWORD *)(a6 + 6) + + 2 * (a7 + *(signed int *)(a6 + 4) * (*(signed int *)(a6 + 2) - a2 - a8))); if ( a2 > 0 ) { v22 = a2; @@ -845,7 +845,7 @@ unsigned __int16 *__stdcall zdrv_paint_flat(int a1, int a2, _DWORD *a3, int a4, v20 += v14[5] - a1; v21 += v12[5] - a1; v18 = v22-- == 1; - result += *(signed __int16 *)(a6 + 4) - a1; + result += *(signed int *)(a6 + 4) - a1; } while ( !v18 ); } diff --git a/graphics/render.cpp b/graphics/render.cpp index 9cd5b68..75168a9 100644 --- a/graphics/render.cpp +++ b/graphics/render.cpp @@ -1,7 +1,7 @@ #include "../pinball.h" //----- (0101304D) -------------------------------------------------------- -void __stdcall render_repaint(struct render_sprite_type_struct *a1) +void render_repaint(struct render_sprite_type_struct *a1) { int *v1; // edi bool v2; // zf @@ -14,17 +14,17 @@ int v8; // [esp+14h] [ebp-4h] struct render_sprite_type_struct *v9; // [esp+20h] [ebp+8h] v1 = (int *)a1; -if ( *((_DWORD *)a1 + 17) ) +if ( *((DWORD *)a1 + 17) ) { -v2 = *((_DWORD *)a1 + 18) == 0; -v3 = *((_DWORD *)a1 + 18) < 0; +v2 = *((DWORD *)a1 + 18) == 0; +v3 = *((DWORD *)a1 + 18) < 0; v9 = 0; if ( !v3 && !v2 ) { do { -v4 = *(_DWORD *)(v1[17] + 4 * (_DWORD)v9); -if ( !*(_BYTE *)(v4 + 24) && *(_DWORD *)(v4 + 16) ) +v4 = *(DWORD *)(v1[17] + 4 * (DWORD)v9); +if ( !*(_BYTE *)(v4 + 24) && *(DWORD *)(v4 + 16) ) { if ( rectangle_clip((int *)v4, v1 + 13, &v5) ) zdrv_paint( @@ -36,12 +36,12 @@ v6, (int)&zscreen, v5, v6, -*(_DWORD **)(v4 + 16), -v5 - *(_DWORD *)v4, -v6 - *(_DWORD *)(v4 + 4), -*(_DWORD *)(v4 + 20), -v5 + *(_DWORD *)(v4 + 44) - *(_DWORD *)v4, -v6 + *(_DWORD *)(v4 + 48) - *(_DWORD *)(v4 + 4)); +*(DWORD **)(v4 + 16), +v5 - *(DWORD *)v4, +v6 - *(DWORD *)(v4 + 4), +*(DWORD *)(v4 + 20), +v5 + *(DWORD *)(v4 + 44) - *(DWORD *)v4, +v6 + *(DWORD *)(v4 + 48) - *(DWORD *)(v4 + 4)); } v9 = (struct render_sprite_type_struct *)((char *)v9 + 1); } @@ -51,7 +51,7 @@ while ( (signed int)v9 < v1[18] ); } //----- (010130F3) -------------------------------------------------------- -void __stdcall render_paint_balls() +void render_paint_balls() { int v0; // ecx int v1; // edi @@ -65,7 +65,7 @@ int v8; // ebx int v9; // ST48_4 int v10; // [esp+Ch] [ebp-10h] struct render_sprite_type_struct **v11; // [esp+10h] [ebp-Ch] -_DWORD *v12; // [esp+14h] [ebp-8h] +DWORD *v12; // [esp+14h] [ebp-8h] v0 = render_many_balls; if ( render_many_balls > 1 ) @@ -79,7 +79,7 @@ for ( i = v1; i < v0 / 2; ++i ) { v3 = render_ball_list[i]; v4 = &render_ball_list[v1]; -if ( *((_WORD *)*v4 + 13) > *((_WORD *)v3 + 13) ) +if ( *((WORD *)*v4 + 13) > *((WORD *)v3 + 13) ) { v5 = *v4; *v4 = v3; @@ -101,7 +101,7 @@ do { v6 = *v11; v7 = (int *)((char *)*v11 + 52); -if ( *((_DWORD *)*v11 + 4) && rectangle_clip((int *)v6, (int *)&vscreen_rect, (_DWORD *)*v11 + 13) ) +if ( *((DWORD *)*v11 + 4) && rectangle_clip((int *)v6, (int *)&vscreen_rect, (DWORD *)*v11 + 13) ) { v8 = *v7; v9 = v7[1]; @@ -115,17 +115,17 @@ v9, (int)&zscreen, v8, v9, -*((_DWORD **)v6 + 4), -v8 - *(_DWORD *)v6, -v9 - *((_DWORD *)v6 + 1), -*((_WORD *)v6 + 13)); +*((DWORD **)v6 + 4), +v8 - *(DWORD *)v6, +v9 - *((DWORD *)v6 + 1), +*((WORD *)v6 + 13)); } else { v7[2] = -1; } ++v10; -v12 = (_DWORD *)((char *)v12 + 37); +v12 = (DWORD *)((char *)v12 + 37); ++v11; } while ( v10 < render_many_balls ); @@ -135,14 +135,14 @@ while ( v10 < render_many_balls ); // 1025070: using guessed type int render_many_balls; //----- (0101320D) -------------------------------------------------------- -void __stdcall render_unpaint_balls() +void render_unpaint_balls() { -_DWORD *v0; // ebx +DWORD *v0; // ebx struct render_sprite_type_struct *v1; // edi -_DWORD *v2; // esi +DWORD *v2; // esi int v3; // eax -_DWORD *v4; // edi -_DWORD *v5; // esi +DWORD *v4; // edi +DWORD *v5; // esi bool v6; // zf int v7; // [esp+0h] [ebp-8h] struct render_sprite_type_struct **v8; // [esp+4h] [ebp-4h] @@ -150,17 +150,17 @@ struct render_sprite_type_struct **v8; // [esp+4h] [ebp-4h] v8 = &render_ball_list[render_many_balls - 1]; if ( render_many_balls - 1 >= 0 ) { -v0 = (_DWORD *)((char *)&ball_bitmap + 37 * (render_many_balls - 1)); +v0 = (DWORD *)((char *)&ball_bitmap + 37 * (render_many_balls - 1)); v7 = render_many_balls; do { v1 = *v8; -v2 = (_DWORD *)((char *)*v8 + 52); -v3 = *((_DWORD *)*v8 + 15); +v2 = (DWORD *)((char *)*v8 + 52); +v3 = *((DWORD *)*v8 + 15); if ( v3 > 0 ) -gdrv_copy_bitmap(&vscreen, v3, *((_DWORD *)*v8 + 16), *((_DWORD *)*v8 + 13), *((_DWORD *)*v8 + 14), v0, 0, 0); +gdrv_copy_bitmap(&vscreen, v3, *((DWORD *)*v8 + 16), *((DWORD *)*v8 + 13), *((DWORD *)*v8 + 14), v0, 0, 0); --v8; -v4 = (_DWORD *)((char *)v1 + 28); +v4 = (DWORD *)((char *)v1 + 28); *v4 = *v2; v5 = v2 + 1; ++v4; @@ -168,7 +168,7 @@ v5 = v2 + 1; ++v5; ++v4; *v4 = *v5; -v0 = (_DWORD *)((char *)v0 - 37); +v0 = (DWORD *)((char *)v0 - 37); v6 = v7-- == 1; v4[1] = v5[1]; } @@ -179,7 +179,7 @@ while ( !v6 ); // 1025070: using guessed type int render_many_balls; //----- (01013283) -------------------------------------------------------- -int __stdcall render_remove_sprite(struct render_sprite_type_struct *a1) +int render_remove_sprite(struct render_sprite_type_struct *a1) { int v1; // eax int v2; // ecx @@ -200,8 +200,8 @@ v1 = render_many_sprites; ++v2; } render_many_sprites = v1 - 1; -if ( *((_DWORD *)a1 + 17) ) -memoryfree(*((_DWORD *)a1 + 17)); +if ( *((DWORD *)a1 + 17) ) +memoryfree(*((DWORD *)a1 + 17)); memoryfree((int)a1); return 1; } @@ -209,7 +209,7 @@ return 1; // 10250B4: using guessed type int render_many_sprites; //----- (010132E8) -------------------------------------------------------- -int __stdcall render_remove_ball(struct render_sprite_type_struct *a1) +int render_remove_ball(struct render_sprite_type_struct *a1) { int v1; // eax int v2; // ecx @@ -237,7 +237,7 @@ return 1; // 1025070: using guessed type int render_many_balls; //----- (010133C7) -------------------------------------------------------- -void __stdcall render_update() +void render_update() { int i; // eax int *v1; // esi @@ -293,7 +293,7 @@ v27 = v15; v26 = v16; zdrv_fill((int)&vscreen, (int)&zscreen, v16, v18, v17, v15, 0xFFFF); if ( render_background_bitmap ) -gdrv_copy_bitmap(&vscreen, v26, v18, v17, v27, (_DWORD *)render_background_bitmap, v17, v27); +gdrv_copy_bitmap(&vscreen, v26, v18, v17, v27, (DWORD *)render_background_bitmap, v17, v27); else gdrv_fill_bitmap((int)&vscreen, &vscreen, v26, v18, v17, v27, 0); goto LABEL_8; @@ -322,7 +322,7 @@ if ( i > 0 ) do { v5 = *v3; -if ( *((_DWORD *)*v3 + 15) > 0 && (!*((_BYTE *)v5 + 25) || *((_BYTE *)v5 + 25) == 1) ) +if ( *((DWORD *)*v3 + 15) > 0 && (!*((_BYTE *)v5 + 25) || *((_BYTE *)v5 + 25) == 1) ) render_repaint(*v3); ++v4; ++v3; @@ -340,7 +340,7 @@ for ( j = render_dirty_list; v28 < render_many_dirty; ++j ) { v6 = *j; v7 = (int *)((char *)*j + 52); -v8 = *((_DWORD *)*j + 15); +v8 = *((DWORD *)*j + 15); v25 = *j; if ( v8 > 0 ) gdrv_blit_sequence((int)&vscreen, *v7, v7[1], *v7 + v27, v7[1] + v26, v8, v7[3]); @@ -365,7 +365,7 @@ for ( j = render_ball_list; v28 < render_many_balls; ++j ) v13 = (int *)((char *)*j + 28); v14 = (int *)((char *)*j + 52); if ( overlapping_box((struct rectangle_type *)v14, (struct rectangle_type *)v13, (struct rectangle_type *)&xSrc) -&& *((_DWORD *)*j + 15) > 0 ) +&& *((DWORD *)*j + 15) > 0 ) { if ( v23 > 0 ) gdrv_blit_sequence((int)&vscreen, xSrc, v22, xSrc + v27, v22 + v26, v23, v24); @@ -395,7 +395,7 @@ render_unpaint_balls(); // 10253B0: using guessed type int render_offset_y; //----- (01013670) -------------------------------------------------------- -void __stdcall render_uninit() +void render_uninit() { int i; // esi int j; // esi @@ -421,7 +421,7 @@ render_many_balls = 0; // 10250C0: using guessed type int render_many_dirty; //----- (01013705) -------------------------------------------------------- -char *__stdcall render_init(_DWORD *a1, float a2, float a3, int a4, int a5) +char *render_init(DWORD *a1, float a2, float a3, int a4, int a5) { int v5; // edi char *result; // eax @@ -460,7 +460,7 @@ result = (char *)gdrv_fill_bitmap((int)&vscreen, &vscreen, dword_1025094, dword_ return result; } // 1024F04: using guessed type int memory_critical_allocation; -// 102505A: using guessed type __int16 word_102505A; +// 102505A: using guessed type int word_102505A; // 1025068: using guessed type struct render_sprite_type_struct **render_dirty_list; // 102506C: using guessed type struct render_sprite_type_struct **render_ball_list; // 1025078: using guessed type int dword_1025078; @@ -475,7 +475,7 @@ return result; // 10253AC: using guessed type int render_offset_x; //----- (0101382A) -------------------------------------------------------- -int __stdcall render_sprite_modified(int a1) +int render_sprite_modified(int a1) { int result; // eax @@ -491,7 +491,7 @@ return result; // 10250C0: using guessed type int render_many_dirty; //----- (0101385C) -------------------------------------------------------- -int __stdcall render_create_sprite(int a1, int a2, int a3, int a4, int a5, _DWORD *a6) +int render_create_sprite(int a1, int a2, int a3, int a4, int a5, DWORD *a6) { int v6; // ebx int result; // eax @@ -500,50 +500,50 @@ v6 = memoryallocate(0x5Cu); result = 0; if ( v6 ) { -*(_DWORD *)(v6 + 4) = a5; -*(_DWORD *)(v6 + 16) = a2; -*(_DWORD *)v6 = a4; +*(DWORD *)(v6 + 4) = a5; +*(DWORD *)(v6 + 16) = a2; +*(DWORD *)v6 = a4; *(_BYTE *)(v6 + 25) = a1; *(_BYTE *)(v6 + 24) = 0; -*(_DWORD *)(v6 + 68) = 0; -*(_DWORD *)(v6 + 72) = 0; +*(DWORD *)(v6 + 68) = 0; +*(DWORD *)(v6 + 72) = 0; if ( a6 ) { -*(_DWORD *)(v6 + 76) = *a6; -*(_DWORD *)(v6 + 80) = a6[1]; -*(_DWORD *)(v6 + 84) = a6[2]; -*(_DWORD *)(v6 + 88) = a6[3]; +*(DWORD *)(v6 + 76) = *a6; +*(DWORD *)(v6 + 80) = a6[1]; +*(DWORD *)(v6 + 84) = a6[2]; +*(DWORD *)(v6 + 88) = a6[3]; } else { -*(_DWORD *)(v6 + 84) = -1; -*(_DWORD *)(v6 + 88) = -1; -*(_DWORD *)(v6 + 76) = 0; -*(_DWORD *)(v6 + 80) = 0; +*(DWORD *)(v6 + 84) = -1; +*(DWORD *)(v6 + 88) = -1; +*(DWORD *)(v6 + 76) = 0; +*(DWORD *)(v6 + 80) = 0; } if ( a2 ) { -*(_DWORD *)(v6 + 8) = *(_DWORD *)(a2 + 12); -*(_DWORD *)(v6 + 12) = *(_DWORD *)(a2 + 16); +*(DWORD *)(v6 + 8) = *(DWORD *)(a2 + 12); +*(DWORD *)(v6 + 12) = *(DWORD *)(a2 + 16); } else { -*(_DWORD *)(v6 + 8) = 0; -*(_DWORD *)(v6 + 12) = 0; +*(DWORD *)(v6 + 8) = 0; +*(DWORD *)(v6 + 12) = 0; } -*(_DWORD *)(v6 + 20) = a3; -*(_DWORD *)(v6 + 48) = 0; -*(_DWORD *)(v6 + 44) = 0; +*(DWORD *)(v6 + 20) = a3; +*(DWORD *)(v6 + 48) = 0; +*(DWORD *)(v6 + 44) = 0; if ( !a3 && a1 != 2 ) { -*(_DWORD *)(v6 + 20) = render_background_zmap; -*(_DWORD *)(v6 + 44) = a4 - render_zmap_offset; -*(_DWORD *)(v6 + 48) = a5 - dword_10253C0; +*(DWORD *)(v6 + 20) = render_background_zmap; +*(DWORD *)(v6 + 44) = a4 - render_zmap_offset; +*(DWORD *)(v6 + 48) = a5 - dword_10253C0; } -*(_DWORD *)(v6 + 28) = *(_DWORD *)v6; -*(_DWORD *)(v6 + 32) = *(_DWORD *)(v6 + 4); -*(_DWORD *)(v6 + 36) = *(_DWORD *)(v6 + 8); -*(_DWORD *)(v6 + 40) = *(_DWORD *)(v6 + 12); +*(DWORD *)(v6 + 28) = *(DWORD *)v6; +*(DWORD *)(v6 + 32) = *(DWORD *)(v6 + 4); +*(DWORD *)(v6 + 36) = *(DWORD *)(v6 + 8); +*(DWORD *)(v6 + 40) = *(DWORD *)(v6 + 12); if ( a1 == 2 ) { render_ball_list[render_many_balls++] = (struct render_sprite_type_struct *)v6; @@ -565,7 +565,7 @@ return result; // 10253C0: using guessed type int dword_10253C0; //----- (0101394E) -------------------------------------------------------- -int __stdcall render_set_background_zmap(struct zmap_header_type *a1, int a2, int a3) +int render_set_background_zmap(struct zmap_header_type *a1, int a2, int a3) { int result; // eax @@ -579,7 +579,7 @@ return result; // 10253C0: using guessed type int dword_10253C0; //----- (01013974) -------------------------------------------------------- -int __stdcall render_sprite_set(_DWORD *a1, int a2, int a3, int a4, int a5) +int render_sprite_set(DWORD *a1, int a2, int a3, int a4, int a5) { int result; // eax @@ -591,8 +591,8 @@ a1[1] = a5; a1[4] = a2; if ( a2 ) { -a1[2] = *(_DWORD *)(a2 + 12); -a1[3] = *(_DWORD *)(a2 + 16); +a1[2] = *(DWORD *)(a2 + 12); +a1[3] = *(DWORD *)(a2 + 16); } a1[5] = a3; result = render_sprite_modified((int)a1); @@ -601,46 +601,46 @@ return result; } //----- (010139B6) -------------------------------------------------------- -void __stdcall render_sprite_set_bitmap(_DWORD *a1, int a2) +void render_sprite_set_bitmap(DWORD *a1, int a2) { if ( a1 && a1[4] != a2 ) { a1[4] = a2; if ( a2 ) { -a1[2] = *(_DWORD *)(a2 + 12); -a1[3] = *(_DWORD *)(a2 + 16); +a1[2] = *(DWORD *)(a2 + 12); +a1[3] = *(DWORD *)(a2 + 16); } render_sprite_modified((int)a1); } } //----- (010139EC) -------------------------------------------------------- -void __stdcall render_ball_set(int a1, int a2, float a3, int a4, int a5) +void render_ball_set(int a1, int a2, float a3, int a4, int a5) { double v5; // st7 if ( a1 ) { -*(_DWORD *)(a1 + 16) = a2; +*(DWORD *)(a1 + 16) = a2; if ( a2 ) { -*(_DWORD *)a1 = a4; -*(_DWORD *)(a1 + 4) = a5; -*(_DWORD *)(a1 + 8) = *(_DWORD *)(a2 + 12); -*(_DWORD *)(a1 + 12) = *(_DWORD *)(a2 + 16); +*(DWORD *)a1 = a4; +*(DWORD *)(a1 + 4) = a5; +*(DWORD *)(a1 + 8) = *(DWORD *)(a2 + 12); +*(DWORD *)(a1 + 12) = *(DWORD *)(a2 + 16); } if ( a3 >= (double)render_zmin ) { v5 = (a3 - render_zmin) * render_zscaler; if ( v5 <= render_zmax ) -*(_WORD *)(a1 + 26) = (signed __int64)v5; +*(WORD *)(a1 + 26) = (signed __int64)v5; else -*(_WORD *)(a1 + 26) = -1; +*(WORD *)(a1 + 26) = -1; } else { -*(_WORD *)(a1 + 26) = 0; +*(WORD *)(a1 + 26) = 0; } } } @@ -649,7 +649,7 @@ else // 10250BC: using guessed type float render_zmin; //----- (01013A6A) -------------------------------------------------------- -void __stdcall render_paint() +void render_paint() { render_paint_balls(); gdrv_blat((int)&vscreen, xDest, yDest); @@ -657,7 +657,7 @@ render_unpaint_balls(); } //----- (01013A8F) -------------------------------------------------------- -void __stdcall render_shift(int a1, int a2, int xSrc, int a4, int DestWidth, int DestHeight) +void render_shift(int a1, int a2, int xSrc, int a4, int DestWidth, int DestHeight) { render_offset_x += a1; render_offset_y += a2; diff --git a/graphics/splash.cpp b/graphics/splash.cpp index 9e9253c..4acd40f 100644 --- a/graphics/splash.cpp +++ b/graphics/splash.cpp @@ -5,7 +5,7 @@ #include "../pinball.h" //----- (01006D96) -------------------------------------------------------- -HPALETTE __stdcall splash_init_palette(LOGPALETTE *plpal) +HPALETTE splash_init_palette(LOGPALETTE *plpal) { LOGPALETTE *v1; // edi HWND v2; // eax @@ -75,7 +75,7 @@ HPALETTE __stdcall splash_init_palette(LOGPALETTE *plpal) } //----- (01006EB9) -------------------------------------------------------- -HBITMAP __stdcall load_title_bitmap(HMODULE hModule, HDC hdc, LPCSTR lpName, UINT iStart, int a5, int a6) +HBITMAP load_title_bitmap(HMODULE hModule, HDC hdc, LPCSTR lpName, UINT iStart, int a5, int a6) { HRSRC v6; // eax HGLOBAL v7; // eax @@ -111,7 +111,7 @@ HBITMAP __stdcall load_title_bitmap(HMODULE hModule, HDC hdc, LPCSTR lpName, UIN if ( !v12 && !v13 ) { lpNamea = splash_init_palette(&plpal); - *(_DWORD *)a6 = lpNamea; + *(DWORD *)a6 = lpNamea; if ( lpNamea ) { hModulea = 0; @@ -144,7 +144,7 @@ HBITMAP __stdcall load_title_bitmap(HMODULE hModule, HDC hdc, LPCSTR lpName, UIN } //----- (01006FCB) -------------------------------------------------------- -int __stdcall splash_bitmap_setup(int a1) +int splash_bitmap_setup(int a1) { HWND v1; // eax HDC v2; // eax @@ -165,7 +165,7 @@ int __stdcall splash_bitmap_setup(int a1) v3 = v2; if ( v2 ) { - *(_DWORD *)(a1 + 12) = CreateCompatibleDC(v2); + *(DWORD *)(a1 + 12) = CreateCompatibleDC(v2); v4 = CreateCompatibleBitmap(v3, 10, 10); v5 = *(HWND *)a1; h = v4; @@ -180,15 +180,15 @@ int __stdcall splash_bitmap_setup(int a1) v7 = load_title_bitmap(hInstance, *(HDC *)(a1 + 12), (LPCSTR)(a1 + 32), 0xAu, 236, a1 + 4); else v7 = LoadBitmapA(hInstance, (LPCSTR)(a1 + 232)); - *(_DWORD *)(a1 + 8) = v7; + *(DWORD *)(a1 + 8) = v7; if ( v7 ) { SelectObject(*(HDC *)(a1 + 12), v7); DeleteObject(h); GetObjectA(*(HANDLE *)(a1 + 8), 24, &pv); - *(_DWORD *)(a1 + 16) = v10; + *(DWORD *)(a1 + 16) = v10; result = v11; - *(_DWORD *)(a1 + 20) = v11; + *(DWORD *)(a1 + 20) = v11; return result; } } @@ -198,43 +198,43 @@ int __stdcall splash_bitmap_setup(int a1) GetLastError(); } } - if ( *(_DWORD *)(a1 + 4) ) + if ( *(DWORD *)(a1 + 4) ) DeleteObject(*(HGDIOBJ *)(a1 + 4)); - if ( *(_DWORD *)a1 ) + if ( *(DWORD *)a1 ) DestroyWindow(*(HWND *)a1); if ( h ) DeleteObject(h); - result = *(_DWORD *)(a1 + 12); + result = *(DWORD *)(a1 + 12); if ( result ) result = DeleteDC(*(HDC *)(a1 + 12)); - *(_DWORD *)(a1 + 8) = 0; + *(DWORD *)(a1 + 8) = 0; return result; } //----- (01007103) -------------------------------------------------------- -void __stdcall splash_paint(int a1, HDC hdc) +void splash_paint(int a1, HDC hdc) { HWND v2; // eax HPALETTE v3; // ST1C_4 struct tagRECT Rect; // [esp+4h] [ebp-10h] - if ( *(_DWORD *)(a1 + 8) ) + if ( *(DWORD *)(a1 + 8) ) { v2 = GetDesktopWindow(); GetWindowRect(v2, &Rect); v3 = *(HPALETTE *)(a1 + 4); - *(_DWORD *)(a1 + 24) = (Rect.right - Rect.left - *(_DWORD *)(a1 + 16)) / 2; - *(_DWORD *)(a1 + 28) = (Rect.bottom - Rect.top - *(_DWORD *)(a1 + 20)) / 2; + *(DWORD *)(a1 + 24) = (Rect.right - Rect.left - *(DWORD *)(a1 + 16)) / 2; + *(DWORD *)(a1 + 28) = (Rect.bottom - Rect.top - *(DWORD *)(a1 + 20)) / 2; SelectPalette(hdc, v3, 0); RealizePalette(hdc); SelectPalette(*(HDC *)(a1 + 12), *(HPALETTE *)(a1 + 4), 0); RealizePalette(*(HDC *)(a1 + 12)); BitBlt( hdc, - *(_DWORD *)(a1 + 24), - *(_DWORD *)(a1 + 28), - *(_DWORD *)(a1 + 16), - *(_DWORD *)(a1 + 20), + *(DWORD *)(a1 + 24), + *(DWORD *)(a1 + 28), + *(DWORD *)(a1 + 16), + *(DWORD *)(a1 + 20), *(HDC *)(a1 + 12), 0, 0, @@ -243,23 +243,23 @@ void __stdcall splash_paint(int a1, HDC hdc) } //----- (010071A5) -------------------------------------------------------- -void __stdcall splash_hide(int a1) +void splash_hide(int a1) { HDC v1; // edi if ( a1 ) { - if ( *(_DWORD *)a1 ) + if ( *(DWORD *)a1 ) { v1 = _GetDC(*(HWND *)a1); - BitBlt(v1, 0, 0, *(_DWORD *)(a1 + 24), *(_DWORD *)(a1 + 28), v1, 0, 0, 0x42u); + BitBlt(v1, 0, 0, *(DWORD *)(a1 + 24), *(DWORD *)(a1 + 28), v1, 0, 0, 0x42u); ReleaseDC(*(HWND *)a1, v1); } } } //----- (010071ED) -------------------------------------------------------- -HINSTANCE __stdcall splash_destroy(int a1) +HINSTANCE splash_destroy(int a1) { void *v1; // eax HDC v2; // eax @@ -267,18 +267,18 @@ HINSTANCE __stdcall splash_destroy(int a1) if ( a1 ) { - if ( *(_DWORD *)a1 ) + if ( *(DWORD *)a1 ) { DestroyWindow(*(HWND *)a1); v1 = *(void **)(a1 + 4); - *(_DWORD *)a1 = 0; + *(DWORD *)a1 = 0; if ( v1 ) DeleteObject(v1); v2 = *(HDC *)(a1 + 12); - *(_DWORD *)(a1 + 4) = 0; + *(DWORD *)(a1 + 4) = 0; if ( v2 ) DeleteDC(v2); - if ( *(_DWORD *)(a1 + 8) ) + if ( *(DWORD *)(a1 + 8) ) DeleteObject(*(HGDIOBJ *)(a1 + 8)); } memoryfree(a1); @@ -293,7 +293,7 @@ HINSTANCE __stdcall splash_destroy(int a1) } //----- (01007264) -------------------------------------------------------- -LRESULT __stdcall splash_message_handler(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam) +LRESULT splash_message_handler(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam) { HDC v5; // eax HDC v6; // esi @@ -325,7 +325,7 @@ LRESULT __stdcall splash_message_handler(HWND hWnd, UINT Msg, WPARAM wParam, LPA } //----- (01007308) -------------------------------------------------------- -int __stdcall splash_screen(int a1, LPCSTR lpString2, LPCSTR a3) +int splash_screen(int a1, LPCSTR lpString2, LPCSTR a3) { int v3; // esi HINSTANCE v4; // ST28_4 @@ -355,9 +355,9 @@ int __stdcall splash_screen(int a1, LPCSTR lpString2, LPCSTR a3) RegisterClassA(&WndClass); } v4 = hInstance; - *(_DWORD *)(v3 + 8) = 0; + *(DWORD *)(v3 + 8) = 0; v5 = CreateWindowExA(0, "3DPB_SPLASH_CLASS", WindowName, 0x80000000, -10, -10, 1, 1, 0, 0, v4, 0); - *(_DWORD *)v3 = v5; + *(DWORD *)v3 = v5; if ( !v5 ) { memoryfree(v3); diff --git a/graphics/timer.cpp b/graphics/timer.cpp index a0d5248..ab14307 100644 --- a/graphics/timer.cpp +++ b/graphics/timer.cpp @@ -5,11 +5,11 @@ #include "../pinball.h" //----- (0100742F) -------------------------------------------------------- -signed int __stdcall timer_init(int a1) +signed int timer_init(int a1) { int v1; // eax int v3; // edx - _DWORD *v4; // ecx + DWORD *v4; // ecx v1 = memoryallocate(20 * a1); dword_1024F80 = v1; @@ -21,7 +21,7 @@ signed int __stdcall timer_init(int a1) dword_10235F4 = 1; if ( a1 - 1 > 0 ) { - v4 = (_DWORD *)(v1 + 12); + v4 = (DWORD *)(v1 + 12); do { *v4 = v4 + 2; @@ -30,7 +30,7 @@ signed int __stdcall timer_init(int a1) } while ( v3 ); } - *(_DWORD *)(20 * a1 + v1 - 8) = 0; + *(DWORD *)(20 * a1 + v1 - 8) = 0; dword_1024F70 = 0; dword_1024F7C = v1; return 0; @@ -43,7 +43,7 @@ signed int __stdcall timer_init(int a1) // 1024F80: using guessed type int dword_1024F80; //----- (0100749B) -------------------------------------------------------- -void __stdcall timer_uninit() +void timer_uninit() { if ( dword_1024F80 ) memoryfree(dword_1024F80); @@ -52,15 +52,15 @@ void __stdcall timer_uninit() // 1024F80: using guessed type int dword_1024F80; //----- (010074B7) -------------------------------------------------------- -int __stdcall timer_set(float a1, int a2, int a3) +int timer_set(float a1, int a2, int a3) { signed __int64 v3; // rax int v4; // esi int v5; // ebx - _DWORD *v7; // ecx - _DWORD *v8; // eax + DWORD *v7; // ecx + DWORD *v8; // eax int v9; // edx - _DWORD *v10; // edi + DWORD *v10; // edi int v11; // eax int v12; // [esp+0h] [ebp-8h] int v13; // [esp+4h] [ebp-4h] @@ -73,28 +73,28 @@ int __stdcall timer_set(float a1, int a2, int a3) if ( dword_1024F78 >= dword_1024F74 ) return 0; v14 = 0; - v7 = (_DWORD *)dword_1024F7C; - v8 = (_DWORD *)(dword_1024F7C + 12); - v9 = *(_DWORD *)(dword_1024F7C + 12); - *(_DWORD *)(dword_1024F7C + 12) = 0; + v7 = (DWORD *)dword_1024F7C; + v8 = (DWORD *)(dword_1024F7C + 12); + v9 = *(DWORD *)(dword_1024F7C + 12); + *(DWORD *)(dword_1024F7C + 12) = 0; dword_1024F7C = v9; v13 = dword_1024F70; - v10 = (_DWORD *)dword_1024F70; + v10 = (DWORD *)dword_1024F70; if ( v4 > 0 ) { while ( v5 >= *v10 ) { ++v14; v13 = (int)v10; - v10 = (_DWORD *)v10[3]; + v10 = (DWORD *)v10[3]; if ( v14 >= v4 ) break; v5 = v12; } - if ( v10 != (_DWORD *)v13 ) + if ( v10 != (DWORD *)v13 ) { - *v8 = *(_DWORD *)(v13 + 12); - *(_DWORD *)(v13 + 12) = v7; + *v8 = *(DWORD *)(v13 + 12); + *(DWORD *)(v13 + 12) = v7; v5 = v12; goto LABEL_12; } @@ -122,21 +122,21 @@ int __stdcall timer_set(float a1, int a2, int a3) // 1024F84: using guessed type int time_ticks; //----- (0100758D) -------------------------------------------------------- -signed int __stdcall timer_check() +signed int timer_check() { - _DWORD *v0; // eax + DWORD *v0; // eax signed int v1; // ebx - _DWORD *v2; // ecx + DWORD *v2; // ecx int v3; // edx bool v4; // zf - _DWORD *v5; // ecx + DWORD *v5; // ecx int v6; // edx char v8; // [esp+4h] [ebp-14h] int v9; // [esp+8h] [ebp-10h] - void (__stdcall *v10)(int, int); // [esp+Ch] [ebp-Ch] + void (*v10)(int, int); // [esp+Ch] [ebp-Ch] int v11; // [esp+14h] [ebp-4h] - v0 = (_DWORD *)dword_1024F70; + v0 = (DWORD *)dword_1024F70; v1 = 0; if ( dword_1024F70 ) { @@ -146,7 +146,7 @@ signed int __stdcall timer_check() qmemcpy(&v8, v0, 0x14u); v2 = v0 + 3; v3 = (int)v0; - v0 = (_DWORD *)v0[3]; + v0 = (DWORD *)v0[3]; ++v1; v4 = v10 == 0; dword_1024F70 = (int)v0; @@ -155,7 +155,7 @@ signed int __stdcall timer_check() if ( !v4 ) { v10(v11, v9); - v0 = (_DWORD *)dword_1024F70; + v0 = (DWORD *)dword_1024F70; } if ( v1 > 1 ) break; @@ -169,14 +169,14 @@ signed int __stdcall timer_check() v4 = v10 == 0; v5 = v0 + 3; v6 = (int)v0; - v0 = (_DWORD *)v0[3]; + v0 = (DWORD *)v0[3]; dword_1024F70 = (int)v0; *v5 = dword_1024F7C; dword_1024F7C = v6; if ( !v4 ) { v10(v11, v9); - v0 = (_DWORD *)dword_1024F70; + v0 = (DWORD *)dword_1024F70; } ++v1; } @@ -189,7 +189,7 @@ signed int __stdcall timer_check() // 1024F84: using guessed type int time_ticks; //----- (01007659) -------------------------------------------------------- -int __stdcall timer_kill(int a1) +int timer_kill(int a1) { int v1; // ecx int v2; // esi @@ -202,20 +202,20 @@ int __stdcall timer_kill(int a1) if ( dword_1024F78 <= 0 ) return 0; result = a1; - while ( a1 != *(_DWORD *)(v1 + 16) ) + while ( a1 != *(DWORD *)(v1 + 16) ) { ++v2; v3 = v1; - v1 = *(_DWORD *)(v1 + 12); + v1 = *(DWORD *)(v1 + 12); if ( v2 >= dword_1024F78 ) return 0; } if ( v3 ) - *(_DWORD *)(v3 + 12) = *(_DWORD *)(v1 + 12); + *(DWORD *)(v3 + 12) = *(DWORD *)(v1 + 12); else - dword_1024F70 = *(_DWORD *)(v1 + 12); + dword_1024F70 = *(DWORD *)(v1 + 12); --dword_1024F78; - *(_DWORD *)(v1 + 12) = dword_1024F7C; + *(DWORD *)(v1 + 12) = dword_1024F7C; dword_1024F7C = v1; return result; } diff --git a/lights.cpp b/lights.cpp index cf5c3c8..d230e34 100644 --- a/lights.cpp +++ b/lights.cpp @@ -1,11 +1,11 @@ #include "pinball.h" //----- (0100C092) -------------------------------------------------------- -BOOL __stdcall light_on(struct component_tag *a1) +BOOL light_on(struct component_tag *a1) { int v1; // eax -v1 = *((_DWORD *)a1 + 1); -return *(_DWORD *)(v1 + 78) || *(_DWORD *)(v1 + 90) || *(_DWORD *)(v1 + 82); +v1 = *((DWORD *)a1 + 1); +return *(DWORD *)(v1 + 78) || *(DWORD *)(v1 + 90) || *(DWORD *)(v1 + 82); } diff --git a/memory.cpp b/memory.cpp index 635ac3c..adbac0c 100644 --- a/memory.cpp +++ b/memory.cpp @@ -5,7 +5,7 @@ #include "pinball.h" //----- (010054AC) -------------------------------------------------------- -int __stdcall memory_init(int a1) +int memory_init(int a1) { int result; // eax @@ -16,9 +16,9 @@ int __stdcall memory_init(int a1) // 1024F08: using guessed type int (*memory_critical_callback)(void); //----- (010054C2) -------------------------------------------------------- -int __stdcall memoryallocate(unsigned int a1) +int memoryallocate(unsigned int a1) { - _DWORD *v1; // eax + DWORD *v1; // eax v1 = _malloc(a1 + 4); if ( a1 >= 0xFFDC ) @@ -51,11 +51,11 @@ int __stdcall memoryallocate(unsigned int a1) // 1024F08: using guessed type int (*memory_critical_callback)(void); //----- (01005541) -------------------------------------------------------- -void __stdcall memoryfree(int a1) +void memoryfree(int a1) { char v1; // cl - memory_use_total += -4 - (*(_DWORD *)(a1 - 4) >> 8); + memory_use_total += -4 - (*(DWORD *)(a1 - 4) >> 8); v1 = *(_BYTE *)(a1 - 4); if ( v1 == 90 || v1 == -91 ) _free((void *)(a1 - 4)); @@ -63,7 +63,7 @@ void __stdcall memoryfree(int a1) // 1024F00: using guessed type int memory_use_total; //----- (01005579) -------------------------------------------------------- -int __stdcall memoryrealloc(int a1, unsigned int a2) +int memoryrealloc(int a1, unsigned int a2) { int result; // eax char *v3; // eax @@ -72,11 +72,11 @@ int __stdcall memoryrealloc(int a1, unsigned int a2) if ( !a1 ) return memoryallocate(a2); v3 = (char *)(a1 - 4); - memory_use_total -= *(_DWORD *)(a1 - 4) >> 8; + memory_use_total -= *(DWORD *)(a1 - 4) >> 8; if ( *(_BYTE *)(a1 - 4) != 90 && *(_BYTE *)(a1 - 4) != -91 || (v3 = (char *)_realloc(v3, a2 + 4)) != 0 ) { v4 = *v3; - *(_DWORD *)v3 = a2 << 8; + *(DWORD *)v3 = a2 << 8; memory_use_total += a2; *v3 = v4; result = (int)(v3 + 4); diff --git a/missions.cpp b/missions.cpp index 86bdd7d..21d74a5 100644 --- a/missions.cpp +++ b/missions.cpp @@ -1,7 +1,7 @@ #include"pinball.h" //----- (0100E657) -------------------------------------------------------- -void __userpurge WaitingDeploymentController(int a1, int a2, struct TPinballComponent* a3) +void WaitingDeploymentController(int a1, int a2, struct TPinballComponent* a3) { char* v3; // eax @@ -10,7 +10,7 @@ void __userpurge WaitingDeploymentController(int a1, int a2, struct TPinballComp case 63: if ((struct TPinballComponent*)dword_1023838 == a3 || (struct TPinballComponent*)dword_1023840 == a3) { - *(_DWORD*)(dword_1023BBC + 6) = 1; + *(DWORD*)(dword_1023BBC + 6) = 1; MissionControl(66, 0); } break; @@ -30,13 +30,13 @@ void __userpurge WaitingDeploymentController(int a1, int a2, struct TPinballComp // 1025048: using guessed type int dword_1025048; //----- (0100E6D2) -------------------------------------------------------- -void __stdcall SelectMissionController(int a1, struct TPinballComponent* a2) +void SelectMissionController(int a1, struct TPinballComponent* a2) { signed int v2; // esi - void(__thiscall * **v3)(_DWORD, signed int, _DWORD); // edi - void(__thiscall * **v4)(_DWORD, signed int, _DWORD); // edi + void(__thiscall * **v3)(DWORD, signed int, DWORD); // edi + void(__thiscall * **v4)(DWORD, signed int, DWORD); // edi char* v5; // eax - void(__stdcall * **v6)(signed int, _DWORD); // ecx + void(* **v6)(signed int, DWORD); // ecx char* v7; // eax CHAR* v8; // ST58_4 CHAR* v9; // eax @@ -63,12 +63,12 @@ void __stdcall SelectMissionController(int a1, struct TPinballComponent* a2) v2 = 3; if (v2) { - if (*(_DWORD*)(dword_1023B9C + 6) == 7) + if (*(DWORD*)(dword_1023B9C + 6) == 7) { - *(_DWORD*)(dword_1023B9C + 6) = 0; + *(DWORD*)(dword_1023B9C + 6) = 0; v2 = 4; } - switch ((**(int(__stdcall * **)(signed int, _DWORD))dword_1023CF4)(37, 0.0)) + switch ((**(int(* **)(signed int, DWORD))dword_1023CF4)(37, 0.0)) { case 1: switch (v2) @@ -157,9 +157,9 @@ void __stdcall SelectMissionController(int a1, struct TPinballComponent* a2) } v13 = 18; LABEL_71: - *(_DWORD*)(dword_1023888 + 6) = v13; - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023888)(15, 2.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023BBC)(4, 0.0); + *(DWORD*)(dword_1023888 + 6) = v13; + (**(void(* **)(signed int, DWORD))dword_1023888)(15, 2.0); + (**(void(* **)(signed int, DWORD))dword_1023BBC)(4, 0.0); goto LABEL_83; default: return; @@ -167,19 +167,19 @@ void __stdcall SelectMissionController(int a1, struct TPinballComponent* a2) } else if ((struct TPinballComponent*)dword_1023870 == a2 && light_on((struct component_tag*) & lite56) - && (**(int(__stdcall * **)(signed int, _DWORD))dword_1023978)(37, 0.0)) + && (**(int(* **)(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); + (**(void(* **)(signed int, DWORD))dword_1023888)(20, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023BBC)(19, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023CFC)(26, -1.0); if (light_on((struct component_tag*) & lite317)) - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023EBC)(20, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023EBC)(20, 0.0); if (light_on((struct component_tag*) & lite318)) - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023EC4)(20, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023EC4)(20, 0.0); 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; + (**(void(* **)(signed int, DWORD))dword_1023ECC)(20, 0.0); + v10 = *(DWORD*)(dword_1023888 + 6); + *(DWORD*)(dword_1023BBC + 6) = v10; MissionControl(66, 0); v11 = SpecialAddScore(*(&off_10246A0 + v10)); v12 = get_rc_string(77, 0); @@ -191,38 +191,38 @@ void __stdcall SelectMissionController(int a1, struct TPinballComponent* a2) { if (a1 == 66) { - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023BBC)(20, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023CFC)(34, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023BB4)(20, 0.0); - *(_DWORD*)(dword_1023888 + 6) = 0; - *(_DWORD*)(dword_1023B9C + 6) = 0; - v3 = (void(__thiscall * **)(_DWORD, signed int, _DWORD))dword_1023A8C; - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023A8C)(34, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023BBC)(20, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023CFC)(34, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023BB4)(20, 0.0); + *(DWORD*)(dword_1023888 + 6) = 0; + *(DWORD*)(dword_1023B9C + 6) = 0; + v3 = (void(__thiscall * **)(DWORD, signed int, DWORD))dword_1023A8C; + (**(void(* **)(signed int, DWORD))dword_1023A8C)(34, 0.0); (**v3)(v3, 20, 0.0); - v4 = (void(__thiscall * **)(_DWORD, signed int, _DWORD))dword_1023A94; - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023A94)(34, 0.0); + v4 = (void(__thiscall * **)(DWORD, signed int, DWORD))dword_1023A94; + (**(void(* **)(signed int, DWORD))dword_1023A94)(34, 0.0); (**v4)(v4, 20, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023EEC)(20, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023EEC)(20, 0.0); } else if (a1 != 67) { return; } - if ((**(int(__stdcall * **)(signed int, _DWORD))dword_1023978)(37, 0.0)) + if ((**(int(* **)(signed int, DWORD))dword_1023978)(37, 0.0)) { if (light_on((struct component_tag*) & lite56)) { - v8 = get_rc_string(word_1024708[2 * *(_DWORD*)(dword_1023888 + 6)], 1); + 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*) & lite318)) - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023EC4)(20, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023EC4)(20, 0.0); if (light_on((struct component_tag*) & lite319)) - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023ECC)(20, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023ECC)(20, 0.0); if (!light_on((struct component_tag*) & lite317)) { - v6 = (void(__stdcall * **)(signed int, _DWORD))dword_1023EBC; + v6 = (void(* **)(signed int, DWORD))dword_1023EBC; goto LABEL_28; } } @@ -231,12 +231,12 @@ void __stdcall SelectMissionController(int a1, struct TPinballComponent* a2) v7 = get_rc_string(104, 0); TTextBox::Display(dword_1023E24, 0, v7, -1.0); if (light_on((struct component_tag*) & lite317)) - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023EBC)(20, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023EBC)(20, 0.0); if (light_on((struct component_tag*) & lite318)) - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023EC4)(20, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023EC4)(20, 0.0); if (!light_on((struct component_tag*) & lite319)) { - v6 = (void(__stdcall * **)(signed int, _DWORD))dword_1023ECC; + v6 = (void(* **)(signed int, DWORD))dword_1023ECC; goto LABEL_28; } } @@ -246,12 +246,12 @@ void __stdcall SelectMissionController(int a1, struct TPinballComponent* a2) v5 = get_rc_string(105, 0); TTextBox::Display(dword_1023E24, 0, v5, -1.0); if (light_on((struct component_tag*) & lite317)) - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023EBC)(20, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023EBC)(20, 0.0); if (light_on((struct component_tag*) & lite319)) - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023ECC)(20, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023ECC)(20, 0.0); if (!light_on((struct component_tag*) & lite318)) { - v6 = (void(__stdcall * **)(signed int, _DWORD))dword_1023EC4; + v6 = (void(* **)(signed int, DWORD))dword_1023EC4; LABEL_28: (**v6)(7, 0.0); return; @@ -280,10 +280,10 @@ void __stdcall SelectMissionController(int a1, struct TPinballComponent* a2) // 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[]; +// 1024708: using guessed type int word_1024708[]; //----- (0100EBF3) -------------------------------------------------------- -void __userpurge PracticeMissionController(int a1@ , int a2, struct TPinballComponent* a3) +void PracticeMissionController(int a1@ , int a2, struct TPinballComponent* a3) { int v3; // ST10_4 CHAR* v4; // eax @@ -297,19 +297,19 @@ void __userpurge PracticeMissionController(int a1@ , int a2, struct TPinba { if (a2 == 66) { - (**(void(__fastcall * **)(int, struct TPinballComponent*, signed int, _DWORD))dword_1023E74)( + (**(void(__fastcall * **)(int, struct TPinballComponent*, signed int, DWORD))dword_1023E74)( dword_1023E74, a3, 7, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023E8C)(7, 0.0); - *(_DWORD*)(dword_1023888 + 6) = 8; + (**(void(* **)(signed int, DWORD))dword_1023E8C)(7, 0.0); + *(DWORD*)(dword_1023888 + 6) = 8; } else if (a2 != 67) { return; } - v3 = *(_DWORD*)(dword_1023888 + 6); + v3 = *(DWORD*)(dword_1023888 + 6); v4 = get_rc_string(107, 0); _sprintf(&Dest, v4, v3); TTextBox::Display(dword_1023E24, a1, &Dest, -1.0); @@ -320,21 +320,21 @@ void __userpurge PracticeMissionController(int a1@ , int a2, struct TPinba || (struct TPinballComponent*)dword_10236F4 == a3 || (struct TPinballComponent*)dword_10236FC == a3) { - v5 = *(_DWORD*)(dword_1023888 + 6) - 1; - *(_DWORD*)(dword_1023888 + 6) = v5; + v5 = *(DWORD*)(dword_1023888 + 6) - 1; + *(DWORD*)(dword_1023888 + 6) = v5; if (v5) { MissionControl(67, a3); } else { - (**(void(__fastcall * **)(int, struct TPinballComponent*, signed int, _DWORD))dword_1023E74)( + (**(void(__fastcall * **)(int, struct TPinballComponent*, signed int, DWORD))dword_1023E74)( dword_1023E74, a3, 20, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023E8C)(20, 0.0); - *(_DWORD*)(dword_1023BBC + 6) = 1; + (**(void(* **)(signed int, DWORD))dword_1023E8C)(20, 0.0); + *(DWORD*)(dword_1023BBC + 6) = 1; MissionControl(66, 0); v6 = get_rc_string(108, 0); TTextBox::Display(dword_1023E24, a1, v6, 4.0); @@ -344,7 +344,7 @@ void __userpurge PracticeMissionController(int a1@ , int a2, struct TPinba if (!AddRankProgress(6)) { TTextBox::Display(dword_1023E24, a1, &Dest, 8.0); - (*(void (**)(void))(*(_DWORD*)dword_1023D14 + 20))(); + (*(void (**)(void))(*(DWORD*)dword_1023D14 + 20))(); } } } @@ -360,7 +360,7 @@ void __userpurge PracticeMissionController(int a1@ , int a2, struct TPinba // 1023E8C: using guessed type int dword_1023E8C; //----- (0100ED83) -------------------------------------------------------- -void __userpurge LaunchTrainingController(int a1@ , int a2, struct TPinballComponent* a3) +void LaunchTrainingController(int a1@ , int a2, struct TPinballComponent* a3) { int v3; // ST08_4 CHAR* v4; // eax @@ -374,18 +374,18 @@ void __userpurge LaunchTrainingController(int a1@ , int a2, struct TPinbal { if (a2 == 66) { - (**(void(__fastcall * **)(int, struct TPinballComponent*, signed int, _DWORD))dword_1023EBC)( + (**(void(__fastcall * **)(int, struct TPinballComponent*, signed int, DWORD))dword_1023EBC)( dword_1023EBC, a3, 7, 0.0); - *(_DWORD*)(dword_1023888 + 6) = 3; + *(DWORD*)(dword_1023888 + 6) = 3; } else if (a2 != 67) { return; } - v3 = *(_DWORD*)(dword_1023888 + 6); + v3 = *(DWORD*)(dword_1023888 + 6); v4 = get_rc_string(110, 0); _sprintf(&Dest, v4, v3); TTextBox::Display(dword_1023E24, a1, &Dest, -1.0); @@ -393,20 +393,20 @@ void __userpurge LaunchTrainingController(int a1@ , int a2, struct TPinbal } if ((struct TPinballComponent*)dword_1023870 == a3) { - v5 = *(_DWORD*)(dword_1023888 + 6) - 1; - *(_DWORD*)(dword_1023888 + 6) = v5; + v5 = *(DWORD*)(dword_1023888 + 6) - 1; + *(DWORD*)(dword_1023888 + 6) = v5; if (v5) { MissionControl(67, a3); } else { - (**(void(__fastcall * **)(int, struct TPinballComponent*, signed int, _DWORD))dword_1023EBC)( + (**(void(__fastcall * **)(int, struct TPinballComponent*, signed int, DWORD))dword_1023EBC)( dword_1023EBC, a3, 20, 0.0); - *(_DWORD*)(dword_1023BBC + 6) = 1; + *(DWORD*)(dword_1023BBC + 6) = 1; MissionControl(66, 0); v6 = get_rc_string(111, 0); TTextBox::Display(dword_1023E24, a1, v6, 4.0); @@ -416,7 +416,7 @@ void __userpurge LaunchTrainingController(int a1@ , int a2, struct TPinbal if (!AddRankProgress(6)) { TTextBox::Display(dword_1023E24, a1, &Dest, 8.0); - (*(void (**)(void))(*(_DWORD*)dword_1023D14 + 20))(); + (*(void (**)(void))(*(DWORD*)dword_1023D14 + 20))(); } } } @@ -428,10 +428,10 @@ void __userpurge LaunchTrainingController(int a1@ , int a2, struct TPinbal // 1023EBC: using guessed type int dword_1023EBC; //----- (0100EED7) -------------------------------------------------------- -void __userpurge ReentryTrainingController(int a1@ , int a2, struct TPinballComponent* a3) +void ReentryTrainingController(int a1@ , int a2, struct TPinballComponent* a3) { - void(__thiscall * **v3)(_DWORD, signed int, _DWORD); // esi - void(__thiscall * **v4)(_DWORD, signed int, _DWORD); // esi + void(__thiscall * **v3)(DWORD, signed int, DWORD); // esi + void(__thiscall * **v4)(DWORD, signed int, DWORD); // esi int v5; // ST38_4 CHAR* v6; // eax int v7; // ecx @@ -444,26 +444,26 @@ void __userpurge ReentryTrainingController(int a1@ , int a2, struct TPinba { if (a2 == 66) { - *(_DWORD*)(dword_1023888 + 6) = 3; - v3 = (void(__thiscall * **)(_DWORD, signed int, _DWORD))dword_1023A8C; - (**(void(__fastcall * **)(int, struct TPinballComponent*, signed int, _DWORD))dword_1023A8C)( + *(DWORD*)(dword_1023888 + 6) = 3; + v3 = (void(__thiscall * **)(DWORD, signed int, DWORD))dword_1023A8C; + (**(void(__fastcall * **)(int, struct TPinballComponent*, signed int, DWORD))dword_1023A8C)( dword_1023A8C, a3, 20, 0.0); (**v3)(v3, 32, 0.2); (**v3)(v3, 26, 0.2); - v4 = (void(__thiscall * **)(_DWORD, signed int, _DWORD))dword_1023A94; - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023A94)(20, 0.0); + v4 = (void(__thiscall * **)(DWORD, signed int, DWORD))dword_1023A94; + (**(void(* **)(signed int, DWORD))dword_1023A94)(20, 0.0); (**v4)(v4, 32, 0.2); (**v4)(v4, 26, 0.2); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023E6C)(7, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023E6C)(7, 0.0); } else if (a2 != 67) { return; } - v5 = *(_DWORD*)(dword_1023888 + 6); + v5 = *(DWORD*)(dword_1023888 + 6); v6 = get_rc_string(112, 0); _sprintf(&Dest, v6, v5); TTextBox::Display(dword_1023E24, a1, &Dest, -1.0); @@ -473,20 +473,20 @@ void __userpurge ReentryTrainingController(int a1@ , int a2, struct TPinba || (struct TPinballComponent*)dword_1023734 == a3 || (struct TPinballComponent*)dword_102373C == a3) { - v7 = *(_DWORD*)(dword_1023888 + 6) - 1; - *(_DWORD*)(dword_1023888 + 6) = v7; + v7 = *(DWORD*)(dword_1023888 + 6) - 1; + *(DWORD*)(dword_1023888 + 6) = v7; if (v7) { MissionControl(67, a3); } else { - (**(void(__fastcall * **)(int, struct TPinballComponent*, signed int, _DWORD))dword_1023E6C)( + (**(void(__fastcall * **)(int, struct TPinballComponent*, signed int, DWORD))dword_1023E6C)( dword_1023E6C, a3, 20, 0.0); - *(_DWORD*)(dword_1023BBC + 6) = 1; + *(DWORD*)(dword_1023BBC + 6) = 1; MissionControl(66, 0); v8 = get_rc_string(113, 0); TTextBox::Display(dword_1023E24, a1, v8, 4.0); @@ -496,7 +496,7 @@ void __userpurge ReentryTrainingController(int a1@ , int a2, struct TPinba if (!AddRankProgress(6)) { TTextBox::Display(dword_1023E24, a1, &Dest, 8.0); - (*(void (**)(void))(*(_DWORD*)dword_1023D14 + 20))(); + (*(void (**)(void))(*(DWORD*)dword_1023D14 + 20))(); } } } @@ -512,7 +512,7 @@ void __userpurge ReentryTrainingController(int a1@ , int a2, struct TPinba // 1023E6C: using guessed type int dword_1023E6C; //----- (0100F0B3) -------------------------------------------------------- -void __userpurge ScienceMissionController(int a1@ , int a2, struct TPinballComponent* a3) +void ScienceMissionController(int a1@ , int a2, struct TPinballComponent* a3) { int v3; // ST60_4 CHAR* v4; // eax @@ -526,34 +526,34 @@ void __userpurge ScienceMissionController(int a1@ , int a2, struct TPinbal { if (a2 == 66) { - *(_DWORD*)(dword_1023888 + 6) = 9; - *(_DWORD*)(dword_1023A9C + 6) = 0; - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023A9C)(50, 0.0); - *(_DWORD*)(dword_1023AA4 + 6) = 0; - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023AA4)(50, 0.0); - *(_DWORD*)(dword_1023AAC + 6) = 0; - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023AAC)(50, 0.0); - *(_DWORD*)(dword_1023ADC + 6) = 0; - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023ADC)(50, 0.0); - *(_DWORD*)(dword_1023AE4 + 6) = 0; - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023AE4)(50, 0.0); - *(_DWORD*)(dword_1023AEC + 6) = 0; - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023AEC)(50, 0.0); - *(_DWORD*)(dword_1023B20 + 6) = 0; - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023B20)(50, 0.0); - *(_DWORD*)(dword_1023B28 + 6) = 0; - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023B28)(50, 0.0); - *(_DWORD*)(dword_1023B30 + 6) = 0; - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023B30)(50, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023E4C)(7, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023E7C)(7, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023EAC)(7, 0.0); + *(DWORD*)(dword_1023888 + 6) = 9; + *(DWORD*)(dword_1023A9C + 6) = 0; + (**(void(* **)(signed int, DWORD))dword_1023A9C)(50, 0.0); + *(DWORD*)(dword_1023AA4 + 6) = 0; + (**(void(* **)(signed int, DWORD))dword_1023AA4)(50, 0.0); + *(DWORD*)(dword_1023AAC + 6) = 0; + (**(void(* **)(signed int, DWORD))dword_1023AAC)(50, 0.0); + *(DWORD*)(dword_1023ADC + 6) = 0; + (**(void(* **)(signed int, DWORD))dword_1023ADC)(50, 0.0); + *(DWORD*)(dword_1023AE4 + 6) = 0; + (**(void(* **)(signed int, DWORD))dword_1023AE4)(50, 0.0); + *(DWORD*)(dword_1023AEC + 6) = 0; + (**(void(* **)(signed int, DWORD))dword_1023AEC)(50, 0.0); + *(DWORD*)(dword_1023B20 + 6) = 0; + (**(void(* **)(signed int, DWORD))dword_1023B20)(50, 0.0); + *(DWORD*)(dword_1023B28 + 6) = 0; + (**(void(* **)(signed int, DWORD))dword_1023B28)(50, 0.0); + *(DWORD*)(dword_1023B30 + 6) = 0; + (**(void(* **)(signed int, DWORD))dword_1023B30)(50, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023E4C)(7, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023E7C)(7, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023EAC)(7, 0.0); } else if (a2 != 67) { return; } - v3 = *(_DWORD*)(dword_1023888 + 6); + v3 = *(DWORD*)(dword_1023888 + 6); v4 = get_rc_string(114, 0); _sprintf(&Dest, v4, v3); TTextBox::Display(dword_1023E24, a1, &Dest, -1.0); @@ -569,18 +569,18 @@ void __userpurge ScienceMissionController(int a1@ , int a2, struct TPinbal || (struct TPinballComponent*)dword_1023B28 == a3 || (struct TPinballComponent*)dword_1023B30 == a3) { - v5 = *(_DWORD*)(dword_1023888 + 6) - 1; - *(_DWORD*)(dword_1023888 + 6) = v5; + v5 = *(DWORD*)(dword_1023888 + 6) - 1; + *(DWORD*)(dword_1023888 + 6) = v5; if (v5) { MissionControl(67, a3); } else { - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023E4C)(20, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023E7C)(20, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023EAC)(20, 0.0); - *(_DWORD*)(dword_1023BBC + 6) = 1; + (**(void(* **)(signed int, DWORD))dword_1023E4C)(20, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023E7C)(20, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023EAC)(20, 0.0); + *(DWORD*)(dword_1023BBC + 6) = 1; MissionControl(66, 0); v6 = get_rc_string(115, 0); TTextBox::Display(dword_1023E24, a1, v6, 4.0); @@ -590,7 +590,7 @@ void __userpurge ScienceMissionController(int a1@ , int a2, struct TPinbal if (!AddRankProgress(9)) { TTextBox::Display(dword_1023E24, a1, &Dest, 8.0); - (*(void (**)(void))(*(_DWORD*)dword_1023D14 + 20))(); + (*(void (**)(void))(*(DWORD*)dword_1023D14 + 20))(); } } } @@ -612,7 +612,7 @@ void __userpurge ScienceMissionController(int a1@ , int a2, struct TPinbal // 1023EAC: using guessed type int dword_1023EAC; //----- (0100F381) -------------------------------------------------------- -void __userpurge StrayCometController(int a1@ , int a2, struct TPinballComponent* a3) +void StrayCometController(int a1@ , int a2, struct TPinballComponent* a3) { char* v3; // eax char* v4; // eax @@ -626,18 +626,18 @@ void __userpurge StrayCometController(int a1@ , int a2, struct TPinballCom || (struct TPinballComponent*)dword_1023BE8 == a3 || (struct TPinballComponent*)dword_1023BF0 == a3) { - if (*(_DWORD*)(dword_1023C10 + 6) == 7) + if (*(DWORD*)(dword_1023C10 + 6) == 7) { - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023E64)(20, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023E54)(7, 0.0); - *(_DWORD*)(dword_1023C10 + 6) = 15; + (**(void(* **)(signed int, DWORD))dword_1023E64)(20, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023E54)(7, 0.0); + *(DWORD*)(dword_1023C10 + 6) = 15; MissionControl(67, a3); } } - else if ((struct TPinballComponent*)dword_1023980 == a3 && *(_DWORD*)(dword_1023C10 + 6) == 15) + else if ((struct TPinballComponent*)dword_1023980 == a3 && *(DWORD*)(dword_1023C10 + 6) == 15) { - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023E54)(20, 0.0); - *(_DWORD*)(dword_1023BBC + 6) = 1; + (**(void(* **)(signed int, DWORD))dword_1023E54)(20, 0.0); + *(DWORD*)(dword_1023BBC + 6) = 1; MissionControl(66, 0); v4 = get_rc_string(119, 0); TTextBox::Display(dword_1023E24, a1, v4, 4.0); @@ -647,7 +647,7 @@ void __userpurge StrayCometController(int a1@ , int a2, struct TPinballCom if (!AddRankProgress(8)) { TTextBox::Display(dword_1023E24, a1, &Dest, 8.0); - (*(void (**)(void))(*(_DWORD*)dword_1023D14 + 20))(); + (*(void (**)(void))(*(DWORD*)dword_1023D14 + 20))(); } } } @@ -655,15 +655,15 @@ void __userpurge StrayCometController(int a1@ , int a2, struct TPinballCom { if (a2 == 66) { - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023C30)(20, 0.0); - *(_DWORD*)(dword_1023C10 + 6) = 0; - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023E64)(7, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023C30)(20, 0.0); + *(DWORD*)(dword_1023C10 + 6) = 0; + (**(void(* **)(signed int, DWORD))dword_1023E64)(7, 0.0); } else if (a2 != 67) { return; } - if (*(_DWORD*)(dword_1023C10 + 6) == 15) + if (*(DWORD*)(dword_1023C10 + 6) == 15) v3 = get_rc_string(118, 0); else v3 = get_rc_string(117, 0); @@ -682,7 +682,7 @@ void __userpurge StrayCometController(int a1@ , int a2, struct TPinballCom // 1023E64: using guessed type int dword_1023E64; //----- (0100F539) -------------------------------------------------------- -void __userpurge SpaceRadiationController(int a1@ , int a2, struct TPinballComponent* a3) +void SpaceRadiationController(int a1@ , int a2, struct TPinballComponent* a3) { char* v3; // eax char* v4; // eax @@ -696,11 +696,11 @@ void __userpurge SpaceRadiationController(int a1@ , int a2, struct TPinbal || (struct TPinballComponent*)dword_1023BD0 == a3 || (struct TPinballComponent*)dword_1023BD8 == a3) { - if (*(_DWORD*)(dword_1023BF8 + 6) == 7) + if (*(DWORD*)(dword_1023BF8 + 6) == 7) { - *(_DWORD*)(dword_1023BF8 + 6) = 15; - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023A3C)(7, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023E9C)(20, 0.0); + *(DWORD*)(dword_1023BF8 + 6) = 15; + (**(void(* **)(signed int, DWORD))dword_1023A3C)(7, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023E9C)(20, 0.0); MissionControl(67, a3); AdvanceWormHoleDestination(1); } @@ -708,9 +708,9 @@ void __userpurge SpaceRadiationController(int a1@ , int a2, struct TPinbal else if (((struct TPinballComponent*)dword_10239EC == a3 || (struct TPinballComponent*)dword_10239F4 == a3 || (struct TPinballComponent*)dword_10239FC == a3) - && *(_DWORD*)(dword_1023BF8 + 6) == 15) + && *(DWORD*)(dword_1023BF8 + 6) == 15) { - *(_DWORD*)(dword_1023BBC + 6) = 1; + *(DWORD*)(dword_1023BBC + 6) = 1; MissionControl(66, 0); v4 = get_rc_string(121, 0); TTextBox::Display(dword_1023E24, a1, v4, 4.0); @@ -720,7 +720,7 @@ void __userpurge SpaceRadiationController(int a1@ , int a2, struct TPinbal if (!AddRankProgress(8)) { TTextBox::Display(dword_1023E24, a1, &Dest, 8.0); - (*(void (**)(void))(*(_DWORD*)dword_1023D14 + 20))(); + (*(void (**)(void))(*(DWORD*)dword_1023D14 + 20))(); } } } @@ -728,15 +728,15 @@ void __userpurge SpaceRadiationController(int a1@ , int a2, struct TPinbal { if (a2 == 66) { - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023C28)(20, 0.0); - *(_DWORD*)(dword_1023BF8 + 6) = 0; - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023E9C)(7, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023C28)(20, 0.0); + *(DWORD*)(dword_1023BF8 + 6) = 0; + (**(void(* **)(signed int, DWORD))dword_1023E9C)(7, 0.0); } else if (a2 != 67) { return; } - if (*(_DWORD*)(dword_1023BF8 + 6) == 15) + if (*(DWORD*)(dword_1023BF8 + 6) == 15) v3 = get_rc_string(120, 0); else v3 = get_rc_string(176, 0); @@ -757,10 +757,10 @@ void __userpurge SpaceRadiationController(int a1@ , int a2, struct TPinbal // 1023E9C: using guessed type int dword_1023E9C; //----- (0100F6F4) -------------------------------------------------------- -void __userpurge BlackHoleThreatController(int a1@ , int a2, struct TPinballComponent* a3) +void BlackHoleThreatController(int a1@ , int a2, struct TPinballComponent* a3) { char* v3; // eax - void(__stdcall * **v4)(signed int, _DWORD); // ecx + void(* **v4)(signed int, DWORD); // ecx char* v5; // eax char* v6; // eax int v7; // ST10_4 @@ -775,13 +775,13 @@ void __userpurge BlackHoleThreatController(int a1@ , int a2, struct TPinba } else if (a2 == 63) { - if ((struct TPinballComponent*)dword_1023C5C == a3 && *(_DWORD*)(dword_1023758 + 78)) + if ((struct TPinballComponent*)dword_1023C5C == a3 && *(DWORD*)(dword_1023758 + 78)) { if (light_on((struct component_tag*) & lite316)) - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023EB4)(20, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023EB4)(20, 0.0); if (light_on((struct component_tag*) & lite314)) - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023EA4)(20, 0.0); - *(_DWORD*)(dword_1023BBC + 6) = 1; + (**(void(* **)(signed int, DWORD))dword_1023EA4)(20, 0.0); + *(DWORD*)(dword_1023BBC + 6) = 1; MissionControl(66, 0); v6 = get_rc_string(124, 0); TTextBox::Display(dword_1023E24, a1, v6, 4.0); @@ -791,7 +791,7 @@ void __userpurge BlackHoleThreatController(int a1@ , int a2, struct TPinba if (!AddRankProgress(8)) { TTextBox::Display(dword_1023E24, a1, &Dest, 8.0); - (*(void (**)(void))(*(_DWORD*)dword_1023D14 + 20))(); + (*(void (**)(void))(*(DWORD*)dword_1023D14 + 20))(); } } } @@ -799,22 +799,22 @@ void __userpurge BlackHoleThreatController(int a1@ , int a2, struct TPinba { if (a2 == 66) { - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023770)(11, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023770)(11, 0.0); } else if (a2 != 67) { return; } v9 = -1.0; - if (*(_DWORD*)(dword_1023758 + 78)) + if (*(DWORD*)(dword_1023758 + 78)) { v5 = get_rc_string(123, 0); TTextBox::Display(dword_1023E24, a1, v5, v9); if (light_on((struct component_tag*) & lite316)) - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023EB4)(20, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023EB4)(20, 0.0); if (!light_on((struct component_tag*) & lite314)) { - v4 = (void(__stdcall * **)(signed int, _DWORD))dword_1023EA4; + v4 = (void(* **)(signed int, DWORD))dword_1023EA4; goto LABEL_12; } } @@ -823,10 +823,10 @@ void __userpurge BlackHoleThreatController(int a1@ , int a2, struct TPinba v3 = get_rc_string(122, 0); TTextBox::Display(dword_1023E24, a1, v3, v9); if (light_on((struct component_tag*) & lite314)) - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023EA4)(20, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023EA4)(20, 0.0); if (!light_on((struct component_tag*) & lite316)) { - v4 = (void(__stdcall * **)(signed int, _DWORD))dword_1023EB4; + v4 = (void(* **)(signed int, DWORD))dword_1023EB4; LABEL_12: (**v4)(7, 0.0); return; @@ -845,7 +845,7 @@ void __userpurge BlackHoleThreatController(int a1@ , int a2, struct TPinba // 1023EB4: using guessed type int dword_1023EB4; //----- (0100F900) -------------------------------------------------------- -void __userpurge BugHuntController(int a1@ , int a2, struct TPinballComponent* a3) +void BugHuntController(int a1@ , int a2, struct TPinballComponent* a3) { int v3; // ST90_4 CHAR* v4; // eax @@ -859,40 +859,40 @@ void __userpurge BugHuntController(int a1@ , int a2, struct TPinballCompon { if (a2 == 66) { - *(_DWORD*)(dword_1023888 + 6) = 15; - *(_DWORD*)(dword_1023A9C + 6) = 0; - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023A9C)(50, 0.0); - *(_DWORD*)(dword_1023AA4 + 6) = 0; - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023AA4)(50, 0.0); - *(_DWORD*)(dword_1023AAC + 6) = 0; - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023AAC)(50, 0.0); - *(_DWORD*)(dword_1023ADC + 6) = 0; - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023ADC)(50, 0.0); - *(_DWORD*)(dword_1023AE4 + 6) = 0; - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023AE4)(50, 0.0); - *(_DWORD*)(dword_1023AEC + 6) = 0; - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023AEC)(50, 0.0); - *(_DWORD*)(dword_1023B20 + 6) = 0; - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023B20)(50, 0.0); - *(_DWORD*)(dword_1023B28 + 6) = 0; - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023B28)(50, 0.0); - *(_DWORD*)(dword_1023B30 + 6) = 0; - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023B30)(50, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023B78)(20, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023BB4)(20, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023C28)(20, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023C30)(20, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023E64)(7, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023E74)(7, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023E84)(7, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023E9C)(7, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023ECC)(7, 0.0); + *(DWORD*)(dword_1023888 + 6) = 15; + *(DWORD*)(dword_1023A9C + 6) = 0; + (**(void(* **)(signed int, DWORD))dword_1023A9C)(50, 0.0); + *(DWORD*)(dword_1023AA4 + 6) = 0; + (**(void(* **)(signed int, DWORD))dword_1023AA4)(50, 0.0); + *(DWORD*)(dword_1023AAC + 6) = 0; + (**(void(* **)(signed int, DWORD))dword_1023AAC)(50, 0.0); + *(DWORD*)(dword_1023ADC + 6) = 0; + (**(void(* **)(signed int, DWORD))dword_1023ADC)(50, 0.0); + *(DWORD*)(dword_1023AE4 + 6) = 0; + (**(void(* **)(signed int, DWORD))dword_1023AE4)(50, 0.0); + *(DWORD*)(dword_1023AEC + 6) = 0; + (**(void(* **)(signed int, DWORD))dword_1023AEC)(50, 0.0); + *(DWORD*)(dword_1023B20 + 6) = 0; + (**(void(* **)(signed int, DWORD))dword_1023B20)(50, 0.0); + *(DWORD*)(dword_1023B28 + 6) = 0; + (**(void(* **)(signed int, DWORD))dword_1023B28)(50, 0.0); + *(DWORD*)(dword_1023B30 + 6) = 0; + (**(void(* **)(signed int, DWORD))dword_1023B30)(50, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023B78)(20, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023BB4)(20, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023C28)(20, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023C30)(20, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023E64)(7, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023E74)(7, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023E84)(7, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023E9C)(7, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023ECC)(7, 0.0); } else if (a2 != 67) { return; } - v3 = *(_DWORD*)(dword_1023888 + 6); + v3 = *(DWORD*)(dword_1023888 + 6); v4 = get_rc_string(125, 0); _sprintf(&Dest, v4, v3); TTextBox::Display(dword_1023E24, a1, &Dest, -1.0); @@ -921,20 +921,20 @@ void __userpurge BugHuntController(int a1@ , int a2, struct TPinballCompon || (struct TPinballComponent*)dword_1023BF0 == a3 || (struct TPinballComponent*)dword_1023C3C == a3) { - v5 = *(_DWORD*)(dword_1023888 + 6) - 1; - *(_DWORD*)(dword_1023888 + 6) = v5; + v5 = *(DWORD*)(dword_1023888 + 6) - 1; + *(DWORD*)(dword_1023888 + 6) = v5; if (v5) { MissionControl(67, a3); } else { - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023E64)(20, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023E74)(20, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023E84)(20, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023E9C)(20, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023ECC)(20, 0.0); - *(_DWORD*)(dword_1023BBC + 6) = 1; + (**(void(* **)(signed int, DWORD))dword_1023E64)(20, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023E74)(20, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023E84)(20, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023E9C)(20, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023ECC)(20, 0.0); + *(DWORD*)(dword_1023BBC + 6) = 1; MissionControl(66, 0); v6 = get_rc_string(126, 0); TTextBox::Display(dword_1023E24, a1, v6, 4.0); @@ -944,7 +944,7 @@ void __userpurge BugHuntController(int a1@ , int a2, struct TPinballCompon if (!AddRankProgress(7)) { TTextBox::Display(dword_1023E24, a1, &Dest, 8.0); - (*(void (**)(void))(*(_DWORD*)dword_1023D14 + 20))(); + (*(void (**)(void))(*(DWORD*)dword_1023D14 + 20))(); } } } @@ -985,11 +985,11 @@ void __userpurge BugHuntController(int a1@ , int a2, struct TPinballCompon // 1023ECC: using guessed type int dword_1023ECC; //----- (0100FCD9) -------------------------------------------------------- -void __userpurge RescueMissionController(int a1, int a2, struct TPinballComponent* a3) +void RescueMissionController(int a1, int a2, struct TPinballComponent* a3) { BOOL v3; // eax char* v4; // eax - void(__stdcall * **v5)(signed int, _DWORD); // ecx + void(* **v5)(signed int, DWORD); // ecx char* v6; // eax int v7; // ecx char* v8; // eax @@ -1009,18 +1009,18 @@ void __userpurge RescueMissionController(int a1, int a2, struct TPinballComponen } if ((struct TPinballComponent*)dword_1023980 != a3 || !light_on((struct component_tag*) & lite20)) return; - v7 = *(_DWORD*)(dword_1023888 + 6) - 1; - *(_DWORD*)(dword_1023888 + 6) = v7; + v7 = *(DWORD*)(dword_1023888 + 6) - 1; + *(DWORD*)(dword_1023888 + 6) = v7; if (v7) { MissionControl(67, a3); return; } if (light_on((struct component_tag*) & lite303)) - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023E4C)(20, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023E4C)(20, 0.0); if (light_on((struct component_tag*) & lite304)) - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023E54)(20, 0.0); - *(_DWORD*)(dword_1023BBC + 6) = 1; + (**(void(* **)(signed int, DWORD))dword_1023E54)(20, 0.0); + *(DWORD*)(dword_1023BBC + 6) = 1; MissionControl(66, 0); v8 = get_rc_string(129, 0); TTextBox::Display(dword_1023E24, a1, v8, 4.0); @@ -1030,16 +1030,16 @@ void __userpurge RescueMissionController(int a1, int a2, struct TPinballComponen if (!AddRankProgress(7)) { TTextBox::Display(dword_1023E24, a1, &Dest, 8.0); - (*(void (**)(void))(*(_DWORD*)dword_1023D14 + 20))(); + (*(void (**)(void))(*(DWORD*)dword_1023D14 + 20))(); } } else { if (a2 == 66) { - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023940)(20, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_10239D0)(20, 0.0); - *(_DWORD*)(dword_1023888 + 6) = 1; + (**(void(* **)(signed int, DWORD))dword_1023940)(20, 0.0); + (**(void(* **)(signed int, DWORD))dword_10239D0)(20, 0.0); + *(DWORD*)(dword_1023888 + 6) = 1; } else if (a2 != 67) { @@ -1052,10 +1052,10 @@ void __userpurge RescueMissionController(int a1, int a2, struct TPinballComponen v6 = get_rc_string(128, 0); TTextBox::Display(dword_1023E24, a1, v6, v11); if (light_on((struct component_tag*) & lite303)) - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023E4C)(20, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023E4C)(20, 0.0); if (!light_on((struct component_tag*) & lite304)) { - v5 = (void(__stdcall * **)(signed int, _DWORD))dword_1023E54; + v5 = (void(* **)(signed int, DWORD))dword_1023E54; goto LABEL_11; } } @@ -1064,10 +1064,10 @@ void __userpurge RescueMissionController(int a1, int a2, struct TPinballComponen v4 = get_rc_string(127, 0); TTextBox::Display(dword_1023E24, a1, v4, v11); if (light_on((struct component_tag*) & lite304)) - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023E54)(20, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023E54)(20, 0.0); if (!light_on((struct component_tag*) & lite303)) { - v5 = (void(__stdcall * **)(signed int, _DWORD))dword_1023E4C; + v5 = (void(* **)(signed int, DWORD))dword_1023E4C; LABEL_11: (**v5)(7, 0.0); return; @@ -1091,26 +1091,26 @@ void __userpurge RescueMissionController(int a1, int a2, struct TPinballComponen // 1023E54: using guessed type int dword_1023E54; //----- (0100FF35) -------------------------------------------------------- -void __userpurge AlienMenaceController(int a1@ , int a2, struct TPinballComponent* a3) +void AlienMenaceController(int a1@ , int a2, struct TPinballComponent* a3) { - void(__thiscall * **v3)(_DWORD, signed int, _DWORD); // esi - void(__thiscall * **v4)(_DWORD, signed int, _DWORD); // esi + void(__thiscall * **v3)(DWORD, signed int, DWORD); // esi + void(__thiscall * **v4)(DWORD, signed int, DWORD); // esi char* v5; // eax if (a2 != 11) { if (a2 == 66) { - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023704)(11, 0.0); - v3 = (void(__thiscall * **)(_DWORD, signed int, _DWORD))dword_1023A8C; - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023A8C)(20, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023704)(11, 0.0); + v3 = (void(__thiscall * **)(DWORD, signed int, DWORD))dword_1023A8C; + (**(void(* **)(signed int, DWORD))dword_1023A8C)(20, 0.0); (**v3)(v3, 32, 0.2); (**v3)(v3, 26, 0.2); - v4 = (void(__thiscall * **)(_DWORD, signed int, _DWORD))dword_1023A94; - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023A94)(20, 0.0); + v4 = (void(__thiscall * **)(DWORD, signed int, DWORD))dword_1023A94; + (**(void(* **)(signed int, DWORD))dword_1023A94)(20, 0.0); (**v4)(v4, 32, 0.2); (**v4)(v4, 26, 0.2); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023E6C)(7, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023E6C)(7, 0.0); } else if (a2 != 67) { @@ -1122,10 +1122,10 @@ void __userpurge AlienMenaceController(int a1@ , int a2, struct TPinballCo } if ((struct TPinballComponent*)dword_10236E4 == a3) { - if (*(_DWORD*)(dword_10236E4 + 78)) + if (*(DWORD*)(dword_10236E4 + 78)) { - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023E6C)(20, 0.0); - *(_DWORD*)(dword_1023BBC + 6) = 20; + (**(void(* **)(signed int, DWORD))dword_1023E6C)(20, 0.0); + *(DWORD*)(dword_1023BBC + 6) = 20; MissionControl(66, 0); } } @@ -1138,10 +1138,10 @@ void __userpurge AlienMenaceController(int a1@ , int a2, struct TPinballCo // 1023E6C: using guessed type int dword_1023E6C; //----- (01010051) -------------------------------------------------------- -void __userpurge AlienMenacePartTwoController(int a1@ , int a2, struct TPinballComponent* a3) +void AlienMenacePartTwoController(int a1@ , int a2, struct TPinballComponent* a3) { - void(__thiscall * **v3)(_DWORD, signed int, _DWORD); // esi - void(__thiscall * **v4)(_DWORD, signed int, _DWORD); // esi + void(__thiscall * **v3)(DWORD, signed int, DWORD); // esi + void(__thiscall * **v4)(DWORD, signed int, DWORD); // esi int v5; // ST30_4 CHAR* v6; // eax int v7; // ecx @@ -1154,25 +1154,25 @@ void __userpurge AlienMenacePartTwoController(int a1@ , int a2, struct TPi { if (a2 == 66) { - *(_DWORD*)(dword_1023888 + 6) = 8; - v3 = (void(__thiscall * **)(_DWORD, signed int, _DWORD))dword_1023A8C; - (**(void(__fastcall * **)(int, struct TPinballComponent*, signed int, _DWORD))dword_1023A8C)( + *(DWORD*)(dword_1023888 + 6) = 8; + v3 = (void(__thiscall * **)(DWORD, signed int, DWORD))dword_1023A8C; + (**(void(__fastcall * **)(int, struct TPinballComponent*, signed int, DWORD))dword_1023A8C)( dword_1023A8C, a3, 34, 0.0); (**v3)(v3, 20, 0.0); - v4 = (void(__thiscall * **)(_DWORD, signed int, _DWORD))dword_1023A94; - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023A94)(34, 0.0); + v4 = (void(__thiscall * **)(DWORD, signed int, DWORD))dword_1023A94; + (**(void(* **)(signed int, DWORD))dword_1023A94)(34, 0.0); (**v4)(v4, 20, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023E74)(7, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023E8C)(7, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023E74)(7, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023E8C)(7, 0.0); } else if (a2 != 67) { return; } - v5 = *(_DWORD*)(dword_1023888 + 6); + v5 = *(DWORD*)(dword_1023888 + 6); v6 = get_rc_string(107, 0); _sprintf(&Dest, v6, v5); TTextBox::Display(dword_1023E24, a1, &Dest, -1.0); @@ -1183,21 +1183,21 @@ void __userpurge AlienMenacePartTwoController(int a1@ , int a2, struct TPi || (struct TPinballComponent*)dword_10236F4 == a3 || (struct TPinballComponent*)dword_10236FC == a3) { - v7 = *(_DWORD*)(dword_1023888 + 6) - 1; - *(_DWORD*)(dword_1023888 + 6) = v7; + v7 = *(DWORD*)(dword_1023888 + 6) - 1; + *(DWORD*)(dword_1023888 + 6) = v7; if (v7) { MissionControl(67, a3); } else { - (**(void(__fastcall * **)(int, struct TPinballComponent*, signed int, _DWORD))dword_1023E74)( + (**(void(__fastcall * **)(int, struct TPinballComponent*, signed int, DWORD))dword_1023E74)( dword_1023E74, a3, 20, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023E8C)(20, 0.0); - *(_DWORD*)(dword_1023BBC + 6) = 1; + (**(void(* **)(signed int, DWORD))dword_1023E8C)(20, 0.0); + *(DWORD*)(dword_1023BBC + 6) = 1; MissionControl(66, 0); v8 = get_rc_string(130, 0); TTextBox::Display(dword_1023E24, a1, v8, 4.0); @@ -1207,7 +1207,7 @@ void __userpurge AlienMenacePartTwoController(int a1@ , int a2, struct TPi if (!AddRankProgress(7)) { TTextBox::Display(dword_1023E24, a1, &Dest, 8.0); - (*(void (**)(void))(*(_DWORD*)dword_1023D14 + 20))(); + (*(void (**)(void))(*(DWORD*)dword_1023D14 + 20))(); } } } @@ -1225,7 +1225,7 @@ void __userpurge AlienMenacePartTwoController(int a1@ , int a2, struct TPi // 1023E8C: using guessed type int dword_1023E8C; //----- (0101022D) -------------------------------------------------------- -void __userpurge SatelliteController(int a1@ , int a2, struct TPinballComponent* a3) +void SatelliteController(int a1@ , int a2, struct TPinballComponent* a3) { int v3; // ST08_4 CHAR* v4; // eax @@ -1239,8 +1239,8 @@ void __userpurge SatelliteController(int a1@ , int a2, struct TPinballComp { if (a2 == 66) { - *(_DWORD*)(dword_1023888 + 6) = 3; - (**(void(__fastcall * **)(int, struct TPinballComponent*, signed int, _DWORD))dword_1023E74)( + *(DWORD*)(dword_1023888 + 6) = 3; + (**(void(__fastcall * **)(int, struct TPinballComponent*, signed int, DWORD))dword_1023E74)( dword_1023E74, a3, 7, @@ -1250,7 +1250,7 @@ void __userpurge SatelliteController(int a1@ , int a2, struct TPinballComp { return; } - v3 = *(_DWORD*)(dword_1023888 + 6); + v3 = *(DWORD*)(dword_1023888 + 6); v4 = get_rc_string(132, 0); _sprintf(&Dest, v4, v3); TTextBox::Display(dword_1023E24, a1, &Dest, -1.0); @@ -1258,20 +1258,20 @@ void __userpurge SatelliteController(int a1@ , int a2, struct TPinballComp } if ((struct TPinballComponent*)dword_10236FC == a3) { - v5 = *(_DWORD*)(dword_1023888 + 6) - 1; - *(_DWORD*)(dword_1023888 + 6) = v5; + v5 = *(DWORD*)(dword_1023888 + 6) - 1; + *(DWORD*)(dword_1023888 + 6) = v5; if (v5) { MissionControl(67, a3); } else { - (**(void(__fastcall * **)(int, struct TPinballComponent*, signed int, _DWORD))dword_1023E74)( + (**(void(__fastcall * **)(int, struct TPinballComponent*, signed int, DWORD))dword_1023E74)( dword_1023E74, a3, 20, 0.0); - *(_DWORD*)(dword_1023BBC + 6) = 1; + *(DWORD*)(dword_1023BBC + 6) = 1; MissionControl(66, 0); v6 = get_rc_string(133, 0); TTextBox::Display(dword_1023E24, a1, v6, 4.0); @@ -1281,7 +1281,7 @@ void __userpurge SatelliteController(int a1@ , int a2, struct TPinballComp if (!AddRankProgress(9)) { TTextBox::Display(dword_1023E24, a1, &Dest, 8.0); - (*(void (**)(void))(*(_DWORD*)dword_1023D14 + 20))(); + (*(void (**)(void))(*(DWORD*)dword_1023D14 + 20))(); } } } @@ -1293,7 +1293,7 @@ void __userpurge SatelliteController(int a1@ , int a2, struct TPinballComp // 1023E74: using guessed type int dword_1023E74; //----- (01010385) -------------------------------------------------------- -void __userpurge ReconnaissanceController(int a1@ , int a2, struct TPinballComponent* a3) +void ReconnaissanceController(int a1@ , int a2, struct TPinballComponent* a3) { int v3; // ST30_4 CHAR* v4; // eax @@ -1307,19 +1307,19 @@ void __userpurge ReconnaissanceController(int a1@ , int a2, struct TPinbal { if (a2 == 66) { - *(_DWORD*)(dword_1023888 + 6) = 15; - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023E3C)(7, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023E44)(7, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023E6C)(7, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023EB4)(7, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023ED4)(7, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023EDC)(7, 0.0); + *(DWORD*)(dword_1023888 + 6) = 15; + (**(void(* **)(signed int, DWORD))dword_1023E3C)(7, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023E44)(7, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023E6C)(7, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023EB4)(7, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023ED4)(7, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023EDC)(7, 0.0); } else if (a2 != 67) { return; } - v3 = *(_DWORD*)(dword_1023888 + 6); + v3 = *(DWORD*)(dword_1023888 + 6); v4 = get_rc_string(134, 0); _sprintf(&Dest, v4, v3); TTextBox::Display(dword_1023E24, a1, &Dest, -1.0); @@ -1337,21 +1337,21 @@ void __userpurge ReconnaissanceController(int a1@ , int a2, struct TPinbal || (struct TPinballComponent*)dword_10238C8 == a3 || (struct TPinballComponent*)dword_10238E8 == a3) { - v5 = *(_DWORD*)(dword_1023888 + 6) - 1; - *(_DWORD*)(dword_1023888 + 6) = v5; + v5 = *(DWORD*)(dword_1023888 + 6) - 1; + *(DWORD*)(dword_1023888 + 6) = v5; if (v5) { MissionControl(67, 0); } else { - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023E3C)(20, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023E44)(20, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023E6C)(20, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023EB4)(20, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023ED4)(20, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023EDC)(20, 0.0); - *(_DWORD*)(dword_1023BBC + 6) = 1; + (**(void(* **)(signed int, DWORD))dword_1023E3C)(20, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023E44)(20, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023E6C)(20, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023EB4)(20, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023ED4)(20, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023EDC)(20, 0.0); + *(DWORD*)(dword_1023BBC + 6) = 1; MissionControl(66, 0); v6 = get_rc_string(136, 0); TTextBox::Display(dword_1023E24, a1, v6, 4.0); @@ -1361,7 +1361,7 @@ void __userpurge ReconnaissanceController(int a1@ , int a2, struct TPinbal if (!AddRankProgress(9)) { TTextBox::Display(dword_1023E24, a1, &Dest, 8.0); - (*(void (**)(void))(*(_DWORD*)dword_1023D14 + 20))(); + (*(void (**)(void))(*(DWORD*)dword_1023D14 + 20))(); } } } @@ -1388,7 +1388,7 @@ void __userpurge ReconnaissanceController(int a1@ , int a2, struct TPinbal // 1023EDC: using guessed type int dword_1023EDC; //----- (010105E3) -------------------------------------------------------- -void __userpurge DoomsdayMachineController(int a1@ , int a2, struct TPinballComponent* a3) +void DoomsdayMachineController(int a1@ , int a2, struct TPinballComponent* a3) { int v3; // ST10_4 CHAR* v4; // eax @@ -1402,19 +1402,19 @@ void __userpurge DoomsdayMachineController(int a1@ , int a2, struct TPinba { if (a2 == 66) { - *(_DWORD*)(dword_1023888 + 6) = 3; - (**(void(__fastcall * **)(int, struct TPinballComponent*, signed int, _DWORD))dword_1023E3C)( + *(DWORD*)(dword_1023888 + 6) = 3; + (**(void(__fastcall * **)(int, struct TPinballComponent*, signed int, DWORD))dword_1023E3C)( dword_1023E3C, a3, 7, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023ED4)(7, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023ED4)(7, 0.0); } else if (a2 != 67) { return; } - v3 = *(_DWORD*)(dword_1023888 + 6); + v3 = *(DWORD*)(dword_1023888 + 6); v4 = get_rc_string(137, 0); _sprintf(&Dest, v4, v3); TTextBox::Display(dword_1023E24, a1, &Dest, -1.0); @@ -1422,21 +1422,21 @@ void __userpurge DoomsdayMachineController(int a1@ , int a2, struct TPinba } if ((struct TPinballComponent*)dword_102389C == a3 || (struct TPinballComponent*)dword_10238A4 == a3) { - v5 = *(_DWORD*)(dword_1023888 + 6) - 1; - *(_DWORD*)(dword_1023888 + 6) = v5; + v5 = *(DWORD*)(dword_1023888 + 6) - 1; + *(DWORD*)(dword_1023888 + 6) = v5; if (v5) { MissionControl(67, a3); } else { - (**(void(__fastcall * **)(int, struct TPinballComponent*, signed int, _DWORD))dword_1023E3C)( + (**(void(__fastcall * **)(int, struct TPinballComponent*, signed int, DWORD))dword_1023E3C)( dword_1023E3C, a3, 20, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023ED4)(20, 0.0); - *(_DWORD*)(dword_1023BBC + 6) = 1; + (**(void(* **)(signed int, DWORD))dword_1023ED4)(20, 0.0); + *(DWORD*)(dword_1023BBC + 6) = 1; MissionControl(66, 0); v6 = get_rc_string(138, 0); TTextBox::Display(dword_1023E24, a1, v6, 4.0); @@ -1446,7 +1446,7 @@ void __userpurge DoomsdayMachineController(int a1@ , int a2, struct TPinba if (!AddRankProgress(9)) { TTextBox::Display(dword_1023E24, a1, &Dest, 8.0); - (*(void (**)(void))(*(_DWORD*)dword_1023D14 + 20))(); + (*(void (**)(void))(*(DWORD*)dword_1023D14 + 20))(); } } } @@ -1460,7 +1460,7 @@ void __userpurge DoomsdayMachineController(int a1@ , int a2, struct TPinba // 1023ED4: using guessed type int dword_1023ED4; //----- (01010767) -------------------------------------------------------- -void __userpurge CosmicPlagueController(int a1@ , int a2, struct TPinballComponent* a3) +void CosmicPlagueController(int a1@ , int a2, struct TPinballComponent* a3) { int v3; // ST20_4 CHAR* v4; // eax @@ -1471,21 +1471,21 @@ void __userpurge CosmicPlagueController(int a1@ , int a2, struct TPinballC { if (a2 == 66) { - *(_DWORD*)(dword_1023888 + 6) = 75; - (**(void(__fastcall * **)(int, struct TPinballComponent*, signed int, _DWORD))dword_1023940)( + *(DWORD*)(dword_1023888 + 6) = 75; + (**(void(__fastcall * **)(int, struct TPinballComponent*, signed int, DWORD))dword_1023940)( dword_1023940, a3, 19, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_10239D0)(19, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023E5C)(7, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023E94)(7, 0.0); + (**(void(* **)(signed int, DWORD))dword_10239D0)(19, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023E5C)(7, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023E94)(7, 0.0); } else if (a2 != 67) { return; } - v3 = *(_DWORD*)(dword_1023888 + 6); + v3 = *(DWORD*)(dword_1023888 + 6); v4 = get_rc_string(139, 0); _sprintf(&Dest, v4, v3); TTextBox::Display(dword_1023E24, a1, &Dest, -1.0); @@ -1493,24 +1493,24 @@ void __userpurge CosmicPlagueController(int a1@ , int a2, struct TPinballC } if ((struct TPinballComponent*)dword_1023930 == a3 || (struct TPinballComponent*)dword_10239C8 == a3) { - v5 = *(_DWORD*)(dword_1023888 + 6) - 1; - *(_DWORD*)(dword_1023888 + 6) = v5; + v5 = *(DWORD*)(dword_1023888 + 6) - 1; + *(DWORD*)(dword_1023888 + 6) = v5; if (v5) { MissionControl(67, a3); } else { - (**(void(__fastcall * **)(int, struct TPinballComponent*, signed int, _DWORD))dword_1023E5C)( + (**(void(__fastcall * **)(int, struct TPinballComponent*, signed int, DWORD))dword_1023E5C)( dword_1023E5C, a3, 20, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023E94)(20, 0.0); - *(_DWORD*)(dword_1023BBC + 6) = 21; + (**(void(* **)(signed int, DWORD))dword_1023E94)(20, 0.0); + *(DWORD*)(dword_1023BBC + 6) = 21; MissionControl(66, 0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023940)(20, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_10239D0)(20, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023940)(20, 0.0); + (**(void(* **)(signed int, DWORD))dword_10239D0)(20, 0.0); } } } @@ -1524,7 +1524,7 @@ void __userpurge CosmicPlagueController(int a1@ , int a2, struct TPinballC // 1023E94: using guessed type int dword_1023E94; //----- (010108BC) -------------------------------------------------------- -void __userpurge CosmicPlaguePartTwoController(int a1@ , int a2, struct TPinballComponent* a3) +void CosmicPlaguePartTwoController(int a1@ , int a2, struct TPinballComponent* a3) { char* v3; // eax char* v4; // eax @@ -1536,7 +1536,7 @@ void __userpurge CosmicPlaguePartTwoController(int a1@ , int a2, struct TP { if (a2 == 66) { - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023E84)(7, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023E84)(7, 0.0); } else if (a2 != 67) { @@ -1548,8 +1548,8 @@ void __userpurge CosmicPlaguePartTwoController(int a1@ , int a2, struct TP } if ((struct TPinballComponent*)dword_1023C50 == a3) { - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023E84)(20, 0.0); - *(_DWORD*)(dword_1023BBC + 6) = 1; + (**(void(* **)(signed int, DWORD))dword_1023E84)(20, 0.0); + *(DWORD*)(dword_1023BBC + 6) = 1; MissionControl(66, 0); v4 = get_rc_string(141, 0); TTextBox::Display(dword_1023E24, a1, v4, 4.0); @@ -1559,7 +1559,7 @@ void __userpurge CosmicPlaguePartTwoController(int a1@ , int a2, struct TP if (!AddRankProgress(11)) { TTextBox::Display(dword_1023E24, a1, &Dest, 8.0); - (*(void (**)(void))(*(_DWORD*)dword_1023D14 + 20))(); + (*(void (**)(void))(*(DWORD*)dword_1023D14 + 20))(); } } } @@ -1569,7 +1569,7 @@ void __userpurge CosmicPlaguePartTwoController(int a1@ , int a2, struct TP // 1023E84: using guessed type int dword_1023E84; //----- (010109D5) -------------------------------------------------------- -void __userpurge SecretMissionYellowController(int a1@ , int a2, struct TPinballComponent* a3) +void SecretMissionYellowController(int a1@ , int a2, struct TPinballComponent* a3) { char* v3; // eax @@ -1577,14 +1577,14 @@ void __userpurge SecretMissionYellowController(int a1@ , int a2, struct TP { if (a2 == 66) { - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023A1C)(20, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023A3C)(20, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023A3C)(23, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023C44)(20, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023A14)(19, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023A34)(11, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023A34)(19, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023A34)(7, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023A1C)(20, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023A3C)(20, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023A3C)(23, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023C44)(20, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023A14)(19, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023A34)(11, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023A34)(19, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023A34)(7, 0.0); } else if (a2 != 67) { @@ -1596,7 +1596,7 @@ void __userpurge SecretMissionYellowController(int a1@ , int a2, struct TP } if ((struct TPinballComponent*)dword_10239FC == a3) { - *(_DWORD*)(dword_1023BBC + 6) = 22; + *(DWORD*)(dword_1023BBC + 6) = 22; MissionControl(66, 0); } } @@ -1609,7 +1609,7 @@ void __userpurge SecretMissionYellowController(int a1@ , int a2, struct TP // 1023C44: using guessed type int dword_1023C44; //----- (01010AD3) -------------------------------------------------------- -void __userpurge SecretMissionRedController(int a1@ , int a2, struct TPinballComponent* a3) +void SecretMissionRedController(int a1@ , int a2, struct TPinballComponent* a3) { char* v3; // eax @@ -1617,10 +1617,10 @@ void __userpurge SecretMissionRedController(int a1@ , int a2, struct TPinb { if (a2 == 66) { - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023A04)(19, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023A24)(11, 2.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023A24)(19, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023A24)(7, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023A04)(19, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023A24)(11, 2.0); + (**(void(* **)(signed int, DWORD))dword_1023A24)(19, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023A24)(7, 0.0); } else if (a2 != 67) { @@ -1632,7 +1632,7 @@ void __userpurge SecretMissionRedController(int a1@ , int a2, struct TPinb } if ((struct TPinballComponent*)dword_10239EC == a3) { - *(_DWORD*)(dword_1023BBC + 6) = 23; + *(DWORD*)(dword_1023BBC + 6) = 23; MissionControl(66, 0); } } @@ -1642,7 +1642,7 @@ void __userpurge SecretMissionRedController(int a1@ , int a2, struct TPinb // 1023BBC: using guessed type int dword_1023BBC; //----- (01010B85) -------------------------------------------------------- -void __userpurge SecretMissionGreenController(int a1@ , int a2, struct TPinballComponent* a3) +void SecretMissionGreenController(int a1@ , int a2, struct TPinballComponent* a3) { char* v3; // eax char* v4; // eax @@ -1654,10 +1654,10 @@ void __userpurge SecretMissionGreenController(int a1@ , int a2, struct TPi { if (a2 == 66) { - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023A0C)(19, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023A2C)(11, 1.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023A2C)(19, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023A2C)(7, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023A0C)(19, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023A2C)(11, 1.0); + (**(void(* **)(signed int, DWORD))dword_1023A2C)(19, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023A2C)(7, 0.0); } else if (a2 != 67) { @@ -1669,7 +1669,7 @@ void __userpurge SecretMissionGreenController(int a1@ , int a2, struct TPi } if ((struct TPinballComponent*)dword_10239F4 == a3) { - *(_DWORD*)(dword_1023BBC + 6) = 1; + *(DWORD*)(dword_1023BBC + 6) = 1; MissionControl(66, 0); v4 = get_rc_string(145, 0); TTextBox::Display(dword_1023E24, a1, v4, 4.0); @@ -1679,7 +1679,7 @@ void __userpurge SecretMissionGreenController(int a1@ , int a2, struct TPi if (!AddRankProgress(10)) { TTextBox::Display(dword_1023E24, a1, &Dest, 8.0); - (*(void (**)(void))(*(_DWORD*)dword_1023D14 + 20))(); + (*(void (**)(void))(*(DWORD*)dword_1023D14 + 20))(); } } } @@ -1690,7 +1690,7 @@ void __userpurge SecretMissionGreenController(int a1@ , int a2, struct TPi // 1023D14: using guessed type int dword_1023D14; //----- (01010CC2) -------------------------------------------------------- -void __userpurge TimeWarpController(int a1@ , int a2, struct TPinballComponent* a3) +void TimeWarpController(int a1@ , int a2, struct TPinballComponent* a3) { int v3; // ST10_4 CHAR* v4; // eax @@ -1701,19 +1701,19 @@ void __userpurge TimeWarpController(int a1@ , int a2, struct TPinballCompo { if (a2 == 66) { - *(_DWORD*)(dword_1023888 + 6) = 25; - (**(void(__fastcall * **)(int, struct TPinballComponent*, signed int, _DWORD))dword_1023E34)( + *(DWORD*)(dword_1023888 + 6) = 25; + (**(void(__fastcall * **)(int, struct TPinballComponent*, signed int, DWORD))dword_1023E34)( dword_1023E34, a3, 7, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023EE4)(7, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023EE4)(7, 0.0); } else if (a2 != 67) { return; } - v3 = *(_DWORD*)(dword_1023888 + 6); + v3 = *(DWORD*)(dword_1023888 + 6); v4 = get_rc_string(146, 0); _sprintf(&Dest, v4, v3); TTextBox::Display(dword_1023E24, a1, &Dest, -1.0); @@ -1724,21 +1724,21 @@ void __userpurge TimeWarpController(int a1@ , int a2, struct TPinballCompo || (struct TPinballComponent*)dword_10237E8 == a3 || (struct TPinballComponent*)dword_10237F0 == a3) { - v5 = *(_DWORD*)(dword_1023888 + 6) - 1; - *(_DWORD*)(dword_1023888 + 6) = v5; + v5 = *(DWORD*)(dword_1023888 + 6) - 1; + *(DWORD*)(dword_1023888 + 6) = v5; if (v5) { MissionControl(67, a3); } else { - (**(void(__fastcall * **)(int, struct TPinballComponent*, signed int, _DWORD))dword_1023E34)( + (**(void(__fastcall * **)(int, struct TPinballComponent*, signed int, DWORD))dword_1023E34)( dword_1023E34, a3, 20, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023EE4)(20, 0.0); - *(_DWORD*)(dword_1023BBC + 6) = 24; + (**(void(* **)(signed int, DWORD))dword_1023EE4)(20, 0.0); + *(DWORD*)(dword_1023BBC + 6) = 24; MissionControl(66, 0); } } @@ -1753,7 +1753,7 @@ void __userpurge TimeWarpController(int a1@ , int a2, struct TPinballCompo // 1023EE4: using guessed type int dword_1023EE4; //----- (01010DD3) -------------------------------------------------------- -void __userpurge TimeWarpPartTwoController(int a1@ , int a2, struct TPinballComponent* a3) +void TimeWarpPartTwoController(int a1@ , int a2, struct TPinballComponent* a3) { char* v3; // eax char* v4; // eax @@ -1770,10 +1770,10 @@ void __userpurge TimeWarpPartTwoController(int a1@ , int a2, struct TPinba { if (a2 == 66) { - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023880)(7, -1.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_10239B8)(7, -1.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023E54)(7, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023EBC)(7, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023880)(7, -1.0); + (**(void(* **)(signed int, DWORD))dword_10239B8)(7, -1.0); + (**(void(* **)(signed int, DWORD))dword_1023E54)(7, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023EBC)(7, 0.0); } else if (a2 != 67) { @@ -1787,10 +1787,10 @@ void __userpurge TimeWarpPartTwoController(int a1@ , int a2, struct TPinba { v4 = get_rc_string(47, 0); TTextBox::Display(dword_1023E24, a1, v4, 4.0); - if ((**(int(__stdcall * **)(signed int, _DWORD))dword_1023CF4)(37, 0.0) > 1) + if ((**(int(* **)(signed int, DWORD))dword_1023CF4)(37, 0.0) > 1) { - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023CF4)(33, 5.0); - v5 = (**(int(__stdcall * **)(signed int, _DWORD))dword_1023CF4)(37, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023CF4)(33, 5.0); + v5 = (**(int(* **)(signed int, DWORD))dword_1023CF4)(37, 0.0); v6 = get_rc_string(word_10246EC[2 * (v5 - 1)], 1); v7 = get_rc_string(174, 0); _sprintf(&Dest, v7, v6); @@ -1803,10 +1803,10 @@ void __userpurge TimeWarpPartTwoController(int a1@ , int a2, struct TPinba return; v8 = get_rc_string(46, 0); TTextBox::Display(dword_1023E24, a1, v8, 4.0); - if ((**(int(__stdcall * **)(signed int, _DWORD))dword_1023CF4)(37, 0.0) < 9) + if ((**(int(* **)(signed int, DWORD))dword_1023CF4)(37, 0.0) < 9) { - v9 = (**(int(__stdcall * **)(signed int, _DWORD))dword_1023CF4)(37, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023CF4)(41, 5.0); + v9 = (**(int(* **)(signed int, DWORD))dword_1023CF4)(37, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023CF4)(41, 5.0); v10 = get_rc_string(word_10246EC[2 * v9], 1); v11 = get_rc_string(173, 0); _sprintf(&Dest, v11, v10); @@ -1814,15 +1814,15 @@ void __userpurge TimeWarpPartTwoController(int a1@ , int a2, struct TPinba if (!AddRankProgress(12)) { TTextBox::Display(dword_1023E24, a1, &Dest, 8.0); - (*(void (**)(void))(*(_DWORD*)dword_1023D1C + 20))(); + (*(void (**)(void))(*(DWORD*)dword_1023D1C + 20))(); } } SpecialAddScore(2000000); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023880)(20, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_10239B8)(20, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023E54)(20, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023EBC)(20, 0.0); - *(_DWORD*)(dword_1023BBC + 6) = 1; + (**(void(* **)(signed int, DWORD))dword_1023880)(20, 0.0); + (**(void(* **)(signed int, DWORD))dword_10239B8)(20, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023E54)(20, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023EBC)(20, 0.0); + *(DWORD*)(dword_1023BBC + 6) = 1; MissionControl(66, 0); } // 1023870: using guessed type int dword_1023870; @@ -1834,10 +1834,10 @@ void __userpurge TimeWarpPartTwoController(int a1@ , int a2, struct TPinba // 1023D1C: using guessed type int dword_1023D1C; // 1023E54: using guessed type int dword_1023E54; // 1023EBC: using guessed type int dword_1023EBC; -// 10246EC: using guessed type __int16 word_10246EC[]; +// 10246EC: using guessed type int word_10246EC[]; //----- (0101106F) -------------------------------------------------------- -void __userpurge MaelstromController(int a1@ , int a2, struct TPinballComponent* a3) +void MaelstromController(int a1@ , int a2, struct TPinballComponent* a3) { int v3; // ST18_4 CHAR* v4; // eax @@ -1848,16 +1848,16 @@ void __userpurge MaelstromController(int a1@ , int a2, struct TPinballComp { if (a2 == 66) { - *(_DWORD*)(dword_1023888 + 6) = 3; - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023E4C)(7, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023E7C)(7, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023EAC)(7, 0.0); + *(DWORD*)(dword_1023888 + 6) = 3; + (**(void(* **)(signed int, DWORD))dword_1023E4C)(7, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023E7C)(7, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023EAC)(7, 0.0); } else if (a2 != 67) { return; } - v3 = *(_DWORD*)(dword_1023888 + 6); + v3 = *(DWORD*)(dword_1023888 + 6); v4 = get_rc_string(148, 0); _sprintf(&Dest, v4, v3); TTextBox::Display(dword_1023E24, a1, &Dest, -1.0); @@ -1873,18 +1873,18 @@ void __userpurge MaelstromController(int a1@ , int a2, struct TPinballComp || (struct TPinballComponent*)dword_1023B28 == a3 || (struct TPinballComponent*)dword_1023B30 == a3) { - v5 = *(_DWORD*)(dword_1023888 + 6) - 1; - *(_DWORD*)(dword_1023888 + 6) = v5; + v5 = *(DWORD*)(dword_1023888 + 6) - 1; + *(DWORD*)(dword_1023888 + 6) = v5; if (v5) { MissionControl(67, a3); } else { - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023E4C)(20, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023E7C)(20, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023EAC)(20, 0.0); - *(_DWORD*)(dword_1023BBC + 6) = 25; + (**(void(* **)(signed int, DWORD))dword_1023E4C)(20, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023E7C)(20, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023EAC)(20, 0.0); + *(DWORD*)(dword_1023BBC + 6) = 25; MissionControl(66, 0); } } @@ -1905,7 +1905,7 @@ void __userpurge MaelstromController(int a1@ , int a2, struct TPinballComp // 1023EAC: using guessed type int dword_1023EAC; //----- (010111D3) -------------------------------------------------------- -void __userpurge MaelstromPartTwoController(int a1@ , int a2, struct TPinballComponent* a3) +void MaelstromPartTwoController(int a1@ , int a2, struct TPinballComponent* a3) { int v3; // ST28_4 CHAR* v4; // eax @@ -1916,18 +1916,18 @@ void __userpurge MaelstromPartTwoController(int a1@ , int a2, struct TPinb { if (a2 == 66) { - *(_DWORD*)(dword_1023888 + 6) = 3; - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023E64)(7, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023E74)(7, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023E84)(7, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023E9C)(7, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023ECC)(7, 0.0); + *(DWORD*)(dword_1023888 + 6) = 3; + (**(void(* **)(signed int, DWORD))dword_1023E64)(7, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023E74)(7, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023E84)(7, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023E9C)(7, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023ECC)(7, 0.0); } else if (a2 != 67) { return; } - v3 = *(_DWORD*)(dword_1023888 + 6); + v3 = *(DWORD*)(dword_1023888 + 6); v4 = get_rc_string(149, 0); _sprintf(&Dest, v4, v3); TTextBox::Display(dword_1023E24, a1, &Dest, -1.0); @@ -1947,20 +1947,20 @@ void __userpurge MaelstromPartTwoController(int a1@ , int a2, struct TPinb || (struct TPinballComponent*)dword_1023BF0 == a3 || (struct TPinballComponent*)dword_1023C3C == a3) { - v5 = *(_DWORD*)(dword_1023888 + 6) - 1; - *(_DWORD*)(dword_1023888 + 6) = v5; + v5 = *(DWORD*)(dword_1023888 + 6) - 1; + *(DWORD*)(dword_1023888 + 6) = v5; if (v5) { MissionControl(67, a3); } else { - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023E64)(20, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023E74)(20, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023E84)(20, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023E9C)(20, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023ECC)(20, 0.0); - *(_DWORD*)(dword_1023BBC + 6) = 26; + (**(void(* **)(signed int, DWORD))dword_1023E64)(20, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023E74)(20, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023E84)(20, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023E9C)(20, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023ECC)(20, 0.0); + *(DWORD*)(dword_1023BBC + 6) = 26; MissionControl(66, 0); } } @@ -1987,7 +1987,7 @@ void __userpurge MaelstromPartTwoController(int a1@ , int a2, struct TPinb // 1023ECC: using guessed type int dword_1023ECC; //----- (010113A1) -------------------------------------------------------- -void __userpurge MaelstromPartThreeController(int a1@ , int a2, struct TPinballComponent* a3) +void MaelstromPartThreeController(int a1@ , int a2, struct TPinballComponent* a3) { int v3; // ST30_4 CHAR* v4; // eax @@ -1998,19 +1998,19 @@ void __userpurge MaelstromPartThreeController(int a1@ , int a2, struct TPi { if (a2 == 66) { - *(_DWORD*)(dword_1023888 + 6) = 5; - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023E3C)(7, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023E44)(7, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023E6C)(7, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023EB4)(7, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023ED4)(7, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023EDC)(7, 0.0); + *(DWORD*)(dword_1023888 + 6) = 5; + (**(void(* **)(signed int, DWORD))dword_1023E3C)(7, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023E44)(7, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023E6C)(7, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023EB4)(7, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023ED4)(7, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023EDC)(7, 0.0); } else if (a2 != 67) { return; } - v3 = *(_DWORD*)(dword_1023888 + 6); + v3 = *(DWORD*)(dword_1023888 + 6); v4 = get_rc_string(150, 0); _sprintf(&Dest, v4, v3); TTextBox::Display(dword_1023E24, a1, &Dest, -1.0); @@ -2028,21 +2028,21 @@ void __userpurge MaelstromPartThreeController(int a1@ , int a2, struct TPi || (struct TPinballComponent*)dword_10238C8 == a3 || (struct TPinballComponent*)dword_10238E8 == a3) { - v5 = *(_DWORD*)(dword_1023888 + 6) - 1; - *(_DWORD*)(dword_1023888 + 6) = v5; + v5 = *(DWORD*)(dword_1023888 + 6) - 1; + *(DWORD*)(dword_1023888 + 6) = v5; if (v5) { MissionControl(67, a3); } else { - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023E3C)(20, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023E44)(20, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023E6C)(20, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023EB4)(20, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023ED4)(20, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023EDC)(20, 0.0); - *(_DWORD*)(dword_1023BBC + 6) = 27; + (**(void(* **)(signed int, DWORD))dword_1023E3C)(20, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023E44)(20, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023E6C)(20, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023EB4)(20, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023ED4)(20, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023EDC)(20, 0.0); + *(DWORD*)(dword_1023BBC + 6) = 27; MissionControl(66, 0); } } @@ -2068,7 +2068,7 @@ void __userpurge MaelstromPartThreeController(int a1@ , int a2, struct TPi // 1023EDC: using guessed type int dword_1023EDC; //----- (01011582) -------------------------------------------------------- -void __userpurge MaelstromPartFourController(int a1@ , int a2, struct TPinballComponent* a3) +void MaelstromPartFourController(int a1@ , int a2, struct TPinballComponent* a3) { char* v3; // eax @@ -2076,8 +2076,8 @@ void __userpurge MaelstromPartFourController(int a1@ , int a2, struct TPin { if (a2 == 66) { - *(_DWORD*)(dword_1023888 + 6) = 0; - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023EC4)(7, 0.0); + *(DWORD*)(dword_1023888 + 6) = 0; + (**(void(* **)(signed int, DWORD))dword_1023EC4)(7, 0.0); } else if (a2 != 67) { @@ -2089,8 +2089,8 @@ void __userpurge MaelstromPartFourController(int a1@ , int a2, struct TPin } if ((struct TPinballComponent*)dword_1023924 == a3) { - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023EC4)(20, 0.0); - *(_DWORD*)(dword_1023BBC + 6) = 28; + (**(void(* **)(signed int, DWORD))dword_1023EC4)(20, 0.0); + *(DWORD*)(dword_1023BBC + 6) = 28; MissionControl(66, 0); } } @@ -2100,7 +2100,7 @@ void __userpurge MaelstromPartFourController(int a1@ , int a2, struct TPin // 1023EC4: using guessed type int dword_1023EC4; //----- (01011612) -------------------------------------------------------- -void __userpurge MaelstromPartFiveController(int a1@ , int a2, struct TPinballComponent* a3) +void MaelstromPartFiveController(int a1@ , int a2, struct TPinballComponent* a3) { char* v3; // eax @@ -2108,7 +2108,7 @@ void __userpurge MaelstromPartFiveController(int a1@ , int a2, struct TPin { if (a2 == 66) { - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023EBC)(7, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023EBC)(7, 0.0); } else if (a2 != 67) { @@ -2120,8 +2120,8 @@ void __userpurge MaelstromPartFiveController(int a1@ , int a2, struct TPin } if ((struct TPinballComponent*)dword_1023870 == a3) { - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023EBC)(20, 0.0); - *(_DWORD*)(dword_1023BBC + 6) = 29; + (**(void(* **)(signed int, DWORD))dword_1023EBC)(20, 0.0); + *(DWORD*)(dword_1023BBC + 6) = 29; MissionControl(66, 0); } } @@ -2130,7 +2130,7 @@ void __userpurge MaelstromPartFiveController(int a1@ , int a2, struct TPin // 1023EBC: using guessed type int dword_1023EBC; //----- (01011699) -------------------------------------------------------- -void __userpurge MaelstromPartSixController(int a1@ , int a2, struct TPinballComponent* a3) +void MaelstromPartSixController(int a1@ , int a2, struct TPinballComponent* a3) { char* v3; // eax @@ -2138,10 +2138,10 @@ void __userpurge MaelstromPartSixController(int a1@ , int a2, struct TPinb { if (a2 == 66) { - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023940)(19, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_10239D0)(19, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023E5C)(7, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023E94)(7, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023940)(19, 0.0); + (**(void(* **)(signed int, DWORD))dword_10239D0)(19, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023E5C)(7, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023E94)(7, 0.0); } else if (a2 != 67) { @@ -2153,12 +2153,12 @@ void __userpurge MaelstromPartSixController(int a1@ , int a2, struct TPinb } if ((struct TPinballComponent*)dword_1023930 == a3 || (struct TPinballComponent*)dword_10239C8 == a3) { - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023E5C)(20, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023E94)(20, 0.0); - *(_DWORD*)(dword_1023BBC + 6) = 30; + (**(void(* **)(signed int, DWORD))dword_1023E5C)(20, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023E94)(20, 0.0); + *(DWORD*)(dword_1023BBC + 6) = 30; MissionControl(66, 0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023940)(20, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_10239D0)(20, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023940)(20, 0.0); + (**(void(* **)(signed int, DWORD))dword_10239D0)(20, 0.0); } } // 1023930: using guessed type int dword_1023930; @@ -2170,7 +2170,7 @@ void __userpurge MaelstromPartSixController(int a1@ , int a2, struct TPinb // 1023E94: using guessed type int dword_1023E94; //----- (01011798) -------------------------------------------------------- -void __userpurge MaelstromPartSevenController(int a1@ , int a2, struct TPinballComponent* a3) +void MaelstromPartSevenController(int a1@ , int a2, struct TPinballComponent* a3) { char* v3; // eax @@ -2179,9 +2179,9 @@ void __userpurge MaelstromPartSevenController(int a1@ , int a2, struct TPi if (a2 == 66) { AdvanceWormHoleDestination(1); - (**(void(__stdcall * **)(signed int, _DWORD))dword_10239EC)(7, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_10239F4)(7, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_10239FC)(7, 0.0); + (**(void(* **)(signed int, DWORD))dword_10239EC)(7, 0.0); + (**(void(* **)(signed int, DWORD))dword_10239F4)(7, 0.0); + (**(void(* **)(signed int, DWORD))dword_10239FC)(7, 0.0); } else if (a2 != 67) { @@ -2195,7 +2195,7 @@ void __userpurge MaelstromPartSevenController(int a1@ , int a2, struct TPi || (struct TPinballComponent*)dword_10239F4 == a3 || (struct TPinballComponent*)dword_10239FC == a3) { - *(_DWORD*)(dword_1023BBC + 6) = 31; + *(DWORD*)(dword_1023BBC + 6) = 31; MissionControl(66, 0); } } @@ -2205,7 +2205,7 @@ void __userpurge MaelstromPartSevenController(int a1@ , int a2, struct TPi // 1023BBC: using guessed type int dword_1023BBC; //----- (0101184C) -------------------------------------------------------- -void __userpurge MaelstromPartEightController(int a1@ , int a2, struct TPinballComponent* a3) +void MaelstromPartEightController(int a1@ , int a2, struct TPinballComponent* a3) { char* v3; // eax int v4; // ST10_4 @@ -2217,8 +2217,8 @@ void __userpurge MaelstromPartEightController(int a1@ , int a2, struct TPi { if (a2 == 66) { - (**(void(__stdcall * **)(signed int, _DWORD))dword_10239C0)(19, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023E54)(7, 0.0); + (**(void(* **)(signed int, DWORD))dword_10239C0)(19, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023E54)(7, 0.0); } else if (a2 != 67) { @@ -2230,9 +2230,9 @@ void __userpurge MaelstromPartEightController(int a1@ , int a2, struct TPi } if ((struct TPinballComponent*)dword_1023980 == a3) { - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023E54)(20, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_10239C0)(20, 0.0); - *(_DWORD*)(dword_1023BBC + 6) = 1; + (**(void(* **)(signed int, DWORD))dword_1023E54)(20, 0.0); + (**(void(* **)(signed int, DWORD))dword_10239C0)(20, 0.0); + *(DWORD*)(dword_1023BBC + 6) = 1; MissionControl(66, 0); v4 = SpecialAddScore(5000000); v5 = get_rc_string(78, 0); @@ -2242,7 +2242,7 @@ void __userpurge MaelstromPartEightController(int a1@ , int a2, struct TPi if (!AddRankProgress(18)) { TTextBox::Display(dword_1023E24, a1, &Dest, 8.0); - (*(void (**)(void))(*(_DWORD*)dword_1023D14 + 20))(); + (*(void (**)(void))(*(DWORD*)dword_1023D14 + 20))(); } } } @@ -2253,7 +2253,7 @@ void __userpurge MaelstromPartEightController(int a1@ , int a2, struct TPi // 1023E54: using guessed type int dword_1023E54; //----- (01011985) -------------------------------------------------------- -void __stdcall GameoverController(int a1, struct TPinballComponent* a2) +void GameoverController(int a1, struct TPinballComponent* a2) { TTextBox* v2; // eax int v3; // esi @@ -2275,15 +2275,15 @@ void __stdcall GameoverController(int a1, struct TPinballComponent* a2) if (a1 != 67) return; v2 = dword_1023E24; - v3 = *(_DWORD*)((char*)dword_1023E24 + 6); + v3 = *(DWORD*)((char*)dword_1023E24 + 6); if (!(v3 & 0x100)) { if (!(v3 & 0x200)) goto LABEL_33; goto LABEL_18; } - v4 = *(_DWORD*)((_BYTE*)dword_1023E24 + 6) & 0xF; - v5 = **(_DWORD * *)((char*)dword_1025040 + 28 * v4 + 102); + v4 = *(DWORD*)((_BYTE*)dword_1023E24 + 6) & 0xF; + v5 = **(DWORD * *)((char*)dword_1025040 + 28 * v4 + 102); v3 = v4 + 1; if (v5 >= 0) { @@ -2310,14 +2310,14 @@ void __stdcall GameoverController(int a1, struct TPinballComponent* a2) } _sprintf(&Dest, v6, v13); TTextBox::Display(dword_1023E24, 256, &Dest, 3.0); - if (v3 == *(_DWORD*)((char*)dword_1025040 + 214)) + if (v3 == *(DWORD*)((char*)dword_1025040 + 214)) v7 = 512; else v7 = v3 | 0x100; goto LABEL_32; } LABEL_9: - *(_DWORD*)((char*)dword_1023E24 + 6) = 512; + *(DWORD*)((char*)dword_1023E24 + 6) = 512; v2 = dword_1023E24; LABEL_18: v8 = v3 & 0xF; @@ -2357,63 +2357,63 @@ void __stdcall GameoverController(int a1, struct TPinballComponent* a2) else v7 = v10 | 0x200; LABEL_32: - *(_DWORD*)((char*)dword_1023E24 + 6) = v7; + *(DWORD*)((char*)dword_1023E24 + 6) = v7; return; } LABEL_33: - *(_DWORD*)((char*)v2 + 6) = 256; + *(DWORD*)((char*)v2 + 6) = 256; v12 = get_rc_string(172, 0); TTextBox::Display(dword_1023E24, 256, v12, 10.0); return; } - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023EEC)(20, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023EEC)(20, 0.0); pb_mode_change(2); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023A74)(1022, 0.0); - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023A7C)(1022, 0.0); - *(_DWORD*)((char*)dword_1023E24 + 6) = 0; + (**(void(* **)(signed int, DWORD))dword_1023A74)(1022, 0.0); + (**(void(* **)(signed int, DWORD))dword_1023A7C)(1022, 0.0); + *(DWORD*)((char*)dword_1023E24 + 6) = 0; } // 1023A74: using guessed type int dword_1023A74; // 1023A7C: using guessed type int dword_1023A7C; // 1023EEC: using guessed type int dword_1023EEC; //----- (01011B98) -------------------------------------------------------- -void __stdcall UnselectMissionController(int a1, struct TPinballComponent* a2) +void UnselectMissionController(int a1, struct TPinballComponent* a2) { - *(_DWORD*)(dword_1023BBC + 6) = 1; + *(DWORD*)(dword_1023BBC + 6) = 1; MissionControl(66, 0); } // 1023BBC: using guessed type int dword_1023BBC; //----- (01011BB5) -------------------------------------------------------- -void __stdcall MissionControl(int a1, struct TPinballComponent* a2) +void MissionControl(int a1, struct TPinballComponent* a2) { int v2; // ebx signed int v3; // edi - void(__thiscall * **v4)(_DWORD, signed int, _DWORD); // ebx - void(__thiscall * **v5)(_DWORD, signed int, _DWORD); // ebx + void(__thiscall * **v4)(DWORD, signed int, DWORD); // ebx + void(__thiscall * **v5)(DWORD, signed int, DWORD); // ebx char* v6; // eax char* v7; // eax int v8; // [esp+30h] [ebp-4h] if (dword_1023BBC) { - v2 = *(_DWORD*)(dword_1023BBC + 6); + v2 = *(DWORD*)(dword_1023BBC + 6); v3 = a1; - v8 = *(_DWORD*)(dword_1023BBC + 6); + v8 = *(DWORD*)(dword_1023BBC + 6); switch (a1) { case 47: if ((struct TPinballComponent*)dword_1023978 == a2 && v2 > 1) { - v4 = (void(__thiscall * **)(_DWORD, signed int, _DWORD))dword_1023A8C; - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023A8C)(34, 0.0); + v4 = (void(__thiscall * **)(DWORD, signed int, DWORD))dword_1023A8C; + (**(void(* **)(signed int, DWORD))dword_1023A8C)(34, 0.0); (**v4)(v4, 20, 0.0); - v5 = (void(__thiscall * **)(_DWORD, signed int, _DWORD))dword_1023A94; - (**(void(__stdcall * **)(signed int, _DWORD))dword_1023A94)(34, 0.0); + v5 = (void(__thiscall * **)(DWORD, signed int, DWORD))dword_1023A94; + (**(void(* **)(signed int, DWORD))dword_1023A94)(34, 0.0); (**v5)(v5, 20, 0.0); v6 = get_rc_string(109, 0); TTextBox::Display(dword_1023E24, (int)v5, v6, 4.0); - *(_DWORD*)(dword_1023BBC + 6) = 1; + *(DWORD*)(dword_1023BBC + 6) = 1; MissionControl(66, 0); v2 = v8; } @@ -2421,7 +2421,7 @@ void __stdcall MissionControl(int a1, struct TPinballComponent* a2) case 60: if ((struct TPinballComponent*)dword_1023978 == a2 && v2) { - if ((**(int(__stdcall * **)(signed int, _DWORD))dword_1023978)(37, 0.0) == 1) + if ((**(int(* **)(signed int, DWORD))dword_1023978)(37, 0.0) == 1) { v7 = get_rc_string(116, 0); TTextBox::Display(dword_1023E24, v2, v7, 4.0); diff --git a/partman/loader.cpp b/partman/loader.cpp index c9864ab..bd0ba36 100644 --- a/partman/loader.cpp +++ b/partman/loader.cpp @@ -5,7 +5,7 @@ #include "../pinball.h" //----- (01008F7A) -------------------------------------------------------- -signed int __stdcall loader_error(int a1, int a2) +signed int loader_error(int a1, int a2) { int v2; // eax const CHAR *v3; // esi @@ -39,9 +39,9 @@ signed int __stdcall loader_error(int a1, int a2) // 10235F8: using guessed type int loader_errors[]; //----- (01008FE0) -------------------------------------------------------- -_DWORD *__stdcall loader_default_vsi(_DWORD *a1) +DWORD *loader_default_vsi(DWORD *a1) { - _DWORD *result; // eax + DWORD *result; // eax result = a1; a1[13] = 0; @@ -59,15 +59,15 @@ _DWORD *__stdcall loader_default_vsi(_DWORD *a1) } //----- (0100901F) -------------------------------------------------------- -signed int __stdcall loader_get_sound_id(int a1) +signed int loader_get_sound_id(int a1) { - signed __int16 v1; // dx + signed int v1; // dx signed int v2; // eax signed int result; // eax signed int v4; // edi int v5; // esi int v6; // eax - _WORD *v7; // eax + WORD *v7; // eax const CHAR *lpName; // ST18_4 HFILE hFile; // ST1C_4 int v10; // [esp+10h] [ebp+8h] @@ -97,7 +97,7 @@ signed int __stdcall loader_get_sound_id(int a1) v10 = v6; if ( v6 > 0 && !play_midi_music ) { - v7 = (_WORD *)partman_field(loader_table, v6, 0); + v7 = (WORD *)partman_field(loader_table, v6, 0); if ( v7 ) { if ( *v7 == 202 ) @@ -123,7 +123,7 @@ signed int __stdcall loader_get_sound_id(int a1) // 1027C28: using guessed type int dword_1027C28[]; //----- (0100911D) -------------------------------------------------------- -void __stdcall loader_unload() +void loader_unload() { signed int v0; // esi LPCVOID *v1; // edi @@ -148,11 +148,11 @@ void __stdcall loader_unload() // 1027C30: using guessed type int dword_1027C30[]; //----- (0100916A) -------------------------------------------------------- -int __stdcall loader_loadfrom(_WORD *a1) +int loader_loadfrom(WORD *a1) { - _WORD *v1; // edx - __int16 v2; // di - _WORD *v3; // eax + WORD *v1; // edx + int v2; // di + WORD *v3; // eax int result; // eax int v5; // ecx @@ -167,8 +167,8 @@ int __stdcall loader_loadfrom(_WORD *a1) { do { - v3 = (_WORD *)partman_field((int)v1, v2, 0); - v1 = (_WORD *)loader_table; + v3 = (WORD *)partman_field((int)v1, v2, 0); + v1 = (WORD *)loader_table; if ( v3 && *v3 == 202 ) { result = sound_count; @@ -200,36 +200,36 @@ int __stdcall loader_loadfrom(_WORD *a1) // 1028134: using guessed type int loader_sound_count; //----- (010091EB) -------------------------------------------------------- -int __stdcall loader_query_handle(LPCSTR lpString) +int loader_query_handle(LPCSTR lpString) { return partman_record_labeled(loader_table, lpString); } //----- (01009207) -------------------------------------------------------- -signed int __stdcall loader_query_visual_states(int a1) +signed int loader_query_visual_states(int a1) { signed int result; // eax - _WORD *v2; // eax + WORD *v2; // eax if ( a1 < 0 ) return loader_error(0, 17); - v2 = (_WORD *)partman_field(loader_table, a1, 10); + v2 = (WORD *)partman_field(loader_table, a1, 10); if ( v2 && *v2 == 100 ) - result = (signed __int16)v2[1]; + result = (signed int)v2[1]; else result = 1; return result; } //----- (01009249) -------------------------------------------------------- -signed int __stdcall loader_material(int a1, _DWORD *a2) +signed int loader_material(int a1, DWORD *a2) { int v2; // edi - _WORD *v4; // eax + WORD *v4; // eax float *v5; // esi unsigned int v6; // ebx double v7; // st7 - _DWORD *v8; // esi + DWORD *v8; // esi double v9; // st7 signed __int64 v10; // rax int v11; // [esp+1Ch] [ebp+8h] @@ -238,7 +238,7 @@ signed int __stdcall loader_material(int a1, _DWORD *a2) v2 = a1; if ( a1 < 0 ) return loader_error(0, 21); - v4 = (_WORD *)partman_field(loader_table, a1, 0); + v4 = (WORD *)partman_field(loader_table, a1, 0); if ( !v4 ) return loader_error(1, 21); if ( *v4 == 300 ) @@ -248,7 +248,7 @@ signed int __stdcall loader_material(int a1, _DWORD *a2) return loader_error(11, 21); v11 = 0; v6 = (unsigned int)partman_field_size(loader_table, v2, 11) >> 2; - if ( (signed __int16)v6 <= 0 ) + if ( (signed int)v6 <= 0 ) return 0; while ( 1 ) { @@ -256,7 +256,7 @@ signed int __stdcall loader_material(int a1, _DWORD *a2) v8 = v5 + 1; v12 = v11 + 1; v9 = _floor(v7); - switch ( (signed __int16)(signed __int64)v9 ) + switch ( (signed int)(signed __int64)v9 ) { case 301: *a2 = *v8; @@ -266,14 +266,14 @@ signed int __stdcall loader_material(int a1, _DWORD *a2) break; case 304: v10 = (signed __int64)_floor(*(float *)v8); - a2[4] = loader_get_sound_id((signed __int16)v10); + a2[4] = loader_get_sound_id((signed int)v10); break; default: return loader_error(9, 21); } v5 = (float *)(v8 + 1); v11 = v12 + 1; - if ( (signed __int16)v11 >= (signed __int16)v6 ) + if ( (signed int)v11 >= (signed int)v6 ) return 0; } } @@ -281,16 +281,16 @@ signed int __stdcall loader_material(int a1, _DWORD *a2) } //----- (01009349) -------------------------------------------------------- -signed int __stdcall loader_kicker(int a1, _DWORD *a2) +signed int loader_kicker(int a1, DWORD *a2) { - _WORD *v3; // eax + WORD *v3; // eax float *v4; // esi double v5; // st7 - _DWORD *v6; // esi + DWORD *v6; // esi double v7; // st7 signed __int64 v8; // rax int v9; // eax - _DWORD *v10; // esi + DWORD *v10; // esi int v11; // eax int v12; // eax unsigned int v13; // [esp+14h] [ebp-4h] @@ -299,7 +299,7 @@ signed int __stdcall loader_kicker(int a1, _DWORD *a2) if ( a1 < 0 ) return loader_error(0, 20); - v3 = (_WORD *)partman_field(loader_table, a1, 0); + v3 = (WORD *)partman_field(loader_table, a1, 0); if ( !v3 ) return loader_error(1, 20); if ( *v3 != 400 ) @@ -309,7 +309,7 @@ signed int __stdcall loader_kicker(int a1, _DWORD *a2) return loader_error(11, 20); v13 = (unsigned int)partman_field_size(loader_table, a1, 11) >> 2; v14 = 0; - if ( (signed __int16)v13 <= 0 ) + if ( (signed int)v13 <= 0 ) return 0; while ( 1 ) { @@ -317,7 +317,7 @@ signed int __stdcall loader_kicker(int a1, _DWORD *a2) v6 = v4 + 1; v15 = v14 + 1; v7 = _floor(v5); - switch ( (signed __int16)(signed __int64)v7 ) + switch ( (signed int)(signed __int64)v7 ) { case 401: *a2 = *v6; @@ -329,7 +329,7 @@ signed int __stdcall loader_kicker(int a1, _DWORD *a2) a2[2] = *v6; goto LABEL_24; } - if ( (signed __int16)(signed __int64)v7 != 404 ) + if ( (signed int)(signed __int64)v7 != 404 ) break; v9 = *v6; v10 = v6 + 1; @@ -342,18 +342,18 @@ signed int __stdcall loader_kicker(int a1, _DWORD *a2) v14 = v15 + 3; a2[5] = v12; LABEL_25: - if ( (signed __int16)v14 >= (signed __int16)v13 ) + if ( (signed int)v14 >= (signed int)v13 ) return 0; } - if ( (signed __int16)(signed __int64)v7 == 405 ) + if ( (signed int)(signed __int64)v7 == 405 ) { a2[6] = *v6; goto LABEL_24; } - if ( (signed __int16)(signed __int64)v7 == 406 ) + if ( (signed int)(signed __int64)v7 == 406 ) { v8 = (signed __int64)_floor(*(float *)v6); - a2[7] = loader_get_sound_id((signed __int16)v8); + a2[7] = loader_get_sound_id((signed int)v8); LABEL_24: v4 = (float *)(v6 + 1); v14 = v15 + 1; @@ -363,18 +363,18 @@ signed int __stdcall loader_kicker(int a1, _DWORD *a2) } //----- (01009486) -------------------------------------------------------- -signed int __stdcall loader_state_id(int a1, signed int a2) +signed int loader_state_id(int a1, signed int a2) { int v2; // esi - __int16 v3; // di - _WORD *v5; // eax - _WORD *v6; // eax + int v3; // di + WORD *v5; // eax + WORD *v6; // eax v2 = a1; v3 = loader_query_visual_states(a1); if ( v3 <= 0 ) return loader_error(12, 24); - v5 = (_WORD *)partman_field(loader_table, a1, 0); + v5 = (WORD *)partman_field(loader_table, a1, 0); if ( !v5 ) return loader_error(1, 24); if ( *v5 != 200 ) @@ -384,7 +384,7 @@ signed int __stdcall loader_state_id(int a1, signed int a2) if ( !a2 ) return v2; v2 = a2 + a1; - v6 = (_WORD *)partman_field(loader_table, a2 + a1, 0); + v6 = (WORD *)partman_field(loader_table, a2 + a1, 0); if ( !v6 ) return loader_error(1, 24); if ( *v6 == 201 ) @@ -393,13 +393,13 @@ signed int __stdcall loader_state_id(int a1, signed int a2) } //----- (0100950A) -------------------------------------------------------- -signed int __stdcall loader_query_visual(int a1, signed int a2, _DWORD *a3) +signed int loader_query_visual(int a1, signed int a2, DWORD *a3) { - _DWORD *v3; // edi + DWORD *v3; // edi int v5; // eax int v6; // ebx int v7; // eax - signed __int16 *v8; // esi + signed int *v8; // esi unsigned int v9; // eax int v10; // ebx signed int v11; // ecx @@ -432,16 +432,16 @@ signed int __stdcall loader_query_visual(int a1, signed int a2, _DWORD *a3) a3[17] = v7; if ( v7 ) { - *(_DWORD *)(v7 + 6) = v7 + 14; - *(_DWORD *)(a3[17] + 10) = *(_DWORD *)(a3[17] + 6); + *(DWORD *)(v7 + 6) = v7 + 14; + *(DWORD *)(a3[17] + 10) = *(DWORD *)(a3[17] + 6); } - v8 = (signed __int16 *)partman_field(loader_table, v6, 10); + v8 = (signed int *)partman_field(loader_table, v6, 10); if ( v8 ) { v9 = partman_field_size(loader_table, v6, 10); v10 = 0; v25 = v9 >> 1; - if ( (signed __int16)(v9 >> 1) > 0 ) + if ( (signed int)(v9 >> 1) > 0 ) { while ( 1 ) { @@ -452,7 +452,7 @@ signed int __stdcall loader_query_visual(int a1, signed int a2, _DWORD *a3) { if ( v11 == 406 ) { - v3[12] = loader_get_sound_id(*(signed __int16 *)v12); + v3[12] = loader_get_sound_id(*(signed int *)v12); } else { @@ -467,15 +467,15 @@ signed int __stdcall loader_query_visual(int a1, signed int a2, _DWORD *a3) { if ( v16 != 96 ) return loader_error(9, 18); - if ( loader_kicker(*(signed __int16 *)v12, v3 + 5) ) + if ( loader_kicker(*(signed int *)v12, v3 + 5) ) return loader_error(14, 18); } else { - v3[4] = loader_get_sound_id(*(signed __int16 *)v12); + v3[4] = loader_get_sound_id(*(signed int *)v12); } } - else if ( loader_material(*(signed __int16 *)v12, v3) ) + else if ( loader_material(*(signed int *)v12, v3) ) { return loader_error(15, 18); } @@ -499,21 +499,21 @@ signed int __stdcall loader_query_visual(int a1, signed int a2, _DWORD *a3) v19 = v18 - 1; if ( !v19 ) { - v3[15] = loader_get_sound_id(*(signed __int16 *)v12); + v3[15] = loader_get_sound_id(*(signed int *)v12); LABEL_32: - v8 = (signed __int16 *)(v12 + 2); + v8 = (signed int *)(v12 + 2); v10 = v13 + 1; goto LABEL_33; } if ( v19 != 399 ) return loader_error(9, 18); - v8 = (signed __int16 *)(v12 + 16); + v8 = (signed int *)(v12 + 16); v10 = v13 + 8; LABEL_33: - if ( (signed __int16)v10 >= (signed __int16)v25 ) + if ( (signed int)v10 >= (signed int)v25 ) goto LABEL_34; } - v3[14] = loader_get_sound_id(*(signed __int16 *)v12); + v3[14] = loader_get_sound_id(*(signed int *)v12); goto LABEL_32; } } @@ -526,28 +526,28 @@ signed int __stdcall loader_query_visual(int a1, signed int a2, _DWORD *a3) v21 = v20 + 1; if ( *v20 != 600.0 ) return 0; - v3[2] = (signed __int16)((unsigned int)partman_field_size(loader_table, v24, 11) >> 2) / 2 - 2; + v3[2] = (signed int)((unsigned int)partman_field_size(loader_table, v24, 11) >> 2) / 2 - 2; v22 = (signed __int64)(_floor(*v21) - 1.0); v23 = (int)(v21 + 1); - if ( !(_WORD)v22 ) + if ( !(WORD)v22 ) { v3[2] = 1; LABEL_40: v3[3] = v23; return 0; } - if ( (_WORD)v22 == 1 ) + if ( (WORD)v22 == 1 ) { v3[2] = 2; goto LABEL_40; } - if ( (signed __int16)v22 == v3[2] ) + if ( (signed int)v22 == v3[2] ) goto LABEL_40; return loader_error(8, 18); } //----- (0100975D) -------------------------------------------------------- -int __stdcall loader_query_name(int a1) +int loader_query_name(int a1) { if ( a1 >= 0 ) return partman_field(loader_table, a1, 3); @@ -556,9 +556,9 @@ int __stdcall loader_query_name(int a1) } //----- (0100978E) -------------------------------------------------------- -int __stdcall loader_query_float_attribute(int a1, signed int a2, int a3) +int loader_query_float_attribute(int a1, signed int a2, int a3) { - __int16 v3; // bx + int v3; // bx int result; // eax int v5; // edi float *v6; // eax @@ -576,7 +576,7 @@ int __stdcall loader_query_float_attribute(int a1, signed int a2, int a3) v7 = v6; if ( !v6 ) break; - if ( (signed __int16)(signed __int64)_floor(*v6) == a3 ) + if ( (signed int)(signed __int64)_floor(*v6) == a3 ) return (int)(v7 + 1); ++v3; } @@ -598,19 +598,19 @@ int __stdcall loader_query_float_attribute(int a1, signed int a2, int a3) } //----- (0100981A) -------------------------------------------------------- -int __stdcall loader_query_iattribute(int a1, int a2, _DWORD *a3) +int loader_query_iattribute(int a1, int a2, DWORD *a3) { - __int16 v3; // di + int v3; // di int result; // eax - signed __int16 *v5; // eax - signed __int16 *v6; // esi + signed int *v5; // eax + signed int *v6; // esi v3 = 0; if ( a1 >= 0 ) { while ( 1 ) { - v5 = (signed __int16 *)partman_field_nth(loader_table, a1, 10, v3); + v5 = (signed int *)partman_field_nth(loader_table, a1, 10, v3); v6 = v5; if ( !v5 ) break; @@ -634,7 +634,7 @@ int __stdcall loader_query_iattribute(int a1, int a2, _DWORD *a3) } //----- (01009895) -------------------------------------------------------- -double __stdcall loader_play_sound(int a1) +double loader_play_sound(int a1) { if ( a1 <= 0 ) return 0.0; diff --git a/partman/partman.cpp b/partman/partman.cpp index 997b606..eabc054 100644 --- a/partman/partman.cpp +++ b/partman/partman.cpp @@ -5,15 +5,15 @@ #include "../pinball.h" //----- (01006270) -------------------------------------------------------- -int __stdcall partman_field(int a1, int a2, int a3) +int partman_field(int a1, int a2, int a3) { - signed __int16 *v3; // eax + signed int *v3; // eax int v4; // edx int v5; // esi - signed __int16 *v6; // eax + signed int *v6; // eax int v7; // ecx - v3 = *(signed __int16 **)(*(_DWORD *)(a1 + 6) + 4 * a2); + v3 = *(signed int **)(*(DWORD *)(a1 + 6) + 4 * a2); v4 = *v3; v5 = 0; if ( v4 <= 0 ) @@ -33,20 +33,20 @@ int __stdcall partman_field(int a1, int a2, int a3) } return 0; } - return *(_DWORD *)(v6 + 3); + return *(DWORD *)(v6 + 3); } //----- (010062B1) -------------------------------------------------------- -int __stdcall partman_field_size_nth(int a1, int a2, int a3, int a4) +int partman_field_size_nth(int a1, int a2, int a3, int a4) { - signed __int16 *v4; // eax + signed int *v4; // eax int v5; // edx int v6; // esi int v7; // edi - signed __int16 *v8; // eax + signed int *v8; // eax int v9; // ecx - v4 = *(signed __int16 **)(*(_DWORD *)(a1 + 6) + 4 * a2); + v4 = *(signed int **)(*(DWORD *)(a1 + 6) + 4 * a2); v5 = *v4; v6 = 0; v7 = 0; @@ -63,7 +63,7 @@ int __stdcall partman_field_size_nth(int a1, int a2, int a3, int a4) goto LABEL_7; } if ( v7 == a4 ) - return *(_DWORD *)(v8 + 1); + return *(DWORD *)(v8 + 1); ++v7; LABEL_7: ++v6; @@ -74,22 +74,22 @@ int __stdcall partman_field_size_nth(int a1, int a2, int a3, int a4) } //----- (010062FE) -------------------------------------------------------- -int __stdcall partman_field_size(int a1, int a2, int a3) +int partman_field_size(int a1, int a2, int a3) { return partman_field_size_nth(a1, a2, a3, 0); } //----- (0100631C) -------------------------------------------------------- -int __stdcall partman_field_nth(int a1, int a2, int a3, int a4) +int partman_field_nth(int a1, int a2, int a3, int a4) { - signed __int16 *v4; // eax + signed int *v4; // eax int v5; // edx int v6; // esi int v7; // edi - signed __int16 *v8; // eax + signed int *v8; // eax int v9; // ecx - v4 = *(signed __int16 **)(*(_DWORD *)(a1 + 6) + 4 * a2); + v4 = *(signed int **)(*(DWORD *)(a1 + 6) + 4 * a2); v5 = *v4; v6 = 0; v7 = 0; @@ -106,7 +106,7 @@ int __stdcall partman_field_nth(int a1, int a2, int a3, int a4) goto LABEL_7; } if ( a4 == v7 ) - return *(_DWORD *)(v8 + 3); + return *(DWORD *)(v8 + 3); ++v7; LABEL_7: ++v6; @@ -117,7 +117,7 @@ int __stdcall partman_field_nth(int a1, int a2, int a3, int a4) } //----- (01006369) -------------------------------------------------------- -int __stdcall partman_record_labeled(int a1, LPCSTR lpString) +int partman_record_labeled(int a1, LPCSTR lpString) { int v2; // esi int v3; // eax @@ -127,7 +127,7 @@ int __stdcall partman_record_labeled(int a1, LPCSTR lpString) int v8; // [esp+Ch] [ebp-4h] v8 = lstrlenA(lpString); - v2 = *(signed __int16 *)a1; + v2 = *(signed int *)a1; while ( 1 ) { if ( --v2 < 0 ) @@ -142,7 +142,7 @@ int __stdcall partman_record_labeled(int a1, LPCSTR lpString) v6 = lpString; do { - if ( *v6 != v6[v3 - (_DWORD)lpString] ) + if ( *v6 != v6[v3 - (DWORD)lpString] ) break; ++v4; ++v6; @@ -158,7 +158,7 @@ int __stdcall partman_record_labeled(int a1, LPCSTR lpString) } //----- (010063DB) -------------------------------------------------------- -int __stdcall partman_field_labeled(int a1, LPCSTR lpString, int a3) +int partman_field_labeled(int a1, LPCSTR lpString, int a3) { int v3; // eax int result; // eax @@ -172,10 +172,10 @@ int __stdcall partman_field_labeled(int a1, LPCSTR lpString, int a3) } //----- (01006408) -------------------------------------------------------- -void __stdcall partman_unload_records(_WORD *a1) +void partman_unload_records(WORD *a1) { - signed __int16 *i; // edi - _WORD *v2; // esi + signed int *i; // edi + WORD *v2; // esi int *v3; // ebx signed int v4; // [esp+4h] [ebp-4h] signed int v5; // [esp+10h] [ebp+8h] @@ -183,7 +183,7 @@ void __stdcall partman_unload_records(_WORD *a1) v4 = 0; for ( i = a1; v4 < *i; ++v4 ) { - v2 = *(_WORD **)(*(_DWORD *)(i + 3) + 4 * v4); + v2 = *(WORD **)(*(DWORD *)(i + 3) + 4 * v4); if ( v2 ) { v5 = 0; @@ -194,29 +194,29 @@ void __stdcall partman_unload_records(_WORD *a1) { if ( *v3 ) { - if ( *((_WORD *)v3 - 3) == 1 ) + if ( *((WORD *)v3 - 3) == 1 ) gdrv_destroy_bitmap(*v3); memoryfree(*v3); } ++v5; v3 = (int *)((char *)v3 + 10); } - while ( v5 < (signed __int16)*v2 ); + while ( v5 < (signed int)*v2 ); } memoryfree((int)v2); } } - if ( *(_DWORD *)(i + 1) ) - memoryfree(*(_DWORD *)(i + 1)); - memoryfree(*(_DWORD *)(i + 3)); + if ( *(DWORD *)(i + 1) ) + memoryfree(*(DWORD *)(i + 1)); + memoryfree(*(DWORD *)(i + 3)); memoryfree((int)i); } //----- (010064E2) -------------------------------------------------------- -signed __int16 *__stdcall partman_load_records(LPCSTR lpFileName) +signed int *partman_load_records(LPCSTR lpFileName) { HFILE v1; // ebx - signed __int16 *v3; // edi + signed int *v3; // edi int v4; // eax CHAR *v5; // eax UINT v6; // esi @@ -227,21 +227,21 @@ signed __int16 *__stdcall partman_load_records(LPCSTR lpFileName) char v11; // bl int v12; // eax int v13; // esi - _WORD *v14; // eax + WORD *v14; // eax int v15; // esi int v16; // eax int v17; // ebx int v18; // eax int v19; // eax void *v20; // eax - signed __int16 v21; // ax + signed int v21; // ax int v22; // [esp+4h] [ebp-168h] int v23; // [esp+8h] [ebp-164h] char v24; // [esp+Ch] [ebp-160h] - __int16 v25; // [esp+Dh] [ebp-15Fh] - __int16 v26; // [esp+Fh] [ebp-15Dh] - __int16 v27; // [esp+11h] [ebp-15Bh] - __int16 v28; // [esp+13h] [ebp-159h] + int v25; // [esp+Dh] [ebp-15Fh] + int v26; // [esp+Fh] [ebp-15Dh] + int v27; // [esp+11h] [ebp-15Bh] + int v28; // [esp+13h] [ebp-159h] int lBytes; // [esp+15h] [ebp-157h] char v30; // [esp+19h] [ebp-153h] int v31; // [esp+1Ch] [ebp-150h] @@ -250,8 +250,8 @@ signed __int16 *__stdcall partman_load_records(LPCSTR lpFileName) struct _OFSTRUCT ReOpenBuff; // [esp+28h] [ebp-144h] char Buffer; // [esp+B0h] [ebp-BCh] CHAR String; // [esp+F7h] [ebp-75h] - unsigned __int16 v37; // [esp+15Fh] [ebp-Dh] - unsigned __int16 v38; // [esp+165h] [ebp-7h] + unsigned int v37; // [esp+15Fh] [ebp-Dh] + unsigned int v38; // [esp+165h] [ebp-7h] v1 = OpenFile(lpFileName, &ReOpenBuff, 0); hFile = v1; @@ -263,7 +263,7 @@ signed __int16 *__stdcall partman_load_records(LPCSTR lpFileName) _lclose(v1); return 0; } - v3 = (signed __int16 *)memoryallocate(0xAu); + v3 = (signed int *)memoryallocate(0xAu); if ( !v3 ) { _lclose(v1); @@ -271,13 +271,13 @@ signed __int16 *__stdcall partman_load_records(LPCSTR lpFileName) } if ( lstrlenA(&String) <= 0 ) { - *(_DWORD *)(v3 + 1) = 0; + *(DWORD *)(v3 + 1) = 0; } else { v4 = lstrlenA(&String); v5 = (CHAR *)memoryallocate(v4 + 1); - *(_DWORD *)(v3 + 1) = v5; + *(DWORD *)(v3 + 1) = v5; if ( !v5 ) { _lclose(v1); @@ -301,12 +301,12 @@ signed __int16 *__stdcall partman_load_records(LPCSTR lpFileName) memoryfree(v8); } v9 = memoryallocate(4 * v37); - *(_DWORD *)(v3 + 3) = v9; + *(DWORD *)(v3 + 3) = v9; if ( !v9 ) { LABEL_19: - if ( *(_DWORD *)(v3 + 1) ) - memoryfree(*(_DWORD *)(v3 + 1)); + if ( *(DWORD *)(v3 + 1) ) + memoryfree(*(DWORD *)(v3 + 1)); goto LABEL_10; } v32 = 0; @@ -321,8 +321,8 @@ signed __int16 *__stdcall partman_load_records(LPCSTR lpFileName) else v12 = v10 - 1; v13 = 4 * v32; - *(_DWORD *)(v13 + *(_DWORD *)(v3 + 3)) = memoryallocate(10 * v12 + 12); - v14 = *(_WORD **)(v13 + *(_DWORD *)(v3 + 3)); + *(DWORD *)(v13 + *(DWORD *)(v3 + 3)) = memoryallocate(10 * v12 + 12); + v14 = *(WORD **)(v13 + *(DWORD *)(v3 + 3)); if ( !v14 ) break; v31 = 0; @@ -334,7 +334,7 @@ signed __int16 *__stdcall partman_load_records(LPCSTR lpFileName) do { LOBYTE(v16) = _lread_char(hFile); - *(_WORD *)(v15 - 6) = (unsigned __int8)v16; + *(WORD *)(v15 - 6) = (unsigned __int8)v16; v16 = (unsigned __int8)v16; v17 = field_size[(unsigned __int8)v16]; v23 = (unsigned __int8)v16; @@ -347,27 +347,27 @@ signed __int16 *__stdcall partman_load_records(LPCSTR lpFileName) { _hread(hFile, &v24, 14); v18 = memoryallocate(0x25u); - *(_DWORD *)v15 = v18; + *(DWORD *)v15 = v18; if ( !v18 ) goto LABEL_41; v19 = v30 & 2 ? gdrv_create_bitmap(v18, v25, v26) : gdrv_create_raw_bitmap(v18, v25, v26, v30 & 1); if ( v19 ) goto LABEL_41; - _hread(hFile, *(LPVOID *)(*(_DWORD *)v15 + 8), lBytes); - *(_DWORD *)(*(_DWORD *)v15 + 29) = v27; - *(_DWORD *)(*(_DWORD *)v15 + 33) = v28; + _hread(hFile, *(LPVOID *)(*(DWORD *)v15 + 8), lBytes); + *(DWORD *)(*(DWORD *)v15 + 29) = v27; + *(DWORD *)(*(DWORD *)v15 + 33) = v28; } else { v20 = (void *)memoryallocate(v17); - *(_DWORD *)v15 = v20; + *(DWORD *)v15 = v20; if ( !v20 ) goto LABEL_41; _hread(hFile, v20, v17); } v21 = v32 + 1; ++v31; - *(_DWORD *)(v15 - 4) = v17; + *(DWORD *)(v15 - 4) = v17; *v3 = v21; v15 += 10; } diff --git a/pinball.cpp b/pinball.cpp index 6d76bc0..a32a65f 100644 --- a/pinball.cpp +++ b/pinball.cpp @@ -8,7 +8,7 @@ #include "pinball.h" //----- (0101461A) -------------------------------------------------------- -signed int __stdcall pb_mode_change(int a1) +signed int pb_mode_change(int a1) { switch (a1) { @@ -20,7 +20,7 @@ signed int __stdcall pb_mode_change(int a1) options_menu_check(0x194u, 1); if (MainTable) { - int v2 = *(_DWORD*)((char*)MainTable + 230); + int v2 = *(DWORD*)((char*)MainTable + 230); if (v2) * (_BYTE*)(v2 + 5) = 1; } @@ -32,7 +32,7 @@ signed int __stdcall pb_mode_change(int a1) options_menu_check(0x194u, 0); if (MainTable) { - int v1 = *(_DWORD*)((char*)MainTable + 230); + int v1 = *(DWORD*)((char*)MainTable + 230); if (v1) * (_BYTE*)(v1 + 5) = 0; } @@ -45,9 +45,9 @@ signed int __stdcall pb_mode_change(int a1) options_menu_set(0x67u, 1); options_menu_check(0x194u, 0); } - if (MainTable && *(_DWORD*)((char*)MainTable + 266)) - (***(void(__thiscall * ***)(_DWORD, signed int, _DWORD))((char*)MainTable + 266))( - *(_DWORD*)((char*)MainTable + 266), + if (MainTable && *(DWORD*)((char*)MainTable + 266)) + (***(void(__thiscall * ***)(DWORD, signed int, DWORD))((char*)MainTable + 266))( + *(DWORD*)((char*)MainTable + 266), 29, 1.4); break; @@ -66,7 +66,7 @@ signed int __stdcall pb_mode_change(int a1) // 1025574: using guessed type int dword_1025574; //----- (01014743) -------------------------------------------------------- -signed int __stdcall pb_mode_countdown(int a1) +signed int pb_mode_countdown(int a1) { if (!dword_1025568 || dword_1025568 <= 0) return 1; @@ -92,7 +92,7 @@ signed int __stdcall pb_mode_countdown(int a1) // 1025574: using guessed type int dword_1025574; //----- (0101479B) -------------------------------------------------------- -int __stdcall pb_end_game() +int pb_end_game() { struct TPinballTable* v0; // edx int v1; // esi @@ -120,7 +120,7 @@ int __stdcall pb_end_game() pb_mode_change(2); v0 = MainTable; v2 = 0; - v18 = *(_DWORD*)((char*)MainTable + 214); + v18 = *(DWORD*)((char*)MainTable + 214); v1 = v18; if (v18 > 0) { @@ -163,7 +163,7 @@ int __stdcall pb_end_game() v4 = i + 1; } result = 0; - if (!dword_1025570 && !*(_DWORD*)((char*)v0 + 62)) + if (!dword_1025570 && !*(DWORD*)((char*)v0 + 62)) { i = 0; if (v1 > 0) @@ -189,18 +189,18 @@ int __stdcall pb_end_game() // 101479B: using guessed type int var_E8[4]; //----- (01014908) -------------------------------------------------------- -signed int __stdcall pb_chk_highscore() +signed int pb_chk_highscore() { int v0; // esi int v1; // edi if (dword_1025570) return 0; - v0 = *(_DWORD*)((char*)MainTable + 214) - 1; + v0 = *(DWORD*)((char*)MainTable + 214) - 1; if (v0 < 0) return 0; v1 = 28 * v0; - while (high_score_get_score_position((int)byte_1025578, **(_DWORD * *)((char*)MainTable + v1 + 102)) < 0) + while (high_score_get_score_position((int)byte_1025578, **(DWORD * *)((char*)MainTable + v1 + 102)) < 0) { --v0; v1 -= 28; @@ -212,7 +212,7 @@ signed int __stdcall pb_chk_highscore() // 1025570: using guessed type int dword_1025570; //----- (01014956) -------------------------------------------------------- -long double __stdcall pb_collide(struct TEdgeSegment* a1, float a2, struct TBall* a3) +long double pb_collide(struct TEdgeSegment* a1, float a2, struct TBall* a3) { struct TBall* v3; // ebx double v4; // st7 @@ -241,7 +241,7 @@ long double __stdcall pb_collide(struct TEdgeSegment* a1, float a2, struct TBall float v28; // [esp+44h] [ebp-4h] v3 = a3; - if (*((_BYTE*)a3 + 5) && !*(_DWORD*)((char*)a3 + 106)) + if (*((_BYTE*)a3 + 5) && !*(DWORD*)((char*)a3 + 106)) { if (ball_speed_limit < (double) * (float*)((char*)a3 + 66)) * (float*)((char*)a3 + 66) = ball_speed_limit; @@ -250,24 +250,24 @@ long double __stdcall pb_collide(struct TEdgeSegment* a1, float a2, struct TBall *(float*)((char*)v3 + 74) = a2; v6 = v4 * *(float*)((char*)v3 + 66); v27 = (struct TBall*)((char*)v3 + 42); - v13 = *(_DWORD*)((char*)v3 + 42); + v13 = *(DWORD*)((char*)v3 + 42); *(float*)((char*)v3 + 70) = v6; v7 = *(float*)& a1; - v14 = *(_DWORD*)((char*)v3 + 46); + v14 = *(DWORD*)((char*)v3 + 46); *(float*)((char*)v3 + 78) = *(float*)& a1; - v15 = *(_DWORD*)((char*)v3 + 50); - v16 = *(_DWORD*)((char*)v3 + 54); - v17 = *(_DWORD*)((char*)v3 + 58); + v15 = *(DWORD*)((char*)v3 + 50); + v16 = *(DWORD*)((char*)v3 + 54); + v17 = *(DWORD*)((char*)v3 + 58); v28 = v5; - v8 = *(_DWORD*)((char*)v3 + 110); - v18 = *(_DWORD*)((char*)v3 + 62); + v8 = *(DWORD*)((char*)v3 + 110); + v18 = *(DWORD*)((char*)v3 + 62); v19 = v6; v23 = v8; v21 = v7; v22 = v4; v20 = 990057071; v9 = TEdgeManager::FindCollisionDistance(edge_manager, (struct ray_type*) & v13, v3, &a1); - *(_DWORD*)((char*)v3 + 134) = 0; + *(DWORD*)((char*)v3 + 134) = 0; *(float*)& a3 = v9; if (*(float*)& a3 >= 1000000000.0) { @@ -281,7 +281,7 @@ long double __stdcall pb_collide(struct TEdgeSegment* a1, float a2, struct TBall } else { - (**(void(__stdcall * **)(struct TBall*, struct TBall*))a1)(v3, a3); + (**(void(* **)(struct TBall*, struct TBall*))a1)(v3, a3); if (v28 > 0.000000001) return fabs(*(float*)& a3 / v28); } @@ -291,7 +291,7 @@ long double __stdcall pb_collide(struct TEdgeSegment* a1, float a2, struct TBall // 10253D0: using guessed type float ball_speed_limit; //----- (01014A68) -------------------------------------------------------- -void __stdcall pb_timed_frame(float a1, float a2, int a3) +void pb_timed_frame(float a1, float a2, int a3) { int v3; // eax int v4; // edi @@ -314,8 +314,8 @@ void __stdcall pb_timed_frame(float a1, float a2, int a3) float v21; // [esp+3Ch] [ebp-8h] float v22; // [esp+40h] [ebp-4h] - v3 = *(_DWORD*)((char*)MainTable + 262); - v18 = *(_DWORD*)(v3 + 4); + v3 = *(DWORD*)((char*)MainTable + 262); + v18 = *(DWORD*)(v3 + 4); v4 = v18; v5 = v3 + 8; if (v18 > 0) @@ -323,16 +323,16 @@ void __stdcall pb_timed_frame(float a1, float a2, int a3) v19 = v18; do { - v6 = *(_DWORD*)v5; - v7 = *(_BYTE*)(*(_DWORD*)v5 + 5) == 0; + v6 = *(DWORD*)v5; + v7 = *(_BYTE*)(*(DWORD*)v5 + 5) == 0; v22 = a2; if (!v7) { - v8 = *(_DWORD*)(v6 + 106); + v8 = *(DWORD*)(v6 + 106); if (v8) { *(float*)(v6 + 74) = a2; - (*(void(__stdcall * *)(int, char*))(*(_DWORD*)v8 + 24))(v6, &v14); + (*(void(* *)(int, char*))(*(DWORD*)v8 + 24))(v6, &v14); } else { @@ -379,13 +379,13 @@ void __stdcall pb_timed_frame(float a1, float a2, int a3) } if (a3) { - v13 = *(_DWORD*)((char*)MainTable + 262) + 8; + v13 = *(DWORD*)((char*)MainTable + 262) + 8; if (v4 > 0) { do { - if (*(_BYTE*)(*(_DWORD*)v13 + 5)) - (*(void (**)(void))(**(_DWORD * *)v13 + 20))(); + if (*(_BYTE*)(*(DWORD*)v13 + 5)) + (*(void (**)(void))(**(DWORD * *)v13 + 20))(); v13 += 4; --v4; } while (v4); @@ -394,7 +394,7 @@ void __stdcall pb_timed_frame(float a1, float a2, int a3) } //----- (01014BF9) -------------------------------------------------------- -signed int __userpurge pb_frame@ (int a1@ , int a2) +signed int pb_frame@ (int a1@ , int a2) { double v2; // st7 char* v3; // eax @@ -423,7 +423,7 @@ signed int __userpurge pb_frame@ (int a1@ , int a2) timer_check(); render_update(); score_update(a1, *(int**)((char*)MainTable + 50)); - if (!*(_DWORD*)((char*)MainTable + 370)) + if (!*(DWORD*)((char*)MainTable + 370)) { if (nudge_count > 0.5) { @@ -445,7 +445,7 @@ signed int __userpurge pb_frame@ (int a1@ , int a2) // 102564C: using guessed type float nudge_count; //----- (01014D3D) -------------------------------------------------------- -void __stdcall pb_firsttime_setup() +void pb_firsttime_setup() { render_blit = 0; render_update(); @@ -454,32 +454,32 @@ void __stdcall pb_firsttime_setup() // 1024754: using guessed type int render_blit; //----- (01014D59) -------------------------------------------------------- -struct TPinballTable* __usercall pb_tilt_no_more@ (int a1@ ) +struct TPinballTable* pb_tilt_no_more@ (int a1@ ) { struct TPinballTable* result; // eax - if (*(_DWORD*)((char*)MainTable + 370)) + if (*(DWORD*)((char*)MainTable + 370)) TTextBox::Clear(InfoTextBox, a1); result = MainTable; - *(_DWORD*)((char*)MainTable + 370) = 0; + *(DWORD*)((char*)MainTable + 370) = 0; nudge_count = -2.0; return result; } // 102564C: using guessed type float nudge_count; //----- (01014D8E) -------------------------------------------------------- -void __stdcall pb_ballset(signed int a1, signed int a2) +void pb_ballset(signed int a1, signed int a2) { int v2; // esi - v2 = *(_DWORD*)(*(_DWORD*)((char*)MainTable + 262) + 8); + v2 = *(DWORD*)(*(DWORD*)((char*)MainTable + 262) + 8); *(float*)(v2 + 54) = (double)a1 * 30.0; *(float*)(v2 + 58) = (double)a2 * 30.0; *(float*)(v2 + 66) = normalize_2d((float*)(v2 + 54)); } //----- (01014DCF) -------------------------------------------------------- -void __stdcall nudge(float a1, float a2) +void nudge(float a1, float a2) { struct TPinballTable* v2; // eax int v3; // ecx @@ -497,8 +497,8 @@ void __stdcall nudge(float a1, float a2) int v15; // [esp+2Ch] [ebp-4h] v2 = MainTable; - v3 = *(_DWORD*)((char*)MainTable + 262); - v4 = *(_DWORD*)(v3 + 4); + v3 = *(DWORD*)((char*)MainTable + 262); + v4 = *(DWORD*)(v3 + 4); v13 = a1 * 0.5; v5 = v3 + 8; v14 = a2 * 0.5; @@ -507,8 +507,8 @@ void __stdcall nudge(float a1, float a2) v15 = v4; do { - v6 = *(_DWORD*)v5; - if (*(_BYTE*)(*(_DWORD*)v5 + 5) && !*(_DWORD*)(v6 + 106)) + v6 = *(DWORD*)v5; + if (*(_BYTE*)(*(DWORD*)v5 + 5) && !*(DWORD*)(v6 + 106)) { *(float*)(v6 + 54) = *(float*)(v6 + 54) * *(float*)(v6 + 66); *(float*)(v6 + 58) = *(float*)(v6 + 58) * *(float*)(v6 + 66); @@ -530,15 +530,15 @@ void __stdcall nudge(float a1, float a2) --v15; } while (v15); } - v9 = *(_DWORD*)((char*)v2 + 246); - v10 = *(_DWORD*)((char*)v2 + 242); + v9 = *(DWORD*)((char*)v2 + 246); + v10 = *(DWORD*)((char*)v2 + 242); v11 = (signed __int64)_floor(0.5 - a2); v12 = _floor(a1 + 0.5); render_shift((signed __int64)v12, v11, 0, 0, v10, v9); } //----- (01014EEE) -------------------------------------------------------- -void __stdcall un_nudge_left(int a1, void* a2) +void un_nudge_left(int a1, void* a2) { if (nudged_left) nudge(2.0, -1.0); @@ -547,7 +547,7 @@ void __stdcall un_nudge_left(int a1, void* a2) // 102563C: using guessed type int nudged_left; //----- (01014F20) -------------------------------------------------------- -void __stdcall un_nudge_right(int a1, void* a2) +void un_nudge_right(int a1, void* a2) { if (nudged_right) nudge(-2.0, -1.0); @@ -556,7 +556,7 @@ void __stdcall un_nudge_right(int a1, void* a2) // 1025640: using guessed type int nudged_right; //----- (01014F52) -------------------------------------------------------- -void __stdcall nudge_left() +void nudge_left() { nudge(-2.0, 1.0); if (nudge_timer) @@ -568,7 +568,7 @@ void __stdcall nudge_left() // 1025648: using guessed type int nudge_timer; //----- (01014FA4) -------------------------------------------------------- -void __stdcall nudge_right() +void nudge_right() { nudge(2.0, 1.0); if (nudge_timer) @@ -580,7 +580,7 @@ void __stdcall nudge_right() // 1025648: using guessed type int nudge_timer; //----- (01014FF6) -------------------------------------------------------- -void __stdcall un_nudge_up(int a1, void* a2) +void un_nudge_up(int a1, void* a2) { if (nudged_up) nudge(0.0, -1.0); @@ -589,7 +589,7 @@ void __stdcall un_nudge_up(int a1, void* a2) // 1025644: using guessed type int nudged_up; //----- (01015024) -------------------------------------------------------- -void __stdcall nudge_up() +void nudge_up() { nudge(0.0, 1.0); if (nudge_timer) @@ -601,7 +601,7 @@ void __stdcall nudge_up() // 1025648: using guessed type int nudge_timer; //----- (01015072) -------------------------------------------------------- -void __stdcall pb_keydown(HKEY a1) +void pb_keydown(HKEY a1) { CHAR* v1; // eax int v2; // eax @@ -624,35 +624,35 @@ void __stdcall pb_keydown(HKEY a1) pbctrl_bdoor_controller(0, (int)a1); if (a1 == dword_1028238) { - (**(void(__stdcall * **)(signed int, _DWORD))MainTable)(1000, LODWORD(time_now)); + (**(void(* **)(signed int, DWORD))MainTable)(1000, LODWORD(time_now)); return; } if (a1 == dword_102823C) { - (**(void(__stdcall * **)(signed int, _DWORD))MainTable)(1002, LODWORD(time_now)); + (**(void(* **)(signed int, DWORD))MainTable)(1002, LODWORD(time_now)); } else { if (a1 == dword_1028240) { - (**(void(__stdcall * **)(signed int, _DWORD))MainTable)(1004, LODWORD(time_now)); + (**(void(* **)(signed int, DWORD))MainTable)(1004, LODWORD(time_now)); return; } if (a1 == dword_1028244) { - if (!*(_DWORD*)((char*)MainTable + 370)) + if (!*(DWORD*)((char*)MainTable + 370)) nudge_right(); return; } if (a1 == dword_1028248) { - if (!*(_DWORD*)((char*)MainTable + 370)) + if (!*(DWORD*)((char*)MainTable + 370)) nudge_left(); return; } if (a1 == dword_102824C) { - if (!*(_DWORD*)((char*)MainTable + 370)) + if (!*(DWORD*)((char*)MainTable + 370)) nudge_up(); return; } @@ -661,8 +661,8 @@ void __stdcall pb_keydown(HKEY a1) { if (a1 == (HKEY)66) { - v2 = *(_DWORD*)((char*)MainTable + 262); - v3 = *(_DWORD*)(v2 + 4); + v2 = *(DWORD*)((char*)MainTable + 262); + v3 = *(DWORD*)(v2 + 4); v4 = 0; v5 = v2 + 8; if (v3 <= 0) @@ -679,7 +679,7 @@ void __stdcall pb_keydown(HKEY a1) while (1) { v6 = *(TBall * *)v5; - if (!*(_BYTE*)(*(_DWORD*)v5 + 5)) + if (!*(_BYTE*)(*(DWORD*)v5 + 5)) break; ++v4; v5 += 4; @@ -687,10 +687,10 @@ void __stdcall pb_keydown(HKEY a1) goto LABEL_36; } } - v8 = *(_DWORD*)((char*)v6 + 154); + v8 = *(DWORD*)((char*)v6 + 154); *(float*)((char*)v6 + 42) = 1.0; *((_BYTE*)v6 + 5) = 1; - *(_DWORD*)((char*)v6 + 50) = v8; + *(DWORD*)((char*)v6 + 50) = v8; *(float*)((char*)v6 + 46) = 1.0; *(float*)((char*)v6 + 62) = 0.0; *(float*)((char*)v6 + 58) = 0.0; @@ -717,7 +717,7 @@ void __stdcall pb_keydown(HKEY a1) } else if ((HKEY)((char*)a1 - 122) == (HKEY)1) { - (*(void (**)(void))(*(_DWORD*)MainTable + 4))(); + (*(void (**)(void))(*(DWORD*)MainTable + 4))(); } } } @@ -729,21 +729,21 @@ void __stdcall pb_keydown(HKEY a1) // 1025630: using guessed type float time_now; //----- (010152E4) -------------------------------------------------------- -void __stdcall pb_keyup(HKEY a1) +void pb_keyup(HKEY a1) { if (dword_1025568 == 1 && !single_step && !dword_1025570) { if (a1 == dword_1028238) { - (**(void(__stdcall * **)(signed int, _DWORD))MainTable)(1001, LODWORD(time_now)); + (**(void(* **)(signed int, DWORD))MainTable)(1001, LODWORD(time_now)); } else if (a1 == dword_102823C) { - (**(void(__stdcall * **)(signed int, _DWORD))MainTable)(1003, LODWORD(time_now)); + (**(void(* **)(signed int, DWORD))MainTable)(1003, LODWORD(time_now)); } else if (a1 == dword_1028240) { - (**(void(__stdcall * **)(signed int, _DWORD))MainTable)(1005, LODWORD(time_now)); + (**(void(* **)(signed int, DWORD))MainTable)(1005, LODWORD(time_now)); } else if (a1 == dword_1028244) { @@ -765,7 +765,7 @@ void __stdcall pb_keyup(HKEY a1) // 1025630: using guessed type float time_now; //----- (010153AE) -------------------------------------------------------- -int __stdcall pb_replay_level(int a1) +int pb_replay_level(int a1) { float v1; // ST04_4 @@ -774,20 +774,20 @@ int __stdcall pb_replay_level(int a1) if (phkResult) midi_play_pb_theme(0); v1 = (double)(signed int)dword_1028234; - return (**(int(__stdcall * **)(signed int, _DWORD))MainTable)(1014, LODWORD(v1)); + return (**(int(* **)(signed int, DWORD))MainTable)(1014, LODWORD(v1)); } // 1025570: using guessed type int dword_1025570; //----- (010153F4) -------------------------------------------------------- -INT_PTR __stdcall pb_high_scores() +INT_PTR pb_high_scores() { return show_high_score_dialog(byte_1025578); } //----- (01015404) -------------------------------------------------------- -_DWORD* __stdcall pb_window_size(_DWORD* a1, _DWORD* a2) +DWORD* pb_window_size(DWORD* a1, DWORD* a2) { - _DWORD* result; // eax + DWORD* result; // eax *a1 = 600; result = a2; @@ -796,13 +796,13 @@ _DWORD* __stdcall pb_window_size(_DWORD* a1, _DWORD* a2) } //----- (01015424) -------------------------------------------------------- -int __stdcall pb_init() +int pb_init() { int result; // eax int v1; // eax - signed __int16* v2; // ebx - _DWORD* v3; // edi - _DWORD* v4; // esi + signed int* v2; // ebx + DWORD* v3; // edi + DWORD* v4; // esi char* v5; // eax signed int v6; // ecx double v7; // st7 @@ -831,9 +831,9 @@ int __stdcall pb_init() return pb_record_table + 1; v1 = partman_field_labeled(pb_record_table, "background", 5); gdrv_display_palette(v1); - v2 = (signed __int16*)partman_field_labeled(pb_record_table, "table_size", 10); - v3 = (_DWORD*)partman_field_labeled(pb_record_table, "background", 1); - v4 = (_DWORD*)partman_field_labeled(pb_record_table, "camera_info", 11); + v2 = (signed int*)partman_field_labeled(pb_record_table, "table_size", 10); + v3 = (DWORD*)partman_field_labeled(pb_record_table, "background", 1); + v4 = (DWORD*)partman_field_labeled(pb_record_table, "camera_info", 11); if (v4) { v5 = &v15; @@ -843,7 +843,7 @@ int __stdcall pb_init() v6 = 4; do { - *(_DWORD*)v5 = *v4; + *(DWORD*)v5 = *v4; ++v4; v5 += 4; --v6; @@ -863,9 +863,9 @@ int __stdcall pb_init() v17 = *((float*)v12 + 1); } 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_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); + loader_loadfrom((WORD*)pb_record_table); if (play_midi_music) pb_mode_change(1); else @@ -879,7 +879,7 @@ int __stdcall pb_init() else MainTable = 0; high_score_read((int)byte_1025578, (int)& pb_state); - v14 = *(float*)(*(_DWORD*)(*(_DWORD*)((char*)MainTable + 262) + 8) + 154); + v14 = *(float*)(*(DWORD*)(*(DWORD*)((char*)MainTable + 262) + 8) + 154); --memory_critical_allocation; result = 0; ball_speed_limit = v14 * 200.0; @@ -891,14 +891,14 @@ int __stdcall pb_init() // 102556C: using guessed type int play_midi_music; //----- (0101566E) -------------------------------------------------------- -int __stdcall pb_uninit() +int pb_uninit() { score_unload_msg_font(); loader_unload(); - partman_unload_records((_WORD*)pb_record_table); + partman_unload_records((WORD*)pb_record_table); high_score_write(byte_1025578, (int)& pb_state); if (MainTable) - (*(void(__stdcall * *)(signed int))(*(_DWORD*)MainTable + 16))(1); + (*(void(* *)(signed int))(*(DWORD*)MainTable + 16))(1); MainTable = 0; gdrv_get_focus(); timer_uninit(); @@ -907,18 +907,18 @@ int __stdcall pb_uninit() } //----- (010156C1) -------------------------------------------------------- -int __stdcall pb_loose_focus() +int pb_loose_focus() { int result; // eax if (MainTable) - result = (**(int(__stdcall * **)(signed int, _DWORD))MainTable)(1010, LODWORD(time_now)); + result = (**(int(* **)(signed int, DWORD))MainTable)(1010, LODWORD(time_now)); return result; } // 1025630: using guessed type float time_now; //----- (010156E4) -------------------------------------------------------- -void __usercall pb_pause_continue(int a1@ ) +void pb_pause_continue(int a1@ ) { char* v1; // eax char* v2; // eax @@ -930,7 +930,7 @@ void __usercall pb_pause_continue(int a1@ ) if (single_step) { if (MainTable) - (**(void(__stdcall * **)(signed int, _DWORD))MainTable)(1008, LODWORD(time_now)); + (**(void(* **)(signed int, DWORD))MainTable)(1008, LODWORD(time_now)); v1 = get_rc_string(22, 0); TTextBox::Display(InfoTextBox, a1, v1, -1.0); midi_music_stop(); @@ -938,7 +938,7 @@ void __usercall pb_pause_continue(int a1@ ) else { if (MainTable) - (**(void(__stdcall * **)(signed int, _DWORD))MainTable)(1009, 0.0); + (**(void(* **)(signed int, DWORD))MainTable)(1009, 0.0); if (!dword_1025570) { if (dword_1025568 == 2) @@ -963,30 +963,30 @@ void __usercall pb_pause_continue(int a1@ ) // 1025630: using guessed type float time_now; //----- (010157C3) -------------------------------------------------------- -int __stdcall pb_launch_ball() +int pb_launch_ball() { - return (***(int(__stdcall * ***)(signed int, _DWORD))((char*)MainTable + 222))(1017, 0.0); + return (***(int(* ***)(signed int, DWORD))((char*)MainTable + 222))(1017, 0.0); } //----- (010157E3) -------------------------------------------------------- -int __stdcall pb_reset_table() +int pb_reset_table() { int result; // eax if (MainTable) - result = (**(int(__stdcall * **)(signed int, _DWORD))MainTable)(1024, 0.0); + result = (**(int(* **)(signed int, DWORD))MainTable)(1024, 0.0); return result; } //----- (01015802) -------------------------------------------------------- -void __usercall pb_toggle_demo(int a1@ ) +void pb_toggle_demo(int a1@ ) { char* v1; // eax if (dword_1025570) { dword_1025570 = 0; - (**(void(__stdcall * **)(signed int, _DWORD))MainTable)(1024, 0.0); + (**(void(* **)(signed int, DWORD))MainTable)(1024, 0.0); pb_mode_change(2); TTextBox::Clear(MissTextBox, a1); v1 = get_rc_string(24, 0); @@ -1000,7 +1000,7 @@ void __usercall pb_toggle_demo(int a1@ ) // 1025570: using guessed type int dword_1025570; //----- (010211D0) -------------------------------------------------------- -int __stdcall check_expiration_date() +int check_expiration_date() { return 0; } diff --git a/pinball.h b/pinball.h index a3869c0..4ae8f0f 100644 --- a/pinball.h +++ b/pinball.h @@ -3,15 +3,15 @@ // #include "Classes/classes.h" -#include -#include -#include -#include -#include -#include +#include +##ifdef _WIN32 +#include +#include +#include +#include #include -#define WIN32_LEAN_AND_MEAN +#endif #ifndef PINBALL_PINBALL_H #define PINBALL_PINBALL_H @@ -32,432 +32,430 @@ void RedirectIOToConsole(); // guicon.cpp #endif -HDC __stdcall _GetDC(HWND hWnd); -HDC __stdcall _BeginPaint(HWND hWnd, LPPAINTSTRUCT lpPaint); -CHAR *__stdcall options_path_init(LPCSTR lpString); -void __stdcall options_path_uninit(); -LPCSTR __stdcall options_path(LPCSTR lpString2); -void __stdcall options_path_free(); -HKEY __stdcall options_get_int(DWORD cbData, LPCSTR lpValueName, HKEY phkResult); -void __stdcall options_get_string(DWORD dwDisposition, LPCSTR lpValueName, LPSTR lpString1, LPCSTR lpString2, int iMaxLength); -void __stdcall options_set_int(HKEY phkResult, LPCSTR lpValueName, BYTE Data); -void __stdcall options_set_string(HKEY phkResult, LPCSTR lpValueName, LPCSTR lpString); -CHAR *__stdcall get_rc_string(__int16 a1, int a2); -int __stdcall get_rc_int(__int16 a1, int *a2); -int __stdcall grtext_draw_ttext_in_box(LPCSTR lpString, int mode, int, COLORREF color, int, int); // idb +HDC _GetDC(HWND hWnd); +HDC _BeginPaint(HWND hWnd, LPPAINTSTRUCT lpPaint); +CHAR *options_path_init(LPCSTR lpString); +void options_path_uninit(); +LPCSTR options_path(LPCSTR lpString2); +void options_path_free(); +HKEY options_get_int(DWORD cbData, LPCSTR lpValueName, HKEY phkResult); +void options_get_string(DWORD dwDisposition, LPCSTR lpValueName, LPSTR lpString1, LPCSTR lpString2, int iMaxLength); +void options_set_int(HKEY phkResult, LPCSTR lpValueName, BYTE Data); +void options_set_string(HKEY phkResult, LPCSTR lpValueName, LPCSTR lpString); +CHAR *get_rc_string(int a1, int a2); +int get_rc_int(int a1, int *a2); +int grtext_draw_ttext_in_box(LPCSTR lpString, int mode, int, COLORREF color, int, int); // idb int sub_10038F8(); LONG sub_1003975(); LONG sub_100399D(); -BOOL __stdcall fullscrn_set_menu_mode(int a1); +BOOL fullscrn_set_menu_mode(int a1); signed int sub_1003A23(); int sub_1003B66(); -LONG __stdcall fullscrn_set_screen_mode(int a1); -void __stdcall fullscrn_force_redraw(); -signed int __stdcall fullscrn_displaychange(); -BOOL __stdcall fullscrn_init(int a1, int a2, int a3, HWND a4, int a5, int a6); -LONG __stdcall fullscrn_shutdown(); -BOOL __stdcall fullscrn_activate(int a1); -int __stdcall fullscrn_convert_mouse_pos(int a1); -_DWORD *__stdcall fullscrn_getminmaxinfo(_DWORD *a1); -// HBRUSH __userpurge sub_1003F10@(LONG a1@, LONG a2@, int a3, int a4); -void __stdcall fullscrn_paint(); -signed int __stdcall rectangle_clip(int *a1, int *a2, _DWORD *a3); -int __stdcall enclosing_box(_DWORD *a1, _DWORD *a2, _DWORD *a3); -int __stdcall DibSetUsage(int, HPALETTE hpal, int); // idb -_DWORD *__stdcall DibCreate(int a1, int a2, int a3); -int __stdcall gdrv_init(int a1, HWND a2); -int __stdcall gdrv_display_palette(int a1); -int __stdcall gdrv_uninit(); -int __stdcall gdrv_create_bitmap_dib(int a1, int a2, int a3); -int __stdcall gdrv_create_bitmap(int a1, int a2, int a3); -signed int __stdcall gdrv_create_raw_bitmap(int a1, int a2, int a3, int a4); -signed int __stdcall gdrv_destroy_bitmap(int a1); -UINT __stdcall gdrv_start_blit_sequence(); -int __stdcall gdrv_blit_sequence(int, int xSrc, int, int xDest, int yDest, int DestWidth, int DestHeight); // idb -int __stdcall gdrv_end_blit_sequence(); -HDC __stdcall gdrv_blit(int a1, int xSrc, int a3, int xDest, int yDest, int DestWidth, int DestHeight); -int __stdcall gdrv_blat(int, int xDest, int yDest); // idb -// int __userpurge gdrv_fill_bitmap@(int a1@, _DWORD *a2, unsigned int a3, int a4, int a5, int a6, char a7); -char *__stdcall gdrv_copy_bitmap(_DWORD *a1, int a2, int a3, int a4, int a5, _DWORD *a6, int a7, int a8); -_BYTE *__stdcall gdrv_copy_bitmap_w_transparency(_DWORD *a1, int a2, int a3, int a4, int a5, _DWORD *a6, int a7, int a8); -int __stdcall zdrv_pad(int a1); -signed int __stdcall zdrv_create_zmap(int a1, int a2, int a3); -signed int __stdcall zdrv_destroy_zmap(_DWORD *a1); -// int __userpurge zdrv_fill@(int a1@, int a2, unsigned int a3, int a4, int a5, int a6, __int16 a7); -_WORD *__stdcall zdrv_paint(int a1, int a2, _DWORD *a3, int a4, int a5, int a6, int a7, int a8, _DWORD *a9, int a10, int a11, int a12, int a13, int a14); -unsigned __int16 *__stdcall zdrv_paint_flat(int a1, int a2, _DWORD *a3, int a4, int a5, int a6, int a7, int a8, _DWORD *a9, int a10, int a11, unsigned __int16 a12); -int __stdcall high_score_clear_table(int a1); -signed int __stdcall high_score_get_score_position(int a1, int a2); -int __stdcall high_score_place_new_score_into(int, int, LPCSTR lpString, int); // idb -char *__stdcall scramble_number_string(int Val, char *DstBuf); -signed int __stdcall high_score_read(int a1, int a2); -int __stdcall high_score_write(LPCSTR lpString, int); // idb -char *__stdcall score_string_format(int a1, char *a2); -void __stdcall hsdlg_show_score(HWND hDlg, LPCSTR lpString, int a3, int a4); -void __stdcall show_high_scores(HWND hDlg, LPCSTR lpString); -BOOL __stdcall HighScore(HWND, UINT, WPARAM, LPARAM); // idb -INT_PTR __stdcall show_high_score_dialog(const CHAR *a1); -INT_PTR __stdcall show_and_set_high_score_dialog(const CHAR *a1, int a2, int a3, const CHAR *a4); -int __stdcall memory_init(int a1); -int __stdcall memoryallocate(unsigned int a1); -void __stdcall memoryfree(int a1); -int __stdcall memoryrealloc(int a1, unsigned int a2); -void __stdcall options_uninit(); -HMENU __stdcall options_menu_set(UINT uIDEnableItem, int a2); -HMENU __stdcall options_menu_check(UINT uIDCheckItem, int a2); -HMENU __stdcall options_toggle(UINT uIDCheckItem); -unsigned int __stdcall get_vk_key_name(__int16 a1, LPSTR lpString); -BOOL __stdcall KeyMapDlgProc(HWND, UINT, WPARAM, LPARAM); // idb -INT_PTR __stdcall options_keyboard(); -void __stdcall options_init(HMENU a1); -int __stdcall partman_field(int a1, int a2, int a3); -int __stdcall partman_field_size_nth(int a1, int a2, int a3, int a4); -int __stdcall partman_field_size(int a1, int a2, int a3); -int __stdcall partman_field_nth(int a1, int a2, int a3, int a4); -int __stdcall partman_record_labeled(int, LPCSTR lpString); // idb -int __stdcall partman_field_labeled(int, LPCSTR lpString, int); // idb -void __stdcall partman_unload_records(_WORD *a1); -char __stdcall _lread_char(HFILE hFile); -int __stdcall _lread_long(HFILE hFile); // idb -signed __int16 *__stdcall partman_load_records(LPCSTR lpFileName); -int __stdcall FindShiftKeys(); -int __stdcall nullsub_1(int, int, int); // weak -LRESULT __stdcall SoundCallBackWndProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam); -int __stdcall Sound_Init(HINSTANCE hInstance, int, int); // idb -HLOCAL __stdcall Sound_Close(); -CHAR *__stdcall Sound_LoadWaveFile(LPCSTR lpName); -LPCVOID __stdcall Sound_FreeSound(LPCVOID pMem); -LPCVOID __stdcall Sound_Deactivate(); -LPCVOID __stdcall Sound_Activate(); -int __stdcall Sound_Idle(); -signed int __stdcall Sound_Flush(signed int a1, int a2); -void __stdcall Sound_PlaySound(int a1, int a2, int a3, unsigned __int16 a4, __int16 a5); -void __stdcall Sound_Enable(signed int a1, int a2, int a3); -HPALETTE __stdcall splash_init_palette(LOGPALETTE *plpal); -HBITMAP __stdcall load_title_bitmap(HMODULE hModule, HDC hdc, LPCSTR lpName, UINT iStart, int a5, int a6); -int __stdcall splash_bitmap_setup(int a1); -void __stdcall splash_paint(int a1, HDC hdc); -void __stdcall splash_hide(int a1); -HINSTANCE __stdcall splash_destroy(int a1); -LRESULT __stdcall splash_message_handler(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam); -int __stdcall splash_screen(int, LPCSTR lpString2, LPCSTR); // idb -signed int __stdcall timer_init(int a1); -void __stdcall timer_uninit(); -int __stdcall timer_set(float, int, int); // idb -signed int __stdcall timer_check(); -int __stdcall timer_kill(int a1); -int __stdcall make_path_name(LPSTR lpFilename, LPCSTR lpString2, DWORD nSize); // idb -void __stdcall help_introduction(int a1, int a2); -BOOL __stdcall center_in(HWND hWnd, HWND a2); -INT __stdcall a_dialog(HINSTANCE hInstance, HWND hWnd, int a3); -// void __usercall winmain_pause(int a1@); -// void __usercall winmain_end_pause(int a1@); -// HCURSOR __usercall winmain_new_game@(int a1@); -void __stdcall __noreturn winmain_memalloc_failure(); // idb -HANDLE __stdcall adjust_priority(int a1); -LRESULT __stdcall message_handler(HWND hWnd, UINT Msg, WPARAM wParam, int a4); +LONG fullscrn_set_screen_mode(int a1); +void fullscrn_force_redraw(); +signed int fullscrn_displaychange(); +BOOL fullscrn_init(int a1, int a2, int a3, HWND a4, int a5, int a6); +LONG fullscrn_shutdown(); +BOOL fullscrn_activate(int a1); +int fullscrn_convert_mouse_pos(int a1); +DWORD *fullscrn_getminmaxinfo(DWORD *a1); +// HBRUSH sub_1003F10(LONG a1, LONG a2, int a3, int a4); +void fullscrn_paint(); +signed int rectangle_clip(int *a1, int *a2, DWORD *a3); +int enclosing_box(DWORD *a1, DWORD *a2, DWORD *a3); +int DibSetUsage(int, HPALETTE hpal, int); // idb +DWORD *DibCreate(int a1, int a2, int a3); +int gdrv_init(int a1, HWND a2); +int gdrv_display_palette(int a1); +int gdrv_uninit(); +int gdrv_create_bitmap_dib(int a1, int a2, int a3); +int gdrv_create_bitmap(int a1, int a2, int a3); +signed int gdrv_create_raw_bitmap(int a1, int a2, int a3, int a4); +signed int gdrv_destroy_bitmap(int a1); +UINT gdrv_start_blit_sequence(); +int gdrv_blit_sequence(int, int xSrc, int, int xDest, int yDest, int DestWidth, int DestHeight); // idb +int gdrv_end_blit_sequence(); +HDC gdrv_blit(int a1, int xSrc, int a3, int xDest, int yDest, int DestWidth, int DestHeight); +int gdrv_blat(int, int xDest, int yDest); // idb +// int gdrv_fill_bitmap(int a1, DWORD *a2, unsigned int a3, int a4, int a5, int a6, char a7); +char *gdrv_copy_bitmap(DWORD *a1, int a2, int a3, int a4, int a5, DWORD *a6, int a7, int a8); +_BYTE *gdrv_copy_bitmap_w_transparency(DWORD *a1, int a2, int a3, int a4, int a5, DWORD *a6, int a7, int a8); +int zdrv_pad(int a1); +signed int zdrv_create_zmap(int a1, int a2, int a3); +signed int zdrv_destroy_zmap(DWORD *a1); +// int zdrv_fill(int a1, int a2, unsigned int a3, int a4, int a5, int a6, int a7); +WORD *zdrv_paint(int a1, int a2, DWORD *a3, int a4, int a5, int a6, int a7, int a8, DWORD *a9, int a10, int a11, int a12, int a13, int a14); +unsigned int *zdrv_paint_flat(int a1, int a2, DWORD *a3, int a4, int a5, int a6, int a7, int a8, DWORD *a9, int a10, int a11, unsigned int a12); +int high_score_clear_table(int a1); +signed int high_score_get_score_position(int a1, int a2); +int high_score_place_new_score_into(int, int, LPCSTR lpString, int); // idb +char *scramble_number_string(int Val, char *DstBuf); +signed int high_score_read(int a1, int a2); +int high_score_write(LPCSTR lpString, int); // idb +char *score_string_format(int a1, char *a2); +void hsdlg_show_score(HWND hDlg, LPCSTR lpString, int a3, int a4); +void show_high_scores(HWND hDlg, LPCSTR lpString); +BOOL HighScore(HWND, UINT, WPARAM, LPARAM); // idb +INT_PTR show_high_score_dialog(const CHAR *a1); +INT_PTR show_and_set_high_score_dialog(const CHAR *a1, int a2, int a3, const CHAR *a4); +int memory_init(int a1); +int memoryallocate(unsigned int a1); +void memoryfree(int a1); +int memoryrealloc(int a1, unsigned int a2); +void options_uninit(); +HMENU options_menu_set(UINT uIDEnableItem, int a2); +HMENU options_menu_check(UINT uIDCheckItem, int a2); +HMENU options_toggle(UINT uIDCheckItem); +unsigned int get_vk_key_name(int a1, LPSTR lpString); +BOOL KeyMapDlgProc(HWND, UINT, WPARAM, LPARAM); // idb +INT_PTR options_keyboard(); +void options_init(HMENU a1); +int partman_field(int a1, int a2, int a3); +int partman_field_size_nth(int a1, int a2, int a3, int a4); +int partman_field_size(int a1, int a2, int a3); +int partman_field_nth(int a1, int a2, int a3, int a4); +int partman_record_labeled(int, LPCSTR lpString); // idb +int partman_field_labeled(int, LPCSTR lpString, int); // idb +void partman_unload_records(WORD *a1); +char _lread_char(HFILE hFile); +int _lread_long(HFILE hFile); // idb +signed int *partman_load_records(LPCSTR lpFileName); +int FindShiftKeys(); +int nullsub_1(int, int, int); // weak +LRESULT SoundCallBackWndProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam); +int Sound_Init(HINSTANCE hInstance, int, int); // idb +HLOCAL Sound_Close(); +CHAR *Sound_LoadWaveFile(LPCSTR lpName); +LPCVOID Sound_FreeSound(LPCVOID pMem); +LPCVOID Sound_Deactivate(); +LPCVOID Sound_Activate(); +int Sound_Idle(); +signed int Sound_Flush(signed int a1, int a2); +void Sound_PlaySound(int a1, int a2, int a3, unsigned int a4, int a5); +void Sound_Enable(signed int a1, int a2, int a3); +HPALETTE splash_init_palette(LOGPALETTE *plpal); +HBITMAP load_title_bitmap(HMODULE hModule, HDC hdc, LPCSTR lpName, UINT iStart, int a5, int a6); +int splash_bitmap_setup(int a1); +void splash_paint(int a1, HDC hdc); +void splash_hide(int a1); +HINSTANCE splash_destroy(int a1); +LRESULT splash_message_handler(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam); +int splash_screen(int, LPCSTR lpString2, LPCSTR); // idb +signed int timer_init(int a1); +void timer_uninit(); +int timer_set(float, int, int); // idb +signed int timer_check(); +int timer_kill(int a1); +int make_path_name(LPSTR lpFilename, LPCSTR lpString2, DWORD nSize); // idb +void help_introduction(int a1, int a2); +BOOL center_in(HWND hWnd, HWND a2); +INT a_dialog(HINSTANCE hInstance, HWND hWnd, int a3); +// void winmain_pause(int a1); +// void winmain_end_pause(int a1); +// HCURSOR winmain_new_game(int a1); +void winmain_memalloc_failure(); // idb +HANDLE adjust_priority(int a1); +LRESULT message_handler(HWND hWnd, UINT Msg, WPARAM wParam, int a4); signed int message_loop(); -int __stdcall WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nShowCmd); -double __stdcall normalize_2d(float *a1); -double __stdcall ray_intersect_circle(float *a1, float *a2); -int __stdcall line_init(int, float, float, float, float); // idb -double __stdcall ray_intersect_line(float *a1, float *a2); -float *__stdcall proj_matrix_vector_multiply(float *a1, float *a2, float *a3); -float *__stdcall cross(float *a1, float *a2, float *a3); -double __stdcall magnitude(float *a1); -int __stdcall proj_init(int a1, int a2, int a3, int a4); -int __stdcall proj_recenter(int a1, int a2); -double __stdcall proj_z_distance(_DWORD); // weak -double __stdcall proj_xform_to_2d(float *a1, _DWORD *a2); -signed int __stdcall loader_error(int a1, int a2); -_DWORD *__stdcall loader_default_vsi(_DWORD *a1); -signed int __stdcall loader_get_sound_id(int a1); -void __stdcall loader_unload(); -int __stdcall loader_loadfrom(_WORD *a1); -int __stdcall loader_query_handle(LPCSTR lpString); // idb -signed int __stdcall loader_query_visual_states(int a1); -signed int __stdcall loader_material(int a1, _DWORD *a2); -signed int __stdcall loader_kicker(int a1, _DWORD *a2); -signed int __stdcall loader_state_id(int a1, signed int a2); -signed int __stdcall loader_query_visual(int a1, signed int a2, _DWORD *a3); -int __stdcall loader_query_name(int a1); -int __stdcall loader_query_float_attribute(int a1, signed int a2, int a3); -int __stdcall loader_query_iattribute(int a1, int a2, _DWORD *a3); -double __stdcall loader_play_sound(int a1); -void __stdcall flasher_callback(int, void *); // idb -void __stdcall flasher_start(struct flasher_type *, int); // idb -void __stdcall flasher_stop(struct flasher_type *, int); // idb -int __stdcall midi_music_init(HWND a1); -MCIERROR __stdcall midi_music_shutdown(); -MCIERROR __stdcall midi_music_stop(); -MCIERROR __stdcall midi_play_pb_theme(int a1); -HWND __stdcall restart_midi_seq(int a1); -void __stdcall `vector constructor iterator`(void *, unsigned int, int, void *(__thiscall *)(void *)); // idb -void __stdcall `vector destructor iterator`(void *, unsigned int, int, void (__thiscall *)(void *)); // idb -void __stdcall edges_insert_circle(struct circle_type *, struct TEdgeSegment *, struct field_effect_type *); // idb -void __stdcall edges_insert_square(float, float, float, float, struct TEdgeSegment *, struct field_effect_type *); // idb -struct TPinballComponent *__stdcall make_component_link(struct component_tag *); // idb -void __stdcall control_make_links(struct TPinballTable *); // idb -BOOL __stdcall light_on(struct component_tag *a1); -void __stdcall table_control_handler(int); // idb -// void __userpurge table_set_replay(int a1@, float a2); -// void __usercall table_set_multiball(int a1@); -// void __usercall table_set_jackpot(int a1@); -// void __usercall table_set_bonus(int a1@); -// void __usercall table_set_flag_lights(int a1@); -// void __usercall table_set_bonus_hold(int a1@); -// void __usercall table_bump_ball_sink_lock(int a1@); -// void __userpurge table_add_extra_ball(int a1@, float a2); -int __stdcall SpecialAddScore(int); // idb -void __stdcall AdvanceWormHoleDestination(int); // idb -void __stdcall FlipperRebounderControl1(int, struct TPinballComponent *); // idb -void __stdcall FlipperRebounderControl2(int, struct TPinballComponent *); // idb -void __stdcall RebounderControl(int, struct TPinballComponent *); // idb -void __stdcall BumperControl(int, struct TPinballComponent *); // idb -void __stdcall LeftKickerControl(int, struct TPinballComponent *); // idb -void __stdcall RightKickerControl(int, struct TPinballComponent *); // idb -void __stdcall LeftKickerGateControl(int, struct TPinballComponent *); // idb -void __stdcall RightKickerGateControl(int, struct TPinballComponent *); // idb -// void __userpurge DeploymentChuteToEscapeChuteOneWayControl(int a1@, int a2@, int a3, struct TPinballComponent *a4); -void __stdcall DeploymentChuteToTableOneWayControl(int, struct TPinballComponent *); // idb -void __stdcall DrainBallBlockerControl(int, struct TPinballComponent *); // idb -// void __userpurge LaunchRampControl(int a1@, int a2, struct TPinballComponent *a3); -void __stdcall LaunchRampHoleControl(int, struct TPinballComponent *); // idb -void __stdcall SpaceWarpRolloverControl(int, struct TPinballComponent *); // idb -// void __userpurge ReentryLanesRolloverControl(int a1@, int a2@, int a3@, int a4, struct TPinballComponent *a5); -void __stdcall BumperGroupControl(int, struct TPinballComponent *); // idb -// void __userpurge LaunchLanesRolloverControl(int a1@, int a2@, int a3@, int a4, struct TPinballComponent *a5); -// void __userpurge OutLaneRolloverControl(int a1@, int a2@, int a3, struct TPinballComponent *a4); -void __stdcall ExtraBallLightControl(int, struct TPinballComponent *); // idb -// void __userpurge ReturnLaneRolloverControl(int a1@, int a2, struct TPinballComponent *a3); -// void __userpurge BonusLaneRolloverControl(int a1@, int a2, struct TPinballComponent *a3); -// void __userpurge FuelRollover1Control(int a1@, int a2, struct TPinballComponent *a3); -// void __userpurge FuelRollover2Control(int a1@, int a2, struct TPinballComponent *a3); -// void __userpurge FuelRollover3Control(int a1@, int a2, struct TPinballComponent *a3); -// void __userpurge FuelRollover4Control(int a1@, int a2, struct TPinballComponent *a3); -// void __userpurge FuelRollover5Control(int a1@, int a2, struct TPinballComponent *a3); -// void __userpurge FuelRollover6Control(int a1@, int a2, struct TPinballComponent *a3); -void __stdcall HyperspaceLightGroupControl(int, struct TPinballComponent *); // idb -// void __userpurge WormHoleControl(int a1@, int a2@, int a3@, int a4, struct TPinballComponent *a5); -void __stdcall LeftFlipperControl(int, struct TPinballComponent *); // idb -void __stdcall RightFlipperControl(int, struct TPinballComponent *); // idb -void __stdcall JackpotLightControl(int, struct TPinballComponent *); // idb -void __stdcall BonusLightControl(int, struct TPinballComponent *); // idb -void __stdcall BoosterTargetControl(int, struct TPinballComponent *); // idb -void __stdcall MedalLightGroupControl(int, struct TPinballComponent *); // idb -// void __userpurge MultiplierLightGroupControl(int a1@, int a2, struct TPinballComponent *a3); -// void __userpurge FuelSpotTargetControl(int a1@, int a2, struct TPinballComponent *a3); -// void __userpurge MissionSpotTargetControl(int a1@, int a2, struct TPinballComponent *a3); -void __stdcall LeftHazardSpotTargetControl(int, struct TPinballComponent *); // idb -void __stdcall RightHazardSpotTargetControl(int, struct TPinballComponent *); // idb -// void __userpurge WormHoleDestinationControl(int a1@, int a2, struct TPinballComponent *a3); -// void __userpurge BlackHoleKickoutControl(int a1@, int a2, struct TPinballComponent *a3); -void __stdcall FlagControl(int, struct TPinballComponent *); // idb -// void __userpurge GravityWellKickoutControl(int a1@, int a2, struct TPinballComponent *a3); -void __stdcall SkillShotGate1Control(int, struct TPinballComponent *); // idb -void __stdcall SkillShotGate2Control(int, struct TPinballComponent *); // idb -void __stdcall SkillShotGate3Control(int, struct TPinballComponent *); // idb -void __stdcall SkillShotGate4Control(int, struct TPinballComponent *); // idb -void __stdcall SkillShotGate5Control(int, struct TPinballComponent *); // idb -void __stdcall SkillShotGate6Control(int, struct TPinballComponent *); // idb -void __stdcall ShootAgainLightControl(int, struct TPinballComponent *); // idb -void __stdcall EscapeChuteSinkControl(int, struct TPinballComponent *); // idb -// int __usercall cheat_bump_rank@(int a1@); -// void __userpurge pbctrl_bdoor_controller(int a1@, int a2); -int __stdcall AddRankProgress(int); // idb -// void __userpurge WaitingDeploymentController(int a1@, int a2, struct TPinballComponent *a3); -void __stdcall SelectMissionController(int, struct TPinballComponent *); // idb -// void __userpurge PracticeMissionController(int a1@, int a2, struct TPinballComponent *a3); -// void __userpurge LaunchTrainingController(int a1@, int a2, struct TPinballComponent *a3); -// void __userpurge ReentryTrainingController(int a1@, int a2, struct TPinballComponent *a3); -// void __userpurge ScienceMissionController(int a1@, int a2, struct TPinballComponent *a3); -// void __userpurge StrayCometController(int a1@, int a2, struct TPinballComponent *a3); -// void __userpurge SpaceRadiationController(int a1@, int a2, struct TPinballComponent *a3); -// void __userpurge BlackHoleThreatController(int a1@, int a2, struct TPinballComponent *a3); -// void __userpurge BugHuntController(int a1@, int a2, struct TPinballComponent *a3); -// void __userpurge RescueMissionController(int a1@, int a2, struct TPinballComponent *a3); -// void __userpurge AlienMenaceController(int a1@, int a2, struct TPinballComponent *a3); -// void __userpurge AlienMenacePartTwoController(int a1@, int a2, struct TPinballComponent *a3); -// void __userpurge SatelliteController(int a1@, int a2, struct TPinballComponent *a3); -// void __userpurge ReconnaissanceController(int a1@, int a2, struct TPinballComponent *a3); -// void __userpurge DoomsdayMachineController(int a1@, int a2, struct TPinballComponent *a3); -// void __userpurge CosmicPlagueController(int a1@, int a2, struct TPinballComponent *a3); -// void __userpurge CosmicPlaguePartTwoController(int a1@, int a2, struct TPinballComponent *a3); -// void __userpurge SecretMissionYellowController(int a1@, int a2, struct TPinballComponent *a3); -// void __userpurge SecretMissionRedController(int a1@, int a2, struct TPinballComponent *a3); -// void __userpurge SecretMissionGreenController(int a1@, int a2, struct TPinballComponent *a3); -// void __userpurge TimeWarpController(int a1@, int a2, struct TPinballComponent *a3); -// void __userpurge TimeWarpPartTwoController(int a1@, int a2, struct TPinballComponent *a3); -// void __userpurge MaelstromController(int a1@, int a2, struct TPinballComponent *a3); -// void __userpurge MaelstromPartTwoController(int a1@, int a2, struct TPinballComponent *a3); -// void __userpurge MaelstromPartThreeController(int a1@, int a2, struct TPinballComponent *a3); -// void __userpurge MaelstromPartFourController(int a1@, int a2, struct TPinballComponent *a3); -// void __userpurge MaelstromPartFiveController(int a1@, int a2, struct TPinballComponent *a3); -// void __userpurge MaelstromPartSixController(int a1@, int a2, struct TPinballComponent *a3); -// void __userpurge MaelstromPartSevenController(int a1@, int a2, struct TPinballComponent *a3); -// void __userpurge MaelstromPartEightController(int a1@, int a2, struct TPinballComponent *a3); -void __stdcall GameoverController(int, struct TPinballComponent *); // idb -void __stdcall UnselectMissionController(int, struct TPinballComponent *); // idb -void __stdcall MissionControl(int, struct TPinballComponent *); // idb -void __stdcall control_handler(int, struct TPinballComponent *); // idb -void __stdcall HyperspaceKickOutControl(int, struct TPinballComponent *); // idb -// void __userpurge PlungerControl(int a1@, int a2, struct TPinballComponent *a3); -// void __userpurge MedalTargetControl(int a1@, int a2@, int a3@, int a4, struct TPinballComponent *a5); -// void __userpurge MultiplierTargetControl(int a1@, int a2@, int a3@, int a4, struct TPinballComponent *a5); -void __stdcall BallDrainControl(int, struct TPinballComponent *); // idb -int __stdcall objlist_add_object(_DWORD *a1, int a2); -signed int __stdcall objlist_delete_object(int a1, int a2); -_DWORD *__stdcall objlist_new(int a1); -int *__stdcall objlist_grow(int *a1, int a2); -void __stdcall build_occlude_list(); -void __stdcall render_repaint(struct render_sprite_type_struct *); // idb -void __stdcall render_paint_balls(); // idb -void __stdcall render_unpaint_balls(); // idb -int __stdcall render_remove_sprite(struct render_sprite_type_struct *); // idb -int __stdcall render_remove_ball(struct render_sprite_type_struct *); // idb -BOOL __stdcall overlapping_box(struct rectangle_type *a1, struct rectangle_type *a2, struct rectangle_type *a3); -void __stdcall render_update(); -void __stdcall render_uninit(); -char *__stdcall render_init(_DWORD *a1, float a2, float a3, int a4, int a5); -int __stdcall render_sprite_modified(int a1); -int __stdcall render_create_sprite(int a1, int a2, int a3, int a4, int a5, _DWORD *a6); -int __stdcall render_set_background_zmap(struct zmap_header_type *a1, int a2, int a3); -int __stdcall render_sprite_set(_DWORD *a1, int a2, int a3, int a4, int a5); -void __stdcall render_sprite_set_bitmap(_DWORD *a1, int a2); -void __stdcall render_ball_set(int a1, int a2, float a3, int a4, int a5); -void __stdcall render_paint(); -void __stdcall render_shift(int a1, int a2, int xSrc, int a4, int DestWidth, int DestHeight); -_DWORD *__stdcall score_create(LPCSTR lpString, int a2); -void *__stdcall score_dup(const void *a1, int a2); -void __stdcall objlist_destroy(int a1); -_DWORD *__stdcall score_set(_DWORD *a1, int a2); -// void *__userpurge score_erase@(int a1@, _DWORD *a2, int a3); -// HDC __userpurge score_update@(int a1@, int *a2); -signed int __stdcall score_init(); -void __stdcall score_unload_msg_font(); -HRSRC __stdcall score_load_msg_font(LPCSTR lpName); -_DWORD __stdcall pb_paint(); // idb -signed int __stdcall pb_mode_change(int a1); -signed int __stdcall pb_mode_countdown(int a1); -int __stdcall pb_end_game(); -signed int __stdcall pb_chk_highscore(); -long double __stdcall pb_collide(struct TEdgeSegment *a1, float a2, struct TBall *a3); -void __stdcall pb_timed_frame(float, float, int); // idb -// signed int __userpurge pb_frame@(int a1@, int a2); -void __stdcall pb_firsttime_setup(); -// struct TPinballTable *__usercall pb_tilt_no_more@(int a1@); -void __stdcall pb_ballset(signed int a1, signed int a2); -void __stdcall nudge(float, float); // idb -void __stdcall un_nudge_left(int, void *); // idb -void __stdcall un_nudge_right(int, void *); // idb -void __stdcall nudge_left(); // idb -void __stdcall nudge_right(); // idb -void __stdcall un_nudge_up(int, void *); // idb -void __stdcall nudge_up(); // idb -void __stdcall pb_keydown(HKEY a1); -void __stdcall pb_keyup(HKEY a1); -int __stdcall pb_replay_level(int a1); -INT_PTR __stdcall pb_high_scores(); -_DWORD *__stdcall pb_window_size(_DWORD *a1, _DWORD *a2); -int __stdcall pb_init(); -int __stdcall pb_uninit(); -int __stdcall pb_loose_focus(); -// void __usercall pb_pause_continue(int a1@); -int __stdcall pb_launch_ball(); -int __stdcall pb_reset_table(); -// void __usercall pb_toggle_demo(int a1@); -_DWORD __stdcall gdrv_get_focus(); // idb -void __stdcall throw_ball(struct TBall *, struct vector_type *, float, float, float); // idb -void __stdcall find_closest_edge(struct ramp_plane_type *, int, struct wall_point_type *, struct vector_type **, struct vector_type **); // idb -double __stdcall basic_collision(struct TBall *a1, struct vector_type *a2, struct vector_type *a3, float a4, float a5, float a6, float a7); -struct TEdgeSegment *__stdcall install_wall(float *, struct TCollisionComponent *, char *, unsigned int, float, void *); // idb -void __stdcall vswap(struct vector_type *, struct vector_type *); // idb -double __stdcall distance_to_flipper(struct ray_type *a1, struct ray_type *a2); -void __stdcall vector_add(struct vector_type *, struct vector_type *); // idb -void __stdcall RotatePt(struct vector_type *, float, float, struct vector_type *); // idb -long double __stdcall Distance(struct vector_type *a1, struct vector_type *a2); -double __stdcall Distance_Squared(float a1, float a2, int a3, float a4, float a5, int a6); -double __stdcall DotProduct(const struct vector_type *a1, const struct vector_type *a2); -void __stdcall SinCos(float, float *, float *); // idb -void __stdcall RotateVector(struct vector_type *, float); // idb -int __security_init_cookie(); -// BOOL __usercall __noreturn __report_gsfailure@(int a1@, int a2@, int a3@, int a4@, int a5@, int a6@); -int __stdcall sub_101CEB6(LPBYTE lpData); // idb -HWND __stdcall HtmlHelpA(HWND hwndCaller, LPCSTR pszFile, UINT uCommand, DWORD_PTR dwData); -_WORD *__stdcall SessionToGlobalDataPtr(_WORD *a1); -BOOL __stdcall IsValidLPMIXWAVE(int a1); -bool __stdcall HasCurrentOutputFormat(const void *a1); -int __stdcall DefaultPauseBlocks(int a1); -unsigned int __stdcall DefaultGoodWavePos(UINT_PTR uDeviceID); -DWORD __stdcall MyWaveOutGetPosition(HWAVEOUT hwo, int a2); -int __stdcall AddFactor(int a1, int a2); -int __stdcall SubFactor(int a1, int a2); -unsigned int __stdcall SetWaveOutPosition(unsigned int a1); -unsigned int __stdcall MyWaveOutReset(HWAVEOUT hwo); -__int16 __stdcall cmixit(_BYTE *a1, char *a2, char *a3, int a4, unsigned __int16 a5); -_DWORD *__stdcall InitChannelNodes(); -int __stdcall GetChannelNode(); -_DWORD *__stdcall FreeChannelNode(_DWORD *a1); -struct wavehdr_tag *__stdcall FreeWaveBlocks(HWAVEOUT hwo, int a2); -int __stdcall AllocWaveBlocks(HWAVEOUT hwo, int); // idb -_DWORD *__stdcall SwapWaveBlocks(); -_DWORD *__stdcall GetWaveBlock(); -struct wavehdr_tag *__stdcall RemoveFromPlayingQueue(struct wavehdr_tag *a1); -LPWAVEHDR __stdcall DestroyPlayQueue(); -int __stdcall ReleaseWaveDevice(int a1); -signed int __stdcall GetWaveDevice(); -signed int __stdcall WaveMixOpenChannel(_WORD *a1, signed int a2, unsigned int a3); -LPWAVEHDR __stdcall AddToPlayingQueue(struct wavehdr_tag *a1); -int __stdcall MixerPlay(LPWAVEHDR pwh, int); // idb -DWORD __stdcall FreePlayedBlocks(); -int __stdcall WaveMixPump(); -LRESULT __stdcall WndProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam); -signed int __stdcall NoResetRemix(int a1, int a2); -signed int __stdcall ResetRemix(int a1, int a2); -void __stdcall ResetWavePosIfNoChannelData(); -signed int __stdcall WaveMixPlay(int a1); -signed int __stdcall WaveMixFlushChannel(_WORD *a1, signed int a2, char a3); -signed int __stdcall WaveMixCloseChannel(_WORD *a1, signed int a2, char a3); -int __stdcall WaveMixFreeWave(int, LPCVOID pMem); // idb -// _WORD *__userpurge BitsPerSampleAlign@(int a1@, LPCVOID pMem, int a3, __int16 a4, int a5); -_BYTE *__stdcall ChannelAlign(LPCVOID pMem, __int16 a2, __int16 a3, __int16 a4, int a5); -void __stdcall AvgSample(_WORD *a1, unsigned __int8 *a2, int a3, int a4, int a5); -int __stdcall RepSample(_BYTE *a1, unsigned __int8 *a2, signed int a3, int a4, int a5); -LPCVOID __stdcall SamplesPerSecAlign(LPCVOID pMem, int a2, int a3, __int16 a4, __int16 a5, int a6); -LPCVOID __stdcall WaveFormatConvert(int a1, int a2, LPCVOID pMem, int a4); -CHAR *__stdcall WaveMixOpenWave(LPCVOID pMem, LPCSTR lpName, HMODULE hModule, LONG cch); -unsigned int __stdcall FigureOutDMABufferSize(unsigned int a1, int a2); -int __stdcall RemoveInvalidIniNameCharacters(LPCSTR lpString); // idb -UINT __stdcall ShowWaveOutDevices(); -const char *__stdcall GetOperatingSystemPrefix(); -int __stdcall ReadRegistryToGetMachineSpecificInfSection(int, LPSTR lpString1, int); // idb -int __stdcall ReadRegistryInt(HKEY hKey, LPCSTR lpSubKey, int); // idb -signed int __stdcall ReadRegistryForAppSpecificConfigs(int a1); -int __stdcall ShowCurrentSettings(); -int __stdcall Settings_OnInitDialog(HWND hWnd, int, int); // idb -int __stdcall Settings_OnCommand(HWND hWnd, int, int, int); // idb -BOOL __stdcall SettingsDlgProc(HWND, UINT, WPARAM, LPARAM); // idb -_DWORD *__stdcall MakeDlgTemplate(int a1, int a2, __int16 a3, __int16 a4, __int16 a5, __int16 a6, wchar_t *Str); -_WORD *__stdcall AddDlgControl(int a1, LPCVOID pMem, __int16 a3, int a4, __int16 a5, __int16 a6, __int16 a7, __int16 a8, __int16 a9, wchar_t *Str); -_WORD *__stdcall MakeSettingsDlgTemplate(); -void __stdcall DestroySettingsDlgTemplate(LPCVOID pMem); -signed int __stdcall WaveMixGetConfig(_WORD *a1, int a2); -BOOL __stdcall SaveConfigSettings(__int16 a1); -DWORD __stdcall SetIniFileName(HMODULE hModule); -int __stdcall InitVolumeTable(); -int __stdcall WaveMixStartup(HMODULE hModule); // idb -signed int __stdcall WaveMixActivate(_WORD *a1, int a2); -MMRESULT __stdcall WaveMixConfigure(int a1, HWND hWndParent, int a3, int a4, int a5); -signed int __stdcall ReadConfigSettings(int a1); -int __stdcall WaveMixConfigureInit(_WORD *a1); -int __stdcall WaveMixInit(); -HLOCAL __stdcall WaveMixCloseSession(HLOCAL hMem); +int WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nShowCmd); +double normalize_2d(float *a1); +double ray_intersect_circle(float *a1, float *a2); +int line_init(int, float, float, float, float); // idb +double ray_intersect_line(float *a1, float *a2); +float *proj_matrix_vector_multiply(float *a1, float *a2, float *a3); +float *cross(float *a1, float *a2, float *a3); +double magnitude(float *a1); +int proj_init(int a1, int a2, int a3, int a4); +int proj_recenter(int a1, int a2); +double proj_z_distance(DWORD); // weak +double proj_xform_to_2d(float *a1, DWORD *a2); +signed int loader_error(int a1, int a2); +DWORD *loader_default_vsi(DWORD *a1); +signed int loader_get_sound_id(int a1); +void loader_unload(); +int loader_loadfrom(WORD *a1); +int loader_query_handle(LPCSTR lpString); // idb +signed int loader_query_visual_states(int a1); +signed int loader_material(int a1, DWORD *a2); +signed int loader_kicker(int a1, DWORD *a2); +signed int loader_state_id(int a1, signed int a2); +signed int loader_query_visual(int a1, signed int a2, DWORD *a3); +int loader_query_name(int a1); +int loader_query_float_attribute(int a1, signed int a2, int a3); +int loader_query_iattribute(int a1, int a2, DWORD *a3); +double loader_play_sound(int a1); +void flasher_callback(int, void *); // idb +void flasher_start(struct flasher_type *, int); // idb +void flasher_stop(struct flasher_type *, int); // idb +int midi_music_init(HWND a1); +MCIERROR midi_music_shutdown(); +MCIERROR midi_music_stop(); +MCIERROR midi_play_pb_theme(int a1); +HWND restart_midi_seq(int a1); +void create(void *, unsigned int, int, void *(__thiscall *)(void *)); // idb +void destroy(void *, unsigned int, int, void (__thiscall *)(void *)); // idb +void edges_insert_circle(struct circle_type *, struct TEdgeSegment *, struct field_effect_type *); // idb +void edges_insert_square(float, float, float, float, struct TEdgeSegment *, struct field_effect_type *); // idb +struct TPinballComponent *make_component_link(struct component_tag *); // idb +void control_make_links(struct TPinballTable *); // idb +BOOL light_on(struct component_tag *a1); +void table_control_handler(int); // idb +// void table_set_replay(int a1, float a2); +// void table_set_multiball(int a1); +// void table_set_jackpot(int a1); +// void table_set_bonus(int a1); +// void table_set_flag_lights(int a1); +// void table_set_bonus_hold(int a1); +// void table_bump_ball_sink_lock(int a1); +// void table_add_extra_ball(int a1, float a2); +int SpecialAddScore(int); // idb +void AdvanceWormHoleDestination(int); // idb +void FlipperRebounderControl1(int, struct TPinballComponent *); // idb +void FlipperRebounderControl2(int, struct TPinballComponent *); // idb +void RebounderControl(int, struct TPinballComponent *); // idb +void BumperControl(int, struct TPinballComponent *); // idb +void LeftKickerControl(int, struct TPinballComponent *); // idb +void RightKickerControl(int, struct TPinballComponent *); // idb +void LeftKickerGateControl(int, struct TPinballComponent *); // idb +void RightKickerGateControl(int, struct TPinballComponent *); // idb +// void DeploymentChuteToEscapeChuteOneWayControl(int a1, int a2, int a3, struct TPinballComponent *a4); +void DeploymentChuteToTableOneWayControl(int, struct TPinballComponent *); // idb +void DrainBallBlockerControl(int, struct TPinballComponent *); // idb +// void LaunchRampControl(int a1, int a2, struct TPinballComponent *a3); +void LaunchRampHoleControl(int, struct TPinballComponent *); // idb +void SpaceWarpRolloverControl(int, struct TPinballComponent *); // idb +// void ReentryLanesRolloverControl(int a1, int a2, int a3, int a4, struct TPinballComponent *a5); +void BumperGroupControl(int, struct TPinballComponent *); // idb +// void LaunchLanesRolloverControl(int a1, int a2, int a3, int a4, struct TPinballComponent *a5); +// void OutLaneRolloverControl(int a1, int a2, int a3, struct TPinballComponent *a4); +void ExtraBallLightControl(int, struct TPinballComponent *); // idb +// void ReturnLaneRolloverControl(int a1, int a2, struct TPinballComponent *a3); +// void BonusLaneRolloverControl(int a1, int a2, struct TPinballComponent *a3); +// void FuelRollover1Control(int a1, int a2, struct TPinballComponent *a3); +// void FuelRollover2Control(int a1, int a2, struct TPinballComponent *a3); +// void FuelRollover3Control(int a1, int a2, struct TPinballComponent *a3); +// void FuelRollover4Control(int a1, int a2, struct TPinballComponent *a3); +// void FuelRollover5Control(int a1, int a2, struct TPinballComponent *a3); +// void FuelRollover6Control(int a1, int a2, struct TPinballComponent *a3); +void HyperspaceLightGroupControl(int, struct TPinballComponent *); // idb +// void WormHoleControl(int a1, int a2, int a3, int a4, struct TPinballComponent *a5); +void LeftFlipperControl(int, struct TPinballComponent *); // idb +void RightFlipperControl(int, struct TPinballComponent *); // idb +void JackpotLightControl(int, struct TPinballComponent *); // idb +void BonusLightControl(int, struct TPinballComponent *); // idb +void BoosterTargetControl(int, struct TPinballComponent *); // idb +void MedalLightGroupControl(int, struct TPinballComponent *); // idb +// void MultiplierLightGroupControl(int a1, int a2, struct TPinballComponent *a3); +// void FuelSpotTargetControl(int a1, int a2, struct TPinballComponent *a3); +// void MissionSpotTargetControl(int a1, int a2, struct TPinballComponent *a3); +void LeftHazardSpotTargetControl(int, struct TPinballComponent *); // idb +void RightHazardSpotTargetControl(int, struct TPinballComponent *); // idb +// void WormHoleDestinationControl(int a1, int a2, struct TPinballComponent *a3); +// void BlackHoleKickoutControl(int a1, int a2, struct TPinballComponent *a3); +void FlagControl(int, struct TPinballComponent *); // idb +// void GravityWellKickoutControl(int a1, int a2, struct TPinballComponent *a3); +void SkillShotGate1Control(int, struct TPinballComponent *); // idb +void SkillShotGate2Control(int, struct TPinballComponent *); // idb +void SkillShotGate3Control(int, struct TPinballComponent *); // idb +void SkillShotGate4Control(int, struct TPinballComponent *); // idb +void SkillShotGate5Control(int, struct TPinballComponent *); // idb +void SkillShotGate6Control(int, struct TPinballComponent *); // idb +void ShootAgainLightControl(int, struct TPinballComponent *); // idb +void EscapeChuteSinkControl(int, struct TPinballComponent *); // idb +// int cheat_bump_rank(int a1); +// void pbctrl_bdoor_controller(int a1, int a2); +int AddRankProgress(int); // idb +// void WaitingDeploymentController(int a1, int a2, struct TPinballComponent *a3); +void SelectMissionController(int, struct TPinballComponent *); // idb +// void PracticeMissionController(int a1, int a2, struct TPinballComponent *a3); +// void LaunchTrainingController(int a1, int a2, struct TPinballComponent *a3); +// void ReentryTrainingController(int a1, int a2, struct TPinballComponent *a3); +// void ScienceMissionController(int a1, int a2, struct TPinballComponent *a3); +// void StrayCometController(int a1, int a2, struct TPinballComponent *a3); +// void SpaceRadiationController(int a1, int a2, struct TPinballComponent *a3); +// void BlackHoleThreatController(int a1, int a2, struct TPinballComponent *a3); +// void BugHuntController(int a1, int a2, struct TPinballComponent *a3); +// void RescueMissionController(int a1, int a2, struct TPinballComponent *a3); +// void AlienMenaceController(int a1, int a2, struct TPinballComponent *a3); +// void AlienMenacePartTwoController(int a1, int a2, struct TPinballComponent *a3); +// void SatelliteController(int a1, int a2, struct TPinballComponent *a3); +// void ReconnaissanceController(int a1, int a2, struct TPinballComponent *a3); +// void DoomsdayMachineController(int a1, int a2, struct TPinballComponent *a3); +// void CosmicPlagueController(int a1, int a2, struct TPinballComponent *a3); +// void CosmicPlaguePartTwoController(int a1, int a2, struct TPinballComponent *a3); +// void SecretMissionYellowController(int a1, int a2, struct TPinballComponent *a3); +// void SecretMissionRedController(int a1, int a2, struct TPinballComponent *a3); +// void SecretMissionGreenController(int a1, int a2, struct TPinballComponent *a3); +// void TimeWarpController(int a1, int a2, struct TPinballComponent *a3); +// void TimeWarpPartTwoController(int a1, int a2, struct TPinballComponent *a3); +// void MaelstromController(int a1, int a2, struct TPinballComponent *a3); +// void MaelstromPartTwoController(int a1, int a2, struct TPinballComponent *a3); +// void MaelstromPartThreeController(int a1, int a2, struct TPinballComponent *a3); +// void MaelstromPartFourController(int a1, int a2, struct TPinballComponent *a3); +// void MaelstromPartFiveController(int a1, int a2, struct TPinballComponent *a3); +// void MaelstromPartSixController(int a1, int a2, struct TPinballComponent *a3); +// void MaelstromPartSevenController(int a1, int a2, struct TPinballComponent *a3); +// void MaelstromPartEightController(int a1, int a2, struct TPinballComponent *a3); +void GameoverController(int, struct TPinballComponent *); // idb +void UnselectMissionController(int, struct TPinballComponent *); // idb +void MissionControl(int, struct TPinballComponent *); // idb +void control_handler(int, struct TPinballComponent *); // idb +void HyperspaceKickOutControl(int, struct TPinballComponent *); // idb +// void PlungerControl(int a1, int a2, struct TPinballComponent *a3); +// void MedalTargetControl(int a1, int a2, int a3, int a4, struct TPinballComponent *a5); +// void MultiplierTargetControl(int a1, int a2, int a3, int a4, struct TPinballComponent *a5); +void BallDrainControl(int, struct TPinballComponent *); // idb +int objlist_add_object(DWORD *a1, int a2); +signed int objlist_delete_object(int a1, int a2); +DWORD *objlist_new(int a1); +int *objlist_grow(int *a1, int a2); +void build_occlude_list(); +void render_repaint(struct render_sprite_type_struct *); // idb +void render_paint_balls(); // idb +void render_unpaint_balls(); // idb +int render_remove_sprite(struct render_sprite_type_struct *); // idb +int render_remove_ball(struct render_sprite_type_struct *); // idb +BOOL overlapping_box(struct rectangle_type *a1, struct rectangle_type *a2, struct rectangle_type *a3); +void render_update(); +void render_uninit(); +char *render_init(DWORD *a1, float a2, float a3, int a4, int a5); +int render_sprite_modified(int a1); +int render_create_sprite(int a1, int a2, int a3, int a4, int a5, DWORD *a6); +int render_set_background_zmap(struct zmap_header_type *a1, int a2, int a3); +int render_sprite_set(DWORD *a1, int a2, int a3, int a4, int a5); +void render_sprite_set_bitmap(DWORD *a1, int a2); +void render_ball_set(int a1, int a2, float a3, int a4, int a5); +void render_paint(); +void render_shift(int a1, int a2, int xSrc, int a4, int DestWidth, int DestHeight); +DWORD *score_create(LPCSTR lpString, int a2); +void *score_dup(const void *a1, int a2); +void objlist_destroy(int a1); +DWORD *score_set(DWORD *a1, int a2); +// void *score_erase(int a1, DWORD *a2, int a3); +// HDC score_update(int a1, int *a2); +signed int score_init(); +void score_unload_msg_font(); +HRSRC score_load_msg_font(LPCSTR lpName); +DWORD pb_paint(); // idb +signed int pb_mode_change(int a1); +signed int pb_mode_countdown(int a1); +int pb_end_game(); +signed int pb_chk_highscore(); +long double pb_collide(struct TEdgeSegment *a1, float a2, struct TBall *a3); +void pb_timed_frame(float, float, int); // idb +// signed int pb_frame(int a1, int a2); +void pb_firsttime_setup(); +// struct TPinballTable *pb_tilt_no_more(int a1); +void pb_ballset(signed int a1, signed int a2); +void nudge(float, float); // idb +void un_nudge_left(int, void *); // idb +void un_nudge_right(int, void *); // idb +void nudge_left(); // idb +void nudge_right(); // idb +void un_nudge_up(int, void *); // idb +void nudge_up(); // idb +void pb_keydown(HKEY a1); +void pb_keyup(HKEY a1); +int pb_replay_level(int a1); +INT_PTR pb_high_scores(); +DWORD *pb_window_size(DWORD *a1, DWORD *a2); +int pb_init(); +int pb_uninit(); +int pb_loose_focus(); +// void pb_pause_continue(int a1); +int pb_launch_ball(); +int pb_reset_table(); +// void pb_toggle_demo(int a1); +DWORD gdrv_get_focus(); // idb +void throw_ball(struct TBall *, struct vector_type *, float, float, float); // idb +void find_closest_edge(struct ramp_plane_type *, int, struct wall_point_type *, struct vector_type **, struct vector_type **); // idb +double basic_collision(struct TBall *a1, struct vector_type *a2, struct vector_type *a3, float a4, float a5, float a6, float a7); +struct TEdgeSegment *install_wall(float *, struct TCollisionComponent *, char *, unsigned int, float, void *); // idb +void vswap(struct vector_type *, struct vector_type *); // idb +double distance_to_flipper(struct ray_type *a1, struct ray_type *a2); +void vector_add(struct vector_type *, struct vector_type *); // idb +void RotatePt(struct vector_type *, float, float, struct vector_type *); // idb +long double Distance(struct vector_type *a1, struct vector_type *a2); +double Distance_Squared(float a1, float a2, int a3, float a4, float a5, int a6); +double DotProduct(const struct vector_type *a1, const struct vector_type *a2); +void SinCos(float, float *, float *); // idb +void RotateVector(struct vector_type *, float); // idb +int sub_101CEB6(LPBYTE lpData); // idb +HWND HtmlHelpA(HWND hwndCaller, LPCSTR pszFile, UINT uCommand, DWORD_PTR dwData); +WORD *SessionToGlobalDataPtr(WORD *a1); +BOOL IsValidLPMIXWAVE(int a1); +bool HasCurrentOutputFormat(const void *a1); +int DefaultPauseBlocks(int a1); +unsigned int DefaultGoodWavePos(UINT_PTR uDeviceID); +DWORD MyWaveOutGetPosition(HWAVEOUT hwo, int a2); +int AddFactor(int a1, int a2); +int SubFactor(int a1, int a2); +unsigned int SetWaveOutPosition(unsigned int a1); +unsigned int MyWaveOutReset(HWAVEOUT hwo); +int cmixit(_BYTE *a1, char *a2, char *a3, int a4, unsigned int a5); +DWORD *InitChannelNodes(); +int GetChannelNode(); +DWORD *FreeChannelNode(DWORD *a1); +struct wavehdr_tag *FreeWaveBlocks(HWAVEOUT hwo, int a2); +int AllocWaveBlocks(HWAVEOUT hwo, int); // idb +DWORD *SwapWaveBlocks(); +DWORD *GetWaveBlock(); +struct wavehdr_tag *RemoveFromPlayingQueue(struct wavehdr_tag *a1); +LPWAVEHDR DestroyPlayQueue(); +int ReleaseWaveDevice(int a1); +signed int GetWaveDevice(); +signed int WaveMixOpenChannel(WORD *a1, signed int a2, unsigned int a3); +LPWAVEHDR AddToPlayingQueue(struct wavehdr_tag *a1); +int MixerPlay(LPWAVEHDR pwh, int); // idb +DWORD FreePlayedBlocks(); +int WaveMixPump(); +LRESULT WndProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam); +signed int NoResetRemix(int a1, int a2); +signed int ResetRemix(int a1, int a2); +void ResetWavePosIfNoChannelData(); +signed int WaveMixPlay(int a1); +signed int WaveMixFlushChannel(WORD *a1, signed int a2, char a3); +signed int WaveMixCloseChannel(WORD *a1, signed int a2, char a3); +int WaveMixFreeWave(int, LPCVOID pMem); // idb +// WORD *BitsPerSampleAlign(int a1, LPCVOID pMem, int a3, int a4, int a5); +_BYTE *ChannelAlign(LPCVOID pMem, int a2, int a3, int a4, int a5); +void AvgSample(WORD *a1, unsigned __int8 *a2, int a3, int a4, int a5); +int RepSample(_BYTE *a1, unsigned __int8 *a2, signed int a3, int a4, int a5); +LPCVOID SamplesPerSecAlign(LPCVOID pMem, int a2, int a3, int a4, int a5, int a6); +LPCVOID WaveFormatConvert(int a1, int a2, LPCVOID pMem, int a4); +CHAR *WaveMixOpenWave(LPCVOID pMem, LPCSTR lpName, HMODULE hModule, LONG cch); +unsigned int FigureOutDMABufferSize(unsigned int a1, int a2); +int RemoveInvalidIniNameCharacters(LPCSTR lpString); // idb +UINT ShowWaveOutDevices(); +const char *GetOperatingSystemPrefix(); +int ReadRegistryToGetMachineSpecificInfSection(int, LPSTR lpString1, int); // idb +int ReadRegistryInt(HKEY hKey, LPCSTR lpSubKey, int); // idb +signed int ReadRegistryForAppSpecificConfigs(int a1); +int ShowCurrentSettings(); +int Settings_OnInitDialog(HWND hWnd, int, int); // idb +int Settings_OnCommand(HWND hWnd, int, int, int); // idb +BOOL SettingsDlgProc(HWND, UINT, WPARAM, LPARAM); // idb +DWORD *MakeDlgTemplate(int a1, int a2, int a3, int a4, int a5, int a6, wchar_t *Str); +WORD *AddDlgControl(int a1, LPCVOID pMem, int a3, int a4, int a5, int a6, int a7, int a8, int a9, wchar_t *Str); +WORD *MakeSettingsDlgTemplate(); +void DestroySettingsDlgTemplate(LPCVOID pMem); +signed int WaveMixGetConfig(WORD *a1, int a2); +BOOL SaveConfigSettings(int a1); +DWORD SetIniFileName(HMODULE hModule); +int InitVolumeTable(); +int WaveMixStartup(HMODULE hModule); // idb +signed int WaveMixActivate(WORD *a1, int a2); +MMRESULT WaveMixConfigure(int a1, HWND hWndParent, int a3, int a4, int a5); +signed int ReadConfigSettings(int a1); +int WaveMixConfigureInit(WORD *a1); +int WaveMixInit(); +HLOCAL WaveMixCloseSession(HLOCAL hMem); int WinMainCRTStartup(); // void __cdecl operator delete(void *); idb // void *__cdecl operator new(unsigned int); idb -// int __cdecl _initterm(_DWORD, _DWORD); weak +// int __cdecl _initterm(DWORD, DWORD); weak unsigned int _setdefaultprecision(); -int __stdcall check_expiration_date(); +int check_expiration_date(); // unsigned int __cdecl _controlfp(unsigned int NewValue, unsigned int Mask); //------------------------------------------------------------------------- @@ -481,9 +479,9 @@ char byte_1023459 = '\0'; // weak char byte_102345A = '\0'; // weak _UNKNOWN unk_102345F; // weak _UNKNOWN unk_1023460; // weak -__int16 vk_list = 32833; // weak +int vk_list = 32833; // weak _UNKNOWN unk_1023540; // weak -__int16 field_size[14] = +int field_size[14] = { 2, 65535, @@ -967,8 +965,8 @@ char **off_1024470[142] = &off_1023E10 }; // weak int off_10246A0 = 16923984; // idb -__int16 word_10246EC[] = { 84 }; // weak -__int16 word_1024708[] = { 91 }; // weak +int word_10246EC[] = { 84 }; // weak +int word_1024708[] = { 91 }; // weak int render_blit = 1; // weak int dword_1024758[5] = { 1, 2, 3, 5, 10 }; // idb int __security_cookie_complement = 4294919359; // weak @@ -1343,13 +1341,13 @@ int memory_use_total; // weak int memory_critical_allocation; // weak int (*memory_critical_callback)(void); // weak HMENU hMenu; // idb -__int16 word_1024F18; // weak +int word_1024F18; // weak int dword_1024F1C[8]; // idb int dword_1024F3C[8]; // idb LPCVOID pMem; // idb HMODULE dword_1024F60; // idb HWND dword_1024F64; // idb -int (__stdcall *dword_1024F68)(_DWORD, _DWORD, _DWORD); // weak +int (*dword_1024F68)(DWORD, DWORD, DWORD); // weak HINSTANCE hInstance; // idb int dword_1024F70; // weak int dword_1024F74; // weak @@ -1382,7 +1380,7 @@ int dword_1025048; // weak int dword_102504C; // weak int dword_1025050; // weak _UNKNOWN zscreen; // weak -__int16 word_102505A; // weak +int word_102505A; // weak struct render_sprite_type_struct **render_dirty_list; // weak struct render_sprite_type_struct **render_ball_list; // weak int render_many_balls; // weak @@ -1453,7 +1451,7 @@ _UNKNOWN T1; // weak int dword_102570C; // weak _UNKNOWN A1; // weak float flt_1025718; // weak -HWND (__stdcall *pHtmlHelpA)(HWND, const char *, unsigned int, unsigned int); // weak +HWND (*pHtmlHelpA)(HWND, const char *, unsigned int, unsigned int); // weak int dword_1025728; // weak HMODULE hModule; // idb int dword_1025730[16]; // idb @@ -1462,8 +1460,8 @@ int dword_1025798; // weak int dword_10257A0[16]; // idb HINSTANCE dword_10257E0; // idb _UNKNOWN unk_10257E4; // weak -__int16 word_1025810[]; // weak -__int16 word_1025812[30]; // idb +int word_1025810[]; // weak +int word_1025812[30]; // idb CHAR FileName[276]; // idb int dword_1025964; // weak int dword_1025968; // weak @@ -1526,12 +1524,12 @@ HKEY dword_1028240; // idb HKEY dword_1028244; // idb HKEY dword_1028248; // idb HKEY dword_102824C; // idb -__int16 dword_1028250; // idb -__int16 dword_1028254; // idb -__int16 dword_1028258; // idb -__int16 dword_102825C; // idb -__int16 dword_1028260; // idb -__int16 dword_1028264; // idb +int dword_1028250; // idb +int dword_1028254; // idb +int dword_1028258; // idb +int dword_102825C; // idb +int dword_1028260; // idb +int dword_1028264; // idb int high_score_dlg_score; // idb LPCSTR high_score_dlg_hst; // idb int high_score_dlg_enter_name; // weak diff --git a/score.cpp b/score.cpp index 2a728f5..f94831e 100644 --- a/score.cpp +++ b/score.cpp @@ -1,7 +1,7 @@ #include "pinball.h" //----- (0100C335) -------------------------------------------------------- -int __stdcall SpecialAddScore(int a1) +int SpecialAddScore(int a1) { TPinballTable *v1; // ecx int v2; // esi @@ -11,29 +11,29 @@ int result; // eax TPinballTable *v6; // ecx v1 = dword_1025040; -v2 = *(_DWORD *)((char *)dword_1025040 + 318); -*(_DWORD *)((char *)dword_1025040 + 318) = 0; -v3 = *(_DWORD *)((char *)v1 + 310); -*(_DWORD *)((char *)v1 + 310) = 0; -v4 = *(_DWORD *)((char *)v1 + 294); -*(_DWORD *)((char *)v1 + 294) = 0; +v2 = *(DWORD *)((char *)dword_1025040 + 318); +*(DWORD *)((char *)dword_1025040 + 318) = 0; +v3 = *(DWORD *)((char *)v1 + 310); +*(DWORD *)((char *)v1 + 310) = 0; +v4 = *(DWORD *)((char *)v1 + 294); +*(DWORD *)((char *)v1 + 294) = 0; result = TPinballTable::AddScore(v1, a1); v6 = dword_1025040; -*(_DWORD *)((char *)dword_1025040 + 310) = v3; -*(_DWORD *)((char *)v6 + 294) = v4; -*(_DWORD *)((char *)v6 + 318) = v2; +*(DWORD *)((char *)dword_1025040 + 310) = v3; +*(DWORD *)((char *)v6 + 294) = v4; +*(DWORD *)((char *)v6 + 318) = v2; return result; } //----- (0100E50B) -------------------------------------------------------- -int __stdcall AddRankProgress(int a1) +int AddRankProgress(int a1) { signed int v1; // ebx int v2; // edi -void (__thiscall ***v3)(_DWORD, signed int, _DWORD); // esi +void (__thiscall ***v3)(DWORD, signed int, DWORD); // esi signed int v4; // edi int v5; // eax -int (__thiscall ***v6)(_DWORD, signed int, _DWORD); // esi +int (__thiscall ***v6)(DWORD, signed int, DWORD); // esi int v7; // edi CHAR *v8; // ST40_4 CHAR *v9; // eax @@ -43,9 +43,9 @@ signed __int64 v12; // rt2 char Dest; // [esp+50h] [ebp-44h] v1 = 0; -(**(void (__stdcall ***)(signed int, _DWORD))dword_10238F0)(19, 0.0); +(**(void (***)(signed int, DWORD))dword_10238F0)(19, 0.0); v2 = a1; -v3 = (void (__thiscall ***)(_DWORD, signed int, _DWORD))dword_1023CFC; +v3 = (void (__thiscall ***)(DWORD, signed int, DWORD))dword_1023CFC; if ( a1 > 0 ) { do @@ -55,14 +55,14 @@ do } while ( v2 ); } -v4 = ((int (__thiscall *)(_DWORD, signed int, _DWORD))**v3)(v3, 37, 0.0); -v5 = ((int (__thiscall *)(_DWORD, signed int, _DWORD))**v3)(v3, 38, 0.0); +v4 = ((int (__thiscall *)(DWORD, signed int, DWORD))**v3)(v3, 37, 0.0); +v5 = ((int (__thiscall *)(DWORD, signed int, DWORD))**v3)(v3, 38, 0.0); if ( v4 == v5 ) { v1 = 1; (**v3)(v3, 16, 5.0); -v6 = (int (__thiscall ***)(_DWORD, signed int, _DWORD))dword_1023CF4; -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023CF4)(34, 0.0); +v6 = (int (__thiscall ***)(DWORD, signed int, DWORD))dword_1023CF4; +(**(void (***)(signed int, DWORD))dword_1023CF4)(34, 0.0); v7 = (**v6)(v6, 37, 0.0); if ( v7 < 9 ) { @@ -71,7 +71,7 @@ v8 = get_rc_string(word_10246EC[2 * v7], 1); v9 = get_rc_string(83, 0); _sprintf(&Dest, v9, v8); TTextBox::Display(dword_1023E24, 1, &Dest, 8.0); -(*(void (**)(void))(*(_DWORD *)dword_1023D1C + 20))(); +(*(void (**)(void))(*(DWORD *)dword_1023D1C + 20))(); } } else @@ -81,7 +81,7 @@ v12 = v10 % 4; LODWORD(v10) = v10 / 4; v11 = v12; if ( v4 >= (signed int)v10 ) -(**(void (__fastcall ***)(int, int, signed int, _DWORD))dword_1023CF4)(dword_1023CF4, v11, 27, -1.0); +(**(void (__fastcall ***)(int, int, signed int, DWORD))dword_1023CF4)(dword_1023CF4, v11, 27, -1.0); } return v1; } @@ -89,28 +89,28 @@ return v1; // 1023CF4: using guessed type int dword_1023CF4; // 1023CFC: using guessed type int dword_1023CFC; // 1023D1C: using guessed type int dword_1023D1C; -// 10246EC: using guessed type __int16 word_10246EC[]; +// 10246EC: using guessed type int word_10246EC[]; //----- (01013BB3) -------------------------------------------------------- -_DWORD *__stdcall score_create(LPCSTR lpString, int a2) +DWORD *score_create(LPCSTR lpString, int a2) { -_DWORD *v2; // esi -__int16 *v3; // eax -__int16 v5; // cx -signed __int16 *v6; // eax +DWORD *v2; // esi +int *v3; // eax +int v5; // cx +signed int *v6; // eax int v7; // edx int v8; // edx int v9; // ebx int *v10; // edi int v11; // [esp+10h] [ebp+Ch] -v2 = (_DWORD *)memoryallocate(0x44u); +v2 = (DWORD *)memoryallocate(0x44u); if ( !v2 ) return 0; *v2 = -9999; v2[2] = a2; -v3 = (__int16 *)partman_field_labeled(loader_table, lpString, 10); +v3 = (int *)partman_field_labeled(loader_table, lpString, 10); if ( !v3 ) { memoryfree((int)v2); @@ -141,7 +141,7 @@ return v2; } //----- (01013C48) -------------------------------------------------------- -void *__stdcall score_dup(const void *a1, int a2) +void *score_dup(const void *a1, int a2) { void *result; // eax @@ -153,9 +153,9 @@ return result; //----- (01013C89) -------------------------------------------------------- -_DWORD *__stdcall score_set(_DWORD *a1, int a2) +DWORD *score_set(DWORD *a1, int a2) { -_DWORD *result; // eax +DWORD *result; // eax result = a1; if ( a1 ) @@ -167,14 +167,14 @@ return result; } //----- (01013CAA) -------------------------------------------------------- -void *__userpurge score_erase@(int a1@, _DWORD *a2, int a3) +void *score_erase(int a1, DWORD *a2, int a3) { -_DWORD *v3; // edx +DWORD *v3; // edx void *result; // eax if ( a2 ) { -v3 = (_DWORD *)a2[2]; +v3 = (DWORD *)a2[2]; if ( v3 ) result = gdrv_copy_bitmap(&vscreen, a2[5], a2[6], a2[3], a2[4], v3, a2[3], a2[4]); else @@ -186,7 +186,7 @@ return result; } //----- (01013D2D) -------------------------------------------------------- -HDC __userpurge score_update@(int a1@, int *a2) +HDC score_update(int a1, int *a2) { HDC result; // eax int v3; // ecx @@ -196,7 +196,7 @@ int v6; // eax char *v7; // eax int v8; // [esp-24h] [ebp-40h] int v9; // [esp-20h] [ebp-3Ch] -_DWORD *v10; // [esp-14h] [ebp-30h] +DWORD *v10; // [esp-14h] [ebp-30h] int v11; // [esp+4h] [ebp-18h] int v12; // [esp+8h] [ebp-14h] char DstBuf[12]; // [esp+Ch] [ebp-10h] @@ -221,7 +221,7 @@ while ( 1 ) { v7 = &DstBuf[v6]; *v7 -= 48; -v10 = (_DWORD *)a2[*v7 + 7]; +v10 = (DWORD *)a2[*v7 + 7]; v4 -= v10[3]; v9 = v10[4]; v8 = v10[3]; @@ -242,13 +242,13 @@ return result; // 1013D2D: using guessed type char DstBuf[12]; //----- (01013E25) -------------------------------------------------------- -signed int __stdcall score_init() +signed int score_init() { return 1; } //----- (01013E2E) -------------------------------------------------------- -void __stdcall score_unload_msg_font() +void score_unload_msg_font() { signed int v0; // esi @@ -257,10 +257,10 @@ if ( score_msg_fontp ) v0 = 8; do { -if ( *(_DWORD *)((char *)score_msg_fontp + v0) ) +if ( *(DWORD *)((char *)score_msg_fontp + v0) ) { -gdrv_destroy_bitmap(*(_DWORD *)((char *)score_msg_fontp + v0)); -memoryfree(*(_DWORD *)((char *)score_msg_fontp + v0)); +gdrv_destroy_bitmap(*(DWORD *)((char *)score_msg_fontp + v0)); +memoryfree(*(DWORD *)((char *)score_msg_fontp + v0)); } v0 += 4; } @@ -271,11 +271,11 @@ score_msg_fontp = 0; // 10253C4: using guessed type struct score_msg_font_type *score_msg_fontp; //----- (01013E73) -------------------------------------------------------- -HRSRC __stdcall score_load_msg_font(LPCSTR lpName) +HRSRC score_load_msg_font(LPCSTR lpName) { HRSRC result; // eax HRSRC v2; // esi -signed __int16 *v3; // ebx +signed int *v3; // ebx int v4; // edx signed int v5; // esi signed int v6; // ecx @@ -284,7 +284,7 @@ _BYTE *v8; // esi int v9; // eax unsigned int v10; // eax const void *v11; // esi -_DWORD *v12; // eax +DWORD *v12; // eax int v13; // edx char *v14; // eax int v15; // esi @@ -306,7 +306,7 @@ v2 = result; hResData = result; if ( !result ) return result; -v3 = (signed __int16 *)LockResource(result); +v3 = (signed int *)LockResource(result); v22 = (int)(v3 + 67); v4 = memoryallocate(0x208u); score_msg_fontp = (struct score_msg_font_type *)v4; @@ -332,8 +332,8 @@ score_msg_fontp = 0; return (HRSRC)FreeResource(hResData); } v23 = 0; -*(_DWORD *)score_msg_fontp = *v3; -*((_DWORD *)score_msg_fontp + 1) = v3[2]; +*(DWORD *)score_msg_fontp = *v3; +*((DWORD *)score_msg_fontp + 1) = v3[2]; lpNamea = (LPCSTR)8; while ( 1 ) { @@ -346,8 +346,8 @@ lpNamea += 4; if ( (signed int)lpNamea >= 520 ) goto LABEL_19; } -*(_DWORD *)((char *)score_msg_fontp + (_DWORD)lpNamea) = memoryallocate(0x25u); -v9 = *(_DWORD *)((char *)score_msg_fontp + (_DWORD)lpNamea); +*(DWORD *)((char *)score_msg_fontp + (DWORD)lpNamea) = memoryallocate(0x25u); +v9 = *(DWORD *)((char *)score_msg_fontp + (DWORD)lpNamea); if ( !v9 ) goto LABEL_19; if ( !gdrv_create_raw_bitmap(v9, (char)*v8, v3[2], 0) ) @@ -359,7 +359,7 @@ qmemcpy((void *)(v19 + 3), v11, v10); v20 = 0; v17 = *((char *)v3 + v23 + 6); v21 = (char *)(v19 + 4); -v12 = *(_DWORD **)((char *)score_msg_fontp + (_DWORD)lpNamea); +v12 = *(DWORD **)((char *)score_msg_fontp + (DWORD)lpNamea); v13 = -v12[5]; v14 = (char *)(v12[2] - v13 * (v12[4] - 1)); for ( i = v14; v20 < v3[2]; i += v13 ) @@ -372,8 +372,8 @@ v14 = &i[v13]; goto LABEL_16; } v15 = 4 * v23 + 8; -memoryfree(*(_DWORD *)((char *)score_msg_fontp + v15)); -*(_DWORD *)((char *)score_msg_fontp + v15) = 0; +memoryfree(*(DWORD *)((char *)score_msg_fontp + v15)); +*(DWORD *)((char *)score_msg_fontp + v15) = 0; LABEL_19: if ( v23 != 128 ) score_unload_msg_font(); diff --git a/sound/midi.cpp b/sound/midi.cpp index 7c8ec0b..97280bc 100644 --- a/sound/midi.cpp +++ b/sound/midi.cpp @@ -5,7 +5,7 @@ #include "../pinball.h" //----- (0100AF1F) -------------------------------------------------------- -int __stdcall midi_music_init(HWND a1) +int midi_music_init(HWND a1) { CHAR *v1; // eax @@ -25,7 +25,7 @@ int __stdcall midi_music_init(HWND a1) // 1025018: using guessed type int dword_1025018; //----- (0100AF8E) -------------------------------------------------------- -MCIERROR __stdcall midi_music_shutdown() +MCIERROR midi_music_shutdown() { MCIERROR result; // eax @@ -37,7 +37,7 @@ MCIERROR __stdcall midi_music_shutdown() // 1025000: using guessed type int midi_seq1_open; //----- (0100AFB9) -------------------------------------------------------- -MCIERROR __stdcall midi_music_stop() +MCIERROR midi_music_stop() { MCIERROR result; // eax @@ -49,7 +49,7 @@ MCIERROR __stdcall midi_music_stop() // 1025004: using guessed type int midi_seq1_playing; //----- (0100AFDC) -------------------------------------------------------- -MCIERROR __stdcall midi_play_pb_theme(int a1) +MCIERROR midi_play_pb_theme(int a1) { MCIERROR v1; // esi DWORD_PTR dwParam2; // [esp+4h] [ebp-Ch] @@ -71,7 +71,7 @@ MCIERROR __stdcall midi_play_pb_theme(int a1) // 1025008: using guessed type HWND midi_notify_hwnd; //----- (0100B035) -------------------------------------------------------- -HWND __stdcall restart_midi_seq(int a1) +HWND restart_midi_seq(int a1) { HWND result; // eax DWORD_PTR dwParam2; // [esp+0h] [ebp-Ch] diff --git a/sound/sound.cpp b/sound/sound.cpp index 12b6168..bcbe1bf 100644 --- a/sound/sound.cpp +++ b/sound/sound.cpp @@ -5,7 +5,7 @@ #include "../pinball.h" //----- (010068F7) -------------------------------------------------------- -LRESULT __stdcall SoundCallBackWndProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam) +LRESULT SoundCallBackWndProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam) { signed int v5; // eax int v6; // esi @@ -35,18 +35,18 @@ LRESULT __stdcall SoundCallBackWndProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARA dword_1024F68(2, lParam, v5); return 0; } -// 1024F68: using guessed type int (__stdcall *dword_1024F68)(_DWORD, _DWORD, _DWORD); +// 1024F68: using guessed type int (*dword_1024F68)(DWORD, DWORD, DWORD); // 1028208: using guessed type int num_channels; //----- (01006973) -------------------------------------------------------- -int __stdcall Sound_Init(HINSTANCE hInstance, int a2, int a3) +int Sound_Init(HINSTANCE hInstance, int a2, int a3) { int v3; // ecx int i; // eax FILE *v5; // eax CHAR *v6; // eax - _WORD *v7; // eax + WORD *v7; // eax WNDCLASSA WndClass; // [esp+8h] [ebp-158h] char Filename; // [esp+30h] [ebp-130h] @@ -62,7 +62,7 @@ int __stdcall Sound_Init(HINSTANCE hInstance, int a2, int a3) dword_1024F1C[i] = 0; dword_1024F3C[i] = 0; } - dword_1024F68 = (int (__stdcall *)(_DWORD, _DWORD, _DWORD))a3; + dword_1024F68 = (int (*)(DWORD, DWORD, DWORD))a3; if ( !a3 ) dword_1024F68 = nullsub_1; make_path_name(&Filename, "wavemix.inf", 0x12Cu); @@ -91,20 +91,20 @@ int __stdcall Sound_Init(HINSTANCE hInstance, int a2, int a3) if ( !dword_1024F64 ) return 0; dword_1024F60 = hInstance; - v7 = (_WORD *)WaveMixInit(); + v7 = (WORD *)WaveMixInit(); pMem = v7; if ( !v7 ) return 0; WaveMixOpenChannel(v7, num_channels, 2u); return 1; } -// 10068EF: using guessed type int __stdcall nullsub_1(int, int, int); -// 1024F18: using guessed type __int16 word_1024F18; -// 1024F68: using guessed type int (__stdcall *dword_1024F68)(_DWORD, _DWORD, _DWORD); +// 10068EF: using guessed type int nullsub_1(int, int, int); +// 1024F18: using guessed type int word_1024F18; +// 1024F68: using guessed type int (*dword_1024F68)(DWORD, DWORD, DWORD); // 1028208: using guessed type int num_channels; //----- (010076BF) -------------------------------------------------------- -int __stdcall make_path_name(LPSTR lpFilename, LPCSTR lpString2, DWORD nSize) +int make_path_name(LPSTR lpFilename, LPCSTR lpString2, DWORD nSize) { CHAR* i; // ecx @@ -131,7 +131,7 @@ int __stdcall make_path_name(LPSTR lpFilename, LPCSTR lpString2, DWORD nSize) } //----- (01006AF6) -------------------------------------------------------- -HLOCAL __stdcall Sound_Close() +HLOCAL Sound_Close() { HLOCAL result; // eax @@ -151,7 +151,7 @@ HLOCAL __stdcall Sound_Close() } //----- (01006B38) -------------------------------------------------------- -CHAR *__stdcall Sound_LoadWaveFile(LPCSTR lpName) +CHAR *Sound_LoadWaveFile(LPCSTR lpName) { CHAR *result; // eax @@ -163,7 +163,7 @@ CHAR *__stdcall Sound_LoadWaveFile(LPCSTR lpName) } //----- (01006B64) -------------------------------------------------------- -LPCVOID __stdcall Sound_FreeSound(LPCVOID pMem) +LPCVOID Sound_FreeSound(LPCVOID pMem) { LPCVOID result; // eax @@ -177,7 +177,7 @@ LPCVOID __stdcall Sound_FreeSound(LPCVOID pMem) } //----- (01006B8A) -------------------------------------------------------- -LPCVOID __stdcall Sound_Deactivate() +LPCVOID Sound_Deactivate() { LPCVOID result; // eax @@ -188,7 +188,7 @@ LPCVOID __stdcall Sound_Deactivate() } //----- (01006BA1) -------------------------------------------------------- -LPCVOID __stdcall Sound_Activate() +LPCVOID Sound_Activate() { LPCVOID result; // eax @@ -199,7 +199,7 @@ LPCVOID __stdcall Sound_Activate() } //----- (01006BB8) -------------------------------------------------------- -int __stdcall Sound_Idle() +int Sound_Idle() { int result; // eax @@ -209,7 +209,7 @@ int __stdcall Sound_Idle() } //----- (01006BCC) -------------------------------------------------------- -signed int __stdcall Sound_Flush(signed int a1, int a2) +signed int Sound_Flush(signed int a1, int a2) { signed int result; // eax int v3; // edi @@ -237,20 +237,20 @@ signed int __stdcall Sound_Flush(signed int a1, int a2) // 1028208: using guessed type int num_channels; //----- (01006C26) -------------------------------------------------------- -void __stdcall Sound_PlaySound(int a1, int a2, int a3, unsigned __int16 a4, __int16 a5) +void Sound_PlaySound(int a1, int a2, int a3, unsigned int a4, int a5) { int v5; // ecx int v6; // edx int v7; // esi int v8; // edx int v9; // esi - __int16 v10; // [esp+4h] [ebp-1Ch] + int v10; // [esp+4h] [ebp-1Ch] LPCVOID v11; // [esp+6h] [ebp-1Ah] int v12; // [esp+Ah] [ebp-16h] int v13; // [esp+Eh] [ebp-12h] HWND v14; // [esp+12h] [ebp-Eh] int v15; // [esp+16h] [ebp-Ah] - __int16 v16; // [esp+1Ah] [ebp-6h] + int v16; // [esp+1Ah] [ebp-6h] v5 = a2; v6 = 0; @@ -269,7 +269,7 @@ void __stdcall Sound_PlaySound(int a1, int a2, int a3, unsigned __int16 a4, __in v8 = a2; do { - if ( (1 << ++v5) & (unsigned __int16)word_1024F18 && dword_1024F1C[v5] < (unsigned int)dword_1024F1C[v8] ) + if ( (1 << ++v5) & (unsigned int)word_1024F18 && dword_1024F1C[v5] < (unsigned int)dword_1024F1C[v8] ) { v7 = v5; v8 = v5; @@ -277,7 +277,7 @@ void __stdcall Sound_PlaySound(int a1, int a2, int a3, unsigned __int16 a4, __in } while ( v5 < a3 ); } - if ( (1 << v7) & (unsigned __int16)word_1024F18 ) + if ( (1 << v7) & (unsigned int)word_1024F18 ) { v11 = pMem; v14 = dword_1024F64; @@ -304,12 +304,12 @@ void __stdcall Sound_PlaySound(int a1, int a2, int a3, unsigned __int16 a4, __in } } } -// 1024F18: using guessed type __int16 word_1024F18; -// 1024F68: using guessed type int (__stdcall *dword_1024F68)(_DWORD, _DWORD, _DWORD); +// 1024F18: using guessed type int word_1024F18; +// 1024F68: using guessed type int (*dword_1024F68)(DWORD, DWORD, DWORD); // 1028208: using guessed type int num_channels; //----- (01006D34) -------------------------------------------------------- -void __stdcall Sound_Enable(signed int a1, int a2, int a3) +void Sound_Enable(signed int a1, int a2, int a3) { int v3; // edi signed int v4; // esi @@ -332,7 +332,7 @@ void __stdcall Sound_Enable(signed int a1, int a2, int a3) } else { - word_1024F18 &= ~(_WORD)v5; + word_1024F18 &= ~(WORD)v5; Sound_Flush(v4, v4); } ++v4; @@ -340,5 +340,5 @@ void __stdcall Sound_Enable(signed int a1, int a2, int a3) } } } -// 1024F18: using guessed type __int16 word_1024F18; +// 1024F18: using guessed type int word_1024F18; // 1028208: using guessed type int num_channels; diff --git a/sound/wavemix.cpp b/sound/wavemix.cpp index a832f56..48e47c2 100644 --- a/sound/wavemix.cpp +++ b/sound/wavemix.cpp @@ -1,7 +1,7 @@ #include "../pinball.h" //----- (0101CFD0) -------------------------------------------------------- -_WORD *__stdcall SessionToGlobalDataPtr(_WORD *a1) +WORD *SessionToGlobalDataPtr(WORD *a1) { if ( a1 && *a1 == 21554 && a1[222] == 21554 ) return a1; @@ -12,24 +12,24 @@ return 0; } //----- (0101D02C) -------------------------------------------------------- -BOOL __stdcall IsValidLPMIXWAVE(int a1) +BOOL IsValidLPMIXWAVE(int a1) { BOOL result; // eax result = a1; if ( a1 ) -result = *(_WORD *)(a1 + 64) == 21554; +result = *(WORD *)(a1 + 64) == 21554; return result; } //----- (0101D04E) -------------------------------------------------------- -bool __stdcall HasCurrentOutputFormat(const void *a1) +bool HasCurrentOutputFormat(const void *a1) { return memcmp(a1, (const void *)(hMem + 380), 0x10u) == 0; } //----- (0101D079) -------------------------------------------------------- -int __stdcall DefaultPauseBlocks(int a1) +int DefaultPauseBlocks(int a1) { int result; // eax @@ -41,7 +41,7 @@ return result; } //----- (0101D0A5) -------------------------------------------------------- -unsigned int __stdcall DefaultGoodWavePos(UINT_PTR uDeviceID) +unsigned int DefaultGoodWavePos(UINT_PTR uDeviceID) { signed int v1; // eax unsigned int result; // eax @@ -56,31 +56,31 @@ return result; } //----- (0101D0FC) -------------------------------------------------------- -DWORD __stdcall MyWaveOutGetPosition(HWAVEOUT hwo, int a2) +DWORD MyWaveOutGetPosition(HWAVEOUT hwo, int a2) { struct mmtime_tag pmmt; // [esp+0h] [ebp-10h] if ( !a2 ) -return (timeGetTime() - *(_DWORD *)(hMem + 416)) * *(_DWORD *)(hMem + 388) / 0x3E8 & 0xFFFFFFF8; +return (timeGetTime() - *(DWORD *)(hMem + 416)) * *(DWORD *)(hMem + 388) / 0x3E8 & 0xFFFFFFF8; pmmt.wType = 4; waveOutGetPosition(hwo, &pmmt, 0xCu); -return (*(int (__stdcall **)(DWORD, _DWORD))(hMem + 436))(pmmt.u.ms, *(_DWORD *)(hMem + 424)); +return (*(int (**)(DWORD, DWORD))(hMem + 436))(pmmt.u.ms, *(DWORD *)(hMem + 424)); } //----- (0101D178) -------------------------------------------------------- -int __stdcall AddFactor(int a1, int a2) +int AddFactor(int a1, int a2) { return a1 + a2; } //----- (0101D18E) -------------------------------------------------------- -int __stdcall SubFactor(int a1, int a2) +int SubFactor(int a1, int a2) { return a1 - a2; } //----- (0101D1A2) -------------------------------------------------------- -unsigned int __stdcall SetWaveOutPosition(unsigned int a1) +unsigned int SetWaveOutPosition(unsigned int a1) { LPARAM v1; // eax HWAVEOUT v2; // ecx @@ -107,35 +107,35 @@ pmmt.u.ms = 0; } if ( v3 < a1 ) { -*(_DWORD *)(v1 + 424) = a1 - v3; -*(_DWORD *)(v1 + 436) = AddFactor; +*(DWORD *)(v1 + 424) = a1 - v3; +*(DWORD *)(v1 + 436) = AddFactor; } else { -*(_DWORD *)(v1 + 424) = v3 - a1; -*(_DWORD *)(v1 + 436) = SubFactor; +*(DWORD *)(v1 + 424) = v3 - a1; +*(DWORD *)(v1 + 436) = SubFactor; } v4 = timeGetTime(); v5 = hMem; v6 = v4; -result = 1000 * a1 / *(_DWORD *)(hMem + 388); -*(_DWORD *)(hMem + 412) = a1; -*(_DWORD *)(v5 + 416) = v6 - result; +result = 1000 * a1 / *(DWORD *)(hMem + 388); +*(DWORD *)(hMem + 412) = a1; +*(DWORD *)(v5 + 416) = v6 - result; return result; } //----- (0101D251) -------------------------------------------------------- -unsigned int __stdcall MyWaveOutReset(HWAVEOUT hwo) +unsigned int MyWaveOutReset(HWAVEOUT hwo) { unsigned int v1; // esi -v1 = MyWaveOutGetPosition(hwo, *(_DWORD *)(hMem + 420)); +v1 = MyWaveOutGetPosition(hwo, *(DWORD *)(hMem + 420)); waveOutReset(hwo); return SetWaveOutPosition(v1); } //----- (0101D285) -------------------------------------------------------- -__int16 __stdcall cmixit(_BYTE *a1, char *a2, char *a3, int a4, unsigned __int16 a5) +int cmixit(_BYTE *a1, char *a2, char *a3, int a4, unsigned int a5) { int v5; // eax unsigned __int8 *v6; // esi @@ -146,7 +146,7 @@ _BYTE *v10; // edi unsigned __int8 *v11; // esi int v12; // edx int v13; // ebx -unsigned __int16 *v14; // eax +unsigned int *v14; // eax int v15; // ecx unsigned __int8 *v16; // ecx int v17; // ecx @@ -155,28 +155,28 @@ unsigned __int8 *v19; // esi int v20; // edi _BYTE *v21; // ecx int v22; // ebx -unsigned __int16 *v23; // ecx +unsigned int *v23; // ecx int v24; // eax int v26; // [esp+10h] [ebp-8h] int v27; // [esp+10h] [ebp-8h] -unsigned __int16 v28; // [esp+14h] [ebp-4h] -unsigned __int16 v29; // [esp+14h] [ebp-4h] +unsigned int v28; // [esp+14h] [ebp-4h] +unsigned int v29; // [esp+14h] [ebp-4h] int v30; // [esp+30h] [ebp+18h] int v31; // [esp+30h] [ebp+18h] LOWORD(v5) = hMem; -if ( *(_WORD *)(hMem + 382) == 2 ) +if ( *(WORD *)(hMem + 382) == 2 ) { if ( a4 == 1 ) { v6 = *(unsigned __int8 **)a2; -LOWORD(v5) = (_WORD)a3; +LOWORD(v5) = (WORD)a3; if ( a5 ) { v7 = a1; -v5 = *(unsigned __int16 *)a3 << 8; -v8 = *((unsigned __int16 *)a3 + 1) << 8; -v9 = (unsigned __int16)(((unsigned __int16)(a5 - 1) >> 1) + 1); +v5 = *(unsigned int *)a3 << 8; +v8 = *((unsigned int *)a3 + 1) << 8; +v9 = (unsigned int)(((unsigned int)(a5 - 1) >> 1) + 1); do { *v7 = byte_1025970[*v6 + v5]; @@ -196,19 +196,19 @@ v28 = 0; LOWORD(v5) = a5; if ( a5 ) { -v26 = (unsigned __int16)(((unsigned __int16)(a5 - 1) >> 1) + 1); +v26 = (unsigned int)(((unsigned int)(a5 - 1) >> 1) + 1); do { v12 = 128; v13 = 128; if ( a4 > 0 ) { -v14 = (unsigned __int16 *)a3; +v14 = (unsigned int *)a3; v15 = a2 - a3; v30 = a4; while ( 1 ) { -v16 = (unsigned __int8 *)(*(_DWORD *)((char *)v14 + v15) + v28); +v16 = (unsigned __int8 *)(*(DWORD *)((char *)v14 + v15) + v28); v13 = v13 + (unsigned __int8)byte_1025970[256 * *v14 + *v16] - 128; v17 = (unsigned __int8)byte_1025970[256 * v14[1] + v16[1]]; v14 += 2; @@ -240,7 +240,7 @@ LOBYTE(v12) = 0; v28 += 2; *a1 = v13; a1[1] = v12; -LOWORD(v5) = (_WORD)a1 + 2; +LOWORD(v5) = (WORD)a1 + 2; v18 = v26-- == 1; a1 += 2; } @@ -251,12 +251,12 @@ while ( !v18 ); else if ( a4 == 1 ) { v19 = *(unsigned __int8 **)a2; -v5 = (*(unsigned __int16 *)a3 + *((unsigned __int16 *)a3 + 1)) / 2; +v5 = (*(unsigned int *)a3 + *((unsigned int *)a3 + 1)) / 2; if ( a5 ) { v20 = a5; v21 = a1; -v5 = (unsigned __int16)v5 << 8; +v5 = (unsigned int)v5 << 8; do { *v21++ = byte_1025970[*v19++ + v5]; @@ -276,12 +276,12 @@ do v22 = 128; if ( a4 > 0 ) { -v23 = (unsigned __int16 *)a3; +v23 = (unsigned int *)a3; v31 = a4; do { -v24 = (unsigned __int8)byte_1025970[256 * (unsigned __int16)((*v23 + v23[1]) / 2) -+ *(unsigned __int8 *)(*(_DWORD *)((char *)v23 + a2 - a3) + v29)]; +v24 = (unsigned __int8)byte_1025970[256 * (unsigned int)((*v23 + v23[1]) / 2) ++ *(unsigned __int8 *)(*(DWORD *)((char *)v23 + a2 - a3) + v29)]; v23 += 2; v18 = v31-- == 1; v22 = v22 + v24 - 128; @@ -309,9 +309,9 @@ return v5; } //----- (0101D491) -------------------------------------------------------- -_DWORD *__stdcall InitChannelNodes() +DWORD *InitChannelNodes() { -_DWORD *result; // eax +DWORD *result; // eax result = &unk_1026470; do @@ -328,7 +328,7 @@ return result; // 1027BA4: using guessed type int dword_1027BA4; //----- (0101D4B9) -------------------------------------------------------- -int __stdcall GetChannelNode() +int GetChannelNode() { int result; // eax int v1; // ecx @@ -336,8 +336,8 @@ int v1; // ecx result = dword_1025964; if ( dword_1025964 ) { -v1 = *(_DWORD *)dword_1025964; -*(_DWORD *)dword_1025964 = 0; +v1 = *(DWORD *)dword_1025964; +*(DWORD *)dword_1025964 = 0; dword_1025964 = v1; } return result; @@ -345,9 +345,9 @@ return result; // 1025964: using guessed type int dword_1025964; //----- (0101D4D4) -------------------------------------------------------- -_DWORD *__stdcall FreeChannelNode(_DWORD *a1) +DWORD *FreeChannelNode(DWORD *a1) { -_DWORD *result; // eax +DWORD *result; // eax result = a1; if ( a1 ) @@ -360,7 +360,7 @@ return result; // 1025964: using guessed type int dword_1025964; //----- (0101D4F6) -------------------------------------------------------- -struct wavehdr_tag *__stdcall FreeWaveBlocks(HWAVEOUT hwo, int a2) +struct wavehdr_tag *FreeWaveBlocks(HWAVEOUT hwo, int a2) { signed int v2; // ebx LPCVOID *v3; // esi @@ -389,11 +389,11 @@ return result; } //----- (0101D549) -------------------------------------------------------- -int __stdcall AllocWaveBlocks(HWAVEOUT hwo, int a2) +int AllocWaveBlocks(HWAVEOUT hwo, int a2) { signed int v2; // edi HGLOBAL v3; // eax -_DWORD *v4; // eax +DWORD *v4; // eax int v5; // ecx signed int v6; // edi int i; // edi @@ -406,7 +406,7 @@ do v3 = GlobalAlloc(0x2000u, 0x2B41u); v4 = GlobalLock(v3); v5 = a2 + 4 * v2; -*(_DWORD *)v5 = v4; +*(DWORD *)v5 = v4; if ( !v4 ) { if ( dword_1027BE4 ) @@ -421,23 +421,23 @@ v9 = GlobalHandle(*(LPCVOID *)(a2 + 4 * i)); GlobalUnlock(v9); v10 = GlobalHandle(*(LPCVOID *)(a2 + 4 * i)); GlobalFree(v10); -*(_DWORD *)(a2 + 4 * i) = 0; +*(DWORD *)(a2 + 4 * i) = 0; } return 0; } *v4 = v4 + 12; -*(_DWORD *)(*(_DWORD *)v5 + 4) = *(_DWORD *)(hMem + 396); -*(_DWORD *)(*(_DWORD *)v5 + 16) = 0; -*(_DWORD *)(*(_DWORD *)v5 + 20) = 0; -*(_DWORD *)(*(_DWORD *)v5 + 32) = 1; +*(DWORD *)(*(DWORD *)v5 + 4) = *(DWORD *)(hMem + 396); +*(DWORD *)(*(DWORD *)v5 + 16) = 0; +*(DWORD *)(*(DWORD *)v5 + 20) = 0; +*(DWORD *)(*(DWORD *)v5 + 32) = 1; ++v2; -*(_DWORD *)(*(_DWORD *)v5 + 36) = 0; +*(DWORD *)(*(DWORD *)v5 + 36) = 0; } while ( v2 < 10 ); v6 = 0; while ( !waveOutPrepareHeader(hwo, *(LPWAVEHDR *)(a2 + 4 * v6), 0x20u) ) { -*(_DWORD *)(*(_DWORD *)(a2 + 4 * v6++) + 16) |= 1u; +*(DWORD *)(*(DWORD *)(a2 + 4 * v6++) + 16) |= 1u; if ( v6 >= 10 ) return 1; } @@ -449,11 +449,11 @@ return 0; // 1027BE4: using guessed type int dword_1027BE4; //----- (0101D649) -------------------------------------------------------- -_DWORD *__stdcall SwapWaveBlocks() +DWORD *SwapWaveBlocks() { -_DWORD *result; // eax +DWORD *result; // eax -result = (_DWORD *)(hMem + 408); +result = (DWORD *)(hMem + 408); if ( *(_UNKNOWN **)(hMem + 408) == &unk_10257E4 ) *result = &unk_1025770; else @@ -462,22 +462,22 @@ return result; } //----- (0101D66B) -------------------------------------------------------- -_DWORD *__stdcall GetWaveBlock() +DWORD *GetWaveBlock() { int v0; // edx int v1; // eax int v2; // esi -_DWORD *result; // eax +DWORD *result; // eax int v4; // ecx -v0 = *(_DWORD *)(hMem + 400); +v0 = *(DWORD *)(hMem + 400); v1 = 0; if ( v0 > 0 ) { -v2 = *(_DWORD *)(hMem + 408); +v2 = *(DWORD *)(hMem + 408); do { -if ( *(_DWORD *)(*(_DWORD *)v2 + 32) ) +if ( *(DWORD *)(*(DWORD *)v2 + 32) ) break; ++v1; v2 += 4; @@ -486,8 +486,8 @@ while ( v1 < v0 ); } if ( v1 >= v0 ) return 0; -v4 = *(_DWORD *)(hMem + 396); -result = *(_DWORD **)(*(_DWORD *)(hMem + 408) + 4 * v1); +v4 = *(DWORD *)(hMem + 396); +result = *(DWORD **)(*(DWORD *)(hMem + 408) + 4 * v1); result[8] = 0; result[1] = v4; *result = result + 12; @@ -497,7 +497,7 @@ return result; // 1025798: using guessed type int dword_1025798; //----- (0101D6C8) -------------------------------------------------------- -struct wavehdr_tag *__stdcall RemoveFromPlayingQueue(struct wavehdr_tag *a1) +struct wavehdr_tag *RemoveFromPlayingQueue(struct wavehdr_tag *a1) { struct wavehdr_tag *result; // eax LPWAVEHDR v2; // edx @@ -518,13 +518,13 @@ do if ( (struct wavehdr_tag *)v3 == a1 ) break; v2 = (LPWAVEHDR)v3; -v3 = *(_DWORD *)(v3 + 44); +v3 = *(DWORD *)(v3 + 44); } while ( v3 ); if ( v3 ) { v4 = v3 == dword_1027BF0; -v2[1].dwUser = *(_DWORD *)(v3 + 44); +v2[1].dwUser = *(DWORD *)(v3 + 44); if ( v4 ) dword_1027BF0 = (int)v2; goto LABEL_12; @@ -542,7 +542,7 @@ return result; // 1027BF0: using guessed type int dword_1027BF0; //----- (0101D734) -------------------------------------------------------- -LPWAVEHDR __stdcall DestroyPlayQueue() +LPWAVEHDR DestroyPlayQueue() { struct wavehdr_tag *v0; // ST00_4 LPWAVEHDR result; // eax @@ -560,14 +560,14 @@ return result; } //----- (0101D752) -------------------------------------------------------- -int __stdcall ReleaseWaveDevice(int a1) +int ReleaseWaveDevice(int a1) { int result; // eax HWND v2; // ST04_4 -if ( *(_DWORD *)(a1 + 16) ) +if ( *(DWORD *)(a1 + 16) ) { -result = *(_DWORD *)(a1 + 12); +result = *(DWORD *)(a1 + 12); if ( result ) { MyWaveOutReset(*(HWAVEOUT *)(a1 + 12)); @@ -576,16 +576,16 @@ FreeWaveBlocks(*(HWAVEOUT *)(a1 + 12), (int)&unk_10257E4); FreeWaveBlocks(*(HWAVEOUT *)(a1 + 12), (int)&unk_1025770); waveOutClose(*(HWAVEOUT *)(a1 + 12)); v2 = *(HWND *)(a1 + 4); -*(_DWORD *)(a1 + 12) = 0; +*(DWORD *)(a1 + 12) = 0; result = DestroyWindow(v2); -*(_DWORD *)(a1 + 4) = 0; +*(DWORD *)(a1 + 4) = 0; } } return result; } //----- (0101D7B1) -------------------------------------------------------- -signed int __stdcall GetWaveDevice() +signed int GetWaveDevice() { HWND v0; // eax LPARAM v1; // ecx @@ -593,56 +593,56 @@ MMRESULT v2; // edi HWND v4; // ST2C_4 WAVEFORMATEX pwfx; // [esp+Ch] [ebp-14h] -if ( *(_DWORD *)(hMem + 12) ) +if ( *(DWORD *)(hMem + 12) ) return 0; v0 = CreateWindowExA(0, "WavMix32", WindowName, 0x8000000u, 0, 0, 0, 0, 0, 0, dword_10257E0, 0); v1 = hMem; -*(_DWORD *)(hMem + 4) = v0; +*(DWORD *)(hMem + 4) = v0; if ( !v0 ) { if ( dword_1027BE4 ) MessageBoxA(0, "Failed to create callback window.", "WavMix32", 0x30u); return 1; } -pwfx.wFormatTag = *(_WORD *)(v1 + 380); -pwfx.nChannels = *(_WORD *)(v1 + 382); -pwfx.nSamplesPerSec = *(_DWORD *)(v1 + 384); -pwfx.nAvgBytesPerSec = *(_DWORD *)(v1 + 388); -pwfx.nBlockAlign = *(_WORD *)(v1 + 392); -pwfx.wBitsPerSample = *(_WORD *)(v1 + 394); +pwfx.wFormatTag = *(WORD *)(v1 + 380); +pwfx.nChannels = *(WORD *)(v1 + 382); +pwfx.nSamplesPerSec = *(DWORD *)(v1 + 384); +pwfx.nAvgBytesPerSec = *(DWORD *)(v1 + 388); +pwfx.nBlockAlign = *(WORD *)(v1 + 392); +pwfx.wBitsPerSample = *(WORD *)(v1 + 394); pwfx.cbSize = 0; -v2 = waveOutOpen((LPHWAVEOUT)(v1 + 12), 0xFFFFFFFF, &pwfx, *(_DWORD *)(v1 + 4), 0, 0x10000u); +v2 = waveOutOpen((LPHWAVEOUT)(v1 + 12), 0xFFFFFFFF, &pwfx, *(DWORD *)(v1 + 4), 0, 0x10000u); if ( v2 ) { DestroyWindow(*(HWND *)(hMem + 4)); -*(_DWORD *)(hMem + 4) = 0; +*(DWORD *)(hMem + 4) = 0; return v2; } if ( AllocWaveBlocks(*(HWAVEOUT *)(hMem + 12), (int)&unk_10257E4) && AllocWaveBlocks(*(HWAVEOUT *)(hMem + 12), (int)&unk_1025770) ) { -*(_DWORD *)(hMem + 408) = &unk_10257E4; +*(DWORD *)(hMem + 408) = &unk_10257E4; return 0; } FreeWaveBlocks(*(HWAVEOUT *)(hMem + 12), (int)&unk_10257E4); FreeWaveBlocks(*(HWAVEOUT *)(hMem + 12), (int)&unk_1025770); waveOutClose(*(HWAVEOUT *)(hMem + 12)); v4 = *(HWND *)(hMem + 4); -*(_DWORD *)(hMem + 12) = 0; +*(DWORD *)(hMem + 12) = 0; DestroyWindow(v4); return 1; } // 1027BE4: using guessed type int dword_1027BE4; //----- (0101D918) -------------------------------------------------------- -signed int __stdcall WaveMixOpenChannel(_WORD *a1, signed int a2, unsigned int a3) +signed int WaveMixOpenChannel(WORD *a1, signed int a2, unsigned int a3) { -_WORD *v3; // eax +WORD *v3; // eax signed int v4; // ecx int v6; // ecx -_DWORD *v7; // edx +DWORD *v7; // edx int v8; // ecx -_DWORD *v9; // edx +DWORD *v9; // edx v3 = SessionToGlobalDataPtr(a1); hMem = (LPARAM)v3; @@ -680,9 +680,9 @@ do if ( *v7 == -1 ) { *v7 = 0; -*((_WORD *)v7 - 32) = v3[88]; -*((_WORD *)v7 - 31) = v3[89]; -++*((_DWORD *)v3 + 77); +*((WORD *)v7 - 32) = v3[88]; +*((WORD *)v7 - 31) = v3[89]; +++*((DWORD *)v3 + 77); } --v7; --v8; @@ -698,13 +698,13 @@ return 4; *v9 = 0; v3[2 * a2 + 90] = v3[88]; v3[2 * a2 + 91] = v3[89]; -++*((_DWORD *)v3 + 77); +++*((DWORD *)v3 + 77); } return 0; } //----- (0101D9E7) -------------------------------------------------------- -LPWAVEHDR __stdcall AddToPlayingQueue(struct wavehdr_tag *a1) +LPWAVEHDR AddToPlayingQueue(struct wavehdr_tag *a1) { LPWAVEHDR result; // eax @@ -712,7 +712,7 @@ result = pwh; a1[1].dwUser = 0; if ( result ) { -*(_DWORD *)(dword_1027BF0 + 44) = a1; +*(DWORD *)(dword_1027BF0 + 44) = a1; } else { @@ -725,13 +725,13 @@ return result; // 1027BF0: using guessed type int dword_1027BF0; //----- (0101DA1D) -------------------------------------------------------- -int __stdcall MixerPlay(LPWAVEHDR pwh, int a2) +int MixerPlay(LPWAVEHDR pwh, int a2) { LPWAVEHDR v2; // edi LPARAM v4; // esi -_DWORD *v5; // ecx +DWORD *v5; // ecx signed int v6; // ebx -_DWORD *v7; // eax +DWORD *v7; // eax int v8; // edx unsigned int v9; // ebx int v10; // eax @@ -763,18 +763,18 @@ return 0; v30 = -1; v31 = 0; v4 = hMem; -v5 = (_DWORD *)(hMem + 244); +v5 = (DWORD *)(hMem + 244); v6 = 16; do { -v7 = (_DWORD *)*v5; +v7 = (DWORD *)*v5; if ( *v5 != -1 && v7 ) { do { -if ( v7[11] > *(_DWORD *)(v4 + 412) ) +if ( v7[11] > *(DWORD *)(v4 + 412) ) break; -v7 = (_DWORD *)*v7; +v7 = (DWORD *)*v7; } while ( v7 ); if ( v7 ) @@ -795,32 +795,32 @@ if ( a2 ) pwh[1].lpData = (LPSTR)1; return 0; } -v9 = *(_DWORD *)(v4 + 412); +v9 = *(DWORD *)(v4 + 412); v28 = pwh->lpData; -LOWORD(v10) = *(_WORD *)(v4 + 396); -v25 = *(_DWORD *)(v4 + 412); -v27 = *(unsigned __int16 *)(v4 + 396); -while ( (_WORD)v10 ) +LOWORD(v10) = *(WORD *)(v4 + 396); +v25 = *(DWORD *)(v4 + 412); +v27 = *(unsigned int *)(v4 + 396); +while ( (WORD)v10 ) { if ( v9 >= v30 ) { v26 = 0; v29 = 0; -v11 = v9 + (unsigned __int16)v10; +v11 = v9 + (unsigned int)v10; if ( !v31 ) goto LABEL_47; do { v12 = dword_1025730[v26]; -v13 = *(_DWORD *)(v12 + 40); +v13 = *(DWORD *)(v12 + 40); if ( v13 <= v9 ) { -if ( *(_DWORD *)(v12 + 44) < v11 ) -v11 = *(_DWORD *)(v12 + 44); +if ( *(DWORD *)(v12 + 44) < v11 ) +v11 = *(DWORD *)(v12 + 44); v14 = v9 - v13; -if ( *(_WORD *)(v12 + 26) ) +if ( *(WORD *)(v12 + 26) ) { -v15 = *(_DWORD *)(v12 + 36); +v15 = *(DWORD *)(v12 + 36); v14 %= v15; v16 = v15 - v14; v9 = v25; @@ -828,15 +828,15 @@ v17 = v25 + v16; if ( v17 < v11 ) v11 = v17; } -v18 = v14 + *(_DWORD *)(v12 + 48); +v18 = v14 + *(DWORD *)(v12 + 48); v19 = v29++; dword_10257A0[v19] = v18; -word_1025810[2 * v19] = *(_WORD *)(v12 + 56); -word_1025812[2 * v19] = *(_WORD *)(v12 + 58); +word_1025810[2 * v19] = *(WORD *)(v12 + 56); +word_1025812[2 * v19] = *(WORD *)(v12 + 58); } else if ( v13 < v11 ) { -v11 = *(_DWORD *)(v12 + 40); +v11 = *(DWORD *)(v12 + 40); } ++v26; } @@ -844,7 +844,7 @@ while ( v26 < v31 ); if ( v29 ) { v20 = v11 - v9; -(*(void (__stdcall **)(LPSTR, int *, __int16 *, int, unsigned int))(v4 + 428))( +(*(void (**)(LPSTR, int *, int *, int, unsigned int))(v4 + 428))( v28, dword_10257A0, word_1025810, @@ -863,16 +863,16 @@ if ( !*v22 ) goto LABEL_57; do { -if ( *(_DWORD *)(*v22 + 44) > v9 ) +if ( *(DWORD *)(*v22 + 44) > v9 ) break; -v23 = *(_DWORD *)*v22; +v23 = *(DWORD *)*v22; *v22 = v23; } while ( v23 ); if ( *v22 ) { -if ( *(_DWORD *)(*v22 + 40) < v30 ) -v30 = *(_DWORD *)(*v22 + 40); +if ( *(DWORD *)(*v22 + 40) < v30 ) +v30 = *(DWORD *)(*v22 + 40); ++v21; ++v22; } @@ -891,10 +891,10 @@ v4 = hMem; } else { -v10 = (unsigned __int16)v10; -if ( (unsigned __int16)v10 + v9 >= v30 ) +v10 = (unsigned int)v10; +if ( (unsigned int)v10 + v9 >= v30 ) v10 = v30 - v9; -memset(v28, 0x80u, (unsigned __int16)v10); +memset(v28, 0x80u, (unsigned int)v10); v28 += v10; v9 += v10; v27 -= v10; @@ -904,8 +904,8 @@ v2 = pwh; LABEL_47: LOWORD(v10) = v27; } -v2[1].dwBufferLength = *(_DWORD *)(v4 + 412); -*(_DWORD *)(v4 + 412) += *(_DWORD *)(v4 + 396); +v2[1].dwBufferLength = *(DWORD *)(v4 + 412); +*(DWORD *)(v4 + 412) += *(DWORD *)(v4 + 396); if ( a2 ) { AddToPlayingQueue(v2); @@ -919,37 +919,37 @@ RemoveFromPlayingQueue(v2); } return 1; } -// 1025810: using guessed type __int16 word_1025810[]; +// 1025810: using guessed type int word_1025810[]; // 1027BE4: using guessed type int dword_1027BE4; //----- (0101DC8C) -------------------------------------------------------- -DWORD __stdcall FreePlayedBlocks() +DWORD FreePlayedBlocks() { DWORD result; // eax LPARAM v1; // esi signed int v2; // ebx -_DWORD *v3; // edi +DWORD *v3; // edi HWND v4; // eax signed int v5; // edi DWORD v6; // [esp+Ch] [ebp-8h] WPARAM wParam; // [esp+10h] [ebp-4h] -result = MyWaveOutGetPosition(*(HWAVEOUT *)(hMem + 12), *(_DWORD *)(hMem + 420)); +result = MyWaveOutGetPosition(*(HWAVEOUT *)(hMem + 12), *(DWORD *)(hMem + 420)); wParam = 0; v1 = hMem; v6 = result; v2 = 244; do { -v3 = *(_DWORD **)(v2 + v1); -if ( v3 && v3 != (_DWORD *)-1 ) +v3 = *(DWORD **)(v2 + v1); +if ( v3 && v3 != (DWORD *)-1 ) { do { result = v6; if ( v6 < v3[11] ) break; -*(_DWORD *)(v2 + v1) = *v3; +*(DWORD *)(v2 + v1) = *v3; v4 = *(HWND *)((char *)v3 + 18); if ( v4 ) { @@ -957,7 +957,7 @@ PostMessageA(v4, 0x3BDu, wParam, v3[8]); v1 = hMem; } result = (DWORD)FreeChannelNode(v3); -v3 = *(_DWORD **)(v2 + v1); +v3 = *(DWORD **)(v2 + v1); } while ( v3 ); } @@ -965,12 +965,12 @@ while ( v3 ); v2 += 4; } while ( v2 < 308 ); -if ( !*(_DWORD *)(v1 + 420) && !pwh ) +if ( !*(DWORD *)(v1 + 420) && !pwh ) { v5 = 244; do { -result = *(_DWORD *)(v5 + v1); +result = *(DWORD *)(v5 + v1); if ( result ) { if ( result != -1 ) @@ -987,7 +987,7 @@ return result; } //----- (0101DD5D) -------------------------------------------------------- -int __stdcall WaveMixPump() +int WaveMixPump() { int result; // eax LPWAVEHDR i; // esi @@ -1020,7 +1020,7 @@ return result; // 1025798: using guessed type int dword_1025798; //----- (0101DDAD) -------------------------------------------------------- -LRESULT __stdcall WndProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam) +LRESULT WndProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam) { if ( Msg != 957 && Msg != 1024 ) return DefWindowProcA(hWnd, Msg, wParam, lParam); @@ -1029,14 +1029,14 @@ return 0; } //----- (0101DDD8) -------------------------------------------------------- -signed int __stdcall NoResetRemix(int a1, int a2) +signed int NoResetRemix(int a1, int a2) { WaveMixPump(); return 1; } //----- (0101DDE8) -------------------------------------------------------- -signed int __stdcall ResetRemix(int a1, int a2) +signed int ResetRemix(int a1, int a2) { struct wavehdr_tag *v2; // eax struct wavehdr_tag *v3; // esi @@ -1050,7 +1050,7 @@ int v11; // [esp+10h] [ebp-4h] v10 = 0; v11 = 0; -*(_DWORD *)(hMem + 412) = a1; +*(DWORD *)(hMem + 412) = a1; DestroyPlayQueue(); SwapWaveBlocks(); while ( 1 ) @@ -1066,12 +1066,12 @@ break; } AddToPlayingQueue(v3); } -v4 = *(_DWORD *)(hMem + 412); +v4 = *(DWORD *)(hMem + 412); MyWaveOutReset(*(HWAVEOUT *)(hMem + 12)); v5 = hMem; -v6 = *(_DWORD *)(hMem + 404) == 0; -v7 = *(_DWORD *)(hMem + 404) < 0; -*(_DWORD *)(hMem + 412) = v4; +v6 = *(DWORD *)(hMem + 404) == 0; +v7 = *(DWORD *)(hMem + 404) < 0; +*(DWORD *)(hMem + 412) = v4; if ( !v7 && !v6 ) { waveOutPause(*(HWAVEOUT *)(v5 + 12)); @@ -1091,7 +1091,7 @@ RemoveFromPlayingQueue(i); v5 = hMem; if ( v10 ) { -if ( ++v11 >= *(_DWORD *)(hMem + 404) ) +if ( ++v11 >= *(DWORD *)(hMem + 404) ) { waveOutRestart(*(HWAVEOUT *)(hMem + 12)); v5 = hMem; @@ -1106,15 +1106,15 @@ return 1; // 1027BE4: using guessed type int dword_1027BE4; //----- (0101DF07) -------------------------------------------------------- -void __stdcall ResetWavePosIfNoChannelData() +void ResetWavePosIfNoChannelData() { signed int v0; // edx -_DWORD *v1; // eax +DWORD *v1; // eax if ( !pwh ) { v0 = 0; -v1 = (_DWORD *)(hMem + 244); +v1 = (DWORD *)(hMem + 244); while ( !*v1 || *v1 == -1 ) { ++v0; @@ -1129,36 +1129,36 @@ return; } //----- (0101DF3D) -------------------------------------------------------- -signed int __stdcall WaveMixPlay(int a1) +signed int WaveMixPlay(int a1) { -_WORD *v1; // ebx +WORD *v1; // ebx const void *v2; // edi int v3; // eax signed int v4; // edx signed int v5; // ecx -_DWORD *v6; // eax +DWORD *v6; // eax bool v7; // zf int v8; // eax int v9; // edx int v10; // ecx int v11; // ecx int v12; // esi -_DWORD **v13; // ebx +DWORD **v13; // ebx LPARAM v14; // esi DWORD v15; // eax -_DWORD *v16; // eax -_DWORD *v17; // edi +DWORD *v16; // eax +DWORD *v17; // edi int v18; // ecx int v19; // eax -__int16 v20; // bx -_DWORD **v21; // ebx -_DWORD *i; // eax -_DWORD *v23; // ST24_4 +int v20; // bx +DWORD **v21; // ebx +DWORD *i; // eax +DWORD *v23; // ST24_4 DWORD v24; // eax -_DWORD *v25; // ecx -_DWORD *v26; // eax +DWORD *v25; // ecx +DWORD *v26; // eax DWORD v27; // eax -unsigned __int16 v28; // ax +unsigned int v28; // ax int v29; // ebx signed int v30; // edi struct wavehdr_tag *v31; // eax @@ -1181,7 +1181,7 @@ MessageBoxA(0, "NULL parameters pointer passed to WaveMixPlay!", "WavMix32", 0x3 v37 = 5; goto LABEL_97; } -v1 = SessionToGlobalDataPtr(*(_WORD **)(a1 + 2)); +v1 = SessionToGlobalDataPtr(*(WORD **)(a1 + 2)); hMem = (LPARAM)v1; if ( !v1 ) { @@ -1197,7 +1197,7 @@ MessageBoxA(0, v35, "WavMix32", 0x30u); goto LABEL_10; } v2 = *(const void **)(a1 + 10); -if ( !IsValidLPMIXWAVE(*(_DWORD *)(a1 + 10)) ) +if ( !IsValidLPMIXWAVE(*(DWORD *)(a1 + 10)) ) { if ( dword_1027BE4 ) MessageBoxA(0, "Invalid or NULL wave pointer passed to WaveMixPlay!", "WavMix32", 0x30u); @@ -1215,9 +1215,9 @@ MessageBoxA(0, aWavemixV23ByAn, "WavMix32", 0x30u); v37 = 8; goto LABEL_97; } -if ( *((_DWORD *)v1 + 4) ) +if ( *((DWORD *)v1 + 4) ) { -if ( !*((_DWORD *)v1 + 77) ) +if ( !*((DWORD *)v1 + 77) ) { if ( !dword_1027BE4 ) goto LABEL_10; @@ -1233,98 +1233,98 @@ do { if ( *(v6 - 17) != -1 ) { -if ( !*(_DWORD *)&v1[2 * v4 + 122] ) +if ( !*(DWORD *)&v1[2 * v4 + 122] ) break; -if ( v5 != v4 && *v6 < *(_DWORD *)&v1[2 * v4 + 156] ) +if ( v5 != v4 && *v6 < *(DWORD *)&v1[2 * v4 + 156] ) v4 = v5; } ++v5; ++v6; } while ( v5 < 16 ); -*(_DWORD *)(a1 + 6) = v4; +*(DWORD *)(a1 + 6) = v4; } else { -v4 = *(_DWORD *)(a1 + 6); +v4 = *(DWORD *)(a1 + 6); } -++*((_DWORD *)v1 + 94); -v7 = *(_DWORD *)&v1[2 * v4 + 122] == -1; -*(_DWORD *)&v1[2 * v4 + 156] = *((_DWORD *)v1 + 94); +++*((DWORD *)v1 + 94); +v7 = *(DWORD *)&v1[2 * v4 + 122] == -1; +*(DWORD *)&v1[2 * v4 + 156] = *((DWORD *)v1 + 94); if ( v7 ) goto LABEL_10; v8 = GetChannelNode(); if ( !v8 ) goto LABEL_97; qmemcpy((void *)(v8 + 4), (const void *)a1, 0x1Cu); -v10 = *(_DWORD *)(v8 + 14); -*(_DWORD *)(v8 + 32) = v10; -*(_DWORD *)(v8 + 36) = *(_DWORD *)(v10 + 20); -v11 = *(_DWORD *)(v10 + 16); -*(_DWORD *)(v8 + 48) = v11; -v12 = (unsigned __int16)v1[196]; -v13 = (_DWORD **)(v1 + 220); -*(_DWORD *)(v8 + 52) = *(_DWORD *)(v8 + 36) + v11 - v12; -*(_DWORD *)(v8 + 10) = v9; +v10 = *(DWORD *)(v8 + 14); +*(DWORD *)(v8 + 32) = v10; +*(DWORD *)(v8 + 36) = *(DWORD *)(v10 + 20); +v11 = *(DWORD *)(v10 + 16); +*(DWORD *)(v8 + 48) = v11; +v12 = (unsigned int)v1[196]; +v13 = (DWORD **)(v1 + 220); +*(DWORD *)(v8 + 52) = *(DWORD *)(v8 + 36) + v11 - v12; +*(DWORD *)(v8 + 10) = v9; if ( *v13 ) { -*(_DWORD *)v8 = **v13; +*(DWORD *)v8 = **v13; **v13 = v8; -*v13 = (_DWORD *)v8; +*v13 = (DWORD *)v8; } else { -*v13 = (_DWORD *)v8; -*(_DWORD *)v8 = v8; +*v13 = (DWORD *)v8; +*(DWORD *)v8 = v8; } if ( !(*(_BYTE *)(v8 + 22) & 8) ) { ResetWavePosIfNoChannelData(); v14 = hMem; -if ( *(signed int (__stdcall **)(int, int))(hMem + 432) == ResetRemix ) +if ( *(signed int (**)(int, int))(hMem + 432) == ResetRemix ) { -v15 = MyWaveOutGetPosition(*(HWAVEOUT *)(hMem + 12), *(_DWORD *)(hMem + 420)); +v15 = MyWaveOutGetPosition(*(HWAVEOUT *)(hMem + 12), *(DWORD *)(hMem + 420)); v14 = hMem; } else { -v15 = *(_DWORD *)(hMem + 412); +v15 = *(DWORD *)(hMem + 412); } v38 = v15; -if ( !*(_DWORD *)(v14 + 440) ) +if ( !*(DWORD *)(v14 + 440) ) goto LABEL_84; do { -v16 = *(_DWORD **)(v14 + 440); -v17 = (_DWORD *)*v16; -if ( (_DWORD *)*v16 == v16 ) -*(_DWORD *)(v14 + 440) = 0; +v16 = *(DWORD **)(v14 + 440); +v17 = (DWORD *)*v16; +if ( (DWORD *)*v16 == v16 ) +*(DWORD *)(v14 + 440) = 0; else *v16 = *v17; -v18 = *(_DWORD *)((char *)v17 + 22); -v19 = *(_DWORD *)((char *)v17 + 10); +v18 = *(DWORD *)((char *)v17 + 22); +v19 = *(DWORD *)((char *)v17 + 10); *v17 = 0; if ( v18 & 0x10 ) { -*((_WORD *)v17 + 28) = *((_WORD *)v17 + 14); -v20 = *((_WORD *)v17 + 15); +*((WORD *)v17 + 28) = *((WORD *)v17 + 14); +v20 = *((WORD *)v17 + 15); } else { -*((_WORD *)v17 + 28) = *(_WORD *)(v14 + 4 * v19 + 180); -v20 = *(_WORD *)(v14 + 4 * v19 + 182); +*((WORD *)v17 + 28) = *(WORD *)(v14 + 4 * v19 + 180); +v20 = *(WORD *)(v14 + 4 * v19 + 182); } -*((_WORD *)v17 + 29) = v20; -if ( *((_WORD *)v17 + 28) > 0xAu ) -*((_WORD *)v17 + 28) = 10; -if ( *((_WORD *)v17 + 29) > 0xAu ) -*((_WORD *)v17 + 29) = 10; +*((WORD *)v17 + 29) = v20; +if ( *((WORD *)v17 + 28) > 0xAu ) +*((WORD *)v17 + 28) = 10; +if ( *((WORD *)v17 + 29) > 0xAu ) +*((WORD *)v17 + 29) = 10; if ( v18 & 1 ) { -v21 = (_DWORD **)(v14 + 4 * v19 + 244); +v21 = (DWORD **)(v14 + 4 * v19 + 244); for ( i = *v21; i; i = v23 ) { -v23 = (_DWORD *)*i; +v23 = (DWORD *)*i; FreeChannelNode(i); } v7 = pwh == 0; @@ -1334,17 +1334,17 @@ v36 = 1; if ( *((_BYTE *)v17 + 22) & 4 ) v24 = v38; else -v24 = *(_DWORD *)(v14 + 412); +v24 = *(DWORD *)(v14 + 412); v17[10] = v24; } else { -v25 = (_DWORD *)(v14 + 4 * v19 + 244); -v26 = (_DWORD *)*v25; +v25 = (DWORD *)(v14 + 4 * v19 + 244); +v26 = (DWORD *)*v25; if ( *v25 ) { while ( *v26 ) -v26 = (_DWORD *)*v26; +v26 = (DWORD *)*v26; *v26 = v17; v27 = v26[11]; if ( *((_BYTE *)v17 + 22) & 4 ) @@ -1352,9 +1352,9 @@ if ( *((_BYTE *)v17 + 22) & 4 ) if ( v27 <= v38 ) v27 = v38; } -else if ( *(_DWORD *)(v14 + 412) > v27 ) +else if ( *(DWORD *)(v14 + 412) > v27 ) { -v27 = *(_DWORD *)(v14 + 412); +v27 = *(DWORD *)(v14 + 412); } } else @@ -1362,27 +1362,27 @@ else v27 = v38; *v25 = v17; if ( !(*((_BYTE *)v17 + 22) & 4) ) -v27 = *(_DWORD *)(v14 + 412); +v27 = *(DWORD *)(v14 + 412); } v17[10] = v27; -if ( *(_DWORD *)(v14 + 412) > v17[10] ) +if ( *(DWORD *)(v14 + 412) > v17[10] ) v36 = 1; } -v28 = *((_WORD *)v17 + 13); +v28 = *((WORD *)v17 + 13); if ( v28 == -1 ) v17[11] = -1; else -v17[11] = v17[10] + v17[9] * (v28 + 1) - *(unsigned __int16 *)(v14 + 392); +v17[11] = v17[10] + v17[9] * (v28 + 1) - *(unsigned int *)(v14 + 392); } -while ( *(_DWORD *)(v14 + 440) ); +while ( *(DWORD *)(v14 + 440) ); if ( !v36 ) goto LABEL_84; -if ( !(*(int (__stdcall **)(DWORD, _DWORD))(v14 + 432))(v38, 0) ) +if ( !(*(int (**)(DWORD, DWORD))(v14 + 432))(v38, 0) ) { v14 = hMem; LABEL_84: v29 = 0; -if ( pwh || *(_DWORD *)(v14 + 404) <= 0 ) +if ( pwh || *(DWORD *)(v14 + 404) <= 0 ) { v30 = 0; } @@ -1396,7 +1396,7 @@ for ( j = MixerPlay(v31, 1); j; j = MixerPlay(v33, 1) ) { if ( v30 ) { -if ( ++v29 >= *(_DWORD *)(hMem + 404) ) +if ( ++v29 >= *(DWORD *)(hMem + 404) ) { waveOutRestart(*(HWAVEOUT *)(hMem + 12)); v30 = 0; @@ -1424,15 +1424,15 @@ return v37; // 1027BF8: using guessed type int dword_1027BF8; //----- (0101E373) -------------------------------------------------------- -signed int __stdcall WaveMixFlushChannel(_WORD *a1, signed int a2, char a3) +signed int WaveMixFlushChannel(WORD *a1, signed int a2, char a3) { -_DWORD *v3; // ebx -_WORD *v4; // eax -_WORD *v5; // esi +DWORD *v3; // ebx +WORD *v4; // eax +WORD *v5; // esi signed int v6; // ecx int v7; // eax -_DWORD **v8; // edi -_DWORD *v9; // eax +DWORD **v8; // edi +DWORD *v9; // eax DWORD v10; // eax signed int v13; // [esp+8h] [ebp-4h] int v14; // [esp+14h] [ebp+8h] @@ -1453,18 +1453,18 @@ goto LABEL_9; v6 = a2; if ( a2 < 0 || a2 >= 16 ) return 11; -if ( *(_DWORD *)&v4[2 * a2 + 122] != -1 ) +if ( *(DWORD *)&v4[2 * a2 + 122] != -1 ) { v7 = a2 + 1; if ( !(__OFSUB__(a2, a2 + 1) ^ 1) ) return 0; LABEL_9: -v8 = (_DWORD **)&v5[2 * v6 + 122]; +v8 = (DWORD **)&v5[2 * v6 + 122]; v14 = v7 - v6; do { v9 = *v8; -if ( *v8 != (_DWORD *)-1 ) +if ( *v8 != (DWORD *)-1 ) { *v8 = v3; if ( v9 != v3 ) @@ -1472,7 +1472,7 @@ if ( v9 != v3 ) v13 = 1; do { -v3 = (_DWORD *)*v9; +v3 = (DWORD *)*v9; FreeChannelNode(v9); v9 = v3; } @@ -1483,10 +1483,10 @@ while ( v3 ); --v14; } while ( v14 ); -if ( (_DWORD *)v13 != v3 && !(a3 & 2) && *((_DWORD **)v5 + 4) != v3 ) +if ( (DWORD *)v13 != v3 && !(a3 & 2) && *((DWORD **)v5 + 4) != v3 ) { -v10 = MyWaveOutGetPosition(*((HWAVEOUT *)v5 + 3), *((_DWORD *)v5 + 105)); -(*((void (__stdcall **)(DWORD, _DWORD *))v5 + 108))(v10, v3); +v10 = MyWaveOutGetPosition(*((HWAVEOUT *)v5 + 3), *((DWORD *)v5 + 105)); +(*((void (**)(DWORD, DWORD *))v5 + 108))(v10, v3); } return 0; } @@ -1495,13 +1495,13 @@ return 5; } //----- (0101E434) -------------------------------------------------------- -signed int __stdcall WaveMixCloseChannel(_WORD *a1, signed int a2, char a3) +signed int WaveMixCloseChannel(WORD *a1, signed int a2, char a3) { signed int result; // eax signed int v4; // esi int v5; // ecx LPARAM v6; // eax -_DWORD *v7; // edx +DWORD *v7; // edx int v8; // ecx hMem = (LPARAM)SessionToGlobalDataPtr(a1); @@ -1523,14 +1523,14 @@ if ( !(__OFSUB__(a2, a2 + 1) ^ 1) ) return 0; } v6 = hMem; -v7 = (_DWORD *)(hMem + 4 * v4 + 244); +v7 = (DWORD *)(hMem + 4 * v4 + 244); v8 = v5 - v4; do { if ( *v7 != -1 ) { *v7 = -1; ---*(_DWORD *)(v6 + 308); +--*(DWORD *)(v6 + 308); } ++v7; --v8; @@ -1542,31 +1542,31 @@ return result; } //----- (0101E4A9) -------------------------------------------------------- -int __stdcall WaveMixFreeWave(int a1, LPCVOID pMem) +int WaveMixFreeWave(int a1, LPCVOID pMem) { -_WORD *v2; // ebx +WORD *v2; // ebx LPCVOID *v4; // edi -_DWORD **v5; // ebx -_DWORD *v6; // esi +DWORD **v5; // ebx +DWORD *v6; // esi HGLOBAL v7; // eax HGLOBAL v8; // eax HGLOBAL v9; // eax HGLOBAL v10; // eax -_DWORD *v11; // [esp+Ch] [ebp+8h] +DWORD *v11; // [esp+Ch] [ebp+8h] char *pMema; // [esp+10h] [ebp+Ch] -v2 = SessionToGlobalDataPtr((_WORD *)a1); +v2 = SessionToGlobalDataPtr((WORD *)a1); if ( !v2 ) return 5; v4 = (LPCVOID *)pMem; if ( !IsValidLPMIXWAVE((int)pMem) ) return 5; -v5 = (_DWORD **)(v2 + 122); +v5 = (DWORD **)(v2 + 122); pMema = (char *)16; do { v6 = *v5; -if ( *v5 != (_DWORD *)-1 ) +if ( *v5 != (DWORD *)-1 ) { v11 = 0; while ( v6 ) @@ -1577,11 +1577,11 @@ if ( v11 ) { *v11 = *v6; FreeChannelNode(v6); -v6 = (_DWORD *)*v11; +v6 = (DWORD *)*v11; } else { -v6 = (_DWORD *)*v6; +v6 = (DWORD *)*v6; FreeChannelNode(*v5); *v5 = v6; } @@ -1589,7 +1589,7 @@ FreeChannelNode(*v5); else { v11 = v6; -v6 = (_DWORD *)*v6; +v6 = (DWORD *)*v6; } } } @@ -1604,7 +1604,7 @@ GlobalUnlock(v7); v8 = GlobalHandle(v4[4]); GlobalFree(v8); } -*((_WORD *)v4 + 32) = 0; +*((WORD *)v4 + 32) = 0; v9 = GlobalHandle(v4); GlobalUnlock(v9); v10 = GlobalHandle(v4); @@ -1613,37 +1613,37 @@ return 0; } //----- (0101E579) -------------------------------------------------------- -_WORD *__userpurge BitsPerSampleAlign@(int a1@, LPCVOID pMem, int a3, __int16 a4, int a5) +WORD *BitsPerSampleAlign(int a1, LPCVOID pMem, int a3, int a4, int a5) { -_WORD *v6; // edi +WORD *v6; // edi int v7; // edi unsigned int v8; // esi SIZE_T v9; // eax HGLOBAL v10; // eax -_WORD *v11; // eax -_WORD *v12; // ecx -_WORD *v13; // ebx +WORD *v11; // eax +WORD *v12; // ecx +WORD *v13; // ebx _BYTE *v14; // edi char *i; // edx HGLOBAL v16; // eax HGLOBAL v17; // eax int v18; // [esp+Ch] [ebp+Ch] -if ( (_WORD)a3 == a4 ) +if ( (WORD)a3 == a4 ) return pMem; -if ( ((_WORD)a3 == 8 || (_WORD)a3 == 16) && (a4 == 8 || a4 == 16) ) +if ( ((WORD)a3 == 8 || (WORD)a3 == 16) && (a4 == 8 || a4 == 16) ) { -LOWORD(a1) = (unsigned __int16)a3 >> 3; +LOWORD(a1) = (unsigned int)a3 >> 3; v7 = a1; -v8 = *(_DWORD *)a5 / (unsigned int)((unsigned __int16)a3 >> 3); -v9 = v8 * ((unsigned __int16)a4 >> 3); -*(_DWORD *)a5 = v9; +v8 = *(DWORD *)a5 / (unsigned int)((unsigned int)a3 >> 3); +v9 = v8 * ((unsigned int)a4 >> 3); +*(DWORD *)a5 = v9; v10 = GlobalAlloc(0x2002u, v9); v11 = GlobalLock(v10); v12 = v11; if ( v11 ) { -if ( (unsigned __int16)v7 <= (unsigned __int16)((unsigned __int16)a4 >> 3) ) +if ( (unsigned int)v7 <= (unsigned int)((unsigned int)a4 >> 3) ) { for ( i = (char *)pMem; v8; --v8 ) { @@ -1696,7 +1696,7 @@ return v6; // 1027BE4: using guessed type int dword_1027BE4; //----- (0101E686) -------------------------------------------------------- -_BYTE *__stdcall ChannelAlign(LPCVOID pMem, __int16 a2, __int16 a3, __int16 a4, int a5) +_BYTE *ChannelAlign(LPCVOID pMem, int a2, int a3, int a4, int a5) { unsigned int v6; // edi SIZE_T v7; // eax @@ -1705,23 +1705,23 @@ _BYTE *v9; // eax _BYTE *v10; // ebx unsigned __int8 *v11; // ecx _BYTE *v12; // eax -_WORD *v13; // eax -_WORD *v14; // esi +WORD *v13; // eax +WORD *v14; // esi HGLOBAL v15; // eax HGLOBAL v16; // eax if ( a2 == a3 ) return pMem; -v6 = *(_DWORD *)a5 / (unsigned int)(unsigned __int16)a4 / (unsigned __int16)a2; -v7 = v6 * (unsigned __int16)a4 * (unsigned __int16)a3; -*(_DWORD *)a5 = v7; +v6 = *(DWORD *)a5 / (unsigned int)(unsigned int)a4 / (unsigned int)a2; +v7 = v6 * (unsigned int)a4 * (unsigned int)a3; +*(DWORD *)a5 = v7; v8 = GlobalAlloc(0x2002u, v7); v9 = GlobalLock(v8); v10 = v9; if ( v9 ) { v11 = (unsigned __int8 *)pMem; -if ( (unsigned __int16)a2 >= (unsigned __int16)a3 ) +if ( (unsigned int)a2 >= (unsigned int)a3 ) { v14 = v9; if ( a4 == 1 ) @@ -1729,7 +1729,7 @@ if ( a4 == 1 ) for ( ; v6; --v6 ) { *(_BYTE *)v14 = (*v11 + v11[1]) / 2; -v14 = (_WORD *)((char *)v14 + 1); +v14 = (WORD *)((char *)v14 + 1); v11 += 2; } } @@ -1737,7 +1737,7 @@ else { for ( ; v6; --v6 ) { -*v14 = (*(signed __int16 *)v11 + *((signed __int16 *)v11 + 1)) / 2; +*v14 = (*(signed int *)v11 + *((signed int *)v11 + 1)) / 2; ++v14; v11 += 4; } @@ -1758,9 +1758,9 @@ else { for ( ; v6; --v6 ) { -*(_WORD *)v9 = *(_WORD *)v11; +*(WORD *)v9 = *(WORD *)v11; v13 = v9 + 2; -*v13 = *(_WORD *)v11; +*v13 = *(WORD *)v11; v9 = v13 + 1; v11 += 2; } @@ -1785,7 +1785,7 @@ return v10; // 1027BE4: using guessed type int dword_1027BE4; //----- (0101E7B0) -------------------------------------------------------- -void __stdcall AvgSample(_WORD *a1, unsigned __int8 *a2, int a3, int a4, int a5) +void AvgSample(WORD *a1, unsigned __int8 *a2, int a3, int a4, int a5) { int v5; // edi _BYTE *v6; // esi @@ -1794,8 +1794,8 @@ int v8; // eax int v9; // edx int v10; // ebx int v11; // edx -signed __int16 *v12; // edi -signed __int16 *v13; // ecx +signed int *v12; // edi +signed int *v13; // ecx int v14; // eax int v15; // esi int v16; // edx @@ -1833,7 +1833,7 @@ while ( v5 ); else { v11 = a5; -v12 = (signed __int16 *)a2; +v12 = (signed int *)a2; if ( a5 > 0 ) { v18 = a5; @@ -1849,7 +1849,7 @@ v16 = 2 * v11; do { v14 += *v13; -v13 = (signed __int16 *)((char *)v13 + v16); +v13 = (signed int *)((char *)v13 + v16); --v15; } while ( v15 ); @@ -1865,7 +1865,7 @@ v11 = a5; } //----- (0101E83A) -------------------------------------------------------- -int __stdcall RepSample(_BYTE *a1, unsigned __int8 *a2, signed int a3, int a4, int a5) +int RepSample(_BYTE *a1, unsigned __int8 *a2, signed int a3, int a4, int a5) { int v5; // ebx int result; // eax @@ -1875,12 +1875,12 @@ _BYTE *v9; // esi _BYTE *v10; // esi int v11; // edx int v12; // ebx -_WORD *v13; // esi -_WORD *v14; // edi +WORD *v13; // esi +WORD *v14; // edi int v15; // ecx int v16; // edx int v17; // [esp+14h] [ebp+8h] -_WORD *v18; // [esp+18h] [ebp+Ch] +WORD *v18; // [esp+18h] [ebp+Ch] unsigned __int8 *v19; // [esp+20h] [ebp+14h] if ( a4 == 1 ) @@ -1927,12 +1927,12 @@ v17 = a5; do { v13 = v18; -LOWORD(v15) = *(_WORD *)v19; +LOWORD(v15) = *(WORD *)v19; ++v18; v14 = &v13[v12]; -result = ((signed __int16)v13[v12] - *(signed __int16 *)v19) / a3; -*v13 = *(_WORD *)v19; -v15 = (signed __int16)v15; +result = ((signed int)v13[v12] - *(signed int *)v19) / a3; +*v13 = *(WORD *)v19; +v15 = (signed int)v15; if ( a3 > 1 ) { v16 = a3 - 1; @@ -1940,7 +1940,7 @@ do { v15 += result; *v14 = v15; -v14 = (_WORD *)((char *)v14 + v12 * 2); +v14 = (WORD *)((char *)v14 + v12 * 2); --v16; } while ( v16 ); @@ -1955,10 +1955,10 @@ return result; } //----- (0101E8F5) -------------------------------------------------------- -LPCVOID __stdcall SamplesPerSecAlign(LPCVOID pMem, int a2, int a3, __int16 a4, __int16 a5, int a6) +LPCVOID SamplesPerSecAlign(LPCVOID pMem, int a2, int a3, int a4, int a5, int a6) { LPCVOID result; // eax -_DWORD *v7; // ecx +DWORD *v7; // ecx int v8; // edi unsigned int v9; // eax int v10; // esi @@ -1983,9 +1983,9 @@ unsigned int v28; // [esp+2Ch] [ebp+1Ch] if ( a2 == a3 ) return pMem; -v7 = (_DWORD *)a6; -v8 = (unsigned __int16)a4 * (unsigned __int16)a5; -v28 = *(_DWORD *)a6 / (unsigned int)v8; +v7 = (DWORD *)a6; +v8 = (unsigned int)a4 * (unsigned int)a5; +v28 = *(DWORD *)a6 / (unsigned int)v8; if ( a3 <= (unsigned int)a2 ) { v11 = a2 / (unsigned int)a3; @@ -2014,7 +2014,7 @@ if ( v10 != 1 ) v25 = v10 - 1; do { -AvgSample(v13, (unsigned __int8 *)pMem, v26, (unsigned __int16)a4, (unsigned __int16)a5); +AvgSample(v13, (unsigned __int8 *)pMem, v26, (unsigned int)a4, (unsigned int)a5); pMem = (char *)pMem + v8 * v26; v13 += v8; --v25; @@ -2039,7 +2039,7 @@ if ( v28 != 1 ) v27 = v28 - 1; do { -RepSample(v13, (unsigned __int8 *)pMem, v24, (unsigned __int16)a4, (unsigned __int16)a5); +RepSample(v13, (unsigned __int8 *)pMem, v24, (unsigned int)a4, (unsigned int)a5); pMem = (char *)pMem + v8; v13 += v8 * v24; --v27; @@ -2054,7 +2054,7 @@ do v17 = pMem; if ( v8 > 0 ) { -v18 = (unsigned __int16)a4 * (unsigned __int16)a5; +v18 = (unsigned int)a4 * (unsigned int)a5; do { *v13++ = *v17++; @@ -2092,26 +2092,26 @@ return result; // 1027BE4: using guessed type int dword_1027BE4; //----- (0101EA82) -------------------------------------------------------- -LPCVOID __stdcall WaveFormatConvert(int a1, int a2, LPCVOID pMem, int a4) +LPCVOID WaveFormatConvert(int a1, int a2, LPCVOID pMem, int a4) { LPCVOID result; // eax -_WORD *v5; // eax +WORD *v5; // eax _BYTE *v6; // eax -if ( *(_WORD *)(a2 + 2) == *(_WORD *)(a1 + 2) -&& *(_DWORD *)(a2 + 4) == *(_DWORD *)(a1 + 4) -&& *(_WORD *)(a2 + 14) == *(_WORD *)(a1 + 14) ) +if ( *(WORD *)(a2 + 2) == *(WORD *)(a1 + 2) +&& *(DWORD *)(a2 + 4) == *(DWORD *)(a1 + 4) +&& *(WORD *)(a2 + 14) == *(WORD *)(a1 + 14) ) { return pMem; } -v5 = BitsPerSampleAlign(*(unsigned __int16 *)(a2 + 14), pMem, *(unsigned __int16 *)(a2 + 14), *(_WORD *)(a1 + 14), a4); -if ( v5 && (v6 = ChannelAlign(v5, *(_WORD *)(a2 + 2), *(_WORD *)(a1 + 2), *(_WORD *)(a1 + 14) >> 3, a4)) != 0 ) +v5 = BitsPerSampleAlign(*(unsigned int *)(a2 + 14), pMem, *(unsigned int *)(a2 + 14), *(WORD *)(a1 + 14), a4); +if ( v5 && (v6 = ChannelAlign(v5, *(WORD *)(a2 + 2), *(WORD *)(a1 + 2), *(WORD *)(a1 + 14) >> 3, a4)) != 0 ) result = SamplesPerSecAlign( v6, -*(_DWORD *)(a2 + 4), -*(_DWORD *)(a1 + 4), -*(_WORD *)(a1 + 14) >> 3, -*(_WORD *)(a1 + 2), +*(DWORD *)(a2 + 4), +*(DWORD *)(a1 + 4), +*(WORD *)(a1 + 14) >> 3, +*(WORD *)(a1 + 2), a4); else result = 0; @@ -2119,9 +2119,9 @@ return result; } //----- (0101EB23) -------------------------------------------------------- -CHAR *__stdcall WaveMixOpenWave(LPCVOID pMem, LPCSTR lpName, HMODULE hModule, LONG cch) +CHAR *WaveMixOpenWave(LPCVOID pMem, LPCSTR lpName, HMODULE hModule, LONG cch) { -_WORD *v4; // eax +WORD *v4; // eax WORD v5; // cx HGLOBAL v7; // eax CHAR *v8; // edi @@ -2155,8 +2155,8 @@ v30 = 0; v4 = SessionToGlobalDataPtr(pMem); pwfx.wFormatTag = v4[190]; pwfx.nChannels = v4[191]; -pwfx.nSamplesPerSec = *((_DWORD *)v4 + 96); -pwfx.nAvgBytesPerSec = *((_DWORD *)v4 + 97); +pwfx.nSamplesPerSec = *((DWORD *)v4 + 96); +pwfx.nAvgBytesPerSec = *((DWORD *)v4 + 97); v5 = v4[196]; hMem = (LPARAM)v4; pwfx.nBlockAlign = v5; @@ -2189,7 +2189,7 @@ if ( !v9 || (hResData = LoadResource(hModule, v9)) == 0 ) if ( HIWORD(lpName) ) _wsprintfA(aWavemixV23ByAn, "Failed to open 'WAVE' resource '%s'.", lpName); else -_wsprintfA(aWavemixV23ByAn, "Failed to open 'WAVE' resource %u.", (unsigned __int16)lpName); +_wsprintfA(aWavemixV23ByAn, "Failed to open 'WAVE' resource %u.", (unsigned int)lpName); if ( dword_1027BE4 ) MessageBoxA(0, aWavemixV23ByAn, "WavMix32", 0x30u); goto LABEL_31; @@ -2283,7 +2283,7 @@ if ( dword_1027BE4 ) MessageBoxA(0, "Failed to read format chunk.", "WavMix32", 0x30u); goto LABEL_29; } -if ( *(_WORD *)v8 != 1 ) +if ( *(WORD *)v8 != 1 ) { if ( dword_1027BE4 ) MessageBoxA(0, "The file is not a PCM file.", "WavMix32", 0x30u); @@ -2336,13 +2336,13 @@ goto LABEL_29; mmioClose(hModulea, 0); if ( hResData ) FreeResource(hResData); -*((_DWORD *)v8 + 5) = cch; +*((DWORD *)v8 + 5) = cch; v20 = (const void *)(hMem + 380); -*((_DWORD *)v8 + 4) = v19; -*((_DWORD *)v8 + 8) = 0; -*((_DWORD *)v8 + 9) = 0; -*((_DWORD *)v8 + 7) = 0; -*((_WORD *)v8 + 32) = 21554; +*((DWORD *)v8 + 4) = v19; +*((DWORD *)v8 + 8) = 0; +*((DWORD *)v8 + 9) = 0; +*((DWORD *)v8 + 7) = 0; +*((WORD *)v8 + 32) = 21554; _memmove(v8, v20, 0x10u); if ( HIWORD(lpName) ) { @@ -2355,21 +2355,21 @@ lstrcpyA(v8 + 48, &lpName[v22]); } else { -_wsprintfA(v8 + 48, "res#%u", (unsigned __int16)lpName); +_wsprintfA(v8 + 48, "res#%u", (unsigned int)lpName); } return v8; } // 1027BE4: using guessed type int dword_1027BE4; //----- (0101F093) -------------------------------------------------------- -unsigned int __stdcall FigureOutDMABufferSize(unsigned int a1, int a2) +unsigned int FigureOutDMABufferSize(unsigned int a1, int a2) { unsigned int result; // eax signed int v3; // ecx result = a1; if ( !a1 ) -result = *(_DWORD *)(a2 + 4) * *(unsigned __int16 *)(a2 + 2) * ((unsigned int)*(unsigned __int16 *)(a2 + 14) >> 3) >> 4; +result = *(DWORD *)(a2 + 4) * *(unsigned int *)(a2 + 2) * ((unsigned int)*(unsigned int *)(a2 + 14) >> 3) >> 4; v3 = 344; if ( result < 0x158 || (v3 = 11025, result > 0x2B11) ) result = v3; @@ -2377,7 +2377,7 @@ return result; } //----- (0101F0D4) -------------------------------------------------------- -int __stdcall RemoveInvalidIniNameCharacters(LPCSTR lpString) +int RemoveInvalidIniNameCharacters(LPCSTR lpString) { CHAR *v1; // esi @@ -2398,7 +2398,7 @@ return lstrlenA(lpString); } //----- (0101F13D) -------------------------------------------------------- -UINT __stdcall ShowWaveOutDevices() +UINT ShowWaveOutDevices() { UINT result; // eax signed int v1; // [esp+0h] [ebp-40h] @@ -2431,7 +2431,7 @@ return result; } //----- (0101F20F) -------------------------------------------------------- -const char *__stdcall GetOperatingSystemPrefix() +const char *GetOperatingSystemPrefix() { const char *result; // eax bool v1; // cf @@ -2446,7 +2446,7 @@ return result; } //----- (0101F25C) -------------------------------------------------------- -int __stdcall ReadRegistryToGetMachineSpecificInfSection(int a1, LPSTR lpString1, int a3) +int ReadRegistryToGetMachineSpecificInfSection(int a1, LPSTR lpString1, int a3) { const char *v3; // eax int v4; // esi @@ -2474,7 +2474,7 @@ return v8; } //----- (0101F315) -------------------------------------------------------- -int __stdcall ReadRegistryInt(HKEY hKey, LPCSTR lpSubKey, int a3) +int ReadRegistryInt(HKEY hKey, LPCSTR lpSubKey, int a3) { int result; // eax LONG cbData; // [esp+0h] [ebp-14h] @@ -2488,7 +2488,7 @@ return result; } //----- (0101F36B) -------------------------------------------------------- -signed int __stdcall ReadRegistryForAppSpecificConfigs(int a1) +signed int ReadRegistryForAppSpecificConfigs(int a1) { int v1; // ebx int v3; // eax @@ -2498,69 +2498,69 @@ UINT_PTR v6; // ST00_4 HKEY phkResult; // [esp+8h] [ebp-3Ch] CHAR SubKey; // [esp+Ch] [ebp-38h] -v1 = *(_DWORD *)(a1 + 2); -if ( !(v1 & 0x400) || !*(_DWORD *)(a1 + 26) ) +v1 = *(DWORD *)(a1 + 2); +if ( !(v1 & 0x400) || !*(DWORD *)(a1 + 26) ) return 0; if ( (v1 & 0x80u) == 0 ) { -*(_WORD *)(a1 + 20) = *(_WORD *)(hMem + 24); +*(WORD *)(a1 + 20) = *(WORD *)(hMem + 24); } -else if ( *(unsigned __int16 *)(a1 + 20) >= waveOutGetNumDevs() ) +else if ( *(unsigned int *)(a1 + 20) >= waveOutGetNumDevs() ) { -*(_WORD *)(a1 + 20) = 0; +*(WORD *)(a1 + 20) = 0; } -_wsprintfA(&SubKey, "WaveMix\\Device%u", *(unsigned __int16 *)(a1 + 20)); +_wsprintfA(&SubKey, "WaveMix\\Device%u", *(unsigned int *)(a1 + 20)); if ( RegOpenKeyA(*(HKEY *)(a1 + 26), &SubKey, &phkResult) ) return 0; if ( !(v1 & 1) ) -*(_WORD *)(a1 + 6) = ReadRegistryInt(phkResult, "Channels", 1); +*(WORD *)(a1 + 6) = ReadRegistryInt(phkResult, "Channels", 1); if ( !(v1 & 2) ) -*(_WORD *)(a1 + 8) = ReadRegistryInt(phkResult, "SamplesPerSec", 11); +*(WORD *)(a1 + 8) = ReadRegistryInt(phkResult, "SamplesPerSec", 11); if ( !(v1 & 4) ) -*(_WORD *)(a1 + 10) = ReadRegistryInt(phkResult, "WaveBlocks", 3); +*(WORD *)(a1 + 10) = ReadRegistryInt(phkResult, "WaveBlocks", 3); if ( !(v1 & 8) ) -*(_WORD *)(a1 + 12) = ReadRegistryInt(phkResult, "WaveBlockLen", 0); -*(_WORD *)(a1 + 14) = 1; +*(WORD *)(a1 + 12) = ReadRegistryInt(phkResult, "WaveBlockLen", 0); +*(WORD *)(a1 + 14) = 1; if ( !(v1 & 0x20) ) -*(_WORD *)(a1 + 16) = (unsigned __int16)ReadRegistryInt(phkResult, "Remix", 1) != 2; +*(WORD *)(a1 + 16) = (unsigned int)ReadRegistryInt(phkResult, "Remix", 1) != 2; if ( !(v1 & 0x40) ) { -v3 = DefaultGoodWavePos(*(unsigned __int16 *)(a1 + 20)); -*(_WORD *)(a1 + 18) = (unsigned __int16)ReadRegistryInt(phkResult, "GoodWavePos", v3) != 0; +v3 = DefaultGoodWavePos(*(unsigned int *)(a1 + 20)); +*(WORD *)(a1 + 18) = (unsigned int)ReadRegistryInt(phkResult, "GoodWavePos", v3) != 0; } if ( !(v1 & 0x100) ) -*(_WORD *)(a1 + 24) = ReadRegistryInt(phkResult, "ShowDebugDialogs", 0); +*(WORD *)(a1 + 24) = ReadRegistryInt(phkResult, "ShowDebugDialogs", 0); if ( !(v1 & 0x200) ) { -v4 = DefaultPauseBlocks(*(unsigned __int16 *)(a1 + 10)); -*(_WORD *)(a1 + 22) = ReadRegistryInt(phkResult, "PauseBlocks", v4); +v4 = DefaultPauseBlocks(*(unsigned int *)(a1 + 10)); +*(WORD *)(a1 + 22) = ReadRegistryInt(phkResult, "PauseBlocks", v4); } v5 = (struct tagWAVEOUTCAPSA *)(hMem + 124); -v6 = *(unsigned __int16 *)(a1 + 20); -*(_DWORD *)(a1 + 2) = 1023; +v6 = *(unsigned int *)(a1 + 20); +*(DWORD *)(a1 + 2) = 1023; waveOutGetDevCapsA(v6, v5, 0x34u); RegCloseKey(phkResult); return 1; } //----- (0101F50B) -------------------------------------------------------- -int __stdcall ShowCurrentSettings() +int ShowCurrentSettings() { const char *v0; // esi const char *v1; // edx const char *v2; // ecx struct tagWAVEOUTCAPSA pwoc; // [esp+0h] [ebp-38h] -if ( waveOutGetDevCapsA(*(_DWORD *)(hMem + 24), &pwoc, 0x34u) || !RemoveInvalidIniNameCharacters(pwoc.szPname) ) +if ( waveOutGetDevCapsA(*(DWORD *)(hMem + 24), &pwoc, 0x34u) || !RemoveInvalidIniNameCharacters(pwoc.szPname) ) lstrcpyA(pwoc.szPname, "Unknown Device"); v0 = "cmixit"; -if ( *(__int16 (__stdcall **)(_BYTE *, char *, char *, int, unsigned __int16))(hMem + 428) != cmixit ) +if ( *(int (**)(_BYTE *, char *, char *, int, unsigned int))(hMem + 428) != cmixit ) v0 = "386 mixit"; v1 = "TRUE"; -if ( !*(_DWORD *)(hMem + 420) ) +if ( !*(DWORD *)(hMem + 420) ) v1 = "FALSE"; v2 = "Reset"; -if ( *(signed int (__stdcall **)(int, int))(hMem + 432) != ResetRemix ) +if ( *(signed int (**)(int, int))(hMem + 432) != ResetRemix ) v2 = "NoReset"; _wsprintfA( aWavemixV23ByAn, @@ -2576,17 +2576,17 @@ aWavemixV23ByAn, pwoc.szPname, v2, v1, -*(_DWORD *)(hMem + 400), -*(_DWORD *)(hMem + 396), +*(DWORD *)(hMem + 400), +*(DWORD *)(hMem + 396), v0, -*(_DWORD *)(hMem + 384), -*(unsigned __int16 *)(hMem + 382), -*(_DWORD *)(hMem + 404)); +*(DWORD *)(hMem + 384), +*(unsigned int *)(hMem + 382), +*(DWORD *)(hMem + 404)); return MessageBoxA(0, aWavemixV23ByAn, "WavMix32", 0x40u); } //----- (0101F5F1) -------------------------------------------------------- -int __stdcall Settings_OnInitDialog(HWND hWnd, int a2, int a3) +int Settings_OnInitDialog(HWND hWnd, int a2, int a3) { BOOL v3; // ST0C_4 HWND v4; // eax @@ -2628,19 +2628,19 @@ GetWindowTextA(hWnd, &String, 256); _wsprintfA(aWavemixV23ByAn, &String, 2, 81); SetWindowTextA(hWnd, aWavemixV23ByAn); SetWindowLongA(hWnd, -21, a3); -v3 = *(_WORD *)(a3 + 6) > 1u; +v3 = *(WORD *)(a3 + 6) > 1u; v4 = GetDlgItem(hWnd, 1000); SendMessageA(v4, 0xF1u, v3, 0); -v5 = *(_WORD *)(a3 + 16) != 0; +v5 = *(WORD *)(a3 + 16) != 0; v6 = GetDlgItem(hWnd, 1001); SendMessageA(v6, 0xF1u, v5, 0); -v7 = *(_WORD *)(a3 + 18) != 0; +v7 = *(WORD *)(a3 + 18) != 0; v8 = GetDlgItem(hWnd, 1004); SendMessageA(v8, 0xF1u, v7, 0); -v9 = *(_WORD *)(a3 + 14) != 0; +v9 = *(WORD *)(a3 + 14) != 0; v10 = GetDlgItem(hWnd, 1005); SendMessageA(v10, 0xF1u, v9, 0); -v11 = *(_WORD *)(a3 + 24) != 0; +v11 = *(WORD *)(a3 + 24) != 0; v12 = GetDlgItem(hWnd, 1010); SendMessageA(v12, 0xF1u, v11, 0); v13 = GetDlgItem(hWnd, 1005); @@ -2673,16 +2673,16 @@ GetWindowTextA(v24, &String, 100); _wsprintfA(aWavemixV23ByAn, &String, 16); v25 = GetDlgItem(hWnd, 1015); SetWindowTextA(v25, aWavemixV23ByAn); -_wsprintfA(aWavemixV23ByAn, "%d", *(unsigned __int16 *)(a3 + 10)); +_wsprintfA(aWavemixV23ByAn, "%d", *(unsigned int *)(a3 + 10)); v26 = GetDlgItem(hWnd, 1003); SetWindowTextA(v26, aWavemixV23ByAn); -_wsprintfA(aWavemixV23ByAn, "%d", *(unsigned __int16 *)(a3 + 12)); +_wsprintfA(aWavemixV23ByAn, "%d", *(unsigned int *)(a3 + 12)); v27 = GetDlgItem(hWnd, 1007); SetWindowTextA(v27, aWavemixV23ByAn); -_wsprintfA(aWavemixV23ByAn, "%d", *(unsigned __int16 *)(a3 + 8)); +_wsprintfA(aWavemixV23ByAn, "%d", *(unsigned int *)(a3 + 8)); v28 = GetDlgItem(hWnd, 1008); SetWindowTextA(v28, aWavemixV23ByAn); -_wsprintfA(aWavemixV23ByAn, "%d", *(unsigned __int16 *)(a3 + 22)); +_wsprintfA(aWavemixV23ByAn, "%d", *(unsigned int *)(a3 + 22)); v29 = GetDlgItem(hWnd, 1011); SetWindowTextA(v29, aWavemixV23ByAn); uDeviceID = 0; @@ -2707,16 +2707,16 @@ SendMessageA(v31, 0x143u, 0, (LPARAM)aWavemixV23ByAn); } while ( uDeviceID < v35 ); } -v32 = *(unsigned __int16 *)(a3 + 20); +v32 = *(unsigned int *)(a3 + 20); v33 = GetDlgItem(hWnd, 1009); SendMessageA(v33, 0x14Eu, v32, 0); return 1; } //----- (0101FA63) -------------------------------------------------------- -int __stdcall Settings_OnCommand(HWND hWnd, int a2, int a3, int a4) +int Settings_OnCommand(HWND hWnd, int a2, int a3, int a4) { -_WORD *v4; // ebx +WORD *v4; // ebx HWND v6; // eax HWND v7; // eax HWND v8; // eax @@ -2727,9 +2727,9 @@ HWND v12; // eax HWND v13; // eax HWND v14; // eax HWND v15; // eax -__int16 v16; // ax +int v16; // ax -v4 = (_WORD *)GetWindowLongA(hWnd, -21); +v4 = (WORD *)GetWindowLongA(hWnd, -21); if ( a2 == 1 ) { if ( v4 ) @@ -2776,45 +2776,45 @@ return 1; } //----- (0101FC24) -------------------------------------------------------- -BOOL __stdcall SettingsDlgProc(HWND hWnd, UINT a2, WPARAM a3, LPARAM a4) +BOOL SettingsDlgProc(HWND hWnd, UINT a2, WPARAM a3, LPARAM a4) { if ( a2 == 272 ) return Settings_OnInitDialog(hWnd, a3, a4); if ( a2 != 273 ) return 0; -Settings_OnCommand(hWnd, (unsigned __int16)a3, a4, a3 >> 16); +Settings_OnCommand(hWnd, (unsigned int)a3, a4, a3 >> 16); return 1; } //----- (0101FC6D) -------------------------------------------------------- -_DWORD *__stdcall MakeDlgTemplate(int a1, int a2, __int16 a3, __int16 a4, __int16 a5, __int16 a6, wchar_t *Str) +DWORD *MakeDlgTemplate(int a1, int a2, int a3, int a4, int a5, int a6, wchar_t *Str) { size_t v7; // eax HGLOBAL v8; // eax -_DWORD *v9; // ebx +DWORD *v9; // ebx v7 = 2 * _wcslen(Str) + 24; -*(_DWORD *)a1 = v7; +*(DWORD *)a1 = v7; if ( v7 & 3 ) -*(_DWORD *)a1 = v7 - (v7 & 3) + 4; -v8 = GlobalAlloc(0x42u, *(_DWORD *)a1); +*(DWORD *)a1 = v7 - (v7 & 3) + 4; +v8 = GlobalAlloc(0x42u, *(DWORD *)a1); v9 = GlobalLock(v8); if ( v9 ) { v9[1] = 0; -*((_WORD *)v9 + 4) = 0; +*((WORD *)v9 + 4) = 0; *v9 = a2 | 0x10000000; -*((_WORD *)v9 + 5) = a3; -*((_WORD *)v9 + 6) = a4; -*((_WORD *)v9 + 7) = a5; -*((_WORD *)v9 + 8) = a6; +*((WORD *)v9 + 5) = a3; +*((WORD *)v9 + 6) = a4; +*((WORD *)v9 + 7) = a5; +*((WORD *)v9 + 8) = a6; qmemcpy((char *)v9 + 22, Str, 2 * _wcslen(Str) + 2); } return v9; } //----- (0101FD0E) -------------------------------------------------------- -_WORD *__stdcall AddDlgControl(int a1, LPCVOID pMem, __int16 a3, int a4, __int16 a5, __int16 a6, __int16 a7, __int16 a8, __int16 a9, wchar_t *Str) +WORD *AddDlgControl(int a1, LPCVOID pMem, int a3, int a4, int a5, int a6, int a7, int a8, int a9, wchar_t *Str) { const void *v10; // edi HGLOBAL v11; // eax @@ -2828,54 +2828,54 @@ v10 = pMem; if ( pMem ) { pMema = *(char **)a1; -*(_DWORD *)a1 += 2 * _wcslen(Str) + 25; -if ( *(_DWORD *)a1 & 3 ) -*(_DWORD *)a1 = *(_DWORD *)a1 - (*(_DWORD *)a1 & 3) + 4; +*(DWORD *)a1 += 2 * _wcslen(Str) + 25; +if ( *(DWORD *)a1 & 3 ) +*(DWORD *)a1 = *(DWORD *)a1 - (*(DWORD *)a1 & 3) + 4; v11 = GlobalHandle(v10); GlobalUnlock(v11); -v12 = *(_DWORD *)a1; +v12 = *(DWORD *)a1; v13 = GlobalHandle(v10); v14 = GlobalReAlloc(v13, v12, 0x42u); v10 = GlobalLock(v14); if ( v10 ) { -v15 = (int)&pMema[(_DWORD)v10]; -*(_DWORD *)(v15 + 4) = 0; -*(_DWORD *)v15 = a4 | 0x50000000; -*(_WORD *)(v15 + 8) = a6; -*(_WORD *)(v15 + 10) = a7; -*(_WORD *)(v15 + 12) = a8; -*(_WORD *)(v15 + 14) = a9; -*(_WORD *)(v15 + 16) = a5; -*(_DWORD *)(v15 + 18) = ((unsigned __int16)a3 << 16) | 0xFFFF; -_wcscpy((wchar_t *)&pMema[(_DWORD)v10 + 22], Str); -++*((_WORD *)v10 + 4); +v15 = (int)&pMema[(DWORD)v10]; +*(DWORD *)(v15 + 4) = 0; +*(DWORD *)v15 = a4 | 0x50000000; +*(WORD *)(v15 + 8) = a6; +*(WORD *)(v15 + 10) = a7; +*(WORD *)(v15 + 12) = a8; +*(WORD *)(v15 + 14) = a9; +*(WORD *)(v15 + 16) = a5; +*(DWORD *)(v15 + 18) = ((unsigned int)a3 << 16) | 0xFFFF; +_wcscpy((wchar_t *)&pMema[(DWORD)v10 + 22], Str); +++*((WORD *)v10 + 4); } } return v10; } //----- (0101FDE1) -------------------------------------------------------- -_WORD *__stdcall MakeSettingsDlgTemplate() +WORD *MakeSettingsDlgTemplate() { -_DWORD *v0; // eax -_WORD *v1; // eax -_WORD *v2; // eax -_WORD *v3; // eax -_WORD *v4; // eax -_WORD *v5; // eax -_WORD *v6; // eax -_WORD *v7; // eax -_WORD *v8; // eax -_WORD *v9; // eax -_WORD *v10; // eax -_WORD *v11; // eax -_WORD *v12; // eax -_WORD *v13; // eax -_WORD *v14; // eax -_WORD *v15; // eax -_WORD *v16; // eax -_WORD *v17; // eax +DWORD *v0; // eax +WORD *v1; // eax +WORD *v2; // eax +WORD *v3; // eax +WORD *v4; // eax +WORD *v5; // eax +WORD *v6; // eax +WORD *v7; // eax +WORD *v8; // eax +WORD *v9; // eax +WORD *v10; // eax +WORD *v11; // eax +WORD *v12; // eax +WORD *v13; // eax +WORD *v14; // eax +WORD *v15; // eax +WORD *v16; // eax +WORD *v17; // eax int v19; // [esp+Ch] [ebp-4h] v19 = 0; @@ -2901,7 +2901,7 @@ return AddDlgControl((int)&v19, v17, 128, 65539, 1004, 55, 117, 75, 10, L"Good G } //----- (01020059) -------------------------------------------------------- -void __stdcall DestroySettingsDlgTemplate(LPCVOID pMem) +void DestroySettingsDlgTemplate(LPCVOID pMem) { HGLOBAL v1; // eax HGLOBAL v2; // eax @@ -2916,9 +2916,9 @@ GlobalFree(v2); } //----- (0102008D) -------------------------------------------------------- -signed int __stdcall WaveMixGetConfig(_WORD *a1, int a2) +signed int WaveMixGetConfig(WORD *a1, int a2) { -_WORD *v2; // eax +WORD *v2; // eax int v4; // ebx v2 = SessionToGlobalDataPtr(a1); @@ -2927,74 +2927,74 @@ if ( !v2 ) return 5; if ( !a2 ) return 11; -v4 = *(_DWORD *)(a2 + 2); +v4 = *(DWORD *)(a2 + 2); if ( v4 & 1 ) -*(_WORD *)(a2 + 6) = v2[191]; +*(WORD *)(a2 + 6) = v2[191]; if ( v4 & 2 ) -*(_WORD *)(a2 + 8) = 11 * (*((_DWORD *)v2 + 96) / 0x2B11u); +*(WORD *)(a2 + 8) = 11 * (*((DWORD *)v2 + 96) / 0x2B11u); if ( v4 & 4 ) -*(_WORD *)(a2 + 10) = v2[200]; +*(WORD *)(a2 + 10) = v2[200]; if ( v4 & 8 ) -*(_WORD *)(a2 + 12) = v2[198]; +*(WORD *)(a2 + 12) = v2[198]; if ( v4 & 0x10 ) -*(_WORD *)(a2 + 14) = *((_DWORD *)v2 + 107) == (_DWORD)cmixit; +*(WORD *)(a2 + 14) = *((DWORD *)v2 + 107) == (DWORD)cmixit; if ( v4 & 0x20 ) -*(_WORD *)(a2 + 16) = *((_DWORD *)v2 + 108) == (_DWORD)ResetRemix; +*(WORD *)(a2 + 16) = *((DWORD *)v2 + 108) == (DWORD)ResetRemix; if ( v4 & 0x40 ) -*(_WORD *)(a2 + 18) = v2[210]; +*(WORD *)(a2 + 18) = v2[210]; if ( (v4 & 0x80u) != 0 ) -*(_WORD *)(a2 + 20) = v2[12]; +*(WORD *)(a2 + 20) = v2[12]; if ( v4 & 0x100 ) -*(_WORD *)(a2 + 24) = dword_1027BE4 != 0; +*(WORD *)(a2 + 24) = dword_1027BE4 != 0; if ( v4 & 0x200 ) -*(_WORD *)(a2 + 22) = v2[202]; +*(WORD *)(a2 + 22) = v2[202]; return 0; } // 1027BE4: using guessed type int dword_1027BE4; //----- (0102018C) -------------------------------------------------------- -BOOL __stdcall SaveConfigSettings(__int16 a1) +BOOL SaveConfigSettings(int a1) { BOOL result; // eax if ( (a1 & 0x80u) != 0 ) { -_wsprintfA(aWavemixV23ByAn, "%d", *(_DWORD *)(hMem + 24)); +_wsprintfA(aWavemixV23ByAn, "%d", *(DWORD *)(hMem + 24)); result = WritePrivateProfileStringA("general", "WaveOutDevice", aWavemixV23ByAn, FileName); } if ( a1 & 1 ) { -_wsprintfA(aWavemixV23ByAn, "%d", *(unsigned __int16 *)(hMem + 382)); +_wsprintfA(aWavemixV23ByAn, "%d", *(unsigned int *)(hMem + 382)); result = WritePrivateProfileStringA((LPCSTR)(hMem + 28), "Channels", aWavemixV23ByAn, FileName); } if ( a1 & 2 ) { -_wsprintfA(aWavemixV23ByAn, "%d", (unsigned __int16)(11 * (*(_DWORD *)(hMem + 384) / 0x2B11u))); +_wsprintfA(aWavemixV23ByAn, "%d", (unsigned int)(11 * (*(DWORD *)(hMem + 384) / 0x2B11u))); result = WritePrivateProfileStringA((LPCSTR)(hMem + 28), "SamplesPerSec", aWavemixV23ByAn, FileName); } if ( a1 & 4 ) { -_wsprintfA(aWavemixV23ByAn, "%d", *(_DWORD *)(hMem + 400)); +_wsprintfA(aWavemixV23ByAn, "%d", *(DWORD *)(hMem + 400)); result = WritePrivateProfileStringA((LPCSTR)(hMem + 28), "WaveBlocks", aWavemixV23ByAn, FileName); } if ( a1 & 8 ) { -_wsprintfA(aWavemixV23ByAn, "%d", *(unsigned __int16 *)(hMem + 396)); +_wsprintfA(aWavemixV23ByAn, "%d", *(unsigned int *)(hMem + 396)); result = WritePrivateProfileStringA((LPCSTR)(hMem + 28), "WaveBlockLen", aWavemixV23ByAn, FileName); } if ( a1 & 0x10 ) { -_wsprintfA(aWavemixV23ByAn, "%d", *(_DWORD *)(hMem + 428) == (_DWORD)cmixit); +_wsprintfA(aWavemixV23ByAn, "%d", *(DWORD *)(hMem + 428) == (DWORD)cmixit); result = WritePrivateProfileStringA((LPCSTR)(hMem + 28), "CMixit", aWavemixV23ByAn, FileName); } if ( a1 & 0x20 ) { -_wsprintfA(aWavemixV23ByAn, "%d", (*(_DWORD *)(hMem + 432) != (_DWORD)ResetRemix) + 1); +_wsprintfA(aWavemixV23ByAn, "%d", (*(DWORD *)(hMem + 432) != (DWORD)ResetRemix) + 1); result = WritePrivateProfileStringA((LPCSTR)(hMem + 28), "Remix", aWavemixV23ByAn, FileName); } if ( a1 & 0x40 ) { -_wsprintfA(aWavemixV23ByAn, "%d", *(_DWORD *)(hMem + 420) == 0); +_wsprintfA(aWavemixV23ByAn, "%d", *(DWORD *)(hMem + 420) == 0); result = WritePrivateProfileStringA((LPCSTR)(hMem + 28), "GoodWavePos", aWavemixV23ByAn, FileName); } if ( a1 & 0x100 ) @@ -3004,7 +3004,7 @@ result = WritePrivateProfileStringA("general", "ShowDebugDialogs", aWavemixV23By } if ( a1 & 0x200 ) { -_wsprintfA(aWavemixV23ByAn, "%d", *(_DWORD *)(hMem + 404)); +_wsprintfA(aWavemixV23ByAn, "%d", *(DWORD *)(hMem + 404)); result = WritePrivateProfileStringA((LPCSTR)(hMem + 28), "PauseBlocks", aWavemixV23ByAn, FileName); } return result; @@ -3012,7 +3012,7 @@ return result; // 1027BE4: using guessed type int dword_1027BE4; //----- (010203CD) -------------------------------------------------------- -DWORD __stdcall SetIniFileName(HMODULE hModule) +DWORD SetIniFileName(HMODULE hModule) { DWORD result; // eax CHAR *i; // eax @@ -3030,7 +3030,7 @@ return result; } //----- (01020412) -------------------------------------------------------- -int __stdcall InitVolumeTable() +int InitVolumeTable() { char *v0; // edi signed int v1; // esi @@ -3063,7 +3063,7 @@ return result; } //----- (0102046F) -------------------------------------------------------- -int __stdcall WaveMixStartup(HMODULE hModule) +int WaveMixStartup(HMODULE hModule) { WNDCLASSA WndClass; // [esp+4h] [ebp-28h] @@ -3096,9 +3096,9 @@ return 1; // 1027BF4: using guessed type int dword_1027BF4; //----- (0102053B) -------------------------------------------------------- -signed int __stdcall WaveMixActivate(_WORD *a1, int a2) +signed int WaveMixActivate(WORD *a1, int a2) { -_WORD *v2; // eax +WORD *v2; // eax int v3; // ecx signed int result; // eax unsigned int v5; // ST04_4 @@ -3114,8 +3114,8 @@ return 5; if ( a2 ) { if ( dword_1025798 ) -return dword_1025798 != (_DWORD)v2 ? 4 : 0; -if ( *((_DWORD *)v2 + 5) ) +return dword_1025798 != (DWORD)v2 ? 4 : 0; +if ( *((DWORD *)v2 + 5) ) return 12; dword_1025798 = (int)v2; sndPlaySoundA(0, 0); @@ -3125,8 +3125,8 @@ if ( result ) dword_1025798 = 0; return result; } -v5 = *(_DWORD *)(hMem + 412); -*(_DWORD *)(hMem + 16) = 1; +v5 = *(DWORD *)(hMem + 412); +*(DWORD *)(hMem + 16) = 1; SetWaveOutPosition(v5); do v6 = (struct wavehdr_tag *)GetWaveBlock(); @@ -3134,15 +3134,15 @@ while ( MixerPlay(v6, 1) ); } else { -if ( *((_DWORD *)v2 + 4) ) +if ( *((DWORD *)v2 + 4) ) { -v7 = MyWaveOutGetPosition(*((HWAVEOUT *)v2 + 3), *((_DWORD *)v2 + 105)); +v7 = MyWaveOutGetPosition(*((HWAVEOUT *)v2 + 3), *((DWORD *)v2 + 105)); v3 = hMem; -*(_DWORD *)(hMem + 412) = v7; +*(DWORD *)(hMem + 412) = v7; } ReleaseWaveDevice(v3); v8 = hMem == dword_1025798; -*(_DWORD *)(hMem + 16) = 0; +*(DWORD *)(hMem + 16) = 0; if ( v8 ) dword_1025798 = 0; } @@ -3151,15 +3151,15 @@ return 0; // 1025798: using guessed type int dword_1025798; //----- (01020615) -------------------------------------------------------- -MMRESULT __stdcall WaveMixConfigure(int a1, HWND hWndParent, int a3, int a4, int a5) +MMRESULT WaveMixConfigure(int a1, HWND hWndParent, int a3, int a4, int a5) { -_WORD *v5; // esi -_WORD *v6; // eax +WORD *v5; // esi +WORD *v6; // eax const DLGTEMPLATE *v7; // esi INT_PTR v8; // edi LPARAM v9; // eax MMRESULT result; // eax -_WORD *v11; // esi +WORD *v11; // esi LPARAM *v12; // edi UINT_PTR v13; // eax LPARAM v14; // eax @@ -3169,60 +3169,60 @@ const char *v17; // eax int v18; // eax int v19; // eax int v20; // eax -_DWORD *v21; // eax +DWORD *v21; // eax int v22; // eax signed int v23; // eax signed int v24; // ecx -_DWORD *v25; // eax +DWORD *v25; // eax int v26; // ecx int v27; // edx -unsigned __int16 v28; // ax +unsigned int v28; // ax unsigned int v29; // edx signed int v30; // ecx -__int16 v31; // cx -signed int (__stdcall *v32)(int, int); // eax +int v31; // cx +signed int (*v32)(int, int); // eax int v33; // ecx -_DWORD *v34; // eax +DWORD *v34; // eax int v35; // esi LPARAM dwInitParam; // [esp+Ch] [ebp-6Ch] -unsigned __int16 v38; // [esp+18h] [ebp-60h] -_DWORD *v39; // [esp+2Ch] [ebp-4Ch] -_WORD *v40; // [esp+30h] [ebp-48h] +unsigned int v38; // [esp+18h] [ebp-60h] +DWORD *v39; // [esp+2Ch] [ebp-4Ch] +WORD *v40; // [esp+30h] [ebp-48h] int v41; // [esp+34h] [ebp-44h] LPARAM *v42; // [esp+38h] [ebp-40h] int v43; // [esp+3Ch] [ebp-3Ch] struct tagWAVEOUTCAPSA pwoc; // [esp+40h] [ebp-38h] -v5 = (_WORD *)a1; +v5 = (WORD *)a1; v42 = (LPARAM *)a3; -v40 = (_WORD *)a1; -v39 = (_DWORD *)a4; +v40 = (WORD *)a1; +v39 = (DWORD *)a4; v43 = 0; -v6 = SessionToGlobalDataPtr((_WORD *)a1); +v6 = SessionToGlobalDataPtr((WORD *)a1); hMem = (LPARAM)v6; if ( !v6 ) return 5; -if ( *((_DWORD *)v6 + 4) ) +if ( *((DWORD *)v6 + 4) ) return 4; -if ( *((_DWORD *)v6 + 5) ) +if ( *((DWORD *)v6 + 5) ) return 12; -WaveMixFlushChannel((_WORD *)a1, -1, 1); +WaveMixFlushChannel((WORD *)a1, -1, 1); if ( !v42 ) { LOWORD(dwInitParam) = 30; *(LPARAM *)((char *)&dwInitParam + 2) = 1023; -WaveMixGetConfig((_WORD *)a1, (int)&dwInitParam); +WaveMixGetConfig((WORD *)a1, (int)&dwInitParam); v7 = (const DLGTEMPLATE *)MakeSettingsDlgTemplate(); if ( !v7 ) return 1; -*(_DWORD *)(hMem + 20) = 1; +*(DWORD *)(hMem + 20) = 1; v8 = DialogBoxIndirectParamA(dword_10257E0, v7, hWndParent, SettingsDlgProc, (LPARAM)&dwInitParam); DestroySettingsDlgTemplate(v7); v9 = hMem; -*(_DWORD *)(hMem + 20) = 0; +*(DWORD *)(hMem + 20) = 0; if ( v8 != 1 ) return 1; -if ( *(_DWORD *)(v9 + 396) == v38 ) +if ( *(DWORD *)(v9 + 396) == v38 ) *(LPARAM *)((char *)&dwInitParam + 2) &= 0xFFFFFFF7; v5 = v40; v42 = &dwInitParam; @@ -3236,48 +3236,48 @@ return 5; v12 = v42; v41 = *(LPARAM *)((char *)v42 + 2); if ( v41 & 0x100 ) -dword_1027BE4 = *((_WORD *)v42 + 12) != 0; +dword_1027BE4 = *((WORD *)v42 + 12) != 0; if ( (v41 & 0x80u) != 0 ) { -v13 = *((unsigned __int16 *)v42 + 10); -if ( v13 != *((_DWORD *)v11 + 6) ) +v13 = *((unsigned int *)v42 + 10); +if ( v13 != *((DWORD *)v11 + 6) ) { result = waveOutGetDevCapsA(v13, &pwoc, 0x34u); if ( result ) return result; v14 = hMem; qmemcpy((void *)(hMem + 124), &pwoc, 0x34u); -v15 = *(_WORD *)(v14 + 168) == 1; -*(_DWORD *)(v14 + 24) = *((unsigned __int16 *)v42 + 10); -if ( v15 && *(_WORD *)(v14 + 382) == 2 ) +v15 = *(WORD *)(v14 + 168) == 1; +*(DWORD *)(v14 + 24) = *((unsigned int *)v42 + 10); +if ( v15 && *(WORD *)(v14 + 382) == 2 ) { -*(_WORD *)(v14 + 382) = 1; -v16 = *(_DWORD *)(v14 + 384); +*(WORD *)(v14 + 382) = 1; +v16 = *(DWORD *)(v14 + 384); v43 = 1; -*(_WORD *)(v14 + 392) = 1; -*(_DWORD *)(v14 + 388) = v16; +*(WORD *)(v14 + 392) = 1; +*(DWORD *)(v14 + 388) = v16; } lstrcpyA((LPSTR)(v14 + 28), pwoc.szPname); if ( !RemoveInvalidIniNameCharacters((LPCSTR)(hMem + 28)) ) lstrcpyA((LPSTR)(hMem + 28), "Unkown Device"); -if ( !ReadRegistryToGetMachineSpecificInfSection(*(_DWORD *)(hMem + 24), (LPSTR)(hMem + 28), 96) ) +if ( !ReadRegistryToGetMachineSpecificInfSection(*(DWORD *)(hMem + 24), (LPSTR)(hMem + 28), 96) ) { v17 = GetOperatingSystemPrefix(); lstrcpyA((LPSTR)(hMem + 28), v17); lstrcatA((LPSTR)(hMem + 28), (LPCSTR)(hMem + 132)); } -v11 = (_WORD *)hMem; +v11 = (WORD *)hMem; v12 = v42; } } if ( v41 & 1 ) { -if ( *((_WORD *)v12 + 3) <= 1u ) +if ( *((WORD *)v12 + 3) <= 1u ) { if ( v11[191] == 2 ) v43 = 1; v11[191] = 1; -v19 = *((_DWORD *)v11 + 96); +v19 = *((DWORD *)v11 + 96); v11[196] = 1; goto LABEL_39; } @@ -3286,24 +3286,24 @@ if ( v11[84] > 1u ) if ( v11[191] == 1 ) v43 = 1; v11[191] = 2; -v18 = *((_DWORD *)v11 + 96); +v18 = *((DWORD *)v11 + 96); v11[196] = 2; v19 = 2 * v18; LABEL_39: -*((_DWORD *)v11 + 97) = v19; +*((DWORD *)v11 + 97) = v19; goto LABEL_40; } } LABEL_40: if ( v41 & 2 ) { -v20 = *((unsigned __int16 *)v12 + 4); +v20 = *((unsigned int *)v12 + 4); if ( v20 == 22 ) { -if ( *((_DWORD *)v11 + 96) != 22050 ) +if ( *((DWORD *)v11 + 96) != 22050 ) v43 = 1; -*((_DWORD *)v11 + 96) = 22050; -v22 = 22050 * (unsigned __int16)v11[191]; +*((DWORD *)v11 + 96) = 22050; +v22 = 22050 * (unsigned int)v11[191]; } else { @@ -3314,30 +3314,30 @@ if ( v15 ) if ( *v21 != 44100 ) v43 = 1; *v21 = 44100; -v22 = 44100 * (unsigned __int16)v11[191]; +v22 = 44100 * (unsigned int)v11[191]; } else { if ( *v21 != 11025 ) v43 = 1; *v21 = 11025; -v22 = 11025 * (unsigned __int16)v11[191]; +v22 = 11025 * (unsigned int)v11[191]; } } -*((_DWORD *)v11 + 97) = v22; +*((DWORD *)v11 + 97) = v22; } if ( v41 & 4 ) { -v23 = *((unsigned __int16 *)v12 + 5); +v23 = *((unsigned int *)v12 + 5); v24 = 2; -*((_DWORD *)v11 + 100) = v23; +*((DWORD *)v11 + 100) = v23; if ( v23 < 2 || (v24 = 10, v23 > 10) ) -*((_DWORD *)v11 + 100) = v24; +*((DWORD *)v11 + 100) = v24; v25 = v11 + 202; -v26 = *((_DWORD *)v11 + 101); +v26 = *((DWORD *)v11 + 101); if ( v26 >= 0 ) { -v27 = *((_DWORD *)v11 + 100); +v27 = *((DWORD *)v11 + 100); if ( v26 > v27 ) *v25 = v27; } @@ -3347,37 +3347,37 @@ else } } if ( v43 ) -*((_DWORD *)v11 + 99) = FigureOutDMABufferSize(0, (int)(v11 + 190)); +*((DWORD *)v11 + 99) = FigureOutDMABufferSize(0, (int)(v11 + 190)); if ( v41 & 8 ) { -v28 = *((_WORD *)v12 + 6); +v28 = *((WORD *)v12 + 6); if ( v28 ) -*((_DWORD *)v11 + 99) = v28; +*((DWORD *)v11 + 99) = v28; } -v29 = *((_DWORD *)v11 + 99); +v29 = *((DWORD *)v11 + 99); v30 = 344; if ( v29 < 0x158 || (v30 = 11025, v29 > 0x2B11) ) -*((_DWORD *)v11 + 99) = v30; +*((DWORD *)v11 + 99) = v30; v31 = v41; if ( v41 & 0x10 ) -*((_DWORD *)v11 + 107) = cmixit; +*((DWORD *)v11 + 107) = cmixit; if ( v31 & 0x20 ) { v32 = ResetRemix; -if ( !*((_WORD *)v12 + 8) ) +if ( !*((WORD *)v12 + 8) ) v32 = NoResetRemix; -*((_DWORD *)v11 + 108) = v32; +*((DWORD *)v11 + 108) = v32; } if ( v31 & 0x40 ) -*((_DWORD *)v11 + 105) = *((_WORD *)v12 + 9) != 0; +*((DWORD *)v11 + 105) = *((WORD *)v12 + 9) != 0; if ( v31 & 0x200 ) { -v33 = *((unsigned __int16 *)v12 + 11); +v33 = *((unsigned int *)v12 + 11); v34 = v11 + 202; -*((_DWORD *)v11 + 101) = v33; +*((DWORD *)v11 + 101) = v33; if ( v33 >= 0 ) { -v35 = *((_DWORD *)v11 + 100); +v35 = *((DWORD *)v11 + 100); if ( v33 > v35 ) *v34 = v35; } @@ -3398,14 +3398,14 @@ return 0; // 1027BE4: using guessed type int dword_1027BE4; //----- (01020A36) -------------------------------------------------------- -signed int __stdcall ReadConfigSettings(int a1) +signed int ReadConfigSettings(int a1) { UINT v2; // eax UINT_PTR *v3; // ebx const char *v4; // eax unsigned int v5; // eax UINT v6; // eax -signed int (__stdcall *v7)(int, int); // ecx +signed int (*v7)(int, int); // ecx LPARAM v8; // eax UINT v9; // ecx LPARAM v10; // eax @@ -3416,7 +3416,7 @@ int v14; // eax signed int v15; // eax LPARAM v16; // ecx signed int v17; // edx -unsigned __int16 v18; // ax +unsigned int v18; // ax LPARAM v19; // ecx int v20; // eax int v21; // eax @@ -3446,7 +3446,7 @@ v2 = GetPrivateProfileIntA("general", "WaveOutDevice", 0, FileName); } else { -v2 = *(unsigned __int16 *)(a1 + 20); +v2 = *(unsigned int *)(a1 + 20); v3 = (UINT_PTR *)(hMem + 24); } *v3 = v2; @@ -3457,14 +3457,14 @@ if ( waveOutGetDevCapsA(*v3, (LPWAVEOUTCAPSA)(hMem + 124), 0x34u) { lstrcpyA((LPSTR)(hMem + 132), "Unkown Device"); } -if ( !ReadRegistryToGetMachineSpecificInfSection(*(_DWORD *)(hMem + 24), (LPSTR)(hMem + 28), 96) ) +if ( !ReadRegistryToGetMachineSpecificInfSection(*(DWORD *)(hMem + 24), (LPSTR)(hMem + 28), 96) ) { v4 = GetOperatingSystemPrefix(); lstrcpyA((LPSTR)(hMem + 28), v4); lstrcatA((LPSTR)(hMem + 28), (LPCSTR)(hMem + 132)); } nDefaulta = GetPrivateProfileIntA("default", "Remix", 1, FileName); -v5 = DefaultGoodWavePos(*(_DWORD *)(hMem + 24)); +v5 = DefaultGoodWavePos(*(DWORD *)(hMem + 24)); v28 = GetPrivateProfileIntA("default", "GoodWavePos", v5, FileName); v27 = GetPrivateProfileIntA("default", "WaveBlocks", 3, FileName); v26 = GetPrivateProfileIntA("default", "SamplesPerSec", 11, FileName); @@ -3492,81 +3492,81 @@ v7 = NoResetRemix; if ( v6 != 2 ) v7 = ResetRemix; v8 = hMem; -*(_DWORD *)(hMem + 432) = v7; +*(DWORD *)(hMem + 432) = v7; v9 = GetPrivateProfileIntA((LPCSTR)(v8 + 28), "GoodWavePos", v28, FileName); v10 = hMem; -*(_DWORD *)(hMem + 420) = v9 != 0; +*(DWORD *)(hMem + 420) = v9 != 0; v11 = GetPrivateProfileIntA((LPCSTR)(v10 + 28), "WaveBlocks", v27, FileName); v12 = hMem; v13 = 2; -*(_DWORD *)(hMem + 400) = v11; +*(DWORD *)(hMem + 400) = v11; if ( v11 < 2 || (v13 = 10, v11 > 10) ) -*(_DWORD *)(v12 + 400) = v13; -v14 = DefaultPauseBlocks(*(_DWORD *)(v12 + 400)); +*(DWORD *)(v12 + 400) = v13; +v14 = DefaultPauseBlocks(*(DWORD *)(v12 + 400)); v15 = GetPrivateProfileIntA((LPCSTR)(hMem + 28), "PauseBlocks", v14, FileName); v16 = hMem; -*(_DWORD *)(hMem + 404) = v15; +*(DWORD *)(hMem + 404) = v15; if ( v15 >= 0 ) { -v17 = *(_DWORD *)(v16 + 400); +v17 = *(DWORD *)(v16 + 400); if ( v15 > v17 ) -*(_DWORD *)(v16 + 404) = v17; +*(DWORD *)(v16 + 404) = v17; } else { -*(_DWORD *)(v16 + 404) = 0; +*(DWORD *)(v16 + 404) = 0; } nDefaultb = GetPrivateProfileIntA((LPCSTR)(v16 + 28), "SamplesPerSec", v26, FileName); v18 = GetPrivateProfileIntA((LPCSTR)(hMem + 28), "Channels", 1, FileName); v19 = hMem; -*(_WORD *)(hMem + 382) = v18; +*(WORD *)(hMem + 382) = v18; if ( v18 >= 1u ) { if ( v18 > 2u ) -*(_WORD *)(v19 + 382) = 2; +*(WORD *)(v19 + 382) = 2; } else { -*(_WORD *)(v19 + 382) = 1; +*(WORD *)(v19 + 382) = 1; } -v20 = *(unsigned __int16 *)(v19 + 382); +v20 = *(unsigned int *)(v19 + 382); if ( nDefaultb == 22 ) { -*(_DWORD *)(v19 + 384) = 22050; +*(DWORD *)(v19 + 384) = 22050; v21 = 22050 * v20; } else if ( nDefaultb == 44 ) { -*(_DWORD *)(v19 + 384) = 44100; +*(DWORD *)(v19 + 384) = 44100; v21 = 44100 * v20; } else { v21 = 11025 * v20; } -*(_DWORD *)(v19 + 388) = v21; +*(DWORD *)(v19 + 388) = v21; v22 = GetPrivateProfileIntA("default", "WaveBlockLen", 0, FileName); v23 = hMem; -*(_DWORD *)(v23 + 396) = FigureOutDMABufferSize(v22, hMem + 380); +*(DWORD *)(v23 + 396) = FigureOutDMABufferSize(v22, hMem + 380); WaveMixConfigure(v23, 0, a1, 0, 0); return 1; } // 1027BE4: using guessed type int dword_1027BE4; //----- (01020D99) -------------------------------------------------------- -int __stdcall WaveMixConfigureInit(_WORD *a1) +int WaveMixConfigureInit(WORD *a1) { unsigned int v1; // ecx HMODULE v2; // eax int result; // eax BOOL v4; // eax -_DWORD *v5; // eax -_WORD *v6; // eax +DWORD *v5; // eax +WORD *v6; // eax void *v7; // ST0C_4 -__int16 v8; // [esp+8h] [ebp-20h] +int v8; // [esp+8h] [ebp-20h] char v9; // [esp+Bh] [ebp-1Dh] -__int16 v10; // [esp+20h] [ebp-8h] -__int16 v11; // [esp+24h] [ebp-4h] +int v10; // [esp+20h] [ebp-8h] +int v11; // [esp+24h] [ebp-4h] memset(&v8, 0, 0x1Cu); v1 = 30; @@ -3575,7 +3575,7 @@ v8 = 30; if ( a1 ) { if ( *a1 < 0x1Eu ) -v1 = (unsigned __int16)*a1; +v1 = (unsigned int)*a1; qmemcpy(&v8, a1, v1); } if ( dword_1027BF4 || (v2 = GetModuleHandleA(0), (result = WaveMixStartup(v2)) != 0) ) @@ -3601,19 +3601,19 @@ hMem = (LPARAM)v5; if ( !v5 ) return 0; v5[107] = dword_1025968; -*((_WORD *)v5 + 222) = 21554; -*(_WORD *)v5 = 21554; +*((WORD *)v5 + 222) = 21554; +*(WORD *)v5 = 21554; v5[102] = 0; v5[5] = 0; -*((_WORD *)v5 + 88) = 10; -*((_WORD *)v5 + 89) = 10; +*((WORD *)v5 + 88) = 10; +*((WORD *)v5 + 89) = 10; memset(v5 + 61, 0xFFu, 0x40u); _memmove(v5 + 95, gpFormat, 0x10u); if ( !ReadConfigSettings((int)&v8) ) { -v6 = (_WORD *)hMem; +v6 = (WORD *)hMem; v7 = (void *)hMem; -*(_WORD *)(hMem + 444) = 0; +*(WORD *)(hMem + 444) = 0; *v6 = 0; LocalFree(v7); hMem = 0; @@ -3628,13 +3628,13 @@ return result; // 1027BF4: using guessed type int dword_1027BF4; //----- (01020F2D) -------------------------------------------------------- -int __stdcall WaveMixInit() +int WaveMixInit() { return WaveMixConfigureInit(0); } //----- (01020F3A) -------------------------------------------------------- -HLOCAL __stdcall WaveMixCloseSession(HLOCAL hMem) +HLOCAL WaveMixCloseSession(HLOCAL hMem) { void *v1; // edi HLOCAL result; // eax diff --git a/table.cpp b/table.cpp index a8ff144..df1ace7 100644 --- a/table.cpp +++ b/table.cpp @@ -2,18 +2,18 @@ //----- (0100C0EE) -------------------------------------------------------- -void __userpurge table_set_replay(int a1@, float a2) +void table_set_replay(int a1, float a2) { char *v2; // eax -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023D0C)(19, 0.0); +(**(void (***)(signed int, DWORD))dword_1023D0C)(19, 0.0); v2 = get_rc_string(0, 0); TTextBox::Display(dword_1023E1C, a1, v2, a2); } // 1023D0C: using guessed type int dword_1023D0C; //----- (0100C12A) -------------------------------------------------------- -void __usercall table_set_multiball(int a1@) +void table_set_multiball(int a1) { char *v1; // eax @@ -22,37 +22,37 @@ TTextBox::Display(dword_1023E1C, a1, v1, 2.0); } //----- (0100C14F) -------------------------------------------------------- -void __usercall table_set_jackpot(int a1@) +void table_set_jackpot(int a1) { char *v1; // eax -*(_DWORD *)((char *)dword_1025040 + 318) = 1; -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023ABC)(9, 60.0); +*(DWORD *)((char *)dword_1025040 + 318) = 1; +(**(void (***)(signed int, DWORD))dword_1023ABC)(9, 60.0); v1 = get_rc_string(15, 0); TTextBox::Display(dword_1023E1C, a1, v1, 2.0); } // 1023ABC: using guessed type int dword_1023ABC; //----- (0100C199) -------------------------------------------------------- -void __usercall table_set_bonus(int a1@) +void table_set_bonus(int a1) { char *v1; // eax -*(_DWORD *)((char *)dword_1025040 + 310) = 1; -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023AC4)(9, 60.0); +*(DWORD *)((char *)dword_1025040 + 310) = 1; +(**(void (***)(signed int, DWORD))dword_1023AC4)(9, 60.0); v1 = get_rc_string(4, 0); TTextBox::Display(dword_1023E1C, a1, v1, 2.0); } // 1023AC4: using guessed type int dword_1023AC4; //----- (0100C1E3) -------------------------------------------------------- -void __usercall table_set_flag_lights(int a1@) +void table_set_flag_lights(int a1) { char *v1; // eax -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023940)(9, 60.0); -(**(void (__stdcall ***)(signed int, _DWORD))dword_10239D0)(9, 60.0); -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023AB4)(9, 60.0); +(**(void (***)(signed int, DWORD))dword_1023940)(9, 60.0); +(**(void (***)(signed int, DWORD))dword_10239D0)(9, 60.0); +(**(void (***)(signed int, DWORD))dword_1023AB4)(9, 60.0); v1 = get_rc_string(51, 0); TTextBox::Display(dword_1023E1C, a1, v1, 2.0); } @@ -61,46 +61,46 @@ TTextBox::Display(dword_1023E1C, a1, v1, 2.0); // 1023AB4: using guessed type int dword_1023AB4; //----- (0100C24A) -------------------------------------------------------- -void __usercall table_set_bonus_hold(int a1@) +void table_set_bonus_hold(int a1) { char *v1; // eax -(**(void (__stdcall ***)(signed int, _DWORD))dword_1023ACC)(19, 0.0); +(**(void (***)(signed int, DWORD))dword_1023ACC)(19, 0.0); v1 = get_rc_string(52, 0); TTextBox::Display(dword_1023E1C, a1, v1, 2.0); } // 1023ACC: using guessed type int dword_1023ACC; //----- (0100C281) -------------------------------------------------------- -void __usercall table_bump_ball_sink_lock(int a1@) +void table_bump_ball_sink_lock(int a1) { int v1; // ecx char *v2; // eax -v1 = *(_DWORD *)((char *)dword_1025040 + 342); +v1 = *(DWORD *)((char *)dword_1025040 + 342); if ( v1 == 2 ) { table_set_multiball(a1); -*(_DWORD *)((char *)dword_1025040 + 342) = 0; +*(DWORD *)((char *)dword_1025040 + 342) = 0; } else { -*(_DWORD *)((char *)dword_1025040 + 342) = v1 + 1; -(*(void (**)(void))(*(_DWORD *)dword_1023DAC + 20))(); +*(DWORD *)((char *)dword_1025040 + 342) = v1 + 1; +(*(void (**)(void))(*(DWORD *)dword_1023DAC + 20))(); v2 = get_rc_string(1, 0); TTextBox::Display(dword_1023E1C, a1, v2, 2.0); -(***(void (__stdcall ****)(signed int, _DWORD))((char *)dword_1025040 + 222))(1016, 0.0); +(***(void (****)(signed int, DWORD))((char *)dword_1025040 + 222))(1016, 0.0); } } // 1023DAC: using guessed type int dword_1023DAC; //----- (0100C2F3) -------------------------------------------------------- -void __userpurge table_add_extra_ball(int a1@, float a2) +void table_add_extra_ball(int a1, float a2) { char *v2; // eax -++*(_DWORD *)((char *)dword_1025040 + 334); -(*(void (**)(void))(*(_DWORD *)dword_1023D44 + 20))(); +++*(DWORD *)((char *)dword_1025040 + 334); +(*(void (**)(void))(*(DWORD *)dword_1023D44 + 20))(); v2 = get_rc_string(9, 0); TTextBox::Display(dword_1023E1C, a1, v2, a2); } diff --git a/underscore.cpp b/underscore.cpp index 22ce619..49382a9 100644 --- a/underscore.cpp +++ b/underscore.cpp @@ -5,7 +5,7 @@ #include "pinball.h" //----- (01003445) -------------------------------------------------------- -HDC __stdcall _GetDC(HWND hWnd) +HDC _GetDC(HWND hWnd) { HDC v1; // eax HDC v2; // esi @@ -18,7 +18,7 @@ HDC __stdcall _GetDC(HWND hWnd) } //----- (0100347C) -------------------------------------------------------- -HDC __stdcall _BeginPaint(HWND hWnd, LPPAINTSTRUCT lpPaint) +HDC _BeginPaint(HWND hWnd, LPPAINTSTRUCT lpPaint) { HDC v2; // eax HDC v3; // esi @@ -31,7 +31,7 @@ HDC __stdcall _BeginPaint(HWND hWnd, LPPAINTSTRUCT lpPaint) } //----- (01006498) -------------------------------------------------------- -char __stdcall _lread_char(HFILE hFile) +char _lread_char(HFILE hFile) { char Buffer; // [esp+1h] [ebp-1h] @@ -41,7 +41,7 @@ char __stdcall _lread_char(HFILE hFile) } //----- (010064BD) -------------------------------------------------------- -int __stdcall _lread_long(HFILE hFile) +int _lread_long(HFILE hFile) { int Buffer; // [esp+0h] [ebp-4h] @@ -52,7 +52,7 @@ int __stdcall _lread_long(HFILE hFile) //----- (01003752) -------------------------------------------------------- -CHAR *__stdcall get_rc_string(__int16 a1, int a2) +CHAR *get_rc_string(int a1, int a2) { CHAR *v2; // esi @@ -66,7 +66,7 @@ CHAR *__stdcall get_rc_string(__int16 a1, int a2) // 1024EA8: using guessed type int rc_string_slot; //----- (010037A6) -------------------------------------------------------- -int __stdcall get_rc_int(__int16 a1, int *a2) +int get_rc_int(int a1, int *a2) { int result; // eax CHAR Buffer; // [esp+4h] [ebp-104h] @@ -81,7 +81,7 @@ int __stdcall get_rc_int(__int16 a1, int *a2) } //----- (01012F2A) -------------------------------------------------------- -void __stdcall build_occlude_list() +void build_occlude_list() { struct render_sprite_type_struct *v0; // esi signed int v1; // edi @@ -101,13 +101,13 @@ if ( render_many_sprites > 0 ) do { v0 = *v4; -if ( *((_DWORD *)*v4 + 17) ) +if ( *((DWORD *)*v4 + 17) ) { -memoryfree(*((_DWORD *)*v4 + 17)); -*((_DWORD *)v0 + 17) = 0; -*((_DWORD *)v0 + 18) = 0; +memoryfree(*((DWORD *)*v4 + 17)); +*((DWORD *)v0 + 17) = 0; +*((DWORD *)v0 + 18) = 0; } -if ( !*((_BYTE *)v0 + 24) && *((_DWORD *)v0 + 21) != -1 ) +if ( !*((_BYTE *)v0 + 24) && *((DWORD *)v0 + 21) != -1 ) { if ( !v7 ) v7 = memoryallocate(0xFA0u); @@ -117,20 +117,20 @@ for ( i = 0; i < render_many_sprites; ++v6 ) { v2 = *v6; if ( !*((_BYTE *)*v6 + 24) -&& *((_DWORD *)v2 + 21) != -1 +&& *((DWORD *)v2 + 21) != -1 && rectangle_clip((int *)v0 + 19, (int *)v2 + 19, 0) && v7 ) { -*(_DWORD *)(v7 + 4 * v1++) = v2; +*(DWORD *)(v7 + 4 * v1++) = v2; } ++i; } -if ( !*((_BYTE *)v0 + 24) && *((_DWORD *)v0 + 4) && v1 < 2 ) +if ( !*((_BYTE *)v0 + 24) && *((DWORD *)v0 + 4) && v1 < 2 ) v1 = 0; if ( v1 ) { -*((_DWORD *)v0 + 17) = memoryrealloc(v7, 4 * v1); -*((_DWORD *)v0 + 18) = v1; +*((DWORD *)v0 + 17) = memoryrealloc(v7, 4 * v1); +*((DWORD *)v0 + 18) = v1; v7 = 0; } } diff --git a/vectors.cpp b/vectors.cpp index 1b4fec0..0fbf9c0 100644 --- a/vectors.cpp +++ b/vectors.cpp @@ -1,14 +1,14 @@ #include "pinball.h" //----- (0101CB8E) -------------------------------------------------------- -void __stdcall vector_add(struct vector_type *a1, struct vector_type *a2) +void vector_add(struct vector_type *a1, struct vector_type *a2) { *(float *)a1 = *(float *)a1 + *(float *)a2; *((float *)a1 + 1) = *((float *)a2 + 1) + *((float *)a1 + 1); } //----- (0101CCF3) -------------------------------------------------------- -void __stdcall RotateVector(struct vector_type *a1, float a2) +void RotateVector(struct vector_type *a1, float a2) { long double v2; // st7 long double v3; // st6 @@ -22,21 +22,21 @@ v4 = v3 * *(float *)a1 - v2 * *((float *)a1 + 1); } //----- (0101B0A4) -------------------------------------------------------- -void __stdcall vswap(struct vector_type *a1, struct vector_type *a2) +void vswap(struct vector_type *a1, struct vector_type *a2) { int v2; // ST08_4 int v3; // ST0C_4 int v4; // ST10_4 -_DWORD *v5; // edi +DWORD *v5; // edi -v2 = *(_DWORD *)a1; -v3 = *((_DWORD *)a1 + 1); -v4 = *((_DWORD *)a1 + 2); -*(_DWORD *)a1 = *(_DWORD *)a2; -v5 = (_DWORD *)((char *)a1 + 4); -*v5 = *((_DWORD *)a2 + 1); -v5[1] = *((_DWORD *)a2 + 2); -*(_DWORD *)a2 = v2; -*((_DWORD *)a2 + 1) = v3; -*((_DWORD *)a2 + 2) = v4; +v2 = *(DWORD *)a1; +v3 = *((DWORD *)a1 + 1); +v4 = *((DWORD *)a1 + 2); +*(DWORD *)a1 = *(DWORD *)a2; +v5 = (DWORD *)((char *)a1 + 4); +*v5 = *((DWORD *)a2 + 1); +v5[1] = *((DWORD *)a2 + 2); +*(DWORD *)a2 = v2; +*((DWORD *)a2 + 1) = v3; +*((DWORD *)a2 + 2) = v4; } diff --git a/windows.cpp b/windows.cpp index 3324c06..c00be6c 100644 --- a/windows.cpp +++ b/windows.cpp @@ -5,7 +5,7 @@ #include "pinball.h" //----- (0100833A) -------------------------------------------------------- -int __stdcall WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nShowCmd) +int WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nShowCmd) { WNDCLASSA WndClass; // [esp+14h] [ebp-13Ch] INITCOMMONCONTROLSEX picce; // [esp+3Ch] [ebp-114h] @@ -281,7 +281,7 @@ int __stdcall WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdL //----- (010079ED) -------------------------------------------------------- -HANDLE __stdcall adjust_priority(int a1) +HANDLE adjust_priority(int a1) { HANDLE result = GetCurrentThread(); @@ -305,7 +305,7 @@ HANDLE __stdcall adjust_priority(int a1) } //----- (01007A3E) -------------------------------------------------------- -LRESULT __stdcall message_handler(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam) +LRESULT message_handler(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam) { struct tagRECT Rect; // [esp+8h] [ebp-64h] int window_size; // [esp+18h] [ebp-54h] @@ -437,7 +437,7 @@ LRESULT __stdcall message_handler(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lPa } return DefWindowProcA(hWnd, Msg, wParam, lParam); case 0x24u: - fullscrn_getminmaxinfo((_DWORD*)lParam); + fullscrn_getminmaxinfo((DWORD*)lParam); return DefWindowProcA(hWnd, Msg, wParam, lParam); case 0x7Eu: if (fullscrn_displaychange()) @@ -579,13 +579,13 @@ LRESULT __stdcall message_handler(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lPa "select=", hwnd_frame, "confirm=", - (_DWORD)hwnd_frame - * (_DWORD)hwnd_frame - * (_DWORD)hwnd_frame - * (_DWORD)hwnd_frame - * (_DWORD)hwnd_frame - * (_DWORD)hwnd_frame - * (_DWORD)hwnd_frame); + (DWORD)hwnd_frame + * (DWORD)hwnd_frame + * (DWORD)hwnd_frame + * (DWORD)hwnd_frame + * (DWORD)hwnd_frame + * (DWORD)hwnd_frame + * (DWORD)hwnd_frame); if ((signed int)WinExec(window_resize_string, 5u) < 32) { MessageBoxA(hwnd_frame, get_rc_string(171, 0), get_rc_string(170, 0), 0x2010u); @@ -685,7 +685,7 @@ LRESULT __stdcall message_handler(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lPa mouse_down = 1; mouse_hsave = SetCursor(0); lParam = fullscrn_convert_mouse_pos(lParam); - last_mouse_x = (unsigned __int16)lParam; + last_mouse_x = (unsigned int)lParam; last_mouse_y = (unsigned int)lParam >> 16; SetCapture(hWnd); }