MattTheTekie/devilutionX
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:diasurgical/devilution

Browse source
This commit is contained in:
Anders Jenbo 2019-05-09 23:51:21 +02:00
commit 0c4b4719b8
39 changed files with 1189 additions and 1379 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Source/cursor.cpp
View file

@ -129,7 +129,7 @@ void CheckTown()
|| cursmx == missile[mx]._mix - 2 && cursmy == missile[mx]._miy - 2
|| cursmx == missile[mx]._mix - 1 && cursmy == missile[mx]._miy - 2
|| cursmx == missile[mx]._mix && cursmy == missile[mx]._miy) {
trigflag_3 = 1;
trigflag = TRUE;
ClearPanel();
strcpy(infostr, "Town Portal");
sprintf(tempstr, "from %s", plr[missile[mx]._misource]._pName);
@ -155,7 +155,7 @@ void CheckRportal()
|| cursmx == missile[mx]._mix - 2 && cursmy == missile[mx]._miy - 2
|| cursmx == missile[mx]._mix - 1 && cursmy == missile[mx]._miy - 2
|| cursmx == missile[mx]._mix && cursmy == missile[mx]._miy) {
trigflag_3 = 1;
trigflag = TRUE;
ClearPanel();
strcpy(infostr, "Portal to");
if (!setlevel)
@ -263,7 +263,7 @@ void CheckCursMove()
pcursplr = -1;
uitemflag = 0;
panelflag = 0;
trigflag_3 = 0;
trigflag = FALSE;
if(plr[myplr]._pInvincible) {
return;