mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-02-17 11:30:09 +00:00
Code Issues Releases Wiki Activity

made the web version compile

Browse Source
This commit is contained in:
Zeno Rogue 2018-06-14 00:06:54 +02:00
parent b342159475
commit 1eaaac4d77
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changelog.txt
View File

@ -2469,8 +2469,9 @@ non-game:
- Strange Challenge should exit correctly. - Strange Challenge should exit correctly.
- rules are described better in other geometries - rules are described better in other geometries
2018.06.12 XX:XX Update 10.4b: 2018.06.13 01:32 Update 10.4b:
- Orb of Love does not give the 30$$$ bonus in the Strange Challenge -- this is now made clearer (the displayed score no longer includes this 30$$$, and a help text for Orb of Love is added). - Orb of Love does not give the 30$$$ bonus in the Strange Challenge -- this is now made clearer (the displayed score no longer includes this 30$$$, and a help text for Orb of Love is added).
- Strange Challenge should reset OSM and Chaos mode correctly
- a flat torus can be embedded in S^3 -- HyperRogue now knows about this when rendering torus in the Hypersian Rug mode in the spherical native geometry - a flat torus can be embedded in S^3 -- HyperRogue now knows about this when rendering torus in the Hypersian Rug mode in the spherical native geometry
- it was possible to get another chance in the Strange Challenge by pressing ESC in specific circumstances -- this should be fixed. - it was possible to get another chance in the Strange Challenge by pressing ESC in specific circumstances -- this should be fixed.
- fixed some issues with adjacency taken into account incorrectly with Hedgehogs/Flailguards/Pikemen and Warp/halfvines - fixed some issues with adjacency taken into account incorrectly with Hedgehogs/Flailguards/Pikemen and Warp/halfvines

2
commandline.cpp
View File

@ -98,7 +98,9 @@ int arg::readCommon() {
else if(argis("-s")) { PHASE(1); shift(); scorefile = argcs(); } else if(argis("-s")) { PHASE(1); shift(); scorefile = argcs(); }
else if(argis("-m")) { PHASE(1); shift(); musicfile = argcs(); } else if(argis("-m")) { PHASE(1); shift(); musicfile = argcs(); }
else if(argis("-nogui")) { PHASE(1); noGUI = true; } else if(argis("-nogui")) { PHASE(1); noGUI = true; }
#ifndef EMSCRIPTEN
else if(argis("-font")) { PHASE(1); shift(); fontpath = args(); } else if(argis("-font")) { PHASE(1); shift(); fontpath = args(); }
#endif
#if CAP_SDLAUDIO #if CAP_SDLAUDIO
else if(argis("-se")) { PHASE(1); shift(); wheresounds = args(); } else if(argis("-se")) { PHASE(1); shift(); wheresounds = args(); }
#endif #endif

3
compileunits.h
View File

@ -50,8 +50,7 @@
#if CAP_INV #if CAP_INV
#include "inventory.cpp" #include "inventory.cpp"
#else #else
bool inv::on; namespace hr { namespace inv { bool on, activating; } }
bool inv::activating;
#endif #endif
#include "system.cpp" #include "system.cpp"
#include "debug.cpp" #include "debug.cpp"

5
hyperweb.cpp
View File

@ -26,6 +26,8 @@ template<class A, class B, class C> void emscripten_set_main_loop(A a, B b, C c)
#include <emscripten/html5.h> #include <emscripten/html5.h>
#endif #endif
#include <string>
namespace hr { namespace hr {
void initweb(); void initweb();
void emscripten_get_commandline(); void emscripten_get_commandline();
@ -35,6 +37,8 @@ namespace hr {
const char *wheresounds; const char *wheresounds;
} }
#include "hyper.cpp"
namespace hr { namespace hr {
// -- demo -- // -- demo --
@ -196,4 +200,3 @@ void emscripten_get_commandline() {
} }
} }
#include "hyper.cpp"