diff --git a/src/game/g_map.pas b/src/game/g_map.pas
index 2b8e9ff34d5875ab0042b71f15b9936bfb680e97..722bd9bb1cdc2a8cf6625a9399795176a29979ea 100644 (file)
--- a/src/game/g_map.pas
+++ b/src/game/g_map.pas
if g_Game_IsClient then Exit;
if (gGameSettings.GameType = GT_SINGLE)
if g_Game_IsClient then Exit;
if (gGameSettings.GameType = GT_SINGLE)
- or LongBool(gGameSettings.Options and GAME_OPTION_MONSTERS) then
+ or (TGameOption.MONSTERS in gGameSettings.Options) then
begin
mon := g_Monsters_Create(monster.MonsterType, monster.X, monster.Y, TDirection(monster.Direction));
begin
mon := g_Monsters_Create(monster.MonsterType, monster.X, monster.Y, TDirection(monster.Direction));
cnt := -1;
for rec in mapTextureList do
begin
cnt := -1;
for rec in mapTextureList do
begin
- Inc(cnt);
+ cnt += 1;
if not usedTextures.has(toLowerCase1251(rec.Resource)) then
begin
rec.tagInt := -1; // just in case
if not usedTextures.has(toLowerCase1251(rec.Resource)) then
begin
rec.tagInt := -1; // just in case
e_LogWritefln(' Loading texture #%d: %s', [cnt, rec.Resource]);
{$ENDIF}
//if g_Map_IsSpecialTexture(s) then e_WriteLog(' SPECIAL!', MSG_NOTIFY);
e_LogWritefln(' Loading texture #%d: %s', [cnt, rec.Resource]);
{$ENDIF}
//if g_Map_IsSpecialTexture(s) then e_WriteLog(' SPECIAL!', MSG_NOTIFY);
+ // TODO: Unify the texture reader - static textures are a special case of dynamic ones, just with only one frame.
if rec.Anim then
begin
// Àíèìèðîâàííàÿ òåêñòóðà
ntn := CreateAnimTexture(rec.Resource, FileName, True);
if rec.Anim then
begin
// Àíèìèðîâàííàÿ òåêñòóðà
ntn := CreateAnimTexture(rec.Resource, FileName, True);
- if (ntn < 0) then g_SimpleError(Format(_lc[I_GAME_ERROR_TEXTURE_ANIM], [rec.Resource]));
+ if (ntn < 0) then
+ begin
+ // FIXME: I think, CreateAnimTexture() will load static textures too, just as animated ones with one frame.
+ ntn := CreateTexture(rec.Resource, FileName, False);
+ if (ntn < 0) then
+ g_SimpleError(Format(_lc[I_GAME_ERROR_TEXTURE_ANIM], [rec.Resource]))
+ else
+ begin
+ rec.user['animated'] := False;
+ e_LogWritefln(' wrong (outdated?) anim flag hint - texture #%d is actually static: %s', [cnt, rec.Resource]);
+ end;
+ end;
end
else
begin
// Îáû÷íàÿ òåêñòóðà
ntn := CreateTexture(rec.Resource, FileName, True);
end
else
begin
// Îáû÷íàÿ òåêñòóðà
ntn := CreateTexture(rec.Resource, FileName, True);
- if (ntn < 0) then g_SimpleError(Format(_lc[I_GAME_ERROR_TEXTURE_SIMPLE], [rec.Resource]));
+ if (ntn < 0) then
+ begin
+ ntn := CreateAnimTexture(rec.Resource, FileName, False);
+ if (ntn < 0) then
+ g_SimpleError(Format(_lc[I_GAME_ERROR_TEXTURE_SIMPLE], [rec.Resource]))
+ else
+ begin
+ rec.user['animated'] := True;
+ e_LogWritefln(' wrong (outdated?) anim flag hint - texture #%d is actually animated: %s', [cnt, rec.Resource]);
+ end;
+ end;
end;
if (ntn < 0) then ntn := CreateNullTexture(rec.Resource);
end;
if (ntn < 0) then ntn := CreateNullTexture(rec.Resource);