mirrors
/
hyperrogue
mirror of https://github.com/zenorogue/hyperrogue.git
1
0
Fork 0
Code Issues Releases Wiki Activity

renamed shmup::safety to delayed_safety to prevent confusion

This commit is contained in:
Zeno Rogue 2019-04-28 12:09:57 +02:00
parent 2c97b4f2aa
commit f98448464a
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
game.cpp
View File

@ -6992,7 +6992,7 @@ bool collectItem(cell *c2, bool telekinesis) {
playSound(c2, "pickup-orb"); // TODO safety playSound(c2, "pickup-orb"); // TODO safety
items[c2->item] = 7; items[c2->item] = 7;
if(shmup::on) if(shmup::on)
shmup::safety = true; shmup::delayed_safety = true;
else else
activateSafety(c2->land); activateSafety(c2->land);
return true; return true;
@ -7053,7 +7053,7 @@ bool collectItem(cell *c2, bool telekinesis) {
else if(c2->item == itBuggy || c2->item == itBuggy2) { else if(c2->item == itBuggy || c2->item == itBuggy2) {
items[itOrbSafety] += 7; items[itOrbSafety] += 7;
if(shmup::on) if(shmup::on)
shmup::safety = true; shmup::delayed_safety = true;
else { else {
buggyGeneration = false; buggyGeneration = false;
activateSafety(laCrossroads); activateSafety(laCrossroads);

2
hyper.h
View File

@ -883,7 +883,7 @@ namespace shmup {
using namespace multi; using namespace multi;
void recall(); void recall();
extern bool on; extern bool on;
extern bool safety; extern bool delayed_safety;
extern int curtime; extern int curtime;
void clearMonsters(); void clearMonsters();
void clearMemory(); void clearMemory();

2
init.cpp
View File

@ -44,8 +44,6 @@ void initAll() {
#endif #endif
start_game(); start_game();
shmup::safety = safety;
if(!shmup::on) { if(!shmup::on) {
restoreGolems(items[itOrbLife], moGolem); items[itOrbLife] = 0; restoreGolems(items[itOrbLife], moGolem); items[itOrbLife] = 0;
restoreGolems(items[itOrbFriend], moTameBomberbird); items[itOrbFriend] = 0; restoreGolems(items[itOrbFriend], moTameBomberbird); items[itOrbFriend] = 0;

9
shmup.cpp
View File

@ -987,7 +987,8 @@ eItem keyresult[MAXPLAYER];
ld fabsl(ld x) { return x>0?x:-x; } ld fabsl(ld x) { return x>0?x:-x; }
bool on = false, safety = false; bool on = false;
bool delayed_safety = false;
bool lastdead = false; bool lastdead = false;
@ -3467,9 +3468,9 @@ void turn(int delta) {
active.clear(); active.clear();
if(safety) { if(delayed_safety) {
activateSafety(pc[0]->base->land); activateSafety(pc[0]->base->land);
safety = false; delayed_safety = false;
} }
} }
@ -3513,7 +3514,7 @@ void init() {
addMessage(XLAT("Welcome to the Shoot'em Up mode!")); addMessage(XLAT("Welcome to the Shoot'em Up mode!"));
// addMessage(XLAT("F/;/Space/Enter/KP5 = fire, WASD/IJKL/Numpad = move")); // addMessage(XLAT("F/;/Space/Enter/KP5 = fire, WASD/IJKL/Numpad = move"));
} }
else safety = false; delayed_safety = false;
} }
bool boatAt(cell *c) { bool boatAt(cell *c) {