diff --git a/Source/automap.cpp b/Source/automap.cpp index 860acfdca..4f788a155 100644 --- a/Source/automap.cpp +++ b/Source/automap.cpp @@ -6,7 +6,7 @@ WORD automaptype[512]; static int MapX; static int MapY; -BOOL automapflag; // idb +BOOL automapflag; // idb char AmShiftTab[32]; // [31]? unsigned char automapview[DMAXX][DMAXY]; int AutoMapScale; // idb @@ -58,19 +58,19 @@ void __cdecl InitAutomap() j = 50; - for(i = 0; i < 31; i++) { + for (i = 0; i < 31; i++) { d = (j << 6) / 100; AmShiftTab[i] = 2 * (320 / d) + 1; - if(320 % d) + if (320 % d) AmShiftTab[i]++; - if(320 % d >= (j << 5) / 100) + if (320 % d >= (j << 5) / 100) AmShiftTab[i]++; j += 5; } memset(automaptype, 0, sizeof(automaptype)); - switch(leveltype) { + switch (leveltype) { case DTYPE_CATHEDRAL: pAFile = LoadFileInMem("Levels\\L1Data\\L1.AMP", (int *)&dwTiles); dwTiles >>= 1; @@ -93,7 +93,7 @@ void __cdecl InitAutomap() pTmp = pAFile; - for(i = 1; i <= dwTiles; i++) { + for (i = 1; i <= dwTiles; i++) { b1 = *pTmp++; b2 = *pTmp++; automaptype[i] = b1 + (b2 << 8); @@ -102,8 +102,8 @@ void __cdecl InitAutomap() mem_free_dbg(pAFile); memset(automapview, 0, sizeof(automapview)); - for(y = 0; y < MAXDUNY; y++) { - for(x = 0; x < MAXDUNX; x++) + for (y = 0; y < MAXDUNY; y++) { + for (x = 0; x < MAXDUNX; x++) dFlags[x][y] &= ~DFLAG_EXPLORED; } } diff --git a/Source/diablo.cpp b/Source/diablo.cpp index dee55a9bc..89b53ecae 100644 --- a/Source/diablo.cpp +++ b/Source/diablo.cpp @@ -139,7 +139,7 @@ void __fastcall run_game_loop(unsigned int uMsg) //int v6; // eax signed int v7; // [esp+8h] [ebp-24h] WNDPROC saveProc; // [esp+Ch] [ebp-20h] - MSG msg; // [esp+10h] [ebp-1Ch] + MSG msg; // [esp+10h] [ebp-1Ch] nthread_ignore_mutex(1); start_game(uMsg); diff --git a/Source/drlg_l3.cpp b/Source/drlg_l3.cpp index e5287af7a..bea47fd4c 100644 --- a/Source/drlg_l3.cpp +++ b/Source/drlg_l3.cpp @@ -1106,40 +1106,40 @@ void __cdecl DRLG_L3MakeMegas() void __cdecl DRLG_L3River() { - signed int v0; // ebx - int v1; // esi - int v2; // edi - char v3; // al - char v4; // al - signed int v5; // edx - int v6; // eax - int v7; // ebx - unsigned char v8; // al - unsigned char v9; // al - int v10; // eax - char *v11; // eax - signed int v12; // eax - int v13; // ecx - BOOLEAN v14; // zf - int v15; // eax - signed int v16; // eax - int v17; // eax - signed int v18; // eax - signed int v19; // eax - signed int v20; // edi - int v21; // eax - int v22; // eax - int v23; // edx - int v24; // ecx - int v25; // ecx - int v26; // esi - int v27; // ecx - int v28; // edx - int v29; // ecx - int v30; // edx - int v31; // ecx - int v32; // edx - BOOLEAN v33; // sf + signed int v0; // ebx + int v1; // esi + int v2; // edi + char v3; // al + char v4; // al + signed int v5; // edx + int v6; // eax + int v7; // ebx + unsigned char v8; // al + unsigned char v9; // al + int v10; // eax + char *v11; // eax + signed int v12; // eax + int v13; // ecx + BOOLEAN v14; // zf + int v15; // eax + signed int v16; // eax + int v17; // eax + signed int v18; // eax + signed int v19; // eax + signed int v20; // edi + int v21; // eax + int v22; // eax + int v23; // edx + int v24; // ecx + int v25; // ecx + int v26; // esi + int v27; // ecx + int v28; // edx + int v29; // ecx + int v30; // edx + int v31; // ecx + int v32; // edx + BOOLEAN v33; // sf //unsigned char v34; // of int river[3][100]; // [esp+Ch] [ebp-4E8h] int v36; // [esp+4BCh] [ebp-38h] diff --git a/Source/dthread.cpp b/Source/dthread.cpp index 4b8731056..e2da38c00 100644 --- a/Source/dthread.cpp +++ b/Source/dthread.cpp @@ -14,7 +14,8 @@ static HANDLE sghThread = (HANDLE)0xFFFFFFFF; // idb #ifndef _MSC_VER __attribute__((constructor)) #endif -static void dthread_c_init(void) +static void +dthread_c_init(void) { dthread_init_mutex(); dthread_cleanup_mutex_atexit(); diff --git a/Source/dx.cpp b/Source/dx.cpp index ab2a32540..c3f8add4d 100644 --- a/Source/dx.cpp +++ b/Source/dx.cpp @@ -20,7 +20,8 @@ HMODULE ghDiabMod; // idb #ifndef _MSC_VER __attribute__((constructor)) #endif -static void dx_c_init(void) +static void +dx_c_init(void) { dx_init_mutex(); dx_cleanup_mutex_atexit(); diff --git a/Source/encrypt.cpp b/Source/encrypt.cpp index f24f434ea..936d09f8b 100644 --- a/Source/encrypt.cpp +++ b/Source/encrypt.cpp @@ -60,8 +60,8 @@ void __cdecl InitHash() seed = 0x00100001; - for ( i = 0; i < 256; i++) { - for ( j = 0; j < 5; j++) { + for (i = 0; i < 256; i++) { + for (j = 0; j < 5; j++) { seed = (125 * seed + 3) % 0x2AAAAB; ch = (seed & 0xFFFF); seed = (125 * seed + 3) % 0x2AAAAB; diff --git a/Source/engine.cpp b/Source/engine.cpp index 662c19338..d083cf310 100644 --- a/Source/engine.cpp +++ b/Source/engine.cpp @@ -2,9 +2,9 @@ #include "../types.h" -char gbPixelCol; // automap pixel color 8-bit (palette entry) -int dword_52B970; // BOOLEAN flip - if y < x -int orgseed; // weak +char gbPixelCol; // automap pixel color 8-bit (palette entry) +int dword_52B970; // BOOLEAN flip - if y < x +int orgseed; // weak int sgnWidth; int sglGameSeed; // weak static CRITICAL_SECTION sgMemCrit; @@ -1468,7 +1468,7 @@ void __fastcall DrawLine(int x0, int y0, int x1, int y1, UCHAR col) int __fastcall GetDirection(int x1, int y1, int x2, int y2) { - int mx, my; + int mx, my; int md, ny; mx = x2 - x1; @@ -1537,7 +1537,8 @@ int __fastcall random(BYTE idx, int v) #ifndef _MSC_VER __attribute__((constructor)) #endif -static void engine_c_init(void) +static void +engine_c_init(void) { mem_init_mutex(); mem_atexit_mutex(); diff --git a/Source/engine.h b/Source/engine.h index c9c033a02..905a5c598 100644 --- a/Source/engine.h +++ b/Source/engine.h @@ -5,9 +5,9 @@ //offset 0 //pCelBuff->pFrameTable[0] -extern char gbPixelCol; // automap pixel color 8-bit (palette entry) -extern int dword_52B970; // bool flip - if y < x -extern int orgseed; // weak +extern char gbPixelCol; // automap pixel color 8-bit (palette entry) +extern int dword_52B970; // bool flip - if y < x +extern int orgseed; // weak extern int sgnWidth; extern int sglGameSeed; // weak extern int SeedCount; // weak diff --git a/Source/fault.cpp b/Source/fault.cpp index 146472392..c89f14cbe 100644 --- a/Source/fault.cpp +++ b/Source/fault.cpp @@ -7,7 +7,8 @@ LPTOP_LEVEL_EXCEPTION_FILTER lpTopLevelExceptionFilter; // idb #ifndef _MSC_VER __attribute__((constructor)) #endif -static void exception_c_init(void) +static void +exception_c_init(void) { exception_install_filter(); j_exception_init_filter(); diff --git a/Source/init.cpp b/Source/init.cpp index 2e92b4e44..550dfca6a 100644 --- a/Source/init.cpp +++ b/Source/init.cpp @@ -3,7 +3,7 @@ #include "../types.h" _SNETVERSIONDATA fileinfo; -int gbActive; // weak +int gbActive; // weak char diablo_exe_path[260]; void *unused_mpq; char patch_rt_mpq_path[260]; diff --git a/Source/init.h b/Source/init.h index 47773ae8b..4687ae4c5 100644 --- a/Source/init.h +++ b/Source/init.h @@ -3,7 +3,7 @@ #define __INIT_H__ extern _SNETVERSIONDATA fileinfo; -extern int gbActive; // weak +extern int gbActive; // weak extern char diablo_exe_path[260]; extern void *unused_mpq; extern char patch_rt_mpq_path[260]; diff --git a/Source/lighting.cpp b/Source/lighting.cpp index 2eb7a5bbf..e0d77cc54 100644 --- a/Source/lighting.cpp +++ b/Source/lighting.cpp @@ -482,62 +482,62 @@ void __fastcall SetLightFX(int *x, int *y, short *s_r, short *s_g, int *s_b, int void __fastcall DoLighting(int nXPos, int nYPos, int nRadius, int Lnum) { - int v4; // edi - int v5; // ebx - int v6; // ecx - int v7; // eax - int v8; // edx - int v9; // esi - int v10; // eax - char *v11; // edi - signed int v12; // ecx - int v13; // edx - _BYTE *v14; // ecx - int v15; // ebx - BOOLEAN v16; // sf + int v4; // edi + int v5; // ebx + int v6; // ecx + int v7; // eax + int v8; // edx + int v9; // esi + int v10; // eax + char *v11; // edi + signed int v12; // ecx + int v13; // edx + _BYTE *v14; // ecx + int v15; // ebx + BOOLEAN v16; // sf //unsigned char v17; // of - int v18; // esi - int v19; // ecx - char *v20; // edi - signed int v21; // eax - int v22; // edx - _BYTE *v23; // eax - int v24; // ebx - int v25; // eax - int v26; // esi - char *v27; // edi - signed int v28; // ecx - int v29; // edx - _BYTE *v30; // ecx - int v31; // ebx - signed int v32; // ebx - int v33; // ecx - char *v34; // esi - signed int v35; // eax - int v36; // edx - _BYTE *v37; // eax - int v38; // edi - short s_r[2]; // [esp+Ch] [ebp-44h] - short s_g[2]; // [esp+10h] [ebp-40h] - int s_b; // [esp+14h] [ebp-3Ch] - int d_r; // [esp+18h] [ebp-38h] - int v43; // [esp+1Ch] [ebp-34h] - int v44; // [esp+20h] [ebp-30h] - int v45; // [esp+24h] [ebp-2Ch] - int v46; // [esp+28h] [ebp-28h] - int v47; // [esp+2Ch] [ebp-24h] - int v48; // [esp+30h] [ebp-20h] - int d_g; // [esp+34h] [ebp-1Ch] - int d_b; // [esp+38h] [ebp-18h] - int v51; // [esp+3Ch] [ebp-14h] - int v52; // [esp+40h] [ebp-10h] - int y; // [esp+44h] [ebp-Ch] - int x; // [esp+48h] [ebp-8h] - int v55; // [esp+4Ch] [ebp-4h] - int Lnuma; // [esp+5Ch] [ebp+Ch] - int Lnumb; // [esp+5Ch] [ebp+Ch] - int Lnumc; // [esp+5Ch] [ebp+Ch] - int Lnumd; // [esp+5Ch] [ebp+Ch] + int v18; // esi + int v19; // ecx + char *v20; // edi + signed int v21; // eax + int v22; // edx + _BYTE *v23; // eax + int v24; // ebx + int v25; // eax + int v26; // esi + char *v27; // edi + signed int v28; // ecx + int v29; // edx + _BYTE *v30; // ecx + int v31; // ebx + signed int v32; // ebx + int v33; // ecx + char *v34; // esi + signed int v35; // eax + int v36; // edx + _BYTE *v37; // eax + int v38; // edi + short s_r[2]; // [esp+Ch] [ebp-44h] + short s_g[2]; // [esp+10h] [ebp-40h] + int s_b; // [esp+14h] [ebp-3Ch] + int d_r; // [esp+18h] [ebp-38h] + int v43; // [esp+1Ch] [ebp-34h] + int v44; // [esp+20h] [ebp-30h] + int v45; // [esp+24h] [ebp-2Ch] + int v46; // [esp+28h] [ebp-28h] + int v47; // [esp+2Ch] [ebp-24h] + int v48; // [esp+30h] [ebp-20h] + int d_g; // [esp+34h] [ebp-1Ch] + int d_b; // [esp+38h] [ebp-18h] + int v51; // [esp+3Ch] [ebp-14h] + int v52; // [esp+40h] [ebp-10h] + int y; // [esp+44h] [ebp-Ch] + int x; // [esp+48h] [ebp-8h] + int v55; // [esp+4Ch] [ebp-4h] + int Lnuma; // [esp+5Ch] [ebp+Ch] + int Lnumb; // [esp+5Ch] [ebp+Ch] + int Lnumc; // [esp+5Ch] [ebp+Ch] + int Lnumd; // [esp+5Ch] [ebp+Ch] v4 = nYPos; v5 = nXPos; diff --git a/Source/loadsave.cpp b/Source/loadsave.cpp index ab93485c8..841e24834 100644 --- a/Source/loadsave.cpp +++ b/Source/loadsave.cpp @@ -523,7 +523,7 @@ void __cdecl SaveLevel() if (!currlevel) glSeedTbl[0] = GetRndSeed(); - dwLen = codec_get_encoded_len(FILEBUFF); + dwLen = codec_get_encoded_len(FILEBUFF); SaveBuff = DiabloAllocPtr(dwLen); tbuff = SaveBuff; diff --git a/Source/logging.cpp b/Source/logging.cpp index 9686585fc..a42fabdf6 100644 --- a/Source/logging.cpp +++ b/Source/logging.cpp @@ -16,7 +16,8 @@ HANDLE log_file = (HANDLE)0xFFFFFFFF; // idb #ifndef _MSC_VER __attribute__((constructor)) #endif -static void log_c_init(void) +static void +log_c_init(void) { log_init_mutex(); j_log_cleanup_mutex(); diff --git a/Source/logging.h b/Source/logging.h index 5d510f440..3bef0a668 100644 --- a/Source/logging.h +++ b/Source/logging.h @@ -2,7 +2,7 @@ #ifndef __LOGGING_H__ #define __LOGGING_H__ -extern CHAR FileName[260]; // idb +extern CHAR FileName[260]; // idb extern char log_buffer[388]; extern LPCVOID lpAddress; // idb extern DWORD nNumberOfBytesToWrite; // idb diff --git a/Source/monster.cpp b/Source/monster.cpp index 94d3b58b9..3edba8eff 100644 --- a/Source/monster.cpp +++ b/Source/monster.cpp @@ -986,7 +986,7 @@ void __fastcall PlaceUniqueMonst(int uniqindex, int miniontype, int packsize) } sprintf(filestr, "Monsters\\Monsters\\%s.TRN", Uniq->mTrnName); - LoadFileWithMem(filestr, (BYTE*)&pLightTbl[256 * (uniquetrans + 19)]); + LoadFileWithMem(filestr, (BYTE *)&pLightTbl[256 * (uniquetrans + 19)]); Monst->_uniqtrans = uniquetrans++; @@ -2472,33 +2472,33 @@ void __fastcall M_TryH2HHit(int i, int pnum, int Hit, int MinDam, int MaxDam) int v8; // edi int v9; // eax //int v10; // ST08_4 - int v12; // ecx - int v13; // edi - int v14; // eax - int v15; // eax - int *v16; // ecx - int v17; // eax - int v18; // edi - int v19; // edx - int v20; // eax - int v21; // eax - int v22; // edx - int v23; // eax - BOOLEAN v24; // zf - BOOLEAN v25; // sf + int v12; // ecx + int v13; // edi + int v14; // eax + int v15; // eax + int *v16; // ecx + int v17; // eax + int v18; // edi + int v19; // edx + int v20; // eax + int v21; // eax + int v22; // edx + int v23; // eax + BOOLEAN v24; // zf + BOOLEAN v25; // sf //unsigned char v26; // of - int v27; // eax - int v29; // edi - int v30; // eax - int v31; // eax - int v32; // eax - int v33; // edi - int v34; // ebx - int v35; // edx - int v36; // [esp+Ch] [ebp-Ch] - int arglist; // [esp+10h] [ebp-8h] - int plr_num; // [esp+14h] [ebp-4h] - int hper; // [esp+20h] [ebp+8h] + int v27; // eax + int v29; // edi + int v30; // eax + int v31; // eax + int v32; // eax + int v33; // edi + int v34; // ebx + int v35; // edx + int v36; // [esp+Ch] [ebp-Ch] + int arglist; // [esp+10h] [ebp-8h] + int plr_num; // [esp+14h] [ebp-4h] + int hper; // [esp+20h] [ebp+8h] v5 = i; plr_num = pnum; @@ -2588,7 +2588,7 @@ void __fastcall M_TryH2HHit(int i, int pnum, int Hit, int MinDam, int MaxDam) v24 = plr[v7]._pHitPoints == v23; v25 = plr[v7]._pHitPoints - v23 < 0; *v16 = v23; - if (!(v25 | v24)) {//if (!((unsigned char)(v25 ^ v26) | v24)) { + if (!(v25 | v24)) { //if (!((unsigned char)(v25 ^ v26) | v24)) { plr[v7]._pHitPoints = v23; if (v18 >= 0) missile[v18]._miVar1 = v23; @@ -5211,24 +5211,24 @@ void __fastcall MAI_Rhino(int i) void __fastcall MAI_Counselor(int i) { - int v1; // ebx - int v2; // esi - int v3; // ecx - int v4; // edi - int v5; // edx - int v6; // ebp - char v9; // al - int v10; // ecx - BOOLEAN v11; // zf - BOOLEAN v12; // sf + int v1; // ebx + int v2; // esi + int v3; // ecx + int v4; // edi + int v5; // edx + int v6; // ebp + char v9; // al + int v10; // ecx + BOOLEAN v11; // zf + BOOLEAN v12; // sf //unsigned char v13; // of - int v14; // edx - int v15; // ecx - int v16; // ebx - int v17; // eax - int v18; // ebx - int v19; // edx - int v20; // ecx + int v14; // edx + int v15; // ecx + int v16; // ebx + int v17; // eax + int v18; // ebx + int v19; // edx + int v20; // ecx //int v21; // eax int v22; // eax //int v23; // ST1C_4 @@ -5273,7 +5273,7 @@ void __fastcall MAI_Counselor(int i) v14 = v10 + 1; v15 = v1; monster[v2]._mgoalvar1 = v14; - if (v12 | v11) {//if ((unsigned char)(v12 ^ v13) | v11) { + if (v12 | v11) { //if ((unsigned char)(v12 ^ v13) | v11) { M_CallWalk(v1, opposite[md]); goto LABEL_39; } @@ -5344,7 +5344,7 @@ void __fastcall MAI_Counselor(int i) //v13 = __OFSUB__(monster[v2]._mhitpoints, v28); v12 = monster[v2]._mhitpoints - v28 < 0; monster[v2]._mdir = md; - if (v12) {//if (v12 ^ v13) { + if (v12) { //if (v12 ^ v13) { _LOBYTE(monster[v2]._mgoal) = MGOAL_RETREAT; LABEL_29: monster[v2]._mgoalvar1 = 0; @@ -5462,7 +5462,6 @@ void __fastcall MAI_SnotSpil(int i) int mx, my, md; MonsterStruct *Monst; - if ((DWORD)i >= MAXMONSTERS) TermMsg("MAI_SnotSpil: Invalid monster %d", i); diff --git a/Source/mpqapi.h b/Source/mpqapi.h index 0ad24d385..0b15d7ef5 100644 --- a/Source/mpqapi.h +++ b/Source/mpqapi.h @@ -2,7 +2,7 @@ #ifndef __MPQAPI_H__ #define __MPQAPI_H__ -extern int sgdwMpqOffset; // idb +extern int sgdwMpqOffset; // idb extern char mpq_buf[4096]; extern _HASHENTRY *sgpHashTbl; extern BOOLEAN save_archive_modified; // weak diff --git a/Source/msgcmd.cpp b/Source/msgcmd.cpp index 7ae39a4f0..5ba61058a 100644 --- a/Source/msgcmd.cpp +++ b/Source/msgcmd.cpp @@ -10,7 +10,8 @@ int sgdwMsgCmdTimer; #ifndef _MSC_VER __attribute__((constructor)) #endif -static void msgcmd_c_init(void) +static void +msgcmd_c_init(void) { exception_install_filter(); j_exception_init_filter(); diff --git a/Source/multi.cpp b/Source/multi.cpp index 4e74ecef1..1b6ef1ad9 100644 --- a/Source/multi.cpp +++ b/Source/multi.cpp @@ -9,10 +9,10 @@ short sgwPackPlrOffsetTbl[MAX_PLRS]; PkPlayerStruct netplr[MAX_PLRS]; char sgbPlayerTurnBitTbl[MAX_PLRS]; char sgbPlayerLeftGameTbl[MAX_PLRS]; -int sgbSentThisCycle; // idb -int dword_678628; // weak -BYTE gbActivePlayers; // weak -char gbGameDestroyed; // weak +int sgbSentThisCycle; // idb +int dword_678628; // weak +BYTE gbActivePlayers; // weak +char gbGameDestroyed; // weak char sgbSendDeltaTbl[MAX_PLRS]; _gamedata sgGameInitInfo; char byte_678640; // weak diff --git a/Source/multi.h b/Source/multi.h index 26e210e8d..0b939688e 100644 --- a/Source/multi.h +++ b/Source/multi.h @@ -9,8 +9,8 @@ extern short sgwPackPlrOffsetTbl[MAX_PLRS]; extern PkPlayerStruct netplr[MAX_PLRS]; extern char sgbPlayerTurnBitTbl[MAX_PLRS]; extern char sgbPlayerLeftGameTbl[MAX_PLRS]; -extern int sgbSentThisCycle; // idb -extern int dword_678628; // weak +extern int sgbSentThisCycle; // idb +extern int dword_678628; // weak extern BYTE gbActivePlayers; extern char gbGameDestroyed; // weak extern char sgbSendDeltaTbl[MAX_PLRS]; diff --git a/Source/nthread.cpp b/Source/nthread.cpp index 2880db355..28bdc0100 100644 --- a/Source/nthread.cpp +++ b/Source/nthread.cpp @@ -25,7 +25,8 @@ static HANDLE sghThread = (HANDLE)0xFFFFFFFF; // idb #ifndef _MSC_VER __attribute__((constructor)) #endif -static void nthread_c_init(void) +static void +nthread_c_init(void) { nthread_init_mutex(); nthread_cleanup_mutex_atexit(); diff --git a/Source/nthread.h b/Source/nthread.h index 796b7c999..d690b4976 100644 --- a/Source/nthread.h +++ b/Source/nthread.h @@ -2,7 +2,7 @@ #ifndef __NTHREAD_H__ #define __NTHREAD_H__ -extern char byte_679704; // weak +extern char byte_679704; // weak extern int gdwMsgLenTbl[4]; extern int gdwDeltaBytesSec; // weak extern char nthread_should_run; // weak diff --git a/Source/player.cpp b/Source/player.cpp index a82d57d5c..b713f86cf 100644 --- a/Source/player.cpp +++ b/Source/player.cpp @@ -106,7 +106,6 @@ int ExpLvlsTbl[MAXCHARLEVEL] = { char *ClassStrTbl[3] = { "Warrior", "Rogue", "Sorceror" }; unsigned char fix[9] = { 0u, 0u, 3u, 3u, 3u, 6u, 6u, 6u, 8u }; /* PM_ChangeLightOff local type */ - void __fastcall SetPlayerGPtrs(UCHAR *pData, UCHAR **pAnim) { int i; diff --git a/Source/player.h b/Source/player.h index 51b8fc03e..a90288873 100644 --- a/Source/player.h +++ b/Source/player.h @@ -5,7 +5,7 @@ extern int plr_lframe_size; // idb extern int plr_wframe_size; // idb extern UCHAR plr_gfx_flag; -extern int plr_aframe_size; // idb +extern int plr_aframe_size; // idb extern int myplr; extern PlayerStruct plr[MAX_PLRS]; extern int plr_fframe_size; // idb diff --git a/Source/scrollrt.cpp b/Source/scrollrt.cpp index 9aef35c19..706639f83 100644 --- a/Source/scrollrt.cpp +++ b/Source/scrollrt.cpp @@ -10,9 +10,9 @@ int sgdwCursY; // idb unsigned char *gpBufEnd; // weak int sgdwCursHgt; DWORD level_cel_block; // weak -int sgdwCursXOld; // idb -int sgdwCursYOld; // idb -char arch_draw_type; // weak +int sgdwCursXOld; // idb +int sgdwCursYOld; // idb +char arch_draw_type; // weak DDSURFACEDESC DDS_desc; int cel_transparency_active; // weak int level_piece_id; // weak @@ -2547,18 +2547,18 @@ void __cdecl ScrollView() { BOOL scroll; - if(pcurs >= CURSOR_FIRSTITEM) + if (pcurs >= CURSOR_FIRSTITEM) return; scroll = FALSE; - if(MouseX < 20) { - if(dmaxy - 1 <= ViewY || dminx >= ViewX) { - if(dmaxy - 1 > ViewY) { + if (MouseX < 20) { + if (dmaxy - 1 <= ViewY || dminx >= ViewX) { + if (dmaxy - 1 > ViewY) { ViewY++; scroll = TRUE; } - if(dminx < ViewX) { + if (dminx < ViewX) { ViewX--; scroll = TRUE; } @@ -2568,13 +2568,13 @@ void __cdecl ScrollView() scroll = TRUE; } } - if(MouseX > 640-20) { - if(dmaxx - 1 <= ViewX || dminy >= ViewY) { - if(dmaxx - 1 > ViewX) { + if (MouseX > 640 - 20) { + if (dmaxx - 1 <= ViewX || dminy >= ViewY) { + if (dmaxx - 1 > ViewX) { ViewX++; scroll = TRUE; } - if(dminy < ViewY) { + if (dminy < ViewY) { ViewY--; scroll = TRUE; } @@ -2584,13 +2584,13 @@ void __cdecl ScrollView() scroll = TRUE; } } - if(MouseY < 20) { - if(dminy >= ViewY || dminx >= ViewX) { - if(dminy < ViewY) { + if (MouseY < 20) { + if (dminy >= ViewY || dminx >= ViewX) { + if (dminy < ViewY) { ViewY--; scroll = TRUE; } - if(dminx < ViewX) { + if (dminx < ViewX) { ViewX--; scroll = TRUE; } @@ -2600,13 +2600,13 @@ void __cdecl ScrollView() scroll = TRUE; } } - if(MouseY > 480-20) { - if(dmaxy - 1 <= ViewY || dmaxx - 1 <= ViewX) { - if(dmaxy - 1 > ViewY) { + if (MouseY > 480 - 20) { + if (dmaxy - 1 <= ViewY || dmaxx - 1 <= ViewX) { + if (dmaxy - 1 > ViewY) { ViewY++; scroll = TRUE; } - if(dmaxx - 1 > ViewX) { + if (dmaxx - 1 > ViewX) { ViewX++; scroll = TRUE; } @@ -2617,7 +2617,7 @@ void __cdecl ScrollView() } } - if(scroll) + if (scroll) ScrollInfo._sdir = SDIR_NONE; } diff --git a/Source/scrollrt.h b/Source/scrollrt.h index 140e832bf..4be39a5d9 100644 --- a/Source/scrollrt.h +++ b/Source/scrollrt.h @@ -10,9 +10,9 @@ extern int sgdwCursY; // idb extern unsigned char *gpBufEnd; // weak extern int sgdwCursHgt; extern DWORD level_cel_block; // weak -extern int sgdwCursXOld; // idb -extern int sgdwCursYOld; // idb -extern char arch_draw_type; // weak +extern int sgdwCursXOld; // idb +extern int sgdwCursYOld; // idb +extern char arch_draw_type; // weak extern DDSURFACEDESC DDS_desc; extern int cel_transparency_active; // weak extern int level_piece_id; // weak diff --git a/Source/sound.cpp b/Source/sound.cpp index 9b4197022..9376eb0d9 100644 --- a/Source/sound.cpp +++ b/Source/sound.cpp @@ -134,7 +134,6 @@ void __fastcall snd_play_snd(TSnd *pSnd, int lVolume, int lPan) error_code = DSB->lpVtbl->Play(DSB, 0, 0, 0); #endif - if (error_code != DSERR_BUFFERLOST) { if (error_code != DS_OK) { DSErrMsg(error_code, 261, "C:\\Src\\Diablo\\Source\\SOUND.CPP"); diff --git a/Source/stores.cpp b/Source/stores.cpp index af8bffcd0..923589d4a 100644 --- a/Source/stores.cpp +++ b/Source/stores.cpp @@ -2676,11 +2676,11 @@ void __fastcall PlaceStoreGold(int v) void __cdecl StoreSellItem() { - int idx; // ebx - char v1; // al - int v2; // eax - int cost; // ebp - BOOLEAN v4; // sf + int idx; // ebx + char v1; // al + int v2; // eax + int cost; // ebp + BOOLEAN v4; // sf //unsigned char v5; // of unsigned int v6; // eax int v8; // edx @@ -2699,7 +2699,7 @@ void __cdecl StoreSellItem() cost = storehold[idx]._iIvalue; //v5 = __OFSUB__(idx, storenumh - 1); v4 = idx - (storenumh-- - 1) < 0; - if (v4) {//if (v4 ^ v5) { + if (v4) { //if (v4 ^ v5) { v6 = v2 - idx; qmemcpy(&storehidx[idx], &storehidx[idx + 1], v6); qmemcpy(&storehold[idx], &storehold[idx + 1], 4 * (368 * v6 >> 2)); @@ -2803,12 +2803,12 @@ void __cdecl SmithRepairItem() void __cdecl S_SRepairEnter() { - int idx; // eax - int v1; // edx - int v2; // ecx - BOOLEAN v3; // sf + int idx; // eax + int v1; // edx + int v2; // ecx + BOOLEAN v3; // sf //unsigned char v4; // of - char v5; // cl + char v5; // cl if (stextsel == 22) { StartStore(STORE_SMITH); @@ -2824,7 +2824,7 @@ void __cdecl S_SRepairEnter() //v4 = __OFSUB__(v2, storehold[idx]._iIvalue); v3 = v2 - storehold[idx]._iIvalue < 0; v5 = STORE_NOMONEY; - if (!v3)//if (!(v3 ^ v4)) + if (!v3) //if (!(v3 ^ v4)) v5 = STORE_CONFIRM; StartStore(v5); } @@ -3001,12 +3001,12 @@ void __cdecl WitchRechargeItem() void __cdecl S_WRechargeEnter() { - int idx; // eax - int v1; // edx - int v2; // ecx - BOOLEAN v3; // sf + int idx; // eax + int v1; // edx + int v2; // ecx + BOOLEAN v3; // sf //unsigned char v4; // of - char v5; // cl + char v5; // cl if (stextsel == 22) { StartStore(STORE_WITCH); @@ -3022,7 +3022,7 @@ void __cdecl S_WRechargeEnter() //v4 = __OFSUB__(v2, storehold[idx]._iIvalue); v3 = v2 - storehold[idx]._iIvalue < 0; v5 = STORE_NOMONEY; - if (!v3)//if (!(v3 ^ v4)) + if (!v3) //if (!(v3 ^ v4)) v5 = STORE_CONFIRM; StartStore(v5); } @@ -3082,17 +3082,17 @@ void __cdecl BoyBuyItem() void __cdecl HealerBuyItem() { - int idx; // esi - BOOLEAN v1; // sf + int idx; // esi + BOOLEAN v1; // sf //unsigned char v2; // of - int v3; // eax - int v4; // ecx - BOOLEAN v5; // sf + int v3; // eax + int v4; // ecx + BOOLEAN v5; // sf //unsigned char v6; // of - int v7; // eax - ItemStruct *v8; // edx - ItemStruct *v9; // edi - BOOLEAN v10; // zf + int v7; // eax + ItemStruct *v8; // edx + ItemStruct *v9; // edi + BOOLEAN v10; // zf idx = stextvhold + ((stextlhold - stextup) >> 2); if (gbMaxPlayers == 1) { @@ -3102,7 +3102,7 @@ void __cdecl HealerBuyItem() //v2 = __OFSUB__(idx, 3); v1 = idx - 3 < 0; } - if (v1) {//if (v1 ^ v2) { + if (v1) { //if (v1 ^ v2) { v3 = GetRndSeed(); v4 = myplr; plr[myplr].HoldItem._iSeed = v3; @@ -3120,7 +3120,7 @@ void __cdecl HealerBuyItem() //v6 = __OFSUB__(idx, 3); v5 = idx - 3 < 0; } - if (!v5) {//if (!(v5 ^ v6)) { + if (!v5) { //if (!(v5 ^ v6)) { v7 = stextvhold + ((stextlhold - stextup) >> 2); if (v7 == 19) { healitem[19]._itype = -1; @@ -3404,12 +3404,12 @@ void __cdecl S_StoryEnter() void __cdecl S_SIDEnter() { - int idx; // eax - int v1; // edx - int v2; // ecx - BOOLEAN v3; // sf + int idx; // eax + int v1; // edx + int v2; // ecx + BOOLEAN v3; // sf //unsigned char v4; // of - char v5; // cl + char v5; // cl if (stextsel == 22) { StartStore(STORE_STORY); @@ -3425,7 +3425,7 @@ void __cdecl S_SIDEnter() //v4 = __OFSUB__(v2, storehold[idx]._iIvalue); v3 = v2 - storehold[idx]._iIvalue < 0; v5 = STORE_NOMONEY; - if (!v3)//if (!(v3 ^ v4)) + if (!v3) //if (!(v3 ^ v4)) v5 = STORE_CONFIRM; StartStore(v5); } @@ -3664,10 +3664,10 @@ void __cdecl STextEnter() void __cdecl CheckStoreBtn() { - BOOLEAN v0; // sf + BOOLEAN v0; // sf //unsigned char v1; // of - int v2; // eax - int *v3; // ecx + int v2; // eax + int *v3; // ecx if (qtextflag) { qtextflag = FALSE; @@ -3681,7 +3681,7 @@ void __cdecl CheckStoreBtn() //v1 = __OFSUB__(MouseX, 344); v0 = MouseX - 344 < 0; } - if (!v0 && MouseX <= 616) {//if (!(v0 ^ v1) && MouseX <= 616) { + if (!v0 && MouseX <= 616) { //if (!(v0 ^ v1) && MouseX <= 616) { v2 = (MouseY - 32) / 12; if (stextscrl && MouseX > 600) { if (v2 == 4) {