mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-10-23 18:07:41 +00:00
Code Issues Releases Wiki Activity

Merge pull request #92 from Quuxplusone/pedantic

Browse Source 
Add `-pedantic` to the Makefile, and fix all resulting warnings
This commit is contained in:
Zeno Rogue
2020-03-27 12:04:40 +01:00
committed by GitHub
parent f03b7bd1b0 14c098eaf9
commit b5a70c1bc6
36 changed files with 174 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
help.cpp
View File

@@ -755,11 +755,11 @@ void gotoHelpFor(eItem i) {
void gotoHelpFor(eWall w) {
help = generateHelpForWall(w);
};
}
void gotoHelpFor(eMonster m) {
help = generateHelpForMonster(m);
};
}
EX void appendHelp(string s) {
auto h = helpgenerator;
@@ -832,7 +832,7 @@ EX void describeMouseover() {
if(c->land == laTortoise && tortoise::seek()) out += " " + tortoise::measure(getBits(c));
if(buggyGeneration) {
char buf[80]; sprintf(buf, " %p H=%d M=%d", c, c->landparam, c->mpdist); out += buf;
char buf[80]; sprintf(buf, " %p H=%d M=%d", hr::voidp(c), c->landparam, c->mpdist); out += buf;
}
if(randomPatternsMode)
@@ -877,7 +877,7 @@ EX void describeMouseover() {
"Trees in this forest can be chopped down. Big trees take two turns to chop down.";
else
if(c->wall != waSea && c->wall != waPalace && c->wall != waDeadfloor)
if(!((c->wall == waCavefloor || c->wall == waCavewall) && (c->land == laEmerald && c->land == laCaves)))
if(!((c->wall == waCavefloor || c->wall == waCavewall) && (c->land == laEmerald || c->land == laCaves)))
if(!((isAlch(c->wall) && c->land == laAlchemist)))
help = bygen([c] () { gotoHelpFor(c->wall); });
}