mirrors
/
devilution
1
0
Fork 0
Code Releases Activity

Update player.cpp

pull/8/head
galaxyhaxz 2018-06-08 22:12:26 -05:00 committed by GitHub
parent a07a6210fa
commit 0dac197965
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/player.cpp
View File

@ -3938,14 +3938,14 @@ int __fastcall PM_DoSpell(int pnum)
if ( !plr[v2]._pSplFrom ) if ( !plr[v2]._pSplFrom )
{ {
if ( _LOBYTE(plr[v2]._pRSplType) == 2 if ( _LOBYTE(plr[v2]._pRSplType) == 2
&& !(plr[v2]._pScrlSpells[1] & ((unsigned __int64)(1 << (_LOBYTE(plr[v2]._pRSpell) - 1)) >> 32) | plr[v2]._pScrlSpells[0] & (unsigned int)(1 << (_LOBYTE(plr[v2]._pRSpell) - 1))) ) && !(plr[v2]._pScrlSpells[1] & ((unsigned __int64)((__int64)1 << (_LOBYTE(plr[v2]._pRSpell) - 1)) >> 32) | plr[v2]._pScrlSpells[0] & (unsigned int)((__int64)1 << (_LOBYTE(plr[v2]._pRSpell) - 1))) )
{ {
plr[v2]._pRSpell = -1; plr[v2]._pRSpell = -1;
_LOBYTE(plr[v2]._pRSplType) = 4; _LOBYTE(plr[v2]._pRSplType) = 4;
drawpanflag = 255; drawpanflag = 255;
} }
if ( _LOBYTE(plr[v2]._pRSplType) == 3 if ( _LOBYTE(plr[v2]._pRSplType) == 3
&& !(plr[v2]._pISpells[1] & ((unsigned __int64)(1 << (_LOBYTE(plr[v2]._pRSpell) - 1)) >> 32) | plr[v2]._pISpells[0] & (unsigned int)(1 << (_LOBYTE(plr[v2]._pRSpell) - 1))) ) && !(plr[v2]._pISpells[1] & ((unsigned __int64)((__int64)1 << (_LOBYTE(plr[v2]._pRSpell) - 1)) >> 32) | plr[v2]._pISpells[0] & (unsigned int)((__int64)1 << (_LOBYTE(plr[v2]._pRSpell) - 1))) )
{ {
plr[v2]._pRSpell = -1; plr[v2]._pRSpell = -1;
_LOBYTE(plr[v2]._pRSplType) = 4; _LOBYTE(plr[v2]._pRSplType) = 4;
@ -4663,7 +4663,7 @@ void __cdecl ValidatePlayer()
__int64 v14; // [esp+Ch] [ebp-8h] __int64 v14; // [esp+Ch] [ebp-8h]
v0 = 0; v0 = 0;
v14 = 0; v14 = (__int64)0;
if ( (unsigned int)myplr >= 4 ) if ( (unsigned int)myplr >= 4 )
TermMsg("ValidatePlayer: illegal player %d", myplr); TermMsg("ValidatePlayer: illegal player %d", myplr);
v1 = myplr; v1 = myplr;
@ -4711,7 +4711,7 @@ void __cdecl ValidatePlayer()
{ {
if ( *v11 != -1 ) if ( *v11 != -1 )
{ {
v14 |= 1 << ((unsigned char)v12 - 1); v14 |= (__int64)1 << ((unsigned char)v12 - 1);
v13 = &plr[v1]._pSplLvl[v12]; v13 = &plr[v1]._pSplLvl[v12];
if ( *v13 > 15 ) if ( *v13 > 15 )
*v13 = 15; *v13 = 15;