Browse Source

Clean up CheckBlock

pull/31/head
Anders Jenbo 7 years ago
parent
commit
8800c4079c
  1. 29
      Source/missiles.cpp
  2. 2
      Source/missiles.h

29
Source/missiles.cpp

@ -414,24 +414,21 @@ void __fastcall GetDamageAmt(int i, int *mind, int *maxd)
} }
} }
int __fastcall CheckBlock(int fx, int fy, int tx, int ty) BOOL __fastcall CheckBlock(int fx, int fy, int tx, int ty)
{ {
int v4; // edi int pn;
int v5; // esi BOOL coll;
int v6; // ebx
int v7; // eax
v4 = fy; coll = FALSE;
v5 = fx; while (fx != tx || fy != ty) {
v6 = 0; pn = GetDirection(fx, fy, tx, ty);
while (v5 != tx || v4 != ty) { fx += XDirAdd[pn];
v7 = GetDirection(v5, v4, tx, ty); fy += YDirAdd[pn];
v5 += XDirAdd[v7]; if (nSolidTable[dPiece[fx][fy]])
v4 += YDirAdd[v7]; coll = TRUE;
if (nSolidTable[dPiece[v5][v4]]) }
v6 = 1;
} return coll;
return v6;
} }
int __fastcall FindClosest(int sx, int sy, int rad) int __fastcall FindClosest(int sx, int sy, int rad)

2
Source/missiles.h

@ -12,7 +12,7 @@ extern int MissilePreFlag; // weak
extern int numchains; // weak extern int numchains; // weak
void __fastcall GetDamageAmt(int i, int *mind, int *maxd); void __fastcall GetDamageAmt(int i, int *mind, int *maxd);
int __fastcall CheckBlock(int fx, int fy, int tx, int ty); BOOL __fastcall CheckBlock(int fx, int fy, int tx, int ty);
int __fastcall FindClosest(int sx, int sy, int rad); int __fastcall FindClosest(int sx, int sy, int rad);
int __fastcall GetSpellLevel(int id, int sn); int __fastcall GetSpellLevel(int id, int sn);
int __fastcall GetDirection8(int x1, int y1, int x2, int y2); int __fastcall GetDirection8(int x1, int y1, int x2, int y2);

Loading…
Cancel
Save