diff --git a/src/game/g_game.pas b/src/game/g_game.pas
index cf87c940dd9abc81ef4e179bcba5259f7a86c42c..87e4f907deffe20e42522d03beaa16593ae63fd1 100644 (file)
--- a/src/game/g_game.pas
+++ b/src/game/g_game.pas
GAME_OPTION_BOTVSPLAYER = 32;
GAME_OPTION_BOTVSMONSTER = 64;
GAME_OPTION_DMKEYS = 128;
GAME_OPTION_BOTVSPLAYER = 32;
GAME_OPTION_BOTVSMONSTER = 64;
GAME_OPTION_DMKEYS = 128;
+ GAME_OPTION_RESPAWNITEMS = 256;
STATE_NONE = 0;
STATE_MENU = 1;
STATE_NONE = 0;
STATE_MENU = 1;
b := -py+(gPlayerScreenSize.Y div 2);
end;
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;
sX := -a;
- sY := -(b+p.IncCam);
+ sY := -b;
sWidth := gPlayerScreenSize.X;
sHeight := gPlayerScreenSize.Y;
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;
begin
if (sX+sWidth > gMapInfo.Width) then sX := gMapInfo.Width-sWidth;
if (sY+sHeight > gMapInfo.Height) then sY := gMapInfo.Height-sHeight;
g_Console_Add(_lc[I_MSG_DMKEYS_ON])
else
g_Console_Add(_lc[I_MSG_DMKEYS_OFF]);
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;
if g_Game_IsNet then MH_SEND_GameSettings;
end;