Game: Use proper syntax of sets for game options instead of raw bitwise operations

[d2df-sdl.git] / src / game / g_main.pas

diff --git a/src/game/g_main.pas b/src/game/g_main.pas
index 5c458d5159025a8f4b376bb425802b8986f1a877..80b5e7ae6a4f1a58cfea5eb3af24e37be5c1cffd 100644 (file)
--- a/src/game/g_main.pas
+++ b/src/game/g_main.pas
@@ -49,6 +49,7 @@ var
   WadDownloadDirs: SSArray;
 
   GameWADName: string = 'GAME';
+  date: AnsiString;
 
 implementation
 
@@ -344,8 +345,8 @@ begin
         Inc(i);
         rwdir := ParamStr(i);
         (* RW *)
-        AddDir(LogDirs, e_CatPath(rwdir, ''));
-        AddDir(SaveDirs, e_CatPath(rwdir, 'data'));
+        AddDir(LogDirs, e_CatPath(rwdir, 'logs'));
+        AddDir(SaveDirs, e_CatPath(rwdir, 'data/saves'));
         AddDir(CacheDirs, e_CatPath(rwdir, 'data/cache'));
         AddDir(ConfigDirs, e_CatPath(rwdir, ''));
         AddDir(MapDownloadDirs, e_CatPath(rwdir, 'maps/downloads'));
@@ -402,8 +403,8 @@ begin
 
   (* RW *)
   rwdirs := GetDefaultRWDirs();
-  AddDef(LogDirs, rwdirs, '');
-  AddDef(SaveDirs, rwdirs, 'data');
+  AddDef(LogDirs, rwdirs, 'logs');
+  AddDef(SaveDirs, rwdirs, 'data/saves');
   AddDef(CacheDirs, rwdirs, 'data/cache');
   AddDef(ConfigDirs, rwdirs, '');
   AddDef(MapDownloadDirs, rwdirs, 'maps/downloads');
@@ -422,10 +423,11 @@ begin
     rwdir := e_GetWriteableDir(LogDirs, false);
     if rwdir <> '' then
     begin
+      DateTimeToString(date, 'yyyy-mm-dd-hh-nn-ss', Now());
       {$IFDEF HEADLESS}
-        LogFileName := e_CatPath(rwdir, 'Doom2DF_H.log');
+        LogFileName := e_CatPath(rwdir, 'dfserver-' + date + '.log');
       {$ELSE}
-        LogFileName := e_CatPath(rwdir, 'Doom2DF.log');
+        LogFileName := e_CatPath(rwdir, 'dfclient-' + date + '.log');
       {$ENDIF}
     end
   end;
@@ -453,6 +455,7 @@ begin
     e_InitLog(LogFileName, TWriteMode.WM_NEWFILE);
   e_InitWritelnDriver();
   e_WriteLog('Doom 2D: Forever version ' + GAME_VERSION + ' proto ' + IntToStr(NET_PROTOCOL_VER), TMsgType.Notify);
+  e_WriteLog('Build arch: ' + g_GetBuildArch(), TMsgType.Notify);
   e_WriteLog('Build date: ' + GAME_BUILDDATE + ' ' + GAME_BUILDTIME, TMsgType.Notify);
   e_WriteLog('Build hash: ' + g_GetBuildHash(), TMsgType.Notify);
   e_WriteLog('Build by: ' + g_GetBuilderName(), TMsgType.Notify);
@@ -794,15 +797,15 @@ begin
   // RAMBO
   if CheckCheat(I_GAME_CHEAT_WEAPONS) then
   begin
-    if gPlayer1 <> nil then gPlayer1.AllRulez(False);
-    if gPlayer2 <> nil then gPlayer2.AllRulez(False);
+    if gPlayer1 <> nil then gPlayer1.TankRamboCheats(False);
+    if gPlayer2 <> nil then gPlayer2.TankRamboCheats(False);
     goto Cheated;
   end;
   // TANK
   if CheckCheat(I_GAME_CHEAT_HEALTH) then
   begin
-    if gPlayer1 <> nil then gPlayer1.AllRulez(True);
-    if gPlayer2 <> nil then gPlayer2.AllRulez(True);
+    if gPlayer1 <> nil then gPlayer1.TankRamboCheats(True);
+    if gPlayer2 <> nil then gPlayer2.TankRamboCheats(True);
     goto Cheated;
   end;
   // IDDQD