Developer Tools (fixed, improved, expanded)

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)

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/bugworkaround.h

@@ -26,7 +26,7 @@ class bugfixdp{
 
   private:
     static character* BugWorkaroundDupPlayer();
-    static void DevConsCmd(std::string strCmdParams);
+    static void DevConsCmd(festring fsCmdParams);
 
     static void GatherAllItemInLevel();
     static bool ItemWork(character* Char, item* it, bool bFix, const char* cInfo, std::vector<item*>* pvItem,bool bSendToHell);

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);
@@ -688,6 +691,7 @@ class character : public entity, public id
   void LycanthropyHandler();
   void SearchingHandler();
   void SaveLife();
+  void SaveLifeBase();
   void BeginInvisibility();
   void BeginInfraVision();
   void BeginESP();
@@ -1183,7 +1187,6 @@ 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*);
@@ -1220,23 +1223,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;

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__