clean up extra decorators
This commit is contained in:
Sydney Biscuit committed
1 parent
531e638179
commit
3183e73860
95 files changed
+4629
-4631
No files matched your search
+58
-58
@@ -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;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user