build: compile fix

mehah · Nov 23, 2023 · b0d5ff1 · b0d5ff1
1 parent 12b7201
commit b0d5ff1
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 21 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -349,7 +349,7 @@ set(SOURCE_FILES
 	client/lightview.cpp
 	client/localplayer.cpp
 	client/luafunctions.cpp
-	client/luavaluecasts.cpp
+	client/luavaluecasts_client.cpp
 	client/map.cpp
 	client/mapio.cpp
 	client/mapview.cpp

diff --git a/src/client/creature.cpp b/src/client/creature.cpp
@@ -24,7 +24,7 @@
 #include "game.h"
 #include "lightview.h"
 #include "localplayer.h"
-#include "luavaluecasts.h"
+#include "luavaluecasts_client.h"
 #include "map.h"
 #include "shadermanager.h"
 #include "thingtypemanager.h"

diff --git a/src/client/game.cpp b/src/client/game.cpp
@@ -26,7 +26,7 @@
 #include "container.h"
 #include "creature.h"
 #include "localplayer.h"
-#include "luavaluecasts.h"
+#include "luavaluecasts_client.h"
 #include "map.h"
 #include "protocolcodes.h"
 #include "protocolgame.h"

diff --git a/src/client/luafunctions.cpp b/src/client/luafunctions.cpp
@@ -30,7 +30,7 @@
 #include "gameconfig.h"
 #include "item.h"
 #include "localplayer.h"
-#include "luavaluecasts.h"
+#include "luavaluecasts_client.h"
 #include "map.h"
 #include "minimap.h"
 #include "missile.h"

diff --git a/src/client/luavaluecasts.cpp → src/client/luavaluecasts_client.cpp b/src/client/luavaluecasts.cpp → src/client/luavaluecasts_client.cpp
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-#include "luavaluecasts.h"
+#include "luavaluecasts_client.h"
 #include <framework/luaengine/luainterface.h>
 
 int push_luavalue(const Outfit& outfit)

diff --git a/src/client/luavaluecasts.h → src/client/luavaluecasts_client.h b/src/client/luavaluecasts.h → src/client/luavaluecasts_client.h
diff --git a/src/client/protocolgameparse.cpp b/src/client/protocolgameparse.cpp
@@ -28,7 +28,7 @@
 #include <framework/core/eventdispatcher.h>
 #include "item.h"
 #include "localplayer.h"
-#include "luavaluecasts.h"
+#include "luavaluecasts_client.h"
 #include "map.h"
 #include "missile.h"
 #include "statictext.h"
@@ -564,8 +564,8 @@ void ProtocolGame::parseMessage(const InputMessagePtr& msg)
         }
     } catch (const stdext::exception& e) {
         g_logger.error(stdext::format("ProtocolGame parse message exception (%d bytes, %d unread, last opcode is 0x%02x (%d), prev opcode is 0x%02x (%d)): %s"
-                                      "\nPacket has been saved to packet.log, you can use it to find what was wrong. (Protocol: %i)",
-                                      msg->getMessageSize(), msg->getUnreadSize(), opcode, opcode, prevOpcode, prevOpcode, e.what(), g_game.getProtocolVersion()));
+                       "\nPacket has been saved to packet.log, you can use it to find what was wrong. (Protocol: %i)",
+                       msg->getMessageSize(), msg->getUnreadSize(), opcode, opcode, prevOpcode, prevOpcode, e.what(), g_game.getProtocolVersion()));
 
         std::ofstream packet("packet.log", std::ifstream::app);
         if (!packet.is_open())
@@ -3953,4 +3953,4 @@ void ProtocolGame::parseMapShader(const InputMessagePtr& msg) {
     const auto& mapView = g_map.getMapView(0);
     if (mapView)
         mapView->setShader(shaderName, 0.f, 0.f);
-}
+}
diff --git a/src/client/uiminimap.cpp b/src/client/uiminimap.cpp
@@ -22,7 +22,7 @@
 
 #include "uiminimap.h"
 #include "game.h"
-#include "luavaluecasts.h"
+#include "luavaluecasts_client.h"
 
 #include "minimap.h"
 #include "uimapanchorlayout.h"

diff --git a/src/framework/luaengine/luavaluecasts.cpp b/src/framework/luaengine/luavaluecasts.cpp
@@ -20,9 +20,8 @@
  * THE SOFTWARE.
  */
 
-#include "luavaluecasts.h"
-#include <framework/otml/otmlnode.h>
 #include "luainterface.h"
+#include <framework/otml/otmlnode.h>
 
  // bool
 int push_luavalue(bool b)

diff --git a/vc17/otclient.vcxproj b/vc17/otclient.vcxproj
@@ -213,6 +213,7 @@ cmd /c "start ../vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\tools\protobuf\
     <ClCompile Include="..\src\client\attachedeffect.cpp" />
     <ClCompile Include="..\src\client\attachedeffectmanager.cpp" />
     <ClCompile Include="..\src\client\gameconfig.cpp" />
+    <ClCompile Include="..\src\client\luavaluecasts_client.cpp" />
     <ClCompile Include="..\src\client\position.cpp" />
     <ClCompile Include="..\src\client\spriteappearances.cpp" />
     <ClCompile Include="..\src\client\client.cpp" />
@@ -227,7 +228,6 @@ cmd /c "start ../vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\tools\protobuf\
     <ClCompile Include="..\src\client\lightview.cpp" />
     <ClCompile Include="..\src\client\localplayer.cpp" />
     <ClCompile Include="..\src\client\luafunctions.cpp" />
-    <ClCompile Include="..\src\client\luavaluecasts.cpp" />
     <ClCompile Include="..\src\client\map.cpp" />
     <ClCompile Include="..\src\client\mapio.cpp" />
     <ClCompile Include="..\src\client\mapview.cpp" />
@@ -364,6 +364,7 @@ cmd /c "start ../vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\tools\protobuf\
     <ClInclude Include="..\src\client\attachedeffect.h" />
     <ClInclude Include="..\src\client\attachedeffectmanager.h" />
     <ClInclude Include="..\src\client\gameconfig.h" />
+    <ClInclude Include="..\src\client\luavaluecasts_client.h" />
     <ClInclude Include="..\src\client\spriteappearances.h" />
     <ClInclude Include="..\src\client\client.h" />
     <ClInclude Include="..\src\client\const.h" />
@@ -379,7 +380,6 @@ cmd /c "start ../vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\tools\protobuf\
     <ClInclude Include="..\src\client\itemtype.h" />
     <ClInclude Include="..\src\client\lightview.h" />
     <ClInclude Include="..\src\client\localplayer.h" />
-    <ClInclude Include="..\src\client\luavaluecasts.h" />
     <ClInclude Include="..\src\client\map.h" />
     <ClInclude Include="..\src\client\mapview.h" />
     <ClInclude Include="..\src\client\minimap.h" />

diff --git a/vc17/otclient.vcxproj.filters b/vc17/otclient.vcxproj.filters
@@ -429,9 +429,6 @@
     <ClCompile Include="..\src\client\luafunctions.cpp">
       <Filter>Source Files\client</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\client\luavaluecasts.cpp">
-      <Filter>Source Files\client</Filter>
-    </ClCompile>
     <ClCompile Include="..\src\client\map.cpp">
       <Filter>Source Files\client</Filter>
     </ClCompile>
@@ -555,6 +552,9 @@
     <ClCompile Include="..\src\client\uigraph.cpp">
       <Filter>Source Files\client</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\client\luavaluecasts_client.cpp">
+      <Filter>Source Files\client</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\src\framework\config.h">
@@ -944,9 +944,6 @@
     <ClInclude Include="..\src\client\localplayer.h">
       <Filter>Header Files\client</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\client\luavaluecasts.h">
-      <Filter>Header Files\client</Filter>
-    </ClInclude>
     <ClInclude Include="..\src\client\map.h">
       <Filter>Header Files\client</Filter>
     </ClInclude>
@@ -1076,10 +1073,13 @@
     <ClInclude Include="..\src\client\uigraph.h">
       <Filter>Header Files\client</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\client\luavaluecasts_client.h">
+      <Filter>Header Files\client</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\src\otcicon.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
-</Project>
+</Project>