moved compiler options to shared/a_modes.inc; turned on advanced records

diff --git a/src/engine/e_fixedbuffer.pas b/src/engine/e_fixedbuffer.pas
index c59302102436e38a1ad715ec74df08c7e908d315..5b80d7fdddc9e9c46f899ebd30fec4325fdec59a 100644 (file)
--- a/src/engine/e_fixedbuffer.pas
+++ b/src/engine/e_fixedbuffer.pas
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *)
-{$INCLUDE e_amodes.inc}
+{$INCLUDE ../shared/a_modes.inc}
 unit e_fixedbuffer;
 
 interface

diff --git a/src/engine/e_graphics.pas b/src/engine/e_graphics.pas
index 39b6e4330ef71754142a013ee8807501c97805ff..51d6cc3d9a83423bffa83f1390b43e0a0584909f 100644 (file)
--- a/src/engine/e_graphics.pas
+++ b/src/engine/e_graphics.pas
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *)
-{$INCLUDE e_amodes.inc}
+{$INCLUDE ../shared/a_modes.inc}
 unit e_graphics;
 
 interface

diff --git a/src/engine/e_input.pas b/src/engine/e_input.pas
index deded67e211fbcfeeaf961aad76d4160ce3a928e..021c3ddadf72452b8c4b11358877cf0da23662e5 100644 (file)
--- a/src/engine/e_input.pas
+++ b/src/engine/e_input.pas
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *)
-{$INCLUDE e_amodes.inc}
+{$INCLUDE ../shared/a_modes.inc}
 unit e_input;
 
 interface

diff --git a/src/engine/e_log.pas b/src/engine/e_log.pas
index dade4e35ec8b42a0fe605ba60d20b82b2468cbac..ebdd646da2021b310af38d75b06e93fdba634ea2 100644 (file)
--- a/src/engine/e_log.pas
+++ b/src/engine/e_log.pas
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *)
-{$INCLUDE e_amodes.inc}
+{$INCLUDE ../shared/a_modes.inc}
 {$R-}
 { $DEFINE CBLOG}
 unit e_log;

diff --git a/src/engine/e_sound.pas b/src/engine/e_sound.pas
index d4d13b8ec34dc57cc7d4c7c45ccf02a1aa0970ac..7616afd24e5fc0953eff36e62809b12d9c8f1c34 100644 (file)
--- a/src/engine/e_sound.pas
+++ b/src/engine/e_sound.pas
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *)
-{$INCLUDE e_amodes.inc}
+{$INCLUDE ../shared/a_modes.inc}
 unit e_sound;
 
 {$IFDEF USE_SDLMIXER}

diff --git a/src/engine/e_textures.pas b/src/engine/e_textures.pas
index ae5cea44fa511f3597b9cf9a44591d52a4cc1533..dd2a5355350a949c8844c00ae6dc102f09d89e86 100644 (file)
--- a/src/engine/e_textures.pas
+++ b/src/engine/e_textures.pas
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *)
-{$INCLUDE e_amodes.inc}
+{$INCLUDE ../shared/a_modes.inc}
 unit e_textures;
 
 { This unit provides interface to load 24-bit and 32-bit uncompressed images

diff --git a/src/game/g_amodes.inc b/src/game/g_amodes.inc
deleted file mode 100644 (file)
index e3a4e67..0000000
--- a/src/game/g_amodes.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-{$MODE DELPHI}
-{$MODESWITCH NESTEDPROCVARS+}
-{$MODESWITCH DUPLICATELOCALS-}
-{.$MODESWITCH CBLOCKS+}
-{$ASSERTIONS ON}
-{$LONGSTRINGS ON}
-{$OVERFLOWCHECKS OFF}
-{$RANGECHECKS OFF}
-{.$STATIC ON}
-{$TYPEDADDRESS OFF}
-{$VARSTRINGCHECKS OFF}
-{$EXTENDEDSYNTAX ON}
-{$B-}
-{$S-}

diff --git a/src/game/g_basic.pas b/src/game/g_basic.pas
index 40b8e4ed43f29f851d7dd9abf6e50ff2f258cff4..67285caa60e8cb5349cdd9f606ca1a66dc7f70ca 100644 (file)
--- a/src/game/g_basic.pas
+++ b/src/game/g_basic.pas
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *)
-{$INCLUDE g_amodes.inc}
+{$INCLUDE ../shared/a_modes.inc}
 unit g_basic;
 
 interface

diff --git a/src/game/g_console.pas b/src/game/g_console.pas
index ec4ce69c581bf64fac766588ee135ac577d5285e..6a5c9a411c9412b3c9d9536bf7928408d4e7005d 100644 (file)
--- a/src/game/g_console.pas
+++ b/src/game/g_console.pas
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *)
-{$INCLUDE g_amodes.inc}
+{$INCLUDE ../shared/a_modes.inc}
 unit g_console;
 
 interface

diff --git a/src/game/g_game.pas b/src/game/g_game.pas
index 18f56398b60c03eec7734ebc8eada624a9e2b82d..4a9bfbe5641c27e0127ec8c3fabc67bb751c4d49 100644 (file)
--- a/src/game/g_game.pas
+++ b/src/game/g_game.pas
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *)
-{$INCLUDE g_amodes.inc}
+{$INCLUDE ../shared/a_modes.inc}
 unit g_game;
 
 interface

diff --git a/src/game/g_gfx.pas b/src/game/g_gfx.pas
index e24db1f6858c312aa2780b23c283750d7b0ccf38..17bbe920be07ac8843548777c9ed53878c498c80 100644 (file)
--- a/src/game/g_gfx.pas
+++ b/src/game/g_gfx.pas
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *)
-{$INCLUDE g_amodes.inc}
+{$INCLUDE ../shared/a_modes.inc}
 unit g_gfx;
 
 interface

diff --git a/src/game/g_grid.pas b/src/game/g_grid.pas
index a56c670270a42aeb38439164b4c3a1160b1cee43..0ffc5bc6358208dfe83b292a0de5eb7445b9b890 100644 (file)
--- a/src/game/g_grid.pas
+++ b/src/game/g_grid.pas
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *)
-{$INCLUDE g_amodes.inc}
+{$INCLUDE ../shared/a_modes.inc}
 unit g_grid;
 
 interface

diff --git a/src/game/g_gui.pas b/src/game/g_gui.pas
index ca49c711d8e7107ecda7cf0784dd8f62cfc7c9de..eb068102514c2f030fad1f629875513445b1de64 100644 (file)
--- a/src/game/g_gui.pas
+++ b/src/game/g_gui.pas
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *)
-{$INCLUDE g_amodes.inc}
+{$INCLUDE ../shared/a_modes.inc}
 unit g_gui;
 
 interface

diff --git a/src/game/g_items.pas b/src/game/g_items.pas
index 2b7008eb53aa79eddd0cb5e91071855bc74ebda6..9e6e2e0860e309c5b305634d542657c9883ac68e 100644 (file)
--- a/src/game/g_items.pas
+++ b/src/game/g_items.pas
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *)
-{$INCLUDE g_amodes.inc}
+{$INCLUDE ../shared/a_modes.inc}
 unit g_items;
 
 interface

diff --git a/src/game/g_language.pas b/src/game/g_language.pas
index a3e7aa7548fa953f49e7d231967321d21e2ce8ef..f2a3958b6921a9ff8cf5f34a7b8ea7c6fff54bb9 100644 (file)
--- a/src/game/g_language.pas
+++ b/src/game/g_language.pas
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *)
-{$INCLUDE g_amodes.inc}
+{$INCLUDE ../shared/a_modes.inc}
 unit g_language;
 
 interface

diff --git a/src/game/g_main.pas b/src/game/g_main.pas
index d5a5a83e80c31de8e30805ecbbbb4c41b81f086a..7864bedebfd18c005a89a1e1c7003f51d39cb3d2 100644 (file)
--- a/src/game/g_main.pas
+++ b/src/game/g_main.pas
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *)
-{$INCLUDE g_amodes.inc}
+{$INCLUDE ../shared/a_modes.inc}
 unit g_main;
 
 interface

diff --git a/src/game/g_map.pas b/src/game/g_map.pas
index d56ed47860c43d1fa441a35bac8c1cbeec964ad9..54d3763290be72f4d486f905a6d08265f5f18af1 100644 (file)
--- a/src/game/g_map.pas
+++ b/src/game/g_map.pas
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *)
-{$INCLUDE g_amodes.inc}
+{$INCLUDE ../shared/a_modes.inc}
 unit g_map;
 
 interface

diff --git a/src/game/g_menu.pas b/src/game/g_menu.pas
index 7c51f80fc92564d3b0784fef7019a2d2231eb37e..298fab8c2b0f033fca626e3cc70f54e2711e49f1 100644 (file)
--- a/src/game/g_menu.pas
+++ b/src/game/g_menu.pas
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *)
-{$INCLUDE g_amodes.inc}
+{$INCLUDE ../shared/a_modes.inc}
 unit g_menu;
 
 interface

diff --git a/src/game/g_monsters.pas b/src/game/g_monsters.pas
index 27846f4421f4d34f484698a0a2771fb67fbf5ca4..5ad20cc3ebca983fe4ec16bb848e2943e976ef36 100644 (file)
--- a/src/game/g_monsters.pas
+++ b/src/game/g_monsters.pas
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *)
-{$INCLUDE g_amodes.inc}
+{$INCLUDE ../shared/a_modes.inc}
 unit g_monsters;
 
 interface

diff --git a/src/game/g_net.pas b/src/game/g_net.pas
index 35968491ebc828dc90f30cbcf5cd56d2d447db16..1de6e98d237e9846b8f0393c53490a2a22213740 100644 (file)
--- a/src/game/g_net.pas
+++ b/src/game/g_net.pas
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *)
-{$INCLUDE g_amodes.inc}
+{$INCLUDE ../shared/a_modes.inc}
 unit g_net;
 
 interface

diff --git a/src/game/g_nethandler.pas b/src/game/g_nethandler.pas
index a4711af631f8eecaeeb15156fa333871c4f316b8..ca7548344441114aa3f781aaf944813832536dad 100644 (file)
--- a/src/game/g_nethandler.pas
+++ b/src/game/g_nethandler.pas
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *)
-{$INCLUDE g_amodes.inc}
+{$INCLUDE ../shared/a_modes.inc}
 unit g_nethandler;
 
 interface

diff --git a/src/game/g_netmaster.pas b/src/game/g_netmaster.pas
index 64681c3946e49dc51d88e16a0bf428249471d307..86d727e93b1963fb9e51004de844f16b11597717 100644 (file)
--- a/src/game/g_netmaster.pas
+++ b/src/game/g_netmaster.pas
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *)
-{$INCLUDE g_amodes.inc}
+{$INCLUDE ../shared/a_modes.inc}
 unit g_netmaster;
 
 interface

diff --git a/src/game/g_netmsg.pas b/src/game/g_netmsg.pas
index 3049838d8ce65254c5b48877aec87f35b0a51277..a0fb6eda640681ee89637144f95dc148f2f0595c 100644 (file)
--- a/src/game/g_netmsg.pas
+++ b/src/game/g_netmsg.pas
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *)
-{$INCLUDE g_amodes.inc}
+{$INCLUDE ../shared/a_modes.inc}
 unit g_netmsg;
 
 interface

diff --git a/src/game/g_options.pas b/src/game/g_options.pas
index a2624391c73f16f38161db5094764afa8e7a8d40..2efcb174ed9d39daf56fac8fe094f81cebfc2bab 100644 (file)
--- a/src/game/g_options.pas
+++ b/src/game/g_options.pas
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *)
-{$INCLUDE g_amodes.inc}
+{$INCLUDE ../shared/a_modes.inc}
 unit g_options;
 
 interface

diff --git a/src/game/g_panel.pas b/src/game/g_panel.pas
index 39c1b101278e6a29830c6dab22ab1ed3ccb26748..4374cf180f3e8027b750c7f382614cdb6164c956 100644 (file)
--- a/src/game/g_panel.pas
+++ b/src/game/g_panel.pas
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *)
-{$INCLUDE g_amodes.inc}
+{$INCLUDE ../shared/a_modes.inc}
 unit g_panel;
 
 interface

diff --git a/src/game/g_phys.pas b/src/game/g_phys.pas
index d581eb3903e325e6fc8ba94a7f659df01167a7a0..a3e790dca705410113cbaff304592ffb486994d0 100644 (file)
--- a/src/game/g_phys.pas
+++ b/src/game/g_phys.pas
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *)
-{$INCLUDE g_amodes.inc}
+{$INCLUDE ../shared/a_modes.inc}
 unit g_phys;
 
 interface

diff --git a/src/game/g_player.pas b/src/game/g_player.pas
index d5b318f728de8b48c213ad54877439ec0764acd0..b25ef0c59112b5db47fa5258f3b799bb01615735 100644 (file)
--- a/src/game/g_player.pas
+++ b/src/game/g_player.pas
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *)
-{$INCLUDE g_amodes.inc}
+{$INCLUDE ../shared/a_modes.inc}
 unit g_player;
 
 interface

diff --git a/src/game/g_playermodel.pas b/src/game/g_playermodel.pas
index 0392cc43d65ad7db2280bba5d56a4cf87ce6c7fc..0d696ee0c79043f0f69dd627c1f3de196b125e0b 100644 (file)
--- a/src/game/g_playermodel.pas
+++ b/src/game/g_playermodel.pas
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *)
-{$INCLUDE g_amodes.inc}
+{$INCLUDE ../shared/a_modes.inc}
 unit g_playermodel;
 
 interface

diff --git a/src/game/g_res_downloader.pas b/src/game/g_res_downloader.pas
index 471268ed20ba9645d44f4ade7564d55c24b6401c..c24e6f89bcb426b36c9cc9e8508e8b0a147ef6a2 100644 (file)
--- a/src/game/g_res_downloader.pas
+++ b/src/game/g_res_downloader.pas
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *)
-{$INCLUDE g_amodes.inc}
+{$INCLUDE ../shared/a_modes.inc}
 unit g_res_downloader;
 
 interface

diff --git a/src/game/g_saveload.pas b/src/game/g_saveload.pas
index 039883d286cc8d5ccd34593ddca464974867f753..40cf5cc16040931f7480f06f890b1d15bf9fa4e8 100644 (file)
--- a/src/game/g_saveload.pas
+++ b/src/game/g_saveload.pas
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *)
-{$INCLUDE g_amodes.inc}
+{$INCLUDE ../shared/a_modes.inc}
 unit g_saveload;
 
 interface

diff --git a/src/game/g_sound.pas b/src/game/g_sound.pas
index a3ef547a60254c6e46fba00506768e11e5e0f4cd..d7d97d20dcf9d7bbcb5cd81edd84ada4a679c000 100644 (file)
--- a/src/game/g_sound.pas
+++ b/src/game/g_sound.pas
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *)
-{$INCLUDE g_amodes.inc}
+{$INCLUDE ../shared/a_modes.inc}
 unit g_sound;
 
 interface

diff --git a/src/game/g_textures.pas b/src/game/g_textures.pas
index 21b33aecdee7dc7046f82726119b9949a62f58e9..45ae37f73a17e422072f17142163e5a35660c049 100644 (file)
--- a/src/game/g_textures.pas
+++ b/src/game/g_textures.pas
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *)
-{$INCLUDE g_amodes.inc}
+{$INCLUDE ../shared/a_modes.inc}
 unit g_textures;
 
 interface

diff --git a/src/game/g_triggers.pas b/src/game/g_triggers.pas
index 278e92a8c609e42e7af63ffea6cd3e7bf1b1672c..39507180c435439cea992c9a54d0839e9731000c 100644 (file)
--- a/src/game/g_triggers.pas
+++ b/src/game/g_triggers.pas
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *)
-{$INCLUDE g_amodes.inc}
+{$INCLUDE ../shared/a_modes.inc}
 unit g_triggers;
 
 interface

diff --git a/src/game/g_weapons.pas b/src/game/g_weapons.pas
index a008366b66617507e8fcb922b3b3e98c5169974e..81db80314333fb159b8396ad7bafabf84fa22700 100644 (file)
--- a/src/game/g_weapons.pas
+++ b/src/game/g_weapons.pas
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *)
-{$INCLUDE g_amodes.inc}
+{$INCLUDE ../shared/a_modes.inc}
 unit g_weapons;
 
 interface

diff --git a/src/game/g_window.pas b/src/game/g_window.pas
index 89511af81cd2c15fc309ba95ad06e9c2009db0c5..045a49ff69cea7a4355e292417fd58edaf07711a 100644 (file)
--- a/src/game/g_window.pas
+++ b/src/game/g_window.pas
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *)
-{$INCLUDE g_amodes.inc}
+{$INCLUDE ../shared/a_modes.inc}
 unit g_window;
 
 interface

diff --git a/src/sfs/sfs.pas b/src/sfs/sfs.pas
index 8437034e83685456ac9070bd9884cf215f54ccfb..a18ad73dd7041dffe12673e9f26b728b62c5ba9d 100644 (file)
--- a/src/sfs/sfs.pas
+++ b/src/sfs/sfs.pas
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *)
 // streaming file system (virtual)
-{$MODE DELPHI}
-{$R+}
+{$INCLUDE ../shared/a_modes.inc}
+{.$R+}
 {.$DEFINE SFS_VOLDEBUG}
 unit sfs;
 

diff --git a/src/sfs/sfsPlainFS.pas b/src/sfs/sfsPlainFS.pas
index 9a58e83c2e495b83d6c1f3d97adecbfb49178bec..e116d933e2fd8ebab29d3429c5113cc44a531eff 100644 (file)
--- a/src/sfs/sfsPlainFS.pas
+++ b/src/sfs/sfsPlainFS.pas
@@ -17,8 +17,8 @@
 //   Quake I/II .PAK (PACK)
 //   SiN .SIN (SPAK)
 //
-{$MODE DELPHI}
-{$R+}
+{$INCLUDE ../shared/a_modes.inc}
+{.$R+}
 unit sfsPlainFS;
 
 interface

diff --git a/src/sfs/sfsZipFS.pas b/src/sfs/sfsZipFS.pas
index 9db434e96973cdd3b87a66ea7435a038cb83c7f6..ae17ba10a8b55970fac0febf3c0a62fd862ef417 100644 (file)
--- a/src/sfs/sfsZipFS.pas
+++ b/src/sfs/sfsZipFS.pas
@@ -18,8 +18,8 @@
 //   dfwad   : D2D:F wad archives
 //
 {.$DEFINE SFS_DEBUG_ZIPFS}
-{$MODE DELPHI}
-{$R+}
+{$INCLUDE ../shared/a_modes.inc}
+{.$R+}
 unit sfsZipFS;
 
 interface

diff --git a/src/shared/BinEditor.pas b/src/shared/BinEditor.pas
index a4143094554046bd07cf7b5b3af5bc4e43add718..1f53456f23d6a009e21d136c418c4aff19ab7555 100644 (file)
--- a/src/shared/BinEditor.pas
+++ b/src/shared/BinEditor.pas
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *)
-{$MODE DELPHI}
+{$INCLUDE a_modes.inc}
 Unit BinEditor;
 
 Interface

diff --git a/src/shared/CONFIG.pas b/src/shared/CONFIG.pas
index 2d1a5f2ac1cacd1f2a666a96fb009fe804656d69..3dfd736f4a6e1f492090993a7e4a11c96d63053c 100644 (file)
--- a/src/shared/CONFIG.pas
+++ b/src/shared/CONFIG.pas
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *)
-{$MODE DELPHI}
+{$INCLUDE a_modes.inc}
 unit CONFIG;
 
 {

diff --git a/src/shared/CONFIGSIMPLE.pas b/src/shared/CONFIGSIMPLE.pas
index 7e0617edf71da0fed3f38f5031e565fb37b0d669..8e6cd2efba0911cee19368662a19f9bfe708b730 100644 (file)
--- a/src/shared/CONFIGSIMPLE.pas
+++ b/src/shared/CONFIGSIMPLE.pas
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *)
-{$MODE DELPHI}
+{$INCLUDE a_modes.inc}
 unit CONFIGSIMPLE;
 
 interface

diff --git a/src/shared/MAPDEF.pas b/src/shared/MAPDEF.pas
index ef4eaf63675fdd137368ba9a01b2a85da2738146..05c510112c57a504a4375f037c3078b23629f6cd 100644 (file)
--- a/src/shared/MAPDEF.pas
+++ b/src/shared/MAPDEF.pas
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *)
-{$MODE DELPHI}
+{$INCLUDE a_modes.inc}
 unit MAPDEF;
 
 {

diff --git a/src/shared/MAPREADER.pas b/src/shared/MAPREADER.pas
index 93de6b08a86c090249a64a2029ba5c1471c434a1..4ea7beb5918f081fdf18b595ab3091b371a3c880 100644 (file)
--- a/src/shared/MAPREADER.pas
+++ b/src/shared/MAPREADER.pas
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *)
-{$MODE DELPHI}
+{$INCLUDE a_modes.inc}
 unit MAPREADER;
 
 {

diff --git a/src/shared/MAPSTRUCT.pas b/src/shared/MAPSTRUCT.pas
index b72499d95de8b6fc497f31929cc1b2967b074b51..d9913a4be10ebfdcc1561bd821c43da7705829c6 100644 (file)
--- a/src/shared/MAPSTRUCT.pas
+++ b/src/shared/MAPSTRUCT.pas
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *)
-{$MODE DELPHI}
+{$INCLUDE a_modes.inc}
 unit MAPSTRUCT;
 
 {

diff --git a/src/engine/e_amodes.inc b/src/shared/a_modes.inc
similarity index 59%
rename from src/engine/e_amodes.inc
rename to src/shared/a_modes.inc
index e3a4e67bd576e9893d1d3abe9f852342d8f4828f..35e29d6ec289341da8ddd68f270baa17b10ce5d6 100644 (file)
--- a/src/engine/e_amodes.inc
+++ b/src/shared/a_modes.inc
@@ -1,7 +1,9 @@
+// compiler options, common for all game modules
 {$MODE DELPHI}
 {$MODESWITCH NESTEDPROCVARS+}
 {$MODESWITCH DUPLICATELOCALS-}
 {.$MODESWITCH CBLOCKS+}
+{$MODESWITCH ADVANCEDRECORDS+}
 {$ASSERTIONS ON}
 {$LONGSTRINGS ON}
 {$OVERFLOWCHECKS OFF}
@@ -12,3 +14,9 @@
 {$EXTENDEDSYNTAX ON}
 {$B-}
 {$S-}
+
+{$IFDEF MSWINDOWS}
+  {$IFNDEF WINDOWS}
+    {$DEFINE WINDOWS}
+  {$ENDIF WINDOWS}
+{$ENDIF MSWINDOWS}

diff --git a/src/shared/conbuf.pas b/src/shared/conbuf.pas
index 1be01b2f80df2eb36fffd90ec3d380828a97ea5d..42f85a52b5ef161f9aa51edabbbd19da3f6d0055 100644 (file)
--- a/src/shared/conbuf.pas
+++ b/src/shared/conbuf.pas
@@ -13,7 +13,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *)
-{$MODE OBJFPC}
+{$INCLUDE a_modes.inc}
+{.$MODE OBJFPC}
 unit conbuf;
 
 interface

diff --git a/src/shared/envvars.pas b/src/shared/envvars.pas
index 6f92b40786a857eea425680bfbc4068ffa4e145b..a7d3293c7accd40a2bd71ea2999f356a46d331b5 100644 (file)
--- a/src/shared/envvars.pas
+++ b/src/shared/envvars.pas
@@ -13,7 +13,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *)
-{$MODE OBJFPC}
+{$INCLUDE a_modes.inc}
+{.$MODE OBJFPC}
 unit envvars;
 
 interface

diff --git a/src/shared/utils.pas b/src/shared/utils.pas
index 253e838961316e5bd5e2b19595ba10d7760e033a..f67317832b7b01cfe5ac49a950304a03ff0ab804 100644 (file)
--- a/src/shared/utils.pas
+++ b/src/shared/utils.pas
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *)
-{$MODE DELPHI}
+{$INCLUDE a_modes.inc}
 unit utils;
 
 interface

diff --git a/src/shared/wadreader.pas b/src/shared/wadreader.pas
index 2997bce0abac0b94b78c6a49f96b45dca027c65e..df0de0fc591a48ffe3d16ce7f68ba412fd781b85 100644 (file)
--- a/src/shared/wadreader.pas
+++ b/src/shared/wadreader.pas
@@ -13,10 +13,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *)
-{$MODE DELPHI}
+{$INCLUDE a_modes.inc}
 unit wadreader;
 
-{$DEFINE SFS_DWFAD_DEBUG}
+{$DEFINE SFS_DFWAD_DEBUG}
 {$DEFINE SFS_MAPDETECT_FX}
 
 interface
@@ -387,7 +387,7 @@ begin
       end;
 {$ENDIF}
       result := true;
-      {$IFDEF SFS_DWFAD_DEBUG}
+      {$IFDEF SFS_DFWAD_DEBUG}
       if wadoptDebug then
         e_WriteLog(Format('DFWAD: file [%s] FOUND in [%s]; size is %d bytes', [name, fFileName, Len]), MSG_NOTIFY);
       {$ENDIF}
@@ -455,7 +455,7 @@ begin
     e_WriteLog(Format('TWADFile.ReadFile: error looking for [%s]', [FileName]), MSG_NOTIFY);
     exit;
   end;
-  {$IFDEF SFS_DWFAD_DEBUG}
+  {$IFDEF SFS_DFWAD_DEBUG}
   if wadoptDebug then e_WriteLog(Format('TWADFile.ReadFile: FOUND [%s]', [rfn]), MSG_NOTIFY);
   {$ENDIF}
   // cache this wad
@@ -474,7 +474,7 @@ begin
   fIter := SFSFileList(rfn);
   if fIter = nil then Exit;
   fFileName := rfn;
-  {$IFDEF SFS_DWFAD_DEBUG}
+  {$IFDEF SFS_DFWAD_DEBUG}
   if wadoptDebug then e_WriteLog(Format('TWADFile.ReadFile: [%s] opened', [fFileName]), MSG_NOTIFY);
   {$ENDIF}
   Result := True;
@@ -501,8 +501,8 @@ begin
 
   fn := Format(' -- memwad %d -- ', [uniqueCounter]);
   Inc(uniqueCounter);
-  {$IFDEF SFS_DWFAD_DEBUG}
-    e_WriteLog(Format('TWADFile.ReadMemory: [%s]', [fn]), MSG_NOTIFY);
+  {$IFDEF SFS_DFWAD_DEBUG}
+  if wadoptDebug then e_WriteLog(Format('TWADFile.ReadMemory: [%s]', [fn]), MSG_NOTIFY);
   {$ENDIF}
 
   try
@@ -521,8 +521,8 @@ begin
   if fIter = nil then Exit;
 
   fFileName := fn;
-  {$IFDEF SFS_DWFAD_DEBUG}
-    e_WriteLog(Format('TWADFile.ReadMemory: [%s] opened', [fFileName]), MSG_NOTIFY);
+  {$IFDEF SFS_DFWAD_DEBUG}
+  if wadoptDebug then e_WriteLog(Format('TWADFile.ReadMemory: [%s] opened', [fFileName]), MSG_NOTIFY);
   {$ENDIF}
 
   {

diff --git a/src/shared/xstreams.pas b/src/shared/xstreams.pas
index 17a575b8a328489783cc230aa523bdda0bc62359..81a104cc9e33be77409318c25766fcdc5b0382b3 100644 (file)
--- a/src/shared/xstreams.pas
+++ b/src/shared/xstreams.pas
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *)
 // special stream classes
-{$MODE DELPHI}
-{$R+}
+{$INCLUDE a_modes.inc}
+{.$R+}
 unit xstreams;
 
 interface