X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_game.pas;h=854a15a978ea9dbb3faecef572e6973abaa77ebb;hb=08e3dd168587e3c1f65cc9b2b93d917c7617c0ce;hp=504171d4e52390b2bce42e5fbd34e78d473a3b40;hpb=64579b586c89085de93fe02cb56be9751105b67c;p=d2df-sdl.git diff --git a/src/game/g_game.pas b/src/game/g_game.pas index 504171d..854a15a 100644 --- a/src/game/g_game.pas +++ b/src/game/g_game.pas @@ -180,6 +180,7 @@ const GAME_OPTION_BOTVSPLAYER = 32; GAME_OPTION_BOTVSMONSTER = 64; GAME_OPTION_DMKEYS = 128; + GAME_OPTION_RESPAWNITEMS = 256; STATE_NONE = 0; STATE_MENU = 1; @@ -3667,67 +3668,45 @@ begin b := -py+(gPlayerScreenSize.Y div 2); end; - if p.IncCam <> 0 then - begin - if py > gMapInfo.Height-(gPlayerScreenSize.Y div 2) then - begin - if p.IncCam > 120-(py-(gMapInfo.Height-(gPlayerScreenSize.Y div 2))) then - begin - p.IncCam := 120-(py-(gMapInfo.Height-(gPlayerScreenSize.Y div 2))); - end; - end; - - if py < gPlayerScreenSize.Y div 2 then - begin - if p.IncCam < -120+((gPlayerScreenSize.Y div 2)-py) then - begin - p.IncCam := -120+((gPlayerScreenSize.Y div 2)-py); - end; - end; - - if p.IncCam < 0 then - begin - while (py+(gPlayerScreenSize.Y div 2)-p.IncCam > gMapInfo.Height) and (p.IncCam < 0) do p.IncCam := p.IncCam+1; //Inc(p.IncCam); - end; - - if p.IncCam > 0 then - begin - while (py-(gPlayerScreenSize.Y div 2)-p.IncCam < 0) and (p.IncCam > 0) do p.IncCam := p.IncCam-1; //Dec(p.IncCam); - end; - end; - - if (px < gPlayerScreenSize.X div 2) or (gMapInfo.Width-gPlayerScreenSize.X <= 256) then c := 0 - else if (px > gMapInfo.Width-(gPlayerScreenSize.X div 2)) then c := gBackSize.X-gPlayerScreenSize.X - else c := round((px-(gPlayerScreenSize.X div 2))/(gMapInfo.Width-gPlayerScreenSize.X)*(gBackSize.X-gPlayerScreenSize.X)); - - if (py-p.IncCam <= gPlayerScreenSize.Y div 2) or (gMapInfo.Height-gPlayerScreenSize.Y <= 256) then d := 0 - else if (py-p.IncCam >= gMapInfo.Height-(gPlayerScreenSize.Y div 2)) then d := gBackSize.Y-gPlayerScreenSize.Y - else d := round((py-p.IncCam-(gPlayerScreenSize.Y div 2))/(gMapInfo.Height-gPlayerScreenSize.Y)*(gBackSize.Y-gPlayerScreenSize.Y)); - sX := -a; - sY := -(b+p.IncCam); + sY := -b; sWidth := gPlayerScreenSize.X; sHeight := gPlayerScreenSize.Y; + fixViewportForScale(); - //glTranslatef(a, b+p.IncCam, 0); - - //if (p = gPlayer1) and (g_dbg_scale >= 1.0) then g_Holmes_plrViewSize(sWidth, sHeight); + i := py - (sY + sHeight div 2); + if (p.IncCam > 0) then + begin + // clamp to level bounds + if (sY - p.IncCam < 0) then + p.IncCam := nclamp(sY, 0, 120); + // clamp around player position + if (i > 0) then + p.IncCam := nclamp(p.IncCam, 0, max(0, 120 - i)); + end + else if (p.IncCam < 0) then + begin + // clamp to level bounds + if (sY + sHeight - p.IncCam > gMapInfo.Height) then + p.IncCam := nclamp(sY + sHeight - gMapInfo.Height, -120, 0); + // clamp around player position + if (i < 0) then + p.IncCam := nclamp(p.IncCam, min(0, -120 - i), 0); + end; - //conwritefln('OLD: (%s,%s)-(%s,%s)', [sX, sY, sWidth, sHeight]); - fixViewportForScale(); - //conwritefln(' (%s,%s)-(%s,%s)', [sX, sY, sWidth, sHeight]); + sY := sY - p.IncCam; - if (g_dbg_scale <> 1.0) and (not g_dbg_ignore_bounds) then + if (not g_dbg_ignore_bounds) then begin if (sX+sWidth > gMapInfo.Width) then sX := gMapInfo.Width-sWidth; if (sY+sHeight > gMapInfo.Height) then sY := gMapInfo.Height-sHeight; if (sX < 0) then sX := 0; if (sY < 0) then sY := 0; - - if (gBackSize.X <= gPlayerScreenSize.X) or (gMapInfo.Width <= sWidth) then c := 0 else c := trunc((gBackSize.X-gPlayerScreenSize.X)*sX/(gMapInfo.Width-sWidth)); - if (gBackSize.Y <= gPlayerScreenSize.Y) or (gMapInfo.Height <= sHeight) then d := 0 else d := trunc((gBackSize.Y-gPlayerScreenSize.Y)*sY/(gMapInfo.Height-sHeight)); end; + if (gBackSize.X <= gPlayerScreenSize.X) or (gMapInfo.Width <= sWidth) then c := 0 else c := trunc((gBackSize.X-gPlayerScreenSize.X)*sX/(gMapInfo.Width-sWidth)); + if (gBackSize.Y <= gPlayerScreenSize.Y) or (gMapInfo.Height <= sHeight) then d := 0 else d := trunc((gBackSize.Y-gPlayerScreenSize.Y)*sY/(gMapInfo.Height-sHeight)); + //r_smallmap_h: 0: left; 1: center; 2: right //r_smallmap_v: 0: top; 1: center; 2: bottom // horiz small map? @@ -4641,7 +4620,7 @@ begin // Ñòàðòóåì ñåðâåð if not g_Net_Host(IPAddr, Port, NetMaxClients) then begin - g_FatalError(_lc[I_NET_MSG] + _lc[I_NET_ERR_HOST]); + g_FatalError(_lc[I_NET_MSG] + Format(_lc[I_NET_ERR_HOST], [Port])); Exit; end; @@ -5572,7 +5551,27 @@ begin g_Console_Add(_lc[I_MSG_DMKEYS_ON]) else g_Console_Add(_lc[I_MSG_DMKEYS_OFF]); - g_Console_Add(_lc[I_MSG_ONMAPCHANGE]); + + if g_Game_IsNet then MH_SEND_GameSettings; + end; + end + else if (cmd = 'g_respawn_items') and not g_Game_IsClient then + begin + with gGameSettings do + begin + if (Length(P) > 1) and + ((P[1] = '1') or (P[1] = '0')) then + begin + if (P[1][1] = '1') then + Options := Options or GAME_OPTION_RESPAWNITEMS + else + Options := Options and (not GAME_OPTION_RESPAWNITEMS); + end; + + if (LongBool(Options and GAME_OPTION_RESPAWNITEMS)) then + g_Console_Add(_lc[I_MSG_RESPAWNITEMS_ON]) + else + g_Console_Add(_lc[I_MSG_RESPAWNITEMS_OFF]); if g_Game_IsNet then MH_SEND_GameSettings; end; @@ -7246,6 +7245,30 @@ begin end else g_Console_Add(_lc[I_MSG_SERVERONLY]); end + else if cmd = 'centerprint' then + begin + if (Length(P) > 2) and (P[1] <> '') then + begin + chstr := ''; + for a := 2 to High(P) do + chstr := chstr + P[a] + ' '; + + if Length(chstr) > 200 then SetLength(chstr, 200); + + if Length(chstr) < 1 then + begin + g_Console_Add('centerprint '); + Exit; + end; + + a := StrToIntDef(P[1], 100); + chstr := b_Text_Format(chstr); + g_Game_Message(chstr, a); + if g_Game_IsNet and g_Game_IsServer then + MH_SEND_GameEvent(NET_EV_BIGTEXT, a, chstr); + end + else g_Console_Add('centerprint '); + end else if (cmd = 'overtime') and not g_Game_IsClient then begin if (Length(P) = 1) or (StrToIntDef(P[1], -1) <= 0) then