From 63c9cc1060b02b2e973eadeec41e1672cb809483 Mon Sep 17 00:00:00 2001
From: Zeno Rogue <zeno@attnam.com>
Date: Fri, 27 Mar 2020 19:57:57 +0100
Subject: [PATCH] removed tactic::trailer

---
 bigstuff.cpp |  2 +-
 landlock.cpp |  4 ++--
 orbgen.cpp   |  1 -
 system.cpp   | 16 +---------------
 yendor.cpp   |  1 -
 5 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/bigstuff.cpp b/bigstuff.cpp
index 415c02b3..0456b26b 100644
--- a/bigstuff.cpp
+++ b/bigstuff.cpp
@@ -1359,7 +1359,7 @@ EX int wallchance(cell *c, bool deepOcean) {
     l == laCrossroads4 ? (weirdhyperbolic ? 5000 : 0) :
     (l == laMirror && !yendor::generating) ? 6000 :
     l == laTerracotta ? 250 :
-    (tactic::on && !tactic::trailer) ? 0 :
+    tactic::on ? 0 :
     racing::on ? 0 :
     l == laCaribbean ? 500 :
     (l == laWarpSea || l == laWarpCoast) ? 500 :
diff --git a/landlock.cpp b/landlock.cpp
index 6c753798..1cef529e 100644
--- a/landlock.cpp
+++ b/landlock.cpp
@@ -154,7 +154,7 @@ EX void countHyperstoneQuest(int& i1, int& i2) {
 
 EX bool hyperstonesUnlocked() {
   int i1, i2;
-  if(tactic::on && isCrossroads(specialland) && !tactic::trailer) return true;
+  if(tactic::on && isCrossroads(specialland)) return true;
   countHyperstoneQuest(i1, i2);
   return i1 == i2;
   }
@@ -331,7 +331,7 @@ EX eLand getNewLand(eLand old) {
     }
   #endif
 
-  if(tactic::on && !(tactic::trailer && old == specialland)) return specialland;
+  if(tactic::on) return specialland;
   if((weirdhyperbolic || cheater) && specialland != old && specialland != laCrossroads4 && specialland != laIce && !chaosmode && old != laBarrier && !isCyclic(specialland) && specialland != laBrownian)
     return specialland;
 
diff --git a/orbgen.cpp b/orbgen.cpp
index 219a31f6..2d7b65c1 100644
--- a/orbgen.cpp
+++ b/orbgen.cpp
@@ -518,7 +518,6 @@ EX void placeLocalOrbs(cell *c) {
     int ch = hrand(oi.lchance);
     if(ch == 1 && chaosmode && hrand(2) == 0 && items[treasureType(oi.l)] * landMultiplier(oi.l) >= (11+hrand(15)))
       ch = 0;
-    if(tactic::trailer && ch < 5) ch = 0;
     int tc = items[treasureType(oi.l)] * landMultiplier(oi.l);
     int tcmin = treasureForLocal();
     if(inv::on) {
diff --git a/system.cpp b/system.cpp
index 3e2db439..648ec418 100644
--- a/system.cpp
+++ b/system.cpp
@@ -75,7 +75,6 @@ EX hookset<bool()> *hooks_welcome_message;
 /** Print the welcome message during the start of game. Depends on the current mode and other settings. */
 EX void welcomeMessage() {
   if(callhandlers(false, hooks_welcome_message)) return;
-  else if(tactic::trailer) return;
 #if CAP_TOUR
   else if(tour::on) return; // displayed by tour
 #endif
@@ -138,10 +137,6 @@ EX void welcomeMessage() {
 #endif
   }
 
-int trailer_cash0 = 5;
-int trailer_cash1 = 15;
-bool trailer_safety = true;
-
 /** These hooks are called at the start of initgame. */
 EX hookset<void()> *hooks_initgame;
 
@@ -231,9 +226,6 @@ EX void initgame() {
     if(hiitemsMax(itWine) >= 25) items[itWine] = min(hiitemsMax(itWine), 50);
     }
   
-  if(tactic::on && tactic::trailer)
-    items[treasureType(firstland)] = trailer_cash0;
-
   yendor::lastchallenge = yendor::challenge;
   
   if(shmup::on) shmup::init();
@@ -273,9 +265,7 @@ EX void initgame() {
   // extern int sightrange; sightrange = 9;
   // cwt.at->land = laHell; items[itHell] = 10;
   for(int i=BARLEV; i>=7 - getDistLimit() - genrange_bonus; i--) {
-    if(tactic::trailer && cwt.at->land != laClearing) safety = trailer_safety;
     setdist(cwt.at, i, NULL);
-    if(tactic::trailer) safety = false;
 
     currentmap->verify();
     }
@@ -309,9 +299,6 @@ EX void initgame() {
     multi::whereto[i].d = MD_UNDECIDED;
     }
     
-  if(tactic::on && tactic::trailer)
-    items[treasureType(firstland)] = trailer_cash1;
-  
   yendor::init(3);
   peace::simon::init();
   
@@ -1037,8 +1024,7 @@ EX void saveStats(bool emergency IS(false)) {
   
 #if ISMOBILE==0
   DEBB(DF_INIT, ("Game statistics saved to ", scorefile));
-  if(!tactic::trailer)
-    addMessage(XLAT("Game statistics saved to %1", scorefile));
+  addMessage(XLAT("Game statistics saved to %1", scorefile));
 #endif
   fclose(f);
   }
diff --git a/yendor.cpp b/yendor.cpp
index 28fb443c..4b5f4633 100644
--- a/yendor.cpp
+++ b/yendor.cpp
@@ -807,7 +807,6 @@ EX namespace yendor {
 #define MAXTAC 20
 EX namespace tactic {
 
-  EX bool trailer = false;
   EX bool on = false;
   EX int id;