mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-12-26 01:50:36 +00:00
Code Issues Releases Wiki Activity

Merge pull request #88 from Quuxplusone/unbreak-travis

Browse Source 
Fix several minor issues causing TravisCI to be red
This commit is contained in:
Zeno Rogue 2020-02-15 13:54:12 +01:00 committed by GitHub
commit 33e6242f36
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.simple
View File

@ -63,7 +63,7 @@ ifeq (${OS},mingw)
LDFLAGS_GL := -lopengl32
LDFLAGS_GLEW := -lglew32
LDFLAGS_PNG := -lpng
LDFLAGS_SDL := -lSDL -lSDL_gfx -lSDL_mixer -lSDL_ttf -lz -lphtread
LDFLAGS_SDL := -lSDL -lSDL_gfx -lSDL_mixer -lSDL_ttf -lpthread -lz
OBJ_EXTENSION := .o
hyper_RES := hyper.res
ifeq (${HYPERROGUE_USE_GLEW},)
@ -78,7 +78,7 @@ ifeq (${OS},osx)
LDFLAGS_GL := -framework AppKit -framework OpenGL
LDFLAGS_GLEW := -lGLEW
LDFLAGS_PNG := -lpng
LDFLAGS_SDL := -lSDL -lSDLMain -lSDL_gfx -lSDL_mixer -lSDL_ttf -lz -lpthread
LDFLAGS_SDL := -lSDL -lSDLMain -lSDL_gfx -lSDL_mixer -lSDL_ttf -lpthread -lz
OBJ_EXTENSION := .o
hyper_RES :=
endif

2
reg3.cpp
View File

@ -1126,7 +1126,7 @@ EX namespace reg3 {
vector<int> possible;
int pfv = parent->fieldval;
if(geometry == gSpace535) pfv = 0;
for(auto s: nonlooping_earlier_states[{pfv, id}]) possible.push_back(s.second);
for(auto s: nonlooping_earlier_states[address{pfv, id}]) possible.push_back(s.second);
id1 = hrand_elt(possible, 0);
res->fiftyval = id1;
find_emeraldval(res, parent, d);

4
rogueviz/rewriting.cpp
View File

@ -117,7 +117,7 @@ void load_rules(vector<string> vs) {
stop_game();
set_geometry(gInfOrderMixed);
ginf[gInfOrderMixed].distlimit = {1, 1};
ginf[gInfOrderMixed].distlimit = {{1, 1}};
ginf[gInfOrderMixed].flags |= qEXPERIMENTAL;
start = "";
@ -189,4 +189,4 @@ auto hooks =
+ addHook(hooks_drawcell, 100, labeller);
}
}
}