Renamed AmmoMod.cpp/h to DamageMod.

sfall/DamageMod.cpp

@@ -434,7 +434,7 @@ static void __declspec(naked) DisplayBonusHtHDmg2_hack() {
 	}
 }
 
-void AmmoModInit() {
+void DamageModInit() {
 	if (formula = GetPrivateProfileIntA("Misc", "DamageFormula", 0, ini)) {
 		switch (formula) {
 		case 1:

sfall/DamageMod.h

@@ -18,4 +18,4 @@
 
 #pragma once
 
-void AmmoModInit();
+void DamageModInit();

sfall/FalloutStructs.h

@@ -167,6 +167,30 @@ struct TProgram
 };
 #pragma pack(pop)
 
+// structures for holding frms loaded with fallout2 functions
+#pragma pack(push, 2)
+typedef class FrmSubframeData {
+public:
+	WORD width;
+	WORD height;
+	DWORD size;
+	WORD x;
+	WORD y;
+} FrmSubframeData;
+
+typedef class FrmFrameData {
+public:
+	DWORD version; // version num
+	WORD fps; // frames per sec
+	WORD actionFrame;
+	WORD numFrames; // number of frames per direction
+	WORD xCentreShift[6]; // offset from frm centre +=right -=left
+	WORD yCentreShift[6]; // offset from frm centre +=down -=up
+	DWORD oriOffset[6]; // frame area offset for diff orientations
+	DWORD frameAreaSize;
+} FrmFrameData;
+#pragma pack(pop)
+
 #pragma pack(push, 1)
 struct Queue
 {

sfall/HeroAppearance.cpp

@@ -63,30 +63,6 @@ typedef struct LineNode {
 	}
 } LineNode;
 
-// structures for holding frms loaded with fallout2 functions
-#pragma pack(2)
-typedef class FRMframe {
-	public:
-	WORD width;
-	WORD height;
-	DWORD size;
-	WORD x;
-	WORD y;
-} FRMframe;
-
-typedef class FRMhead {
-	public:
-	DWORD version; // version num
-	WORD FPS; // frames per sec
-	WORD actionFrame;
-	WORD numFrames; // number of frames per direction
-	WORD xCentreShift[6]; // offset from frm centre +=right -=left
-	WORD yCentreShift[6]; // offset from frm centre +=down -=up
-	DWORD oriOffset[6]; // frame area offset for diff orientations
-	DWORD frameAreaSize;
-} FRMhead;
-#pragma pack()
-
 // structures for loading unlisted frms
 typedef class UNLSTDframe {
 	public:
@@ -363,8 +339,8 @@ BYTE* GetFrmSurface2(DWORD FrmID, DWORD *FrmObj_out, DWORD *frmWidth_out, DWORD
 }
 */
 
-FRMhead* GetFrm(DWORD FrmID, DWORD *FrmObj_out) {
-	FRMhead* Frm;
+FrmFrameData* GetFrm(DWORD FrmID, DWORD *FrmObj_out) {
+	FrmFrameData* Frm;
 	__asm {
 		mov  edx, FrmObj_out;
 		mov  eax, FrmID;
@@ -374,7 +350,7 @@ FRMhead* GetFrm(DWORD FrmID, DWORD *FrmObj_out) {
 	return Frm;
 }
 
-DWORD GetFrmFrameWidth(FRMhead* Frm, DWORD FrameNum, DWORD Ori) {
+DWORD GetFrmFrameWidth(FrmFrameData* Frm, DWORD FrameNum, DWORD Ori) {
 	DWORD Width;
 	__asm {
 		mov  ebx, Ori; // 0-5
@@ -386,7 +362,7 @@ DWORD GetFrmFrameWidth(FRMhead* Frm, DWORD FrameNum, DWORD Ori) {
 	return Width;
 }
 
-DWORD GetFrmFrameHeight(FRMhead* Frm, DWORD FrameNum, DWORD Ori) {
+DWORD GetFrmFrameHeight(FrmFrameData* Frm, DWORD FrameNum, DWORD Ori) {
 	DWORD Height;
 	__asm {
 		mov  ebx, Ori; // 0-5
@@ -398,7 +374,7 @@ DWORD GetFrmFrameHeight(FRMhead* Frm, DWORD FrameNum, DWORD Ori) {
 	return Height;
 }
 
-BYTE* GetFrmFrameSurface(FRMhead* Frm,  DWORD FrameNum, DWORD Ori) {
+BYTE* GetFrmFrameSurface(FrmFrameData* Frm,  DWORD FrameNum, DWORD Ori) {
 	BYTE *Surface;
 	__asm {
 		mov  ebx, Ori; // 0-5
@@ -1211,7 +1187,7 @@ static void sub_draw(long subWidth, long subHeight, long fromWidth, long fromHei
 static void DrawBody(DWORD critNum, BYTE* surface) {
 	DWORD critFrmLock;
 
-	FRMhead *critFrm = GetFrm(BuildFrmId(1, critNum), &critFrmLock);
+	FrmFrameData *critFrm = GetFrm(BuildFrmId(1, critNum), &critFrmLock);
 	DWORD critWidth = GetFrmFrameWidth(critFrm, 0, charRotOri);
 	DWORD critHeight = GetFrmFrameHeight(critFrm, 0, charRotOri);
 	BYTE *critSurface = GetFrmFrameSurface(critFrm, 0, charRotOri);

sfall/ddraw.vcxproj

@@ -264,7 +264,7 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="AI.h" />
-    <ClInclude Include="AmmoMod.h" />
+    <ClInclude Include="DamageMod.h" />
     <ClInclude Include="AnimationsAtOnceLimit.h" />
     <ClInclude Include="Arrays.h" />
     <ClInclude Include="BarBoxes.h" />
@@ -330,7 +330,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="AI.cpp" />
-    <ClCompile Include="AmmoMod.cpp" />
+    <ClCompile Include="DamageMod.cpp" />
     <ClCompile Include="AnimationsAtOnceLimit.cpp" />
     <ClCompile Include="Arrays.cpp" />
     <ClCompile Include="BarBoxes.cpp" />

sfall/ddraw.vcxproj.filters

@@ -12,9 +12,6 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="AmmoMod.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
     <ClInclude Include="Console.h">
       <Filter>Headers</Filter>
     </ClInclude>
@@ -196,6 +193,9 @@
     <ClInclude Include="ScriptOps\MetaruleOp.hpp">
       <Filter>Headers\ScriptOps</Filter>
     </ClInclude>
+    <ClInclude Include="DamageMod.h">
+      <Filter>Headers</Filter>
+    </ClInclude>
     <ClInclude Include="Cpp11_emu.h">
       <Filter>Headers</Filter>
     </ClInclude>
@@ -204,9 +204,6 @@
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="AmmoMod.cpp">
-      <Filter>Source</Filter>
-    </ClCompile>
     <ClCompile Include="Console.cpp">
       <Filter>Source</Filter>
     </ClCompile>
@@ -337,6 +334,9 @@
     <ClCompile Include="Message.cpp">
       <Filter>Source</Filter>
     </ClCompile>
+    <ClCompile Include="DamageMod.cpp">
+      <Filter>Source</Filter>
+    </ClCompile>
     <ClCompile Include="stdafx.cpp">
       <Filter>Source</Filter>
     </ClCompile>

sfall/main.cpp

@@ -22,7 +22,6 @@
 #include <stdio.h>
 
 #include "AI.h"
-#include "AmmoMod.h"
 #include "AnimationsAtOnceLimit.h"
 #include "BarBoxes.h"
 #include "Books.h"
@@ -32,6 +31,7 @@
 #include "CRC.h"
 #include "Credits.h"
 #include "Criticals.h"
+#include "DamageMod.h"
 #include "Define.h"
 #include "DebugEditor.h"
 #include "Elevators.h"
@@ -911,8 +911,8 @@ static void DllMain2() {
 		dlogr(" Done", DL_INIT);
 	}
 
-	dlogr("Running AmmoModInit().", DL_INIT);
-	AmmoModInit();
+	dlogr("Running DamageModInit().", DL_INIT);
+	DamageModInit();
 
 	dlogr("Running MoviesInit().", DL_INIT);
 	MoviesInit();