mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-10-30 21:42:59 +00:00
Code Issues Releases Wiki Activity

10.1, and fixing problems reported by some compilers

Browse Source
This commit is contained in:
Zeno Rogue
2017-10-14 21:43:21 +02:00
parent c5e2da9626
commit 6fca4fd008
4 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
graph.cpp
View File

@@ -3711,7 +3711,7 @@ void drawcell(cell *c, transmatrix V, int spinv, bool mirrored) {
else if((c->land == laCaribbean || c->land == laOcean || c->land == laOceanWall || c->land == laWhirlpool)) else if((c->land == laCaribbean || c->land == laOcean || c->land == laOceanWall || c->land == laWhirlpool))
qfloor(c, Vf, shCloudFloor[ct6], darkena(fcol, fd, 0xFF)); qfloor(c, Vf, shCloudFloor[ct6], darkena(fcol, fd, 0xFF));
else if((c->land == laKraken)) else if(c->land == laKraken)
qfloor(c, Vf, shFullFloor[ct6], darkena(fcol, fd, 0xFF)); qfloor(c, Vf, shFullFloor[ct6], darkena(fcol, fd, 0xFF));
else if(c->land == laLivefjord) else if(c->land == laLivefjord)

13
help.cpp
View File

@@ -860,11 +860,16 @@ void gotoHelpFor(eLand l) {
auto listbeasts = [l] () { auto listbeasts = [l] () {
char nextmonster = 'a'; char nextmonster = 'a';
for(int m0=0; m0<motypes; m0++) { for(int m0=0; m0<motypes; m0++) {
eMonster m = eMonster(m0); const eMonster m = eMonster(m0);
if(isNative(l, m) && !nodisplay(m)) if(isNative(l, m) && !nodisplay(m)) {
help_extensions.push_back(help_extension{nextmonster++, XLATN(minf[m].name), [m] () { help_extension hex;
hex.key = nextmonster++;
hex.text = XLATN(minf[m].name);
hex.action = [m] () {
subhelp(bygen([m] () { gotoHelpFor(m); })); subhelp(bygen([m] () { gotoHelpFor(m); }));
}}); };
help_extensions.push_back(hex);
}
} }
}; };

8
init.cpp
View File

@@ -1,6 +1,6 @@
#define VER "10.0o" #define VER "10.1"
#define VERNUM 10015 #define VERNUM 10100
#define VERNUM_HEX 0xA00F #define VERNUM_HEX 0xA080
#define GEN_M 0 #define GEN_M 0
#define GEN_F 1 #define GEN_F 1
@@ -294,7 +294,7 @@ inline Uint8 *SDL_GetKeyState(void *v) { static Uint8 tab[1024]; return tab; }
#include <string> #include <string>
#include <map> #include <map>
#include <queue> #include <queue>
#include <stdexcept>
#include <array> #include <array>
#ifdef USE_UNORDERED_MAP #ifdef USE_UNORDERED_MAP

10
menus.cpp
View File

@@ -139,10 +139,13 @@ void showOverview() {
int umod = uni % 1000; int umod = uni % 1000;
int udiv = uni / 1000; int udiv = uni / 1000;
if(udiv == 1 && umod < landtypes) { if(udiv == 1 && umod < landtypes) {
eLand l = eLand(umod); const eLand l = eLand(umod);
gotoHelp(""); gotoHelpFor(l); gotoHelp(""); gotoHelpFor(l);
if(cheater) { if(cheater) {
help_extensions.push_back(help_extension{'t', XLAT("teleport"), [l] () { help_extension hex;
hex.key = 't';
hex.text = XLAT("teleport");
hex.action = [l] () {
cheater++; cheater++;
bool princ = (l == laPrincessQuest); bool princ = (l == laPrincessQuest);
if(princ) { if(princ) {
@@ -156,7 +159,8 @@ void showOverview() {
if(princ) fullcenter(); if(princ) fullcenter();
popScreen(); popScreen();
popScreen(); popScreen();
}}); };
help_extensions.push_back(hex);
} }
} }
else if(udiv == 2 && umod < ittypes) { else if(udiv == 2 && umod < ittypes) {