Add bringris to two of the build systems

.github/workflows/build.sh

@@ -17,11 +17,20 @@ if [[ "$GH_HYP_RVIZ" == "rviz_1" ]]; then
   GH_AUTOTOOLS_CXXFLAGS+=" -std=c++17 -DCAP_ROGUEVIZ=1"
 fi
 
+if [[ "$GH_HYP_BRINGRIS" == "bringris_1" ]]; then
+  GH_MYMAKE_ARGS+=" -bringris"
+fi
+
 export CC=$GH_COMPILER
 export CXX=${CC%cc}++
 
 if [[ "$GH_BUILDSYS" == "makefile" ]]; then
-  make -f Makefile.simple
+  if [[ "$GH_HYP_BRINGRIS" == "bringris_1" ]]; then
+    make -f Makefile.simple bringris
+    mv bringris hyperrogue
+  else
+    make -f Makefile.simple
+  fi
 elif [[ "$GH_BUILDSYS" == "autotools" ]]; then
   autoreconf -vfi
   ./configure CXXFLAGS="${GH_AUTOTOOLS_CXXFLAGS}"

.github/workflows/github_ci.yml

@@ -71,6 +71,30 @@ jobs:
     - name: Do a simple test
       run: .github/workflows/test_simple.sh
 
+  bringris:
+    name: Bringris
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macos-latest]
+        compiler: [gcc, clang]
+        build_system: [makefile, mymake]
+    env:
+      GH_OS: ${{ matrix.os }}
+      GH_COMPILER: ${{ matrix.compiler }}
+      GH_BUILDSYS: ${{ matrix.build_system }}
+      GH_HYP_BRINGRIS: bringris_1
+      GH_HYP_GLEW: glew_1
+    steps:
+    - uses: actions/checkout@v2
+    - name: Install build dependencies
+      run: .github/workflows/install_deps.sh
+    - name: Build
+      run: .github/workflows/build.sh
+    - name: Do a simple test
+      run: .github/workflows/test_simple.sh
+
   emscripten:
     runs-on: ubuntu-latest
     steps:

.travis.yml

@@ -122,6 +122,38 @@ matrix:
       HYPERROGUE_USE_GLEW=1
       HYPERROGUE_USE_PNG=1
       HYPERROGUE_USE_ROGUEVIZ=1
+  - os: linux                           # Linux, make, Bringris
+    compiler: gcc
+    env: >-
+      TRAVIS_OS_NAME=linux
+      TRAVIS_COMPILER_NAME=gcc
+      TRAVIS_BUILD_SYSTEM=Makefile
+      HYPERROGUE_USE_GLEW=1
+      HYPERROGUE_USE_BRINGRIS=1
+  - os: linux                           # Linux, mymake, Bringris
+    compiler: gcc
+    env: >-
+      TRAVIS_OS_NAME=linux
+      TRAVIS_COMPILER_NAME=gcc
+      TRAVIS_BUILD_SYSTEM=mymake
+      HYPERROGUE_USE_GLEW=1
+      HYPERROGUE_USE_BRINGRIS=1
+  - os: osx                             # OSX, make, Bringris
+    compiler: clang
+    env: >-
+      TRAVIS_OS_NAME=osx
+      TRAVIS_COMPILER_NAME=clang
+      TRAVIS_BUILD_SYSTEM=Makefile
+      HYPERROGUE_USE_GLEW=1
+      HYPERROGUE_USE_BRINGRIS=1
+  - os: osx                             # OSX, mymake, Bringris
+    compiler: clang
+    env: >-
+      TRAVIS_OS_NAME=osx
+      TRAVIS_COMPILER_NAME=clang
+      TRAVIS_BUILD_SYSTEM=mymake
+      HYPERROGUE_USE_GLEW=1
+      HYPERROGUE_USE_BRINGRIS=1
   - os: linux                           # Emscripten
     env: >-
       TRAVIS_OS_NAME=linux
@@ -184,11 +216,18 @@ script:
     ./configure CXXFLAGS="-W -Wall -Wextra -Werror -Wno-unused-parameter -Wno-maybe-uninitialized -Wno-unknown-warning-option"
     make
   elif [[ "$TRAVIS_BUILD_SYSTEM" == "Makefile" ]]; then
-    make -f Makefile.simple
+    if [[ "$HYPERROGUE_USE_BRINGRIS" == "1" ]]; then
+      make -f Makefile.simple bringris
+      mv bringris hyperrogue
+    else
+      make -f Makefile.simple
+    fi
   elif [[ "$TRAVIS_BUILD_SYSTEM" == "mymake" ]]; then
     make -f Makefile.simple mymake
     if [[ "$HYPERROGUE_USE_ROGUEVIZ" == "1" ]]; then
       ./mymake -rv
+    elif [[ "$HYPERROGUE_USE_BRINGRIS" == "1" ]]; then
+      ./mymake -bringris
     else
       ./mymake
     fi

Makefile.simple

@@ -108,6 +108,9 @@ endif
 hyper_OBJS = hyper$(OBJ_EXTENSION)
 hyper_LDFLAGS = $(LDFLAGS_GL) $(LDFLAGS_SDL)
 
+bringris_CXXFLAGS = -DBRINGRIS -Wno-unused-variable
+bringris_LDFLAGS = $(hyper_LDFLAGS)
+
 ifeq (${HYPERROGUE_USE_GLEW},1)
   CXXFLAGS_EARLY += -DCAP_GLEW=1
   hyper_LDFLAGS += $(LDFLAGS_GLEW)
@@ -171,6 +174,12 @@ emscripten: hyper.html
 
 hyper.emscripten-sources: *.cpp autohdr.h
 
+bringris.o: rogueviz/bringris.cpp autohdr.h
+	$(CXX) $(CXXFLAGS) $(bringris_CXXFLAGS) rogueviz/bringris.cpp -c -o $@
+
+bringris$(EXE_EXTENSION): bringris.o
+	$(CXX) $(CXXFLAGS) $(bringris_CXXFLAGS) bringris.o $(LDFLAGS) $(bringris_LDFLAGS) -o $@
+
 .PHONY: clean
 
 clean:

graph.cpp

@@ -5065,8 +5065,7 @@ EX void normalscreen() {
   cmode = sm::NORMAL | sm::DOTOUR | sm::CENTER;
   if(viewdists && show_distance_lists) cmode |= sm::SIDE | sm::MAYDARK;
   gamescreen((vid.highlightmode == (hiliteclick ? 0 : 2)) ? 1 : 0); drawStats();
-  if(nomenukey || ISMOBILE)
-    ;
+  if(nomenukey || ISMOBILE) {}
 #if CAP_TOUR
   else if(tour::on) 
     displayButton(vid.xres-8, vid.yres-vid.fsize, XLAT("(ESC) tour menu"), SDLK_ESCAPE, 16);

mymake.cpp

@@ -142,6 +142,10 @@ int main(int argc, char **argv) {
       obj_dir += "/web";
       setdir += "../";
       }
+    else if(s == "-bringris") {
+      modules.push_back("rogueviz/bringris");
+      modules.push_back("rogueviz/subquotient");
+      }
     else if(s.substr(0, 2) == "-f") {
       opts += " " + s;
       obj_dir += "/";

sky.cpp

@@ -196,8 +196,8 @@ void celldrawer::draw_ceiling() {
 
     case 2: {
       if(euclid) return;
-      color_t col;
-      color_t skycol;
+      color_t col = skycolor(c);
+      color_t skycol = 0xA0A0FF;
 
       switch(c->land) {
         case laWineyard: