index 8438e2d35db92e44cf931e8c34881487d55f10e0..2ca5f3ef193854bff9789eea2e4d9e37bc5528aa 100644 (file)
interface
+ uses g_base; // TRectWH
+
procedure r_Map_Initialize;
procedure r_Map_Finalize;
procedure r_Map_LoadTextures;
procedure r_Map_FreeTextures;
+{$IFDEF ENABLE_GFX}
procedure r_Map_NewGFX (typ, x, y: Integer);
+{$ENDIF}
+{$IFDEF ENABLE_GIBS}
+ function r_Map_GetGibSize (m, i: Integer): TRectWH;
+{$ENDIF}
procedure r_Map_Update;
{$ENDIF}
e_log,
binheap, MAPDEF, utils,
- g_options, g_textures, g_basic, g_base, g_phys,
+ g_options, g_textures, g_basic, g_phys,
g_game, g_map, g_panel, g_items, g_monsters, g_playermodel, g_player, g_weapons,
{$IFDEF ENABLE_CORPSES}
g_corpses,
{$ENDIF}
+ {$IFDEF ENABLE_SHELLS}
+ g_shells,
+ {$ENDIF}
+ {$IFDEF ENABLE_GIBS}
+ g_gibs,
+ {$ENDIF}
{$IFDEF ENABLE_GFX}
g_gfx,
{$ENDIF}
VILEFIRE_DX = 32;
VILEFIRE_DY = 128;
+ ItemAnim: array [0..ITEM_LAST] of record
+ name: AnsiString;
+ w, h: Integer;
+ d: Integer; // delay
+ n: Integer; // count
+ b: Boolean; // backanim
+ end = (
+ (name: ''; w: 0; h: 0; d: 0; n: 0; b: False),
+ (name: 'MED1'; w: 16; h: 16; d: 0; n: 1; b: False),
+ (name: 'MED2'; w: 32; h: 32; d: 0; n: 1; b: False),
+ (name: 'BMED'; w: 32; h: 32; d: 0; n: 1; b: False),
+ (name: 'ARMORGREEN'; w: 32; h: 16; d: 20; n: 3; b: True),
+ (name: 'ARMORBLUE'; w: 32; h: 16; d: 20; n: 3; b: True),
+ (name: 'SBLUE'; w: 32; h: 32; d: 15; n: 4; b: True),
+ (name: 'SWHITE'; w: 32; h: 32; d: 20; n: 4; b: True),
+ (name: 'SUIT'; w: 32; h: 64; d: 0; n: 1; b: False),
+ (name: 'OXYGEN'; w: 16; h: 32; d: 0; n: 1; b: False),
+ (name: 'INVUL'; w: 32; h: 32; d: 20; n: 4; b: True),
+ (name: 'SAW'; w: 64; h: 32; d: 0; n: 1; b: False),
+ (name: 'SHOTGUN1'; w: 64; h: 16; d: 0; n: 1; b: False),
+ (name: 'SHOTGUN2'; w: 64; h: 16; d: 0; n: 1; b: False),
+ (name: 'MGUN'; w: 64; h: 16; d: 0; n: 1; b: False),
+ (name: 'RLAUNCHER'; w: 64; h: 16; d: 0; n: 1; b: False),
+ (name: 'PGUN'; w: 64; h: 16; d: 0; n: 1; b: False),
+ (name: 'BFG'; w: 64; h: 64; d: 0; n: 1; b: False),
+ (name: 'SPULEMET'; w: 64; h: 16; d: 0; n: 1; b: False),
+ (name: 'CLIP'; w: 16; h: 16; d: 0; n: 1; b: False),
+ (name: 'AMMO'; w: 32; h: 16; d: 0; n: 1; b: False),
+ (name: 'SHELL1'; w: 16; h: 8; d: 0; n: 1; b: False),
+ (name: 'SHELL2'; w: 32; h: 16; d: 0; n: 1; b: False),
+ (name: 'ROCKET'; w: 16; h: 32; d: 0; n: 1; b: False),
+ (name: 'ROCKETS'; w: 64; h: 32; d: 0; n: 1; b: False),
+ (name: 'CELL'; w: 16; h: 16; d: 0; n: 1; b: False),
+ (name: 'CELL2'; w: 32; h: 32; d: 0; n: 1; b: False),
+ (name: 'BPACK'; w: 32; h: 32; d: 0; n: 1; b: False),
+ (name: 'KEYR'; w: 16; h: 16; d: 0; n: 1; b: False),
+ (name: 'KEYG'; w: 16; h: 16; d: 0; n: 1; b: False),
+ (name: 'KEYB'; w: 16; h: 16; d: 0; n: 1; b: False),
+ (name: 'KASTET'; w: 64; h: 32; d: 0; n: 1; b: False),
+ (name: 'PISTOL'; w: 64; h: 16; d: 0; n: 1; b: False),
+ (name: 'BOTTLE'; w: 16; h: 32; d: 20; n: 4; b: True),
+ (name: 'HELMET'; w: 16; h: 16; d: 20; n: 4; b: True),
+ (name: 'JETPACK'; w: 32; h: 32; d: 15; n: 3; b: True),
+ (name: 'INVIS'; w: 32; h: 32; d: 20; n: 4; b: True),
+ (name: 'FLAMETHROWER'; w: 64; h: 32; d: 0; n: 1; b: False),
+ (name: 'FUELCAN'; w: 16; h: 32; d: 0; n: 1; b: False)
+ );
+
+{$IFDEF ENABLE_GFX}
GFXAnim: array [0..R_GFX_LAST] of record
name: AnsiString;
w, h: Integer;
(name: 'SMOKE'; w: 32; h: 32; count: 10; back: false; speed: 3; rspeed: 0; alpha: 150), // transparent
(name: 'FLAME'; w: 32; h: 32; count: 11; back: false; speed: 3; rspeed: 2; alpha: 0) // random
);
+{$ENDIF}
ShotAnim: array [0..WEAPON_LAST] of record
name: AnsiString;
(name: 'BSKELFIRE'; w: 64; h: 64; count: 2) // 26 SKEL_FIRE
);
+{$IFDEF ENABLE_SHELLS}
+ ShellAnim: array [0..SHELL_LAST] of record
+ name: AnsiString;
+ dx, dy: Integer;
+ end = (
+ (name: 'EBULLET'; dx: 2; dy: 1), // 0 SHELL_BULLET
+ (name: 'ESHELL'; dx: 4; dy: 2), // 1 SHELL_SHELL
+ (name: 'ESHELL'; dx: 4; dy: 2) // 2 SHELL_DBLSHELL
+ );
+{$ENDIF}
+
type
TBinHeapPanelDrawCmp = class
public
spec: LongInt;
tex: TGLMultiTexture;
end;
- Items: array [0..ITEM_MAX] of record
+ Items: array [0..ITEM_LAST] of record
tex: TGLMultiTexture;
anim: TAnimState;
end;
anim: array [TDirection, 0..A_LAST] of record
base, mask: TGLMultiTexture;
end;
-(*
- {$IFDEF ENABLE_GIBS}
- gibs: array of record
- base, mask: TGLTexture;
- rect: TRectWH;
- end;
- {$ENDIF}
-*)
+{$IFDEF ENABLE_GIBS}
+ gibs: record
+ base, mask: TGLTextureArray;
+ rect: TRectArray;
+ end;
+{$ENDIF}
end;
StubShotAnim: TAnimState;
FlagAnim: TAnimState;
+{$IFDEF ENABLE_SHELLS}
+ ShellTextures: array [0..SHELL_LAST] of TGLTexture;
+{$ENDIF}
{$IFDEF ENABLE_GFX}
GFXTextures: array [0..R_GFX_LAST] of TGLMultiTexture;
gfxlist: array of record
StubShotAnim.Invalidate;
end;
+ procedure r_Map_FreeModel (i: Integer);
+ var a: Integer; d: TDirection;
+ begin
+ for d := TDirection.D_LEFT to TDirection.D_RIGHT do
+ begin
+ for a := A_STAND to A_LAST do
+ begin
+ if Models[i].anim[d, a].base <> nil then
+ Models[i].anim[d, a].base.Free;
+ if Models[i].anim[d, a].mask <> nil then
+ Models[i].anim[d, a].mask.Free;
+ Models[i].anim[d, a].base := nil;
+ Models[i].anim[d, a].mask := nil;
+ end;
+ end;
+ {$IFDEF ENABLE_GIBS}
+ if Models[i].gibs.base <> nil then
+ for a := 0 to High(Models[i].gibs.base) do
+ Models[i].gibs.base[a].Free;
+ if Models[i].gibs.mask <> nil then
+ for a := 0 to High(Models[i].gibs.mask) do
+ Models[i].gibs.mask[a].Free;
+ Models[i].gibs.base := nil;
+ Models[i].gibs.mask := nil;
+ Models[i].gibs.rect := nil;
+ {$ENDIF}
+ end;
+
procedure r_Map_LoadModel (i: Integer);
var prefix: AnsiString; a: Integer; d: TDirection; m: ^TPlayerModelInfo;
begin
+ ASSERT(i < Length(Models));
+ ASSERT(i < Length(PlayerModelsArray));
+ r_Map_FreeModel(i);
m := @PlayerModelsArray[i];
prefix := m.FileName + ':TEXTURES/';
for d := TDirection.D_LEFT to TDirection.D_RIGHT do
Models[i].anim[d, a].mask := r_Textures_LoadMultiFromFileAndInfo(prefix + m.anim[d, a].mask, 64, 64, m.anim[d, a].frames, m.anim[d, a].back, true);
end
end;
-(*
{$IFDEF ENABLE_GIBS}
- Models[i].gibs := nil;
+ Models[i].gibs.base := nil;
+ Models[i].gibs.mask := nil;
+ Models[i].gibs.rect := nil;
if m.GibsCount > 0 then
begin
- SetLength(Models[i].gibs, m.GibsCount);
+ SetLength(Models[i].gibs.base, m.GibsCount);
+ SetLength(Models[i].gibs.mask, m.GibsCount);
+ SetLength(Models[i].gibs.rect, m.GibsCount);
+ for a := 0 to m.GibsCount - 1 do
+ Models[i].gibs.rect[a] := DefaultGibSize;
+ if r_Textures_LoadStreamFromFile(prefix + m.GibsResource, 32, 32, m.GibsCount, Models[i].gibs.base, Models[i].gibs.rect) then
+ begin
+ if r_Textures_LoadStreamFromFile(prefix + m.GibsMask, 32, 32, m.GibsCount, Models[i].gibs.mask, nil) then
+ begin
+ // ok
+ end;
+ end;
+ for a := 0 to m.GibsCount - 1 do
+ e_logwritefln('model %s gib %s: %sx%s:%sx%s', [i, a, Models[i].gibs.rect[a].x, Models[i].gibs.rect[a].y, Models[i].gibs.rect[a].width, Models[i].gibs.rect[a].height]);
end;
{$ENDIF}
-*)
end;
+ procedure r_Map_LoadMonsterAnim (m, a: Integer; d: TDirection);
+ const dir: array [TDirection] of AnsiString = ('_L', '');
+ var w, h, count: Integer;
+ begin
+ count := MONSTER_ANIMTABLE[m].AnimCount[a];
+ if count > 0 then
+ begin
+ w := MTABLE[m].w;
+ h := MTABLE[m].h;
+ if (m = MONSTER_SOUL) and (a = ANIM_DIE) then
+ begin
+ // special case
+ w := 128;
+ h := 128;
+ end;
+ MonTextures[m, a, d] := r_Textures_LoadMultiFromFileAndInfo(
+ GameWAD + ':MTEXTURES/' + MONSTERTABLE[m].name + '_' + ANIMTABLE[a].name + dir[d],
+ w,
+ h,
+ count,
+ False,
+ False
+ );
+ end
+ else
+ MonTextures[m, a, d] := nil;
+ end;
procedure r_Map_Load;
const
WeapAct: array [0..W_ACT_LAST] of AnsiString = ('', '_FIRE');
var
i, j, k: Integer; d: TDirection;
-
- procedure LoadItem (i: Integer; const name: AnsiString; w, h, delay, count: Integer; backanim: Boolean);
- begin
- ASSERT(i >= 0);
- ASSERT(i <= ITEM_MAX);
- Items[i].tex := r_Textures_LoadMultiFromFileAndInfo(GameWAD + ':TEXTURES/' + name, w, h, count, backanim, false);
- if backanim then count := count * 2 - 2;
- Items[i].anim := TAnimState.Create(True, delay, count);
- ASSERT(Items[i].tex <> NIL);
- end;
-
- procedure LoadMonster (m, a: Integer; d: TDirection);
- const
- dir: array [TDirection] of AnsiString = ('_L', '');
- var
- w, h, count: Integer;
+ begin
+ // --------- items --------- //
+ for i := 0 to ITEM_LAST do
begin
- count := MONSTER_ANIMTABLE[m].AnimCount[a];
- if count > 0 then
+ if ItemAnim[i].n > 0 then
begin
- w := MTABLE[m].w;
- h := MTABLE[m].h;
- if (m = MONSTER_SOUL) and (a = ANIM_DIE) then
- begin
- // special case
- w := 128;
- h := 128;
- end;
- MonTextures[m, a, d] := r_Textures_LoadMultiFromFileAndInfo(
- GameWAD + ':MTEXTURES/' + MONSTERTABLE[m].name + '_' + ANIMTABLE[a].name + dir[d],
- w,
- h,
- count,
- False,
- False
- )
- end
- else
- MonTextures[m, a, d] := nil
+ Items[i].tex := r_Textures_LoadMultiFromFileAndInfo(
+ GameWAD + ':TEXTURES/' + ItemAnim[i].name,
+ ItemAnim[i].w,
+ ItemAnim[i].h,
+ ItemAnim[i].n,
+ ItemAnim[i].b,
+ false
+ );
+ k := IfThen(ItemAnim[i].b, ItemAnim[i].n * 2 - 2, ItemAnim[i].n);
+ Items[i].anim := TAnimState.Create(True, ItemAnim[i].d, k);
+ end;
end;
-
- begin
- // --------- items --------- //
- // i name w h d n backanim
- LoadItem(ITEM_NONE, 'NOTEXTURE', 16, 16, 0, 1, False);
- LoadItem(ITEM_MEDKIT_SMALL, 'MED1', 16, 16, 0, 1, False);
- LoadItem(ITEM_MEDKIT_LARGE, 'MED2', 32, 32, 0, 1, False);
- LoadItem(ITEM_MEDKIT_BLACK, 'BMED', 32, 32, 0, 1, False);
- LoadItem(ITEM_ARMOR_GREEN, 'ARMORGREEN', 32, 16, 20, 3, True);
- LoadItem(ITEM_ARMOR_BLUE, 'ARMORBLUE', 32, 16, 20, 3, True);
- LoadItem(ITEM_SPHERE_BLUE, 'SBLUE', 32, 32, 15, 4, True);
- LoadItem(ITEM_SPHERE_WHITE, 'SWHITE', 32, 32, 20, 4, True);
- LoadItem(ITEM_SUIT, 'SUIT', 32, 64, 0, 1, False);
- LoadItem(ITEM_OXYGEN, 'OXYGEN', 16, 32, 0, 1, False);
- LoadItem(ITEM_INVUL, 'INVUL', 32, 32, 20, 4, True);
- LoadItem(ITEM_WEAPON_SAW, 'SAW', 64, 32, 0, 1, False);
- LoadItem(ITEM_WEAPON_SHOTGUN1, 'SHOTGUN1', 64, 16, 0, 1, False);
- LoadItem(ITEM_WEAPON_SHOTGUN2, 'SHOTGUN2', 64, 16, 0, 1, False);
- LoadItem(ITEM_WEAPON_CHAINGUN, 'MGUN', 64, 16, 0, 1, False);
- LoadItem(ITEM_WEAPON_ROCKETLAUNCHER, 'RLAUNCHER', 64, 16, 0, 1, False);
- LoadItem(ITEM_WEAPON_PLASMA, 'PGUN', 64, 16, 0, 1, False);
- LoadItem(ITEM_WEAPON_BFG, 'BFG', 64, 64, 0, 1, False);
- LoadItem(ITEM_WEAPON_SUPERPULEMET, 'SPULEMET', 64, 16, 0, 1, False);
- LoadItem(ITEM_AMMO_BULLETS, 'CLIP', 16, 16, 0, 1, False);
- LoadItem(ITEM_AMMO_BULLETS_BOX, 'AMMO', 32, 16, 0, 1, False);
- LoadItem(ITEM_AMMO_SHELLS, 'SHELL1', 16, 8, 0, 1, False);
- LoadItem(ITEM_AMMO_SHELLS_BOX, 'SHELL2', 32, 16, 0, 1, False);
- LoadItem(ITEM_AMMO_ROCKET, 'ROCKET', 16, 32, 0, 1, False);
- LoadItem(ITEM_AMMO_ROCKET_BOX, 'ROCKETS', 64, 32, 0, 1, False);
- LoadItem(ITEM_AMMO_CELL, 'CELL', 16, 16, 0, 1, False);
- LoadItem(ITEM_AMMO_CELL_BIG, 'CELL2', 32, 32, 0, 1, False);
- LoadItem(ITEM_AMMO_BACKPACK, 'BPACK', 32, 32, 0, 1, False);
- LoadItem(ITEM_KEY_RED, 'KEYR', 16, 16, 0, 1, False);
- LoadItem(ITEM_KEY_GREEN, 'KEYG', 16, 16, 0, 1, False);
- LoadItem(ITEM_KEY_BLUE, 'KEYB', 16, 16, 0, 1, False);
- LoadItem(ITEM_WEAPON_KASTET, 'KASTET', 64, 32, 0, 1, False);
- LoadItem(ITEM_WEAPON_PISTOL, 'PISTOL', 64, 16, 0, 1, False);
- LoadItem(ITEM_BOTTLE, 'BOTTLE', 16, 32, 20, 4, True);
- LoadItem(ITEM_HELMET, 'HELMET', 16, 16, 20, 4, True);
- LoadItem(ITEM_JETPACK, 'JETPACK', 32, 32, 15, 3, True);
- LoadItem(ITEM_INVIS, 'INVIS', 32, 32, 20, 4, True);
- LoadItem(ITEM_WEAPON_FLAMETHROWER, 'FLAMETHROWER', 64, 32, 0, 1, False);
- LoadItem(ITEM_AMMO_FUELCAN, 'FUELCAN', 16, 32, 0, 1, False);
- // fill with NOTEXURE forgotten item
- for i := ITEM_AMMO_FUELCAN + 1 to ITEM_MAX do
- LoadItem(i,'NOTEXTURE', 16, 16, 0, 1, False);
// --------- monsters --------- //
for i := MONSTER_DEMON to MONSTER_MAN do
for j := 0 to ANIM_LAST do
for d := TDirection.D_LEFT to TDirection.D_RIGHT do
- LoadMonster(i, j, d);
+ r_Map_LoadMonsterAnim(i, j, d);
VileFire := r_Textures_LoadMultiFromFileAndInfo(GameWAD + ':TEXTURES/FIRE', 64, 128, 8, False, False);
// --------- player models --------- //
if PlayerModelsArray <> nil then
FlagTextures[FLAG_RED] := r_Textures_LoadMultiFromFileAndInfo(GameWad + ':TEXTURES/FLAGRED', 64, 64, 5, false);
FlagTextures[FLAG_BLUE] := r_Textures_LoadMultiFromFileAndInfo(GameWad + ':TEXTURES/FLAGBLUE', 64, 64, 5, false);
// FlagTextures[FLAG_DOM] := r_Textures_LoadMultiFromFileAndInfo(GameWad + ':TEXTURES/FLAGDOM', 64, 64, 8, false);
+ // --------- shells --------- //
+ {$IFDEF ENABLE_SHELLS}
+ for i := 0 to SHELL_LAST do
+ ShellTextures[i] := r_Textures_LoadFromFile(GameWad + ':TEXTURES/' + ShellAnim[i].name);
+ {$ENDIF}
end;
procedure r_Map_Free;
var i, j, k, a: Integer; d: TDirection;
begin
+ {$IFDEF ENABLE_SHELLS}
+ for i := 0 to SHELL_LAST do
+ begin
+ if ShellTextures[i] <> nil then
+ ShellTextures[i].Free;
+ ShellTextures[i] := nil;
+ end;
+ {$ENDIF}
for i := 0 to FLAG_LAST do
begin
if FlagTextures[i] <> nil then
end;
end;
end;
- for d := TDirection.D_LEFT to TDirection.D_RIGHT do
- begin
- for a := A_STAND to A_LAST do
- begin
- if Models[i].anim[d, a].base <> nil then
- Models[i].anim[d, a].base.Free;
- if Models[i].anim[d, a].mask <> nil then
- Models[i].anim[d, a].mask.Free;
- Models[i].anim[d, a].base := nil;
- Models[i].anim[d, a].mask := nil;
- end;
- end;
+ if Models <> nil then
+ for i := 0 to High(Models) do
+ r_Map_FreeModel(i);
for i := MONSTER_DEMON to MONSTER_MAN do
begin
for j := 0 to ANIM_LAST do
end;
end;
end;
- for i := 0 to ITEM_MAX do
+ for i := 0 to ITEM_LAST do
begin
if Items[i].tex <> nil then
begin
for i := 0 to High(ggItems) do
begin
it := @ggItems[i];
- if it.used and it.alive and (it.dropped = drop) and (it.ItemType <> ITEM_NONE) then
+ if it.used and it.alive and (it.dropped = drop) and (it.ItemType > ITEM_NONE) and (it.ItemType <= ITEM_LAST) then
begin
t := Items[it.ItemType].tex;
if g_Collide(it.obj.x, it.obj.y, t.width, t.height, x, y, w, h) then
r_Map_DrawPlayer(gPlayers[i]);
end;
+{$IFDEF ENABLE_GIBS}
+ function r_Map_GetGibSize (m, i: Integer): TRectWH;
+ begin
+ result := Models[m].gibs.rect[i];
+ end;
+
+ procedure r_Map_DrawGibs (x, y, w, h: Integer);
+ var i, fx, fy, m, id, rx, ry, ra: Integer; p: PObj; t: TGLTexture;
+ begin
+ if gGibs <> nil then
+ begin
+ for i := 0 to High(gGibs) do
+ begin
+ if gGibs[i].alive then
+ begin
+ p := @gGibs[i].Obj;
+ if g_Obj_Collide(x, y, w, h, p) then
+ begin
+ p.Lerp(gLerpFactor, fx, fy);
+ id := gGibs[i].GibID;
+ m := gGibs[i].ModelID;
+ t := Models[m].gibs.base[id];
+ if t <> nil then
+ begin
+ rx := p.Rect.X + p.Rect.Width div 2;
+ ry := p.Rect.Y + p.Rect.Height div 2;
+ ra := gGibs[i].RAngle;
+ r_Draw_TextureRepeatRotate(t, fx, fy, t.width, t.height, false, 255, 255, 255, 255, false, rx, ry, ra);
+ t := Models[m].gibs.mask[id];
+ if t <> nil then
+ r_Draw_TextureRepeatRotate(t, fx, fy, t.width, t.height, false, gGibs[i].Color.R, gGibs[i].Color.G, gGibs[i].Color.B, 255, false, rx, ry, ra);
+ // r_Draw_TextureRepeatRotate(nil, fx + p.Rect.X, fy + p.Rect.Y, p.Rect.Width, p.Rect.Height, false, 255, 255, 255, 255, false, p.Rect.Width div 2, p.Rect.Height div 2, ra);
+ end;
+ end;
+ end;
+ end;
+ end;
+ end;
+{$ENDIF}
+
{$IFDEF ENABLE_CORPSES}
procedure r_Map_DrawCorpses (x, y, w, h: Integer);
var i, fX, fY: Integer; p: TCorpse;
end;
end;
+{$IFDEF ENABLE_SHELLS}
+ procedure r_Map_DrawShells (x, y, w, h: Integer);
+ var i, fx, fy, typ: Integer; t: TGLTexture; p: PObj;
+ begin
+ if gShells <> nil then
+ begin
+ for i := 0 to High(gShells) do
+ begin
+ if gShells[i].alive then
+ begin
+ typ := gShells[i].SType;
+ if typ <= SHELL_LAST then
+ begin
+ p := @gShells[i].Obj;
+ if g_Obj_Collide(x, y, w, h, p) then
+ begin
+ t := ShellTextures[typ];
+ if t <> nil then
+ begin
+ p.Lerp(gLerpFactor, fx, fy);
+ r_Draw_TextureRepeatRotate(t, fx, fy, t.width, t.height, false, 255, 255, 255, 255, false, ShellAnim[typ].dx, ShellAnim[typ].dy, gShells[i].RAngle);
+ end;
+ end;
+ end;
+ end;
+ end;
+ end;
+ end;
+{$ENDIF}
+
procedure r_Map_Draw (x, y, w, h, camx, camy: Integer);
var iter: TPanelGrid.Iter; p: PPanel; cx, cy, xx, yy, ww, hh: Integer;
begin
r_Map_DrawPanelType(PANEL_STEP);
r_Map_DrawItems(xx, yy, ww, hh, false);
r_Map_DrawShots(xx, yy, ww, hh);
- // TODO draw shells
+ {$IFDEF ENABLE_SHELLS}
+ r_Map_DrawShells(xx, yy, ww, hh);
+ {$ENDIF}
r_Map_DrawPlayers(xx, yy, ww, hh);
- // TODO draw gibs
+ {$IFDEF ENABLE_GIBS}
+ r_Map_DrawGibs(xx, yy, ww, hh);
+ {$ENDIF}
{$IFDEF ENABLE_CORPSES}
r_Map_DrawCorpses(xx, yy, ww, hh);
{$ENDIF}
procedure r_Map_Update;
var i: Integer;
begin
- for i := 0 to ITEM_MAX do
+ for i := 0 to ITEM_LAST do
Items[i].anim.Update;
r_Map_UpdateGFX;
FlagAnim.Update;