fix: BlurMemory and Amnesia fail in wilderness

Author: finduraf

Diff for: Main/Source/bodypart.cpp

@@ -3564,17 +3564,21 @@ void head::SignalPossibleUsabilityChange()
         if(RAND_N(5))
         {
           ADD_MESSAGE("Your memory becomes blurred.");
-          GetLevel()->Amnesia(25 + RAND_N(50));
           Master->EditExperience(INTELLIGENCE, -80, 1 << 13);
-          game::SendLOSUpdateRequest();
+          if(!game::IsInWilderness()) {
+            GetLevel()->Amnesia(25 + RAND_N(50));
+            game::SendLOSUpdateRequest();
+          }
         }
         else
         {
           ADD_MESSAGE("A terrible concussion garbles your consciousness.");
           Master->BeginTemporaryState(CONFUSED, 5000 + RAND_N(5000));
           Master->EditExperience(INTELLIGENCE, -100, 1 << 14);
-          GetLevel()->BlurMemory();
-          game::SendLOSUpdateRequest();
+          if(!game::IsInWilderness()) {
+            GetLevel()->BlurMemory();
+            game::SendLOSUpdateRequest();
+          }
         }
       }
       else

Diff for: Main/Source/char.cpp

@@ -5042,7 +5042,7 @@ void character::DoDetecting()
   if(Squares > GetAttribute(INTELLIGENCE) * (25 + RAND() % 51))
   {
     ADD_MESSAGE("An enormous burst of geographical information overwhelms your consciousness. Your mind cannot cope with it and your memories blur.");
-    Level->BlurMemory();
+    Level->BlurMemory();  // !game::IsInWilderness() is already checked by DetectHandler()
     BeginTemporaryState(CONFUSED, 1000 + RAND() % 1000);
     EditExperience(INTELLIGENCE, -100, 1 << 12);
   }

Diff for: Main/Source/dungeon.cpp

@@ -94,18 +94,18 @@ truth dungeon::PrepareLevel(int Index, truth Visual)
   {
     festring fsGenLoopDL;{const char* pc = std::getenv("IVAN_DebugGenDungeonLevelLoopID");if(pc!=NULL)fsGenLoopDL<<pc;}
     int iGenLoopMax=250;{const char* pc = std::getenv("IVAN_DebugGenDungeonLevelLoopMax");if(pc!=NULL)iGenLoopMax=atoi(pc);}
-    
+
     festring fsDL;fsDL<<GetIndex()<<Index;
     int iRetryMax = fsGenLoopDL==fsDL ? iGenLoopMax : 10;
-    
+
     DBG3("GeneratingDungeonLevel",fsDL.CStr(),fsGenLoopDL.CStr());
-    
+
     level* NewLevel=NULL;
     cbitmap* EnterImage=NULL;
     for(int i=0;i<iRetryMax;i++){
       try{
         if(!genericException::ToggleGenNewLvl())ABORT("expecting gen lvl to become: true");
-        
+
         NewLevel = Level[Index] = new level;
         NewLevel->SetDungeon(this);
         NewLevel->SetIndex(Index);
@@ -123,11 +123,11 @@ truth dungeon::PrepareLevel(int Index, truth Visual)
             game::SetEnterTextDisplacement(Displacement);
             game::TextScreen(CONST_S("Entering ") + GetLevelDescription(Index)
                              + CONST_S("...\n\nThis may take some time, please wait."),
-                             Displacement, WHITE, false, 
+                             Displacement, WHITE, false,
                              true, &game::BusyAnimation);
             game::TextScreen(CONST_S("Entering ") + GetLevelDescription(Index)
                              + CONST_S("...\n\nPress any key to continue."),
-                             Displacement, WHITE, game::GetAutoPlayMode()<2, 
+                             Displacement, WHITE, game::GetAutoPlayMode()<2,
                              false, &game::BusyAnimation);
             game::SetEnterImage(0);
             delete EnterImage;
@@ -158,7 +158,7 @@ truth dungeon::PrepareLevel(int Index, truth Visual)
         //TODO it is not working well, memory usage keeps increasing...
         if(NewLevel  ){delete NewLevel  ;NewLevel=NULL;}
         if(EnterImage){delete EnterImage;EnterImage=NULL;}
-        
+
         //retry
       }
     } //for()
@@ -210,10 +210,6 @@ void dungeon::PrepareMusic(int Index)
      }
      audio::SetPlaybackStatus(audio::PLAYING);
   }
-
-
-
-
 }
 
 void dungeon::SaveLevel(cfestring& SaveName, int Number, truth DeleteAfterwards)
@@ -312,7 +308,7 @@ inputfile& operator>>(inputfile& SaveFile, dungeon*& Dungeon)
 
 /**
  * The wrong luminance saved to a lsquare problem
- * may happen after craft/split eg.: a blue crystal stone, 
+ * may happen after craft/split e.g.: a blue crystal stone,
  * then you save the game and re-load it and the luminance would be still there.
  * TODO this workaround will not be necessary when the problem is fixed on it's origin
  */
@@ -333,7 +329,7 @@ level* dungeon::LoadLevel(inputfile& SaveFile, int Number)
   Level[Number]->SetLevelScript(GetLevelScript(Number));
   PrepareMusic(Number);
   WorkaroundFixLuminance(Level[Number]);
-    
+
   return Level[Number];
 }
 

Diff for: Main/Source/miscitem.cpp

@@ -3087,7 +3087,7 @@ void scrollofdetectmaterial::FinishReading(character* Reader)
   {
     ADD_MESSAGE("An enormous burst of geographical information overwhelms your "
                 "consciousness. Your mind cannot cope with it and your memories blur.");
-    Level->BlurMemory();
+    Level->BlurMemory();  // !game::IsInWilderness() is already handled by reading command
     Reader->BeginTemporaryState(CONFUSED, 1000 + RAND() % 1000);
     Reader->EditExperience(INTELLIGENCE, -100, 1 << 12);
   }