diff --git a/src/game/g_game.pas b/src/game/g_game.pas
index 981082d949b8aa4b5766dc98757319001b108dda..82d2981743c307471a549bd6a6e8ee65db137f58 100644 (file)
--- a/src/game/g_game.pas
+++ b/src/game/g_game.pas
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();
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;
end;
end;
- // these are in separate PreUpdate functions because they can interact during Update()
- // we don't care that much about corpses and gibs
- g_Player_PreUpdate();
- g_Monsters_PreUpdate();
- g_Items_PreUpdate();
- g_Weapon_PreUpdate();
-
// Îáíîâëÿåì âñå îñòàëüíîå:
g_Map_Update();
g_Items_Update();
e_WriteLog(Format(_lc[I_FATAL_ERROR], [Text]), TMsgType.Warning);
gExit := EXIT_SIMPLE;
+ if gGameOn then EndGame;
end;
procedure g_SimpleError(Text: String);
g_Game_Free();
with gGameSettings do
begin
+ Options := gsGameFlags;
GameMode := g_Game_TextToMode(gsGameMode);
if gSwitchGameMode <> GM_NONE then
GameMode := gSwitchGameMode;
g_Game_Free();
with gGameSettings do
begin
+ Options := gsGameFlags;
GameMode := g_Game_TextToMode(gsGameMode);
if gSwitchGameMode <> GM_NONE then GameMode := gSwitchGameMode;
if GameMode = GM_NONE then GameMode := GM_DM;
case gAnnouncer of
ANNOUNCE_NONE:
Exit;
- ANNOUNCE_ME,
- ANNOUNCE_MEPLUS:
+ ANNOUNCE_ME:
if not g_Game_IsWatchedPlayer(SpawnerUID) then
Exit;
end;
// Options:
s := Find_Param_Value(pars, '-opt');
if (s = '') then
- Opt := GAME_OPTION_ALLOWEXIT or GAME_OPTION_BOTVSPLAYER or
- GAME_OPTION_BOTVSMONSTER or GAME_OPTION_DMKEYS
+ Opt := gsGameFlags
else
Opt := StrToIntDef(s, 0);