X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_map.pas;h=46db3faae77a9079d5a1fd43b3af92f77f9e90e1;hb=717e99e0ebd065bbc8f0c253cce7f5ee7df9c77b;hp=4b197e3ec74bf4e2ddbec3750e4624798ab307ab;hpb=15ef0fb2d44e381afb8d0ea07cdb31fd3903ba7b;p=d2df-sdl.git diff --git a/src/game/g_map.pas b/src/game/g_map.pas index 4b197e3..46db3fa 100644 --- a/src/game/g_map.pas +++ b/src/game/g_map.pas @@ -20,8 +20,9 @@ unit g_map; 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 @@ -65,7 +66,7 @@ procedure g_Map_Update(); 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); @@ -82,7 +83,7 @@ procedure g_Map_EnableWall_XXX (ID: DWORD); 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; @@ -95,8 +96,8 @@ function g_Map_HaveFlagPoints(): 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); @@ -109,7 +110,7 @@ function g_Map_traceToNearestWall (x0, y0, x1, y1: Integer; hitx: PInteger=nil; function g_Map_traceToNearest (x0, y0, x1, y1: Integer; tag: Integer; hitx: PInteger=nil; hity: PInteger=nil): TPanel; type - TForEachPanelCB = function (pan: TPanel): Boolean; // return `true` to stop + TForEachPanelCB = function (pan: TPanel): Boolean is nested; // return `true` to stop function g_Map_HasAnyPanelAtPoint (x, y: Integer; panelType: Word): Boolean; function g_Map_PanelAtPoint (x, y: Integer; tagmask: Integer=-1): TPanel; @@ -119,6 +120,12 @@ function g_Map_PanelAtPoint (x, y: Integer; tagmask: Integer=-1): TPanel; function g_Map_TraceLiquidNonPrecise (x, y, dx, dy: Integer; out topx, topy: Integer): Boolean; +// return `true` from `cb` to stop +function g_Map_ForEachPanel (cb: TForEachPanelCB): TPanel; + +procedure g_Map_NetSendInterestingPanels (); // yay! + + procedure g_Map_ProfilersBegin (); procedure g_Map_ProfilersEnd (); @@ -236,7 +243,7 @@ var 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, @@ -250,6 +257,21 @@ const FLAG_SIGNATURE = $47414C46; // 'FLAG' +// ////////////////////////////////////////////////////////////////////////// // +procedure mapWarningCB (const msg: AnsiString; line, col: Integer); +begin + if (line > 0) then + begin + e_LogWritefln('parse error at (%s,%s): %s', [line, col, msg], TMsgType.Warning); + end + else + begin + e_LogWritefln('parse error: %s', [msg], TMsgType.Warning); + end; +end; + + +// ////////////////////////////////////////////////////////////////////////// // var panByGUID: array of TPanel = nil; @@ -262,6 +284,34 @@ begin end; +// return `true` from `cb` to stop +function g_Map_ForEachPanel (cb: TForEachPanelCB): TPanel; +var + pan: TPanel; +begin + result := nil; + if not assigned(cb) then exit; + for pan in panByGUID do + begin + if cb(pan) then begin result := pan; exit; end; + end; +end; + + +procedure g_Map_NetSendInterestingPanels (); +var + pan: TPanel; +begin + if g_Game_IsServer and g_Game_IsNet then + begin + for pan in panByGUID do + begin + if pan.gncNeedSend then MH_SEND_PanelState(pan.guid); + end; + end; +end; + + // ////////////////////////////////////////////////////////////////////////// // function g_Map_MinX (): Integer; inline; begin if (mapGrid <> nil) then result := mapGrid.gridX0 else result := 0; end; function g_Map_MinY (): Integer; inline; begin if (mapGrid <> nil) then result := mapGrid.gridY0 else result := 0; end; @@ -324,8 +374,11 @@ begin try dfmapdef := TDynMapDef.Create(pr); - except on e: Exception do - raise Exception.Create(Format('ERROR in "mapdef.txt" at (%s,%s): %s', [pr.line, pr.col, e.message])); + except + on e: TDynParseException do + raise Exception.CreateFmt('ERROR in "mapdef.txt" at (%s,%s): %s', [e.tokLine, e.tokCol, e.message]); + on e: Exception do + raise Exception.CreateFmt('ERROR in "mapdef.txt" at (%s,%s): %s', [pr.tokLine, pr.tokCol, e.message]); end; st.Free(); @@ -337,7 +390,6 @@ end; function g_Map_ParseMap (data: Pointer; dataLen: Integer): TDynRecord; var wst: TSFSMemoryChunkStream = nil; - pr: TTextParser = nil; begin result := nil; if (dataLen < 4) then exit; @@ -347,41 +399,25 @@ begin if (dfmapdef = nil) then raise Exception.Create('internal map loader error'); wst := TSFSMemoryChunkStream.Create(data, dataLen); - - if (PAnsiChar(data)[0] = 'M') and (PAnsiChar(data)[1] = 'A') and (PAnsiChar(data)[2] = 'P') and (PByte(data)[3] = 1) then - begin - // binary map - try - //e_LogWriteln('parsing binary map...'); - result := dfmapdef.parseBinMap(wst); - except on e: Exception do + try + result := dfmapdef.parseMap(wst); + except + on e: TDynParseException do begin - e_LogWritefln('ERROR: %s', [e.message]); + e_LogWritefln('ERROR at (%s,%s): %s', [e.tokLine, e.tokCol, e.message]); wst.Free(); result := nil; exit; end; - end; - wst.Free(); - end - else - begin - // text map - pr := TFileTextParser.Create(wst); - try - //e_LogWriteln('parsing text map...'); - result := dfmapdef.parseMap(pr); - except on e: Exception do + on e: Exception do begin - if (pr <> nil) then e_LogWritefln('ERROR at (%s,%s): %s', [pr.line, pr.col, e.message]) - else e_LogWritefln('ERROR: %s', [e.message]); - pr.Free(); // will free `wst` + e_LogWritefln('ERROR: %s', [e.message]); + wst.Free(); result := nil; exit; end; - end; - pr.Free(); // will free `wst` end; + //e_LogWriteln('map parsed.'); end; @@ -787,7 +823,7 @@ begin PanelArray := nil; end; -function CreatePanel (PanelRec: TDynRecord; AddTextures: TAddTextureArray; CurTex: Integer; sav: Boolean): Integer; +function CreatePanel (PanelRec: TDynRecord; AddTextures: TAddTextureArray; CurTex: Integer): Integer; var len: Integer; panels: ^TPanelArray; @@ -822,7 +858,6 @@ begin pan.arrIdx := len; pan.proxyId := -1; pan.tag := panelTypeToTag(PanelRec.PanelType); - if sav then pan.SaveIt := True; PanelRec.user['panel_guid'] := pguid; @@ -865,7 +900,7 @@ begin if TextNameHash.get(RecName, result) then begin // i found her! - //e_LogWritefln('texture ''%s'' already loaded', [RecName]); + //e_LogWritefln('texture ''%s'' already loaded (%s)', [RecName, result]); exit; end; @@ -933,7 +968,9 @@ begin SetLength(Textures, Length(Textures)+1); if not e_CreateTextureMem(TextureData, ResLength, Textures[High(Textures)].TextureID) then begin + e_WriteLog(Format('Error loading texture %s', [RecName]), TMsgType.Warning); SetLength(Textures, Length(Textures)-1); + result := -1; Exit; end; e_GetTextureSize(Textures[High(Textures)].TextureID, @Textures[High(Textures)].Width, @Textures[High(Textures)].Height); @@ -950,7 +987,7 @@ begin if (BadTextNameHash = nil) then BadTextNameHash := hashNewStrInt(); if log and (not BadTextNameHash.get(RecName, a)) then begin - e_WriteLog(Format('Error loading texture %s', [RecName]), MSG_WARNING); + e_WriteLog(Format('Error loading texture %s', [RecName]), TMsgType.Warning); //e_WriteLog(Format('WAD Reader error: %s', [WAD.GetLastErrorStr]), MSG_WARNING); end; BadTextNameHash.put(RecName, -1); @@ -981,7 +1018,7 @@ begin if TextNameHash.get(RecName, result) then begin // i found her! - //e_LogWritefln('animated texture ''%s'' already loaded', [RecName]); + //e_LogWritefln('animated texture ''%s'' already loaded (%s)', [RecName, result]); exit; end; @@ -1010,7 +1047,7 @@ begin if (BadTextNameHash = nil) then BadTextNameHash := hashNewStrInt(); if log and (not BadTextNameHash.get(RecName, f)) then begin - e_WriteLog(Format('Error loading animation texture %s', [RecName]), MSG_WARNING); + e_WriteLog(Format('Error loading animation texture %s', [RecName]), TMsgType.Warning); //e_WriteLog(Format('WAD Reader error: %s', [WAD.GetLastErrorStr]), MSG_WARNING); end; BadTextNameHash.put(RecName, -1); @@ -1029,7 +1066,7 @@ begin if ResLength < 6 then begin - e_WriteLog(Format('Animated texture file "%s" too short', [RecName]), MSG_WARNING); + e_WriteLog(Format('Animated texture file "%s" too short', [RecName]), TMsgType.Warning); BadTextNameHash.put(RecName, -1); exit; end; @@ -1041,7 +1078,7 @@ begin // íåò, ýòî ñóïåðìåí! if not WAD.ReadMemory(TextureWAD, ResLength) then begin - e_WriteLog(Format('Animated texture WAD file "%s" is invalid', [RecName]), MSG_WARNING); + e_WriteLog(Format('Animated texture WAD file "%s" is invalid', [RecName]), TMsgType.Warning); BadTextNameHash.put(RecName, -1); exit; end; @@ -1049,7 +1086,7 @@ begin // ×èòàåì INI-ðåñóðñ àíèì. òåêñòóðû è çàïîìèíàåì åãî óñòàíîâêè: if not WAD.GetResource('TEXT/ANIM', TextData, ResLength) then begin - e_WriteLog(Format('Animated texture file "%s" has invalid INI', [RecName]), MSG_WARNING); + e_WriteLog(Format('Animated texture file "%s" has invalid INI', [RecName]), TMsgType.Warning); BadTextNameHash.put(RecName, -1); exit; end; @@ -1059,7 +1096,7 @@ begin TextureResource := cfg.ReadStr('', 'resource', ''); if TextureResource = '' then begin - e_WriteLog(Format('Animated texture WAD file "%s" has no "resource"', [RecName]), MSG_WARNING); + e_WriteLog(Format('Animated texture WAD file "%s" has no "resource"', [RecName]), TMsgType.Warning); BadTextNameHash.put(RecName, -1); exit; end; @@ -1076,7 +1113,7 @@ begin // ×èòàåì ðåñóðñ òåêñòóð (êàäðîâ) àíèì. òåêñòóðû â ïàìÿòü: if not WAD.GetResource('TEXTURES/'+TextureResource, TextureData, ResLength) then begin - e_WriteLog(Format('Animated texture WAD file "%s" has no texture "%s"', [RecName, 'TEXTURES/'+TextureResource]), MSG_WARNING); + e_WriteLog(Format('Animated texture WAD file "%s" has no texture "%s"', [RecName, 'TEXTURES/'+TextureResource]), TMsgType.Warning); BadTextNameHash.put(RecName, -1); exit; end; @@ -1104,7 +1141,7 @@ begin if (BadTextNameHash = nil) then BadTextNameHash := hashNewStrInt(); if log and (not BadTextNameHash.get(RecName, f)) then begin - e_WriteLog(Format('Error loading animation texture %s', [RecName]), MSG_WARNING); + e_WriteLog(Format('Error loading animation texture %s', [RecName]), TMsgType.Warning); end; BadTextNameHash.put(RecName, -1); end; @@ -1125,13 +1162,13 @@ begin GlobalMetadata.ClearMetaItemsForSaving(); if not LoadMultiImageFromMemory(TextureWAD, ResLength, ia) then begin - e_WriteLog(Format('Animated texture file "%s" cannot be loaded', [RecName]), MSG_WARNING); + e_WriteLog(Format('Animated texture file "%s" cannot be loaded', [RecName]), TMsgType.Warning); BadTextNameHash.put(RecName, -1); exit; end; if length(ia) = 0 then begin - e_WriteLog(Format('Animated texture file "%s" has no frames', [RecName]), MSG_WARNING); + e_WriteLog(Format('Animated texture file "%s" has no frames', [RecName]), TMsgType.Warning); BadTextNameHash.put(RecName, -1); exit; end; @@ -1175,7 +1212,7 @@ begin //writeln(' creating animated texture with ', length(ia), ' frames (delay:', _speed, '; backloop:', _backanimation, ') from "', RecName, '"...'); //for f := 0 to high(ia) do writeln(' frame #', f, ': ', ia[f].width, 'x', ia[f].height); f := ord(_backanimation); - e_WriteLog(Format('Animated texture file "%s": %d frames (delay:%d; back:%d; frdelay:%d; frloop:%d), %dx%d', [RecName, length(ia), _speed, f, frdelay, frloop, _width, _height]), MSG_NOTIFY); + e_WriteLog(Format('Animated texture file "%s": %d frames (delay:%d; back:%d; frdelay:%d; frloop:%d), %dx%d', [RecName, length(ia), _speed, f, frdelay, frloop, _width, _height]), TMsgType.Notify); SetLength(Textures, Length(Textures)+1); // cîçäàåì êàäðû àíèì. òåêñòóðû èç êàðòèíîê @@ -1196,7 +1233,7 @@ begin if (BadTextNameHash = nil) then BadTextNameHash := hashNewStrInt(); if log and (not BadTextNameHash.get(RecName, f)) then begin - e_WriteLog(Format('Error loading animation texture "%s" images', [RecName]), MSG_WARNING); + e_WriteLog(Format('Error loading animation texture "%s" images', [RecName]), TMsgType.Warning); end; BadTextNameHash.put(RecName, -1); end; @@ -1293,10 +1330,11 @@ begin end; end; -procedure CreateTrigger (amapIdx: Integer; Trigger: TDynRecord; atpanid, atrigpanid: Integer; fTexturePanel1Type, fTexturePanel2Type: Word); +function CreateTrigger (amapIdx: Integer; Trigger: TDynRecord; atpanid, atrigpanid: Integer): Integer; var _trigger: TTrigger; begin + result := -1; if g_Game_IsClient and not (Trigger.TriggerType in [TRIGGER_SOUND, TRIGGER_MUSIC]) then Exit; with _trigger do @@ -1308,31 +1346,14 @@ 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 - trigData := nil; - if (TriggerType <> TRIGGER_SECRET) then - begin - e_LogWritefln('trigger of type %s has no triggerdata; wtf?!', [TriggerType], MSG_WARNING); - end; - end - else - begin - trigData := Trigger.trigRec.clone(nil); - end; end; - g_Triggers_Create(_trigger); + result := Integer(g_Triggers_Create(_trigger, Trigger)); end; procedure CreateMonster(monster: TDynRecord); @@ -1354,7 +1375,7 @@ begin if gTriggers[a].TriggerType in [TRIGGER_PRESS, TRIGGER_ON, TRIGGER_OFF, TRIGGER_ONOFF] then begin //if (gTriggers[a].Data.MonsterID-1) = Integer(mon.StartID) then mon.AddTrigger(a); - if (gTriggers[a].trigData.trigMonsterId) = Integer(mon.StartID) then mon.AddTrigger(a); + if (gTriggers[a].trigDataRec.trigMonsterId) = Integer(mon.StartID) then mon.AddTrigger(a); end; end; end; @@ -1386,7 +1407,7 @@ procedure g_Map_ReAdd_DieTriggers(); tw.Free(); end; } - if (gTriggers[a].trigData.trigMonsterId) = Integer(mon.StartID) then mon.AddTrigger(a); + if (gTriggers[a].trigDataRec.trigMonsterId) = Integer(mon.StartID) then mon.AddTrigger(a); end; end; end; @@ -1495,7 +1516,7 @@ var if (pan.proxyId <> -1) then begin {$IF DEFINED(D2F_DEBUG)} - e_WriteLog(Format('DUPLICATE wall #%d(%d) enabled (%d); type:%08x', [Integer(idx), Integer(pan.proxyId), Integer(mapGrid.proxyEnabled[pan.proxyId]), pan.PanelType]), MSG_NOTIFY); + e_WriteLog(Format('DUPLICATE wall #%d(%d) enabled (%d); type:%08x', [Integer(idx), Integer(pan.proxyId), Integer(mapGrid.proxyEnabled[pan.proxyId]), pan.PanelType]), TMsgType.Notify); {$ENDIF} continue; end; @@ -1577,21 +1598,19 @@ type PTRec = ^TTRec; TTRec = record //TexturePanel: Integer; - texPanIdx: Integer; - LiftPanelIdx: Integer; - DoorPanelIdx: Integer; - ShotPanelIdx: Integer; - MPlatPanelIdx: Integer; + tnum: Integer; + id: 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; @@ -1605,7 +1624,7 @@ var FileName, mapResName, s, TexName: String; Data: Pointer; Len: Integer; - ok, isAnim, trigRef: Boolean; + ok, isAnim: Boolean; CurTex, ntn: Integer; rec, texrec: TDynRecord; pttit: PTRec; @@ -1613,92 +1632,111 @@ var stt: UInt64; 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, TMsgType.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], TMsgType.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; + + if (gCurrentMap = nil) then + begin + e_LogWritefln('invalid map file: ''%s''', [mapResName]); + gCurrentMapFileName := ''; + exit; + end; + end + else + begin + stt := getTimeMicro(); end; - FreeMem(Data); + //gCurrentMap := mapReader; - generateExternalResourcesList(mapReader); - mapTextureList := mapReader['texture']; + 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); + e_WriteLog(' Reading map info...', TMsgType.Notify); g_Game_SetLoadingText(_lc[I_LOAD_MAP_HEADER], 0, False); 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; // Çàãðóçêà òåêñòóð: @@ -1706,7 +1744,7 @@ begin // Äîáàâëåíèå òåêñòóð â Textures[]: if (mapTextureList <> nil) and (mapTextureList.count > 0) then begin - e_WriteLog(' Loading textures:', MSG_NOTIFY); + e_WriteLog(' Loading textures:', TMsgType.Notify); g_Game_SetLoadingText(_lc[I_LOAD_TEXTURES], mapTextureList.count-1, False); cnt := -1; @@ -1715,7 +1753,7 @@ begin Inc(cnt); s := rec.Resource; {$IF DEFINED(D2F_DEBUG_TXLOAD)} - e_WriteLog(Format(' Loading texture #%d: %s', [cnt, s]), MSG_NOTIFY); + e_WriteLog(Format(' Loading texture #%d: %s', [cnt, s]), TMsgType.Notify); {$ENDIF} //if g_Map_IsSpecialTexture(s) then e_WriteLog(' SPECIAL!', MSG_NOTIFY); if rec.Anim then @@ -1749,11 +1787,11 @@ begin // Çàãðóçêà òðèããåðîâ gTriggerClientID := 0; - e_WriteLog(' Loading triggers...', MSG_NOTIFY); + e_WriteLog(' Loading triggers...', TMsgType.Notify); g_Game_SetLoadingText(_lc[I_LOAD_TRIGGERS], 0, False); // Çàãðóçêà ïàíåëåé - e_WriteLog(' Loading panels...', MSG_NOTIFY); + e_WriteLog(' Loading panels...', TMsgType.Notify); g_Game_SetLoadingText(_lc[I_LOAD_PANELS], 0, False); // check texture numbers for panels @@ -1763,8 +1801,11 @@ begin begin if (rec.tagInt < 0) then begin - e_WriteLog('error loading map: invalid texture index for panel', MSG_FATALERROR); + e_WriteLog('error loading map: invalid texture index for panel', TMsgType.Fatal); result := false; + gCurrentMap.Free(); + gCurrentMap := nil; + gCurrentMapFileName := ''; exit; end; end; @@ -1773,53 +1814,27 @@ begin // Ñîçäàíèå òàáëèöû òðèããåðîâ (ñîîòâåòñòâèå ïàíåëåé òðèããåðàì) if (triggers <> nil) and (triggers.count > 0) then begin - e_WriteLog(' Setting up trigger table...', MSG_NOTIFY); + e_WriteLog(' Setting up trigger table...', TMsgType.Notify); //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; @@ -1827,7 +1842,7 @@ begin // Ñîçäàåì ïàíåëè if (panels <> nil) and (panels.count > 0) then begin - e_WriteLog(' Setting up trigger links...', MSG_NOTIFY); + e_WriteLog(' Setting up trigger links...', TMsgType.Notify); g_Game_SetLoadingText(_lc[I_LOAD_LINK_TRIGGERS], panels.count-1, False); pannum := -1; @@ -1837,7 +1852,6 @@ begin //e_LogWritefln('PANSTART: pannum=%s', [pannum]); texrec := nil; SetLength(AddTextures, 0); - trigRef := False; CurTex := -1; ok := false; @@ -1854,21 +1868,9 @@ begin ok := false; if (TriggersTable <> nil) and (mapTextureList <> nil) then begin - { - for b := 0 to High(TriggersTable) do - begin - if (TriggersTable[b].texPan = rec) or (TriggersTable[b].shotPan = rec) then - begin - trigRef := True; - ok := True; - break; - end; - end; - } if rec.userPanelTrigRef then begin // e_LogWritefln('trigref for panel %s', [pannum]); - trigRef := True; ok := True; end; end; @@ -1996,7 +1998,8 @@ begin //e_LogWritefln('PANADD: pannum=%s', [pannum]); // Ñîçäàåì ïàíåëü è çàïîìèíàåì åå GUID - PanelID := CreatePanel(rec, AddTextures, CurTex, trigRef); + //e_LogWritefln('new panel; tcount=%s; curtex=%s', [Length(AddTextures), CurTex]); + PanelID := CreatePanel(rec, AddTextures, CurTex); //e_LogWritefln('panel #%s of type %s got guid #%s', [pannum, rec.PanelType, PanelID]); rec.userPanelId := PanelID; // remember game panel id, we'll fix triggers later @@ -2004,7 +2007,7 @@ begin moveSpeed := rec.moveSpeed; //moveStart := rec.moveStart; //moveEnd := rec.moveEnd; - //moveActive := rec['move_active'].varvalue; + //moveActive := rec['move_active'].value; if not moveSpeed.isZero then begin SetLength(gMovingWallIds, Length(gMovingWallIds)+1); @@ -2021,15 +2024,12 @@ begin // ×èíèì 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) - e_WriteLog('Creating map grid', MSG_NOTIFY); + e_WriteLog('Creating map grid', TMsgType.Notify); mapCreateGrid(); // Åñëè íå LoadState, òî ñîçäàåì òðèããåðû @@ -2042,45 +2042,52 @@ begin 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]); - CreateTrigger(trignum, rec, TriggersTable[trignum].texPanIdx, tgpid, Word(b), Word(c)); + TriggersTable[trignum].tnum := trignum; + TriggersTable[trignum].id := CreateTrigger(trignum, rec, TriggersTable[trignum].texPanelIdx, tgpid); + end; + end; + + //FIXME: use hashtable! + for pan in panByGUID do + begin + if (pan.endPosTrigId >= 0) and (pan.endPosTrigId < Length(TriggersTable)) then + begin + pan.endPosTrigId := TriggersTable[pan.endPosTrigId].id; + end; + if (pan.endSizeTrigId >= 0) and (pan.endSizeTrigId < Length(TriggersTable)) then + begin + pan.endSizeTrigId := TriggersTable[pan.endSizeTrigId].id; end; end; // Çàãðóçêà ïðåäìåòîâ - e_WriteLog(' Loading items...', MSG_NOTIFY); + e_WriteLog(' Loading items...', TMsgType.Notify); g_Game_SetLoadingText(_lc[I_LOAD_ITEMS], 0, False); // Åñëè íå LoadState, òî ñîçäàåì ïðåäìåòû if (items <> nil) and not gLoadGameMode then begin - e_WriteLog(' Spawning items...', MSG_NOTIFY); + e_WriteLog(' Spawning items...', TMsgType.Notify); g_Game_SetLoadingText(_lc[I_LOAD_CREATE_ITEMS], 0, False); for rec in items do CreateItem(rec); end; // Çàãðóçêà îáëàñòåé - e_WriteLog(' Loading areas...', MSG_NOTIFY); + e_WriteLog(' Loading areas...', TMsgType.Notify); g_Game_SetLoadingText(_lc[I_LOAD_AREAS], 0, False); // Åñëè íå LoadState, òî ñîçäàåì îáëàñòè if areas <> nil then begin - e_WriteLog(' Creating areas...', MSG_NOTIFY); + e_WriteLog(' Creating areas...', TMsgType.Notify); g_Game_SetLoadingText(_lc[I_LOAD_CREATE_AREAS], 0, False); for rec in areas do CreateArea(rec); end; // Çàãðóçêà ìîíñòðîâ - e_WriteLog(' Loading monsters...', MSG_NOTIFY); + e_WriteLog(' Loading monsters...', TMsgType.Notify); g_Game_SetLoadingText(_lc[I_LOAD_MONSTERS], 0, False); gTotalMonsters := 0; @@ -2088,43 +2095,45 @@ begin // Åñëè íå LoadState, òî ñîçäàåì ìîíñòðîâ if (monsters <> nil) and not gLoadGameMode then begin - e_WriteLog(' Spawning monsters...', MSG_NOTIFY); + e_WriteLog(' Spawning monsters...', TMsgType.Notify); g_Game_SetLoadingText(_lc[I_LOAD_CREATE_MONSTERS], 0, False); 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); + e_WriteLog(' Loading sky: ' + gMapInfo.SkyName, TMsgType.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; // Çàãðóçêà ìóçûêè ok := False; if gMapInfo.MusicName <> '' then begin - e_WriteLog(' Loading music: ' + gMapInfo.MusicName, MSG_NOTIFY); + e_WriteLog(' Loading music: ' + gMapInfo.MusicName, TMsgType.Notify); g_Game_SetLoadingText(_lc[I_LOAD_MUSIC], 0, False); FileName := g_ExtractWadName(gMapInfo.MusicName); @@ -2173,15 +2182,22 @@ begin 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); + e_WriteLog('Done loading map.', TMsgType.Notify); Result := True; end; @@ -2224,6 +2240,8 @@ begin FreeMem(Data); + if (mapReader = nil) then exit; + if (mapReader.Width > 0) and (mapReader.Height > 0) then begin Result.Name := mapReader.MapName; @@ -2350,6 +2368,7 @@ begin begin e_LogWritefln('g_Map_Free: no previous map.', []); end; + if freeTextures then begin e_LogWritefln('g_Map_Free: clearing textures...', []); @@ -2378,6 +2397,9 @@ begin TextNameHash := nil; BadTextNameHash.Free(); BadTextNameHash := nil; + gCurrentMapFileName := ''; + gCurrentMap.Free(); + gCurrentMap := nil; end; panByGUID := nil; @@ -2487,7 +2509,7 @@ begin if j > High(gPlayers) then j := 0; if gPlayers[j] <> nil then begin - if gPlayers[j].Live and g_Obj_Collide(@Obj, @gPlayers[j].Obj) then + if gPlayers[j].alive and g_Obj_Collide(@Obj, @gPlayers[j].Obj) then begin if gPlayers[j].GetFlag(a) then Break; end; @@ -2502,7 +2524,7 @@ end; // 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 @@ -2513,7 +2535,7 @@ procedure g_Map_DrawPanels (PanelType: Word); // 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; @@ -2871,6 +2893,8 @@ begin //pan := gWalls[ID]; pan := g_Map_PanelByGUID(pguid); if (pan = nil) then exit; + if pan.Enabled and mapGrid.proxyEnabled[pan.proxyId] then exit; + pan.Enabled := True; g_Mark(pan.X, pan.Y, pan.Width, pan.Height, MARK_DOOR, true); @@ -2878,7 +2902,9 @@ begin //if (pan.proxyId >= 0) then mapGrid.proxyEnabled[pan.proxyId] := true //else pan.proxyId := mapGrid.insertBody(pan, pan.X, pan.Y, pan.Width, pan.Height, GridTagDoor); - if g_Game_IsServer and g_Game_IsNet then MH_SEND_PanelState({gWalls[ID]}pan.PanelType, pguid); + //if g_Game_IsServer and g_Game_IsNet then MH_SEND_PanelState(pguid); + // mark platform as interesting + pan.setDirty(); {$IFDEF MAP_DEBUG_ENABLED_FLAG} //e_WriteLog(Format('ENABLE: wall #%d(%d) enabled (%d) (%d,%d)-(%d,%d)', [Integer(ID), Integer(pan.proxyId), Integer(mapGrid.proxyEnabled[pan.proxyId]), pan.x, pan.y, pan.width, pan.height]), MSG_NOTIFY); @@ -2893,13 +2919,17 @@ begin //pan := gWalls[ID]; pan := g_Map_PanelByGUID(pguid); if (pan = nil) then exit; + if (not pan.Enabled) and (not mapGrid.proxyEnabled[pan.proxyId]) then exit; + pan.Enabled := False; g_Mark(pan.X, pan.Y, pan.Width, pan.Height, MARK_DOOR, false); mapGrid.proxyEnabled[pan.proxyId] := false; //if (pan.proxyId >= 0) then begin mapGrid.removeBody(pan.proxyId); pan.proxyId := -1; end; - if g_Game_IsServer and g_Game_IsNet then MH_SEND_PanelState(pan.PanelType, pguid); + //if g_Game_IsServer and g_Game_IsNet then MH_SEND_PanelState(pguid); + // mark platform as interesting + pan.setDirty(); {$IFDEF MAP_DEBUG_ENABLED_FLAG} //e_WriteLog(Format('DISABLE: wall #%d(%d) disabled (%d) (%d,%d)-(%d,%d)', [Integer(ID), Integer(pan.proxyId), Integer(mapGrid.proxyEnabled[pan.proxyId]), pan.x, pan.y, pan.width, pan.height]), MSG_NOTIFY); @@ -2907,27 +2937,14 @@ begin 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(PanelType, pguid, AnimLoop); + if g_Game_IsServer and g_Game_IsNet then MH_SEND_PanelTexture(pguid, AnimLoop); end; @@ -2956,7 +2973,9 @@ begin 3: g_Mark(X, Y, Width, Height, MARK_LIFTRIGHT); end; - if g_Game_IsServer and g_Game_IsNet then MH_SEND_PanelState(PanelType, pguid); + //if g_Game_IsServer and g_Game_IsNet then MH_SEND_PanelState(pguid); + // mark platform as interesting + pan.setDirty(); end; end; @@ -3013,7 +3032,7 @@ begin Obj.Y := -1000; Obj.Vel.X := 0; Obj.Vel.Y := 0; - Direction := D_LEFT; + Direction := TDirection.D_LEFT; State := FLAG_STATE_NONE; if FlagPoints[Flag] <> nil then begin @@ -3041,14 +3060,14 @@ begin if State = FLAG_STATE_NONE then continue; - if Direction = D_LEFT then + if Direction = TDirection.D_LEFT then begin - Mirror := M_HORIZONTAL; + Mirror := TMirrorType.Horizontal; dx := -1; end else begin - Mirror := M_NONE; + Mirror := TMirrorType.None; dx := 1; end; @@ -3066,87 +3085,62 @@ begin 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; begin - // Ñîçäàåì íîâûé ñïèñîê ñîõðàíÿåìûõ ïàíåëåé - PAMem := TBinMemoryWriter.Create((Length(panByGUID)+1) * 40); - - for pan in panByGUID do - begin - if true{pan.SaveIt} then - begin - // ID ïàíåëè - //PAMem.WriteInt(i); - // Ñîõðàíÿåì ïàíåëü - pan.SaveState(PAMem); - end; - end; - - // Ñîõðàíÿåì ýòîò ñïèñîê ïàíåëåé - 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); + if flag^.Direction = TDirection.D_LEFT then b := 1 else b := 2; // D_RIGHT + 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; ///// ///// @@ -3154,69 +3148,53 @@ begin 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; begin - // Çàãðóæàåì òåêóùèé ñïèñîê ïàíåëåé - PAMem := TBinMemoryReader.Create(); - PAMem.LoadFromMemory(Mem); - + // Çàãðóæàåì ïàíåëè + if (Length(panByGUID) <> utils.readLongInt(st)) then raise XStreamError.Create('invalid number of saved panels'); for pan in panByGUID do begin - if true{pan.SaveIt} then - begin - // ID ïàíåëè: - //PAMem.ReadInt(id); - { - if id <> i then raise EBinSizeError.Create('g_Map_LoadState: LoadPanelArray: Wrong Panel ID'); - } - // Çàãðóæàåì ïàíåëü - pan.LoadState(PAMem); - //if (panels[i].arrIdx <> i) then raise Exception.Create('g_Map_LoadState: LoadPanelArray: Wrong Panel arrIdx'); - if (pan.proxyId >= 0) then mapGrid.proxyEnabled[pan.proxyId] := pan.Enabled; - end; + 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 := TDirection.D_LEFT else flag^.Direction := TDirection.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(); @@ -3227,36 +3205,34 @@ begin //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; ///// ///// @@ -3264,9 +3240,9 @@ begin 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; @@ -3295,4 +3271,6 @@ begin end; +begin + DynWarningCB := mapWarningCB; end.