mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-12-24 17:10:36 +00:00
Code Issues Releases Wiki Activity

Protection from accidentally activating Flash/Lightning (not implemented)

Browse Source
This commit is contained in:
Zeno Rogue 2017-09-01 23:01:10 +02:00
parent c54ed7222f
commit 42da061f2f
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
game.cpp
View File

@ -6401,6 +6401,7 @@ bool movepcto(int d, int subdir, bool checkonly) {
if(!passable(c2, cwt.c, P_ISPLAYER | P_MIRROR | P_USEBOAT | P_FRIENDSWAP) && items[itOrbFlash]) { if(!passable(c2, cwt.c, P_ISPLAYER | P_MIRROR | P_USEBOAT | P_FRIENDSWAP) && items[itOrbFlash]) {
if(checkonly) return true; if(checkonly) return true;
if(orbProtection(itOrbFlash)) return true;
activateFlash(); activateFlash();
bfs(); bfs();
if(multi::players > 1) { multi::whereto[multi::cpid].d = MD_UNDECIDED; return false; } if(multi::players > 1) { multi::whereto[multi::cpid].d = MD_UNDECIDED; return false; }
@ -6410,6 +6411,7 @@ bool movepcto(int d, int subdir, bool checkonly) {
if(!passable(c2, cwt.c, P_ISPLAYER | P_MIRROR | P_USEBOAT | P_FRIENDSWAP) && items[itOrbLightning]) { if(!passable(c2, cwt.c, P_ISPLAYER | P_MIRROR | P_USEBOAT | P_FRIENDSWAP) && items[itOrbLightning]) {
if(checkonly) return true; if(checkonly) return true;
if(orbProtection(itOrbLightning)) return true;
activateLightning(); activateLightning();
keepLightning = true; keepLightning = true;
bfs(); bfs();
@ -6724,6 +6726,7 @@ bool movepcto(int d, int subdir, bool checkonly) {
if(items[itOrbFlash]) { if(items[itOrbFlash]) {
if(checkonly) return true; if(checkonly) return true;
if(orbProtection(itOrbFlash)) return true;
activateFlash(); activateFlash();
checkmove(); checkmove();
return true; return true;
@ -6731,6 +6734,7 @@ bool movepcto(int d, int subdir, bool checkonly) {
if(items[itOrbLightning]) { if(items[itOrbLightning]) {
if(checkonly) return true; if(checkonly) return true;
if(orbProtection(itOrbLightning)) return true;
activateLightning(); activateLightning();
checkmove(); checkmove();
return true; return true;

2
hyper.h
View File

@ -1530,3 +1530,5 @@ void selectLanguageScreen();
bool inscreenrange(cell *c); bool inscreenrange(cell *c);
bool allowIncreasedSight(); bool allowIncreasedSight();
static bool orbProtection(eItem it) { return false; } // not implemented