dbg_scale fixes; made non-sky textures always NEAREST

[d2df-sdl.git] / src / game / g_monsters.pas

diff --git a/src/game/g_monsters.pas b/src/game/g_monsters.pas
index accdcb7ee23d5892e4f0fc39ebdfbe52ec3509ea..9647d18eca57012ecd6a4773bd78db2054143f72 100644 (file)
--- a/src/game/g_monsters.pas
+++ b/src/game/g_monsters.pas
@@ -38,12 +38,14 @@ const
   MONSTATE_REVIVE = 10;
   MONSTATE_RUNOUT = 11;
 
   MONSTATE_REVIVE = 10;
   MONSTATE_RUNOUT = 11;
 

+{ in mapdef now

   BH_NORMAL   = 0;
   BH_KILLER   = 1;
   BH_MANIAC   = 2;
   BH_INSANE   = 3;
   BH_CANNIBAL = 4;
   BH_GOOD     = 5;
   BH_NORMAL   = 0;
   BH_KILLER   = 1;
   BH_MANIAC   = 2;
   BH_INSANE   = 3;
   BH_CANNIBAL = 4;
   BH_GOOD     = 5;

+}

 
 type
   TMonster = Class (TObject)
 
 type
   TMonster = Class (TObject)


@@ -89,6 +91,8 @@ type
 
     mNeedSend: Boolean; // for network
 
 
     mNeedSend: Boolean; // for network
 

+    mEDamageType: Integer;
+

     procedure Turn();
     function findNewPrey(): Boolean;
     procedure ActivateTriggers();
     procedure Turn();
     function findNewPrey(): Boolean;
     procedure ActivateTriggers();


@@ -96,6 +100,8 @@ type
     procedure setGameX (v: Integer); inline;
     procedure setGameY (v: Integer); inline;
 
     procedure setGameX (v: Integer); inline;
     procedure setGameY (v: Integer); inline;
 

+    procedure doDamage (v: Integer);
+

   public
     FNoRespawn: Boolean;
     FFireTime: Integer;
   public
     FNoRespawn: Boolean;
     FFireTime: Integer;


@@ -156,7 +162,6 @@ type
     property proxyId: Integer read mProxyId;
     property arrIdx: Integer read mArrIdx;
 
     property proxyId: Integer read mProxyId;
     property arrIdx: Integer read mArrIdx;
 

-  published

     property MonsterType: Byte read FMonsterType;
     property MonsterHealth: Integer read FHealth write FHealth;
     property MonsterAmmo: Integer read FAmmo write FAmmo;
     property MonsterType: Byte read FMonsterType;
     property MonsterHealth: Integer read FHealth write FHealth;
     property MonsterAmmo: Integer read FAmmo write FAmmo;


@@ -181,6 +186,36 @@ type
     property GameDirection: TDirection read FDirection write FDirection;
 
     property StartID: Integer read FStartID;
     property GameDirection: TDirection read FDirection write FDirection;
 
     property StartID: Integer read FStartID;

+
+  published
+    property eMonsterType: Byte read FMonsterType;
+    property eMonsterHealth: Integer read FHealth write FHealth;
+    property eMonsterAmmo: Integer read FAmmo write FAmmo;
+    property eMonsterTargetUID: Word read FTargetUID write FTargetUID;
+    property eMonsterTargetTime: Integer read FTargetTime write FTargetTime;
+    property eMonsterBehaviour: Byte read FBehaviour write FBehaviour;
+    property eMonsterSleep: Integer read FSleep write FSleep;
+    property eMonsterState: Byte read FState write FState;
+    property eMonsterRemoved: Boolean read FRemoved;
+    property eMonsterPain: Integer read FPain write FPain;
+    property eMonsterAnim: Byte read FCurAnim;
+
+    property eUID: Word read FUID;
+    property eSpawnTrigger: Integer read FSpawnTrigger;
+
+    property eGameX: Integer read FObj.X write setGameX;
+    property eGameY: Integer read FObj.Y write setGameY;
+    property eGameVelX: Integer read FObj.Vel.X write FObj.Vel.X;
+    property eGameVelY: Integer read FObj.Vel.Y write FObj.Vel.Y;
+    property eGameAccelX: Integer read FObj.Accel.X write FObj.Accel.X;
+    property eGameAccelY: Integer read FObj.Accel.Y write FObj.Accel.Y;
+    property eGameDirection: TDirection read FDirection write FDirection;
+
+    property eStartID: Integer read FStartID;
+
+    // set this before assigning something to `eDamage`
+    property eDamageType: Integer read mEDamageType write mEDamageType;
+    property eDamage: Integer write doDamage;

   end;
 
 
   end;
 
 


@@ -271,7 +306,7 @@ var
 implementation
 
 uses
 implementation
 
 uses

-  e_log, g_main, g_sound, g_gfx, g_player, g_game,
+  e_log, e_texture, g_main, g_sound, g_gfx, g_player, g_game,

   g_weapons, g_triggers, MAPDEF, g_items, g_options,
   g_console, g_map, Math, SysUtils, g_menu, wadreader,
   g_language, g_netmsg, idpool;
   g_weapons, g_triggers, MAPDEF, g_items, g_options,
   g_console, g_map, Math, SysUtils, g_menu, wadreader,
   g_language, g_netmsg, idpool;


@@ -1585,6 +1620,12 @@ begin
   end;
 end;
 
   end;
 end;
 

+procedure TMonster.doDamage (v: Integer);
+begin
+  if (v <= 0) then exit;
+  if (v > 32767) then v := 32767;
+  Damage(v, 0, 0, 0, mEDamageType);
+end;

 
 procedure TMonster.ActionSound();
 begin
 
 procedure TMonster.ActionSound();
 begin


@@ -1831,6 +1872,7 @@ begin
   FFireTime := 0;
   FFirePainTime := 0;
   FFireAttacker := 0;
   FFireTime := 0;
   FFirePainTime := 0;
   FFireAttacker := 0;

+  mEDamageType := HIT_SOME;

 
   mProxyId := -1;
   mArrIdx := -1;
 
   mProxyId := -1;
   mArrIdx := -1;


@@ -2152,6 +2194,7 @@ begin
                       o.Y+o.Rect.Y+o.Rect.Height-128, M_NONE);
 
 // Íå â îáëàñòè ðèñîâàíèÿ íå ðåñóåì:
                       o.Y+o.Rect.Y+o.Rect.Height-128, M_NONE);
 
 // Íå â îáëàñòè ðèñîâàíèÿ íå ðåñóåì:

+//FIXME!

   if (g_dbg_scale = 1.0) then
   begin
     if not g_Collide(FObj.X+FObj.Rect.X, FObj.Y+FObj.Rect.Y, FObj.Rect.Width, FObj.Rect.Height,
   if (g_dbg_scale = 1.0) then
   begin
     if not g_Collide(FObj.X+FObj.Rect.X, FObj.Y+FObj.Rect.Y, FObj.Rect.Width, FObj.Rect.Height,