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

Merge pull request #763 from qndel/AddTortures

Browse source 
AddTortures almost bin exact
This commit is contained in:
Robin Eklind 2019-04-02 20:05:23 +09:00 • committed by GitHub
commit b58b698da4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

45
Source/objects.cpp
View file

@ -538,36 +538,27 @@ void __cdecl ClrAllObjects()
void __cdecl AddTortures()
{
int v0; // esi
int v1; // edi
_DWORD *v2; // [esp+Ch] [ebp-4h]
int ox, oy;
v0 = 0;
do {
v1 = 2;
v2 = (_DWORD *)((char *)dPiece + 4 * v0);
do {
if (*v2 == 367) {
AddObject(OBJ_TORTURE1, v1 - 2, v0 + 1);
AddObject(OBJ_TORTURE3, v1, v0 - 1);
AddObject(OBJ_TORTURE2, v1 - 2, v0 + 3);
AddObject(OBJ_TORTURE4, v1 + 2, v0 - 1);
AddObject(OBJ_TORTURE5, v1 - 2, v0 + 5);
AddObject(OBJ_TNUDEM1, v1 - 1, v0 + 3);
AddObject(OBJ_TNUDEM2, v1 + 2, v0 + 5);
AddObject(OBJ_TNUDEM3, v1, v0);
AddObject(OBJ_TNUDEM4, v1 + 1, v0 + 2);
AddObject(OBJ_TNUDEW1, v1, v0 + 4);
AddObject(OBJ_TNUDEW2, v1, v0 + 1);
AddObject(OBJ_TNUDEW3, v1 + 2, v0 + 2);
for (oy = 0; oy < MAXDUNY; oy++) {
for (ox = 0; ox < MAXDUNX; ox++) {
if (dPiece[ox][oy] == 367) {
AddObject(OBJ_TORTURE1, ox, oy + 1);
AddObject(OBJ_TORTURE3, ox + 2, oy - 1);
AddObject(OBJ_TORTURE2, ox, oy + 3);
AddObject(OBJ_TORTURE4, ox + 4, oy - 1);
AddObject(OBJ_TORTURE5, ox, oy + 5);
AddObject(OBJ_TNUDEM1, ox + 1, oy + 3);
AddObject(OBJ_TNUDEM2, ox + 4, oy + 5);
AddObject(OBJ_TNUDEM3, ox + 2, oy);
AddObject(OBJ_TNUDEM4, ox + 3, oy + 2);
AddObject(OBJ_TNUDEW1, ox + 2, oy + 4);
AddObject(OBJ_TNUDEW2, ox + 2, oy + 1);
AddObject(OBJ_TNUDEW3, ox + 4, oy + 2);
}
v2 += 112;
++v1;
} while (v1 - 2 < 112);
++v0;
} while (v0 < 112);
}
}
}
void __cdecl AddCandles()
{
int v0; // esi