MattTheTekie/devilutionX
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix some struct names and lighting (#190)

Browse source
This commit is contained in:
galaxyhaxz 2018-09-04 12:31:58 -05:00 • committed by GitHub
commit 2a377ea876
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 30 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Source/dead.cpp
View file

@ -60,8 +60,8 @@ void __cdecl InitDead()
_LOBYTE(dead[v4]._deadtrans) = 0;
dead[v4]._deadFrame = 8;
v5 = (unsigned int)misfiledata[18].mAnimData[0];
dead[v4].field_24 = 128;
dead[v4].field_28 = 32;
dead[v4]._deadWidth = 128;
dead[v4]._deadWidth2 = 32;
v6 = v0 + 1;
spurtndx = v0 + 1;
memset32(&dead[v6], v5, 8u);
@ -69,8 +69,8 @@ void __cdecl InitDead()
stonendx = v0 + 2;
v7 = nummonsters;
dead[v6]._deadFrame = 12;
dead[v6].field_24 = 128;
dead[v6].field_28 = 32;
dead[v6]._deadWidth = 128;
dead[v6]._deadWidth2 = 32;
v17 = v0 + 2;
if ( v7 > 0 )
{

6
Source/lighting.cpp
View file

@ -274,7 +274,7 @@ char CrawlTable[2749] =
-15, -3, 15, -3, -15, 2, 15, 2,
-15, -2, 15, -2, -15, 1, 15, 1,
-15, -1, 15, -1, -15, 0, 15, 0,
128,
(char)128,
0, 16, 0, -16, -1, 16, 1, 16,
-1, -16, 1, -16, -2, 16, 2, 16,
-2, -16, 2, -16, -3, 16, 3, 16,
@ -307,7 +307,7 @@ char CrawlTable[2749] =
-16, -3, 16, -3, -16, 2, 16, 2,
-16, -2, 16, -2, -16, 1, 16, 1,
-16, -1, 16, -1, -16, 0, 16, 0,
136,
(char)136,
0, 17, 0, -17, -1, 17, 1, 17,
-1, -17, 1, -17, -2, 17, 2, 17,
-2, -17, 2, -17, -3, 17, 3, 17,
@ -342,7 +342,7 @@ char CrawlTable[2749] =
-17, -3, 17, -3, -17, 2, 17, 2,
-17, -2, 17, -2, -17, 1, 17, 1,
-17, -1, 17, -1, -17, 0, 17, 0,
144,
(char)144,
0, 18, 0, -18, -1, 18, 1, 18,
-1, -18, 1, -18, -2, 18, 2, 18,
-2, -18, 2, -18, -3, 18, 3, 18,

12
Source/missiles.cpp
View file

@ -7,9 +7,9 @@ int missileavail[MAXMISSILES];
MissileStruct missile[MAXMISSILES];
int nummissiles; // idb
int ManashieldFlag;
unk_missile_struct misflagstruct_unknown[MAXMISSILES];
ChainStruct chain[MAXMISSILES];
int MissilePreFlag; // weak
int unk_missile_flag; // weak
int numchains; // weak
MissileData missiledata[68] =
{
@ -2316,8 +2316,8 @@ void __cdecl InitMissiles()
++v4;
}
while ( v4 < MAXMISSILES );
unk_missile_flag = 0;
v5 = &misflagstruct_unknown[0].field_4;
numchains = 0;
v5 = &chain[0]._mitype;
do
{
*(v5 - 1) = -1;
@ -2325,7 +2325,7 @@ void __cdecl InitMissiles()
v5[1] = 0;
v5 += 3;
}
while ( (signed int)v5 < (signed int)&misflagstruct_unknown[MAXMISSILES].field_4 );
while ( (signed int)v5 < (signed int)&chain[MAXMISSILES]._mitype );
v6 = 0;
do
{
@ -2342,7 +2342,7 @@ void __cdecl InitMissiles()
}
while ( v6 < 112 );
}
// 64CCD8: using guessed type int unk_missile_flag;
// 64CCD8: using guessed type int numchains;
void __fastcall AddLArrow(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam)
{

4
Source/missiles.h
View file

@ -7,9 +7,9 @@ extern int missileavail[MAXMISSILES];
extern MissileStruct missile[MAXMISSILES];
extern int nummissiles; // idb
extern int ManashieldFlag;
extern unk_missile_struct misflagstruct_unknown[MAXMISSILES];
extern ChainStruct chain[MAXMISSILES];
extern int MissilePreFlag; // weak
extern int unk_missile_flag; // weak
extern int numchains; // weak
void __fastcall GetDamageAmt(int i, int *mind, int *maxd);
int __fastcall CheckBlock(int fx, int fy, int tx, int ty);

18
Source/scrollrt.cpp
View file

@ -979,7 +979,7 @@ void __fastcall scrollrt_draw_clipped_dungeon(char *a1, int sx, int sy, int a4,
{
v11 = &dead[(v7 & 0x1F) - 1];
v12 = (int *)v11->_deadData[(v7 >> 5) & 7];
v13 = a4 - v11->field_28;
v13 = a4 - v11->_deadWidth2;
if ( v12 )
{
v14 = v11->_deadFrame;
@ -987,9 +987,9 @@ void __fastcall scrollrt_draw_clipped_dungeon(char *a1, int sx, int sy, int a4,
{
v15 = v11->_deadtrans;
if ( v15 )
Cl2DecodeFrm5(v13, a5, (char *)v12, v14, v11->field_24, 0, 8, v15);
Cl2DecodeFrm5(v13, a5, (char *)v12, v14, v11->_deadWidth, 0, 8, v15);
else
Cl2DecodeFrm6(v13, a5, (char *)v12, v14, v11->field_24, 0, 8);
Cl2DecodeFrm6(v13, a5, (char *)v12, v14, v11->_deadWidth, 0, 8);
}
}
}
@ -1652,7 +1652,7 @@ void __fastcall scrollrt_draw_clipped_dungeon_2(char *buffer, int x, int y, int
{
v14 = &dead[(v9 & 0x1F) - 1];
v15 = (int *)v14->_deadData[(v9 >> 5) & 7];
v16 = v13 - v14->field_28;
v16 = v13 - v14->_deadWidth2;
if ( v15 )
{
v17 = v14->_deadFrame;
@ -1660,9 +1660,9 @@ void __fastcall scrollrt_draw_clipped_dungeon_2(char *buffer, int x, int y, int
{
v18 = v14->_deadtrans;
if ( v18 )
Cl2DecodeFrm5(v16, sy, (char *)v15, v17, v14->field_24, a5, 8, v18);
Cl2DecodeFrm5(v16, sy, (char *)v15, v17, v14->_deadWidth, a5, 8, v18);
else
Cl2DecodeFrm6(v16, sy, (char *)v15, v17, v14->field_24, a5, 8);
Cl2DecodeFrm6(v16, sy, (char *)v15, v17, v14->_deadWidth, a5, 8);
}
}
}
@ -2254,7 +2254,7 @@ void __fastcall scrollrt_draw_dungeon(char *buffer, int x, int y, int a4, int a5
{
v13 = &dead[(v9 & 0x1F) - 1];
v14 = (int *)v13->_deadData[(v9 >> 5) & 7];
v15 = sx - v13->field_28;
v15 = sx - v13->_deadWidth2;
if ( v14 )
{
v16 = v13->_deadFrame;
@ -2262,9 +2262,9 @@ void __fastcall scrollrt_draw_dungeon(char *buffer, int x, int y, int a4, int a5
{
v17 = v13->_deadtrans;
if ( v17 )
Cl2DecodeFrm3(v15, sy, (char *)v14, v16, v13->field_24, 0, a5, v17);
Cl2DecodeFrm3(v15, sy, (char *)v14, v16, v13->_deadWidth, 0, a5, v17);
else
Cl2DecodeLightTbl(v15, sy, (char *)v14, v16, v13->field_24, 0, a5);
Cl2DecodeLightTbl(v15, sy, (char *)v14, v16, v13->_deadWidth, 0, a5);
}
}
}

12
structs.h
View file

@ -378,11 +378,11 @@ struct MisFileData
int mAnimWidth2[16];
};
struct unk_missile_struct
struct ChainStruct
{
int field_0;
int field_4;
int field_8;
int idx;
int _mitype;
int _mirange;
};
struct MissileStruct
@ -1226,8 +1226,8 @@ struct DeadStruct
{
unsigned char *_deadData[8];
int _deadFrame;
int field_24; // width
int field_28; // cel or fnum _deadtype?
int _deadWidth;
int _deadWidth2;
int _deadtrans;
};