Merge a877ccd5d2f6d49be9f2a5a5c458910e850ed47c into 49be5b6405d6ab427e06ed350cf76c715a1f3bdd

This commit is contained in:
Herman 2024-10-19 05:12:01 +03:00 committed by GitHub
commit 7a6b6fa102
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 3 additions and 1 deletions

View File

@ -104,7 +104,7 @@ struct ScriptFunctionPointer : public ScriptIdentity
constexpr ScriptFunctionPointer(Function<R, Types...> addr) : ScriptIdentity(addr), addr((void*)(addr)) {}
#else
template<typename R, typename... Types>
constexpr ScriptFunctionPointer(Function<R, Types...> addr) : ScriptIdentity(addr), addr(addr) {}
constexpr ScriptFunctionPointer(Function<R, Types...> addr) : ScriptIdentity(addr), addr((void*)(addr)) {}
#endif
};

View File

@ -1,6 +1,7 @@
#ifndef GAME_STATE_CHARACTERMANAGER_H
#define GAME_STATE_CHARACTERMANAGER_H
#include <list>
#include <boost/filesystem/path.hpp>
#include "character.hpp"

View File

@ -6,6 +6,7 @@
#include <boost/filesystem/fstream.hpp>
#include <components/debug/debuglog.hpp>
#include <memory>
namespace osgMyGUI
{