added common file with compiler flags; cosmetic fix in g_monsters.pas

diff --git a/src/engine/e_amodes.inc b/src/engine/e_amodes.inc
new file mode 100644 (file)
index 0000000..b71ccfa
--- /dev/null
+++ b/src/engine/e_amodes.inc
@@ -0,0 +1,14 @@
+{$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/engine/e_fixedbuffer.pas b/src/engine/e_fixedbuffer.pas
index 92c984c9d6115165241836d2b8778a540503a062..c59302102436e38a1ad715ec74df08c7e908d315 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/>.
  *)
-{$MODE DELPHI}
+{$INCLUDE e_amodes.inc}
 unit e_fixedbuffer;
 
 interface

diff --git a/src/engine/e_graphics.pas b/src/engine/e_graphics.pas
index d3cb67e0d7e221191a3f367026351f06be8a0e4f..39b6e4330ef71754142a013ee8807501c97805ff 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/>.
  *)
-{$MODE DELPHI}
+{$INCLUDE e_amodes.inc}
 unit e_graphics;
 
 interface

diff --git a/src/engine/e_input.pas b/src/engine/e_input.pas
index 269a1d17c85c81e277f6ffeaaca4f20a3cba179f..deded67e211fbcfeeaf961aad76d4160ce3a928e 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/>.
  *)
-{$MODE DELPHI}
+{$INCLUDE e_amodes.inc}
 unit e_input;
 
 interface

diff --git a/src/engine/e_log.pas b/src/engine/e_log.pas
index 75b325e8ccbc397ed289fa3e39684035a0e7d40b..dade4e35ec8b42a0fe605ba60d20b82b2468cbac 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/>.
  *)
-{$MODE DELPHI}
+{$INCLUDE e_amodes.inc}
 {$R-}
 { $DEFINE CBLOG}
 unit e_log;

diff --git a/src/engine/e_sound.pas b/src/engine/e_sound.pas
index 333ab5059196a48a4b28b063f9107d5af48e043f..d4d13b8ec34dc57cc7d4c7c45ccf02a1aa0970ac 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/>.
  *)
-{$MODE DELPHI}
+{$INCLUDE e_amodes.inc}
 unit e_sound;
 
 {$IFDEF USE_SDLMIXER}

diff --git a/src/engine/e_textures.pas b/src/engine/e_textures.pas
index 8dfd2cc8392a4796b6714787e49b920fb5bbbf65..ae5cea44fa511f3597b9cf9a44591d52a4cc1533 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/>.
  *)
-{$MODE DELPHI}
+{$INCLUDE e_amodes.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
new file mode 100644 (file)
index 0000000..b71ccfa
--- /dev/null
+++ b/src/game/g_amodes.inc
@@ -0,0 +1,14 @@
+{$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 1705e0e371054939c97ff485be59178684684f72..40b8e4ed43f29f851d7dd9abf6e50ff2f258cff4 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/>.
  *)
-{$MODE DELPHI}
+{$INCLUDE g_amodes.inc}
 unit g_basic;
 
 interface

diff --git a/src/game/g_console.pas b/src/game/g_console.pas
index fcabed7ba667ec84613f3e80cb698ddcfbaac5f5..ec4ce69c581bf64fac766588ee135ac577d5285e 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/>.
  *)
-{$MODE DELPHI}
+{$INCLUDE g_amodes.inc}
 unit g_console;
 
 interface

diff --git a/src/game/g_game.pas b/src/game/g_game.pas
index 73e6b28e6221babfb08549a07202ca96ac9f1bf9..18f56398b60c03eec7734ebc8eada624a9e2b82d 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/>.
  *)
-{$MODE DELPHI}
+{$INCLUDE g_amodes.inc}
 unit g_game;
 
 interface

diff --git a/src/game/g_gfx.pas b/src/game/g_gfx.pas
index f39d0710c683638f30b61674a1b3e1b287a64705..e24db1f6858c312aa2780b23c283750d7b0ccf38 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/>.
  *)
-{$MODE DELPHI}
+{$INCLUDE g_amodes.inc}
 unit g_gfx;
 
 interface

diff --git a/src/game/g_grid.pas b/src/game/g_grid.pas
index 984d8e7e2c2b9025fe5a93c4274ad66372763d35..a56c670270a42aeb38439164b4c3a1160b1cee43 100644 (file)
--- a/src/game/g_grid.pas
+++ b/src/game/g_grid.pas
@@ -13,8 +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}
-{$modeswitch nestedprocvars}
+{$INCLUDE g_amodes.inc}
 unit g_grid;
 
 interface

diff --git a/src/game/g_gui.pas b/src/game/g_gui.pas
index c276cfd1a7c271de1afd66938ee564d2e8e1ef1e..ca49c711d8e7107ecda7cf0784dd8f62cfc7c9de 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/>.
  *)
-{$MODE DELPHI}
+{$INCLUDE g_amodes.inc}
 unit g_gui;
 
 interface

diff --git a/src/game/g_items.pas b/src/game/g_items.pas
index d94b996e05b7436b9b8d487f3e181a81d508ccba..2b7008eb53aa79eddd0cb5e91071855bc74ebda6 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/>.
  *)
-{$MODE DELPHI}
+{$INCLUDE g_amodes.inc}
 unit g_items;
 
 interface

diff --git a/src/game/g_language.pas b/src/game/g_language.pas
index aa828100dd7dbf497aeba34c62f548cd4a73226a..412e2f711ef33b4eac628db54e2a60b92a057b5c 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/>.
  *)
-{$MODE DELPHI}
+{$INCLUDE g_amodes.inc}
 unit g_language;
 
 interface

diff --git a/src/game/g_main.pas b/src/game/g_main.pas
index 2d9d7e4eb2df64e2d08e858a4dea80816045716d..d5a5a83e80c31de8e30805ecbbbb4c41b81f086a 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/>.
  *)
-{$MODE DELPHI}
+{$INCLUDE g_amodes.inc}
 unit g_main;
 
 interface

diff --git a/src/game/g_map.pas b/src/game/g_map.pas
index 91102f1d03044e07dbe904f98e978f590ca621a4..d56ed47860c43d1fa441a35bac8c1cbeec964ad9 100644 (file)
--- a/src/game/g_map.pas
+++ b/src/game/g_map.pas
@@ -13,8 +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}
-{$modeswitch nestedprocvars}
+{$INCLUDE g_amodes.inc}
 unit g_map;
 
 interface

diff --git a/src/game/g_menu.pas b/src/game/g_menu.pas
index 29817ae5f5f1c67cd97251c5de33f246d5b68de7..7c51f80fc92564d3b0784fef7019a2d2231eb37e 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/>.
  *)
-{$MODE DELPHI}
+{$INCLUDE g_amodes.inc}
 unit g_menu;
 
 interface

diff --git a/src/game/g_monsters.pas b/src/game/g_monsters.pas
index e37e2e448b5115c204097f6c81c5467e5e01d5ae..27846f4421f4d34f484698a0a2771fb67fbf5ca4 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/>.
  *)
-{$MODE DELPHI}
+{$INCLUDE g_amodes.inc}
 unit g_monsters;
 
 interface
@@ -100,7 +100,7 @@ type
     function Live(): Boolean;
     procedure SetHealth(aH: Integer);
     procedure Push(vx, vy: Integer);
-    function Damage(Damage: Word; VelX, VelY: Integer; SpawnerUID: Word; t: Byte): Boolean;
+    function Damage(aDamage: Word; VelX, VelY: Integer; SpawnerUID: Word; t: Byte): Boolean;
     function Heal(Value: Word): Boolean;
     procedure BFGHit();
     procedure Update();
@@ -1574,7 +1574,7 @@ begin
     vilefire := nil;
 end;
 
-function TMonster.Damage(Damage: Word; VelX, VelY: Integer; SpawnerUID: Word; t: Byte): Boolean;
+function TMonster.Damage(aDamage: Word; VelX, VelY: Integer; SpawnerUID: Word; t: Byte): Boolean;
 var
   c, it: Integer;
   p: TPlayer;
@@ -1604,15 +1604,15 @@ begin
 
 // Ðîáîòó óðîíà íåò:
   if FMonsterType = MONSTER_ROBO then
-    Damage := 0;
+    aDamage := 0;
 
 // Íàíîñèì óðîí:
-  if g_Game_IsServer then Dec(FHealth, Damage);
+  if g_Game_IsServer then Dec(FHealth, aDamage);
 
 // Óñèëèâàåì áîëü ìîíñòðà îò óðîíà:
   if FPain = 0 then
     FPain := 3;
-  FPain := FPain+Damage;
+  FPain := FPain+aDamage;
 
 // Åñëè áîëü ñóùåñòâåííàÿ, òî ìåíÿåì ñîñòîÿíèå íà áîëåâîå:
   if FState <> STATE_PAIN then
@@ -1623,8 +1623,8 @@ begin
 // Åñëè ðàçðåøåíà êðîâü - ñîçäàåì áðûçãè êðîâè:
   if (gBloodCount > 0) then
   begin
-    c := Min(Damage, 200);
-    c := c*gBloodCount - (Damage div 4) + Random(c div 2);
+    c := Min(aDamage, 200);
+    c := c*gBloodCount - (aDamage div 4) + Random(c div 2);
 
     if (VelX = 0) and (VelY = 0) then
       MakeBloodSimple(c)

diff --git a/src/game/g_net.pas b/src/game/g_net.pas
index 944ce6f6727eb3746ff56c901238e6ccecbaa035..35968491ebc828dc90f30cbcf5cd56d2d447db16 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/>.
  *)
-{$MODE DELPHI}
+{$INCLUDE g_amodes.inc}
 unit g_net;
 
 interface

diff --git a/src/game/g_nethandler.pas b/src/game/g_nethandler.pas
index 4f4cfed29aa4ff371df563817557c697da555bda..a4711af631f8eecaeeb15156fa333871c4f316b8 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/>.
  *)
-{$MODE DELPHI}
+{$INCLUDE g_amodes.inc}
 unit g_nethandler;
 
 interface

diff --git a/src/game/g_netmaster.pas b/src/game/g_netmaster.pas
index 9c4c4ad1098665e3c4bc923cfaa189988450217e..64681c3946e49dc51d88e16a0bf428249471d307 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/>.
  *)
-{$MODE DELPHI}
+{$INCLUDE g_amodes.inc}
 unit g_netmaster;
 
 interface

diff --git a/src/game/g_netmsg.pas b/src/game/g_netmsg.pas
index a5bd880c0e817a6c91756c18377b6d94699c26f7..3049838d8ce65254c5b48877aec87f35b0a51277 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/>.
  *)
-{$MODE DELPHI}
+{$INCLUDE g_amodes.inc}
 unit g_netmsg;
 
 interface

diff --git a/src/game/g_options.pas b/src/game/g_options.pas
index 416f3b3c1411eb514ea33f1228b6845b957ca134..a2624391c73f16f38161db5094764afa8e7a8d40 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/>.
  *)
-{$MODE DELPHI}
+{$INCLUDE g_amodes.inc}
 unit g_options;
 
 interface

diff --git a/src/game/g_panel.pas b/src/game/g_panel.pas
index d724f2af056e6e91ea8154bb4b14c6678aaf78d6..39c1b101278e6a29830c6dab22ab1ed3ccb26748 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/>.
  *)
-{$MODE DELPHI}
+{$INCLUDE g_amodes.inc}
 unit g_panel;
 
 interface

diff --git a/src/game/g_phys.pas b/src/game/g_phys.pas
index 4564750062a73d60df54dc827118ccc3ef83094a..d581eb3903e325e6fc8ba94a7f659df01167a7a0 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/>.
  *)
-{$MODE DELPHI}
+{$INCLUDE g_amodes.inc}
 unit g_phys;
 
 interface

diff --git a/src/game/g_player.pas b/src/game/g_player.pas
index ef8b1af0da19cfd20e0ea61faa118bc8474f298f..d5b318f728de8b48c213ad54877439ec0764acd0 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/>.
  *)
-{$MODE DELPHI}
+{$INCLUDE g_amodes.inc}
 unit g_player;
 
 interface

diff --git a/src/game/g_playermodel.pas b/src/game/g_playermodel.pas
index f3e1f8d79e5c7652ba9a002d1216f422016c8198..0392cc43d65ad7db2280bba5d56a4cf87ce6c7fc 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/>.
  *)
-{$MODE DELPHI}
+{$INCLUDE g_amodes.inc}
 unit g_playermodel;
 
 interface

diff --git a/src/game/g_res_downloader.pas b/src/game/g_res_downloader.pas
index 6d112ee446e280555e4776edb2dad57561e887d0..471268ed20ba9645d44f4ade7564d55c24b6401c 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/>.
  *)
-{$MODE DELPHI}
+{$INCLUDE g_amodes.inc}
 unit g_res_downloader;
 
 interface

diff --git a/src/game/g_saveload.pas b/src/game/g_saveload.pas
index f020b9bb69bc77aba28390dd431c50d1c3695550..039883d286cc8d5ccd34593ddca464974867f753 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/>.
  *)
-{$MODE DELPHI}
+{$INCLUDE g_amodes.inc}
 unit g_saveload;
 
 interface

diff --git a/src/game/g_sound.pas b/src/game/g_sound.pas
index 813d8d145c4edec5cb745d5e83206215d9a17f12..a3ef547a60254c6e46fba00506768e11e5e0f4cd 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/>.
  *)
-{$MODE DELPHI}
+{$INCLUDE g_amodes.inc}
 unit g_sound;
 
 interface

diff --git a/src/game/g_textures.pas b/src/game/g_textures.pas
index 9d9720c9b753e436dc0891dbf9a7e6ff920d676b..21b33aecdee7dc7046f82726119b9949a62f58e9 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/>.
  *)
-{$MODE DELPHI}
+{$INCLUDE g_amodes.inc}
 unit g_textures;
 
 interface

diff --git a/src/game/g_triggers.pas b/src/game/g_triggers.pas
index 8c1c1b895de8c7b08df419df0d85e43204ee449f..278e92a8c609e42e7af63ffea6cd3e7bf1b1672c 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/>.
  *)
-{$MODE DELPHI}
+{$INCLUDE g_amodes.inc}
 unit g_triggers;
 
 interface

diff --git a/src/game/g_weapons.pas b/src/game/g_weapons.pas
index baf71083a364a4808f2ea94424ac3cacdbcbe0e9..22fc69dd520dd148c7206a2d803607342fc22251 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/>.
  *)
-{$MODE DELPHI}
+{$INCLUDE g_amodes.inc}
 unit g_weapons;
 
 interface

diff --git a/src/game/g_window.pas b/src/game/g_window.pas
index e7cc9cd5bb37b42372c61a8bc8e9c9000630e066..89511af81cd2c15fc309ba95ad06e9c2009db0c5 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/>.
  *)
-{$MODE DELPHI}
+{$INCLUDE g_amodes.inc}
 unit g_window;
 
 interface