1
0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2026-05-29 08:52:11 +00:00

moved all the HyperRogue stuff except RogueViz to namespace 'hr' -- useful when using hr as a library

This commit is contained in:
Zeno Rogue
2018-06-11 01:58:31 +02:00
parent c2e3ed54f0
commit 4c619e60dd
68 changed files with 735 additions and 539 deletions
+5 -2
View File
@@ -4,6 +4,8 @@
// implementation of the shoot'em up mode
namespace hr {
extern int mousex, mousey;
extern bool clicked;
@@ -368,7 +370,7 @@ void handleConfig(int sym, int uni) {
shmupcfg = !shmupcfg;
#if CAP_CONFIG
else if(uni == 'c')
::saveConfig();
hr::saveConfig();
#endif
else if(uni == 'n' || uni == 'N') {
vid.scfg.players += shiftmul > 0 ? 1 : -1;
@@ -2263,7 +2265,7 @@ void moveBullet(monster *m, int delta) {
bool revive = m2->type == moMirrorSpirit && !m2->dead;
killMonster(m2, m->parent ? m->parent->type : moNone);
if(revive && m2->dead) {
::kills[moMirrorSpirit]--;
hr::kills[moMirrorSpirit]--;
multi::kills[cpid]--;
mirrorspirits++;
}
@@ -3576,3 +3578,4 @@ auto hooks = addHook(clearmemory, 0, shmup::clearMemory) +
});
}
}