diasurgical/devilution
1
0
Fork 0
mirror of https://github.com/diasurgical/devilution.git synced 2026-06-20 05:46:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

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
parent 13126a90d6
commit 2a377ea876
6 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/scrollrt.cpp
+9 -9
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);
}
}
}