game: hit friendlies with everything by default

diff --git a/src/game/g_game.pas b/src/game/g_game.pas
index 1d5767065eaac6518d332b5e259be800d234f655..8271428fc1389de5deabaedb962b6742e64dd8ee 100644 (file)
--- a/src/game/g_game.pas
+++ b/src/game/g_game.pas
@@ -4439,6 +4439,8 @@ begin
   gGameSettings.Options := gGameSettings.Options + GAME_OPTION_ALLOWEXIT;
   gGameSettings.Options := gGameSettings.Options + GAME_OPTION_MONSTERS;
   gGameSettings.Options := gGameSettings.Options + GAME_OPTION_BOTVSMONSTER;
+  gGameSettings.Options := gGameSettings.Options + GAME_OPTION_TEAMHITPROJECTILE;
+  gGameSettings.Options := gGameSettings.Options + GAME_OPTION_TEAMHITTRACE;
   gSwitchGameMode := GM_SINGLE;
 
   gLMSRespawn := LMS_RESPAWN_NONE;

diff --git a/src/game/g_options.pas b/src/game/g_options.pas
index ecc30f9b7606d64e9dec8b22579d5609d9d84944..c29bb4da0a1c1bb8032142f5c9ee42f77954770f 100644 (file)
--- a/src/game/g_options.pas
+++ b/src/game/g_options.pas
@@ -270,7 +270,8 @@ begin
   gsSpawnInvul := 0;
   gsItemRespawnTime := 60;
   gsGameFlags := GAME_OPTION_ALLOWEXIT or GAME_OPTION_DMKEYS or
-    GAME_OPTION_BOTVSPLAYER or GAME_OPTION_BOTVSMONSTER;
+    GAME_OPTION_BOTVSPLAYER or GAME_OPTION_BOTVSMONSTER or
+    GAME_OPTION_TEAMHITTRACE or GAME_OPTION_TEAMHITPROJECTILE;
   gsPlayers := 1;
 
   (* section MasterServer *)