Fix building errors.

DreamyCecil · Nov 23, 2021 · cf58207 · cf58207
1 parent 0f6ee2f
commit cf58207
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 10 deletions.
diff --git a/Sources/Bots/NetworkPatch/ServerIntegration.cpp b/Sources/Bots/NetworkPatch/ServerIntegration.cpp
@@ -17,7 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "ServerIntegration.h"
 #include "EntitiesMP/Player.h"
 
-#include "EntitiesMP/Patcher/patcher.h"
+#include "Bots/Patcher/patcher.h"
 
 // Server patches
 class CCecilMessageDispatcher : public CMessageDispatcher {

diff --git a/Sources/EntitiesMP/Common/Common.cpp b/Sources/EntitiesMP/Common/Common.cpp
@@ -499,7 +499,7 @@ void SpawnHitTypeEffect(CEntity *pen, enum BulletHitType bhtType, BOOL bSound, F
           GetNormalComponent( vDistance/fDistance, vHitNormal, ese.vDirection);
           FLOAT fLength = ese.vDirection.Length();
           fLength   = Clamp( fLength*3, 1.0f, 3.0f);
-          fDistance = Clamp( log10(fDistance), 0.5, 2.0);
+          fDistance = Clamp( (FLOAT)log10(fDistance), 0.5f, 2.0f);
           ese.vStretch = FLOAT3D( fDistance, fLength*fDistance, 1.0f);
 
           try {

diff --git a/Sources/EntitiesMP/EntitiesMP_vs2013.vcxproj b/Sources/EntitiesMP/EntitiesMP_vs2013.vcxproj
@@ -76,7 +76,7 @@
     <IntDir>vs2013\$(Configuration)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
     <ExecutablePath>$(SolutionDir)Extras;$(ExecutablePath)</ExecutablePath>
-    <IncludePath>$(SolutionDir);$(SolutionDir)Extras;$(SolutionDir)Engine107;$(IncludePath)</IncludePath>
+    <IncludePath>$(SolutionDir);$(SolutionDir)Extras;$(ProjectDir)StdH;$(SolutionDir)Engine107;$(IncludePath)</IncludePath>
     <LibraryPath>$(SolutionDir)Engine107;$(LibraryPath)</LibraryPath>
     <TargetName>$(ProjectName)</TargetName>
     <OutDir>vs2013\$(Configuration)\</OutDir>
@@ -86,7 +86,7 @@
     <IntDir>vs2013\$(Configuration)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
     <ExecutablePath>$(SolutionDir)Extras;$(ExecutablePath)</ExecutablePath>
-    <IncludePath>$(SolutionDir);$(SolutionDir)Extras;$(SolutionDir)Engine110;$(IncludePath)</IncludePath>
+    <IncludePath>$(SolutionDir);$(SolutionDir)Extras;$(ProjectDir)StdH;$(SolutionDir)Engine110;$(IncludePath)</IncludePath>
     <LibraryPath>$(SolutionDir)Engine110;$(LibraryPath)</LibraryPath>
     <TargetName>$(ProjectName)</TargetName>
   </PropertyGroup>
@@ -95,7 +95,7 @@
     <IntDir>vs2013\$(Configuration)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
     <ExecutablePath>$(SolutionDir)Extras;$(ExecutablePath)</ExecutablePath>
-    <IncludePath>$(SolutionDir);$(SolutionDir)Extras;$(SolutionDir)Engine107;$(IncludePath)</IncludePath>
+    <IncludePath>$(SolutionDir);$(SolutionDir)Extras;$(ProjectDir)StdH;$(SolutionDir)Engine107;$(IncludePath)</IncludePath>
     <LibraryPath>$(SolutionDir)Engine107;$(LibraryPath)</LibraryPath>
     <TargetName>$(ProjectName)D</TargetName>
   </PropertyGroup>
@@ -104,7 +104,7 @@
     <IntDir>vs2013\$(Configuration)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
     <ExecutablePath>$(SolutionDir)Extras;$(ExecutablePath)</ExecutablePath>
-    <IncludePath>$(SolutionDir);$(SolutionDir)Extras;$(SolutionDir)Engine110;$(IncludePath)</IncludePath>
+    <IncludePath>$(SolutionDir);$(SolutionDir)Extras;$(ProjectDir)StdH;$(SolutionDir)Engine110;$(IncludePath)</IncludePath>
     <LibraryPath>$(SolutionDir)Engine110;$(LibraryPath)</LibraryPath>
     <TargetName>$(ProjectName)D</TargetName>
   </PropertyGroup>
@@ -146,6 +146,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <ImportLibrary>$(OutDir)$(TargetName).lib</ImportLibrary>
+      <AdditionalDependencies>user32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <CustomBuildStep>
       <Command>copy vs2013\Release\$(TargetName).dll $(SolutionDir)..\Bin\ &gt;nul
@@ -193,6 +194,7 @@ copy vs2013\Release\$(TargetName).lib $(SolutionDir)..\Bin\ &gt;nul</Command>
       <LinkDLL>true</LinkDLL>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
+      <AdditionalDependencies>user32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <CustomBuildStep>
       <Command>copy vs2013\Release_110\$(TargetName).dll $(SolutionDir)..\Bin\ &gt;nul
@@ -237,7 +239,7 @@ copy vs2013\Release_110\$(TargetName).lib $(SolutionDir)..\Bin\ &gt;nul</Command
       <LinkDLL>true</LinkDLL>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
-      <AdditionalDependencies>EngineD.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>EngineD.lib;user32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <ImportLibrary>$(OutDir)$(TargetName).lib</ImportLibrary>
     </Link>
     <CustomBuildStep>
@@ -283,7 +285,7 @@ copy vs2013\Debug\$(TargetName).lib $(SolutionDir)..\Bin\Debug\ &gt;nul</Command
       <LinkDLL>true</LinkDLL>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
-      <AdditionalDependencies>EngineD.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>EngineD.lib;user32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <CustomBuildStep>
       <Command>copy vs2013\Debug_110\$(TargetName).dll $(SolutionDir)..\Bin\Debug\ &gt;nul

diff --git a/Sources/EntitiesMP/Player.es b/Sources/EntitiesMP/Player.es
@@ -2088,7 +2088,7 @@ functions:
     // [Cecil] TEMP: 7 buttons instead of 10
     for (INDEX iButton = 0; iButton < 7; iButton++) {
       FLOAT2D vSize = FLOAT2D(192, 32);
-      FLOAT2D vOffset = FLOAT2D((iButton % 2) ? 32 : -(vSize(1) + 32), 40*Floor(iButton / 2));
+      FLOAT2D vOffset = FLOAT2D((iButton % 2) ? 32 : -(vSize(1) + 32), 40*floor(iButton / 2));
       FLOAT2D vPos = FLOAT2D(320+vOffset(1), 192+vOffset(2));
 
       //BOOL bMouse = PointBox(m_vMousePointer, vPos, vSize);

diff --git a/Sources/GameMP/Console.cpp b/Sources/GameMP/Console.cpp
@@ -144,7 +144,7 @@ void CGame::ConsoleRender(CDrawPort *pdp)
   //LCDRenderGrid();
   LCDRenderClouds2();
   dpConsole.DrawLine( 0, pixSizeJ-1, pixSizeI, pixSizeJ-1, LCDFadedColor(SE_COL_BLUE_NEUTRAL|255));
-  const colFill = (colDark & ~CT_AMASK) | 0x2F;
+  const COLOR colFill = (colDark & ~CT_AMASK) | 0x2F;
   dpConsole.Fill( 0, pixSizeJ-pixLineSpacing*1.6f, pixSizeI, pixLineSpacing*1.6f, colFill);
 
   // setup font