Merge branch 'amiga-port' of https://github.com/ingpaschke/NetHack into NetHack-3.7

src/allmain.c

@@ -13,6 +13,7 @@
 
 staticfn void moveloop_preamble(boolean);
 staticfn void u_calc_moveamt(int);
+
 staticfn void maybe_do_tutorial(void);
 #ifdef POSITIONBAR
 staticfn void do_positionbar(void);
@@ -511,11 +512,6 @@ moveloop_core(void)
         return;
     }
 
-#ifdef CLIPPING
-    /* just before rhack */
-    cliparound(u.ux, u.uy);
-#endif
-
     u.umoved = FALSE;
 
     if (gm.multi > 0) {
@@ -546,6 +542,11 @@ moveloop_core(void)
 
     if (gv.vision_full_recalc)
         vision_recalc(0); /* vision! */
+#ifdef CLIPPING
+    /* after rhack() and vision_recalc() so that the map is redrawn
+       once with correct vision data, not twice (overshoot+correct) */
+    cliparound(u.ux, u.uy);
+#endif
     /* when running in non-tport mode, this gets done through domove() */
     if ((!svc.context.run || flags.runmode == RUN_TPORT)
         && (gm.multi && (!svc.context.travel ? !(gm.multi % 7)

src/rip.c

@@ -9,7 +9,8 @@
    necessarily have to be used by a binary with multiple window-ports */
 
 #if defined(TTY_GRAPHICS) || defined(X11_GRAPHICS) || defined(GEM_GRAPHICS) \
-    || defined(DUMPLOG) || defined(CURSES_GRAPHICS) || defined(SHIM_GRAPHICS)
+    || defined(DUMPLOG) || defined(CURSES_GRAPHICS) || defined(SHIM_GRAPHICS) \
+    || defined(AMII_GRAPHICS)
 #define TEXT_TOMBSTONE
 #endif
 #if defined(mac) || defined(__BEOS__)