sydney/3d-pinball-space-cadet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clean up extra decorators

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Classes/TKickback/TKickback.cpp
+37 -37
View File
@@ -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;