Skip to content

Commit

Permalink
Merge pull request #9 from Exit-9B/update-v2.2.1
Browse files Browse the repository at this point in the history
Update v2.2.1
  • Loading branch information
Exit-9B authored Apr 23, 2024
2 parents dbc2370 + 922a104 commit 829aa3e
Show file tree
Hide file tree
Showing 13 changed files with 1,077 additions and 103 deletions.
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
[submodule "extern/CommonLibSSE"]
path = external/CommonLibSSE
url = https://github.com/Ryan-rsm-McKenzie/CommonLibSSE
[submodule "external/FlashLibSkyrim"]
path = external/FlashLibSkyrim
url = https://github.com/Exit-9B/FlashLibSkyrim
[submodule "tools/SKSE-CMakeModules"]
path = tools/SKSE-CMakeModules
url = https://github.com/Exit-9B/SKSE-CMakeModules.git
5 changes: 1 addition & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.24)

project(
MapMarkerFramework
VERSION 2.2.0
VERSION 2.2.1
LANGUAGES CXX
)

Expand Down Expand Up @@ -30,15 +30,12 @@ SKSEPlugin_Add(
src/PCH/PCH.h
)

add_subdirectory("external/FlashLibSkyrim" FlashLibSkyrim EXCLUDE_FROM_ALL)

find_package(jsoncpp REQUIRED)
find_package(tsl-ordered-map CONFIG REQUIRED)

target_link_libraries(
${PROJECT_NAME}
PRIVATE
FlashLibSkyrim
jsoncpp_static
tsl::ordered_map
)
Expand Down
1 change: 0 additions & 1 deletion external/FlashLibSkyrim
Submodule FlashLibSkyrim deleted from 945ec8
1 change: 0 additions & 1 deletion src/PCH/PCH.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
#include <SKSE/SKSE.h>

#include "RE/Offset.Ext.h"
#include "REL/Pattern.h"

#ifdef NDEBUG
#include <spdlog/sinks/basic_file_sink.h>
Expand Down
35 changes: 35 additions & 0 deletions src/RE/Offset.Ext.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,47 @@

namespace Offset
{
namespace GASActionBufferData
{
inline constexpr REL::ID Vtbl(242366);
}

namespace GASDoAction
{
inline constexpr REL::ID Vtbl(242413);
}

namespace GFxInitImportActions
{
inline constexpr REL::ID Vtbl(244866);
}

namespace GFxMovieDefImpl
{
// SkyrimSE 1.6.318.0: 0x18D0260
inline constexpr REL::ID Vtbl(243274);
}

namespace GFxPlaceObject2
{
inline constexpr REL::ID Vtbl(242592);
}

namespace GFxPlaceObject3
{
inline constexpr REL::ID Vtbl(242593);
}

namespace GFxRemoveObject
{
inline constexpr REL::ID Vtbl(244863);
}

namespace GFxRemoveObject2
{
inline constexpr REL::ID Vtbl(244864);
}

namespace HUDMenu
{
// SkyrimSE 1.6.318.0: 0x8AC4F0
Expand Down
91 changes: 0 additions & 91 deletions src/REL/Pattern.h

This file was deleted.

Loading

0 comments on commit 829aa3e

Please sign in to comment.