Archive/TombEngine
0
0
Fork 0
mirror of https://github.com/TombEngine/TombEngine.git synced 2025-05-10 20:46:47 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix issues with conflicting filename

Browse source
This commit is contained in:
Lwmte 2021-09-17 17:14:15 +03:00
parent 7b242a533c
commit 896b60f434
6 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
TR5Main/Game/control.cpp
View file

@ -41,7 +41,7 @@
#include "tr4_littlebeetle.h"
#include "particle/SimpleParticle.h"
#include "Specific/prng.h"
#include "Specific/time.h"
#include "Specific/clock.h"
#include "control/flipmap.h"
#include "Lara/lara_one_gun.h"
#include "generic_switch.h"

2
TR5Main/Renderer/Renderer11.cpp
View file

@ -6,7 +6,7 @@
#include "gameflow.h"
#include "camera.h"
#include "effects/tomb4fx.h"
#include "Specific/time.h"
#include "Specific/clock.h"
#include "Specific/trmath.h"
#include "Utils.h"
#include "VertexBuffer/VertexBuffer.h"

0
TR5Main/Specific/time.cpp → TR5Main/Specific/clock.cpp
View file

0
TR5Main/Specific/time.h → TR5Main/Specific/clock.h
View file

4
TR5Main/TombEngine.vcxproj
View file

@ -515,7 +515,7 @@ xcopy /Y "$(ProjectDir)Shaders\HUD\*.hlsl" "$(TargetDir)\Shaders\HUD\"</Command>
<ClInclude Include="Specific\level.h" />
<ClInclude Include="Specific\newtypes.h" />
<ClInclude Include="Specific\setup.h" />
<ClInclude Include="Specific\time.h" />
<ClInclude Include="Specific\clock.h" />
<ClInclude Include="Specific\trmath.h" />
<ClInclude Include="Specific\winmain.h" />
<ClInclude Include="targetver.h" />
@ -579,7 +579,7 @@ xcopy /Y "$(ProjectDir)Shaders\HUD\*.hlsl" "$(TargetDir)\Shaders\HUD\"</Command>
<ClCompile Include="Objects\Generic\Switches\turn_switch.cpp" />
<ClCompile Include="Objects\Generic\Switches\underwater_switch.cpp" />
<ClCompile Include="Objects\TR5\Switch\tr5_crowdove_switch.cpp" />
<ClCompile Include="Specific\time.cpp" />
<ClCompile Include="Specific\clock.cpp" />
<ClCompile Include="Specific\trmath.cpp" />
<ClCompile Include="Game\effects\smoke.cpp" />
<ClCompile Include="Game\effects\spark.cpp" />

12
TR5Main/TombEngine.vcxproj.filters
View file

@ -1170,9 +1170,6 @@
<ClInclude Include="Game\control\flipmap.h">
<Filter>File di intestazione</Filter>
</ClInclude>
<ClInclude Include="Specific\time.h">
<Filter>File di intestazione</Filter>
</ClInclude>
<ClInclude Include="Game\animation.h">
<Filter>File di intestazione</Filter>
</ClInclude>
@ -1182,6 +1179,9 @@
<ClInclude Include="Game\itemdata\creature_info.h">
<Filter>File di intestazione</Filter>
</ClInclude>
<ClInclude Include="Specific\clock.h">
<Filter>File di intestazione</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="Game\box.cpp">
@ -2117,15 +2117,15 @@
<ClCompile Include="Game\control\filpmap.cpp">
<Filter>File di origine</Filter>
</ClCompile>
<ClCompile Include="Specific\time.cpp">
<Filter>File di origine</Filter>
</ClCompile>
<ClCompile Include="Game\animation.cpp">
<Filter>File di origine</Filter>
</ClCompile>
<ClCompile Include="Game\room.cpp">
<Filter>File di origine</Filter>
</ClCompile>
<ClCompile Include="Specific\clock.cpp">
<Filter>File di origine</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />