X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;ds=inline;f=src%2Fgame%2Fg_monsters.pas;h=92ee2f66a84b55c4d83e904d4705f584ced54a9d;hb=e796653d0ccd214192261ed1715dc68806758926;hp=a52ddf1738be26e9b78ebd1e22cbd34ba76cbc55;hpb=b79ddd98d923ee15f4bfd1db5111e669fc19964a;p=d2df-sdl.git
diff --git a/src/game/g_monsters.pas b/src/game/g_monsters.pas
index a52ddf1..92ee2f6 100644
--- a/src/game/g_monsters.pas
+++ b/src/game/g_monsters.pas
@@ -14,12 +14,14 @@
* along with this program. If not, see .
*)
{$INCLUDE ../shared/a_modes.inc}
+{$M+}
+{.$DEFINE D2F_DEBUG_MONS_MOVE}
unit g_monsters;
interface
uses
- g_basic, e_graphics, g_phys, g_textures,
+ g_basic, e_graphics, g_phys, g_textures, g_grid,
g_saveload, BinEditor, g_panel, xprofiler;
const
@@ -79,9 +81,8 @@ type
FFirePainTime: Integer;
FFireAttacker: Word;
vilefire: TAnimation;
-
- proxyId: Integer; // node in dyntree or -1
- arrIdx: Integer; // in gMonsters
+ mProxyId: Integer; // node in dyntree or -1
+ mArrIdx: Integer; // in gMonsters
FDieTriggers: Array of Integer;
FSpawnTrigger: Integer;
@@ -90,10 +91,14 @@ type
function findNewPrey(): Boolean;
procedure ActivateTriggers();
+ procedure setGameX (v: Integer); inline;
+ procedure setGameY (v: Integer); inline;
+
public
FNoRespawn: Boolean;
FFireTime: Integer;
trapCheckFrameId: DWord; // for `g_weapons.CheckTrap()`
+ mplatCheckFrameId: LongWord;
constructor Create(MonsterType: Byte; aID: Integer; ForcedUID: Integer = -1);
destructor Destroy(); override;
@@ -101,7 +106,7 @@ type
function Collide(Panel: TPanel): Boolean; overload;
function Collide(X, Y: Integer): Boolean; overload;
function TeleportTo(X, Y: Integer; silent: Boolean; dir: Byte): Boolean;
- function Live(): Boolean;
+ function alive(): Boolean;
procedure SetHealth(aH: Integer);
procedure Push(vx, vy: Integer);
function Damage(aDamage: Word; VelX, VelY: Integer; SpawnerUID: Word; t: Byte): Boolean;
@@ -134,8 +139,18 @@ type
procedure positionChanged (); //WARNING! call this after monster position was changed, or coldet will not work right!
+ procedure setPosition (ax, ay: Integer; callPosChanged: Boolean=true); inline;
+ procedure moveBy (dx, dy: Integer); inline;
+
procedure getMapBox (out x, y, w, h: Integer); inline;
+ public
+ property Obj: TObj read FObj;
+
+ 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;
@@ -148,12 +163,11 @@ type
property MonsterPain: Integer read FPain write FPain;
property MonsterAnim: Byte read FCurAnim write FCurAnim;
- property Obj: TObj read FObj;
property UID: Word read FUID write FUID;
property SpawnTrigger: Integer read FSpawnTrigger write FSpawnTrigger;
- property GameX: Integer read FObj.X write FObj.X;
- property GameY: Integer read FObj.Y write FObj.Y;
+ property GameX: Integer read FObj.X write setGameX;
+ property GameY: Integer read FObj.Y write setGameY;
property GameVelX: Integer read FObj.Vel.X write FObj.Vel.X;
property GameVelY: Integer read FObj.Vel.Y write FObj.Vel.Y;
property GameAccelX: Integer read FObj.Accel.X write FObj.Accel.X;
@@ -170,7 +184,7 @@ procedure g_Mons_InitTree (x, y, w, h: Integer);
procedure g_Monsters_LoadData ();
procedure g_Monsters_FreeData ();
procedure g_Monsters_Init ();
-procedure g_Monsters_Free ();
+procedure g_Monsters_Free (clearGrid: Boolean=true);
function g_Monsters_Create (MonsterType: Byte; X, Y: Integer; Direction: TDirection;
AdjCoord: Boolean = False; ForcedUID: Integer = -1): TMonster;
procedure g_Monsters_Update ();
@@ -180,9 +194,16 @@ function g_Monsters_ByUID (UID: Word): TMonster;
procedure g_Monsters_killedp ();
procedure g_Monsters_SaveState (var Mem: TBinMemoryWriter);
procedure g_Monsters_LoadState (var Mem: TBinMemoryReader);
-function g_Monsters_GetIDByName (name: String): Integer;
-function g_Monsters_GetNameByID (MonsterType: Byte): String;
-function g_Monsters_GetKilledBy (MonsterType: Byte): String;
+
+function g_Mons_SpawnAt (monType: Integer; x, y: Integer; dir: TDirection=D_LEFT): TMonster; overload;
+function g_Mons_SpawnAt (const typeName: AnsiString; x, y: Integer; dir: TDirection=D_LEFT): TMonster; overload;
+
+function g_Mons_TypeLo (): Integer; inline;
+function g_Mons_TypeHi (): Integer; inline;
+
+function g_Mons_TypeIdByName (const name: AnsiString): Integer;
+function g_Mons_NameByTypeId (monType: Integer): AnsiString;
+function g_Mons_GetKilledByTypeId (monType: Integer): AnsiString;
type
@@ -194,6 +215,8 @@ function g_Mons_ByIdx (uid: Integer): TMonster; inline;
// can return null
function g_Mons_ByIdx_NC (uid: Integer): TMonster; inline;
+function g_Mons_TotalCount (): Integer; inline;
+
function g_Mons_IsAnyAliveAt (x, y: Integer; width, height: Integer): Boolean;
function g_Mons_ForEach (cb: TEachMonsterCB): Boolean;
@@ -202,7 +225,8 @@ function g_Mons_ForEachAlive (cb: TEachMonsterCB): Boolean;
function g_Mons_ForEachAt (x, y: Integer; width, height: Integer; cb: TEachMonsterCB): Boolean;
function g_Mons_ForEachAliveAt (x, y: Integer; width, height: Integer; cb: TEachMonsterCB): Boolean;
-function g_Mons_getNewTrapFrameId (): DWord;
+function g_Mons_getNewTrapFrameId (): DWord; inline;
+function g_Mons_getNewMPlatFrameId (): LongWord; inline;
type
@@ -226,13 +250,26 @@ var
profMonsLOS: TProfiler = nil; //WARNING: FOR DEBUGGING ONLY!
+type
+ TMonsterGrid = specialize TBodyGridBase;
+
+var
+ monsGrid: TMonsterGrid = nil; // DO NOT USE! public for debugging only!
+
+
+var
+ gmon_debug_think: Boolean = true;
+ gmon_debug_one_think_step: Boolean = false;
+
+
implementation
uses
e_log, 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, g_grid;
+ g_language, g_netmsg, idpool;
+
// ////////////////////////////////////////////////////////////////////////// //
@@ -265,7 +302,8 @@ end;
// ////////////////////////////////////////////////////////////////////////// //
var
- monCheckTrapLastFrameId: DWord;
+ monCheckTrapLastFrameId: DWord = 0;
+ monCheckMPlatLastFrameId: LongWord = 0;
procedure TMonster.getMapBox (out x, y, w, h: Integer); inline;
@@ -278,13 +316,6 @@ end;
// ////////////////////////////////////////////////////////////////////////// //
-type
- TMonsterGrid = specialize TBodyGridBase;
-
-var
- monsGrid: TMonsterGrid = nil;
-
-
function g_Mons_AlongLine (x0, y0, x1, y1: Integer; cb: TMonsAlongLineCB; log: Boolean=false): TMonster;
begin
if not assigned(cb) then begin result := nil; exit; end;
@@ -295,35 +326,46 @@ end;
//WARNING! call this after monster position was changed, or coldet will not work right!
procedure TMonster.positionChanged ();
var
- x, y: Integer;
+ x, y, w, h: Integer;
+ nx, ny, nw, nh: Integer;
begin
{$IF DEFINED(D2F_DEBUG_MONS_MOVE)}
- //e_WriteLog(Format('monster #%d(%u): pos=(%d,%d); rpos=(%d,%d)', [arrIdx, UID, FObj.X, FObj.Y, FObj.Rect.X, FObj.Rect.Y]), MSG_NOTIFY);
+ //e_WriteLog(Format('monster #%d(%u): pos=(%d,%d); rpos=(%d,%d)', [mArrIdx, UID, FObj.X, FObj.Y, FObj.Rect.X, FObj.Rect.Y]), MSG_NOTIFY);
{$ENDIF}
- if (proxyId = -1) then
+ if (mProxyId = -1) then
begin
- proxyId := monsGrid.insertBody(self, FObj.X+FObj.Rect.X, FObj.Y+FObj.Rect.Y, FObj.Rect.Width, FObj.Rect.Height);
+ mProxyId := monsGrid.insertBody(self, FObj.X+FObj.Rect.X, FObj.Y+FObj.Rect.Y, FObj.Rect.Width, FObj.Rect.Height);
{$IF DEFINED(D2F_DEBUG_MONS_MOVE)}
- monsGrid.getBodyXY(proxyId, x, y);
- e_WriteLog(Format('monster #%d(%u): inserted into the grid; proxyid=%d; x=%d; y=%d', [arrIdx, UID, proxyId, x, y]), MSG_NOTIFY);
+ monsGrid.getBodyXY(mProxyId, x, y);
+ e_WriteLog(Format('monster #%d:(%u): inserted into the grid; mProxyid=%d; gx=%d; gy=%d', [mArrIdx, UID, mProxyId, x-monsGrid.gridX0, y-monsGrid.gridY0]), MSG_NOTIFY);
{$ENDIF}
end
else
begin
- monsGrid.getBodyXY(proxyId, x, y);
- if (FObj.X+FObj.Rect.X = x) and (FObj.Y+FObj.Rect.Y = y) then exit; // nothing to do
- {$IF DEFINED(D2F_DEBUG_MONS_MOVE)}e_WriteLog(Format('monster #%d(%u): updating tree; proxyid=%d; x=%d; y=%d', [arrIdx, UID, proxyId, x, y]), MSG_NOTIFY);{$ENDIF}
-
- {$IF TRUE}
- monsGrid.moveBody(proxyId, FObj.X+FObj.Rect.X, FObj.Y+FObj.Rect.Y);
- {$ELSE}
- monsGrid.removeBody(proxyId);
- proxyId := monsGrid.insertBody(self, FObj.X+FObj.Rect.X, FObj.Y+FObj.Rect.Y, FObj.Rect.Width, FObj.Rect.Height);
- {$ENDIF}
+ monsGrid.getBodyDims(mProxyId, x, y, w, h);
+ getMapBox(nx, ny, nw, nh);
+ if (w <> nw) or (h <> nh) then
+ begin
+ {$IF DEFINED(D2F_DEBUG_MONS_MOVE)}
+ e_WriteLog(Format('monster #%d:(%u): resized; mProxyid=%d; gx=%d; gy=%d', [mArrIdx, UID, mProxyId, x-monsGrid.gridX0, y-monsGrid.gridY0]), MSG_NOTIFY);
+ {$ENDIF}
+ monsGrid.moveResizeBody(mProxyId, nx, ny, nw, nh);
+ end
+ else if (x <> nx) or (y <> ny) then
+ begin
+ {$IF DEFINED(D2F_DEBUG_MONS_MOVE)}
+ e_WriteLog(Format('monster #%d:(%u): updating grid; mProxyid=%d; gx=%d; gy=%d', [mArrIdx, UID, mProxyId, x-monsGrid.gridX0, y-monsGrid.gridY0]), MSG_NOTIFY);
+ {$ENDIF}
+ monsGrid.moveBody(mProxyId, nx, ny);
+ end
+ else
+ begin
+ exit; // nothing to do
+ end;
{$IF DEFINED(D2F_DEBUG_MONS_MOVE)}
- monsGrid.getBodyXY(proxyId, x, y);
- e_WriteLog(Format('monster #%d(%u): updated tree; proxyid=%d; x=%d; y=%d', [arrIdx, UID, proxyId, x, y]), MSG_NOTIFY);
+ monsGrid.getBodyXY(mProxyId, x, y);
+ e_WriteLog(Format('monster #%d:(%u): updated grid; mProxyid=%d; gx=%d; gy=%d', [mArrIdx, UID, mProxyId, x-monsGrid.gridX0, y-monsGrid.gridY0]), MSG_NOTIFY);
{$ENDIF}
end;
end;
@@ -339,19 +381,6 @@ const
ANIM_ATTACK2 = 5;
ANIM_PAIN = 6;
- STATE_SLEEP = 0;
- STATE_GO = 1;
- STATE_RUN = 2;
- STATE_CLIMB = 3;
- STATE_DIE = 4;
- STATE_DEAD = 5;
- STATE_ATTACK = 6;
- STATE_SHOOT = 7;
- STATE_PAIN = 8;
- STATE_WAIT = 9;
- STATE_REVIVE = 10;
- STATE_RUNOUT = 11;
-
MONSTER_SIGNATURE = $534E4F4D; // 'MONS'
// Òàáëèöà òèïîâ àíèìàöèè ìîíñòðîâ:
@@ -444,8 +473,8 @@ const
LeftAnim: Boolean;
wX, wY: Integer; // Îòêóäà âûëåòèò ïóëÿ
AnimSpeed: Array [ANIM_SLEEP..ANIM_PAIN] of Byte;
- AnimDeltaRight: Array [ANIM_SLEEP..ANIM_PAIN] of TPoint;
- AnimDeltaLeft: Array [ANIM_SLEEP..ANIM_PAIN] of TPoint;
+ AnimDeltaRight: Array [ANIM_SLEEP..ANIM_PAIN] of TDFPoint;
+ AnimDeltaLeft: Array [ANIM_SLEEP..ANIM_PAIN] of TDFPoint;
end = // SLEEP GO DIE MESS ATTACK ATTACK2 PAIN
((LeftAnim: False; wX: 54; wY: 32; AnimSpeed:(3, 2, 3, 2, 3, 0, 4); //DEMON
AnimDeltaRight: ((X: 1; Y: 4), (X: 1; Y: 4), (X: 0; Y: 4), (X: 0; Y: 4), (X: 2; Y: 6), (X: 2; Y: 6), (X: 2; Y: 5));
@@ -531,9 +560,11 @@ const
MAX_SOUL = 512; // Îãðàíè÷åíèå Lost_Soul'îâ
+// ////////////////////////////////////////////////////////////////////////// //
var
gMonsters: array of TMonster;
uidMap: array [0..65535] of TMonster; // monster knows it's index
+ freeInds: TIdPool = nil;
procedure clearUidMap ();
@@ -541,15 +572,16 @@ var
idx: Integer;
begin
for idx := 0 to High(uidMap) do uidMap[idx] := nil;
+ freeInds.clear();
end;
-function g_Mons_getNewTrapFrameId (): DWord;
+function g_Mons_getNewTrapFrameId (): DWord; inline;
var
f: Integer;
begin
Inc(monCheckTrapLastFrameId);
- if monCheckTrapLastFrameId = 0 then
+ if (monCheckTrapLastFrameId = 0) then
begin
// wraparound
monCheckTrapLastFrameId := 1;
@@ -562,6 +594,24 @@ begin
end;
+function g_Mons_getNewMPlatFrameId (): LongWord; inline;
+var
+ f: Integer;
+begin
+ Inc(monCheckMPlatLastFrameId);
+ if (monCheckMPlatLastFrameId = 0) then
+ begin
+ // wraparound
+ monCheckMPlatLastFrameId := 1;
+ for f := 0 to High(gMonsters) do
+ begin
+ if (gMonsters[f] <> nil) then gMonsters[f].mplatCheckFrameId := 0;
+ end;
+ end;
+ result := monCheckMPlatLastFrameId;
+end;
+
+
var
pt_x: Integer = 0;
pt_xs: Integer = 1;
@@ -570,29 +620,16 @@ var
soulcount: Integer = 0;
-function allocMonster(): DWORD;
+function allocMonster (): DWORD;
var
- i, olen: Integer;
+ f, olen: Integer;
begin
- for i := 0 to High(gMonsters) do
- begin
- if (gMonsters[i] = nil) then
- begin
- result := i;
- exit;
- end;
- end;
-
- olen := Length(gMonsters);
- if (olen = 0) then
- begin
- SetLength(gMonsters, 64);
- result := 0;
- end
- else
+ result := freeInds.alloc();
+ if (result > High(gMonsters)) then
begin
- result := olen;
- SetLength(gMonsters, Length(gMonsters)+32);
+ olen := Length(gMonsters);
+ SetLength(gMonsters, result+64);
+ for f := olen to High(gMonsters) do gMonsters[f] := nil;
end;
end;
@@ -674,7 +711,7 @@ function isCorpse (o: PObj; immediately: Boolean): Integer;
begin
atag := atag; // shut up, fpc!
result := false; // don't stop
- if (mon.FState = STATE_DEAD) and g_Obj_Collide(o, @mon.FObj) then
+ if (mon.FState = MONSTATE_DEAD) and g_Obj_Collide(o, @mon.FObj) then
begin
case mon.FMonsterType of // Íå âîñêðåñèòü:
MONSTER_SOUL, MONSTER_PAIN, MONSTER_CYBER, MONSTER_SPIDER,
@@ -698,13 +735,13 @@ begin
if gmon_debug_use_sqaccel then
begin
mon := monsGrid.forEachInAABB(o.X+o.Rect.X, o.Y+o.Rect.Y, o.Rect.Width, o.Rect.Height, monsCollCheck);
- if (mon <> nil) then result := mon.arrIdx;
+ if (mon <> nil) then result := mon.mArrIdx;
end
else
begin
for a := 0 to High(gMonsters) do
begin
- if (gMonsters[a] <> nil) and (gMonsters[a].FState = STATE_DEAD) and g_Obj_Collide(o, @gMonsters[a].FObj) then
+ if (gMonsters[a] <> nil) and (gMonsters[a].FState = MONSTATE_DEAD) and g_Obj_Collide(o, @gMonsters[a].FObj) then
begin
case gMonsters[a].FMonsterType of // Íå âîñêðåñèòü:
MONSTER_SOUL, MONSTER_PAIN, MONSTER_CYBER, MONSTER_SPIDER,
@@ -958,8 +995,10 @@ begin
g_Sound_CreateWADEx('SOUND_MONSTER_FISH_ATTACK', GameWAD+':MSOUNDS\FISH_ATTACK');
+ freeInds := TIdPool.Create();
clearUidMap();
monCheckTrapLastFrameId := 0;
+ monCheckMPlatLastFrameId := 0;
end;
procedure g_Monsters_FreeData();
@@ -1176,6 +1215,9 @@ begin
g_Sound_Delete('SOUND_MONSTER_SPIDER_WALK');
g_Sound_Delete('SOUND_MONSTER_FISH_ATTACK');
+
+ freeInds.Free();
+ freeInds := nil;
end;
procedure g_Monsters_Init();
@@ -1183,16 +1225,21 @@ begin
soulcount := 0;
end;
-procedure g_Monsters_Free();
+procedure g_Monsters_Free (clearGrid: Boolean=true);
var
a: Integer;
begin
- monsGrid.Free();
- monsGrid := nil;
+ e_LogWritefln('Cleared monster data (clearGrid=%s)', [clearGrid]);
+ if (clearGrid) then
+ begin
+ monsGrid.Free();
+ monsGrid := nil;
+ end;
for a := 0 to High(gMonsters) do gMonsters[a].Free();
gMonsters := nil;
clearUidMap();
monCheckTrapLastFrameId := 0;
+ monCheckMPlatLastFrameId := 0;
end;
@@ -1201,6 +1248,8 @@ procedure g_Mons_InitTree (x, y, w, h: Integer);
begin
monsGrid.Free();
monsGrid := TMonsterGrid.Create(x, y, w, h);
+ //clearUidMap(); // why not?
+ e_LogWritefln('%s', ['Recreated monster tree']);
end;
@@ -1226,8 +1275,8 @@ begin
mon := TMonster.Create(MonsterType, find_id, ForcedUID);
gMonsters[find_id] := mon;
- mon.arrIdx := find_id;
- mon.proxyId := -1;
+ mon.mArrIdx := find_id;
+ mon.mProxyId := -1;
uidMap[mon.FUID] := mon;
@@ -1263,19 +1312,25 @@ begin
if gMonsters = nil then
Exit;
-// Ïðèêîëèñò ñìååòñÿ íàä ñìåðòüþ èãðîêà:
+ // Ïðèêîëèñò ñìååòñÿ íàä ñìåðòüþ èãðîêà:
h := High(gMonsters);
for a := 0 to h do
+ begin
if (gMonsters[a] <> nil) then
+ begin
with gMonsters[a] do
+ begin
if (FMonsterType = MONSTER_MAN) and
- (FState <> STATE_DEAD) and
- (FState <> STATE_SLEEP) and
- (FState <> STATE_DIE) then
+ (FState <> MONSTATE_DEAD) and
+ (FState <> MONSTATE_SLEEP) and
+ (FState <> MONSTATE_DIE) then
begin
g_Sound_PlayExAt('SOUND_MONSTER_TRUP', FObj.X, FObj.Y);
Exit;
end;
+ end;
+ end;
+ end;
end;
procedure g_Monsters_Update();
@@ -1293,20 +1348,24 @@ begin
gMon := True; // Äëÿ ðàáîòû BlockMon'à
- for a := 0 to High(gMonsters) do
+ if gmon_debug_think or gmon_debug_one_think_step then
begin
- if (gMonsters[a] = nil) then continue;
- if not gMonsters[a].FRemoved then
+ gmon_debug_one_think_step := false;
+ for a := 0 to High(gMonsters) do
begin
- if g_Game_IsClient then
- gMonsters[a].ClientUpdate()
+ if (gMonsters[a] = nil) then continue;
+ if not gMonsters[a].FRemoved then
+ begin
+ if g_Game_IsClient then
+ gMonsters[a].ClientUpdate()
+ else
+ gMonsters[a].Update();
+ end
else
- gMonsters[a].Update();
- end
- else
- begin
- gMonsters[a].Free();
- gMonsters[a] := nil;
+ begin
+ gMonsters[a].Free();
+ gMonsters[a] := nil;
+ end;
end;
end;
@@ -1318,9 +1377,12 @@ var
a: Integer;
begin
if gMonsters <> nil then
+ begin
for a := 0 to High(gMonsters) do
- if gMonsters[a] <> nil then
- gMonsters[a].Draw();
+ begin
+ if (gMonsters[a] <> nil) then gMonsters[a].Draw();
+ end;
+ end;
end;
procedure g_Monsters_DrawHealth();
@@ -1332,29 +1394,19 @@ begin
e_TextureFontGetSize(gStdFont, fW, fH);
for a := 0 to High(gMonsters) do
+ begin
if gMonsters[a] <> nil then
begin
e_TextureFontPrint(gMonsters[a].FObj.X + gMonsters[a].FObj.Rect.X,
gMonsters[a].FObj.Y + gMonsters[a].FObj.Rect.Y + gMonsters[a].FObj.Rect.Height - fH,
IntToStr(gMonsters[a].FHealth), gStdFont);
end;
+ end;
end;
function g_Monsters_ByUID (UID: Word): TMonster;
-//var a: Integer;
begin
result := uidMap[UID];
- {
- Result := nil;
- if gMonsters <> nil then
- for a := 0 to High(gMonsters) do
- if (gMonsters[a] <> nil) and
- (gMonsters[a].FUID = UID) then
- begin
- Result := gMonsters[a];
- Break;
- end;
- }
end;
procedure g_Monsters_SaveState(var Mem: TBinMemoryWriter);
@@ -1364,11 +1416,16 @@ var
begin
// Ñ÷èòàåì êîëè÷åñòâî ñóùåñòâóþùèõ ìîíñòðîâ:
count := 0;
- if gMonsters <> nil then
+ if (gMonsters <> nil) then
+ begin
for i := 0 to High(gMonsters) do
- if gMonsters[i] <> nil then
- if gMonsters[i].FMonsterType <> MONSTER_NONE then
- count := count + 1;
+ begin
+ if (gMonsters[i] <> nil) then
+ begin
+ if (gMonsters[i].FMonsterType <> MONSTER_NONE) then count += 1;
+ end;
+ end;
+ end;
Mem := TBinMemoryWriter.Create((count+1) * 350);
@@ -1386,15 +1443,19 @@ begin
// Ñîõðàíÿåì ìîíñòðîâ:
for i := 0 to High(gMonsters) do
- if gMonsters[i] <> nil then
- if gMonsters[i].FMonsterType <> MONSTER_NONE then
+ begin
+ if (gMonsters[i] <> nil) then
+ begin
+ if (gMonsters[i].FMonsterType <> MONSTER_NONE) then
begin
- // Òèï ìîíñòðà:
+ // Òèï ìîíñòðà:
b := gMonsters[i].MonsterType;
Mem.WriteByte(b);
- // Ñîõðàíÿåì äàííûå ìîíñòðà:
+ // Ñîõðàíÿåì äàííûå ìîíñòðà:
gMonsters[i].SaveState(Mem);
end;
+ end;
+ end;
end;
procedure g_Monsters_LoadState(var Mem: TBinMemoryReader);
@@ -1405,7 +1466,7 @@ var
begin
if Mem = nil then exit;
- g_Monsters_Free();
+ g_Monsters_Free(false);
// Çàãðóæàåì èíôîðìàöèþ öåëåóêàçàòåëÿ
Mem.ReadInt(pt_x);
@@ -1431,43 +1492,87 @@ begin
end;
end;
-function g_Monsters_GetIDByName(name: String): Integer;
+
+// ////////////////////////////////////////////////////////////////////////// //
+function g_Mons_SpawnAt (monType: Integer; x, y: Integer; dir: TDirection=D_LEFT): TMonster; overload;
+begin
+ result := nil;
+ if (monType >= MONSTER_DEMON) and (monType <= MONSTER_MAN) then
+ begin
+ result := g_Monsters_Create(monType, x, y, dir);
+ end;
+end;
+
+
+function g_Mons_SpawnAt (const typeName: AnsiString; x, y: Integer; dir: TDirection=D_LEFT): TMonster; overload;
+begin
+ result := g_Mons_SpawnAt(g_Mons_TypeIdByName(typeName), x, y, dir);
+end;
+
+
+
+// ////////////////////////////////////////////////////////////////////////// //
+function g_Mons_TypeLo (): Integer; inline; begin result := Low(MONSTERTABLE); end;
+function g_Mons_TypeHi (): Integer; inline; begin result := High(MONSTERTABLE); end;
+
+
+function g_Mons_TypeIdByName (const name: String): Integer;
var
i: Integer;
begin
- name := UpperCase(name);
i := MONSTER_DEMON;
while (i <= MONSTER_MAN) do
begin
- if name = MONSTERTABLE[i].Name then
+ if (CompareText(name, MONSTERTABLE[i].Name) = 0) then
begin
- Result := i;
- Exit;
+ result := i;
+ exit;
end;
Inc(i);
end;
-
- Result := -1;
+ result := -1;
+ // HACK!
+ if (CompareText(name, 'zombie') = 0) then result := MONSTER_ZOMBY;
end;
-function g_Monsters_GetNameByID(MonsterType: Byte): String;
+
+function g_Mons_NameByTypeId (monType: Integer): AnsiString;
begin
- if MonsterType in [MONSTER_DEMON..MONSTER_MAN] then
- Result := MONSTERTABLE[MonsterType].Name
+ if (monType >= MONSTER_DEMON) and (monType <= MONSTER_MAN) then
+ result := MONSTERTABLE[monType].Name
else
- Result := '?';
+ result := '?';
end;
-function g_Monsters_GetKilledBy(MonsterType: Byte): String;
+
+function g_Mons_GetKilledByTypeId (monType: Integer): AnsiString;
begin
- if MonsterType in [MONSTER_DEMON..MONSTER_MAN] then
- Result := KilledByMonster[MonsterType]
+ if (monType >= MONSTER_DEMON) and (monType <= MONSTER_MAN) then
+ Result := KilledByMonster[monType]
else
Result := '?';
end;
+
+// ////////////////////////////////////////////////////////////////////////// //
{ T M o n s t e r : }
+procedure TMonster.setGameX (v: Integer); inline; begin FObj.X := v; positionChanged(); end;
+procedure TMonster.setGameY (v: Integer); inline; begin FObj.Y := v; positionChanged(); end;
+
+procedure TMonster.setPosition (ax, ay: Integer; callPosChanged: Boolean=true); inline; begin FObj.X := ax; FObj.Y := ay; if callPosChanged then positionChanged(); end;
+
+procedure TMonster.moveBy (dx, dy: Integer); inline;
+begin
+ if (dx <> 0) or (dy <> 0) then
+ begin
+ FObj.X += dx;
+ FObj.Y += dy;
+ positionChanged();
+ end;
+end;
+
+
procedure TMonster.ActionSound();
begin
case FMonsterType of
@@ -1656,8 +1761,8 @@ begin
FObj.Accel.X := 0;
FObj.Accel.Y := 0;
FDirection := FStartDirection;
- GameX := FStartX;
- GameY := FStartY;
+ {GameX}FObj.X := FStartX;
+ {GameY}FObj.Y := FStartY;
FObj.Rect := MONSTERTABLE[FMonsterType].Rect;
FHealth := MONSTERTABLE[FMonsterType].Health;
FAmmo := 0;
@@ -1669,7 +1774,7 @@ begin
FChainFire := False;
FShellTimer := -1;
- FState := STATE_SLEEP;
+ FState := MONSTATE_SLEEP;
FCurAnim := ANIM_SLEEP;
positionChanged(); // this updates spatial accelerators
@@ -1697,7 +1802,7 @@ begin
g_Obj_Init(@FObj);
- FState := STATE_SLEEP;
+ FState := MONSTATE_SLEEP;
FCurAnim := ANIM_SLEEP;
FHealth := MONSTERTABLE[MonsterType].Health;
FMaxHealth := FHealth;
@@ -1714,9 +1819,10 @@ begin
FFirePainTime := 0;
FFireAttacker := 0;
- proxyId := -1;
- arrIdx := -1;
+ mProxyId := -1;
+ mArrIdx := -1;
trapCheckFrameId := 0;
+ mplatCheckFrameId := 0;
if FMonsterType in [MONSTER_ROBO, MONSTER_BARREL] then
FBloodKind := BLOOD_SPARKS
@@ -1813,7 +1919,7 @@ begin
Result := False;
// Óìèðàåò, óìåð èëè âîñêðåøàåòñÿ => óðîí äåëàòü íåêîìó:
- if (FState = STATE_DEAD) or (FState = STATE_DIE) or (FState = STATE_REVIVE) then
+ if (FState = MONSTATE_DEAD) or (FState = MONSTATE_DIE) or (FState = MONSTATE_REVIVE) then
Exit;
// Ðûáó â âîäå áüåò òîêîì => ïàíèêà áåç óðîíà:
@@ -1825,7 +1931,7 @@ begin
else
FDirection := D_LEFT;
Result := True;
- SetState(STATE_RUN);
+ SetState(MONSTATE_RUN);
Exit;
end;
@@ -1846,10 +1952,10 @@ begin
FPain := FPain+aDamage;
// Åñëè áîëü ñóùåñòâåííàÿ, òî ìåíÿåì ñîñòîÿíèå íà áîëåâîå:
- if FState <> STATE_PAIN then
+ if FState <> MONSTATE_PAIN then
if (FPain >= MONSTERTABLE[FMonsterType].MinPain) and
(FMonsterType <> MONSTER_BARREL) then
- SetState(STATE_PAIN);
+ SetState(MONSTATE_PAIN);
// Åñëè ðàçðåøåíà êðîâü - ñîçäàåì áðûçãè êðîâè:
if (gBloodCount > 0) then
@@ -1929,6 +2035,7 @@ begin
begin
FObj.Rect.Y := FObj.Rect.Y + FObj.Rect.Height-12;
FObj.Rect.Height := 12;
+ positionChanged();
end;
// Óðîí áûë ñèëüíûì => ñëàáûå - â êàøó:
@@ -1938,12 +2045,12 @@ begin
(FMonsterType = MONSTER_MAN)) then
begin
g_Sound_PlayExAt('SOUND_MONSTER_SLOP', FObj.X, FObj.Y);
- SetState(STATE_DIE, ANIM_MESS);
+ SetState(MONSTATE_DIE, ANIM_MESS);
end
else
begin
DieSound();
- SetState(STATE_DIE);
+ SetState(MONSTATE_DIE);
end;
// Àêòèâèðîâàòü òðèããåðû, æäóùèå ñìåðòè ýòîãî ìîíñòðà:
@@ -1952,10 +2059,10 @@ begin
FHealth := 0;
end
else
- if FState = STATE_SLEEP then
+ if FState = MONSTATE_SLEEP then
begin // Ñïàë, ðàçáóäèëè íåñìåðòåëüíûì óäàðîì:
FPain := MONSTERTABLE[FMonsterType].Pain;
- SetState(STATE_GO);
+ SetState(MONSTATE_GO);
end;
if g_Game_IsServer and g_Game_IsNet then MH_SEND_MonsterState(FUID);
@@ -1967,7 +2074,7 @@ begin
Result := False;
if g_Game_IsClient then
Exit;
- if not Live then
+ if not alive then
Exit;
if FHealth < FMaxHealth then
@@ -1990,20 +2097,24 @@ begin
vilefire.Free();
- if (proxyId <> -1) then
+ if (mProxyId <> -1) then
begin
if (monsGrid <> nil) then
begin
- monsGrid.removeBody(proxyId);
+ monsGrid.removeBody(mProxyId);
{$IF DEFINED(D2F_DEBUG_MONS_MOVE)}
- e_WriteLog(Format('monster #%d(%u): removed from tree; proxyid=%d', [arrIdx, UID, proxyId]), MSG_NOTIFY);
+ e_WriteLog(Format('monster #%d:(%u): removed from grid; mProxyid=%d', [mArrIdx, UID, mProxyId]), MSG_NOTIFY);
{$ENDIF}
end;
- proxyId := -1;
+ mProxyId := -1;
end;
- if (arrIdx <> -1) and (arrIdx < Length(gMonsters)) then gMonsters[arrIdx] := nil;
- arrIdx := -1;
+ if (mArrIdx <> -1) and (mArrIdx < Length(gMonsters)) then
+ begin
+ freeInds.release(mArrIdx);
+ gMonsters[mArrIdx] := nil;
+ end;
+ mArrIdx := -1;
uidMap[FUID] := nil;
@@ -2021,18 +2132,21 @@ begin
// Åñëè êîëäóí ñòðåëÿåò, òî ðèñóåì îãîíü:
if FMonsterType = MONSTER_VILE then
- if FState = STATE_SHOOT then
+ if FState = MONSTATE_SHOOT then
if GetPos(FTargetUID, @o) then
vilefire.Draw(o.X+o.Rect.X+(o.Rect.Width div 2)-32,
o.Y+o.Rect.Y+o.Rect.Height-128, M_NONE);
// Íå â îáëàñòè ðèñîâàíèÿ íå ðåñóåì:
- if not g_Collide(FObj.X+FObj.Rect.X, FObj.Y+FObj.Rect.Y, FObj.Rect.Width, FObj.Rect.Height,
- sX-128, sY-128, sWidth+256, sHeight+256) then
- Exit;
+ 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,
+ sX-128, sY-128, sWidth+256, sHeight+256) then
+ Exit;
+ end;
// Ýòè ìîíñòðû, óìèðàÿ, íå îñòàâëÿþò òðóïîâ:
- if FState = STATE_DEAD then
+ if FState = MONSTATE_DEAD then
case FMonsterType of
MONSTER_BARREL, MONSTER_SOUL, MONSTER_PAIN: Exit;
end;
@@ -2120,14 +2234,14 @@ var
begin
// Åñëè ñîñòîÿíèå = íà÷àëè óìèðàòü, à ýòîò ìîíñòð = Lost_Soul,
// òî ñîáëþäàåì îãðàíè÷åíèå êîëè÷åñòâà Lost_Soul'îâ:
- if (State = STATE_DIE) and (MonsterType = MONSTER_SOUL) then
+ if (State = MONSTATE_DIE) and (MonsterType = MONSTER_SOUL) then
soulcount := soulcount-1;
// Ïðèñìåðòè - íåëüçÿ ñðàçó íà÷èíàòü àòàêîâàòü èëè áåãàòü:
case FState of
- STATE_DIE, STATE_DEAD, STATE_REVIVE:
- if (State <> STATE_DEAD) and (State <> STATE_REVIVE) and
- (State <> STATE_GO) then
+ MONSTATE_DIE, MONSTATE_DEAD, MONSTATE_REVIVE:
+ if (State <> MONSTATE_DEAD) and (State <> MONSTATE_REVIVE) and
+ (State <> MONSTATE_GO) then
Exit;
end;
@@ -2138,14 +2252,14 @@ begin
// Íîâàÿ àíèìàöèÿ ïðè íîâîì ñîñòîÿíèè:
case FState of
- STATE_SLEEP: Anim := ANIM_SLEEP;
- STATE_PAIN: Anim := ANIM_PAIN;
- STATE_WAIT: Anim := ANIM_SLEEP;
- STATE_CLIMB, STATE_RUN, STATE_RUNOUT, STATE_GO: Anim := ANIM_GO;
- STATE_SHOOT: Anim := ANIM_ATTACK;
- STATE_ATTACK: Anim := ANIM_ATTACK;
- STATE_DIE: Anim := ANIM_DIE;
- STATE_REVIVE:
+ MONSTATE_SLEEP: Anim := ANIM_SLEEP;
+ MONSTATE_PAIN: Anim := ANIM_PAIN;
+ MONSTATE_WAIT: Anim := ANIM_SLEEP;
+ MONSTATE_CLIMB, MONSTATE_RUN, MONSTATE_RUNOUT, MONSTATE_GO: Anim := ANIM_GO;
+ MONSTATE_SHOOT: Anim := ANIM_ATTACK;
+ MONSTATE_ATTACK: Anim := ANIM_ATTACK;
+ MONSTATE_DIE: Anim := ANIM_DIE;
+ MONSTATE_REVIVE:
begin // íà÷àëè âîñðåøàòüñÿ
Anim := FCurAnim;
FAnim[Anim, FDirection].Revert(True);
@@ -2254,15 +2368,15 @@ begin
// Ðûáû "ëåòàþò" òîëüêî â âîäå:
if FMonsterType = MONSTER_FISH then
if g_Obj_CollidePanel(@FObj, 0, 0, PANEL_WATER or PANEL_ACID1 or PANEL_ACID2) then
- if (FState <> STATE_DIE) and (FState <> STATE_DEAD) then
+ if (FState <> MONSTATE_DIE) and (FState <> MONSTATE_DEAD) then
fall := False;
// Ëåòàþùèå ìîíòñðû:
if ((FMonsterType = MONSTER_SOUL) or
(FMonsterType = MONSTER_PAIN) or
(FMonsterType = MONSTER_CACO)) and
- (FState <> STATE_DIE) and
- (FState <> STATE_DEAD) then
+ (FState <> MONSTATE_DIE) and
+ (FState <> MONSTATE_DEAD) then
fall := False;
// Ìåíÿåì ñêîðîñòü òîëüêî ïî ÷åòíûì êàäðàì:
@@ -2287,7 +2401,7 @@ begin
(FObj.X > gMapInfo.Width+1000) or (FObj.Y < -1000) then
begin
FRemoved := True;
- if Live and (gLMSRespawn = LMS_RESPAWN_NONE) then
+ if alive and (gLMSRespawn = LMS_RESPAWN_NONE) then
begin
Inc(gCoopMonstersKilled);
if g_Game_IsNet then
@@ -2300,7 +2414,7 @@ begin
oldvelx := FObj.Vel.X;
// Ñîïðîòèâëåíèå âîçäóõà äëÿ òðóïà:
- if (FState = STATE_DIE) or (FState = STATE_DEAD) then
+ if (FState = MONSTATE_DIE) or (FState = MONSTATE_DEAD) then
FObj.Vel.X := z_dec(FObj.Vel.X, 1);
if FFireTime > 0 then
@@ -2311,7 +2425,7 @@ begin
begin
OnFireFlame(1);
FFireTime := FFireTime - 1;
- if (FState <> STATE_DIE) and (FState <> STATE_DEAD) then
+ if (FState <> MONSTATE_DIE) and (FState <> MONSTATE_DEAD) then
if FFirePainTime = 0 then
begin
Damage(5, FFireAttacker, 0, 0, HIT_FLAME);
@@ -2323,15 +2437,15 @@ begin
end;
// Ìåðòâûé íè÷åãî íå äåëàåò:
- if (FState = STATE_DEAD) then
+ if (FState = MONSTATE_DEAD) then
goto _end;
// AI ìîíñòðîâ âûêëþ÷åí:
if g_debug_MonsterOff then
begin
FSleep := 1;
- if FState <> STATE_SLEEP then
- SetState(STATE_SLEEP);
+ if FState <> MONSTATE_SLEEP then
+ SetState(MONSTATE_SLEEP);
end;
// Âîçìîæíî, ñîçäàåì ïóçûðüêè â âîäå:
@@ -2357,7 +2471,7 @@ begin
// Åñëè ïðîøåë ïåðâûé êàäð àíèìàöèè âçðûâà áî÷êè, òî âçðûâ:
if FMonsterType = MONSTER_BARREL then
begin
- if (FState = STATE_DIE) and (FAnim[FCurAnim, FDirection].CurrentFrame = 1) and
+ if (FState = MONSTATE_DIE) and (FAnim[FCurAnim, FDirection].CurrentFrame = 1) and
(FAnim[FCurAnim, FDirection].Counter = 0) then
g_Weapon_Explode(FObj.X+FObj.Rect.X+(FObj.Rect.Width div 2),
FObj.Y+FObj.Rect.Y+FObj.Rect.Height-16,
@@ -2402,8 +2516,8 @@ begin
// Ïðîáóåì óâåðíóòüñÿ îò ëåòÿùåé ïóëè:
if fall then
- if (FState in [STATE_GO, STATE_RUN, STATE_RUNOUT,
- STATE_ATTACK, STATE_SHOOT]) then
+ if (FState in [MONSTATE_GO, MONSTATE_RUN, MONSTATE_RUNOUT,
+ MONSTATE_ATTACK, MONSTATE_SHOOT]) then
if g_Weapon_Danger(FUID, FObj.X+FObj.Rect.X, FObj.Y+FObj.Rect.Y,
FObj.Rect.Width, FObj.Rect.Height, 50) then
if (g_Obj_CollideLevel(@FObj, 0, 1) or g_Obj_StayOnStep(@FObj)) and
@@ -2411,7 +2525,7 @@ begin
FObj.Vel.Y := -MONSTERTABLE[FMonsterType].Jump;
case FState of
- STATE_PAIN: // Ñîñòîÿíèå - Áîëü
+ MONSTATE_PAIN: // Ñîñòîÿíèå - Áîëü
begin
// Áîëü ñèëüíàÿ => ìîíñòð êðè÷èò:
if FPain >= MONSTERTABLE[FMonsterType].Pain then
@@ -2430,11 +2544,11 @@ begin
begin
FPain := 0;
FAmmo := -9;
- SetState(STATE_GO);
+ SetState(MONSTATE_GO);
end;
end;
- STATE_SLEEP: // Ñîñòîÿíèå - Ñîí
+ MONSTATE_SLEEP: // Ñîñòîÿíèå - Ñîí
begin
// Ñïèì:
FSleep := FSleep + 1;
@@ -2450,7 +2564,7 @@ begin
// Åñëè åñòü èãðîê ðÿäîì, ïðîñûïàåìñÿ è èäåì ê íåìó:
if (gPlayers <> nil) then
for a := 0 to High(gPlayers) do
- if (gPlayers[a] <> nil) and (gPlayers[a].Live)
+ if (gPlayers[a] <> nil) and (gPlayers[a].alive)
and (not gPlayers[a].NoTarget) and (gPlayers[a].FMegaRulez[MR_INVIS] < gTime) then
with gPlayers[a] do
if g_Look(@FObj, @Obj, FDirection) then
@@ -2458,7 +2572,7 @@ begin
FTargetUID := gPlayers[a].UID;
FTargetTime := 0;
WakeUpSound();
- SetState(STATE_GO);
+ SetState(MONSTATE_GO);
Break;
end;
@@ -2468,7 +2582,7 @@ begin
// Åñëè åñòü ïîäõîäÿùèé ìîíñòð ðÿäîì:
if gMonsters <> nil then
for a := 0 to High(gMonsters) do
- if (gMonsters[a] <> nil) and (gMonsters[a].Live) and
+ if (gMonsters[a] <> nil) and (gMonsters[a].alive) and
(gMonsters[a].FUID <> FUID) then
begin
// Ìàíüÿêè íàïàäàþò íà âñåõ ìîíñòðîâ, êðîìå äðóçåé
@@ -2487,30 +2601,30 @@ begin
FTargetUID := gMonsters[a].UID;
FTargetTime := 0;
WakeUpSound();
- SetState(STATE_GO);
+ SetState(MONSTATE_GO);
Break;
end;
end;
end;
- STATE_WAIT: // Ñîñòîÿíèå - Îæèäàíèå
+ MONSTATE_WAIT: // Ñîñòîÿíèå - Îæèäàíèå
begin
// Æäåì:
FSleep := FSleep - 1;
// Âûæäàëè äîñòàòî÷íî - èäåì:
if FSleep < 0 then
- SetState(STATE_GO);
+ SetState(MONSTATE_GO);
end;
- STATE_GO: // Ñîñòîÿíèå - Äâèæåíèå (ñ îñìîòðîì ñèòóàöèè)
+ MONSTATE_GO: // Ñîñòîÿíèå - Äâèæåíèå (ñ îñìîòðîì ñèòóàöèè)
begin
// Åñëè íàòêíóëèñü íà ÁëîêÌîí - óáåãàåì îò íåãî:
if WordBool(st and MOVE_BLOCK) then
begin
Turn();
FSleep := 40;
- SetState(STATE_RUNOUT);
+ SetState(MONSTATE_RUNOUT);
goto _end;
end;
@@ -2520,7 +2634,7 @@ begin
if isCorpse(@FObj, False) <> -1 then
begin
FObj.Vel.X := 0;
- SetState(STATE_ATTACK, ANIM_ATTACK2);
+ SetState(MONSTATE_ATTACK, ANIM_ATTACK2);
goto _end;
end;
@@ -2573,7 +2687,7 @@ begin
if FMonsterType <> MONSTER_FISH then
begin
FSleep := 15;
- SetState(STATE_RUN);
+ SetState(MONSTATE_RUN);
if Random(2) = 0 then
FDirection := D_LEFT
else
@@ -2589,7 +2703,7 @@ begin
FObj.Rect.Height, FUID, ACTIVATE_MONSTERPRESS) <> nil then
begin // Ñìîãëè íàæàòü êíîïêó - íåáîëüøîå îæèäàíèå
FSleep := 4;
- SetState(STATE_WAIT);
+ SetState(MONSTATE_WAIT);
goto _end;
end;
@@ -2602,7 +2716,7 @@ begin
begin // Ñòîèì íà òâåðäîì ïîëó èëè ñòóïåíè
// Ïðûæîê ÷åðåç ñòåíó:
FObj.Vel.Y := -MONSTERTABLE[FMonsterType].Jump;
- SetState(STATE_CLIMB);
+ SetState(MONSTATE_CLIMB);
end;
end;
@@ -2625,7 +2739,7 @@ begin
end;
// Ðûáå áîëüíî:
- SetState(STATE_PAIN);
+ SetState(MONSTATE_PAIN);
FPain := FPain + 50;
end
else // Ðûáà â âîäå
@@ -2648,7 +2762,7 @@ begin
else
FDirection := D_RIGHT;
FSleep := 20;
- SetState(STATE_RUN);
+ SetState(MONSTATE_RUN);
end;
end;
end
@@ -2670,7 +2784,7 @@ begin
if b > 1 then b := b * (Random(8 div b) + 1);
for a := 0 to High(gGibs) do
begin
- if gGibs[a].Live and
+ if gGibs[a].alive and
g_Obj_Collide(FObj.X+FObj.Rect.X, FObj.Y+FObj.Rect.Y+FObj.Rect.Height-4,
FObj.Rect.Width, 8, @gGibs[a].Obj) and (Random(3) = 0) then
begin
@@ -2737,14 +2851,14 @@ begin
FObj.Vel.X := 0;
end;
- STATE_RUN: // Ñîñòîÿíèå - Áåã
+ MONSTATE_RUN: // Ñîñòîÿíèå - Áåã
begin
// Åñëè íàòêíóëèñü íà ÁëîêÌîí - óáåãàåì îò íåãî:
if WordBool(st and MOVE_BLOCK) then
begin
Turn();
FSleep := 40;
- SetState(STATE_RUNOUT);
+ SetState(MONSTATE_RUNOUT);
goto _end;
end;
@@ -2755,7 +2869,7 @@ begin
if (FSleep <= 0) or (WordBool(st and MOVE_HITWALL) and ((FObj.Vel.Y+FObj.Accel.Y) = 0)) then
begin
FSleep := 0;
- SetState(STATE_GO);
+ SetState(MONSTATE_GO);
// Ñòåíà - èäåì îáðàòíî:
if WordBool(st and (MOVE_HITWALL or MOVE_BLOCK)) then
Turn();
@@ -2778,7 +2892,7 @@ begin
FObj.Vel.X := 0;
end;
- STATE_RUNOUT: // Ñîñòîÿíèå - Óáåãàåò îò ÷åãî-òî
+ MONSTATE_RUNOUT: // Ñîñòîÿíèå - Óáåãàåò îò ÷åãî-òî
begin
// Âûøëè èç ÁëîêÌîíà:
if (not WordBool(st and MOVE_BLOCK)) and (FSleep > 0) then
@@ -2790,7 +2904,7 @@ begin
if FSleep <= -18 then
begin
FSleep := 0;
- SetState(STATE_GO);
+ SetState(MONSTATE_GO);
// Ñòåíà/ÁëîêÌîí - èäåì îáðàòíî:
if WordBool(st and (MOVE_HITWALL or MOVE_BLOCK)) then
Turn();
@@ -2813,21 +2927,21 @@ begin
FObj.Vel.X := 0;
end;
- STATE_CLIMB: // Ñîñòîÿíèå - Ïðûæîê (÷òîáû îáîéòè ñòåíó)
+ MONSTATE_CLIMB: // Ñîñòîÿíèå - Ïðûæîê (÷òîáû îáîéòè ñòåíó)
begin
// Äîñòèãëè âûñøåé òî÷êè ïðûæêà èëè ñòåíà êîí÷èëàñü => ïåðåõîäèì íà øàã:
if ((FObj.Vel.Y+FObj.Accel.Y) >= 0) or
(not WordBool(st and MOVE_HITWALL)) then
begin
FSleep := 0;
- SetState(STATE_GO);
+ SetState(MONSTATE_GO);
// Ñòåíà íå êîí÷èëàñü => áåæèì îò íåå:
if WordBool(st and (MOVE_HITWALL or MOVE_BLOCK)) then
begin
Turn();
FSleep := 15;
- SetState(STATE_RUN);
+ SetState(MONSTATE_RUN);
end;
end;
@@ -2845,14 +2959,14 @@ begin
FObj.Vel.X := 0;
end;
- STATE_ATTACK, // Ñîñòîÿíèå - Àòàêà
- STATE_SHOOT: // Ñîñòîÿíèå - Ñòðåëüáà
+ MONSTATE_ATTACK, // Ñîñòîÿíèå - Àòàêà
+ MONSTATE_SHOOT: // Ñîñòîÿíèå - Ñòðåëüáà
begin
// Lost_Soul âðåçàëñÿ â ñòåíó ïðè àòàêå => ïåðåõîäèò íà øàã:
if FMonsterType = MONSTER_SOUL then
begin
if WordBool(st and (MOVE_HITWALL or MOVE_HITCEIL or MOVE_HITLAND)) then
- SetState(STATE_GO);
+ SetState(MONSTATE_GO);
goto _end;
end;
@@ -2862,12 +2976,12 @@ begin
FObj.Vel.X := z_dec(FObj.Vel.X, 1);
// Íóæíî ñòðåëÿòü, à ìîíñòð - êîëäóí:
- if (FMonsterType = MONSTER_VILE) and (FState = STATE_SHOOT) then
+ if (FMonsterType = MONSTER_VILE) and (FState = MONSTATE_SHOOT) then
begin
// Öåëü ïîãèáëà => èäåì äàëüøå:
if not GetPos(FTargetUID, @o) then
begin
- SetState(STATE_GO);
+ SetState(MONSTATE_GO);
goto _end;
end;
@@ -2875,7 +2989,7 @@ begin
// Öåëü íå âèäíî => èäåì äàëüøå:
if not g_Look(@FObj, @o, FDirection) then
begin
- SetState(STATE_GO);
+ SetState(MONSTATE_GO);
goto _end;
end;
@@ -2883,7 +2997,7 @@ begin
// Öåëü â âîäå - íå çàãîðèòñÿ => èäåì äàëüøå:
if g_Obj_CollideWater(@o, 0, 0) then
begin
- SetState(STATE_GO);
+ SetState(MONSTATE_GO);
goto _end;
end;
@@ -2899,11 +3013,11 @@ begin
_end:
// Ñîñòîÿíèå - Âîñêðåøåíèå:
- if FState = STATE_REVIVE then
+ if FState = MONSTATE_REVIVE then
if FAnim[FCurAnim, FDirection].Played then
begin // Îáðàòíàÿ àíèìàöèÿ óìèðàíèÿ çàêîí÷èëàñü - èäåì äàëüøå:
FAnim[FCurAnim, FDirection].Revert(False);
- SetState(STATE_GO);
+ SetState(MONSTATE_GO);
end;
// Åñëè åñòü àíèìàöèÿ îãíÿ êîëäóíà - ïóñòü îíà èäåò:
@@ -2911,12 +3025,12 @@ _end:
vilefire.Update();
// Ñîñòîÿíèå - Óìèðàåò è òåêóùàÿ àíèìàöèÿ ïðîèãðàíà:
- if (FState = STATE_DIE) and
+ if (FState = MONSTATE_DIE) and
(FAnim[FCurAnim, FDirection] <> nil) and
(FAnim[FCurAnim, FDirection].Played) then
begin
// Óìåð:
- SetState(STATE_DEAD);
+ SetState(MONSTATE_DEAD);
// Pain_Elemental ïðè ñìåðòè âûïóñêàåò 3 Lost_Soul'à:
if (FMonsterType = MONSTER_PAIN) then
@@ -2925,7 +3039,7 @@ _end:
FObj.Y+FObj.Rect.Y+20, D_LEFT);
if mon <> nil then
begin
- mon.SetState(STATE_GO);
+ mon.SetState(MONSTATE_GO);
mon.FNoRespawn := True;
Inc(gTotalMonsters);
if g_Game_IsNet then MH_SEND_MonsterSpawn(mon.UID);
@@ -2935,7 +3049,7 @@ _end:
FObj.Y+FObj.Rect.Y+20, D_RIGHT);
if mon <> nil then
begin
- mon.SetState(STATE_GO);
+ mon.SetState(MONSTATE_GO);
mon.FNoRespawn := True;
Inc(gTotalMonsters);
if g_Game_IsNet then MH_SEND_MonsterSpawn(mon.UID);
@@ -2945,7 +3059,7 @@ _end:
FObj.Y+FObj.Rect.Y, D_RIGHT);
if mon <> nil then
begin
- mon.SetState(STATE_GO);
+ mon.SetState(MONSTATE_GO);
mon.FNoRespawn := True;
Inc(gTotalMonsters);
if g_Game_IsNet then MH_SEND_MonsterSpawn(mon.UID);
@@ -2962,22 +3076,22 @@ _end:
end;
// Ñîâåðøåíèå àòàêè è ñòðåëüáû:
- if (FState = STATE_ATTACK) or (FState = STATE_SHOOT) then
+ if (FState = MONSTATE_ATTACK) or (FState = MONSTATE_SHOOT) then
if (FAnim[FCurAnim, FDirection] <> nil) then
// Àíèìàöèÿ àòàêè åñòü - ìîæíî àòàêîâàòü
if (FAnim[FCurAnim, FDirection].Played) then
begin // Àíèìàöèÿ àòàêè çàêîí÷èëàñü => ïåðåõîäèì íà øàã
- if FState = STATE_ATTACK then
+ if FState = MONSTATE_ATTACK then
begin // Ñîñòîÿíèå - Àòàêà
// Åñëè ìîíñòð íå Lost_Soul, òî ïîñëå àòàêè ïåðåõîäèì íà øàã:
if FMonsterType <> MONSTER_SOUL then
- SetState(STATE_GO);
+ SetState(MONSTATE_GO);
end
else // Ñîñòîÿíèå - Ñòðåëüáà
begin
// Ïåðåõîäèì íà øàã, åñëè íå íàäî ñòðåëÿòü åùå ðàç:
if not FChainFire then
- SetState(STATE_GO)
+ SetState(MONSTATE_GO)
else
begin // Íàäî ñòðåëÿòü åùå
FChainFire := False;
@@ -2997,7 +3111,7 @@ _end:
(FAnim[FCurAnim, FDirection].TotalFrames div 2))
) then
begin // Àòàêè åùå íå áûëî è ýòî ñåðåäèíà àíèìàöèè àòàêè
- if FState = STATE_ATTACK then
+ if FState = MONSTATE_ATTACK then
begin // Ñîñòîÿíèå - Àòàêà
// Åñëè ýòî Lost_Soul, òî ñáðàñûâàåì àíèìàöèþ àòàêè:
if FMonsterType = MONSTER_SOUL then
@@ -3009,7 +3123,7 @@ _end:
if g_Weapon_Hit(@FObj, 15, FUID, HIT_SOME) <> 0 then
// Lost_Soul óêóñèë êîãî-òî => ïåðåõîäèò íà øàã:
if FMonsterType = MONSTER_SOUL then
- SetState(STATE_GO);
+ SetState(MONSTATE_GO);
MONSTER_FISH:
// Ðûáà êóñàåò ïåðâîãî ïîïàâøåãîñÿ ñî çâóêîì:
@@ -3033,7 +3147,7 @@ _end:
sx := isCorpse(@FObj, True);
if sx <> -1 then
begin // Íàøëè, êîãî âîñêðåñèòü
- gMonsters[sx].SetState(STATE_REVIVE);
+ gMonsters[sx].SetState(MONSTATE_REVIVE);
g_Sound_PlayExAt('SOUND_MONSTER_SLOP', FObj.X, FObj.Y);
// Âîñêðåøàòü - ñåáå âðåäèòü:
{g_Weapon_HitUID(FUID, 5, 0, HIT_SOME);}
@@ -3120,7 +3234,7 @@ _end:
GetPos(FTargetUID, @o);
mon.FTargetTime := 0;
mon.FNoRespawn := True;
- mon.SetState(STATE_GO);
+ mon.SetState(MONSTATE_GO);
mon.shoot(@o, True);
Inc(gTotalMonsters);
@@ -3154,7 +3268,7 @@ _end:
// Ïîñëåäíèé êàäð òåêóùåé àíèìàöèè:
if FAnim[FCurAnim, FDirection].Counter = FAnim[FCurAnim, FDirection].Speed-1 then
case FState of
- STATE_GO, STATE_RUN, STATE_CLIMB, STATE_RUNOUT:
+ MONSTATE_GO, MONSTATE_RUN, MONSTATE_CLIMB, MONSTATE_RUNOUT:
// Çâóêè ïðè ïåðåäâèæåíèè:
case FMonsterType of
MONSTER_CYBER:
@@ -3177,7 +3291,7 @@ _end:
end;
if g_Obj_CollidePanel(@FObj, 0, 0, PANEL_LIFTLEFT or PANEL_LIFTRIGHT) and
- not ((FState = STATE_DEAD) or (FState = STATE_DIE)) then
+ not ((FState = MONSTATE_DEAD) or (FState = MONSTATE_DIE)) then
FObj.Vel.X := oldvelx;
// Åñëè åñòü àíèìàöèÿ, òî ïóñòü îíà èäåò:
@@ -3221,15 +3335,15 @@ begin
// Ðûáû "ëåòàþò" òîëüêî â âîäå:
if FMonsterType = MONSTER_FISH then
if g_Obj_CollidePanel(@FObj, 0, 0, PANEL_WATER or PANEL_ACID1 or PANEL_ACID2) then
- if (FState <> STATE_DIE) and (FState <> STATE_DEAD) then
+ if (FState <> MONSTATE_DIE) and (FState <> MONSTATE_DEAD) then
fall := False;
// Ëåòàþùèå ìîíòñðû:
if ((FMonsterType = MONSTER_SOUL) or
(FMonsterType = MONSTER_PAIN) or
(FMonsterType = MONSTER_CACO)) and
- (FState <> STATE_DIE) and
- (FState <> STATE_DEAD) then
+ (FState <> MONSTATE_DIE) and
+ (FState <> MONSTATE_DEAD) then
fall := False;
// Ìåíÿåì ñêîðîñòü òîëüêî ïî ÷åòíûì êàäðàì:
@@ -3260,7 +3374,7 @@ begin
oldvelx := FObj.Vel.X;
// Ñîïðîòèâëåíèå âîçäóõà äëÿ òðóïà:
- if (FState = STATE_DIE) or (FState = STATE_DEAD) then
+ if (FState = MONSTATE_DIE) or (FState = MONSTATE_DEAD) then
FObj.Vel.X := z_dec(FObj.Vel.X, 1);
if FFireTime > 0 then
@@ -3275,7 +3389,7 @@ begin
end;
// Ìåðòâûé íè÷åãî íå äåëàåò:
- if (FState = STATE_DEAD) then
+ if (FState = MONSTATE_DEAD) then
goto _end;
// Âîçìîæíî, ñîçäàåì ïóçûðüêè â âîäå:
@@ -3301,7 +3415,7 @@ begin
// Åñëè ïðîøåë ïåðâûé êàäð àíèìàöèè âçðûâà áî÷êè, òî âçðûâ:
if FMonsterType = MONSTER_BARREL then
begin
- if (FState = STATE_DIE) and (FAnim[FCurAnim, FDirection].CurrentFrame = 1) and
+ if (FState = MONSTATE_DIE) and (FAnim[FCurAnim, FDirection].CurrentFrame = 1) and
(FAnim[FCurAnim, FDirection].Counter = 0) then
g_Weapon_Explode(FObj.X+FObj.Rect.X+(FObj.Rect.Width div 2),
FObj.Y+FObj.Rect.Y+FObj.Rect.Height-16,
@@ -3345,8 +3459,8 @@ begin
// Ïðîáóåì óâåðíóòüñÿ îò ëåòÿùåé ïóëè:
if fall then
- if (FState in [STATE_GO, STATE_RUN, STATE_RUNOUT,
- STATE_ATTACK, STATE_SHOOT]) then
+ if (FState in [MONSTATE_GO, MONSTATE_RUN, MONSTATE_RUNOUT,
+ MONSTATE_ATTACK, MONSTATE_SHOOT]) then
if g_Weapon_Danger(FUID, FObj.X+FObj.Rect.X, FObj.Y+FObj.Rect.Y,
FObj.Rect.Width, FObj.Rect.Height, 50) then
if (g_Obj_CollideLevel(@FObj, 0, 1) or g_Obj_StayOnStep(@FObj)) and
@@ -3354,7 +3468,7 @@ begin
FObj.Vel.Y := -MONSTERTABLE[FMonsterType].Jump;
case FState of
- STATE_PAIN: // Ñîñòîÿíèå - Áîëü
+ MONSTATE_PAIN: // Ñîñòîÿíèå - Áîëü
begin
// Áîëü ñèëüíàÿ => ìîíñòð êðè÷èò:
if FPain >= MONSTERTABLE[FMonsterType].Pain then
@@ -3371,12 +3485,12 @@ begin
// Áîëü óæå íå îøóòèìàÿ => èäåì äàëüøå:
if FPain <= MONSTERTABLE[FMonsterType].MinPain then
begin
- SetState(STATE_GO);
+ SetState(MONSTATE_GO);
FPain := 0;
end;
end;
- STATE_SLEEP: // Ñîñòîÿíèå - Ñîí
+ MONSTATE_SLEEP: // Ñîñòîÿíèå - Ñîí
begin
// Ñïèì:
FSleep := FSleep + 1;
@@ -3388,20 +3502,20 @@ begin
goto _end;
end;
- STATE_WAIT: // Ñîñòîÿíèå - Îæèäàíèå
+ MONSTATE_WAIT: // Ñîñòîÿíèå - Îæèäàíèå
begin
// Æäåì:
FSleep := FSleep - 1;
end;
- STATE_GO: // Ñîñòîÿíèå - Äâèæåíèå (ñ îñìîòðîì ñèòóàöèè)
+ MONSTATE_GO: // Ñîñòîÿíèå - Äâèæåíèå (ñ îñìîòðîì ñèòóàöèè)
begin
// Åñëè íàòêíóëèñü íà ÁëîêÌîí - óáåãàåì îò íåãî:
if WordBool(st and MOVE_BLOCK) then
begin
Turn();
FSleep := 40;
- SetState(STATE_RUNOUT);
+ SetState(MONSTATE_RUNOUT);
goto _end;
end;
@@ -3410,7 +3524,7 @@ begin
if (FMonsterType = MONSTER_VILE) then
if isCorpse(@FObj, False) <> -1 then
begin
- SetState(STATE_ATTACK, ANIM_ATTACK2);
+ SetState(MONSTATE_ATTACK, ANIM_ATTACK2);
FObj.Vel.X := 0;
goto _end;
@@ -3420,7 +3534,7 @@ begin
if Abs(sx) < 40 then
if FMonsterType <> MONSTER_FISH then
begin
- SetState(STATE_RUN);
+ SetState(MONSTATE_RUN);
FSleep := 15;
goto _end;
@@ -3437,7 +3551,7 @@ begin
begin // Ñòîèì íà òâåðäîì ïîëó èëè ñòóïåíè
// Ïðûæîê ÷åðåç ñòåíó:
FObj.Vel.Y := -MONSTERTABLE[FMonsterType].Jump;
- SetState(STATE_CLIMB);
+ SetState(MONSTATE_CLIMB);
end;
end;
@@ -3461,7 +3575,7 @@ begin
end;
// Ðûáå áîëüíî:
- SetState(STATE_PAIN);
+ SetState(MONSTATE_PAIN);
FPain := FPain + 50;
end
else // Ðûáà â âîäå
@@ -3479,7 +3593,7 @@ begin
// Âñïëûëè äî ïîâåðõíîñòè - ñòîï:
FObj.Vel.Y := 0;
// Ïëàâàåì òóäà-ñþäà:
- SetState(STATE_RUN);
+ SetState(MONSTATE_RUN);
FSleep := 20;
end;
end;
@@ -3502,7 +3616,7 @@ begin
if b > 1 then b := b * (Random(8 div b) + 1);
for a := 0 to High(gGibs) do
begin
- if gGibs[a].Live and
+ if gGibs[a].alive and
g_Obj_Collide(FObj.X+FObj.Rect.X, FObj.Y+FObj.Rect.Y+FObj.Rect.Height-4,
FObj.Rect.Width, 8, @gGibs[a].Obj) and (Random(3) = 0) then
begin
@@ -3564,12 +3678,12 @@ begin
FObj.Vel.X := 0;
end;
- STATE_RUN: // Ñîñòîÿíèå - Áåã
+ MONSTATE_RUN: // Ñîñòîÿíèå - Áåã
begin
// Åñëè íàòêíóëèñü íà ÁëîêÌîí - óáåãàåì îò íåãî:
if WordBool(st and MOVE_BLOCK) then
begin
- SetState(STATE_RUNOUT);
+ SetState(MONSTATE_RUNOUT);
FSleep := 40;
goto _end;
@@ -3580,7 +3694,7 @@ begin
// Ïðîáåæàëè äîñòàòî÷íî èëè âðåçàëèñü â ñòåíó => ïåðåõîäèì íà øàã:
if (FSleep <= 0) or (WordBool(st and MOVE_HITWALL) and ((FObj.Vel.Y+FObj.Accel.Y) = 0)) then
begin
- SetState(STATE_GO);
+ SetState(MONSTATE_GO);
FSleep := 0;
// Èíîãäà ðû÷èì:
@@ -3602,7 +3716,7 @@ begin
FObj.Vel.X := 0;
end;
- STATE_RUNOUT: // Ñîñòîÿíèå - Óáåãàåò îò ÷åãî-òî
+ MONSTATE_RUNOUT: // Ñîñòîÿíèå - Óáåãàåò îò ÷åãî-òî
begin
// Âûøëè èç ÁëîêÌîíà:
if (not WordBool(st and MOVE_BLOCK)) and (FSleep > 0) then
@@ -3613,7 +3727,7 @@ begin
// Óáàæåëè äîñòàòî÷íî äàëåêî => ïåðåõîäèì íà øàã:
if FSleep <= -18 then
begin
- SetState(STATE_GO);
+ SetState(MONSTATE_GO);
FSleep := 0;
// Èíîãäà ðû÷èì:
@@ -3635,19 +3749,19 @@ begin
FObj.Vel.X := 0;
end;
- STATE_CLIMB: // Ñîñòîÿíèå - Ïðûæîê (÷òîáû îáîéòè ñòåíó)
+ MONSTATE_CLIMB: // Ñîñòîÿíèå - Ïðûæîê (÷òîáû îáîéòè ñòåíó)
begin
// Äîñòèãëè âûñøåé òî÷êè ïðûæêà èëè ñòåíà êîí÷èëàñü => ïåðåõîäèì íà øàã:
if ((FObj.Vel.Y+FObj.Accel.Y) >= 0) or
(not WordBool(st and MOVE_HITWALL)) then
begin
- SetState(STATE_GO);
+ SetState(MONSTATE_GO);
FSleep := 0;
// Ñòåíà íå êîí÷èëàñü => áåæèì îò íåå:
if WordBool(st and (MOVE_HITWALL or MOVE_BLOCK)) then
begin
- SetState(STATE_RUN);
+ SetState(MONSTATE_RUN);
FSleep := 15;
end;
end;
@@ -3666,14 +3780,14 @@ begin
FObj.Vel.X := 0;
end;
- STATE_ATTACK, // Ñîñòîÿíèå - Àòàêà
- STATE_SHOOT: // Ñîñòîÿíèå - Ñòðåëüáà
+ MONSTATE_ATTACK, // Ñîñòîÿíèå - Àòàêà
+ MONSTATE_SHOOT: // Ñîñòîÿíèå - Ñòðåëüáà
begin
// Lost_Soul âðåçàëñÿ â ñòåíó ïðè àòàêå => ïåðåõîäèò íà øàã:
if FMonsterType = MONSTER_SOUL then
begin
if WordBool(st and (MOVE_HITWALL or MOVE_HITCEIL or MOVE_HITLAND)) then
- SetState(STATE_GO);
+ SetState(MONSTATE_GO);
goto _end;
end;
@@ -3683,12 +3797,12 @@ begin
FObj.Vel.X := z_dec(FObj.Vel.X, 1);
// Íóæíî ñòðåëÿòü, à ìîíñòð - êîëäóí:
- if (FMonsterType = MONSTER_VILE) and (FState = STATE_SHOOT) then
+ if (FMonsterType = MONSTER_VILE) and (FState = MONSTATE_SHOOT) then
begin
// Öåëü ïîãèáëà => èäåì äàëüøå:
if not GetPos(FTargetUID, @o) then
begin
- SetState(STATE_GO);
+ SetState(MONSTATE_GO);
goto _end;
end;
@@ -3696,7 +3810,7 @@ begin
// Öåëü íå âèäíî => èäåì äàëüøå:
if not g_Look(@FObj, @o, FDirection) then
begin
- SetState(STATE_GO);
+ SetState(MONSTATE_GO);
goto _end;
end;
@@ -3704,7 +3818,7 @@ begin
// Öåëü â âîäå - íå çàãîðèòñÿ => èäåì äàëüøå:
if g_Obj_CollideWater(@o, 0, 0) then
begin
- SetState(STATE_GO);
+ SetState(MONSTATE_GO);
goto _end;
end;
@@ -3715,11 +3829,11 @@ begin
_end:
// Ñîñòîÿíèå - Âîñêðåøåíèå:
- if FState = STATE_REVIVE then
+ if FState = MONSTATE_REVIVE then
if FAnim[FCurAnim, FDirection].Played then
begin // Îáðàòíàÿ àíèìàöèÿ óìèðàíèÿ çàêîí÷èëàñü - èäåì äàëüøå:
FAnim[FCurAnim, FDirection].Revert(False);
- SetState(STATE_GO);
+ SetState(MONSTATE_GO);
end;
// Åñëè åñòü àíèìàöèÿ îãíÿ êîëäóíà - ïóñòü îíà èäåò:
@@ -3727,12 +3841,12 @@ _end:
vilefire.Update();
// Ñîñòîÿíèå - Óìèðàåò è òåêóùàÿ àíèìàöèÿ ïðîèãðàíà:
- if (FState = STATE_DIE) and
+ if (FState = MONSTATE_DIE) and
(FAnim[FCurAnim, FDirection] <> nil) and
(FAnim[FCurAnim, FDirection].Played) then
begin
// Óìåð:
- SetState(STATE_DEAD);
+ SetState(MONSTATE_DEAD);
// Ó ýòèõ ìîíñòðîâ íåò òðóïîâ:
if (FMonsterType = MONSTER_PAIN) or
@@ -3744,22 +3858,22 @@ _end:
end;
// Ñîâåðøåíèå àòàêè è ñòðåëüáû:
- if (FState = STATE_ATTACK) or (FState = STATE_SHOOT) then
+ if (FState = MONSTATE_ATTACK) or (FState = MONSTATE_SHOOT) then
if (FAnim[FCurAnim, FDirection] <> nil) then
// Àíèìàöèÿ àòàêè åñòü - ìîæíî àòàêîâàòü
if (FAnim[FCurAnim, FDirection].Played) then
begin // Àíèìàöèÿ àòàêè çàêîí÷èëàñü => ïåðåõîäèì íà øàã
- if FState = STATE_ATTACK then
+ if FState = MONSTATE_ATTACK then
begin // Ñîñòîÿíèå - Àòàêà
// Åñëè ìîíñòð íå Lost_Soul, òî ïîñëå àòàêè ïåðåõîäèì íà øàã:
if FMonsterType <> MONSTER_SOUL then
- SetState(STATE_GO);
+ SetState(MONSTATE_GO);
end
else // Ñîñòîÿíèå - Ñòðåëüáà
begin
// Ïåðåõîäèì íà øàã, åñëè íå íàäî ñòðåëÿòü åùå ðàç:
if not FChainFire then
- SetState(STATE_GO)
+ SetState(MONSTATE_GO)
else
begin // Íàäî ñòðåëÿòü åùå
FChainFire := False;
@@ -3779,7 +3893,7 @@ _end:
(FAnim[FCurAnim, FDirection].TotalFrames div 2))
) then
begin // Àòàêè åùå íå áûëî è ýòî ñåðåäèíà àíèìàöèè àòàêè
- if FState = STATE_ATTACK then
+ if FState = MONSTATE_ATTACK then
begin // Ñîñòîÿíèå - Àòàêà
// Åñëè ýòî Lost_Soul, òî ñáðàñûâàåì àíèìàöèþ àòàêè:
if FMonsterType = MONSTER_SOUL then
@@ -3791,7 +3905,7 @@ _end:
if g_Weapon_Hit(@FObj, 15, FUID, HIT_SOME) <> 0 then
// Lost_Soul óêóñèë êîãî-òî => ïåðåõîäèò íà øàã:
if FMonsterType = MONSTER_SOUL then
- SetState(STATE_GO);
+ SetState(MONSTATE_GO);
MONSTER_FISH:
g_Weapon_Hit(@FObj, 10, FUID, HIT_SOME);
@@ -3843,7 +3957,7 @@ _end:
// Ïîñëåäíèé êàäð òåêóùåé àíèìàöèè:
if FAnim[FCurAnim, FDirection].Counter = FAnim[FCurAnim, FDirection].Speed-1 then
case FState of
- STATE_GO, STATE_RUN, STATE_CLIMB, STATE_RUNOUT:
+ MONSTATE_GO, MONSTATE_RUN, MONSTATE_CLIMB, MONSTATE_RUNOUT:
// Çâóêè ïðè ïåðåäâèæåíèè:
case FMonsterType of
MONSTER_CYBER:
@@ -3867,7 +3981,7 @@ _end:
// Êîñòûëü äëÿ ïîòîêîâ
if g_Obj_CollidePanel(@FObj, 0, 0, PANEL_LIFTLEFT or PANEL_LIFTRIGHT) and
- not ((FState = STATE_DEAD) or (FState = STATE_DIE)) then
+ not ((FState = MONSTATE_DEAD) or (FState = MONSTATE_DIE)) then
FObj.Vel.X := oldvelx;
// Åñëè åñòü àíèìàöèÿ, òî ïóñòü îíà èäåò:
@@ -3954,7 +4068,7 @@ begin
if (gPlayers <> nil) and (FBehaviour <> BH_INSANE) and
(FBehaviour <> BH_CANNIBAL) and (FBehaviour <> BH_GOOD) then
for a := 0 to High(gPlayers) do
- if (gPlayers[a] <> nil) and (gPlayers[a].Live)
+ if (gPlayers[a] <> nil) and (gPlayers[a].alive)
and (not gPlayers[a].NoTarget) and (gPlayers[a].FMegaRulez[MR_INVIS] < gTime) then
begin
if g_Look(@FObj, @gPlayers[a].Obj, FDirection) then
@@ -3974,7 +4088,7 @@ begin
// Êèëëåðû è äîáðûå íå òðîãàþò ìîíñòðîâ
if (gMonsters <> nil) and (FBehaviour <> BH_KILLER) and (FBehaviour <> BH_GOOD) then
for a := 0 to High(gMonsters) do
- if (gMonsters[a] <> nil) and (gMonsters[a].Live) and
+ if (gMonsters[a] <> nil) and (gMonsters[a].alive) and
(gMonsters[a].FUID <> FUID) then
begin
if (FBehaviour = BH_CANNIBAL) and (gMonsters[a].FMonsterType <> FMonsterType) then
@@ -4078,24 +4192,24 @@ begin
case FMonsterType of
MONSTER_FISH:
begin
- SetState(STATE_ATTACK);
+ SetState(MONSTATE_ATTACK);
Result := True;
end;
MONSTER_DEMON:
begin
- SetState(STATE_ATTACK);
+ SetState(MONSTATE_ATTACK);
g_Sound_PlayExAt('SOUND_MONSTER_DEMON_ATTACK', FObj.X, FObj.Y);
Result := True;
end;
MONSTER_IMP:
begin
- SetState(STATE_ATTACK);
+ SetState(MONSTATE_ATTACK);
g_Sound_PlayExAt('SOUND_MONSTER_IMP_ATTACK', FObj.X, FObj.Y);
Result := True;
end;
MONSTER_SKEL, MONSTER_ROBO, MONSTER_CYBER:
begin
- SetState(STATE_ATTACK, ANIM_ATTACK2);
+ SetState(MONSTATE_ATTACK, ANIM_ATTACK2);
g_Sound_PlayExAt('SOUND_MONSTER_SKEL_ATTACK', FObj.X, FObj.Y);
Result := True;
end;
@@ -4178,19 +4292,19 @@ begin
case FMonsterType of
MONSTER_IMP, MONSTER_BARON, MONSTER_KNIGHT, MONSTER_CACO:
begin
- SetState(STATE_SHOOT);
+ SetState(MONSTATE_SHOOT);
{nn}
end;
MONSTER_SKEL:
begin
- SetState(STATE_SHOOT);
+ SetState(MONSTATE_SHOOT);
{nn}
end;
MONSTER_VILE:
begin // Çàæèãàåì îãîíü
tx := o^.X+o^.Rect.X+(o^.Rect.Width div 2);
ty := o^.Y+o^.Rect.Y;
- SetState(STATE_SHOOT);
+ SetState(MONSTATE_SHOOT);
vilefire.Reset();
@@ -4199,7 +4313,7 @@ begin
end;
MONSTER_SOUL:
begin // Ëåòèò â ñòîðîíó öåëè:
- SetState(STATE_ATTACK);
+ SetState(MONSTATE_ATTACK);
g_Sound_PlayExAt('SOUND_MONSTER_SOUL_ATTACK', FObj.X, FObj.Y);
xd := tx-(FObj.X+FObj.Rect.X+(FObj.Rect.Width div 2));
@@ -4219,7 +4333,7 @@ begin
if FAmmo = 1 then
g_Sound_PlayExAt('SOUND_MONSTER_MANCUB_ATTACK', FObj.X, FObj.Y);
- SetState(STATE_SHOOT);
+ SetState(MONSTATE_SHOOT);
end;
else Exit;
end;
@@ -4227,9 +4341,9 @@ begin
Result := True;
end;
-function TMonster.Live(): Boolean;
+function TMonster.alive(): Boolean;
begin
- Result := (FState <> STATE_DIE) and (FState <> STATE_DEAD) and (FHealth > 0);
+ Result := (FState <> MONSTATE_DIE) and (FState <> MONSTATE_DEAD) and (FHealth > 0);
end;
procedure TMonster.SetHealth(aH: Integer);
@@ -4245,7 +4359,7 @@ end;
procedure TMonster.WakeUp();
begin
if g_Game_IsClient then Exit;
- SetState(STATE_GO);
+ SetState(MONSTATE_GO);
FTargetTime := MAX_ATM;
WakeUpSound();
end;
@@ -4332,6 +4446,7 @@ begin
end;
end;
+
procedure TMonster.LoadState(var Mem: TBinMemoryReader);
var
i: Integer;
@@ -4348,8 +4463,13 @@ begin
begin
raise EBinSizeError.Create('TMonster.LoadState: Wrong Monster Signature');
end;
+ if (uidMap[FUID] <> nil) and (uidMap[FUID] <> self) then raise Exception.Create('internal error in monster loader (0)');
+ uidMap[FUID] := nil;
// UID ìîíñòðà:
Mem.ReadWord(FUID);
+ //if (arrIdx = -1) then raise Exception.Create('internal error in monster loader');
+ if (uidMap[FUID] <> nil) then raise Exception.Create('internal error in monster loader (1)');
+ uidMap[FUID] := self;
// Íàïðàâëåíèå:
Mem.ReadByte(b);
if b = 1 then
@@ -4472,7 +4592,7 @@ begin
Anim := TAnimation.Create(id, False, 3);
Anim.Alpha := 0;
g_GFX_OnceAnim(Obj.X+Obj.Rect.X+Random(Obj.Rect.Width+Times*2)-(Anim.Width div 2),
- Obj.Y+8+Random(8+Times*2)+IfThen(FState = STATE_DEAD, 16, 0), Anim, ONCEANIM_SMOKE);
+ Obj.Y+8+Random(8+Times*2)+IfThen(FState = MONSTATE_DEAD, 16, 0), Anim, ONCEANIM_SMOKE);
Anim.Free();
end;
end;
@@ -4487,7 +4607,6 @@ begin
if (result = nil) then raise Exception.Create('g_Mons_ByIdx: invalid monster id');
end;
-
// can return null
function g_Mons_ByIdx_NC (uid: Integer): TMonster; inline;
begin
@@ -4495,6 +4614,11 @@ begin
result := gMonsters[uid];
end;
+function g_Mons_TotalCount (): Integer; inline;
+begin
+ result := Length(gMonsters);
+end;
+
function g_Mons_ForEach (cb: TEachMonsterCB): Boolean;
var
@@ -4525,7 +4649,7 @@ begin
for idx := 0 to High(gMonsters) do
begin
mon := gMonsters[idx];
- if (mon <> nil) and mon.Live then
+ if (mon <> nil) and mon.alive then
begin
result := cb(mon);
if result then exit;
@@ -4538,7 +4662,7 @@ function g_Mons_IsAnyAliveAt (x, y: Integer; width, height: Integer): Boolean;
function monsCollCheck (mon: TMonster; atag: Integer): Boolean;
begin
- result := mon.Live;// and g_Obj_Collide(x, y, width, height, @mon.Obj));
+ result := mon.alive;// and g_Obj_Collide(x, y, width, height, @mon.Obj));
end;
var
@@ -4556,7 +4680,7 @@ begin
for idx := 0 to High(gMonsters) do
begin
mon := gMonsters[idx];
- if (mon <> nil) and mon.Live then
+ if (mon <> nil) and mon.alive then
begin
if g_Obj_Collide(x, y, width, height, @mon.Obj) then
begin
@@ -4569,13 +4693,10 @@ begin
end;
-///!!!FIXME!!!
function g_Mons_ForEachAt (x, y: Integer; width, height: Integer; cb: TEachMonsterCB): Boolean;
function monsCollCheck (mon: TMonster; atag: Integer): Boolean;
begin
- //result := false;
- //if g_Obj_Collide(x, y, width, height, @mon.Obj) then result := cb(mon);
result := cb(mon);
end;
@@ -4594,7 +4715,7 @@ begin
for idx := 0 to High(gMonsters) do
begin
mon := gMonsters[idx];
- if (mon <> nil) and mon.Live then
+ if (mon <> nil) and mon.alive then
begin
if g_Obj_Collide(x, y, width, height, @mon.Obj) then
begin
@@ -4612,8 +4733,8 @@ function g_Mons_ForEachAliveAt (x, y: Integer; width, height: Integer; cb: TEach
function monsCollCheck (mon: TMonster; atag: Integer): Boolean;
begin
//result := false;
- //if mon.Live and g_Obj_Collide(x, y, width, height, @mon.Obj) then result := cb(mon);
- if mon.Live then result := cb(mon) else result := false;
+ //if mon.alive and g_Obj_Collide(x, y, width, height, @mon.Obj) then result := cb(mon);
+ if mon.alive then result := cb(mon) else result := false;
end;
var
@@ -4638,7 +4759,7 @@ begin
for idx := 0 to High(gMonsters) do
begin
mon := gMonsters[idx];
- if (mon <> nil) and mon.Live then
+ if (mon <> nil) and mon.alive then
begin
if g_Obj_Collide(x, y, width, height, @mon.Obj) then
begin