From 3410a20275a7e002d83f964a6bd19483b69fccdc Mon Sep 17 00:00:00 2001
From: Zeno Rogue <zeno@attnam.com>
Date: Sat, 26 Feb 2022 13:32:33 +0100
Subject: [PATCH] rv:: do not destroy change water into chasms (except demos
 that do that)

---
 rogueviz/gobot.cpp      | 6 ++++--
 rogueviz/starbattle.cpp | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/rogueviz/gobot.cpp b/rogueviz/gobot.cpp
index 41a2debb..92aba055 100644
--- a/rogueviz/gobot.cpp
+++ b/rogueviz/gobot.cpp
@@ -18,7 +18,7 @@
 #include <aegis.hpp>
 #endif
 
-#include "../hyper.h"
+#include "rogueviz.h"
 
 namespace hr {
 
@@ -44,6 +44,8 @@ int labels_value = 1;
 
 vector<boarddata> history;
 
+bool draw_go(cell *c, const shiftmatrix& V);
+
 void init_go() {
   ac = currentmap->allcells();
   current.taken.resize(isize(ac), 2);
@@ -52,6 +54,7 @@ void init_go() {
   current.captures[1] = 0;
   for(int i=0; i<isize(ac); i++)
     indices[ac[i]] = i;
+  rogueviz::addHook(hooks_drawcell, 100, draw_go);
   }
 
 void hwrite(hstream& hs, const boarddata& b) {
@@ -602,7 +605,6 @@ int rugArgs() {
 
 auto gobot_hook = 
   addHook(hooks_args, 100, rugArgs) +
-  addHook(hooks_drawcell, 100, draw_go) +
   addHook(shmup::hooks_turn, 100, [] (int t) {
     if(shot_state == 1) {
       shot::take("go-temp.png");
diff --git a/rogueviz/starbattle.cpp b/rogueviz/starbattle.cpp
index bc163832..384a07fd 100644
--- a/rogueviz/starbattle.cpp
+++ b/rogueviz/starbattle.cpp
@@ -488,6 +488,7 @@ void launch() {
   
   showstartmenu = false;
   mapeditor::drawplayer = false;
+  rv::hook(hooks_drawcell, 100, draw_star);
   }
 
 #if CAP_COMMANDLINE
@@ -515,7 +516,6 @@ int rugArgs() {
 
 auto starbattle_hook = 
   addHook(hooks_args, 100, rugArgs) +
-  addHook(hooks_drawcell, 100, draw_star) +
   addHook(mapstream::hooks_savemap, 100, [] (fhstream& f) {
     f.write<int>(isize(sdata));
     for(auto& sd: sdata) {