mirror
/
devilutionX
mirror of https://github.com/diasurgical/devilutionX.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Fix sgJunk array (#177)

pull/4/head
galaxyhaxz 8 years ago committed by GitHub
parent
5ed2336e90
commit
6fbb559a30
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 17 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 32
      Source/msg.cpp
  2. 2
      Source/msg.h

32
Source/msg.cpp
Unescape View File

@ -12,7 +12,7 @@ TMegaPkt *sgpCurrPkt;
char sgRecvBuf[4722]; char sgRecvBuf[4722];
unsigned char sgbRecvCmd; // idb unsigned char sgbRecvCmd; // idb
LocalLevel sgLocals[NUMLEVELS]; LocalLevel sgLocals[NUMLEVELS];
DJunk sgJunk[4]; DJunk sgJunk;
TMegaPkt *sgpMegaPkt; TMegaPkt *sgpMegaPkt;
char sgbDeltaChanged; // weak char sgbDeltaChanged; // weak
char sgbDeltaChunks; // weak char sgbDeltaChunks; // weak
@ -352,8 +352,8 @@ char *__fastcall DeltaExportJunk(char *a1)
int *v5; // ebp int *v5; // ebp
v1 = a1; v1 = a1;
v2 = sgJunk; v2 = &sgJunk;
v3 = sgJunk[0].quests; v3 = sgJunk.quests;
do do
{ {
if ( v2->portal[0].x == -1 ) if ( v2->portal[0].x == -1 )
@ -367,7 +367,7 @@ char *__fastcall DeltaExportJunk(char *a1)
} }
v2 = (DJunk *)((char *)v2 + 5); v2 = (DJunk *)((char *)v2 + 5);
} }
while ( (signed int)v2 < (signed int)sgJunk[0].quests ); while ( (signed int)v2 < (signed int)sgJunk.quests );
v4 = &quests[0]._qactive; v4 = &quests[0]._qactive;
v5 = &questlist[0]._qflags; v5 = &questlist[0]._qflags;
do do
@ -404,7 +404,7 @@ int __fastcall msg_comp_level(char *buffer, int size)
void __cdecl delta_init() void __cdecl delta_init()
{ {
sgbDeltaChanged = 0; sgbDeltaChanged = 0;
memset(sgJunk, 255, 0x20u); memset(&sgJunk, 255, 0x20u);
memset(sgLevels, 255, 0x13981u); memset(sgLevels, 255, 0x13981u);
memset(sgLocals, 0, 0x6A40u); memset(sgLocals, 0, 0x6A40u);
deltaload = 0; deltaload = 0;
@ -537,12 +537,12 @@ void __fastcall delta_leave_sync(unsigned char bLevel)
bool __fastcall delta_portal_inited(int i) bool __fastcall delta_portal_inited(int i)
{ {
return sgJunk[0].portal[i].x == -1; return sgJunk.portal[i].x == -1;
} }
bool __fastcall delta_quest_inited(int i) bool __fastcall delta_quest_inited(int i)
{ {
return sgJunk[0].quests[i].qstate != -1; return sgJunk.quests[i].qstate != -1;
} }
void __fastcall DeltaAddItem(int ii) void __fastcall DeltaAddItem(int ii)
@ -1353,7 +1353,7 @@ void __fastcall NetSendCmdString(int a1, const char *pszStr)
void __fastcall RemovePlrPortal(int pnum) void __fastcall RemovePlrPortal(int pnum)
{ {
memset((char *)sgJunk + 5 * pnum, 255, 5u); memset(&sgJunk.portal[pnum], 255, 5u);
sgbDeltaChanged = 1; sgbDeltaChanged = 1;
} }
// 67618C: using guessed type char sgbDeltaChanged; // 67618C: using guessed type char sgbDeltaChanged;
@ -1697,7 +1697,7 @@ char __fastcall DeltaImportJunk(int a1)
v1 = (_BYTE *)a1; v1 = (_BYTE *)a1;
v2 = 0; v2 = 0;
v3 = sgJunk; v3 = &sgJunk;
do do
{ {
if ( *v1 == -1 ) if ( *v1 == -1 )
@ -1721,8 +1721,8 @@ char __fastcall DeltaImportJunk(int a1)
v3 = (DJunk *)((char *)v3 + 5); v3 = (DJunk *)((char *)v3 + 5);
++v2; ++v2;
} }
while ( (signed int)v3 < (signed int)sgJunk[0].quests ); while ( (signed int)v3 < (signed int)sgJunk.quests );
v5 = sgJunk[0].quests; v5 = sgJunk.quests;
v6 = &quests[0]._qactive; v6 = &quests[0]._qactive;
v7 = &questlist[0]._qflags; v7 = &questlist[0]._qflags;
do do
@ -3579,11 +3579,11 @@ void __fastcall delta_open_portal(int pnum, int x, int y, int bLevel, int bLType
v6 = pnum; v6 = pnum;
sgbDeltaChanged = 1; sgbDeltaChanged = 1;
sgJunk[0].portal[v6].y = y; sgJunk.portal[v6].y = y;
sgJunk[0].portal[v6].level = bLevel; sgJunk.portal[v6].level = bLevel;
sgJunk[0].portal[v6].ltype = bLType; sgJunk.portal[v6].ltype = bLType;
sgJunk[0].portal[v6].x = x; sgJunk.portal[v6].x = x;
sgJunk[0].portal[v6].setlvl = bSetLvl; sgJunk.portal[v6].setlvl = bSetLvl;
} }
// 67618C: using guessed type char sgbDeltaChanged; // 67618C: using guessed type char sgbDeltaChanged;

2
Source/msg.h
Unescape View File

@ -12,7 +12,7 @@ extern TMegaPkt *sgpCurrPkt;
extern char sgRecvBuf[4722]; extern char sgRecvBuf[4722];
extern unsigned char sgbRecvCmd; // idb extern unsigned char sgbRecvCmd; // idb
extern LocalLevel sgLocals[NUMLEVELS]; extern LocalLevel sgLocals[NUMLEVELS];
extern DJunk sgJunk[4]; extern DJunk sgJunk;
extern TMegaPkt *sgpMegaPkt; extern TMegaPkt *sgpMegaPkt;
extern char sgbDeltaChanged; // weak extern char sgbDeltaChanged; // weak
extern char sgbDeltaChunks; // weak extern char sgbDeltaChunks; // weak

Write Preview
Loading…
Cancel
Save