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

Clean up (#568) 

* Clean up mana checks

* Don't expose static globals
pull/25/head
Anders Jenbo 7 years ago committed by Robin Eklind
parent
62b48e4788
commit
cfbe27f3b8
22 changed files with 30 additions and 102 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. 9
      Source/control.h
  2. 13
      Source/diablo.h
  3. 2
      Source/dthread.h
  4. 2
      Source/dx.h
  5. 2
      Source/effects.h
  6. 2
      Source/engine.h
  7. 3
      Source/gamemenu.h
  8. 2
      Source/gmenu.h
  9. 2
      Source/interfac.h
  10. 6
      Source/inv.h
  11. 7
      Source/minitext.h
  12. 1
      Source/monster.h
  13. 7
      Source/mpqapi.h
  14. 3
      Source/msgcmd.h
  15. 16
      Source/multi.h
  16. 13
      Source/nthread.h
  17. 12
      Source/objects.cpp
  18. 1
      Source/palette.h
  19. 15
      Source/scrollrt.h
  20. 7
      Source/sound.h
  21. 1
      Source/sync.h
  22. 6
      Source/towners.h

9
Source/control.h
Unescape View File

@ -2,8 +2,6 @@
#ifndef __CONTROL_H__ #ifndef __CONTROL_H__
#define __CONTROL_H__ #define __CONTROL_H__
extern char sgbNextTalkSave; // weak
extern char sgbTalkSavePos; // weak
extern void *pDurIcons; extern void *pDurIcons;
extern void *pChrButtons; extern void *pChrButtons;
extern BOOL drawhpflag; // idb extern BOOL drawhpflag; // idb
@ -13,12 +11,10 @@ extern int chrbtn[4];
extern void *pMultiBtns; extern void *pMultiBtns;
extern void *pPanelButtons; extern void *pPanelButtons;
extern void *pChrPanel; extern void *pChrPanel;
extern int lvlbtndown; // weak extern int lvlbtndown; // weak
extern char sgszTalkSave[8][80];
extern int dropGoldValue; // idb extern int dropGoldValue; // idb
extern BOOL drawmanaflag; // idb extern BOOL drawmanaflag; // idb
extern BOOL chrbtnactive; extern BOOL chrbtnactive;
extern char sgszTalkMsg[80];
extern void *pPanelText; extern void *pPanelText;
extern int frame_4B8800; // idb extern int frame_4B8800; // idb
extern char *pLifeBuff; extern char *pLifeBuff;
@ -30,8 +26,7 @@ extern BOOL pinfoflag;
extern int talkbtndown[3]; extern int talkbtndown[3];
extern int pSpell; // weak extern int pSpell; // weak
extern char *pManaBuff; extern char *pManaBuff;
extern int infoclr; // weak extern int infoclr; // weak
extern int sgbPlrTalkTbl; // weak // should be char [4]
extern void *pGBoxBuff; extern void *pGBoxBuff;
extern void *pSBkBtnCel; extern void *pSBkBtnCel;
extern char tempstr[256]; extern char tempstr[256];

13
Source/diablo.h
Unescape View File

@ -24,13 +24,12 @@ extern int drawpanflag; // weak
extern int visiondebug; // weak extern int visiondebug; // weak
extern int scrollflag; /* unused */ extern int scrollflag; /* unused */
extern BOOL light4flag; extern BOOL light4flag;
extern int leveldebug; // weak extern int leveldebug; // weak
extern int monstdebug; // weak extern int monstdebug; // weak
extern int trigdebug; /* unused */ extern int trigdebug; /* unused */
extern int setseed; // weak extern int setseed; // weak
extern int debugmonsttypes; // weak extern int debugmonsttypes; // weak
extern int PauseMode; // weak extern int PauseMode; // weak
extern int sgnTimeoutCurs;
extern char sgbMouseDown; // weak extern char sgbMouseDown; // weak
extern int color_cycle_timer; // weak extern int color_cycle_timer; // weak

2
Source/dthread.h
Unescape View File

@ -3,9 +3,7 @@
#define __DTHREAD_H__ #define __DTHREAD_H__
extern unsigned int glpDThreadId; // idb extern unsigned int glpDThreadId; // idb
extern TMegaPkt *sgpInfoHead; /* may not be right struct */
extern BOOLEAN dthread_running; extern BOOLEAN dthread_running;
extern HANDLE sghWorkToDoEvent;
void __cdecl dthread_init_mutex(); void __cdecl dthread_init_mutex();
void __cdecl dthread_cleanup_mutex_atexit(); void __cdecl dthread_cleanup_mutex_atexit();

2
Source/dx.h
Unescape View File

@ -2,10 +2,8 @@
#ifndef __DX_H__ #ifndef __DX_H__
#define __DX_H__ #define __DX_H__
extern Screen *sgpBackBuf;
extern IDirectDraw *lpDDInterface; extern IDirectDraw *lpDDInterface;
extern IDirectDrawPalette *lpDDPalette; // idb extern IDirectDrawPalette *lpDDPalette; // idb
extern int sgdwLockCount;
extern Screen *gpBuffer; extern Screen *gpBuffer;
extern IDirectDrawSurface *lpDDSBackBuf; extern IDirectDrawSurface *lpDDSBackBuf;
extern IDirectDrawSurface *lpDDSPrimary; extern IDirectDrawSurface *lpDDSPrimary;

2
Source/effects.h
Unescape View File

@ -34,6 +34,4 @@ extern const char monster_action_sounds[]; // idb
/* data */ /* data */
extern TSFX sgSFX[NUM_SFX];
#endif /* __EFFECTS_H__ */ #endif /* __EFFECTS_H__ */

2
Source/engine.h
Unescape View File

@ -8,8 +8,6 @@
extern char gbPixelCol; // automap pixel color 8-bit (palette entry) extern char gbPixelCol; // automap pixel color 8-bit (palette entry)
extern int dword_52B970; // bool flip - if y < x extern int dword_52B970; // bool flip - if y < x
extern int orgseed; // weak extern int orgseed; // weak
extern int sgnWidth;
extern int sglGameSeed; // weak
extern int SeedCount; // weak extern int SeedCount; // weak
extern int dword_52B99C; // bool valid - if x/y are in bounds extern int dword_52B99C; // bool valid - if x/y are in bounds

3
Source/gamemenu.h
Unescape View File

@ -26,9 +26,6 @@ int __cdecl gamemenu_slider_gamma();
void __cdecl gamemenu_color_cycling(); void __cdecl gamemenu_color_cycling();
/* rdata */ /* rdata */
extern TMenuItem sgSingleMenu[6];
extern TMenuItem sgMultiMenu[5];
extern TMenuItem sgOptionMenu[6];
extern char *music_toggle_names[]; extern char *music_toggle_names[];
extern char *sound_toggle_names[]; extern char *sound_toggle_names[];
extern char *color_cycling_toggle_names[]; extern char *color_cycling_toggle_names[];

2
Source/gmenu.h
Unescape View File

@ -5,14 +5,12 @@
extern void *optbar_cel; extern void *optbar_cel;
extern BOOLEAN byte_634464; // weak extern BOOLEAN byte_634464; // weak
extern void *PentSpin_cel; extern void *PentSpin_cel;
extern TMenuItem *sgpCurrItem;
extern void *BigTGold_cel; extern void *BigTGold_cel;
extern int dword_634474; // weak extern int dword_634474; // weak
extern char byte_634478; // weak extern char byte_634478; // weak
extern void(__cdecl *dword_63447C)(); extern void(__cdecl *dword_63447C)();
extern TMenuItem *dword_634480; // idb extern TMenuItem *dword_634480; // idb
extern void *option_cel; extern void *option_cel;
extern void *sgpLogo;
extern int dword_63448C; // weak extern int dword_63448C; // weak
void __cdecl gmenu_draw_pause(); void __cdecl gmenu_draw_pause();

2
Source/interfac.h
Unescape View File

@ -2,8 +2,6 @@
#ifndef __INTERFAC_H__ #ifndef __INTERFAC_H__
#define __INTERFAC_H__ #define __INTERFAC_H__
extern void *sgpBackCel;
extern int sgdwProgress;
extern int progress_id; // idb extern int progress_id; // idb
void __cdecl interface_msg_pump(); void __cdecl interface_msg_pump();

6
Source/inv.h
Unescape View File

@ -3,9 +3,7 @@
#define __INV_H__ #define __INV_H__
extern BOOL invflag; extern BOOL invflag;
extern void *pInvCels;
extern int drawsbarflag; // idb extern int drawsbarflag; // idb
extern int sgdwLastTime; // check name
void __cdecl FreeInvGFX(); void __cdecl FreeInvGFX();
void __cdecl InitInv(); void __cdecl InitInv();
@ -48,10 +46,6 @@ void __cdecl DoTelekinesis();
int __fastcall CalculateGold(int pnum); int __fastcall CalculateGold(int pnum);
int __cdecl DropItemBeforeTrig(); int __cdecl DropItemBeforeTrig();
/* rdata */
extern const InvXY InvRect[73];
/* data */ /* data */
extern int AP2x2Tbl[10]; // weak extern int AP2x2Tbl[10]; // weak

7
Source/minitext.h
Unescape View File

@ -4,10 +4,9 @@
extern int qtexty; // weak extern int qtexty; // weak
extern char *qtextptr; extern char *qtextptr;
extern int qtextSpd; // weak extern int qtextSpd; // weak
extern char qtextflag; // weak extern char qtextflag; // weak
extern int scrolltexty; // weak extern int scrolltexty; // weak
extern int sgLastScroll; // weak
extern void *pMedTextCels; extern void *pMedTextCels;
extern void *pTextBoxCels; extern void *pTextBoxCels;

1
Source/monster.h
Unescape View File

@ -6,7 +6,6 @@ extern int MissileFileFlag; // weak
extern int monstkills[MAXMONSTERS]; extern int monstkills[MAXMONSTERS];
extern int monstactive[MAXMONSTERS]; extern int monstactive[MAXMONSTERS];
extern int nummonsters; extern int nummonsters;
extern int sgbSaveSoundOn; // weak
extern MonsterStruct monster[MAXMONSTERS]; extern MonsterStruct monster[MAXMONSTERS];
extern int totalmonsters; // weak extern int totalmonsters; // weak
extern CMonster Monsters[16]; extern CMonster Monsters[16];

7
Source/mpqapi.h
Unescape View File

@ -2,12 +2,9 @@
#ifndef __MPQAPI_H__ #ifndef __MPQAPI_H__
#define __MPQAPI_H__ #define __MPQAPI_H__
extern int sgdwMpqOffset; // idb
extern char mpq_buf[4096]; extern char mpq_buf[4096];
extern _HASHENTRY *sgpHashTbl;
extern BOOLEAN save_archive_modified; // weak extern BOOLEAN save_archive_modified; // weak
extern _BLOCKENTRY *sgpBlockTbl; extern BOOLEAN save_archive_open; // weak
extern BOOLEAN save_archive_open; // weak
BOOL __fastcall mpqapi_set_hidden(const char *pszArchive, BOOL hidden); BOOL __fastcall mpqapi_set_hidden(const char *pszArchive, BOOL hidden);
void __fastcall mpqapi_store_creation_time(const char *pszArchive, int dwChar); void __fastcall mpqapi_store_creation_time(const char *pszArchive, int dwChar);
@ -42,6 +39,4 @@ BOOLEAN __cdecl mpqapi_can_seek();
/* data */ /* data */
extern HANDLE sghArchive; // idb
#endif /* __MPQAPI_H__ */ #endif /* __MPQAPI_H__ */

3
Source/msgcmd.h
Unescape View File

@ -2,9 +2,6 @@
#ifndef __MSGCMD_H__ #ifndef __MSGCMD_H__
#define __MSGCMD_H__ #define __MSGCMD_H__
extern ChatCmd sgChat_Cmd;
extern int sgdwMsgCmdTimer;
void __cdecl msgcmd_init_event(); void __cdecl msgcmd_init_event();
void __cdecl msgcmd_cleanup_chatcmd_atexit(); void __cdecl msgcmd_cleanup_chatcmd_atexit();
void __cdecl msgcmd_cleanup_chatcmd(void); void __cdecl msgcmd_cleanup_chatcmd(void);

16
Source/multi.h
Unescape View File

@ -3,28 +3,16 @@
#define __MULTI_H__ #define __MULTI_H__
extern char gbSomebodyWonGameKludge; // weak extern char gbSomebodyWonGameKludge; // weak
extern TBuffer sgHiPriBuf;
extern char szPlayerDescript[128]; extern char szPlayerDescript[128];
extern short sgwPackPlrOffsetTbl[MAX_PLRS]; extern short sgwPackPlrOffsetTbl[MAX_PLRS];
extern PkPlayerStruct netplr[MAX_PLRS]; extern PkPlayerStruct netplr[MAX_PLRS];
extern char sgbPlayerTurnBitTbl[MAX_PLRS]; extern int dword_678628; // weak
extern char sgbPlayerLeftGameTbl[MAX_PLRS];
extern int sgbSentThisCycle; // idb
extern int dword_678628; // weak
extern BYTE gbActivePlayers; extern BYTE gbActivePlayers;
extern char gbGameDestroyed; // weak extern char gbGameDestroyed; // weak
extern char sgbSendDeltaTbl[MAX_PLRS]; extern char byte_678640; // weak
extern _gamedata sgGameInitInfo;
extern char byte_678640; // weak
extern int sglTimeoutStart; // weak
extern int sgdwPlayerLeftReasonTbl[MAX_PLRS];
extern TBuffer sgLoPriBuf;
extern unsigned int sgdwGameLoops; // idb
extern BYTE gbMaxPlayers; extern BYTE gbMaxPlayers;
extern char sgbTimeout; // weak
extern char szPlayerName[128]; extern char szPlayerName[128];
extern BYTE gbDeltaSender; // weak extern BYTE gbDeltaSender; // weak
extern int sgbNetInited; // weak
extern int player_state[MAX_PLRS]; extern int player_state[MAX_PLRS];
void __fastcall multi_msg_add(BYTE *a1, unsigned char a2); void __fastcall multi_msg_add(BYTE *a1, unsigned char a2);

13
Source/nthread.h
Unescape View File

@ -9,14 +9,11 @@ extern char nthread_should_run; // weak
extern DWORD gdwTurnsInTransit; // weak extern DWORD gdwTurnsInTransit; // weak
extern int glpMsgTbl[4]; extern int glpMsgTbl[4];
extern unsigned int glpNThreadId; extern unsigned int glpNThreadId;
extern char sgbSyncCountdown; // weak extern int turn_upper_bit; // weak
extern int turn_upper_bit; // weak extern char byte_679758; // weak
extern char byte_679758; // weak extern int gdwLargestMsgSize; // weak
extern char sgbPacketCountdown; // weak extern int gdwNormalMsgSize; // weak
extern char sgbThreadIsRunning; // weak extern int last_tick; // weak
extern int gdwLargestMsgSize; // weak
extern int gdwNormalMsgSize; // weak
extern int last_tick; // weak
void __cdecl nthread_init_mutex(); void __cdecl nthread_init_mutex();
void __cdecl nthread_cleanup_mutex_atexit(); void __cdecl nthread_cleanup_mutex_atexit();

12
Source/objects.cpp
Unescape View File

@ -4191,11 +4191,11 @@ void __fastcall OperateShrine(int pnum, int i, int sType)
plr[pnum]._pMana -= v72; plr[pnum]._pMana -= v72;
plr[pnum]._pMaxManaBase -= v72; plr[pnum]._pMaxManaBase -= v72;
plr[pnum]._pMaxMana -= v72; plr[pnum]._pMaxMana -= v72;
if ((signed int)(plr[pnum]._pMana & 0xFFFFFFC0) <= 0) { if (plr[pnum]._pMana >> 6 <= 0) {
plr[pnum]._pMana = min; plr[pnum]._pMana = min;
plr[pnum]._pManaBase = 0; plr[pnum]._pManaBase = 0;
} }
if ((signed int)(plr[pnum]._pMaxMana & 0xFFFFFFC0) <= 0) { if (plr[pnum]._pMaxMana >> 6 <= 0) {
plr[pnum]._pMaxMana = max; plr[pnum]._pMaxMana = max;
plr[pnum]._pMaxManaBase = 0; plr[pnum]._pMaxManaBase = 0;
} }
@ -4316,11 +4316,11 @@ void __fastcall OperateShrine(int pnum, int i, int sType)
plr[pnum]._pMana -= v72; plr[pnum]._pMana -= v72;
plr[pnum]._pMaxManaBase -= v72; plr[pnum]._pMaxManaBase -= v72;
plr[pnum]._pMaxMana -= v72; plr[pnum]._pMaxMana -= v72;
if ((signed int)(plr[pnum]._pMana & 0xFFFFFFC0) <= 0) { if (plr[pnum]._pMana >> 6 <= 0) {
plr[pnum]._pMana = min; plr[pnum]._pMana = min;
plr[pnum]._pManaBase = 0; plr[pnum]._pManaBase = 0;
} }
if ((signed int)(plr[pnum]._pMaxMana & 0xFFFFFFC0) <= 0) { if (plr[pnum]._pMaxMana >> 6 <= 0) {
plr[pnum]._pMaxMana = max; plr[pnum]._pMaxMana = max;
plr[pnum]._pMaxManaBase = 0; plr[pnum]._pMaxManaBase = 0;
} }
@ -4408,11 +4408,11 @@ void __fastcall OperateShrine(int pnum, int i, int sType)
plr[pnum]._pMana -= v72; plr[pnum]._pMana -= v72;
plr[pnum]._pMaxManaBase -= v72; plr[pnum]._pMaxManaBase -= v72;
plr[pnum]._pMaxMana -= v72; plr[pnum]._pMaxMana -= v72;
if ((signed int)(plr[pnum]._pMana & 0xFFFFFFC0) <= 0) { if (plr[pnum]._pMana >> 6 <= 0) {
plr[pnum]._pMana = min; plr[pnum]._pMana = min;
plr[pnum]._pManaBase = 0; plr[pnum]._pManaBase = 0;
} }
if ((signed int)(plr[pnum]._pMaxMana & 0xFFFFFFC0) <= 0) { if (plr[pnum]._pMaxMana >> 6 <= 0) {
plr[pnum]._pMaxMana = max; plr[pnum]._pMaxMana = max;
plr[pnum]._pMaxManaBase = 0; plr[pnum]._pMaxManaBase = 0;
} }

1
Source/palette.h
Unescape View File

@ -34,6 +34,5 @@ void __fastcall palette_set_color_cycling(BOOLEAN enabled);
extern int gamma_correction; // idb extern int gamma_correction; // idb
extern BOOL color_cycling_enabled; extern BOOL color_cycling_enabled;
extern BOOLEAN sgbFadedIn;
#endif /* __PALETTE_H__ */ #endif /* __PALETTE_H__ */

15
Source/scrollrt.h
Unescape View File

@ -4,23 +4,14 @@
extern int light_table_index; // weak extern int light_table_index; // weak
extern int screen_y_times_768[1024]; extern int screen_y_times_768[1024];
extern unsigned int sgdwCursWdtOld; // idb extern unsigned char *gpBufEnd; // weak
extern int sgdwCursX; // idb extern DWORD level_cel_block; // weak
extern int sgdwCursY; // idb extern char arch_draw_type; // weak
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 DDSURFACEDESC DDS_desc; extern DDSURFACEDESC DDS_desc;
extern int cel_transparency_active; // weak extern int cel_transparency_active; // weak
extern int level_piece_id; // weak extern int level_piece_id; // weak
extern int sgdwCursWdt;
extern int(__fastcall *DrawPlrProc)(int player_num, int x, int y, int screen_x, int screen_y, void *cl2_buf, int frame, int frame_width, int a9, int a10); extern int(__fastcall *DrawPlrProc)(int player_num, int x, int y, int screen_x, int screen_y, void *cl2_buf, int frame, int frame_width, int a9, int a10);
extern char sgSaveBack[8192];
extern int draw_monster_num; // weak extern int draw_monster_num; // weak
extern int sgdwCursHgtOld; // idb
void __cdecl ClearCursor(); void __cdecl ClearCursor();
void __fastcall DrawMissile(int x, int y, int sx, int sy, int a5, int a6, int del_flag); void __fastcall DrawMissile(int x, int y, int sx, int sy, int a5, int a6, int del_flag);

7
Source/sound.h
Unescape View File

@ -3,13 +3,8 @@
#define __SOUND_H__ #define __SOUND_H__
extern IDirectSoundBuffer *DSBs[8]; extern IDirectSoundBuffer *DSBs[8];
extern LPDIRECTSOUND sglpDS;
extern char gbSndInited; extern char gbSndInited;
extern int sglMusicVolume;
extern int sglSoundVolume;
extern HMODULE hDsound_dll; extern HMODULE hDsound_dll;
extern void *sgpMusicTrack;
extern IDirectSoundBuffer *sglpDSB;
void __fastcall snd_update(BOOL bStopAll); void __fastcall snd_update(BOOL bStopAll);
void __fastcall snd_stop_snd(TSnd *pSnd); void __fastcall snd_stop_snd(TSnd *pSnd);
@ -39,8 +34,6 @@ int __fastcall sound_get_or_set_sound_volume(int volume);
extern BYTE gbMusicOn; extern BYTE gbMusicOn;
extern BYTE gbSoundOn; extern BYTE gbSoundOn;
extern BYTE gbDupSounds; extern BYTE gbDupSounds;
extern int sgnMusicTrack;
extern char *sgszMusicTracks[6];
extern char unk_volume[4][2]; extern char unk_volume[4][2];
#endif /* __SOUND_H__ */ #endif /* __SOUND_H__ */

1
Source/sync.h
Unescape View File

@ -6,7 +6,6 @@ extern short sync_word_6AA708[MAXMONSTERS];
extern int syncmonsters; // weak extern int syncmonsters; // weak
extern short sync_word_6AA89C[MAXMONSTERS]; extern short sync_word_6AA89C[MAXMONSTERS];
extern int syncitems; extern int syncitems;
extern int sgnSyncPInv; // weak
int __fastcall sync_all_monsters(TSyncHeader *packet, int size); int __fastcall sync_all_monsters(TSyncHeader *packet, int size);
void __cdecl sync_one_monster(); void __cdecl sync_one_monster();

6
Source/towners.h
Unescape View File

@ -2,10 +2,8 @@
#ifndef __TOWNERS_H__ #ifndef __TOWNERS_H__
#define __TOWNERS_H__ #define __TOWNERS_H__
extern int storeflag; // weak extern int storeflag; // weak
extern int sgnCowMsg; extern int numtowners; // idb
extern int numtowners; // idb
extern DWORD sgdwCowClicks;
extern int bannerflag; // weak // unused 0x6AAC28 extern int bannerflag; // weak // unused 0x6AAC28
extern int boyloadflag; // weak extern int boyloadflag; // weak
extern void *pCowCels; // idb extern void *pCowCels; // idb

Write Preview
Loading…
Cancel
Save