Merge branch 'master' of ssh://repo.or.cz/d2df-sdl

diff --git a/.gitignore b/.gitignore
new file mode 100644 (file)
index 0000000..3f29eae
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,18 @@
+# Project-specific
+bin/
+tmp/
+
+# Precompiled and Delphi-specific files
+# without *.res
+*.obj
+*.dcu
+*.cbk
+*.dof
+*.ddp
+
+# Commonly used temporary files
+~*
+*.~*
+*.tmp
+*.bak
+*.lps

diff --git a/src/engine/e_log.pas b/src/engine/e_log.pas
index f3dab4ea4156e53f2fa32cb5c5b089bed822c2ea..75b325e8ccbc397ed289fa3e39684035a0e7d40b 100644 (file)
--- a/src/engine/e_log.pas
+++ b/src/engine/e_log.pas
@@ -69,7 +69,7 @@ begin
   begin
     case RecordCategory of
       MSG_FATALERROR: write('FATAL: ');
-      MSG_WARNING: write('WARNINIG: ');
+      MSG_WARNING: write('WARNING: ');
     end;
     writeln(TextLine);
   end;

diff --git a/src/game/Doom2DF.lpi b/src/game/Doom2DF.lpi
new file mode 100644 (file)
index 0000000..3d42f1c
--- /dev/null
+++ b/src/game/Doom2DF.lpi
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CONFIG>
+  <ProjectOptions>
+    <Version Value="9"/>
+    <PathDelim Value="\"/>
+    <General>
+      <Flags>
+        <MainUnitHasCreateFormStatements Value="False"/>
+        <MainUnitHasTitleStatement Value="False"/>
+      </Flags>
+      <SessionStorage Value="InProjectDir"/>
+      <MainUnit Value="0"/>
+      <Title Value="Doom2DF"/>
+      <UseAppBundle Value="False"/>
+      <ResourceType Value="res"/>
+    </General>
+    <i18n>
+      <EnableI18N LFM="False"/>
+    </i18n>
+    <VersionInfo>
+      <StringTable ProductVersion=""/>
+    </VersionInfo>
+    <BuildModes Count="1">
+      <Item1 Name="Default" Default="True"/>
+    </BuildModes>
+    <PublishOptions>
+      <Version Value="2"/>
+    </PublishOptions>
+    <RunParams>
+      <local>
+        <FormatVersion Value="1"/>
+      </local>
+    </RunParams>
+    <Units Count="1">
+      <Unit0>
+        <Filename Value="Doom2DF.dpr"/>
+        <IsPartOfProject Value="True"/>
+      </Unit0>
+    </Units>
+  </ProjectOptions>
+  <CompilerOptions>
+    <Version Value="11"/>
+    <PathDelim Value="\"/>
+    <Target>
+      <Filename Value="..\..\bin\Doom2DF"/>
+    </Target>
+    <SearchPaths>
+      <IncludeFiles Value="..\lib\vampimg;..\lib\vampimg\JpegLib;..\lib\vampimg\ZLib;$(ProjOutDir)"/>
+      <OtherUnitFiles Value="..\lib\vampimg;..\lib\vampimg\JpegLib;..\lib\vampimg\ZLib"/>
+      <UnitOutputDirectory Value="..\..\tmp"/>
+    </SearchPaths>
+    <Parsing>
+      <SyntaxOptions>
+        <SyntaxMode Value="Delphi"/>
+      </SyntaxOptions>
+    </Parsing>
+    <CodeGeneration>
+      <Optimizations>
+        <OptimizationLevel Value="2"/>
+      </Optimizations>
+    </CodeGeneration>
+    <Other>
+      <CompilerMessages>
+        <MsgFileName Value=""/>
+      </CompilerMessages>
+      <CustomOptions Value="-dUSE_FMOD"/>
+      <CompilerPath Value="$(CompPath)"/>
+    </Other>
+  </CompilerOptions>
+  <Debugging>
+    <Exceptions Count="3">
+      <Item1>
+        <Name Value="EAbort"/>
+      </Item1>
+      <Item2>
+        <Name Value="ECodetoolError"/>
+      </Item2>
+      <Item3>
+        <Name Value="EFOpenError"/>
+      </Item3>
+    </Exceptions>
+  </Debugging>
+</CONFIG>

diff --git a/src/shared/MAPDEF.pas b/src/shared/MAPDEF.pas
index d414e7248661e5768524bbd1e4c5748c981b839f..9fd1becc1060410fa9a2d69d17653a5c4bf38ab0 100644 (file)
--- a/src/shared/MAPDEF.pas
+++ b/src/shared/MAPDEF.pas
@@ -224,7 +224,7 @@ const
   TEXTURE_SPECIAL_ACID2 = DWORD(-3);
   TEXTURE_NONE = DWORD(-4);
 
-Type
+type
   TPoint = packed record
     X, Y: LongInt;
   end;
@@ -304,13 +304,13 @@ Type
                              HealInterval: Word;
                              HealMax: Boolean;
                              HealSilent: Boolean);
-      TRIGGER_SHOT:         (ShotType: Byte;
+      TRIGGER_SHOT:         (ShotPos: TPoint;
+                             ShotType: Byte;
+                             ShotTarget: Byte;
                              ShotSound: Boolean;
+                             ShotAllMap: Boolean;
                              ShotPanelID: Integer;
-                             ShotTarget: Byte;
                              ShotIntSight: Word;
-                             ShotAllMap: Boolean;
-                             ShotPos: TPoint;
                              ShotAngle: Word;
                              ShotWait: Word;
                              ShotAccuracy: Word;