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/TComponentGroup/TComponentGroup.cpp
+17 -17
View File
@@ -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;