mirror of
https://github.com/zenorogue/hyperrogue.git
synced 2024-09-29 22:40:41 +00:00
Merge pull request #88 from Quuxplusone/unbreak-travis
Fix several minor issues causing TravisCI to be red
This commit is contained in:
commit
33e6242f36
@ -63,7 +63,7 @@ ifeq (${OS},mingw)
|
|||||||
LDFLAGS_GL := -lopengl32
|
LDFLAGS_GL := -lopengl32
|
||||||
LDFLAGS_GLEW := -lglew32
|
LDFLAGS_GLEW := -lglew32
|
||||||
LDFLAGS_PNG := -lpng
|
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
|
OBJ_EXTENSION := .o
|
||||||
hyper_RES := hyper.res
|
hyper_RES := hyper.res
|
||||||
ifeq (${HYPERROGUE_USE_GLEW},)
|
ifeq (${HYPERROGUE_USE_GLEW},)
|
||||||
@ -78,7 +78,7 @@ ifeq (${OS},osx)
|
|||||||
LDFLAGS_GL := -framework AppKit -framework OpenGL
|
LDFLAGS_GL := -framework AppKit -framework OpenGL
|
||||||
LDFLAGS_GLEW := -lGLEW
|
LDFLAGS_GLEW := -lGLEW
|
||||||
LDFLAGS_PNG := -lpng
|
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
|
OBJ_EXTENSION := .o
|
||||||
hyper_RES :=
|
hyper_RES :=
|
||||||
endif
|
endif
|
||||||
|
2
reg3.cpp
2
reg3.cpp
@ -1126,7 +1126,7 @@ EX namespace reg3 {
|
|||||||
vector<int> possible;
|
vector<int> possible;
|
||||||
int pfv = parent->fieldval;
|
int pfv = parent->fieldval;
|
||||||
if(geometry == gSpace535) pfv = 0;
|
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);
|
id1 = hrand_elt(possible, 0);
|
||||||
res->fiftyval = id1;
|
res->fiftyval = id1;
|
||||||
find_emeraldval(res, parent, d);
|
find_emeraldval(res, parent, d);
|
||||||
|
@ -117,7 +117,7 @@ void load_rules(vector<string> vs) {
|
|||||||
|
|
||||||
stop_game();
|
stop_game();
|
||||||
set_geometry(gInfOrderMixed);
|
set_geometry(gInfOrderMixed);
|
||||||
ginf[gInfOrderMixed].distlimit = {1, 1};
|
ginf[gInfOrderMixed].distlimit = {{1, 1}};
|
||||||
ginf[gInfOrderMixed].flags |= qEXPERIMENTAL;
|
ginf[gInfOrderMixed].flags |= qEXPERIMENTAL;
|
||||||
|
|
||||||
start = "";
|
start = "";
|
||||||
|
Loading…
Reference in New Issue
Block a user