diff --git a/src/game/g_map.pas b/src/game/g_map.pas
index 9a51d3b66ef9202f389ca80c2ddd553fb5b52163..c93344a6e41fb74e7125fb08afb7bff525d906d1 100644 (file)
--- a/src/game/g_map.pas
+++ b/src/game/g_map.pas
uses
SysUtils, Classes, mempool,
- g_base, g_basic, MAPDEF, g_textures,
+ g_base, g_basic, MAPDEF,
g_phys, utils, g_panel, g_grid, md5, binheap, xprofiler, xparser, xdynrec;
type
FLAG_RED = 1;
FLAG_BLUE = 2;
FLAG_DOM = 3;
+ FLAG_LAST = FLAG_DOM;
FLAG_STATE_NONE = 0;
FLAG_STATE_NORMAL = 1;
gExternalResources: array of TDiskFileInfo = nil;
gMovingWallIds: array of Integer = nil;
- gdbg_map_use_accel_render: Boolean = true;
gdbg_map_use_accel_coldet: Boolean = true;
profMapCollision: TProfiler = nil; //WARNING: FOR DEBUGGING ONLY!
{$ENDIF}
e_input, e_log, e_res, g_items, g_console,
g_weapons, g_game, g_sound, e_sound, CONFIG,
- g_options, g_triggers, g_player,
+ g_options, g_triggers, g_player, g_window,
Math, g_monsters, g_saveload, g_language, g_netmsg,
sfs, xstreams, hashtable, wadreader,
g_res_downloader
function CreateTexture (RecName: AnsiString; Map: String; log: Boolean): Integer;
var
HName: AnsiString;
- WAD, WADz: TWADFile;
+ WAD: TWADFile;
WADName, ResName: String;
- ResData, ReszData: Pointer;
- ResLen, ReszLen: Integer;
- cfg: TConfig;
+ ResData: Pointer;
+ ResLen: Integer;
id: Integer;
begin
Result := -1;
begin
if WAD.GetResource(ResName, ResData, ResLen, log) then
begin
- if IsWadData(ResData, ResLen) then
- begin
- WADz := TWADFile.Create();
- if WADz.ReadMemory(ResData, ResLen) then
- begin
- if WADz.GetResource('TEXT/ANIM', ReszData, ReszLen) then
- begin
- cfg := TConfig.CreateMem(ReszData, ReszLen);
- if cfg <> nil then
- begin
- SetLength(Textures, Length(Textures) + 1);
- Textures[High(Textures)].TextureName := RecName;
- Textures[High(Textures)].FullName := WadName + ':' + ResName;
- Textures[High(Textures)].FramesCount := cfg.ReadInt('', 'framecount', 0);
- Textures[High(Textures)].Speed := cfg.ReadInt('', 'waitcount', 0);
- Result := High(Textures);
- TextNameHash.put(HName, result);
- cfg.Free;
- end;
- FreeMem(ReszData);
- end
- end;
- WADz.Free;
- end
- else
- begin
- SetLength(Textures, Length(Textures) + 1);
- Textures[High(Textures)].FullName := WADName + ':' + ResName;
- Textures[High(Textures)].TextureName := RecName;
- Result := High(Textures);
- TextNameHash.put(HName, result);
- end;
+ SetLength(Textures, Length(Textures) + 1);
+ Textures[High(Textures)].FullName := WADName + ':' + ResName;
+ Textures[High(Textures)].TextureName := RecName;
+ Result := High(Textures);
+ TextNameHash.put(HName, result);
FreeMem(ResData);
- end
+ end;
end;
WAD.Free;
end
tp := g_Map_PanelByGUID(pguid);
if (tp = nil) then exit;
tp.NextTexture(AnimLoop);
- if g_Game_IsServer and g_Game_IsNet then MH_SEND_PanelTexture(pguid, AnimLoop);
+ if g_Game_IsServer and g_Game_IsNet then MH_SEND_PanelTexture(pguid);
end;