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

ValidatePlayer (#318) 

* ValidatePlayer

* Add MAX_SPELLS define
pull/4/head
Anders Jenbo 8 years ago committed by Robin Eklind
parent
e05679b1c9
commit
db77557dce
11 changed files with 58 additions and 87 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      Source/control.cpp
  2. 2
      Source/control.h
  3. 2
      Source/debug.cpp
  4. 8
      Source/items.cpp
  5. 4
      Source/objects.cpp
  6. 4
      Source/pack.cpp
  7. 108
      Source/player.cpp
  8. 2
      Source/spells.cpp
  9. 2
      Source/spells.h
  10. 1
      defs.h
  11. 2
      structs.h

10
Source/control.cpp
Unescape View File

@ -143,7 +143,7 @@ const unsigned char fontidx[256] =
/* data */
unsigned char SpellITbl[37] =
unsigned char SpellITbl[MAX_SPELLS] =
{
1, 1, 2, 3, 4, 5, 6, 7, 8, 9,
28, 13, 12, 18, 16, 14, 18, 19, 11, 20,
@ -611,7 +611,7 @@ LABEL_68:
v26 *= (__int64)2;
v23 = v4;
}
while ( (signed int)v20 < (signed int)&spelldata[37].sTownSpell );
while ( (signed int)v20 < (signed int)&spelldata[MAX_SPELLS].sTownSpell );
if ( v25 && v17 != 636 )
v17 -= 56;
if ( v17 == 20 )
@ -1382,7 +1382,7 @@ void __cdecl DoSpeedBook()
++v10;
v7 = v4;
}
while ( v10 < 37 );
while ( v10 < MAX_SPELLS );
if ( v3 && v13 != 636 )
v13 -= 56;
if ( v13 == 20 )
@ -2748,11 +2748,11 @@ void __cdecl DrawSpellBook()
{
v7 = GetSBookTrans(v2, 1u);
SetSpellTrans(v7);
DrawSpellCel(395, v8 + 1, (char *)pSBkIconCels, (char)SpellITbl[v2], 37);
DrawSpellCel(395, v8 + 1, (char *)pSBkIconCels, (char)SpellITbl[v2], MAX_SPELLS);
if ( v2 == plr[myplr]._pRSpell && v7 == _LOBYTE(plr[myplr]._pRSplType) )
{
SetSpellTrans(0);
DrawSpellCel(395, v8 + 1, (char *)pSBkIconCels, 43, 37);
DrawSpellCel(395, v8 + 1, (char *)pSBkIconCels, 43, MAX_SPELLS);
}
PrintSBookStr(10, v8 - 22, 0, spelldata[v2].sNameText, 0);
v3 = GetSBookTrans(v2, 0);

2
Source/control.h
Unescape View File

@ -131,7 +131,7 @@ extern const unsigned char fontidx[256];
/* data */
extern unsigned char SpellITbl[37];
extern unsigned char SpellITbl[MAX_SPELLS];
extern int PanBtnPos[8][5];
extern char *PanBtnHotKey[8];
extern char *PanBtnStr[8];

2
Source/debug.cpp
Unescape View File

@ -105,7 +105,7 @@ void __cdecl MaxSpellsCheat()
{
int i; // ebp
for(i = 1; i < 37; i++)
for(i = 1; i < MAX_SPELLS; i++)
{
if ( spelldata[i].sBookLvl != -1 )
{

8
Source/items.cpp
Unescape View File

@ -1883,7 +1883,7 @@ void __fastcall GetBookSpell(int i, int lvl)
v3 = i;
if ( !lvl )
v2 = lvl + 1;
v4 = random(14, 37) + 1;
v4 = random(14, MAX_SPELLS) + 1;
LABEL_13:
v6 = 1;
while ( v4 > 0 )
@ -1902,7 +1902,7 @@ LABEL_13:
if ( v6 == SPL_HEALOTHER )
v6 = SPL_FLARE;
}
if ( v6 == 37 )
if ( v6 == MAX_SPELLS )
goto LABEL_13;
}
v7 = v3;
@ -2017,7 +2017,7 @@ void __fastcall GetStaffSpell(int i, int lvl, unsigned char onlygood)
l = lvl >> 1;
if ( !l )
l = 1;
rv = random(18, 37) + 1;
rv = random(18, MAX_SPELLS) + 1;
LABEL_15:
s = 1;
while ( rv > 0 )
@ -2035,7 +2035,7 @@ LABEL_15:
if ( s == SPL_HEALOTHER )
s = SPL_FLARE;
}
if ( s == 37 )
if ( s == MAX_SPELLS )
goto LABEL_15;
}
sprintf(istr, "%s of %s", item[i]._iName, spelldata[bs].sNameText);

4
Source/objects.cpp
Unescape View File

@ -5287,10 +5287,10 @@ LABEL_47:
v57 *= 2;
++v59;
}
while ( v59 <= 37 );
while ( v59 <= MAX_SPELLS );
do
{
v60 = random(0, 37);
v60 = random(0, MAX_SPELLS);
v7 = v60;
}
while ( !(plr[v53]._pMemSpells[1] & ((unsigned __int64)((__int64)1 << v60) >> 32) | plr[v53]._pMemSpells[0] & (unsigned int)((__int64)1 << v60)) );

4
Source/pack.cpp
Unescape View File

@ -50,7 +50,7 @@ void __fastcall PackPlayer(PkPlayerStruct *pPack, int pnum, bool manashield)
pPack->pMemSpells = pPlayer->_pMemSpells[0];
pPack->pMemSpells2 = pPlayer->_pMemSpells[1];
for(i = 0; i < 37; i++)
for(i = 0; i < MAX_SPELLS; i++)
pPack->pSplLvl[i] = pPlayer->_pSplLvl[i];
pki = pPack->InvBody;
@ -199,7 +199,7 @@ void __fastcall UnPackPlayer(PkPlayerStruct *pPack, int pnum, bool killok)
pPlayer->_pMemSpells[0] = pPack->pMemSpells;
pPlayer->_pMemSpells[1] = pPack->pMemSpells2;
for(i = 0; i < 37; i++)
for(i = 0; i < MAX_SPELLS; i++)
pPlayer->_pSplLvl[i] = pPack->pSplLvl[i];
pki = pPack->InvBody;

108
Source/player.cpp
Unescape View File

@ -3810,81 +3810,51 @@ BOOL __fastcall PlrDeathModeOK(int pnum)
void __cdecl ValidatePlayer()
{
int v0; // edi
int v1; // esi
char *v2; // eax
int v3; // ecx
int v4; // ecx
int *v5; // eax
int v6; // eax
int v7; // edx
int v8; // edx
int v9; // edx
int v10; // eax
int *v11; // ebx
signed int v12; // edi
char *v13; // eax
__int64 v14; // [esp+Ch] [ebp-8h]
__int64 msk = 0;
v0 = 0;
v14 = (__int64)0;
if ( (unsigned int)myplr >= 4 )
if ( (DWORD)myplr >= MAX_PLRS ) {
TermMsg("ValidatePlayer: illegal player %d", myplr);
v1 = myplr;
v2 = &plr[myplr]._pLevel;
if ( *v2 > 50 )
*v2 = 50;
v3 = plr[v1]._pNextExper;
if ( plr[v1]._pExperience > v3 )
plr[v1]._pExperience = v3;
v4 = 0;
if ( plr[v1]._pNumInv > 0 )
{
v5 = &plr[v1].InvList[0]._ivalue;
do
{
if ( *(v5 - 47) == 11 )
{
if ( *v5 > 5000 )
*v5 = 5000;
v4 += *v5;
}
if ( plr[myplr]._pLevel > 50 )
plr[myplr]._pLevel = 50;
if ( plr[myplr]._pExperience > plr[myplr]._pNextExper )
plr[myplr]._pExperience = plr[myplr]._pNextExper;
int gt = 0;
for ( int i = 0; i < plr[myplr]._pNumInv; i++ ) {
if ( plr[myplr].InvList[i]._itype == ITYPE_GOLD ) {
if ( plr[myplr].InvList[i]._ivalue > 5000 ) {
plr[myplr].InvList[i]._ivalue = 5000;
}
++v0;
v5 += 92;
gt += plr[myplr].InvList[i]._ivalue;
}
while ( v0 < plr[v1]._pNumInv );
}
if ( v4 != plr[v1]._pGold )
plr[v1]._pGold = v4;
v6 = SLOBYTE(plr[v1]._pClass);
v7 = MaxStats[v6][0];
if ( plr[v1]._pBaseStr > v7 )
plr[v1]._pBaseStr = v7;
v8 = MaxStats[v6][1];
if ( plr[v1]._pBaseMag > v8 )
plr[v1]._pBaseMag = v8;
v9 = MaxStats[v6][2];
if ( plr[v1]._pBaseDex > v9 )
plr[v1]._pBaseDex = v9;
v10 = MaxStats[v6][3];
if ( plr[v1]._pBaseVit > v10 )
plr[v1]._pBaseVit = v10;
v11 = &spelldata[1].sBookLvl;
v12 = 1;
do
{
if ( *v11 != -1 )
{
v14 |= (__int64)1 << ((unsigned char)v12 - 1);
v13 = &plr[v1]._pSplLvl[v12];
if ( *v13 > 15 )
*v13 = 15;
}
if ( gt != plr[myplr]._pGold )
plr[myplr]._pGold = gt;
int pc = plr[myplr]._pClass;
if ( plr[myplr]._pBaseStr > MaxStats[pc][ATTRIB_STR] ) {
plr[myplr]._pBaseStr = MaxStats[pc][ATTRIB_STR];
}
if ( plr[myplr]._pBaseMag > MaxStats[pc][ATTRIB_MAG] ) {
plr[myplr]._pBaseMag = MaxStats[pc][ATTRIB_MAG];
}
if ( plr[myplr]._pBaseDex > MaxStats[pc][ATTRIB_DEX] ) {
plr[myplr]._pBaseDex = MaxStats[pc][ATTRIB_DEX];
}
if ( plr[myplr]._pBaseVit > MaxStats[pc][ATTRIB_VIT] ) {
plr[myplr]._pBaseVit = MaxStats[pc][ATTRIB_VIT];
}
for ( int b = 1; b < MAX_SPELLS; b++) {
if ( spelldata[b].sBookLvl != -1 ) {
msk |= (__int64)1 << (b - 1);
if ( plr[myplr]._pSplLvl[b] > 15 )
plr[myplr]._pSplLvl[b] = 15;
}
v11 += 14;
++v12;
}
while ( (signed int)v11 < (signed int)&spelldata[37].sBookLvl );
*(_QWORD *)plr[v1]._pMemSpells &= v14;
plr[myplr]._pMemSpells64 &= msk;
}
void __cdecl ProcessPlayers()

2
Source/spells.cpp
Unescape View File

@ -2,7 +2,7 @@
#include "../types.h"
SpellData spelldata[37] =
SpellData spelldata[MAX_SPELLS] =
{
{ 0, 0, 0, NULL, NULL, 0, 0, 0, 0, 0, 0, { 0, 0, 0 }, 0, 0, 40, 80, 0, 0 },
{ SPL_FIREBOLT, 6, STYPE_FIRE, "Firebolt", "Firebolt", 1, 1, 1, 0, 15, IS_CAST2, { MIS_FIREBOLT, 0, 0 }, 1, 3, 40, 80, 1000, 50 },

2
Source/spells.h
Unescape View File

@ -12,6 +12,6 @@ void __fastcall DoHealOther(int pnum, int rid);
/* rdata */
extern SpellData spelldata[37];
extern SpellData spelldata[MAX_SPELLS];
#endif /* __SPELLS_H__ */

1
defs.h
Unescape View File

@ -12,6 +12,7 @@
#define MAX_LVLMTYPES 16
// #define MAX_PATH 260
#define MAX_SEND_STR_LEN 80
#define MAX_SPELLS 37
#define MAXDEAD 31
#define MAXDUNX 112

2
structs.h
Unescape View File

@ -1471,7 +1471,7 @@ struct PkPlayerStruct
int pMaxHPBase;
int pManaBase;
int pMaxManaBase;
char pSplLvl[37];
char pSplLvl[MAX_SPELLS];
int pMemSpells; /* __int64 */
int pMemSpells2;
PkItemStruct InvBody[7];

Write Preview
Loading…
Cancel
Save