X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_map.pas;h=e976be49c616045a92b12fd0b2c4844fd9227be2;hb=db4e988645273fe1c11611d84e03f0199cd181f7;hp=a4b2064a98e26b9609aa691c77fcb2f90eb61c2f;hpb=96165a1a95f0ea18a20dd8578fade4b46ec23746;p=d2df-sdl.git diff --git a/src/game/g_map.pas b/src/game/g_map.pas index a4b2064..e976be4 100644 --- a/src/game/g_map.pas +++ b/src/game/g_map.pas @@ -63,6 +63,8 @@ function g_Map_Exist(Res: String): Boolean; procedure g_Map_Free(freeTextures: Boolean=true); procedure g_Map_Update(); +function g_Map_PanelByGUID (aguid: Integer): TPanel; inline; + procedure g_Map_DrawPanels (PanelType: Word); // unaccelerated procedure g_Map_CollectDrawPanels (x0, y0, wdt, hgt: Integer); @@ -70,10 +72,18 @@ procedure g_Map_DrawBack(dx, dy: Integer); function g_Map_CollidePanel(X, Y: Integer; Width, Height: Word; PanelType: Word; b1x3: Boolean=false): Boolean; function g_Map_CollideLiquid_Texture(X, Y: Integer; Width, Height: Word): DWORD; -procedure g_Map_EnableWall(ID: DWORD); -procedure g_Map_DisableWall(ID: DWORD); -procedure g_Map_SwitchTexture(PanelType: Word; ID: DWORD; AnimLoop: Byte = 0); -procedure g_Map_SetLift(ID: DWORD; t: Integer); + +procedure g_Map_EnableWallGUID (pguid: Integer); +procedure g_Map_DisableWallGUID (pguid: Integer); +procedure g_Map_SetLiftGUID (pguid: Integer; t: Integer); + +// HACK!!! +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_ReAdd_DieTriggers(); function g_Map_IsSpecialTexture(Texture: String): Boolean; @@ -85,8 +95,6 @@ function g_Map_HaveFlagPoints(): Boolean; procedure g_Map_ResetFlag(Flag: Byte); procedure g_Map_DrawFlags(); -function g_Map_PanelForPID(PanelID: Integer; var PanelArrayID: Integer): PPanel; - procedure g_Map_SaveState(Var Mem: TBinMemoryWriter); procedure g_Map_LoadState(Var Mem: TBinMemoryReader); @@ -101,7 +109,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; @@ -111,12 +119,24 @@ 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 (); function g_Map_ParseMap (data: Pointer; dataLen: Integer): TDynRecord; + +function g_Map_MinX (): Integer; inline; +function g_Map_MinY (): Integer; inline; +function g_Map_MaxX (): Integer; inline; +function g_Map_MaxY (): Integer; inline; + const NNF_NO_NAME = 0; NNF_NAME_BEFORE = 1; @@ -163,17 +183,20 @@ const PANEL_FORE *) // sorted by draw priority - GridTagBack = 1 shl 0; - GridTagStep = 1 shl 1; - GridTagWall = 1 shl 2; - GridTagDoor = 1 shl 3; - GridTagAcid1 = 1 shl 4; - GridTagAcid2 = 1 shl 5; - GridTagWater = 1 shl 6; - GridTagFore = 1 shl 7; + GridTagBack = 1 shl 0; // gRenderBackgrounds + GridTagStep = 1 shl 1; // gSteps + GridTagWall = 1 shl 2; // gWalls + GridTagDoor = 1 shl 3; // gWalls + GridTagAcid1 = 1 shl 4; // gAcid1 + GridTagAcid2 = 1 shl 5; // gAcid2 + GridTagWater = 1 shl 6; // gWater + GridTagFore = 1 shl 7; // gRenderForegrounds // the following are invisible - GridTagLift = 1 shl 8; - GridTagBlockMon = 1 shl 9; + GridTagLift = 1 shl 8; // gLifts + GridTagBlockMon = 1 shl 9; // gBlockMon + + GridTagObstacle = (GridTagStep or GridTagWall or GridTagDoor); + GridTagLiquid = (GridTagAcid1 or GridTagAcid2 or GridTagWater); GridDrawableMask = (GridTagBack or GridTagStep or GridTagWall or GridTagDoor or GridTagAcid1 or GridTagAcid2 or GridTagWater or GridTagFore); @@ -195,6 +218,7 @@ var gWADHash: TMD5Digest; BackID: DWORD = DWORD(-1); gExternalResources: TStringList; + gMovingWallIds: array of Integer = nil; gdbg_map_use_accel_render: Boolean = true; gdbg_map_use_accel_coldet: Boolean = true; @@ -232,9 +256,58 @@ const FLAG_SIGNATURE = $47414C46; // 'FLAG' +var + panByGUID: array of TPanel = nil; + + +// ////////////////////////////////////////////////////////////////////////// // +function g_Map_PanelByGUID (aguid: Integer): TPanel; inline; +begin + //if (panByGUID = nil) or (not panByGUID.get(aguid, result)) then result := nil; + if (aguid >= 0) and (aguid < Length(panByGUID)) then result := panByGUID[aguid] else result := nil; +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; +function g_Map_MaxX (): Integer; inline; begin if (mapGrid <> nil) then result := mapGrid.gridX0+mapGrid.gridWidth-1 else result := 0; end; +function g_Map_MaxY (): Integer; inline; begin if (mapGrid <> nil) then result := mapGrid.gridY0+mapGrid.gridHeight-1 else result := 0; end; + + +// ////////////////////////////////////////////////////////////////////////// // var dfmapdef: TDynMapDef = nil; + procedure loadMapDefinition (); var pr: TTextParser = nil; @@ -242,13 +315,15 @@ var WAD: TWADFile = nil; begin if (dfmapdef <> nil) then exit; + try e_LogWritefln('parsing "mapdef.txt"...', []); st := openDiskFileRO(DataDir+'mapdef.txt'); + e_LogWritefln('found local "%smapdef.txt"', [DataDir]); except st := nil; - e_LogWritefln('local "%smapdef.txt" not found', [DataDir]); end; + if (st = nil) then begin WAD := TWADFile.Create(); @@ -263,21 +338,31 @@ begin end; end; - if (st = nil) then - begin - //raise Exception.Create('cannot open "mapdef.txt"'); - e_LogWritefln('using default "mapdef.txt"...', [], MSG_WARNING); - pr := TStrTextParser.Create(defaultMapDef); - end - else - begin - pr := TFileTextParser.Create(st); + try + if (st = nil) then + begin + //raise Exception.Create('cannot open "mapdef.txt"'); + e_LogWriteln('using default "mapdef.txt"...'); + pr := TStrTextParser.Create(defaultMapDef); + end + else + begin + pr := TFileTextParser.Create(st); + end; + except on e: Exception do + begin + e_LogWritefln('something is VERY wrong here! -- ', [e.message]); + raise; + end; end; 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(); @@ -285,53 +370,43 @@ begin 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; + + if (dfmapdef = nil) then writeln('need to load mapdef'); loadMapDefinition(); 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 - 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 - 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; +// ////////////////////////////////////////////////////////////////////////// // var NNF_PureName: String; // Èìÿ òåêñòóðû áåç öèôð â êîíöå NNF_FirstNum: Integer; // ×èñëî ó íà÷àëüíîé òåêñòóðû @@ -396,6 +471,7 @@ begin end; +// ////////////////////////////////////////////////////////////////////////// // function panelTypeToTag (panelType: Word): Integer; begin case panelType of @@ -431,19 +507,12 @@ begin end; -type - TPanelID = record - PWhere: ^TPanelArray; - PArrID: Integer; - end; - var - PanelById: array of TPanelID; - Textures: TLevelTextureArray = nil; + Textures: TLevelTextureArray = nil; TextNameHash: THashStrInt = nil; // key: texture name; value: index in `Textures` BadTextNameHash: THashStrInt = nil; // set; so we won't spam with non-existing texture messages - RespawnPoints: Array of TRespawnPoint; - FlagPoints: Array [FLAG_RED..FLAG_BLUE] of PFlagPoint; + RespawnPoints: array of TRespawnPoint; + FlagPoints: array[FLAG_RED..FLAG_BLUE] of PFlagPoint; //DOMFlagPoints: Array of TFlagPoint; @@ -738,53 +807,46 @@ 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; + pan: TPanel; + pguid: Integer; begin Result := -1; case PanelRec.PanelType of - PANEL_WALL, PANEL_OPENDOOR, PANEL_CLOSEDOOR: - panels := @gWalls; - PANEL_BACK: - panels := @gRenderBackgrounds; - PANEL_FORE: - panels := @gRenderForegrounds; - PANEL_WATER: - panels := @gWater; - PANEL_ACID1: - panels := @gAcid1; - PANEL_ACID2: - panels := @gAcid2; - PANEL_STEP: - panels := @gSteps; - PANEL_LIFTUP, PANEL_LIFTDOWN, PANEL_LIFTLEFT, PANEL_LIFTRIGHT: - panels := @gLifts; - PANEL_BLOCKMON: - panels := @gBlockMon; - else - Exit; + PANEL_WALL, PANEL_OPENDOOR, PANEL_CLOSEDOOR: panels := @gWalls; + PANEL_BACK: panels := @gRenderBackgrounds; + PANEL_FORE: panels := @gRenderForegrounds; + PANEL_WATER: panels := @gWater; + PANEL_ACID1: panels := @gAcid1; + PANEL_ACID2: panels := @gAcid2; + PANEL_STEP: panels := @gSteps; + PANEL_LIFTUP, PANEL_LIFTDOWN, PANEL_LIFTLEFT, PANEL_LIFTRIGHT: panels := @gLifts; + PANEL_BLOCKMON: panels := @gBlockMon; + else exit; end; len := Length(panels^); - SetLength(panels^, len + 1); - - panels^[len] := TPanel.Create(PanelRec, AddTextures, CurTex, Textures); - panels^[len].arrIdx := len; - panels^[len].proxyId := -1; - panels^[len].tag := panelTypeToTag(PanelRec.PanelType); - if sav then - panels^[len].SaveIt := True; - - Result := len; - - len := Length(PanelByID); - SetLength(PanelByID, len + 1); - PanelByID[len].PWhere := panels; - PanelByID[len].PArrID := Result; + SetLength(panels^, len+1); + + pguid := Length(panByGUID); + SetLength(panByGUID, pguid+1); //FIXME! + pan := TPanel.Create(PanelRec, AddTextures, CurTex, Textures, pguid); + assert(pguid >= 0); + assert(pguid < Length(panByGUID)); + panByGUID[pguid] := pan; + panels^[len] := pan; + pan.arrIdx := len; + pan.proxyId := -1; + pan.tag := panelTypeToTag(PanelRec.PanelType); + + PanelRec.user['panel_guid'] := pguid; + + //result := len; + result := pguid; end; @@ -1250,10 +1312,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; fTexturePanel1Type, fTexturePanel2Type: Word): 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 @@ -1266,18 +1329,19 @@ begin Height := Trigger.Height; Enabled := Trigger.Enabled; //TexturePanel := Trigger.TexturePanel; - TexturePanel := atpanid; + TexturePanelGUID := atpanid; TexturePanelType := fTexturePanel1Type; ShotPanelType := fTexturePanel2Type; TriggerType := Trigger.TriggerType; ActivateType := Trigger.ActivateType; Keys := Trigger.Keys; - trigPanelId := atrigpanid; + trigPanelGUID := atrigpanid; //trigShotPanelId := ashotpanid; //Data.Default := Trigger.DATA; if (Trigger.trigRec = nil) then begin - trigData := nil; + trigDataRec := nil; + //HACK! if (TriggerType <> TRIGGER_SECRET) then begin e_LogWritefln('trigger of type %s has no triggerdata; wtf?!', [TriggerType], MSG_WARNING); @@ -1285,11 +1349,11 @@ begin end else begin - trigData := Trigger.trigRec.clone(); + trigDataRec := Trigger.trigRec.clone(nil); end; end; - g_Triggers_Create(_trigger); + result := Integer(g_Triggers_Create(_trigger)); end; procedure CreateMonster(monster: TDynRecord); @@ -1311,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; @@ -1343,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; @@ -1534,15 +1598,19 @@ type PTRec = ^TTRec; TTRec = record //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; end; var WAD: TWADFile; @@ -1560,12 +1628,15 @@ 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; pannum, trignum, cnt, tgpid: Integer; stt: UInt64; + moveSpeed{, moveStart, moveEnd}: TDFPoint; + //moveActive: Boolean; + pan: TPanel; begin mapGrid.Free(); mapGrid := nil; @@ -1573,6 +1644,8 @@ begin gCurrentMap.Free(); gCurrentMap := nil; + panByGUID := nil; + Result := False; gMapInfo.Map := Res; TriggersTable := nil; @@ -1628,6 +1701,12 @@ begin FreeMem(Data); + if (mapReader = nil) then + begin + e_LogWritefln('invalid map file: ''%s''', [mapResName]); + exit; + end; + generateExternalResourcesList(mapReader); mapTextureList := mapReader['texture']; // get all other lists here too @@ -1738,10 +1817,12 @@ begin 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 @@ -1757,11 +1838,17 @@ begin 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; g_Game_StepLoading(); end; @@ -1780,7 +1867,6 @@ begin //e_LogWritefln('PANSTART: pannum=%s', [pannum]); texrec := nil; SetLength(AddTextures, 0); - trigRef := False; CurTex := -1; ok := false; @@ -1797,21 +1883,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; @@ -1938,12 +2012,23 @@ begin //e_LogWritefln('PANADD: pannum=%s', [pannum]); - // Ñîçäàåì ïàíåëü è çàïîìèíàåì åå íîìåð - PanelID := CreatePanel(rec, AddTextures, CurTex, trigRef); - //e_LogWritefln('panel #%s of type %s got id #%s', [pannum, rec.PanelType, PanelID]); - // set 'gamePanelId' field to panel id + // Ñîçäàåì ïàíåëü è çàïîìèíàåì åå GUID + 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 + // setup lifts + moveSpeed := rec.moveSpeed; + //moveStart := rec.moveStart; + //moveEnd := rec.moveEnd; + //moveActive := rec['move_active'].value; + if not moveSpeed.isZero then + begin + SetLength(gMovingWallIds, Length(gMovingWallIds)+1); + gMovingWallIds[High(gMovingWallIds)] := PanelID; + //e_LogWritefln('found moving panel ''%s'' (idx=%s; id=%s)', [rec.id, pannum, PanelID]); + end; + //e_LogWritefln('PANEND: pannum=%s', [pannum]); g_Game_StepLoading(); @@ -1957,6 +2042,7 @@ begin 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; end; // create map grid, init other grids (for monsters, for example) @@ -1979,9 +2065,24 @@ begin 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; //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].texPanIdx, tgpid, Word(b), Word(c)); + 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; @@ -2148,10 +2249,14 @@ begin mapReader := g_Map_ParseMap(Data, Len); except mapReader := nil; + FreeMem(Data); + exit; end; FreeMem(Data); + if (mapReader = nil) then exit; + if (mapReader.Width > 0) and (mapReader.Height > 0) then begin Result.Name := mapReader.MapName; @@ -2308,6 +2413,8 @@ begin BadTextNameHash := nil; end; + panByGUID := nil; + FreePanelArray(gWalls); FreePanelArray(gRenderBackgrounds); FreePanelArray(gRenderForegrounds); @@ -2317,6 +2424,7 @@ begin FreePanelArray(gSteps); FreePanelArray(gLifts); FreePanelArray(gBlockMon); + gMovingWallIds := nil; if BackID <> DWORD(-1) then begin @@ -2338,8 +2446,6 @@ begin gDoorMap := nil; gLiftMap := nil; - - PanelByID := nil; end; procedure g_Map_Update(); @@ -2353,12 +2459,12 @@ var i: Integer; begin - if panels <> nil then - for i := 0 to High(panels) do - panels[i].Update(); + for i := 0 to High(panels) do panels[i].Update(); end; begin + if g_dbgpan_mplat_step then g_dbgpan_mplat_active := true; + UpdatePanelArray(gWalls); UpdatePanelArray(gRenderBackgrounds); UpdatePanelArray(gRenderForegrounds); @@ -2367,24 +2473,26 @@ begin UpdatePanelArray(gAcid2); UpdatePanelArray(gSteps); + if g_dbgpan_mplat_step then begin g_dbgpan_mplat_step := false; g_dbgpan_mplat_active := false; end; + if gGameSettings.GameMode = GM_CTF then begin for a := FLAG_RED to FLAG_BLUE do + begin if not (gFlags[a].State in [FLAG_STATE_NONE, FLAG_STATE_CAPTURED]) then + begin with gFlags[a] do begin - if gFlags[a].Animation <> nil then - gFlags[a].Animation.Update(); + if gFlags[a].Animation <> nil then gFlags[a].Animation.Update(); m := g_Obj_Move(@Obj, True, True); - if gTime mod (GAME_TICK*2) <> 0 then - Continue; + if gTime mod (GAME_TICK*2) <> 0 then Continue; - // Ñîïðîòèâëåíèå âîçäóõà: + // Ñîïðîòèâëåíèå âîçäóõà Obj.Vel.X := z_dec(Obj.Vel.X, 1); - // Òàéìàóò ïîòåðÿííîãî ôëàãà, ëèáî îí âûïàë çà êàðòó: + // Òàéìàóò ïîòåðÿííîãî ôëàãà, ëèáî îí âûïàë çà êàðòó if ((Count = 0) or ByteBool(m and MOVE_FALLOUT)) and g_Game_IsServer then begin g_Map_ResetFlag(a); @@ -2400,30 +2508,28 @@ begin Continue; end; - if Count > 0 then - Count := Count - 1; + if Count > 0 then Count -= 1; - // Èãðîê áåðåò ôëàã: + // Èãðîê áåðåò ôëàã if gPlayers <> nil then begin j := Random(Length(gPlayers)) - 1; - for d := 0 to High(gPlayers) do begin Inc(j); - if j > High(gPlayers) then - j := 0; - + if j > High(gPlayers) then j := 0; if gPlayers[j] <> nil then - if gPlayers[j].Live and - g_Obj_Collide(@Obj, @gPlayers[j].Obj) then + begin + if gPlayers[j].alive and g_Obj_Collide(@Obj, @gPlayers[j].Obj) then begin - if gPlayers[j].GetFlag(a) then - Break; + if gPlayers[j].GetFlag(a) then Break; end; + end; end; end; end; + end; + end; end; end; @@ -2786,97 +2892,119 @@ begin end; -procedure g_Map_EnableWall(ID: DWORD); +procedure g_Map_EnableWall_XXX (ID: DWORD); begin if (ID < Length(gWalls)) then g_Map_EnableWallGUID(gWalls[ID].guid); end; +procedure g_Map_DisableWall_XXX (ID: DWORD); begin if (ID < Length(gWalls)) then g_Map_DisableWallGUID(gWalls[ID].guid); end; +procedure g_Map_SetLift_XXX (ID: DWORD; t: Integer); begin if (ID < Length(gLifts)) then g_Map_SetLiftGUID(gLifts[ID].guid, t); end; + + +procedure g_Map_EnableWallGUID (pguid: Integer); var pan: TPanel; begin - pan := gWalls[ID]; + //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); + g_Mark(pan.X, pan.Y, pan.Width, pan.Height, MARK_DOOR, true); mapGrid.proxyEnabled[pan.proxyId] := true; //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].PanelType, ID); + //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); {$ENDIF} end; -procedure g_Map_DisableWall(ID: DWORD); + +procedure g_Map_DisableWallGUID (pguid: Integer); var pan: TPanel; begin - pan := gWalls[ID]; + //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); + 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, ID); + //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); {$ENDIF} end; -procedure g_Map_SwitchTexture(PanelType: Word; ID: DWORD; AnimLoop: Byte = 0); + +procedure g_Map_SwitchTextureGUID (PanelType: Word; 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; + 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, ID, AnimLoop); + if g_Game_IsServer and g_Game_IsNet then MH_SEND_PanelTexture(pguid, AnimLoop); end; -procedure g_Map_SetLift(ID: DWORD; t: Integer); + +procedure g_Map_SetLiftGUID (pguid: Integer; t: Integer); +var + pan: TPanel; begin - if gLifts[ID].LiftType = t then - Exit; + //pan := gLifts[ID]; + pan := g_Map_PanelByGUID(pguid); + if (pan = nil) then exit; + if not pan.isGLift then exit; + + if ({gLifts[ID]}pan.LiftType = t) then exit; //!FIXME!TRIGANY! - with gLifts[ID] do + with {gLifts[ID]} pan do begin LiftType := t; - g_Mark(X, Y, Width, Height, MARK_LIFT, False); + g_Mark(X, Y, Width, Height, MARK_LIFT, false); //TODO: make separate lift tags, and change tag here - if LiftType = 0 then - g_Mark(X, Y, Width, Height, MARK_LIFTUP, True) - else if LiftType = 1 then - g_Mark(X, Y, Width, Height, MARK_LIFTDOWN, True) - else if LiftType = 2 then - g_Mark(X, Y, Width, Height, MARK_LIFTLEFT, True) - else if LiftType = 3 then - g_Mark(X, Y, Width, Height, MARK_LIFTRIGHT, True); + case LiftType of + 0: g_Mark(X, Y, Width, Height, MARK_LIFTUP); + 1: g_Mark(X, Y, Width, Height, MARK_LIFTDOWN); + 2: g_Mark(X, Y, Width, Height, MARK_LIFTLEFT); + 3: g_Mark(X, Y, Width, Height, MARK_LIFTRIGHT); + end; - if g_Game_IsServer and g_Game_IsNet then MH_SEND_PanelState(PanelType, ID); + //if g_Game_IsServer and g_Game_IsNet then MH_SEND_PanelState(pguid); + // mark platform as interesting + pan.setDirty(); end; end; -function g_Map_GetPoint(PointType: Byte; var RespawnPoint: TRespawnPoint): Boolean; + +function g_Map_GetPoint (PointType: Byte; var RespawnPoint: TRespawnPoint): Boolean; var a: Integer; PointsArray: Array of TRespawnPoint; @@ -2980,266 +3108,199 @@ begin end; end; -procedure g_Map_SaveState(Var Mem: TBinMemoryWriter); + +procedure g_Map_SaveState (var Mem: TBinMemoryWriter); var dw: DWORD; b: Byte; str: String; boo: Boolean; - procedure SavePanelArray(var panels: TPanelArray); + procedure savePanels (); var PAMem: TBinMemoryWriter; - i: Integer; + pan: TPanel; + count: Integer; begin - // Ñîçäàåì íîâûé ñïèñîê ñîõðàíÿåìûõ ïàíåëåé: - PAMem := TBinMemoryWriter.Create((Length(panels)+1) * 40); + // Ñîçäàåì íîâûé ñïèñîê ñîõðàíÿåìûõ ïàíåëåé + PAMem := TBinMemoryWriter.Create((Length(panByGUID)+1) * 40); - i := 0; - while i < Length(panels) do - begin - if panels[i].SaveIt then - begin - // ID ïàíåëè: - PAMem.WriteInt(i); - // Ñîõðàíÿåì ïàíåëü: - panels[i].SaveState(PAMem); - end; - Inc(i); - end; + // Ñîõðàíÿåì ïàíåëè + count := Length(panByGUID); + Mem.WriteInt(count); + for pan in panByGUID do pan.SaveState(PAMem); - // Ñîõðàíÿåì ýòîò ñïèñîê ïàíåëåé: + // Ñîõðàíÿåì ýòîò ñïèñîê ïàíåëåé PAMem.SaveToMemory(Mem); PAMem.Free(); end; - procedure SaveFlag(flag: PFlag); + procedure SaveFlag (flag: PFlag); begin - // Ñèãíàòóðà ôëàãà: + // Ñèãíàòóðà ôëàãà dw := FLAG_SIGNATURE; // 'FLAG' Mem.WriteDWORD(dw); - // Âðåìÿ ïåðåïîÿâëåíèÿ ôëàãà: + // Âðåìÿ ïåðåïîÿâëåíèÿ ôëàãà Mem.WriteByte(flag^.RespawnType); - // Ñîñòîÿíèå ôëàãà: + // Ñîñòîÿíèå ôëàãà Mem.WriteByte(flag^.State); - // Íàïðàâëåíèå ôëàãà: - if flag^.Direction = D_LEFT then - b := 1 - else // D_RIGHT - b := 2; + // Íàïðàâëåíèå ôëàãà + if flag^.Direction = D_LEFT then b := 1 else b := 2; // D_RIGHT Mem.WriteByte(b); - // Îáúåêò ôëàãà: + // Îáúåêò ôëàãà Obj_SaveState(@flag^.Obj, Mem); end; begin Mem := TBinMemoryWriter.Create(1024 * 1024); // 1 MB -///// Ñîõðàíÿåì ñïèñêè ïàíåëåé: ///// -// Ñîõðàíÿåì ïàíåëè ñòåí è äâåðåé: - SavePanelArray(gWalls); -// Ñîõðàíÿåì ïàíåëè ôîíà: - SavePanelArray(gRenderBackgrounds); -// Ñîõðàíÿåì ïàíåëè ïåðåäíåãî ïëàíà: - SavePanelArray(gRenderForegrounds); -// Ñîõðàíÿåì ïàíåëè âîäû: - SavePanelArray(gWater); -// Ñîõðàíÿåì ïàíåëè êèñëîòû-1: - SavePanelArray(gAcid1); -// Ñîõðàíÿåì ïàíåëè êèñëîòû-2: - SavePanelArray(gAcid2); -// Ñîõðàíÿåì ïàíåëè ñòóïåíåé: - SavePanelArray(gSteps); -// Ñîõðàíÿåì ïàíåëè ëèôòîâ: - SavePanelArray(gLifts); -///// ///// - -///// Ñîõðàíÿåì ìóçûêó: ///// -// Ñèãíàòóðà ìóçûêè: + ///// Ñîõðàíÿåì ñïèñêè ïàíåëåé: ///// + savePanels(); + ///// ///// + + ///// Ñîõðàíÿåì ìóçûêó: ///// + // Ñèãíàòóðà ìóçûêè: dw := MUSIC_SIGNATURE; // 'MUSI' Mem.WriteDWORD(dw); -// Íàçâàíèå ìóçûêè: + // Íàçâàíèå ìóçûêè: Assert(gMusic <> nil, 'g_Map_SaveState: gMusic = nil'); - if gMusic.NoMusic then - str := '' - else - str := gMusic.Name; + if gMusic.NoMusic then str := '' else str := gMusic.Name; Mem.WriteString(str, 64); -// Ïîçèöèÿ ïðîèãðûâàíèÿ ìóçûêè: + // Ïîçèöèÿ ïðîèãðûâàíèÿ ìóçûêè dw := gMusic.GetPosition(); Mem.WriteDWORD(dw); -// Ñòîèò ëè ìóçûêà íà ñïåö-ïàóçå: + // Ñòîèò ëè ìóçûêà íà ñïåö-ïàóçå boo := gMusic.SpecPause; Mem.WriteBoolean(boo); -///// ///// + ///// ///// -///// Ñîõðàíÿåì êîëè÷åñòâî ìîíñòðîâ: ///// + ///// Ñîõðàíÿåì êîëè÷åñòâî ìîíñòðîâ: ///// Mem.WriteInt(gTotalMonsters); -///// ///// + ///// ///// -//// Ñîõðàíÿåì ôëàãè, åñëè ýòî CTF: ///// + //// Ñîõðàíÿåì ôëàãè, åñëè ýòî CTF: ///// if gGameSettings.GameMode = GM_CTF then begin - // Ôëàã Êðàñíîé êîìàíäû: + // Ôëàã Êðàñíîé êîìàíäû SaveFlag(@gFlags[FLAG_RED]); - // Ôëàã Ñèíåé êîìàíäû: + // Ôëàã Ñèíåé êîìàíäû SaveFlag(@gFlags[FLAG_BLUE]); end; -///// ///// + ///// ///// -///// Ñîõðàíÿåì êîëè÷åñòâî ïîáåä, åñëè ýòî TDM/CTF: ///// + ///// Ñîõðàíÿåì êîëè÷åñòâî ïîáåä, åñëè ýòî TDM/CTF: ///// if gGameSettings.GameMode in [GM_TDM, GM_CTF] then begin - // Î÷êè Êðàñíîé êîìàíäû: + // Î÷êè Êðàñíîé êîìàíäû Mem.WriteSmallInt(gTeamStat[TEAM_RED].Goals); - // Î÷êè Ñèíåé êîìàíäû: + // Î÷êè Ñèíåé êîìàíäû Mem.WriteSmallInt(gTeamStat[TEAM_BLUE].Goals); end; -///// ///// + ///// ///// end; -procedure g_Map_LoadState(Var Mem: TBinMemoryReader); + +procedure g_Map_LoadState (var Mem: TBinMemoryReader); var dw: DWORD; b: Byte; str: String; boo: Boolean; - procedure LoadPanelArray(var panels: TPanelArray); + procedure loadPanels (); var PAMem: TBinMemoryReader; - i, id: Integer; + pan: TPanel; + count: LongInt; begin - // Çàãðóæàåì òåêóùèé ñïèñîê ïàíåëåé: + // Çàãðóæàåì òåêóùèé ñïèñîê ïàíåëåé PAMem := TBinMemoryReader.Create(); PAMem.LoadFromMemory(Mem); - for i := 0 to Length(panels)-1 do + // Çàãðóæàåì ïàíåëè + PAMem.ReadInt(count); + if (count <> Length(panByGUID)) then raise EBinSizeError.Create('g_Map_LoadState: LoadPanelArray: invalid number of panels'); + for pan in panByGUID do begin - if panels[i].SaveIt then - begin - // ID ïàíåëè: - PAMem.ReadInt(id); - if id <> i then - begin - raise EBinSizeError.Create('g_Map_LoadState: LoadPanelArray: Wrong Panel ID'); - end; - // Çàãðóæàåì ïàíåëü: - panels[i].LoadState(PAMem); - if (panels[i].arrIdx <> i) then raise Exception.Create('g_Map_LoadState: LoadPanelArray: Wrong Panel arrIdx'); - if (panels[i].proxyId >= 0) then mapGrid.proxyEnabled[panels[i].proxyId] := panels[i].Enabled; - end; + pan.LoadState(PAMem); + if (pan.proxyId >= 0) then mapGrid.proxyEnabled[pan.proxyId] := pan.Enabled; end; - // Ýòîò ñïèñîê ïàíåëåé çàãðóæåí: + // Ýòîò ñïèñîê ïàíåëåé çàãðóæåí PAMem.Free(); end; procedure LoadFlag(flag: PFlag); begin - // Ñèãíàòóðà ôëàãà: + // Ñèãíàòóðà ôëàãà Mem.ReadDWORD(dw); - if dw <> FLAG_SIGNATURE then // 'FLAG' - begin - raise EBinSizeError.Create('g_Map_LoadState: LoadFlag: Wrong Flag Signature'); - end; - // Âðåìÿ ïåðåïîÿâëåíèÿ ôëàãà: + // 'FLAG' + if dw <> FLAG_SIGNATURE then raise EBinSizeError.Create('g_Map_LoadState: LoadFlag: Wrong Flag Signature'); + // Âðåìÿ ïåðåïîÿâëåíèÿ ôëàãà Mem.ReadByte(flag^.RespawnType); - // Ñîñòîÿíèå ôëàãà: + // Ñîñòîÿíèå ôëàãà Mem.ReadByte(flag^.State); - // Íàïðàâëåíèå ôëàãà: + // Íàïðàâëåíèå ôëàãà Mem.ReadByte(b); - if b = 1 then - flag^.Direction := D_LEFT - else // b = 2 - flag^.Direction := D_RIGHT; - // Îáúåêò ôëàãà: + if b = 1 then flag^.Direction := D_LEFT else flag^.Direction := D_RIGHT; // b = 2 + // Îáúåêò ôëàãà Obj_LoadState(@flag^.Obj, Mem); end; begin - if Mem = nil then - Exit; + if Mem = nil then Exit; + + ///// Çàãðóæàåì ñïèñêè ïàíåëåé: ///// + loadPanels(); + ///// ///// -///// Çàãðóæàåì ñïèñêè ïàíåëåé: ///// -// Çàãðóæàåì ïàíåëè ñòåí è äâåðåé: - LoadPanelArray(gWalls); -// Çàãðóæàåì ïàíåëè ôîíà: - LoadPanelArray(gRenderBackgrounds); -// Çàãðóæàåì ïàíåëè ïåðåäíåãî ïëàíà: - LoadPanelArray(gRenderForegrounds); -// Çàãðóæàåì ïàíåëè âîäû: - LoadPanelArray(gWater); -// Çàãðóæàåì ïàíåëè êèñëîòû-1: - LoadPanelArray(gAcid1); -// Çàãðóæàåì ïàíåëè êèñëîòû-2: - LoadPanelArray(gAcid2); -// Çàãðóæàåì ïàíåëè ñòóïåíåé: - LoadPanelArray(gSteps); -// Çàãðóæàåì ïàíåëè ëèôòîâ: - LoadPanelArray(gLifts); -///// ///// - -// Îáíîâëÿåì êàðòó ñòîëêíîâåíèé è ñåòêó: + // Îáíîâëÿåì êàðòó ñòîëêíîâåíèé è ñåòêó g_GFX_Init(); //mapCreateGrid(); -///// Çàãðóæàåì ìóçûêó: ///// -// Ñèãíàòóðà ìóçûêè: + ///// Çàãðóæàåì ìóçûêó: ///// + // Ñèãíàòóðà ìóçûêè Mem.ReadDWORD(dw); - if dw <> MUSIC_SIGNATURE then // 'MUSI' - begin - raise EBinSizeError.Create('g_Map_LoadState: Wrong Music Signature'); - end; -// Íàçâàíèå ìóçûêè: + // 'MUSI' + if dw <> MUSIC_SIGNATURE then raise EBinSizeError.Create('g_Map_LoadState: Wrong Music Signature'); + // Íàçâàíèå ìóçûêè Assert(gMusic <> nil, 'g_Map_LoadState: gMusic = nil'); Mem.ReadString(str); -// Ïîçèöèÿ ïðîèãðûâàíèÿ ìóçûêè: + // Ïîçèöèÿ ïðîèãðûâàíèÿ ìóçûêè Mem.ReadDWORD(dw); -// Ñòîèò ëè ìóçûêà íà ñïåö-ïàóçå: + // Ñòîèò ëè ìóçûêà íà ñïåö-ïàóçå Mem.ReadBoolean(boo); -// Çàïóñêàåì ýòó ìóçûêó: + // Çàïóñêàåì ýòó ìóçûêó gMusic.SetByName(str); gMusic.SpecPause := boo; gMusic.Play(); gMusic.Pause(True); gMusic.SetPosition(dw); -///// ///// + ///// ///// -///// Çàãðóæàåì êîëè÷åñòâî ìîíñòðîâ: ///// + ///// Çàãðóæàåì êîëè÷åñòâî ìîíñòðîâ: ///// Mem.ReadInt(gTotalMonsters); -///// ///// + ///// ///// -//// Çàãðóæàåì ôëàãè, åñëè ýòî CTF: ///// + //// Çàãðóæàåì ôëàãè, åñëè ýòî CTF: ///// if gGameSettings.GameMode = GM_CTF then begin - // Ôëàã Êðàñíîé êîìàíäû: + // Ôëàã Êðàñíîé êîìàíäû LoadFlag(@gFlags[FLAG_RED]); - // Ôëàã Ñèíåé êîìàíäû: + // Ôëàã Ñèíåé êîìàíäû LoadFlag(@gFlags[FLAG_BLUE]); end; -///// ///// + ///// ///// -///// Çàãðóæàåì êîëè÷åñòâî ïîáåä, åñëè ýòî TDM/CTF: ///// + ///// Çàãðóæàåì êîëè÷åñòâî ïîáåä, åñëè ýòî TDM/CTF: ///// if gGameSettings.GameMode in [GM_TDM, GM_CTF] then begin - // Î÷êè Êðàñíîé êîìàíäû: + // Î÷êè Êðàñíîé êîìàíäû Mem.ReadSmallInt(gTeamStat[TEAM_RED].Goals); - // Î÷êè Ñèíåé êîìàíäû: + // Î÷êè Ñèíåé êîìàíäû Mem.ReadSmallInt(gTeamStat[TEAM_BLUE].Goals); end; -///// ///// -end; - -function g_Map_PanelForPID(PanelID: Integer; var PanelArrayID: Integer): PPanel; -var - Arr: TPanelArray; -begin - Result := nil; - if (PanelID < 0) or (PanelID > High(PanelByID)) then Exit; - Arr := PanelByID[PanelID].PWhere^; - PanelArrayID := PanelByID[PanelID].PArrID; - Result := Addr(Arr[PanelByID[PanelID].PArrID]); + ///// ///// end;