diff --git a/src/game/g_map.pas b/src/game/g_map.pas
index e976be49c616045a92b12fd0b2c4844fd9227be2..5d4f8d87cb5b0ab9a7a9c615b429496d1a6f572f 100644 (file)
--- a/src/game/g_map.pas
+++ b/src/game/g_map.pas
interface
uses
- e_graphics, g_basic, MAPDEF, g_textures, Classes,
- g_phys, wadreader, BinEditor, g_panel, g_grid, md5, binheap, xprofiler, xparser, xdynrec;
+ SysUtils, Classes,
+ e_graphics, g_basic, MAPDEF, g_textures,
+ g_phys, wadreader, g_panel, g_grid, md5, binheap, xprofiler, xparser, xdynrec;
type
TMapInfo = record
function g_Map_PanelByGUID (aguid: Integer): TPanel; inline;
-procedure g_Map_DrawPanels (PanelType: Word); // unaccelerated
+procedure g_Map_DrawPanels (PanelType: Word; hasAmbient: Boolean; constref ambColor: TDFColor); // unaccelerated
procedure g_Map_CollectDrawPanels (x0, y0, wdt, hgt: Integer);
procedure g_Map_DrawBack(dx, dy: Integer);
procedure g_Map_DisableWall_XXX (ID: DWORD);
procedure g_Map_SetLift_XXX (ID: DWORD; t: Integer);
-procedure g_Map_SwitchTextureGUID (PanelType: Word; pguid: Integer; AnimLoop: Byte = 0);
+procedure g_Map_SwitchTextureGUID (pguid: Integer; AnimLoop: Byte = 0);
procedure g_Map_ReAdd_DieTriggers();
function g_Map_IsSpecialTexture(Texture: String): Boolean;
procedure g_Map_ResetFlag(Flag: Byte);
procedure g_Map_DrawFlags();
-procedure g_Map_SaveState(Var Mem: TBinMemoryWriter);
-procedure g_Map_LoadState(Var Mem: TBinMemoryReader);
+procedure g_Map_SaveState (st: TStream);
+procedure g_Map_LoadState (st: TStream);
procedure g_Map_DrawPanelShadowVolumes(lightX: Integer; lightY: Integer; radius: Integer);
implementation
uses
- e_input, g_main, e_log, SysUtils, g_items, g_gfx, g_console,
+ e_input, g_main, e_log, e_texture, g_items, g_gfx, g_console,
GL, GLExt, g_weapons, g_game, g_sound, e_sound, CONFIG,
g_options, g_triggers, g_player,
Math, g_monsters, g_saveload, g_language, g_netmsg,
end;
end;
-function CreateTrigger (amapIdx: Integer; Trigger: TDynRecord; atpanid, atrigpanid: Integer; fTexturePanel1Type, fTexturePanel2Type: Word): Integer;
+function CreateTrigger (amapIdx: Integer; Trigger: TDynRecord; atpanid, atrigpanid: Integer): Integer;
var
_trigger: TTrigger;
begin
Width := Trigger.Width;
Height := Trigger.Height;
Enabled := Trigger.Enabled;
- //TexturePanel := Trigger.TexturePanel;
TexturePanelGUID := atpanid;
- TexturePanelType := fTexturePanel1Type;
- ShotPanelType := fTexturePanel2Type;
TriggerType := Trigger.TriggerType;
ActivateType := Trigger.ActivateType;
Keys := Trigger.Keys;
trigPanelGUID := atrigpanid;
- //trigShotPanelId := ashotpanid;
- //Data.Default := Trigger.DATA;
- if (Trigger.trigRec = nil) then
- begin
- trigDataRec := nil;
- //HACK!
- if (TriggerType <> TRIGGER_SECRET) then
- begin
- e_LogWritefln('trigger of type %s has no triggerdata; wtf?!', [TriggerType], MSG_WARNING);
- end;
- end
- else
- begin
- trigDataRec := Trigger.trigRec.clone(nil);
- end;
end;
- result := Integer(g_Triggers_Create(_trigger));
+ result := Integer(g_Triggers_Create(_trigger, Trigger));
end;
procedure CreateMonster(monster: TDynRecord);
//TexturePanel: Integer;
tnum: Integer;
id: Integer;
- texPanIdx: Integer;
- LiftPanelIdx: Integer;
- DoorPanelIdx: Integer;
- ShotPanelIdx: Integer;
- MPlatPanelIdx: Integer;
trigrec: TDynRecord;
- texPan: TDynRecord;
- liftPan: TDynRecord;
- doorPan: TDynRecord;
- shotPan: TDynRecord;
- mplatPan: TDynRecord;
+ // texture pane;
+ texPanelIdx: Integer;
+ texPanel: TDynRecord;
+ // "action" panel
+ actPanelIdx: Integer;
+ actPanel: TDynRecord;
end;
var
WAD: TWADFile;
- mapReader: TDynRecord = nil;
+ //mapReader: TDynRecord = nil;
mapTextureList: TDynField = nil; //TTexturesRec1Array; tagInt: texture index
panels: TDynField = nil; //TPanelsRec1Array;
items: TDynField = nil; //TItemsRec1Array;
moveSpeed{, moveStart, moveEnd}: TDFPoint;
//moveActive: Boolean;
pan: TPanel;
+ mapOk: Boolean = false;
begin
mapGrid.Free();
mapGrid := nil;
- gCurrentMap.Free();
- gCurrentMap := nil;
+ //gCurrentMap.Free();
+ //gCurrentMap := nil;
panByGUID := nil;
Result := False;
gMapInfo.Map := Res;
TriggersTable := nil;
- mapReader := nil;
+ //mapReader := nil;
sfsGCDisable(); // temporary disable removing of temporary volumes
try
- // Çàãðóçêà WAD:
- FileName := g_ExtractWadName(Res);
- e_WriteLog('Loading map WAD: '+FileName, MSG_NOTIFY);
- g_Game_SetLoadingText(_lc[I_LOAD_WAD_FILE], 0, False);
-
- WAD := TWADFile.Create();
- if not WAD.ReadFile(FileName) then
+ // Çàãðóçêà WAD (åñëè ó íàñ íåò óæå çàãðóæåíîé êàðòû)
+ if (gCurrentMap = nil) then
begin
- g_FatalError(Format(_lc[I_GAME_ERROR_MAP_WAD], [FileName]));
- WAD.Free();
- Exit;
- end;
+ FileName := g_ExtractWadName(Res);
+ e_WriteLog('Loading map WAD: '+FileName, MSG_NOTIFY);
+ g_Game_SetLoadingText(_lc[I_LOAD_WAD_FILE], 0, False);
+
+ WAD := TWADFile.Create();
+ if not WAD.ReadFile(FileName) then
+ begin
+ g_FatalError(Format(_lc[I_GAME_ERROR_MAP_WAD], [FileName]));
+ WAD.Free();
+ Exit;
+ end;
+
+ //k8: why loader ignores path here?
+ mapResName := g_ExtractFileName(Res);
+ if not WAD.GetMapResource(mapResName, Data, Len) then
+ begin
+ g_FatalError(Format(_lc[I_GAME_ERROR_MAP_RES], [mapResName]));
+ WAD.Free();
+ Exit;
+ end;
- //k8: why loader ignores path here?
- mapResName := g_ExtractFileName(Res);
- if not WAD.GetMapResource(mapResName, Data, Len) then
- begin
- g_FatalError(Format(_lc[I_GAME_ERROR_MAP_RES], [mapResName]));
WAD.Free();
- Exit;
- end;
- WAD.Free();
+ if (Len < 4) then
+ begin
+ e_LogWritefln('invalid map file: ''%s''', [mapResName]);
+ FreeMem(Data);
+ exit;
+ end;
- if (Len < 4) then
- begin
- e_LogWritefln('invalid map file: ''%s''', [mapResName]);
- FreeMem(Data);
- exit;
- end;
+ // Çàãðóçêà êàðòû:
+ e_LogWritefln('Loading map: %s', [mapResName], MSG_NOTIFY);
+ g_Game_SetLoadingText(_lc[I_LOAD_MAP], 0, False);
- // Çàãðóçêà êàðòû:
- e_LogWritefln('Loading map: %s', [mapResName], MSG_NOTIFY);
- g_Game_SetLoadingText(_lc[I_LOAD_MAP], 0, False);
+ stt := getTimeMicro();
- stt := curTimeMicro();
+ try
+ gCurrentMap := g_Map_ParseMap(Data, Len);
+ except
+ gCurrentMap.Free();
+ g_FatalError(Format(_lc[I_GAME_ERROR_MAP_LOAD], [Res]));
+ FreeMem(Data);
+ gCurrentMapFileName := '';
+ Exit;
+ end;
- try
- mapReader := g_Map_ParseMap(Data, Len);
- except
- mapReader.Free();
- g_FatalError(Format(_lc[I_GAME_ERROR_MAP_LOAD], [Res]));
FreeMem(Data);
- Exit;
- end;
- FreeMem(Data);
-
- if (mapReader = nil) then
+ if (gCurrentMap = nil) then
+ begin
+ e_LogWritefln('invalid map file: ''%s''', [mapResName]);
+ gCurrentMapFileName := '';
+ exit;
+ end;
+ end
+ else
begin
- e_LogWritefln('invalid map file: ''%s''', [mapResName]);
- exit;
+ stt := getTimeMicro();
end;
- generateExternalResourcesList(mapReader);
- mapTextureList := mapReader['texture'];
+ //gCurrentMap := mapReader;
+
+ generateExternalResourcesList(gCurrentMap);
+ mapTextureList := gCurrentMap['texture'];
// get all other lists here too
- panels := mapReader['panel'];
- triggers := mapReader['trigger'];
- items := mapReader['item'];
- areas := mapReader['area'];
- monsters := mapReader['monster'];
+ panels := gCurrentMap['panel'];
+ triggers := gCurrentMap['trigger'];
+ items := gCurrentMap['item'];
+ areas := gCurrentMap['area'];
+ monsters := gCurrentMap['monster'];
// Çàãðóçêà îïèñàíèÿ êàðòû:
e_WriteLog(' Reading map info...', MSG_NOTIFY);
with gMapInfo do
begin
- Name := mapReader.MapName;
- Description := mapReader.MapDesc;
- Author := mapReader.MapAuthor;
- MusicName := mapReader.MusicName;
- SkyName := mapReader.SkyName;
- Height := mapReader.Height;
- Width := mapReader.Width;
+ Name := gCurrentMap.MapName;
+ Description := gCurrentMap.MapDesc;
+ Author := gCurrentMap.MapAuthor;
+ MusicName := gCurrentMap.MusicName;
+ SkyName := gCurrentMap.SkyName;
+ Height := gCurrentMap.Height;
+ Width := gCurrentMap.Width;
end;
// Çàãðóçêà òåêñòóð:
begin
e_WriteLog('error loading map: invalid texture index for panel', MSG_FATALERROR);
result := false;
+ gCurrentMap.Free();
+ gCurrentMap := nil;
+ gCurrentMapFileName := '';
exit;
end;
end;
//SetLength(TriggersTable, triggers.count);
g_Game_SetLoadingText(_lc[I_LOAD_TRIGGERS_TABLE], triggers.count-1, False);
+ SetLength(TriggersTable, triggers.count);
+ trignum := -1;
for rec in triggers do
begin
- SetLength(TriggersTable, Length(TriggersTable)+1);
- pttit := @TriggersTable[High(TriggersTable)];
+ Inc(trignum);
+ pttit := @TriggersTable[trignum];
pttit.trigrec := rec;
// Ñìåíà òåêñòóðû (âîçìîæíî, êíîïêè)
- pttit.texPan := mapReader.panel[rec.TexturePanel];
- pttit.liftPan := nil;
- pttit.doorPan := nil;
- pttit.shotPan := nil;
- pttit.mplatPan := nil;
- pttit.texPanIdx := -1;
- pttit.LiftPanelIdx := -1;
- pttit.DoorPanelIdx := -1;
- pttit.ShotPanelIdx := -1;
- pttit.MPlatPanelIdx := -1;
- // Ëèôòû
- if rec.TriggerType in [TRIGGER_LIFTUP, TRIGGER_LIFTDOWN, TRIGGER_LIFT] then
- begin
- pttit.liftPan := mapReader.panel[rec.trigRec.tgPanelID];
- end;
- // Äâåðè
- if rec.TriggerType in [TRIGGER_OPENDOOR, TRIGGER_CLOSEDOOR, TRIGGER_DOOR, TRIGGER_DOOR5, TRIGGER_CLOSETRAP, TRIGGER_TRAP] then
- begin
- pttit.doorPan := mapReader.panel[rec.trigRec.tgPanelID];
- end;
- // Òóðåëü
- if (rec.TriggerType = TRIGGER_SHOT) then
- begin
- pttit.shotPan := mapReader.panel[rec.trigRec.tgShotPanelID];
- end;
- //
- if rec.TriggerType in [TRIGGER_PRESS, TRIGGER_ON, TRIGGER_OFF, TRIGGER_ONOFF] then
- begin
- pttit.mplatPan := mapReader.panel[rec.trigRec.tgPanelID];
- end;
-
- if (pttit.texPan <> nil) then pttit.texPan.userPanelTrigRef := true;
- if (pttit.liftPan <> nil) then pttit.liftPan.userPanelTrigRef := true;
- if (pttit.doorPan <> nil) then pttit.doorPan.userPanelTrigRef := true;
- if (pttit.shotPan <> nil) then pttit.shotPan.userPanelTrigRef := true;
- if (pttit.mplatPan <> nil) then pttit.mplatPan.userPanelTrigRef := true;
-
+ pttit.texPanelIdx := -1; // will be fixed later
+ pttit.texPanel := rec.TexturePanelRec;
+ // action panel
+ pttit.actPanelIdx := -1;
+ if (rec.trigRec <> nil) then pttit.actPanel := rec.trigRec.tgPanelRec else pttit.actPanel := nil;
+ // set flag
+ if (pttit.texPanel <> nil) then pttit.texPanel.userPanelTrigRef := true;
+ if (pttit.actPanel <> nil) then pttit.actPanel.userPanelTrigRef := true;
+ // update progress
g_Game_StepLoading();
end;
end;
// ×èíèì ID'û ïàíåëåé, êîòîðûå èñïîëüçóþòñÿ â òðèããåðàõ
for b := 0 to High(TriggersTable) do
begin
- if (TriggersTable[b].texPan <> nil) then TriggersTable[b].texPanIdx := TriggersTable[b].texPan.userPanelId;
- if (TriggersTable[b].liftPan <> nil) then TriggersTable[b].LiftPanelIdx := TriggersTable[b].liftPan.userPanelId;
- if (TriggersTable[b].doorPan <> nil) then TriggersTable[b].DoorPanelIdx := TriggersTable[b].doorPan.userPanelId;
- if (TriggersTable[b].shotPan <> nil) then TriggersTable[b].ShotPanelIdx := TriggersTable[b].shotPan.userPanelId;
- if (TriggersTable[b].mplatPan <> nil) then TriggersTable[b].MPlatPanelIdx := TriggersTable[b].mplatPan.userPanelId;
+ if (TriggersTable[b].texPanel <> nil) then TriggersTable[b].texPanelIdx := TriggersTable[b].texPanel.userPanelId;
+ if (TriggersTable[b].actPanel <> nil) then TriggersTable[b].actPanelIdx := TriggersTable[b].actPanel.userPanelId;
end;
// create map grid, init other grids (for monsters, for example)
for rec in triggers do
begin
Inc(trignum);
- if (TriggersTable[trignum].texPan <> nil) then b := TriggersTable[trignum].texPan.PanelType else b := 0;
- if (TriggersTable[trignum].shotPan <> nil) then c := TriggersTable[trignum].shotPan.PanelType else c := 0;
- // we can have only one of those
- if (TriggersTable[trignum].LiftPanelIdx <> -1) then tgpid := TriggersTable[trignum].LiftPanelIdx
- else if (TriggersTable[trignum].DoorPanelIdx <> -1) then tgpid := TriggersTable[trignum].DoorPanelIdx
- else if (TriggersTable[trignum].ShotPanelIdx <> -1) then tgpid := TriggersTable[trignum].ShotPanelIdx
- else if (TriggersTable[trignum].MPlatPanelIdx <> -1) then tgpid := TriggersTable[trignum].MPlatPanelIdx
- else tgpid := -1;
+ tgpid := TriggersTable[trignum].actPanelIdx;
//e_LogWritefln('creating trigger #%s; texpantype=%s; shotpantype=%s (%d,%d)', [trignum, b, c, TriggersTable[trignum].texPanIdx, TriggersTable[trignum].ShotPanelIdx]);
TriggersTable[trignum].tnum := trignum;
- TriggersTable[trignum].id := CreateTrigger(trignum, rec, TriggersTable[trignum].texPanIdx, tgpid, Word(b), Word(c));
+ TriggersTable[trignum].id := CreateTrigger(trignum, rec, TriggersTable[trignum].texPanelIdx, tgpid);
end;
end;
for rec in monsters do CreateMonster(rec);
end;
- gCurrentMap := mapReader; // this will be our current map now
+ //gCurrentMap := mapReader; // this will be our current map now
gCurrentMapFileName := Res;
- mapReader := nil;
+ //mapReader := nil;
// Çàãðóçêà íåáà
- if gMapInfo.SkyName <> '' then
+ if (gMapInfo.SkyName <> '') then
begin
e_WriteLog(' Loading sky: ' + gMapInfo.SkyName, MSG_NOTIFY);
g_Game_SetLoadingText(_lc[I_LOAD_SKY], 0, False);
FileName := g_ExtractWadName(gMapInfo.SkyName);
- if FileName <> '' then
- FileName := GameDir+'/wads/'+FileName
- else
- begin
- FileName := g_ExtractWadName(Res);
- end;
+ if (FileName <> '') then FileName := GameDir+'/wads/'+FileName else FileName := g_ExtractWadName(Res);
- s := FileName+':'+g_ExtractFilePathName(gMapInfo.SkyName);
- if g_Texture_CreateWAD(BackID, s) then
+ if gTextureFilter then TEXTUREFILTER := GL_LINEAR else TEXTUREFILTER := GL_NEAREST;
+ try
+ s := FileName+':'+g_ExtractFilePathName(gMapInfo.SkyName);
+ if g_Texture_CreateWAD(BackID, s) then
begin
g_Game_SetupScreenSize();
end
- else
- g_FatalError(Format(_lc[I_GAME_ERROR_SKY], [s]));
+ else
+ begin
+ g_FatalError(Format(_lc[I_GAME_ERROR_SKY], [s]));
+ end;
+ finally
+ TEXTUREFILTER := GL_NEAREST;
+ end;
end;
// Çàãðóçêà ìóçûêè
gMusic.SetByName('');
end;
- stt := curTimeMicro()-stt;
+ stt := getTimeMicro()-stt;
e_LogWritefln('map loaded in %s.%s milliseconds', [Integer(stt div 1000), Integer(stt mod 1000)]);
+ mapOk := true;
finally
sfsGCEnable(); // enable releasing unused volumes
- mapReader.Free();
+ //mapReader.Free();
e_ClearInputBuffer(); // why not?
+ if not mapOk then
+ begin
+ gCurrentMap.Free();
+ gCurrentMap := nil;
+ gCurrentMapFileName := '';
+ end;
end;
e_WriteLog('Done loading map.', MSG_NOTIFY);
begin
e_LogWritefln('g_Map_Free: no previous map.', []);
end;
+
if freeTextures then
begin
e_LogWritefln('g_Map_Free: clearing textures...', []);
TextNameHash := nil;
BadTextNameHash.Free();
BadTextNameHash := nil;
+ gCurrentMapFileName := '';
+ gCurrentMap.Free();
+ gCurrentMap := nil;
end;
panByGUID := nil;
// old algo
-procedure g_Map_DrawPanels (PanelType: Word);
+procedure g_Map_DrawPanels (PanelType: Word; hasAmbient: Boolean; constref ambColor: TDFColor);
procedure DrawPanels (constref panels: TPanelArray; drawDoors: Boolean=False);
var
// alas, no visible set
for idx := 0 to High(panels) do
begin
- if not (drawDoors xor panels[idx].Door) then panels[idx].Draw();
+ if not (drawDoors xor panels[idx].Door) then panels[idx].Draw(hasAmbient, ambColor);
end;
end;
end;
end;
-procedure g_Map_SwitchTextureGUID (PanelType: Word; pguid: Integer; AnimLoop: Byte = 0);
+procedure g_Map_SwitchTextureGUID (pguid: Integer; AnimLoop: Byte = 0);
var
tp: TPanel;
begin
tp := g_Map_PanelByGUID(pguid);
if (tp = nil) then exit;
- {
- case PanelType of
- PANEL_WALL, PANEL_OPENDOOR, PANEL_CLOSEDOOR: tp := gWalls[ID];
- PANEL_FORE: tp := gRenderForegrounds[ID];
- PANEL_BACK: tp := gRenderBackgrounds[ID];
- PANEL_WATER: tp := gWater[ID];
- PANEL_ACID1: tp := gAcid1[ID];
- PANEL_ACID2: tp := gAcid2[ID];
- PANEL_STEP: tp := gSteps[ID];
- else exit;
- end;
- }
-
tp.NextTexture(AnimLoop);
if g_Game_IsServer and g_Game_IsNet then MH_SEND_PanelTexture(pguid, AnimLoop);
end;
end;
-procedure g_Map_SaveState (var Mem: TBinMemoryWriter);
+procedure g_Map_SaveState (st: TStream);
var
- dw: DWORD;
- b: Byte;
str: String;
- boo: Boolean;
procedure savePanels ();
var
- PAMem: TBinMemoryWriter;
pan: TPanel;
- count: Integer;
begin
- // Ñîçäàåì íîâûé ñïèñîê ñîõðàíÿåìûõ ïàíåëåé
- PAMem := TBinMemoryWriter.Create((Length(panByGUID)+1) * 40);
-
// Ñîõðàíÿåì ïàíåëè
- count := Length(panByGUID);
- Mem.WriteInt(count);
- for pan in panByGUID do pan.SaveState(PAMem);
-
- // Ñîõðàíÿåì ýòîò ñïèñîê ïàíåëåé
- PAMem.SaveToMemory(Mem);
- PAMem.Free();
+ utils.writeInt(st, LongInt(Length(panByGUID)));
+ for pan in panByGUID do pan.SaveState(st);
end;
- procedure SaveFlag (flag: PFlag);
+ procedure saveFlag (flag: PFlag);
+ var
+ b: Byte;
begin
- // Ñèãíàòóðà ôëàãà
- dw := FLAG_SIGNATURE; // 'FLAG'
- Mem.WriteDWORD(dw);
+ utils.writeSign(st, 'FLAG');
+ utils.writeInt(st, Byte(0)); // version
// Âðåìÿ ïåðåïîÿâëåíèÿ ôëàãà
- Mem.WriteByte(flag^.RespawnType);
+ utils.writeInt(st, Byte(flag^.RespawnType));
// Ñîñòîÿíèå ôëàãà
- Mem.WriteByte(flag^.State);
+ utils.writeInt(st, Byte(flag^.State));
// Íàïðàâëåíèå ôëàãà
if flag^.Direction = D_LEFT then b := 1 else b := 2; // D_RIGHT
- Mem.WriteByte(b);
+ utils.writeInt(st, Byte(b));
// Îáúåêò ôëàãà
- Obj_SaveState(@flag^.Obj, Mem);
+ Obj_SaveState(st, @flag^.Obj);
end;
begin
- Mem := TBinMemoryWriter.Create(1024 * 1024); // 1 MB
-
- ///// Ñîõðàíÿåì ñïèñêè ïàíåëåé: /////
savePanels();
- ///// /////
- ///// Ñîõðàíÿåì ìóçûêó: /////
- // Ñèãíàòóðà ìóçûêè:
- dw := MUSIC_SIGNATURE; // 'MUSI'
- Mem.WriteDWORD(dw);
- // Íàçâàíèå ìóçûêè:
- Assert(gMusic <> nil, 'g_Map_SaveState: gMusic = nil');
+ // Ñîõðàíÿåì ìóçûêó
+ utils.writeSign(st, 'MUSI');
+ utils.writeInt(st, Byte(0));
+ // Íàçâàíèå ìóçûêè
+ assert(gMusic <> nil, 'g_Map_SaveState: gMusic = nil');
if gMusic.NoMusic then str := '' else str := gMusic.Name;
- Mem.WriteString(str, 64);
+ utils.writeStr(st, str);
// Ïîçèöèÿ ïðîèãðûâàíèÿ ìóçûêè
- dw := gMusic.GetPosition();
- Mem.WriteDWORD(dw);
+ utils.writeInt(st, LongWord(gMusic.GetPosition()));
// Ñòîèò ëè ìóçûêà íà ñïåö-ïàóçå
- boo := gMusic.SpecPause;
- Mem.WriteBoolean(boo);
- ///// /////
+ utils.writeBool(st, gMusic.SpecPause);
///// Ñîõðàíÿåì êîëè÷åñòâî ìîíñòðîâ: /////
- Mem.WriteInt(gTotalMonsters);
+ utils.writeInt(st, LongInt(gTotalMonsters));
///// /////
//// Ñîõðàíÿåì ôëàãè, åñëè ýòî CTF: /////
- if gGameSettings.GameMode = GM_CTF then
+ if (gGameSettings.GameMode = GM_CTF) then
begin
// Ôëàã Êðàñíîé êîìàíäû
- SaveFlag(@gFlags[FLAG_RED]);
+ saveFlag(@gFlags[FLAG_RED]);
// Ôëàã Ñèíåé êîìàíäû
- SaveFlag(@gFlags[FLAG_BLUE]);
+ saveFlag(@gFlags[FLAG_BLUE]);
end;
///// /////
if gGameSettings.GameMode in [GM_TDM, GM_CTF] then
begin
// Î÷êè Êðàñíîé êîìàíäû
- Mem.WriteSmallInt(gTeamStat[TEAM_RED].Goals);
+ utils.writeInt(st, SmallInt(gTeamStat[TEAM_RED].Goals));
// Î÷êè Ñèíåé êîìàíäû
- Mem.WriteSmallInt(gTeamStat[TEAM_BLUE].Goals);
+ utils.writeInt(st, SmallInt(gTeamStat[TEAM_BLUE].Goals));
end;
///// /////
end;
-procedure g_Map_LoadState (var Mem: TBinMemoryReader);
+procedure g_Map_LoadState (st: TStream);
var
dw: DWORD;
- b: Byte;
str: String;
boo: Boolean;
procedure loadPanels ();
var
- PAMem: TBinMemoryReader;
pan: TPanel;
- count: LongInt;
begin
- // Çàãðóæàåì òåêóùèé ñïèñîê ïàíåëåé
- PAMem := TBinMemoryReader.Create();
- PAMem.LoadFromMemory(Mem);
-
// Çàãðóæàåì ïàíåëè
- PAMem.ReadInt(count);
- if (count <> Length(panByGUID)) then raise EBinSizeError.Create('g_Map_LoadState: LoadPanelArray: invalid number of panels');
+ if (Length(panByGUID) <> utils.readLongInt(st)) then raise XStreamError.Create('invalid number of saved panels');
for pan in panByGUID do
begin
- pan.LoadState(PAMem);
+ pan.LoadState(st);
if (pan.proxyId >= 0) then mapGrid.proxyEnabled[pan.proxyId] := pan.Enabled;
end;
-
- // Ýòîò ñïèñîê ïàíåëåé çàãðóæåí
- PAMem.Free();
end;
- procedure LoadFlag(flag: PFlag);
+ procedure loadFlag (flag: PFlag);
+ var
+ b: Byte;
begin
// Ñèãíàòóðà ôëàãà
- Mem.ReadDWORD(dw);
- // 'FLAG'
- if dw <> FLAG_SIGNATURE then raise EBinSizeError.Create('g_Map_LoadState: LoadFlag: Wrong Flag Signature');
+ if not utils.checkSign(st, 'FLAG') then raise XStreamError.Create('invalid flag signature');
+ if (utils.readByte(st) <> 0) then raise XStreamError.Create('invalid flag version');
// Âðåìÿ ïåðåïîÿâëåíèÿ ôëàãà
- Mem.ReadByte(flag^.RespawnType);
+ flag^.RespawnType := utils.readByte(st);
// Ñîñòîÿíèå ôëàãà
- Mem.ReadByte(flag^.State);
+ flag^.State := utils.readByte(st);
// Íàïðàâëåíèå ôëàãà
- Mem.ReadByte(b);
- if b = 1 then flag^.Direction := D_LEFT else flag^.Direction := D_RIGHT; // b = 2
+ b := utils.readByte(st);
+ if (b = 1) then flag^.Direction := D_LEFT else flag^.Direction := D_RIGHT; // b = 2
// Îáúåêò ôëàãà
- Obj_LoadState(@flag^.Obj, Mem);
+ Obj_LoadState(@flag^.Obj, st);
end;
begin
- if Mem = nil then Exit;
+ if (st = nil) then exit;
///// Çàãðóæàåì ñïèñêè ïàíåëåé: /////
loadPanels();
//mapCreateGrid();
///// Çàãðóæàåì ìóçûêó: /////
- // Ñèãíàòóðà ìóçûêè
- Mem.ReadDWORD(dw);
- // 'MUSI'
- if dw <> MUSIC_SIGNATURE then raise EBinSizeError.Create('g_Map_LoadState: Wrong Music Signature');
+ if not utils.checkSign(st, 'MUSI') then raise XStreamError.Create('invalid music signature');
+ if (utils.readByte(st) <> 0) then raise XStreamError.Create('invalid music version');
// Íàçâàíèå ìóçûêè
- Assert(gMusic <> nil, 'g_Map_LoadState: gMusic = nil');
- Mem.ReadString(str);
+ assert(gMusic <> nil, 'g_Map_LoadState: gMusic = nil');
+ str := utils.readStr(st);
// Ïîçèöèÿ ïðîèãðûâàíèÿ ìóçûêè
- Mem.ReadDWORD(dw);
+ dw := utils.readLongWord(st);
// Ñòîèò ëè ìóçûêà íà ñïåö-ïàóçå
- Mem.ReadBoolean(boo);
+ boo := utils.readBool(st);
// Çàïóñêàåì ýòó ìóçûêó
gMusic.SetByName(str);
gMusic.SpecPause := boo;
gMusic.Play();
- gMusic.Pause(True);
+ gMusic.Pause(true);
gMusic.SetPosition(dw);
///// /////
///// Çàãðóæàåì êîëè÷åñòâî ìîíñòðîâ: /////
- Mem.ReadInt(gTotalMonsters);
+ gTotalMonsters := utils.readLongInt(st);
///// /////
//// Çàãðóæàåì ôëàãè, åñëè ýòî CTF: /////
- if gGameSettings.GameMode = GM_CTF then
+ if (gGameSettings.GameMode = GM_CTF) then
begin
// Ôëàã Êðàñíîé êîìàíäû
- LoadFlag(@gFlags[FLAG_RED]);
+ loadFlag(@gFlags[FLAG_RED]);
// Ôëàã Ñèíåé êîìàíäû
- LoadFlag(@gFlags[FLAG_BLUE]);
+ loadFlag(@gFlags[FLAG_BLUE]);
end;
///// /////
if gGameSettings.GameMode in [GM_TDM, GM_CTF] then
begin
// Î÷êè Êðàñíîé êîìàíäû
- Mem.ReadSmallInt(gTeamStat[TEAM_RED].Goals);
+ gTeamStat[TEAM_RED].Goals := utils.readSmallInt(st);
// Î÷êè Ñèíåé êîìàíäû
- Mem.ReadSmallInt(gTeamStat[TEAM_BLUE].Goals);
+ gTeamStat[TEAM_BLUE].Goals := utils.readSmallInt(st);
end;
///// /////
end;