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/TRamp/TRamp.cpp
+73 -73
View File
@@ -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;
}