mirror of
https://github.com/zenorogue/hyperrogue.git
synced 2024-12-24 17:10:36 +00:00
10.1, and fixing problems reported by some compilers
This commit is contained in:
parent
c5e2da9626
commit
6fca4fd008
@ -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))
|
||||
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));
|
||||
|
||||
else if(c->land == laLivefjord)
|
||||
|
13
help.cpp
13
help.cpp
@ -860,11 +860,16 @@ void gotoHelpFor(eLand l) {
|
||||
auto listbeasts = [l] () {
|
||||
char nextmonster = 'a';
|
||||
for(int m0=0; m0<motypes; m0++) {
|
||||
eMonster m = eMonster(m0);
|
||||
if(isNative(l, m) && !nodisplay(m))
|
||||
help_extensions.push_back(help_extension{nextmonster++, XLATN(minf[m].name), [m] () {
|
||||
const eMonster m = eMonster(m0);
|
||||
if(isNative(l, m) && !nodisplay(m)) {
|
||||
help_extension hex;
|
||||
hex.key = nextmonster++;
|
||||
hex.text = XLATN(minf[m].name);
|
||||
hex.action = [m] () {
|
||||
subhelp(bygen([m] () { gotoHelpFor(m); }));
|
||||
}});
|
||||
};
|
||||
help_extensions.push_back(hex);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
|
8
init.cpp
8
init.cpp
@ -1,6 +1,6 @@
|
||||
#define VER "10.0o"
|
||||
#define VERNUM 10015
|
||||
#define VERNUM_HEX 0xA00F
|
||||
#define VER "10.1"
|
||||
#define VERNUM 10100
|
||||
#define VERNUM_HEX 0xA080
|
||||
|
||||
#define GEN_M 0
|
||||
#define GEN_F 1
|
||||
@ -294,7 +294,7 @@ inline Uint8 *SDL_GetKeyState(void *v) { static Uint8 tab[1024]; return tab; }
|
||||
#include <string>
|
||||
#include <map>
|
||||
#include <queue>
|
||||
|
||||
#include <stdexcept>
|
||||
#include <array>
|
||||
|
||||
#ifdef USE_UNORDERED_MAP
|
||||
|
10
menus.cpp
10
menus.cpp
@ -139,10 +139,13 @@ void showOverview() {
|
||||
int umod = uni % 1000;
|
||||
int udiv = uni / 1000;
|
||||
if(udiv == 1 && umod < landtypes) {
|
||||
eLand l = eLand(umod);
|
||||
const eLand l = eLand(umod);
|
||||
gotoHelp(""); gotoHelpFor(l);
|
||||
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++;
|
||||
bool princ = (l == laPrincessQuest);
|
||||
if(princ) {
|
||||
@ -156,7 +159,8 @@ void showOverview() {
|
||||
if(princ) fullcenter();
|
||||
popScreen();
|
||||
popScreen();
|
||||
}});
|
||||
};
|
||||
help_extensions.push_back(hex);
|
||||
}
|
||||
}
|
||||
else if(udiv == 2 && umod < ittypes) {
|
||||
|
Loading…
Reference in New Issue
Block a user