Remove dublicated WaveForm.h

OpenXRay · Feb 25, 2018 · a633e89 · a633e89
1 parent df2fe9d
commit a633e89
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 89 deletions.
diff --git a/src/utils/xrSE_Factory/xrSE_Factory.vcxproj b/src/utils/xrSE_Factory/xrSE_Factory.vcxproj
@@ -97,6 +97,7 @@
     <ClInclude Include="..\..\Common\object_type_traits.h" />
     <ClInclude Include="..\..\Include\xrRender\DrawUtils.h" />
     <ClInclude Include="..\..\xrCore\fastdelegate.h" />
+    <ClInclude Include="..\..\xrEngine\WaveForm.h" />
     <ClInclude Include="..\..\xrServerEntities\ai_sounds.h" />
     <ClInclude Include="..\..\xrServerEntities\alife_human_brain.h" />
     <ClInclude Include="..\..\xrServerEntities\alife_human_brain_inline.h" />
@@ -142,7 +143,6 @@
     <ClInclude Include="..\..\xrServerEntities\smart_cast_impl1.h" />
     <ClInclude Include="..\..\xrServerEntities\smart_cast_impl2.h" />
     <ClInclude Include="..\..\xrServerEntities\specific_character.h" />
-    <ClInclude Include="..\..\xrServerEntities\WaveForm.h" />
     <ClInclude Include="..\..\xrServerEntities\xml_str_id_loader.h" />
     <ClInclude Include="..\..\xrServerEntities\xrEProps.h" />
     <ClInclude Include="..\..\xrServerEntities\xrMessages.h" />

diff --git a/src/utils/xrSE_Factory/xrSE_Factory.vcxproj.filters b/src/utils/xrSE_Factory/xrSE_Factory.vcxproj.filters
@@ -360,9 +360,6 @@
     <ClInclude Include="..\..\xrServerEntities\PropertiesListTypes.h">
       <Filter>ServerStuff\ServerEntities\editor_properties</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xrServerEntities\WaveForm.h">
-      <Filter>ServerStuff\ServerEntities\editor_properties</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\xrServerEntities\xrEProps.h">
       <Filter>ServerStuff\ServerEntities\editor_properties</Filter>
     </ClInclude>
@@ -402,6 +399,9 @@
     <ClInclude Include="..\..\xrServerEntities\alife_movement_manager_holder.h">
       <Filter>ServerStuff\ServerEntities\movement_manager_holder</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\xrEngine\WaveForm.h">
+      <Filter>ServerStuff\ServerEntities\editor_properties</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\xrServerEntities\pch_script.cpp">

diff --git a/src/xrEngine/WaveForm.h b/src/xrEngine/WaveForm.h
@@ -1,6 +1,8 @@
 #pragma once
-#ifndef WAVEFORM_H
-#define WAVEFORM_H
+#include <math.h>
+#include "xrCore/_types.h"
+#include "xrCore/math_constants.h"
+#include "xrCommon/math_funcs_inline.h"
 
 #pragma pack(push, 4)
 struct WaveForm
@@ -68,6 +70,4 @@ struct WaveForm
         return true;
     }
 };
-
 #pragma pack(pop)
-#endif
diff --git a/src/xrGame/xrGame.vcxproj b/src/xrGame/xrGame.vcxproj
@@ -140,6 +140,7 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="$(xrExternals)GameSpy\src\GameSpy\md5.h" />
+    <ClInclude Include="..\xrEngine\WaveForm.h" />
     <ClInclude Include="..\xrServerEntities\ai_sounds.h" />
     <ClInclude Include="..\xrServerEntities\alife_human_brain.h" />
     <ClInclude Include="..\xrServerEntities\alife_human_brain_inline.h" />
@@ -185,7 +186,6 @@
     <ClInclude Include="..\xrServerEntities\smart_cast_impl1.h" />
     <ClInclude Include="..\xrServerEntities\smart_cast_impl2.h" />
     <ClInclude Include="..\xrServerEntities\specific_character.h" />
-    <ClInclude Include="..\xrServerEntities\WaveForm.h" />
     <ClInclude Include="..\xrServerEntities\xml_str_id_loader.h" />
     <ClInclude Include="..\xrServerEntities\xrEProps.h" />
     <ClInclude Include="..\xrServerEntities\xrMessages.h" />

diff --git a/src/xrGame/xrGame.vcxproj.filters b/src/xrGame/xrGame.vcxproj.filters
@@ -5565,9 +5565,6 @@
     <ClInclude Include="..\xrServerEntities\ItemListTypes.h">
       <Filter>Core\Server\Editor</Filter>
     </ClInclude>
-    <ClInclude Include="..\xrServerEntities\WaveForm.h">
-      <Filter>Core\Server\Editor</Filter>
-    </ClInclude>
     <ClInclude Include="..\xrServerEntities\xrEProps.h">
       <Filter>Core\Server\Editor</Filter>
     </ClInclude>
@@ -6674,6 +6671,9 @@
       <Filter>UI\Common\PDA\FractionWar</Filter>
     </ClInclude>
     <ClInclude Include="game_type.h" />
+    <ClInclude Include="..\xrEngine\WaveForm.h">
+      <Filter>Core\Server\Editor</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="damage_manager.cpp">

diff --git a/src/xrServerEntities/PropertiesListTypes.h b/src/xrServerEntities/PropertiesListTypes.h
@@ -1,7 +1,7 @@
 //---------------------------------------------------------------------------
 #pragma once
 
-#include "WaveForm.h"
+#include "xrEngine/WaveForm.h"
 #include "gametype_chooser.h"
 #include "xrCommon/xr_string.h"
 #include "xrCommon/xr_vector.h"

diff --git a/src/xrServerEntities/WaveForm.h b/src/xrServerEntities/WaveForm.h