clean up extra decorators

This commit is contained in:
Sydney Biscuit committed 2019-08-18 16:44:11 -07:00
1 parent 531e638179
commit 3183e73860
95 files changed
+4629 -4631

No files matched your search

+52 -52
View File
@@ -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;
}