X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_panel.pas;h=f8a252edf80374a6abc32a59f229d7986f42f046;hb=c8d05082e92b7c2c5b722e2b205e96a15a32eec2;hp=0a52568dd4706237bf1506fa881add0d2694c20f;hpb=716e8233028cb94e958b09dccc83e72c4ab0038d;p=d2df-sdl.git diff --git a/src/game/g_panel.pas b/src/game/g_panel.pas index 0a52568..f8a252e 100644 --- a/src/game/g_panel.pas +++ b/src/game/g_panel.pas @@ -29,6 +29,12 @@ type Anim: Boolean; end; + ATextureID = array of record + case Anim: Boolean of + False: (Tex: Cardinal); + True: (AnTex: TAnimation); + end; + PPanel = ^TPanel; TPanel = Class (TObject) private @@ -39,13 +45,7 @@ type FTextureHeight: Word; FAlpha: Byte; FBlending: Boolean; - FTextureIDs: Array of - record - case Anim: Boolean of - False: (Tex: Cardinal); - True: (AnTex: TAnimation); - end; - + FTextureIDs: ATextureID; mMovingSpeed: TDFPoint; mMovingStart: TDFPoint; mMovingEnd: TDFPoint; @@ -97,7 +97,9 @@ type FCurFrame: Integer; FCurFrameCount: Byte; FX, FY: Integer; + FOldX, FOldY: Integer; FWidth, FHeight: Word; + FOldW, FOldH: Word; FPanelType: Word; FEnabled: Boolean; FDoor: Boolean; @@ -117,8 +119,6 @@ type var Textures: TLevelTextureArray; aguid: Integer); destructor Destroy(); override; - procedure Draw (hasAmbient: Boolean; constref ambColor: TDFColor); - procedure DrawShadowVolume(lightX: Integer; lightY: Integer; radius: Integer); procedure Update(); procedure SetFrame(Frame: Integer; Count: Byte); procedure NextTexture(AnimLoop: Byte = 0); @@ -159,6 +159,10 @@ type property y: Integer read FY write FY; property width: Word read FWidth write FWidth; property height: Word read FHeight write FHeight; + property oldX: Integer read FOldX; + property oldY: Integer read FOldY; + property oldWidth: Word read FOldW; + property oldHeight: Word read FOldH; property panelType: Word read FPanelType write FPanelType; property enabled: Boolean read FEnabled write FEnabled; property door: Boolean read FDoor write FDoor; @@ -189,6 +193,13 @@ type property isGLift: Boolean read getIsGLift; property isGBlockMon: Boolean read getIsGBlockMon; + (* private state *) + property Alpha: Byte read FAlpha; + property TextureWidth: Word read FTextureWidth; + property TextureHeight: Word read FTextureHeight; + property Blending: Boolean read FBlending; + property TextureIDs: ATextureID read FTextureIDs; + public property movingSpeed: TDFPoint read mMovingSpeed write mMovingSpeed; property movingStart: TDFPoint read mMovingStart write mMovingStart; @@ -217,8 +228,7 @@ var implementation uses - {$INCLUDE ../nogl/noGLuses.inc} - e_texture, g_basic, g_map, g_game, g_gfx, e_graphics, g_weapons, g_triggers, + g_basic, g_map, g_game, g_gfx, g_weapons, g_triggers, g_items, g_console, g_language, g_monsters, g_player, g_grid, e_log, geom, utils, xstreams; const @@ -236,8 +246,12 @@ var begin X := PanelRec.X; Y := PanelRec.Y; + FOldX := X; + FOldY := Y; Width := PanelRec.Width; Height := PanelRec.Height; + FOldW := Width; + FOldH := Height; FAlpha := 0; FBlending := False; FCurFrame := 0; @@ -423,111 +437,6 @@ function TPanel.getIsGBlockMon (): Boolean; inline; begin result := ((tag and Gr function TPanel.gncNeedSend (): Boolean; inline; begin result := mNeedSend; mNeedSend := false; end; procedure TPanel.setDirty (); inline; begin mNeedSend := true; end; - -procedure TPanel.Draw (hasAmbient: Boolean; constref ambColor: TDFColor); -var - xx, yy: Integer; - NoTextureID: DWORD; - NW, NH: Word; -begin - if {Enabled and} (FCurTexture >= 0) and - (Width > 0) and (Height > 0) and (FAlpha < 255) {and - g_Collide(X, Y, Width, Height, sX, sY, sWidth, sHeight)} then - begin - if FTextureIDs[FCurTexture].Anim then - begin // Àíèìèðîâàííàÿ òåêñòóðà - if FTextureIDs[FCurTexture].AnTex = nil then - Exit; - - for xx := 0 to (Width div FTextureWidth)-1 do - for yy := 0 to (Height div FTextureHeight)-1 do - FTextureIDs[FCurTexture].AnTex.Draw( - X + xx*FTextureWidth, - Y + yy*FTextureHeight, TMirrorType.None); - end - else - begin // Îáû÷íàÿ òåêñòóðà - case FTextureIDs[FCurTexture].Tex of - LongWord(TEXTURE_SPECIAL_WATER): e_DrawFillQuad(X, Y, X+Width-1, Y+Height-1, 0, 0, 255, 0, TBlending.Filter); - LongWord(TEXTURE_SPECIAL_ACID1): e_DrawFillQuad(X, Y, X+Width-1, Y+Height-1, 0, 230, 0, 0, TBlending.Filter); - LongWord(TEXTURE_SPECIAL_ACID2): e_DrawFillQuad(X, Y, X+Width-1, Y+Height-1, 230, 0, 0, 0, TBlending.Filter); - LongWord(TEXTURE_NONE): - if g_Texture_Get('NOTEXTURE', NoTextureID) then - begin - e_GetTextureSize(NoTextureID, @NW, @NH); - e_DrawFill(NoTextureID, X, Y, Width div NW, Height div NH, 0, False, False); - end - else - begin - xx := X + (Width div 2); - yy := Y + (Height div 2); - e_DrawFillQuad(X, Y, xx, yy, 255, 0, 255, 0); - e_DrawFillQuad(xx, Y, X+Width-1, yy, 255, 255, 0, 0); - e_DrawFillQuad(X, yy, xx, Y+Height-1, 255, 255, 0, 0); - e_DrawFillQuad(xx, yy, X+Width-1, Y+Height-1, 255, 0, 255, 0); - end; - else - begin - if not mMovingActive then - e_DrawFill(FTextureIDs[FCurTexture].Tex, X, Y, Width div FTextureWidth, Height div FTextureHeight, FAlpha, True, FBlending, hasAmbient) - else - e_DrawFillX(FTextureIDs[FCurTexture].Tex, X, Y, Width, Height, FAlpha, True, FBlending, g_dbg_scale, hasAmbient); - if hasAmbient then e_AmbientQuad(X, Y, Width, Height, ambColor.r, ambColor.g, ambColor.b, ambColor.a); - end; - end; - end; - end; -end; - -procedure TPanel.DrawShadowVolume(lightX: Integer; lightY: Integer; radius: Integer); - procedure extrude (x: Integer; y: Integer); - begin - glVertex2i(x+(x-lightX)*500, y+(y-lightY)*500); - //e_WriteLog(Format(' : (%d,%d)', [x+(x-lightX)*300, y+(y-lightY)*300]), MSG_WARNING); - end; - - procedure drawLine (x0: Integer; y0: Integer; x1: Integer; y1: Integer); - begin - // does this side facing the light? - if ((x1-x0)*(lightY-y0)-(lightX-x0)*(y1-y0) >= 0) then exit; - //e_WriteLog(Format('lightpan: (%d,%d)-(%d,%d)', [x0, y0, x1, y1]), MSG_WARNING); - // this edge is facing the light, extrude and draw it - glVertex2i(x0, y0); - glVertex2i(x1, y1); - extrude(x1, y1); - extrude(x0, y0); - end; - -begin - if radius < 4 then exit; - if Enabled and (FCurTexture >= 0) and (Width > 0) and (Height > 0) and (FAlpha < 255) {and - g_Collide(X, Y, Width, Height, sX, sY, sWidth, sHeight)} then - begin - if not FTextureIDs[FCurTexture].Anim then - begin - case FTextureIDs[FCurTexture].Tex of - LongWord(TEXTURE_SPECIAL_WATER): exit; - LongWord(TEXTURE_SPECIAL_ACID1): exit; - LongWord(TEXTURE_SPECIAL_ACID2): exit; - LongWord(TEXTURE_NONE): exit; - end; - end; - if (X+Width < lightX-radius) then exit; - if (Y+Height < lightY-radius) then exit; - if (X > lightX+radius) then exit; - if (Y > lightY+radius) then exit; - //e_DrawFill(FTextureIDs[FCurTexture].Tex, X, Y, Width div FTextureWidth, Height div FTextureHeight, FAlpha, True, FBlending); - - glBegin(GL_QUADS); - drawLine(x, y, x+width, y); // top - drawLine(x+width, y, x+width, y+height); // right - drawLine(x+width, y+height, x, y+height); // bottom - drawLine(x, y+height, x, y); // left - glEnd(); - end; -end; - - procedure TPanel.positionChanged (); inline; var px, py, pw, ph: Integer; @@ -575,6 +484,7 @@ var nx, ny, nw, nh: Integer; ex, ey, nex, ney: Integer; mpw, mph: Integer; + conveyor: Boolean; // return `true` if we should move by dx,dy function tryMPlatMove (px, py, pw, ph: Integer; out dx, dy: Integer; out squash: Boolean; ontop: PBoolean=nil): Boolean; @@ -650,7 +560,7 @@ var dx := tex-px; dy := tey-py; result := (dx <> 0) or (dy <> 0); - if ((tag and (GridTagWall or GridTagDoor)) <> 0) then + if not conveyor and ((tag and (GridTagWall or GridTagDoor)) <> 0) then begin // check for squashing; as entity cannot be pushed into a wall, check only collision with the platform itself squash := g_Collide(tex, tey, pw, ph, nx, ny, nw, nh); // squash, if still in platform @@ -674,6 +584,8 @@ var gib: PGib; cor: TCorpse; mon: TMonster; + flg: PFlag; + itm: PItem; mpfrid: LongWord; ontop: Boolean; actMoveTrig: Boolean; @@ -716,10 +628,19 @@ begin mpw := Width; mph := Height; + // the mplat acts as a stationary conveyor belt when it's locked within a movement rect of zero area + conveyor := (mMovingEnd.X = mMovingStart.X) and (mMovingEnd.Y = mMovingStart.Y) + and (mMovingEnd.X = X) and (mMovingEnd.Y = Y); + nw := mpw+mSizeSpeed.w; nh := mph+mSizeSpeed.h; - nx := ox+mMovingSpeed.X; - ny := oy+mMovingSpeed.Y; + nx := ox; + ny := oy; + if not conveyor then + begin + nx += mMovingSpeed.X; + ny += mMovingSpeed.Y; + end; // force network updates only if some sudden change happened // set the flag here, so we can sync affected monsters @@ -808,6 +729,40 @@ begin end; end; + // move and push flags + if gGameSettings.GameMode = GM_CTF then + for f := FLAG_RED to FLAG_BLUE do + begin + flg := @gFlags[f]; + if (flg.State in [FLAG_STATE_NONE, FLAG_STATE_CAPTURED]) then continue; + px := flg.Obj.X+flg.Obj.Rect.X; + py := flg.Obj.Y+flg.Obj.Rect.Y; + pw := flg.Obj.Rect.Width; + ph := flg.Obj.Rect.Height; + if not g_Collide(px, py, pw, ph, cx0, cy0, cw, ch) then continue; + if tryMPlatMove(px, py, pw, ph, pdx, pdy, squash, @ontop) then + if (pdx <> 0) or (pdy <> 0) then + begin + flg.Obj.X := flg.Obj.X + pdx; + flg.Obj.Y := flg.Obj.Y + pdy; + flg.NeedSend := true; + end; + end; + + // move and push items + itm := g_Items_NextAlive(-1); + while itm <> nil do + begin + if itm.Fall then + begin + itm.getMapBox(px, py, pw, ph); + if g_Collide(px, py, pw, ph, cx0, cy0, cw, ch) then + if tryMPlatMove(px, py, pw, ph, pdx, pdy, squash, @ontop) then + itm.moveBy(pdx, pdy); // this will call `positionChanged()` for us + end; + itm := g_Items_NextAlive(itm.myId); + end; + // collect monsters monCheckListUsed := 0; g_Mons_ForEachAt(cx0, cy0, cw, ch, monCollect); @@ -843,8 +798,12 @@ begin end; // move panel + FOldX := X; + FOldY := Y; X := nx; Y := ny; + FOldW := FWidth; + FOldH := FHeight; FWidth := nw; FHeight := nh; positionChanged(); @@ -863,21 +822,24 @@ begin if (nw < 1) or (nh < 1) then mMovingActive := false; //HACK! end; - // reverse moving direction, if necessary - if ((mMovingSpeed.X < 0) and (nx <= mMovingStart.X)) or ((mMovingSpeed.X > 0) and (nx >= mMovingEnd.X)) then + if not conveyor then begin - if mMoveOnce then mMovingActive := false else mMovingSpeed.X := -mMovingSpeed.X; - actMoveTrig := true; - end; + // reverse moving direction, if necessary + if ((mMovingSpeed.X < 0) and (nx <= mMovingStart.X)) or ((mMovingSpeed.X > 0) and (nx >= mMovingEnd.X)) then + begin + if mMoveOnce then mMovingActive := false else mMovingSpeed.X := -mMovingSpeed.X; + actMoveTrig := true; + end; - if ((mMovingSpeed.Y < 0) and (ny <= mMovingStart.Y)) or ((mMovingSpeed.Y > 0) and (ny >= mMovingEnd.Y)) then - begin - if mMoveOnce then mMovingActive := false else mMovingSpeed.Y := -mMovingSpeed.Y; - actMoveTrig := true; - end; + if ((mMovingSpeed.Y < 0) and (ny <= mMovingStart.Y)) or ((mMovingSpeed.Y > 0) and (ny >= mMovingEnd.Y)) then + begin + if mMoveOnce then mMovingActive := false else mMovingSpeed.Y := -mMovingSpeed.Y; + actMoveTrig := true; + end; - if (mOldMovingActive <> mMovingActive) then mNeedSend := true; - mOldMovingActive := mMovingActive; + if (mOldMovingActive <> mMovingActive) then mNeedSend := true; + mOldMovingActive := mMovingActive; + end; if not g_Game_IsClient then begin @@ -1089,8 +1051,12 @@ begin // Êîîðäèíàòû è ðàçìåð FX := utils.readLongInt(st); FY := utils.readLongInt(st); + FOldX := FX; + FOldY := FY; FWidth := utils.readWord(st); FHeight := utils.readWord(st); + FOldW := FWidth; + FOldH := FHeight; // Àíèìèðîâàííàÿ ëè òåêóùàÿ òåêñòóðà if utils.readBool(st) then begin