Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build: compile fix #637

Merged
merged 6 commits into from
Nov 23, 2023
Merged

build: compile fix #637

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cc15efb
init
mehah Nov 22, 2023
031f84d
fix
mehah Nov 22, 2023
a1d561c
Update uiminimap.cpp
mehah Nov 22, 2023
e8062f8
Merge branch 'main' into compile_fix
mehah Nov 23, 2023
3d24049
Merge branch 'main' into compile_fix
mehah Nov 23, 2023
5a1e1ab
Update luavaluecasts.cpp
mehah Nov 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/client/creature.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/client/game.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/client/luafunctions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/client/luavaluecasts.cpp → src/client/luavaluecasts_client.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* THE SOFTWARE.
*/

#include "luavaluecasts.h"
#include "luavaluecasts_client.h"
#include <framework/luaengine/luainterface.h>

int push_luavalue(const Outfit& outfit)
Expand Down
0 src/client/luavaluecasts.h → src/client/luavaluecasts_client.h
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions src/client/protocolgameparse.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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())
Expand Down Expand Up @@ -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);
}
}
2 changes: 1 addition & 1 deletion src/client/uiminimap.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

#include "uiminimap.h"
#include "game.h"
#include "luavaluecasts.h"
#include "luavaluecasts_client.h"

#include "minimap.h"
#include "uimapanchorlayout.h"
Expand Down
3 changes: 1 addition & 2 deletions src/framework/luaengine/luavaluecasts.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions vc17/otclient.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand All @@ -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" />
Expand Down Expand Up @@ -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" />
Expand All @@ -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" />
Expand Down
14 changes: 7 additions & 7 deletions vc17/otclient.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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">
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Loading