diff --git a/src/game/g_game.pas b/src/game/g_game.pas
index 504171d4e52390b2bce42e5fbd34e78d473a3b40..7da95bf0499b2c8b41abe7759460351c2c931314 100644 (file)
--- a/src/game/g_game.pas
+++ b/src/game/g_game.pas
GoalLimit: Word;
WarmupTime: Word;
SpawnInvul: Word;
GoalLimit: Word;
WarmupTime: Word;
SpawnInvul: Word;
+ ItemRespawnTime: Word;
MaxLives: Byte;
Options: LongWord;
WAD: String;
MaxLives: Byte;
Options: LongWord;
WAD: String;
procedure g_Game_LoadData();
procedure g_Game_FreeData();
procedure g_Game_Update();
procedure g_Game_LoadData();
procedure g_Game_FreeData();
procedure g_Game_Update();
+procedure g_Game_PreUpdate();
procedure g_Game_Draw();
procedure g_Game_Quit();
procedure g_Game_SetupScreenSize();
procedure g_Game_Draw();
procedure g_Game_Quit();
procedure g_Game_SetupScreenSize();
function g_Game_IsTestMap(): Boolean;
procedure g_Game_DeleteTestMap();
procedure GameCVars(P: SSArray);
function g_Game_IsTestMap(): Boolean;
procedure g_Game_DeleteTestMap();
procedure GameCVars(P: SSArray);
+procedure PlayerSettingsCVars(P: SSArray);
+procedure SystemCommands(P: SSArray);
procedure GameCommands(P: SSArray);
procedure GameCheats(P: SSArray);
procedure DebugCommands(P: SSArray);
procedure GameCommands(P: SSArray);
procedure GameCheats(P: SSArray);
procedure DebugCommands(P: SSArray);
gPlayer2: TPlayer = nil;
gPlayerDrawn: TPlayer = nil;
gTime: LongWord;
gPlayer2: TPlayer = nil;
gPlayerDrawn: TPlayer = nil;
gTime: LongWord;
+ gLerpFactor: Single = 1.0;
gSwitchGameMode: Byte = GM_DM;
gHearPoint1, gHearPoint2: THearPoint;
gSoundEffectsDF: Boolean = False;
gSwitchGameMode: Byte = GM_DM;
gHearPoint1, gHearPoint2: THearPoint;
gSoundEffectsDF: Boolean = False;
gMapToDelete: String;
gTempDelete: Boolean = False;
gLastMap: Boolean = False;
gMapToDelete: String;
gTempDelete: Boolean = False;
gLastMap: Boolean = False;
- gWinSizeX, gWinSizeY: Integer;
+ gScreenWidth: Word;
+ gScreenHeight: Word;
gResolutionChange: Boolean = False;
gRC_Width, gRC_Height: Integer;
gRC_FullScreen, gRC_Maximized: Boolean;
gResolutionChange: Boolean = False;
gRC_Width, gRC_Height: Integer;
gRC_FullScreen, gRC_Maximized: Boolean;
e_input, e_log, g_console, g_items, g_map, g_panel,
g_playermodel, g_gfx, g_options, Math,
g_triggers, g_monsters, e_sound, CONFIG,
e_input, e_log, g_console, g_items, g_map, g_panel,
g_playermodel, g_gfx, g_options, Math,
g_triggers, g_monsters, e_sound, CONFIG,
- g_language, g_net, g_main,
+ g_language, g_net, g_main, g_phys,
ENet, e_msg, g_netmsg, g_netmaster,
sfs, wadreader, g_system;
ENet, e_msg, g_netmsg, g_netmaster,
sfs, wadreader, g_system;
SortGameStat(CustomStat.PlayerStat);
SortGameStat(CustomStat.PlayerStat);
- if (gSaveStats or gScreenshotStats) and (Length(gPlayers) > 1) then
+ if (gSaveStats or gScreenshotStats) and (Length(CustomStat.PlayerStat) > 1) then
begin
t := Now;
if g_Game_IsNet then StatFilename := NetServerName else StatFilename := 'local';
begin
t := Now;
if g_Game_IsNet then StatFilename := NetServerName else StatFilename := 'local';
MC_SEND_CheatRequest(NET_CHEAT_READY);
end;
MC_SEND_CheatRequest(NET_CHEAT_READY);
end;
+procedure g_Game_PreUpdate();
+begin
+ // these are in separate PreUpdate functions because they can interact during Update()
+ // and are synced over the net
+ // we don't care that much about corpses and gibs
+ g_Player_PreUpdate();
+ g_Monsters_PreUpdate();
+ g_Items_PreUpdate();
+ g_Weapon_PreUpdate();
+end;
+
procedure g_Game_Update();
var
Msg: g_gui.TMessage;
procedure g_Game_Update();
var
Msg: g_gui.TMessage;
end;
// HACK: take stats screenshot immediately after the first frame of the stats showing
end;
// HACK: take stats screenshot immediately after the first frame of the stats showing
- if gScreenshotStats and not StatShotDone then
+ if gScreenshotStats and (not StatShotDone) and (Length(CustomStat.PlayerStat) > 1) then
begin
g_TakeScreenShot('stats/' + StatFilename);
StatShotDone := True;
begin
g_TakeScreenShot('stats/' + StatFilename);
StatShotDone := True;
end
else
begin
end
else
begin
- glScissor(0, 0, gWinSizeX, gWinSizeY);
+ glScissor(0, 0, gScreenWidth, gScreenHeight);
end;
// no need to clear stencil buffer, light blitting will do it for us... but only for normal scale
if (g_dbg_scale <> 1.0) then glClear(GL_STENCIL_BUFFER_BIT);
end;
// no need to clear stencil buffer, light blitting will do it for us... but only for normal scale
if (g_dbg_scale <> 1.0) then glClear(GL_STENCIL_BUFFER_BIT);
procedure DrawPlayer(p: TPlayer);
var
procedure DrawPlayer(p: TPlayer);
var
- px, py, a, b, c, d, i: Integer;
+ px, py, a, b, c, d, i, fX, fY: Integer;
+ camObj: TObj;
//R: TRect;
begin
if (p = nil) or (p.FDummy) then
//R: TRect;
begin
if (p = nil) or (p.FDummy) then
glPushMatrix();
glPushMatrix();
- px := p.GameX + PLAYER_RECT_CX;
- py := p.GameY + PLAYER_RECT_CY+p.Obj.slopeUpLeft;
+ camObj := p.getCameraObj();
+ camObj.lerp(gLerpFactor, fX, fY);
+ px := fX + PLAYER_RECT_CX;
+ py := fY + PLAYER_RECT_CY+nlerp(p.SlopeOld, camObj.slopeUpLeft, gLerpFactor);
if (g_dbg_scale = 1.0) and (not g_dbg_ignore_bounds) then
begin
if (g_dbg_scale = 1.0) and (not g_dbg_ignore_bounds) then
begin
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 - nlerp(p.IncCamOld, p.IncCam, gLerpFactor);
- 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;
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;
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?
//r_smallmap_h: 0: left; 1: center; 2: right
//r_smallmap_v: 0: top; 1: center; 2: bottom
// horiz small map?
else gPlayers[i].DrawIndicator(gPlayers[i].GetColor);
end;
else gPlayers[i].DrawIndicator(gPlayers[i].GetColor);
end;
- if p.FSpectator then
- e_TextureFontPrintEx(p.GameX + PLAYER_RECT_CX - 4,
- p.GameY + PLAYER_RECT_CY - 4,
- 'X', gStdFont, 255, 255, 255, 1, True);
{
for a := 0 to High(gCollideMap) do
for b := 0 to High(gCollideMap[a]) do
{
for a := 0 to High(gCollideMap) do
for b := 0 to High(gCollideMap[a]) do
FPSTime := Time;
end;
FPSTime := Time;
end;
+ e_SetRendertarget(True);
+ e_SetViewPort(0, 0, gScreenWidth, gScreenHeight);
+
if gGameOn or (gState = STATE_FOLD) then
begin
if (gPlayer1 <> nil) and (gPlayer2 <> nil) then
if gGameOn or (gState = STATE_FOLD) then
begin
if (gPlayer1 <> nil) and (gPlayer2 <> nil) then
if gGameOn then drawProfilers();
if gGameOn then drawProfilers();
+ // TODO: draw this after the FBO and remap mouse click coordinates
+
{$IFDEF ENABLE_HOLMES}
g_Holmes_DrawUI();
{$ENDIF}
{$IFDEF ENABLE_HOLMES}
g_Holmes_DrawUI();
{$ENDIF}
+ // blit framebuffer to screen
+
+ e_SetRendertarget(False);
+ e_SetViewPort(0, 0, gWinSizeX, gWinSizeY);
+ e_BlitFramebuffer(gWinSizeX, gWinSizeY);
+
+ // draw the overlay stuff on top of it
+
g_Touch_Draw;
end;
g_Touch_Draw;
end;
if ((not gGameOn) and (gState <> STATE_INTERCUSTOM))
or (not (gGameSettings.GameType in [GT_CUSTOM, GT_SERVER, GT_CLIENT])) then
Exit;
if ((not gGameOn) and (gState <> STATE_INTERCUSTOM))
or (not (gGameSettings.GameType in [GT_CUSTOM, GT_SERVER, GT_CLIENT])) then
Exit;
+
+ if (gGameSettings.MaxLives > 0) and (gLMSRespawn = LMS_RESPAWN_NONE) then
+ Exit;
+
if gPlayer1 = nil then
begin
if g_Game_IsClient then
begin
if NetPlrUID1 > -1 then
if gPlayer1 = nil then
begin
if g_Game_IsClient then
begin
if NetPlrUID1 > -1 then
- begin
MC_SEND_CheatRequest(NET_CHEAT_SPECTATE);
MC_SEND_CheatRequest(NET_CHEAT_SPECTATE);
- gPlayer1 := g_Player_Get(NetPlrUID1);
- end;
Exit;
end;
Exit;
end;
g_Console_Add(Format(_lc[I_PLAYER_LEAVE], [Pl.Name]), True);
g_Player_Remove(Pl.UID);
g_Net_Slist_ServerPlayerLeaves();
g_Console_Add(Format(_lc[I_PLAYER_LEAVE], [Pl.Name]), True);
g_Player_Remove(Pl.UID);
g_Net_Slist_ServerPlayerLeaves();
- end else
+ end
+ else
+ begin
+ gSpectLatchPID2 := Pl.UID;
gPlayer2 := nil;
gPlayer2 := nil;
+ end;
Exit;
end;
Pl := gPlayer1;
Exit;
end;
Pl := gPlayer1;
g_Net_Slist_ServerPlayerLeaves();
end else
begin
g_Net_Slist_ServerPlayerLeaves();
end else
begin
+ gSpectLatchPID1 := Pl.UID;
gPlayer1 := nil;
MC_SEND_CheatRequest(NET_CHEAT_SPECTATE);
end;
gPlayer1 := nil;
MC_SEND_CheatRequest(NET_CHEAT_SPECTATE);
end;
gGameSettings.Options := gGameSettings.Options + GAME_OPTION_BOTVSMONSTER;
gSwitchGameMode := GM_SINGLE;
gGameSettings.Options := gGameSettings.Options + GAME_OPTION_BOTVSMONSTER;
gSwitchGameMode := GM_SINGLE;
+ gLMSRespawn := LMS_RESPAWN_NONE;
+ gLMSRespawnTime := 0;
+ gSpectLatchPID1 := 0;
+ gSpectLatchPID2 := 0;
+
g_Game_ExecuteEvent('ongamestart');
// Óñòàíîâêà ðàçìåðîâ îêîí èãðîêîâ:
g_Game_ExecuteEvent('ongamestart');
// Óñòàíîâêà ðàçìåðîâ îêîí èãðîêîâ:
gAimLine := False;
gShowMap := False;
gAimLine := False;
gShowMap := False;
+ gLMSRespawn := LMS_RESPAWN_NONE;
+ gLMSRespawnTime := 0;
+ gSpectLatchPID1 := 0;
+ gSpectLatchPID2 := 0;
+
g_Game_ExecuteEvent('ongamestart');
// Óñòàíîâêà ðàçìåðîâ îêîí èãðîêîâ:
g_Game_ExecuteEvent('ongamestart');
// Óñòàíîâêà ðàçìåðîâ îêîí èãðîêîâ:
gAimLine := False;
gShowMap := False;
gAimLine := False;
gShowMap := False;
+ gLMSRespawn := LMS_RESPAWN_NONE;
+ gLMSRespawnTime := 0;
+ gSpectLatchPID1 := 0;
+ gSpectLatchPID2 := 0;
+
g_Game_ExecuteEvent('ongamestart');
// Óñòàíîâêà ðàçìåðîâ îêíà èãðîêà
g_Game_ExecuteEvent('ongamestart');
// Óñòàíîâêà ðàçìåðîâ îêíà èãðîêà
// Ñòàðòóåì ñåðâåð
if not g_Net_Host(IPAddr, Port, NetMaxClients) then
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;
Exit;
end;
- g_Net_Slist_Set(NetSlistIP, NetSlistPort, NetSlistList);
+ g_Net_Slist_Set(NetMasterList);
g_Net_Slist_ServerStarted();
g_Net_Slist_ServerStarted();
// create (or update) map/resource databases
g_Res_CreateDatabases(true);
// create (or update) map/resource databases
g_Res_CreateDatabases(true);
+ gLMSRespawn := LMS_RESPAWN_NONE;
+ gLMSRespawnTime := 0;
+ gSpectLatchPID1 := 0;
+ gSpectLatchPID2 := 0;
+
// Ñòàðòóåì êëèåíò
if not g_Net_Connect(Addr, Port) then
begin
// Ñòàðòóåì êëèåíò
if not g_Net_Connect(Addr, Port) then
begin
Exit;
end;
Exit;
end;
- gLMSRespawn := LMS_RESPAWN_NONE;
- gLMSRespawnTime := 0;
-
g_Player_Init();
NetState := NET_STATE_GAME;
MC_SEND_FullStateRequest;
g_Player_Init();
NetState := NET_STATE_GAME;
MC_SEND_FullStateRequest;
ResName := Map;
end;
ResName := Map;
end;
+ gTime := 0;
+
//writeln('********: gsw=', gGameSettings.WAD, '; rn=', ResName);
result := false;
if (ResName <> '') and (NewWAD <> '') then
//writeln('********: gsw=', gGameSettings.WAD, '; rn=', ResName);
result := false;
if (ResName <> '') and (NewWAD <> '') then
gExit := 0;
gPauseMain := false;
gPauseHolmes := false;
gExit := 0;
gPauseMain := false;
gPauseHolmes := false;
- gTime := 0;
NetTimeToUpdate := 1;
NetTimeToReliable := 0;
NetTimeToMaster := NetMasterRate;
NetTimeToUpdate := 1;
NetTimeToReliable := 0;
NetTimeToMaster := NetMasterRate;
- gLMSRespawn := LMS_RESPAWN_NONE;
- gLMSRespawnTime := 0;
+ gSpectLatchPID1 := 0;
+ gSpectLatchPID2 := 0;
gMissionFailed := False;
gNextMap := '';
gMissionFailed := False;
gNextMap := '';
g_Game_SpectateCenterView();
g_Game_SpectateCenterView();
- if (gGameSettings.MaxLives > 0) and (gGameSettings.WarmupTime > 0) then
+ if g_Game_IsServer then
begin
begin
- gLMSRespawn := LMS_RESPAWN_WARMUP;
- gLMSRespawnTime := gTime + gGameSettings.WarmupTime*1000;
- gLMSSoftSpawn := True;
- if NetMode = NET_SERVER then
- MH_SEND_GameEvent(NET_EV_LMS_WARMUP, (gLMSRespawnTime - gTime) div 1000)
+ if (gGameSettings.MaxLives > 0) and (gGameSettings.WarmupTime > 0) then
+ begin
+ gLMSRespawn := LMS_RESPAWN_WARMUP;
+ gLMSRespawnTime := gTime + gGameSettings.WarmupTime*1000;
+ gLMSSoftSpawn := True;
+ if g_Game_IsNet then
+ MH_SEND_GameEvent(NET_EV_LMS_WARMUP, gLMSRespawnTime - gTime);
+ end
else
else
- g_Console_Add(Format(_lc[I_MSG_WARMUP_START], [(gLMSRespawnTime - gTime) div 1000]), True);
+ begin
+ gLMSRespawn := LMS_RESPAWN_NONE;
+ gLMSRespawnTime := 0;
+ end;
end;
if NetMode = NET_SERVER then
end;
if NetMode = NET_SERVER then
procedure g_Game_RestartRound(NoMapRestart: Boolean = False);
var
i, n, nb, nr: Integer;
procedure g_Game_RestartRound(NoMapRestart: Boolean = False);
var
i, n, nb, nr: Integer;
-
- function monRespawn (mon: TMonster): Boolean;
- begin
- result := false; // don't stop
- if not mon.FNoRespawn then mon.Respawn();
- end;
-
begin
if not g_Game_IsServer then Exit;
if gLMSRespawn = LMS_RESPAWN_NONE then Exit;
begin
if not g_Game_IsServer then Exit;
if gLMSRespawn = LMS_RESPAWN_NONE then Exit;
else if gPlayers[i].Team = TEAM_BLUE then Inc(nb)
end;
else if gPlayers[i].Team = TEAM_BLUE then Inc(nb)
end;
- if (n < 2) or ((gGameSettings.GameMode = GM_TDM) and ((nr = 0) or (nb = 0))) then
+ if (n < 1) or ((gGameSettings.GameMode = GM_TDM) and ((nr = 0) or (nb = 0))) then
begin
// wait a second until the fuckers finally decide to join
gLMSRespawn := LMS_RESPAWN_WARMUP;
begin
// wait a second until the fuckers finally decide to join
gLMSRespawn := LMS_RESPAWN_WARMUP;
- gLMSRespawnTime := gTime + 1000;
+ gLMSRespawnTime := gTime + gGameSettings.WarmupTime*1000;
gLMSSoftSpawn := NoMapRestart;
gLMSSoftSpawn := NoMapRestart;
+ if g_Game_IsNet then
+ MH_SEND_GameEvent(NET_EV_LMS_WARMUP, gLMSRespawnTime - gTime);
Exit;
end;
Exit;
end;
gPlayers[i].Frags := 0;
gPlayers[i].RecallState;
end;
gPlayers[i].Frags := 0;
gPlayers[i].RecallState;
end;
- if (gPlayer1 = nil) and (gLMSPID1 > 0) then
- gPlayer1 := g_Player_Get(gLMSPID1);
- if (gPlayer2 = nil) and (gLMSPID2 > 0) then
- gPlayer2 := g_Player_Get(gLMSPID2);
+ if (gPlayer1 = nil) and (gSpectLatchPID1 > 0) then
+ gPlayer1 := g_Player_Get(gSpectLatchPID1);
+ if (gPlayer2 = nil) and (gSpectLatchPID2 > 0) then
+ gPlayer2 := g_Player_Get(gSpectLatchPID2);
end;
g_Items_RestartRound();
end;
g_Items_RestartRound();
-
- g_Mons_ForEach(monRespawn);
-
gLMSSoftSpawn := False;
end;
gLMSSoftSpawn := False;
end;
var
a, b: Integer;
stat: TPlayerStatArray;
var
a, b: Integer;
stat: TPlayerStatArray;
- cmd, s: string;
- config: TConfig;
-begin
- stat := nil;
- cmd := LowerCase(P[0]);
- if (cmd = 'g_friendlyfire') and not g_Game_IsClient then
+ cmd: string;
+
+ procedure ParseGameFlag(Flag: LongWord; OffMsg, OnMsg: TStrings_Locale; OnMapChange: Boolean = False);
+ var
+ x: Boolean;
begin
begin
- with gGameSettings do
+ if Length(P) > 1 then
begin
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_TEAMDAMAGE
- else
- Options := Options and (not GAME_OPTION_TEAMDAMAGE);
- end;
+ x := P[1] = '1';
- if (LongBool(Options and GAME_OPTION_TEAMDAMAGE)) then
- g_Console_Add(_lc[I_MSG_FRIENDLY_FIRE_ON])
+ if x then
+ gsGameFlags := gsGameFlags or Flag
else
else
- g_Console_Add(_lc[I_MSG_FRIENDLY_FIRE_OFF]);
+ gsGameFlags := gsGameFlags and (not Flag);
- if g_Game_IsNet then MH_SEND_GameSettings;
- end;
- end
- else if (cmd = 'g_weaponstay') and not g_Game_IsClient then
- begin
- with gGameSettings do
- begin
- if (Length(P) > 1) and
- ((P[1] = '1') or (P[1] = '0')) then
+ if g_Game_IsServer then
begin
begin
- if (P[1][1] = '1') then
- Options := Options or GAME_OPTION_WEAPONSTAY
+ if x then
+ gGameSettings.Options := gGameSettings.Options or Flag
else
else
- Options := Options and (not GAME_OPTION_WEAPONSTAY);
+ gGameSettings.Options := gGameSettings.Options and (not Flag);
+ if g_Game_IsNet then MH_SEND_GameSettings;
end;
end;
+ end;
- if (LongBool(Options and GAME_OPTION_WEAPONSTAY)) then
- g_Console_Add(_lc[I_MSG_WEAPONSTAY_ON])
- else
- g_Console_Add(_lc[I_MSG_WEAPONSTAY_OFF]);
+ if LongBool(gsGameFlags and Flag) then
+ g_Console_Add(_lc[OnMsg])
+ else
+ g_Console_Add(_lc[OffMsg]);
- if g_Game_IsNet then MH_SEND_GameSettings;
- end;
- end
- else if cmd = 'g_gamemode' then
+ if OnMapChange and g_Game_IsServer then
+ g_Console_Add(_lc[I_MSG_ONMAPCHANGE]);
+ end;
+
+begin
+ stat := nil;
+ cmd := LowerCase(P[0]);
+
+ if cmd = 'g_gamemode' then
begin
begin
- a := g_Game_TextToMode(P[1]);
- if a = GM_SINGLE then a := GM_COOP;
- if (Length(P) > 1) and (a <> GM_NONE) and (not g_Game_IsClient) then
+ if (Length(P) > 1) then
begin
begin
- gSwitchGameMode := a;
- if (gGameOn and (gGameSettings.GameMode = GM_SINGLE)) or
- (gState = STATE_INTERSINGLE) then
- gSwitchGameMode := GM_SINGLE;
- if not gGameOn then
- gGameSettings.GameMode := gSwitchGameMode;
+ a := g_Game_TextToMode(P[1]);
+ if a = GM_SINGLE then a := GM_COOP;
+ gsGameMode := g_Game_ModeToText(a);
+ if g_Game_IsServer then
+ begin
+ gSwitchGameMode := a;
+ if (gGameOn and (gGameSettings.GameMode = GM_SINGLE)) or
+ (gState = STATE_INTERSINGLE) then
+ gSwitchGameMode := GM_SINGLE;
+ if not gGameOn then
+ gGameSettings.GameMode := gSwitchGameMode;
+ end;
end;
end;
+
if gSwitchGameMode = gGameSettings.GameMode then
g_Console_Add(Format(_lc[I_MSG_GAMEMODE_CURRENT],
[g_Game_ModeToText(gGameSettings.GameMode)]))
if gSwitchGameMode = gGameSettings.GameMode then
g_Console_Add(Format(_lc[I_MSG_GAMEMODE_CURRENT],
[g_Game_ModeToText(gGameSettings.GameMode)]))
[g_Game_ModeToText(gGameSettings.GameMode),
g_Game_ModeToText(gSwitchGameMode)]));
end
[g_Game_ModeToText(gGameSettings.GameMode),
g_Game_ModeToText(gSwitchGameMode)]));
end
- else if (cmd = 'g_allow_exit') and not g_Game_IsClient then
+ else if cmd = 'g_friendlyfire' then
begin
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_ALLOWEXIT
- else
- Options := Options and (not GAME_OPTION_ALLOWEXIT);
- end;
-
- if (LongBool(Options and GAME_OPTION_ALLOWEXIT)) then
- g_Console_Add(_lc[I_MSG_ALLOWEXIT_ON])
- else
- g_Console_Add(_lc[I_MSG_ALLOWEXIT_OFF]);
- g_Console_Add(_lc[I_MSG_ONMAPCHANGE]);
-
- if g_Game_IsNet then MH_SEND_GameSettings;
- end;
+ ParseGameFlag(GAME_OPTION_TEAMDAMAGE, I_MSG_FRIENDLY_FIRE_OFF, I_MSG_FRIENDLY_FIRE_ON);
end
end
- else if (cmd = 'g_allow_monsters') and not g_Game_IsClient then
+ else if cmd = 'g_weaponstay' then
begin
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_MONSTERS
- else
- Options := Options and (not GAME_OPTION_MONSTERS);
- end;
-
- if (LongBool(Options and GAME_OPTION_MONSTERS)) then
- g_Console_Add(_lc[I_MSG_ALLOWMON_ON])
- else
- g_Console_Add(_lc[I_MSG_ALLOWMON_OFF]);
- g_Console_Add(_lc[I_MSG_ONMAPCHANGE]);
-
- if g_Game_IsNet then MH_SEND_GameSettings;
- end;
+ ParseGameFlag(GAME_OPTION_WEAPONSTAY, I_MSG_WEAPONSTAY_OFF, I_MSG_WEAPONSTAY_ON);
end
end
- else if (cmd = 'g_bot_vsplayers') and not g_Game_IsClient then
+ else if cmd = 'g_allow_exit' then
begin
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_BOTVSPLAYER
- else
- Options := Options and (not GAME_OPTION_BOTVSPLAYER);
- end;
-
- if (LongBool(Options and GAME_OPTION_BOTVSPLAYER)) then
- g_Console_Add(_lc[I_MSG_BOTSVSPLAYERS_ON])
- else
- g_Console_Add(_lc[I_MSG_BOTSVSPLAYERS_OFF]);
-
- if g_Game_IsNet then MH_SEND_GameSettings;
- end;
+ ParseGameFlag(GAME_OPTION_ALLOWEXIT, I_MSG_ALLOWEXIT_OFF, I_MSG_ALLOWEXIT_ON, True);
+ end
+ else if cmd = 'g_allow_monsters' then
+ begin
+ ParseGameFlag(GAME_OPTION_MONSTERS, I_MSG_ALLOWMON_OFF, I_MSG_ALLOWMON_ON, True);
+ end
+ else if cmd = 'g_bot_vsplayers' then
+ begin
+ ParseGameFlag(GAME_OPTION_BOTVSPLAYER, I_MSG_BOTSVSPLAYERS_OFF, I_MSG_BOTSVSPLAYERS_ON);
+ end
+ else if cmd = 'g_bot_vsmonsters' then
+ begin
+ ParseGameFlag(GAME_OPTION_BOTVSMONSTER, I_MSG_BOTSVSMONSTERS_OFF, I_MSG_BOTSVSMONSTERS_ON);
+ end
+ else if cmd = 'g_dm_keys' then
+ begin
+ ParseGameFlag(GAME_OPTION_DMKEYS, I_MSG_DMKEYS_OFF, I_MSG_DMKEYS_ON, True);
end
end
- else if (cmd = 'g_bot_vsmonsters') and not g_Game_IsClient then
+ else if cmd = 'g_gameflags' then
begin
begin
- with gGameSettings do
+ if Length(P) > 1 then
begin
begin
- if (Length(P) > 1) and
- ((P[1] = '1') or (P[1] = '0')) then
+ gsGameFlags := StrToDWordDef(P[1], gsGameFlags);
+ if g_Game_IsServer then
begin
begin
- if (P[1][1] = '1') then
- Options := Options or GAME_OPTION_BOTVSMONSTER
- else
- Options := Options and (not GAME_OPTION_BOTVSMONSTER);
+ gGameSettings.Options := gsGameFlags;
+ if g_Game_IsNet then MH_SEND_GameSettings;
end;
end;
-
- if (LongBool(Options and GAME_OPTION_BOTVSMONSTER)) then
- g_Console_Add(_lc[I_MSG_BOTSVSMONSTERS_ON])
- else
- g_Console_Add(_lc[I_MSG_BOTSVSMONSTERS_OFF]);
-
- if g_Game_IsNet then MH_SEND_GameSettings;
end;
end;
+
+ g_Console_Add(Format('%s %u', [cmd, gsGameFlags]));
end
end
- else if (cmd = 'g_dm_keys') and not g_Game_IsClient then
+ else if cmd = 'g_warmup_time' then
begin
begin
- with gGameSettings do
+ if Length(P) > 1 then
begin
begin
- if (Length(P) > 1) and
- ((P[1] = '1') or (P[1] = '0')) then
+ gsWarmupTime := nclamp(StrToIntDef(P[1], gsWarmupTime), 0, $FFFF);
+ if g_Game_IsServer then
begin
begin
- if (P[1][1] = '1') then
- Options := Options or GAME_OPTION_DMKEYS
- else
- Options := Options and (not GAME_OPTION_DMKEYS);
+ gGameSettings.WarmupTime := gsWarmupTime;
+ // extend warmup if it's already going
+ if gLMSRespawn = LMS_RESPAWN_WARMUP then
+ begin
+ gLMSRespawnTime := gTime + gsWarmupTime * 1000;
+ if g_Game_IsNet then MH_SEND_GameEvent(NET_EV_LMS_WARMUP, gLMSRespawnTime - gTime);
+ end;
+ if g_Game_IsNet then MH_SEND_GameSettings;
end;
end;
-
- if (LongBool(Options and GAME_OPTION_DMKEYS)) then
- 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;
+
+ g_Console_Add(Format(_lc[I_MSG_WARMUP], [Integer(gsWarmupTime)]));
+ if g_Game_IsServer then g_Console_Add(_lc[I_MSG_ONMAPCHANGE]);
end
end
- else if (cmd = 'g_warmuptime') and not g_Game_IsClient then
+ else if cmd = 'g_spawn_invul' then
begin
if Length(P) > 1 then
begin
begin
if Length(P) > 1 then
begin
- if StrToIntDef(P[1], gGameSettings.WarmupTime) = 0 then
- gGameSettings.WarmupTime := 30
- else
- gGameSettings.WarmupTime := StrToIntDef(P[1], gGameSettings.WarmupTime);
+ gsSpawnInvul := nclamp(StrToIntDef(P[1], gsSpawnInvul), 0, $FFFF);
+ if g_Game_IsServer then
+ begin
+ gGameSettings.SpawnInvul := gsSpawnInvul;
+ if g_Game_IsNet then MH_SEND_GameSettings;
+ end;
end;
end;
- g_Console_Add(Format(_lc[I_MSG_WARMUP],
- [gGameSettings.WarmupTime]));
- g_Console_Add(_lc[I_MSG_ONMAPCHANGE]);
+ g_Console_Add(Format('%s %d', [cmd, Integer(gsSpawnInvul)]));
end
end
- else if (cmd = 'g_spawn_invul') and not g_Game_IsClient then
+ else if cmd = 'g_item_respawn_time' then
begin
if Length(P) > 1 then
begin
begin
if Length(P) > 1 then
begin
- if StrToIntDef(P[1], gGameSettings.SpawnInvul) = 0 then
- gGameSettings.SpawnInvul := 0
- else
- gGameSettings.SpawnInvul := StrToIntDef(P[1], gGameSettings.SpawnInvul);
+ gsItemRespawnTime := nclamp(StrToIntDef(P[1], gsItemRespawnTime), 0, $FFFF);
+ if g_Game_IsServer then
+ begin
+ gGameSettings.ItemRespawnTime := gsItemRespawnTime;
+ if g_Game_IsNet then MH_SEND_GameSettings;
+ end;
end;
end;
- g_Console_Add(Format(_lc[I_MSG_SPAWNINVUL],
- [gGameSettings.SpawnInvul]));
- g_Console_Add(_lc[I_MSG_ONMAPCHANGE]);
+ g_Console_Add(Format('%s %d', [cmd, Integer(gsItemRespawnTime)]));
+ if g_Game_IsServer then g_Console_Add(_lc[I_MSG_ONMAPCHANGE]);
end
end
- else if cmd = 'net_interp' then
+ else if cmd = 'sv_intertime' then
begin
if (Length(P) > 1) then
begin
if (Length(P) > 1) then
- NetInterpLevel := StrToIntDef(P[1], NetInterpLevel);
- g_Console_Add('net_interp = ' + IntToStr(NetInterpLevel));
- s := e_GetWriteableDir(ConfigDirs);
- if s <> '' then
+ gDefInterTime := Min(Max(StrToIntDef(P[1], gDefInterTime), -1), 120);
+
+ g_Console_Add(cmd + ' = ' + IntToStr(gDefInterTime));
+ end
+ else if cmd = 'g_max_particles' then
+ begin
+ if Length(p) = 2 then
begin
begin
- config := TConfig.CreateFile(s + '/' + CONFIG_FILENAME);
- config.WriteInt('Client', 'InterpolationSteps', NetInterpLevel);
- config.SaveFile(s + '/' + CONFIG_FILENAME);
- config.Free
+ a := Max(0, StrToInt(p[1]));
+ g_GFX_SetMax(a)
+ end
+ else if Length(p) = 1 then
+ begin
+ e_LogWritefln('%s', [g_GFX_GetMax()])
+ end
+ else
+ begin
+ e_LogWritefln('usage: %s <n>', [cmd])
end
end
end
end
- else if cmd = 'net_forceplayerupdate' then
+ else if cmd = 'g_max_shells' then
begin
begin
- if (Length(P) > 1) and ((P[1] = '1') or (P[1] = '0')) then
- NetForcePlayerUpdate := (P[1][1] = '1');
-
- if NetForcePlayerUpdate then
- g_Console_Add('net_forceplayerupdate = 1')
+ if Length(p) = 2 then
+ begin
+ a := Max(0, StrToInt(p[1]));
+ g_Shells_SetMax(a)
+ end
+ else if Length(p) = 1 then
+ begin
+ e_LogWritefln('%s', [g_Shells_GetMax()])
+ end
else
else
- g_Console_Add('net_forceplayerupdate = 0');
-
- s := e_GetWriteableDir(ConfigDirs);
- if s <> '' then
begin
begin
- config := TConfig.CreateFile(s + '/' + CONFIG_FILENAME);
- config.WriteBool('Client', 'ForcePlayerUpdate', NetForcePlayerUpdate);
- config.SaveFile(s + '/' + CONFIG_FILENAME);
- config.Free
+ e_LogWritefln('usage: %s <n>', [cmd])
end
end
end
end
- else if cmd = 'net_predictself' then
+ else if cmd = 'g_max_gibs' then
begin
begin
- if (Length(P) > 1) and
- ((P[1] = '1') or (P[1] = '0')) then
- NetPredictSelf := (P[1][1] = '1');
-
- if NetPredictSelf then
- g_Console_Add('net_predictself = 1')
+ if Length(p) = 2 then
+ begin
+ a := Max(0, StrToInt(p[1]));
+ g_Gibs_SetMax(a)
+ end
+ else if Length(p) = 1 then
+ begin
+ e_LogWritefln('%s', [g_Gibs_GetMax()])
+ end
else
else
- g_Console_Add('net_predictself = 0');
-
- s := e_GetWriteableDir(ConfigDirs);
- if s <> '' then
begin
begin
- config := TConfig.CreateFile(s + '/' + CONFIG_FILENAME);
- config.WriteBool('Client', 'PredictSelf', NetPredictSelf);
- config.SaveFile(s + '/' + CONFIG_FILENAME);
- config.Free
+ e_LogWritefln('usage: %s <n>', [cmd])
end
end
end
end
- else if cmd = 'sv_name' then
+ else if cmd = 'g_max_corpses' then
begin
begin
- if (Length(P) > 1) and (Length(P[1]) > 0) then
+ if Length(p) = 2 then
begin
begin
- NetServerName := P[1];
- if Length(NetServerName) > 64 then
- SetLength(NetServerName, 64);
- g_Net_Slist_ServerRenamed();
- end;
-
- g_Console_Add(cmd + ' = "' + NetServerName + '"');
+ a := Max(0, StrToInt(p[1]));
+ g_Corpses_SetMax(a)
+ end
+ else if Length(p) = 1 then
+ begin
+ e_LogWritefln('%s', [g_Corpses_GetMax()])
+ end
+ else
+ begin
+ e_LogWritefln('usage: %s <n>', [cmd])
+ end
end
end
- else if cmd = 'sv_passwd' then
+ else if cmd = 'g_scorelimit' then
begin
begin
- if (Length(P) > 1) and (Length(P[1]) > 0) then
+ if Length(P) > 1 then
begin
begin
- NetPassword := P[1];
- if Length(NetPassword) > 24 then
- SetLength(NetPassword, 24);
- g_Net_Slist_ServerRenamed();
+ gsGoalLimit := nclamp(StrToIntDef(P[1], gsGoalLimit), 0, $FFFF);
+
+ if g_Game_IsServer then
+ begin
+ b := 0;
+ if gGameSettings.GameMode = GM_DM then
+ begin // DM
+ stat := g_Player_GetStats();
+ if stat <> nil then
+ for a := 0 to High(stat) do
+ if stat[a].Frags > b then
+ b := stat[a].Frags;
+ end
+ else // TDM/CTF
+ b := Max(gTeamStat[TEAM_RED].Goals, gTeamStat[TEAM_BLUE].Goals);
+
+ // if someone has a higher score, set it to that instead
+ gsGoalLimit := max(gsGoalLimit, b);
+ gGameSettings.GoalLimit := gsGoalLimit;
+
+ if g_Game_IsNet then MH_SEND_GameSettings;
+ end;
end;
end;
- g_Console_Add(cmd + ' = "' + AnsiLowerCase(NetPassword) + '"');
+ g_Console_Add(Format(_lc[I_MSG_SCORE_LIMIT], [Integer(gsGoalLimit)]));
end
end
- else if cmd = 'sv_maxplrs' then
+ else if cmd = 'g_timelimit' then
begin
begin
- if (Length(P) > 1) then
+ if Length(P) > 1 then
begin
begin
- NetMaxClients := Min(Max(StrToIntDef(P[1], NetMaxClients), 1), NET_MAXCLIENTS);
- if g_Game_IsServer and g_Game_IsNet then
+ gsTimeLimit := nclamp(StrToIntDef(P[1], gsTimeLimit), 0, $FFFF);
+ if g_Game_IsServer then
begin
begin
- b := 0;
- for a := 0 to High(NetClients) do
- begin
- if NetClients[a].Used then
- begin
- Inc(b);
- if b > NetMaxClients then
- begin
- s := g_Player_Get(NetClients[a].Player).Name;
- enet_peer_disconnect(NetClients[a].Peer, NET_DISC_FULL);
- g_Console_Add(Format(_lc[I_PLAYER_KICK], [s]));
- MH_SEND_GameEvent(NET_EV_PLAYER_KICK, 0, s);
- end;
- end;
- end;
- g_Net_Slist_ServerRenamed();
+ gGameSettings.TimeLimit := gsTimeLimit;
+ if g_Game_IsNet then MH_SEND_GameSettings;
end;
end;
end;
end;
-
- g_Console_Add(cmd + ' = ' + IntToStr(NetMaxClients));
+ g_Console_Add(Format(_lc[I_MSG_TIME_LIMIT],
+ [gsTimeLimit div 3600,
+ (gsTimeLimit div 60) mod 60,
+ gsTimeLimit mod 60]));
end
end
- else if cmd = 'sv_public' then
+ else if cmd = 'g_maxlives' then
begin
begin
- if (Length(P) > 1) then
+ if Length(P) > 1 then
begin
begin
- NetUseMaster := StrToIntDef(P[1], Byte(NetUseMaster)) > 0;
- if NetUseMaster then g_Net_Slist_Public() else g_Net_Slist_Private();
+ gsMaxLives := nclamp(StrToIntDef(P[1], gsMaxLives), 0, $FFFF);
+ if g_Game_IsServer then
+ begin
+ gGameSettings.MaxLives := gsMaxLives;
+ if g_Game_IsNet then MH_SEND_GameSettings;
+ end;
end;
end;
- g_Console_Add(cmd + ' = ' + IntToStr(Byte(NetUseMaster)));
- end
- else if cmd = 'sv_intertime' then
- begin
- if (Length(P) > 1) then
- gDefInterTime := Min(Max(StrToIntDef(P[1], gDefInterTime), -1), 120);
+ g_Console_Add(Format(_lc[I_MSG_LIVES], [Integer(gsMaxLives)]));
+ end;
+end;
- g_Console_Add(cmd + ' = ' + IntToStr(gDefInterTime));
- end
- else if cmd = 'p1_name' then
- begin
- if (Length(P) > 1) and gGameOn then
- begin
- if g_Game_IsClient then
+procedure PlayerSettingsCVars(P: SSArray);
+var
+ cmd: string;
+begin
+ cmd := LowerCase(P[0]);
+ case cmd of
+ 'p1_name':
begin
begin
- gPlayer1Settings.Name := b_Text_Unformat(P[1]);
- MC_SEND_PlayerSettings;
- end
- else
- if gPlayer1 <> nil then
+ if (Length(P) > 1) then
begin
begin
- gPlayer1.Name := b_Text_Unformat(P[1]);
- if g_Game_IsNet then MH_SEND_PlayerSettings(gPlayer1.UID);
- end
- else
gPlayer1Settings.Name := b_Text_Unformat(P[1]);
gPlayer1Settings.Name := b_Text_Unformat(P[1]);
- end;
- end
- else if cmd = 'p2_name' then
- begin
- if (Length(P) > 1) and gGameOn then
- begin
- if g_Game_IsClient then
+ if g_Game_IsClient then
+ MC_SEND_PlayerSettings
+ else if gGameOn and (gPlayer1 <> nil) then
+ begin
+ gPlayer1.Name := b_Text_Unformat(P[1]);
+ if g_Game_IsNet then MH_SEND_PlayerSettings(gPlayer1.UID);
+ end;
+ end;
+ end;
+ 'p2_name':
begin
begin
- gPlayer2Settings.Name := b_Text_Unformat(P[1]);
- MC_SEND_PlayerSettings;
- end
- else
- if gPlayer2 <> nil then
+ if (Length(P) > 1) then
begin
begin
- gPlayer2.Name := b_Text_Unformat(P[1]);
- if g_Game_IsNet then MH_SEND_PlayerSettings(gPlayer2.UID);
- end
- else
gPlayer2Settings.Name := b_Text_Unformat(P[1]);
gPlayer2Settings.Name := b_Text_Unformat(P[1]);
- end;
- end
- else if cmd = 'p1_color' then
- begin
- if Length(P) > 3 then
- if g_Game_IsClient then
+ if g_Game_IsClient then
+ MC_SEND_PlayerSettings
+ else if gGameOn and (gPlayer2 <> nil) then
+ begin
+ gPlayer2.Name := b_Text_Unformat(P[1]);
+ if g_Game_IsNet then MH_SEND_PlayerSettings(gPlayer2.UID);
+ end;
+ end;
+ end;
+ 'p1_color':
begin
begin
- gPlayer1Settings.Color := _RGB(EnsureRange(StrToIntDef(P[1], 0), 0, 255),
- EnsureRange(StrToIntDef(P[2], 0), 0, 255),
- EnsureRange(StrToIntDef(P[3], 0), 0, 255));
- MC_SEND_PlayerSettings;
- end
- else
- if gPlayer1 <> nil then
+ if Length(P) > 3 then
begin
begin
- gPlayer1.Model.SetColor(EnsureRange(StrToIntDef(P[1], 0), 0, 255),
- EnsureRange(StrToIntDef(P[2], 0), 0, 255),
- EnsureRange(StrToIntDef(P[3], 0), 0, 255));
- if g_Game_IsNet then MH_SEND_PlayerSettings(gPlayer1.UID);
- end
- else
gPlayer1Settings.Color := _RGB(EnsureRange(StrToIntDef(P[1], 0), 0, 255),
EnsureRange(StrToIntDef(P[2], 0), 0, 255),
EnsureRange(StrToIntDef(P[3], 0), 0, 255));
gPlayer1Settings.Color := _RGB(EnsureRange(StrToIntDef(P[1], 0), 0, 255),
EnsureRange(StrToIntDef(P[2], 0), 0, 255),
EnsureRange(StrToIntDef(P[3], 0), 0, 255));
- end
- else if (cmd = 'p2_color') and not g_Game_IsNet then
- begin
- if Length(P) > 3 then
- if g_Game_IsClient then
+ if g_Game_IsClient then
+ MC_SEND_PlayerSettings
+ else if gGameOn and (gPlayer1 <> nil) then
+ begin
+ gPlayer1.SetColor(gPlayer1Settings.Color);
+ if g_Game_IsNet then MH_SEND_PlayerSettings(gPlayer1.UID);
+ end;
+ end;
+ end;
+ 'p2_color':
begin
begin
- gPlayer2Settings.Color := _RGB(EnsureRange(StrToIntDef(P[1], 0), 0, 255),
- EnsureRange(StrToIntDef(P[2], 0), 0, 255),
- EnsureRange(StrToIntDef(P[3], 0), 0, 255));
- MC_SEND_PlayerSettings;
- end
- else
- if gPlayer2 <> nil then
+ if Length(P) > 3 then
begin
begin
- gPlayer2.Model.SetColor(EnsureRange(StrToIntDef(P[1], 0), 0, 255),
- EnsureRange(StrToIntDef(P[2], 0), 0, 255),
- EnsureRange(StrToIntDef(P[3], 0), 0, 255));
- if g_Game_IsNet then MH_SEND_PlayerSettings(gPlayer2.UID);
- end
- else
gPlayer2Settings.Color := _RGB(EnsureRange(StrToIntDef(P[1], 0), 0, 255),
EnsureRange(StrToIntDef(P[2], 0), 0, 255),
EnsureRange(StrToIntDef(P[3], 0), 0, 255));
gPlayer2Settings.Color := _RGB(EnsureRange(StrToIntDef(P[1], 0), 0, 255),
EnsureRange(StrToIntDef(P[2], 0), 0, 255),
EnsureRange(StrToIntDef(P[3], 0), 0, 255));
- end
- else if gGameSettings.GameType in [GT_CUSTOM, GT_SERVER, GT_CLIENT] then
- begin
- if cmd = 'r_showscore' then
- begin
- if (Length(P) > 1) and
- ((P[1] = '1') or (P[1] = '0')) then
- gShowGoals := (P[1][1] = '1');
-
- if gShowGoals then
- g_Console_Add(_lc[I_MSG_SCORE_ON])
- else
- g_Console_Add(_lc[I_MSG_SCORE_OFF]);
- end
- else if cmd = 'r_showstat' then
- begin
- if (Length(P) > 1) and
- ((P[1] = '1') or (P[1] = '0')) then
- gShowStat := (P[1][1] = '1');
-
- if gShowStat then
- g_Console_Add(_lc[I_MSG_STATS_ON])
- else
- g_Console_Add(_lc[I_MSG_STATS_OFF]);
- end
- else if cmd = 'r_showkillmsg' then
- begin
- if (Length(P) > 1) and
- ((P[1] = '1') or (P[1] = '0')) then
- gShowKillMsg := (P[1][1] = '1');
-
- if gShowKillMsg then
- g_Console_Add(_lc[I_MSG_KILL_MSGS_ON])
- else
- g_Console_Add(_lc[I_MSG_KILL_MSGS_OFF]);
- end
- else if cmd = 'r_showlives' then
- begin
- if (Length(P) > 1) and
- ((P[1] = '1') or (P[1] = '0')) then
- gShowLives := (P[1][1] = '1');
-
- if gShowLives then
- g_Console_Add(_lc[I_MSG_LIVES_ON])
- else
- g_Console_Add(_lc[I_MSG_LIVES_OFF]);
- end
- else if cmd = 'r_showspect' then
- begin
- if (Length(P) > 1) and
- ((P[1] = '1') or (P[1] = '0')) then
- gSpectHUD := (P[1][1] = '1');
-
- if gSpectHUD then
- g_Console_Add(_lc[I_MSG_SPECT_HUD_ON])
- else
- g_Console_Add(_lc[I_MSG_SPECT_HUD_OFF]);
- end
- else if cmd = 'r_showping' then
- begin
- if (Length(P) > 1) and
- ((P[1] = '1') or (P[1] = '0')) then
- gShowPing := (P[1][1] = '1');
-
- if gShowPing then
- g_Console_Add(_lc[I_MSG_PING_ON])
- else
- g_Console_Add(_lc[I_MSG_PING_OFF]);
- end
- else if (cmd = 'g_scorelimit') and not g_Game_IsClient then
- begin
- if Length(P) > 1 then
+ if g_Game_IsClient then
+ MC_SEND_PlayerSettings
+ else if gGameOn and (gPlayer2 <> nil) then
+ begin
+ gPlayer2.SetColor(gPlayer2Settings.Color);
+ if g_Game_IsNet then MH_SEND_PlayerSettings(gPlayer2.UID);
+ end;
+ end;
+ end;
+ 'p1_model':
begin
begin
- if StrToIntDef(P[1], gGameSettings.GoalLimit) = 0 then
- gGameSettings.GoalLimit := 0
- else
+ if (Length(P) > 1) then
+ begin
+ gPlayer1Settings.Model := P[1];
+ if g_Game_IsClient then
+ MC_SEND_PlayerSettings
+ else if gGameOn and (gPlayer1 <> nil) then
begin
begin
- b := 0;
-
- if gGameSettings.GameMode = GM_DM then
- begin // DM
- stat := g_Player_GetStats();
- if stat <> nil then
- for a := 0 to High(stat) do
- if stat[a].Frags > b then
- b := stat[a].Frags;
- end
- else // TDM/CTF
- b := Max(gTeamStat[TEAM_RED].Goals, gTeamStat[TEAM_BLUE].Goals);
-
- gGameSettings.GoalLimit := Max(StrToIntDef(P[1], gGameSettings.GoalLimit), b);
+ gPlayer1.FActualModelName := gPlayer1Settings.Model;
+ gPlayer1.SetModel(gPlayer1Settings.Model);
+ if g_Game_IsNet then MH_SEND_PlayerSettings(gPlayer1.UID);
end;
end;
-
- if g_Game_IsNet then MH_SEND_GameSettings;
+ end;
end;
end;
-
- g_Console_Add(Format(_lc[I_MSG_SCORE_LIMIT], [gGameSettings.GoalLimit]));
- end
- else if (cmd = 'g_timelimit') and not g_Game_IsClient then
- begin
- if (Length(P) > 1) and (StrToIntDef(P[1], -1) >= 0) then
- gGameSettings.TimeLimit := StrToIntDef(P[1], -1);
-
- g_Console_Add(Format(_lc[I_MSG_TIME_LIMIT],
- [gGameSettings.TimeLimit div 3600,
- (gGameSettings.TimeLimit div 60) mod 60,
- gGameSettings.TimeLimit mod 60]));
- if g_Game_IsNet then MH_SEND_GameSettings;
- end
- else if (cmd = 'g_maxlives') and not g_Game_IsClient then
- begin
- if Length(P) > 1 then
+ 'p2_model':
begin
begin
- if StrToIntDef(P[1], gGameSettings.MaxLives) = 0 then
- gGameSettings.MaxLives := 0
- else
+ if (Length(P) > 1) then
begin
begin
- b := 0;
- stat := g_Player_GetStats();
- if stat <> nil then
- for a := 0 to High(stat) do
- if stat[a].Lives > b then
- b := stat[a].Lives;
- gGameSettings.MaxLives :=
- Max(StrToIntDef(P[1], gGameSettings.MaxLives), b);
+ gPlayer2Settings.Model := P[1];
+ if g_Game_IsClient then
+ MC_SEND_PlayerSettings
+ else if gGameOn and (gPlayer2 <> nil) then
+ begin
+ gPlayer2.FActualModelName := gPlayer2Settings.Model;
+ gPlayer2.SetModel(gPlayer2Settings.Model);
+ if g_Game_IsNet then MH_SEND_PlayerSettings(gPlayer2.UID);
+ end;
end;
end;
end;
end;
-
- g_Console_Add(Format(_lc[I_MSG_LIVES],
- [gGameSettings.MaxLives]));
- if g_Game_IsNet then MH_SEND_GameSettings;
- end;
end;
end;
end;
end;
if cmd = 'd_window' then
begin
g_Console_Add(Format('gScreenWidth = %d, gScreenHeight = %d', [gScreenWidth, gScreenHeight]));
if cmd = 'd_window' then
begin
g_Console_Add(Format('gScreenWidth = %d, gScreenHeight = %d', [gScreenWidth, gScreenHeight]));
- g_Console_Add(Format('gWinSizeX = %d, gWinSizeY = %d', [gWinSizeX, gWinSizeY]));
+ g_Console_Add(Format('gScreenWidth = %d, gScreenHeight = %d', [gScreenWidth, gScreenHeight]));
end
else if cmd = 'd_sounds' then
begin
end
else if cmd = 'd_sounds' then
begin
// Îáùèå êîìàíäû:
cmd := LowerCase(P[0]);
chstr := '';
// Îáùèå êîìàíäû:
cmd := LowerCase(P[0]);
chstr := '';
- if (cmd = 'quit') or
- (cmd = 'exit') then
- begin
- g_Game_Free();
- g_Game_Quit();
- Exit;
- end
- else if cmd = 'pause' then
+ if cmd = 'pause' then
begin
if (g_ActiveWindow = nil) then
g_Game_Pause(not gPauseMain);
begin
if (g_ActiveWindow = nil) then
g_Game_Pause(not gPauseMain);
g_Game_Free();
with gGameSettings do
begin
g_Game_Free();
with gGameSettings do
begin
- GameMode := g_Game_TextToMode(gcGameMode);
+ GameMode := g_Game_TextToMode(gsGameMode);
if gSwitchGameMode <> GM_NONE then
GameMode := gSwitchGameMode;
if GameMode = GM_NONE then GameMode := GM_DM;
if gSwitchGameMode <> GM_NONE then
GameMode := gSwitchGameMode;
if GameMode = GM_NONE then GameMode := GM_DM;
g_Game_Free();
with gGameSettings do
begin
g_Game_Free();
with gGameSettings do
begin
- GameMode := g_Game_TextToMode(gcGameMode);
+ GameMode := g_Game_TextToMode(gsGameMode);
if gSwitchGameMode <> GM_NONE then GameMode := gSwitchGameMode;
if GameMode = GM_NONE then GameMode := GM_DM;
if GameMode = GM_SINGLE then GameMode := GM_COOP;
if gSwitchGameMode <> GM_NONE then GameMode := gSwitchGameMode;
if GameMode = GM_NONE then GameMode := GM_DM;
if GameMode = GM_SINGLE then GameMode := GM_COOP;
end else
g_Console_Add(_lc[I_MSG_SERVERONLY]);
end
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 <timeout> <text>');
+ 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 <timeout> <text>');
+ end
else if (cmd = 'overtime') and not g_Game_IsClient then
begin
if (Length(P) = 1) or (StrToIntDef(P[1], -1) <= 0) then
else if (cmd = 'overtime') and not g_Game_IsClient then
begin
if (Length(P) = 1) or (StrToIntDef(P[1], -1) <= 0) then
end;
end;
end;
end;
+procedure SystemCommands(P: SSArray);
+var
+ cmd: string;
+begin
+ cmd := LowerCase(P[0]);
+ case cmd of
+ 'exit', 'quit':
+ begin
+ g_Game_Free();
+ g_Game_Quit();
+ end;
+ 'r_reset':
+ begin
+ gRC_Width := Max(1, gRC_Width);
+ gRC_Height := Max(1, gRC_Height);
+ gBPP := Max(1, gBPP);
+ if sys_SetDisplayMode(gRC_Width, gRC_Height, gBPP, gRC_FullScreen, gRC_Maximized) = True then
+ e_LogWriteln('resolution changed')
+ else
+ e_LogWriteln('resolution not changed');
+ sys_EnableVSync(gVSync);
+ end;
+ 'r_maxfps':
+ begin
+ if Length(p) = 2 then
+ begin
+ gMaxFPS := StrToIntDef(p[1], gMaxFPS);
+ if gMaxFPS > 0 then
+ gFrameTime := 1000 div gMaxFPS
+ else
+ gFrameTime := 0;
+ end;
+ e_LogWritefln('r_maxfps %d', [gMaxFPS]);
+ end;
+ 'g_language':
+ begin
+ if Length(p) = 2 then
+ begin
+ gAskLanguage := true;
+ gLanguage := LANGUAGE_ENGLISH;
+ case LowerCase(p[1]) of
+ 'english':
+ begin
+ gAskLanguage := false;
+ gLanguage := LANGUAGE_ENGLISH;
+ end;
+ 'russian':
+ begin
+ gAskLanguage := false;
+ gLanguage := LANGUAGE_RUSSIAN;
+ end;
+ 'ask':
+ begin
+ gAskLanguage := true;
+ gLanguage := LANGUAGE_ENGLISH;
+ end;
+ end;
+ g_Language_Set(gLanguage);
+ end
+ else
+ begin
+ e_LogWritefln('usage: %s <English|Russian|Ask>', [cmd]);
+ end
+ end;
+ end;
+end;
+
procedure g_TakeScreenShot(Filename: string = '');
var s: TStream; t: TDateTime; dir, date, name: String;
begin
procedure g_TakeScreenShot(Filename: string = '');
var s: TStream; t: TDateTime; dir, date, name: String;
begin
case gAnnouncer of
ANNOUNCE_NONE:
Exit;
case gAnnouncer of
ANNOUNCE_NONE:
Exit;
- ANNOUNCE_ME,
- ANNOUNCE_MEPLUS:
+ ANNOUNCE_ME:
if not g_Game_IsWatchedPlayer(SpawnerUID) then
Exit;
end;
if not g_Game_IsWatchedPlayer(SpawnerUID) then
Exit;
end;
// Options:
s := Find_Param_Value(pars, '-opt');
if (s = '') then
// Options:
s := Find_Param_Value(pars, '-opt');
if (s = '') then
- Opt := GAME_OPTION_ALLOWEXIT or GAME_OPTION_BOTVSPLAYER or GAME_OPTION_BOTVSMONSTER
+ Opt := GAME_OPTION_ALLOWEXIT or GAME_OPTION_BOTVSPLAYER or
+ GAME_OPTION_BOTVSMONSTER or GAME_OPTION_DMKEYS
else
Opt := StrToIntDef(s, 0);
else
Opt := StrToIntDef(s, 0);
- if Opt = 0 then
- Opt := GAME_OPTION_ALLOWEXIT or GAME_OPTION_BOTVSPLAYER or GAME_OPTION_BOTVSMONSTER;
// Close after map:
s := Find_Param_Value(pars, '--close');
// Close after map:
s := Find_Param_Value(pars, '--close');
conRegVar('dbg_ignore_level_bounds', @g_dbg_ignore_bounds, 'ignore level bounds', '', false);
conRegVar('r_scale', @g_dbg_scale, 0.01, 100.0, 'render scale', '', false);
conRegVar('dbg_ignore_level_bounds', @g_dbg_ignore_bounds, 'ignore level bounds', '', false);
conRegVar('r_scale', @g_dbg_scale, 0.01, 100.0, 'render scale', '', false);
+ conRegVar('r_resolution_scale', @r_pixel_scale, 0.01, 100.0, 'upscale factor', '', false);
conRegVar('light_enabled', @gwin_k8_enable_light_experiments, 'enable/disable dynamic lighting', 'lighting');
conRegVar('light_player_halo', @g_playerLight, 'enable/disable player halo', 'player light halo');
conRegVar('light_enabled', @gwin_k8_enable_light_experiments, 'enable/disable dynamic lighting', 'lighting');
conRegVar('light_player_halo', @g_playerLight, 'enable/disable player halo', 'player light halo');
conRegVar('r_showfps', @gShowFPS, 'draw fps counter', 'draw fps counter');
conRegVar('r_showtime', @gShowTime, 'show game time', 'show game time');
conRegVar('r_showfps', @gShowFPS, 'draw fps counter', 'draw fps counter');
conRegVar('r_showtime', @gShowTime, 'show game time', 'show game time');
+ conRegVar('r_showping', @gShowPing, 'show ping', 'show ping');
+ conRegVar('r_showscore', @gShowGoals, 'show score', 'show score');
+ conRegVar('r_showkillmsg', @gShowKillMsg, 'show kill log', 'show kill log');
+ conRegVar('r_showlives', @gShowLives, 'show lives', 'show lives');
+ conRegVar('r_showspect', @gSpectHUD, 'show spectator hud', 'show spectator hud');
+ conRegVar('r_showstat', @gShowStat, 'show stats', 'show stats');
end.
end.