(See the other PRs first!) This is the merge of all my other PRs + some fixes and adjustments.

.devsPrefs/AquariusPower/nbproject/project.xml

@@ -4,8 +4,8 @@
     <configuration>
         <data xmlns="http://www.netbeans.org/ns/make-project/1">
             <name>Ivan.github</name>
-            <c-extensions/>
-            <cpp-extensions>cc,cpp</cpp-extensions>
+            <c-extensions>c</c-extensions>
+            <cpp-extensions>cc,cpp,cxx</cpp-extensions>
             <header-extensions>h</header-extensions>
             <sourceEncoding>UTF-8</sourceEncoding>
             <make-dep-projects/>
@@ -17,6 +17,7 @@
                 <sourceRootElem>Main/Source</sourceRootElem>
                 <sourceRootElem>Main/Include</sourceRootElem>
                 <sourceRootElem>FeLib/Include</sourceRootElem>
+                <sourceRootElem>SDL2-2.0.4/include</sourceRootElem>
             </sourceRootList>
             <confList>
                 <confElem>

Doc/HowTo/DefinesValidator.txt

@@ -16,3 +16,7 @@ or when someone changes a value only at `define.dat` or at some c++ .h file, so
 in case c++ has no such define, it will be ignored ex.: the check will be performed only `#ifdef EMISSARY` (currently not used in c++ .h files)
 
 7) run any game, go to the console ctrl+` and run the validator, it will abort complaining about TORSO value with this message: "Defined TORSO with value 2 from .dat file mismatches hardcoded c++ define value of 1!"
+
+Ps.: alternatively (instead of using developer console), you can run this command line commands:
+./ivan --defgen # that creates definesvalidator.h
+./ivan --defval # to validate it

FeLib/Include/festring.h

@@ -15,6 +15,7 @@
 
 #include <climits>
 #include <vector>
+#include <pcre.h>
 
 #include "felibdef.h"
 
@@ -119,6 +120,7 @@ class festring
   void ExtractWord(festring&);
   long GetCheckSum() const;
   void EnsureOwnsData(bool = false);
+  static pcre* CompilePCRE(pcre *pcreExistingRegexWorker, cfestring &fsPattern, festring *pfsErrorMsg=NULL);
  private:
   static void InstallIntegerMap();
   static void DeInstallIntegerMap();

FeLib/Include/graphics.h

@@ -167,4 +167,4 @@ class graphics
   static rawbitmap* DefaultFont;
 };
 
-#endif
+#endif //__GRAPHICS_H__

FeLib/Include/rawbit.h

@@ -49,6 +49,7 @@ class rawbitmap
                    cpackalpha* = 0,
                    cuchar* = 0, cuchar* = 0, truth = true) const;
   v2 GetSize() const { return Size; }
+  v2 GetFontSize() { return v2FontSize; }
 
   void AlterGradient(v2, v2, int, int, truth);
   void SwapColors(v2, v2, int, int);
@@ -74,6 +75,7 @@ class rawbitmap
   uchar* Palette;
   paletteindex** PaletteBuffer;
   fontcache FontCache;
+  v2 v2FontSize=v2(8,8); //TODO everywhere using 8 to calculate font size should use this variable, so one day we can have dynamic size font, after that we can set this var to any other proper value
 };
 
 #endif

FeLib/Source/bitmap.cpp

@@ -865,6 +865,11 @@ void bitmap::DrawLine(int FromX, int FromY, v2 To, col16 Color, truth Wide)
 void bitmap::DrawLine(v2 From, v2 To, col16 Color, truth Wide)
 { DrawLine(From.X, From.Y, To.X, To.Y, Color, Wide); }
 
+/**
+ * TODO this needs a fix:
+ *  If a line is drawn from x,1 to anywhere and it is WIDE, the game will SEGFAULT.
+ *  Every drawn dot must be checked if is inside the bitmap boundaries...
+ */
 void bitmap::DrawLine(int OrigFromX, int OrigFromY, int OrigToX, int OrigToY, col16 Color, truth Wide)
 {
   if(OrigFromY == OrigToY)

FeLib/Source/festring.cpp

@@ -13,6 +13,8 @@
 #include <cctype>
 #include <cstdlib>
 #include <cstring>
+#include <iostream>
+
 #include "festring.h"
 #include "allocate.h"
 #include "error.h"
@@ -713,8 +715,13 @@ festring::sizetype festring::IgnoreCaseFind(cfestring& Where,
   return NPos;
 }
 
-/* Replaces all occurances of What in Where after Begin with With */
-
+/**
+ * Replaces all occurances of What in Where after Begin with With 
+ * @param Where
+ * @param What
+ * @param With
+ * @param Begin
+ */
 void festring::SearchAndReplace(festring& Where, cfestring& What,
                                 cfestring& With, sizetype Begin)
 {
@@ -907,3 +914,43 @@ void festring::EnsureOwnsData(bool Unique)
     CreateOwnData(Data, Size);
   }
 }
+
+/**
+ * 
+ * @param pcreExistingRegexWorker it has to be freed if was already set
+ * @param fsPattern
+ * @param bWarnOnError
+ * @return 
+ */
+pcre* festring::CompilePCRE(pcre *pcreExistingRegexWorker, cfestring &fsPattern, festring *pfsErrorMsg)
+{
+  if(pcreExistingRegexWorker)
+    pcre_free(pcreExistingRegexWorker);
+
+  if(fsPattern.IsEmpty())
+    return NULL;
+
+  const char *errMsg;
+  int iErrOffset;
+  pcreExistingRegexWorker = pcre_compile(
+    fsPattern.CStr(),
+    0, // no options
+    &errMsg, &iErrOffset,
+    0  // default char tables
+  );
+
+  if (!pcreExistingRegexWorker){
+    festring fsErr;
+    fsErr<<"Regex validation failed, if ignored will just not work at all.\n"
+         <<errMsg<<",\n"
+         <<"offset:"<<iErrOffset<<".";
+
+    DBG1(fsErr.CStr());
+    //TODO let this work with travis-ci compilation...: std::cerr<<fsErr.CStr()<<std::endl;
+
+    if(pfsErrorMsg)
+      (*pfsErrorMsg)=fsErr;
+  }
+
+  return pcreExistingRegexWorker;
+}

FeLib/Source/graphics.cpp

@@ -634,7 +634,7 @@ void graphics::AddDrawAboveAll(drawabove da, int iPriority, const char* desc)
     vDrawaboveTmp.erase(vDrawaboveTmp.begin()+iIndexLP);
   }
 
-  char* c = std::getenv("IVAN_LISTDRAWABOVE"); //to help on development, so all priorities can be adjusted easily
+  char* c = std::getenv("IVAN_LISTDRAWABOVE"); //output to terminal to help on development, so all priorities can be adjusted easily
   bool bCOut = c!=NULL && strcmp(c,"true")==0;
   festring fsDrawAbovePriority;
   for(int i=0;i<vDrawabove.size();i++){

FeLib/Source/rawbit.cpp

@@ -436,8 +436,8 @@ void rawbitmap::Printf(bitmap* Bitmap, v2 Pos, packcol16 Color, cchar* Format, .
     {
       v2 F(((Buffer[c] - 0x20) & 0xF) << 4, (Buffer[c] - 0x20) & 0xF0);
           //printf("X=%4d -- Y=%d\n", F.X, F.Y);
-      MaskedBlit(Bitmap, F, v2(Pos.X + (c << 3) + 1, Pos.Y + 1), v2(8, 8), &ShadeCol);
-      MaskedBlit(Bitmap, F, v2(Pos.X + (c << 3), Pos.Y), v2(8, 8), &Color);
+      MaskedBlit(Bitmap, F, v2(Pos.X + (c << 3) + 1, Pos.Y + 1), v2FontSize, &ShadeCol);
+      MaskedBlit(Bitmap, F, v2(Pos.X + (c << 3), Pos.Y), v2FontSize, &Color);
     }
   }
   else
@@ -451,7 +451,7 @@ void rawbitmap::Printf(bitmap* Bitmap, v2 Pos, packcol16 Color, cchar* Format, .
                    TRANSPARENT_COLOR,
                    0 };
 
-    for(int c = 0; Buffer[c]; ++c, B.Dest.X += 8)
+    for(int c = 0; Buffer[c]; ++c, B.Dest.X += v2FontSize.X)
     {
       B.Src.X = ((Buffer[c] - 0x20) & 0xF) << 4;
       B.Src.Y = (Buffer[c] - 0x20) & 0xF0;

FeLib/Source/specialkeys.cpp

@@ -251,7 +251,15 @@ void specialkeys::AddCtrlOrFuncKeyHandler(SDL_Keycode key, specialkeyhandler Han
  */
 bool specialkeys::ControlKeyHandler(SDL_Keycode key)
 {
-  switch(key){ //TODO use SDLK_ keys?
+  /**
+   * Important: it will require to use some special SDLK_ keys if they are not 
+   * being translated to a felibdef.h key value
+   * 
+   * If you use some "mouse pointer indicator OS feature" by pressing the CONTROL key,
+   * the first time you press a key combination (like ctrl+f) it may not work!
+   * On the tests I performed, it would only mess RightControl+f here.
+   */
+  switch(key){ 
   case 'f':
     Request=Filter;
     return true;
@@ -261,6 +269,7 @@ bool specialkeys::ControlKeyHandler(SDL_Keycode key)
   case 'v':
     Request=PasteFromClipboard;
     return true;
+  case KEY_DELETE:
   case SDLK_DELETE:
     Request=ClearStringInput;
     return true;

FeLib/Source/whandler.cpp

@@ -727,7 +727,6 @@ void globalwindowhandler::ProcessKeyDownMessage(SDL_Event* Event)
 #if SDL_MAJOR_VERSION == 1 
    default:
     KeyPressed = Event->key.keysym.unicode;
-
     if(!KeyPressed)
       return;
 #endif

Main/CMakeLists.txt

@@ -28,8 +28,8 @@ set_source_files_properties(
     Source/smoke.cpp    Source/square.cpp    Source/stack.cpp    Source/team.cpp
     Source/terra.cpp    Source/trap.cpp      Source/traps.cpp    Source/worldmap.cpp
     Source/wsquare.cpp  Source/wterra.cpp    Source/wterras.cpp  Source/hiteffect.cpp
-    Source/cmdcraft.cpp Source/cmdcraftfilters.cpp
-    Source/cmdswapweap.cpp
+    Source/cmdcraft.cpp        Source/cmdcraftfilters.cpp Source/cmdswapweap.cpp
+    Source/curseddeveloper.cpp Source/wizautoplay.cpp
     PROPERTIES HEADER_FILE_ONLY TRUE)
 
 add_executable(ivan ${IVAN_SOURCES} Resource/Ivan.rc)

Main/Include/char.h

@@ -287,6 +287,8 @@ class character : public entity, public id
  public:
   friend class databasecreator<character>;
   friend class corpse;
+  friend class curseddeveloper;
+  friend class wizautoplay;
   typedef characterprototype prototype;
   typedef characterdatabase database;
   character();
@@ -364,6 +366,7 @@ class character : public entity, public id
   void ActivateEquipmentState(long What) { EquipmentState |= What; }
   void DeActivateEquipmentState(long What) { EquipmentState &= ~What; }
   truth TemporaryStateIsActivated(long What) const;
+  truth HasStateFlag(long Flag);
   truth EquipmentStateIsActivated(long What) const { return EquipmentState & What; }
   truth StateIsActivated(long What) const;
   truth LoseConsciousness(int, truth = false);
@@ -689,6 +692,7 @@ class character : public entity, public id
   void LycanthropyHandler();
   void SearchingHandler();
   void SaveLife();
+  void SaveLifeBase();
   void BeginInvisibility();
   void BeginInfraVision();
   void BeginESP();
@@ -1126,6 +1130,7 @@ class character : public entity, public id
   festring GetTrapDescription() const;
   truth TryToUnStickTraps(v2);
   void RemoveTrap(ulong);
+  truth ValidateTrapData(bool bForceNow = false);
   void AddTrap(ulong, ulong);
   truth IsStuckToTrap(ulong) const;
   void RemoveTraps();
@@ -1184,14 +1189,14 @@ class character : public entity, public id
   void SignalBurn();
   void Extinguish(truth);
   truth IsBurnt() const;
-  truth IsPlayerAutoPlay();
   truth CheckAIZapOpportunity();
   int GetAdjustedStaminaCost(int, int);
   truth TryToStealFromShop(character*, item*);
   int GetMyVomitMaterial() { return MyVomitMaterial; }
   void SetNewVomitMaterial(int What) { MyVomitMaterial = What; }
   festring GetHitPointDescription() const;
   truth WillGetTurnSoon() const;
+  truth OverloadedKickFailCheck();
   virtual void SetFeedingSumo(truth What) { return; }
  protected:
   static truth DamageTypeDestroysBodyPart(int);
@@ -1222,23 +1227,6 @@ class character : public entity, public id
   void StandIdleAI();
   virtual void CreateCorpse(lsquare*);
   void GetPlayerCommand();
-
-  truth AutoPlayAICommand(int&);
-  truth AutoPlayAIPray();
-  bool AutoPlayAIChkInconsistency();
-  static void AutoPlayAIDebugDrawSquareRect(v2 v2SqrPos, col16 color, int iPrintIndex=-1, bool bWide=false, bool bKeepColor=false);
-  static void AutoPlayAIDebugDrawOverlay();
-  static bool AutoPlayAICheckAreaLevelChangedAndReset();
-  truth AutoPlayAIDropThings();
-  bool IsAutoplayAICanPickup(item* it,bool bPlayerHasLantern);
-  truth AutoPlayAIEquipAndPickup(bool bPlayerHasLantern);
-  int   AutoPlayAIFindWalkDist(v2 v2To);
-  truth AutoPlayAITestValidPathTo(v2 v2To);
-  truth AutoPlayAINavigateDungeon(bool bPlayerHasLantern);
-  truth AutoPlayAISetAndValidateKeepGoingTo(v2 v2KGTo);
-  void AutoPlayAITeleport(bool bDeathCountBased);
-  void AutoPlayAIReset(bool bFailedToo);
-
   virtual void GetAICommand();
   truth MoveTowardsTarget(truth);
   virtual cchar* FirstPersonUnarmedHitVerb() const;
@@ -1318,6 +1306,7 @@ class character : public entity, public id
   ulong WarnFlags;
   int ScienceTalks;
   trapdata* TrapData;
+  long lTmpLastValidateTrapDataTurn; //performace wise, no need to store
   expmodifiermap ExpModifierMap;
   int CounterToMindWormHatch;
   ulong MemorizedEquippedItemIDs[MAX_EQUIPMENT_SLOTS];

Main/Include/command.h

@@ -74,6 +74,7 @@ class commandsystem
   static truth Open(character*);
   static truth PickUp(character*);
   static truth Pray(character*);
+  static truth AskFavour(character*);
   static truth Craft(character*);
   static truth Quit(character*);
   static truth Read(character*);

Main/Include/craft.h

@@ -229,6 +229,7 @@ class recipedata {
     v2 v2TailoringWorkbenchLocation;
 
     long lDamageFinalItem;
+    long lInitialTurn;
 
   public:
     recipedata(humanoid* H=NULL,uint sel=FELIST_ERROR_BIT);

Main/Include/curseddeveloper.h

@@ -0,0 +1,56 @@
+/*
+ *
+ *  Iter Vehemens ad Necem (IVAN)
+ *  Copyright (C) Timo Kiviluoto
+ *  Released under the GNU General
+ *  Public License
+ *
+ *  See LICENSING which should be included
+ *  along with this file for more details
+ *
+ */
+
+#ifndef __CURSEDDEVELOPER_H__
+#define __CURSEDDEVELOPER_H__
+
+class bodypart;
+class character;
+class festring;
+
+class curseddeveloper {
+  public:
+    static bool IsCursedDeveloper();
+
+#ifdef CURSEDDEVELOPER
+  public:
+    static void Init();
+    static bool IsCursedDeveloperTeleport(){return bCursedDeveloperTeleport;}
+    static bool LifeSaveJustABitIfRequested();
+    static bool LifeSaveJustABit(character* Killer);
+    static long UpdateKillCredit(character* Victim=NULL,int iMod=0);
+    static long ModKillCredit(int i){UpdateKillCredit(NULL,i);return lKillCredit;}
+    static long GetKillCredit(){return lKillCredit;}
+    static void RequestResurrect(character* C){if(!Killer)Killer=C;bResurrect=true;}
+  protected:
+    static bool BuffAndDebuffPlayerKiller(character* Killer,int& riBuff,int& riDebuff,bool& rbRev);
+    static void RestoreLimbs(festring fsCmdParams = CONST_S(""));
+    static bool HealTorso(bodypart* bp);
+    static bool HealBP(int iIndex,int iMode,int iMinHpOK=0);
+    static bool CreateBP(int iIndex);
+    static void NightmareWakeUp(character* P);
+    static void ResetKillCredit(festring fsCmdParams = CONST_S(""));
+  private:
+    static bool bCursedDeveloper;
+    static bool bCursedDeveloperTeleport;
+    static bool bInit;
+    static long lKillCredit;
+    static bool bNightmareWakeUp;
+    static bool bResurrect;
+    static character* Killer;
+#else
+  public:
+    static bool IsCursedDeveloperTeleport(){return false;}
+#endif
+};
+
+#endif //__CURSEDDEVELOPER_H__

Main/Include/definesvalidator.h

@@ -9473,10 +9473,10 @@ class definesvalidator{
 
 
 #ifdef WEAPON_SKILL_CATEGORIES // DO NOT MODIFY!
-  bsA = 11;
+  bsA = 12;
   bsB = WEAPON_SKILL_CATEGORIES;
   if(bsA!=bsB)
-    ssErrors << "Defined WEAPON_SKILL_CATEGORIES with value 11 from .dat file mismatches hardcoded c++ define value of " << WEAPON_SKILL_CATEGORIES << "!" << std::endl;
+    ssErrors << "Defined WEAPON_SKILL_CATEGORIES with value 12 from .dat file mismatches hardcoded c++ define value of " << WEAPON_SKILL_CATEGORIES << "!" << std::endl;
 #endif