Skip to content

Commit

Permalink
Moved to SKSE64 2.0.6 with MSVC2017. Blocking issue: state functions …
Browse files Browse the repository at this point in the history 
…are not supported.
  • Loading branch information
@ryobg
ryobg committed Feb 6, 2018
1 parent 87d0367 commit 09ca264
Show file tree
Hide file tree
Showing 493 changed files with 35,823 additions and 27,491 deletions.
5 changes: 4 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Ignore as too big, basically unpack there a release of Boost
# There is one single batch file, for build settings.
dep/boost

#################
Expand All @@ -15,7 +16,8 @@ dep/boost

# Build results


Debug/
Release/
x64/
[Bb]in/
[Oo]bj/
Expand Down Expand Up @@ -49,6 +51,7 @@ x64/
*.scc

# Visual C++ cache files
.vs/
ipch/
*.aps
*.ncb
Expand Down
63 changes: 39 additions & 24 deletions JContainers.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ VisualStudioVersion = 15.0.27004.2005
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JContainers", "JContainers\JContainers.vcxproj", "{C7305D8C-5514-4C58-9ED7-04D1D7A53D8D}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "skse", "dep\skse\skse\skse.vcxproj", "{AA0365EC-47EA-45AA-BB1F-EBBCCCC466F2}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common", "dep\common\common.vcxproj", "{20C6411C-596F-4B85-BE4E-8BC91F59D8A6}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jansson", "dep\jansson\jansson.vcxproj", "{F9EF3CA7-06A8-4BB2-9232-C4251E65829B}"
Expand All @@ -21,6 +19,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "luajit", "dep\luajit\luajit
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest", "dep\googletest\gtest.vcxproj", "{C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "skse64", "dep\skse\skse64\skse64.vcxproj", "{7028B79C-06E3-4D9A-B38C-1DC3680B1BDB}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "skse64_common", "dep\skse\skse64_common\skse64_common.vcxproj", "{5FD1C08D-DB80-480C-A1C6-F0920005CD13}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Expand Down Expand Up @@ -48,37 +50,22 @@ Global
{C7305D8C-5514-4C58-9ED7-04D1D7A53D8D}.SKSE|Win32.ActiveCfg = Release|Win32
{C7305D8C-5514-4C58-9ED7-04D1D7A53D8D}.SKSE|x64.ActiveCfg = Release|x64
{C7305D8C-5514-4C58-9ED7-04D1D7A53D8D}.SKSE|x64.Build.0 = Release|x64
{AA0365EC-47EA-45AA-BB1F-EBBCCCC466F2}.Debug|Win32.ActiveCfg = Debug|Win32
{AA0365EC-47EA-45AA-BB1F-EBBCCCC466F2}.Debug|Win32.Build.0 = Debug|Win32
{AA0365EC-47EA-45AA-BB1F-EBBCCCC466F2}.Debug|x64.ActiveCfg = Debug|x64
{AA0365EC-47EA-45AA-BB1F-EBBCCCC466F2}.Debug|x64.Build.0 = Debug|x64
{AA0365EC-47EA-45AA-BB1F-EBBCCCC466F2}.Distrib|Win32.ActiveCfg = Release|Win32
{AA0365EC-47EA-45AA-BB1F-EBBCCCC466F2}.Distrib|Win32.Build.0 = Release|Win32
{AA0365EC-47EA-45AA-BB1F-EBBCCCC466F2}.Distrib|x64.ActiveCfg = Debug|x64
{AA0365EC-47EA-45AA-BB1F-EBBCCCC466F2}.Distrib|x64.Build.0 = Debug|x64
{AA0365EC-47EA-45AA-BB1F-EBBCCCC466F2}.Release|Win32.ActiveCfg = Release|Win32
{AA0365EC-47EA-45AA-BB1F-EBBCCCC466F2}.Release|Win32.Build.0 = Release|Win32
{AA0365EC-47EA-45AA-BB1F-EBBCCCC466F2}.Release|x64.ActiveCfg = Release|x64
{AA0365EC-47EA-45AA-BB1F-EBBCCCC466F2}.SKSE|Win32.ActiveCfg = SKSE|Win32
{AA0365EC-47EA-45AA-BB1F-EBBCCCC466F2}.SKSE|Win32.Build.0 = SKSE|Win32
{AA0365EC-47EA-45AA-BB1F-EBBCCCC466F2}.SKSE|x64.ActiveCfg = SKSE|x64
{AA0365EC-47EA-45AA-BB1F-EBBCCCC466F2}.SKSE|x64.Build.0 = SKSE|x64
{20C6411C-596F-4B85-BE4E-8BC91F59D8A6}.Debug|Win32.ActiveCfg = Debug|Win32
{20C6411C-596F-4B85-BE4E-8BC91F59D8A6}.Debug|Win32.Build.0 = Debug|Win32
{20C6411C-596F-4B85-BE4E-8BC91F59D8A6}.Debug|x64.ActiveCfg = Debug|x64
{20C6411C-596F-4B85-BE4E-8BC91F59D8A6}.Debug|x64.Build.0 = Debug|x64
{20C6411C-596F-4B85-BE4E-8BC91F59D8A6}.Debug|x64.ActiveCfg = Debug|Win32
{20C6411C-596F-4B85-BE4E-8BC91F59D8A6}.Distrib|Win32.ActiveCfg = Release|Win32
{20C6411C-596F-4B85-BE4E-8BC91F59D8A6}.Distrib|Win32.Build.0 = Release|Win32
{20C6411C-596F-4B85-BE4E-8BC91F59D8A6}.Distrib|x64.ActiveCfg = Debug|x64
{20C6411C-596F-4B85-BE4E-8BC91F59D8A6}.Distrib|x64.Build.0 = Debug|x64
{20C6411C-596F-4B85-BE4E-8BC91F59D8A6}.Distrib|x64.ActiveCfg = Release|Win32
{20C6411C-596F-4B85-BE4E-8BC91F59D8A6}.Distrib|x64.Build.0 = Release|Win32
{20C6411C-596F-4B85-BE4E-8BC91F59D8A6}.Distrib|x64.Deploy.0 = Release|Win32
{20C6411C-596F-4B85-BE4E-8BC91F59D8A6}.Release|Win32.ActiveCfg = Release|Win32
{20C6411C-596F-4B85-BE4E-8BC91F59D8A6}.Release|Win32.Build.0 = Release|Win32
{20C6411C-596F-4B85-BE4E-8BC91F59D8A6}.Release|x64.ActiveCfg = Release|x64
{20C6411C-596F-4B85-BE4E-8BC91F59D8A6}.Release|x64.Build.0 = Release|x64
{20C6411C-596F-4B85-BE4E-8BC91F59D8A6}.SKSE|Win32.ActiveCfg = Release|Win32
{20C6411C-596F-4B85-BE4E-8BC91F59D8A6}.SKSE|Win32.Build.0 = Release|Win32
{20C6411C-596F-4B85-BE4E-8BC91F59D8A6}.SKSE|x64.ActiveCfg = Release|x64
{20C6411C-596F-4B85-BE4E-8BC91F59D8A6}.SKSE|x64.Build.0 = Release|x64
{20C6411C-596F-4B85-BE4E-8BC91F59D8A6}.SKSE|x64.ActiveCfg = Release|Win32
{20C6411C-596F-4B85-BE4E-8BC91F59D8A6}.SKSE|x64.Build.0 = Release|Win32
{20C6411C-596F-4B85-BE4E-8BC91F59D8A6}.SKSE|x64.Deploy.0 = Release|Win32
{F9EF3CA7-06A8-4BB2-9232-C4251E65829B}.Debug|Win32.ActiveCfg = Debug|Win32
{F9EF3CA7-06A8-4BB2-9232-C4251E65829B}.Debug|Win32.Build.0 = Debug|Win32
{F9EF3CA7-06A8-4BB2-9232-C4251E65829B}.Debug|x64.ActiveCfg = Debug|x64
Expand Down Expand Up @@ -169,6 +156,34 @@ Global
{C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.SKSE|Win32.Build.0 = Release|Win32
{C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.SKSE|x64.ActiveCfg = Release|x64
{C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.SKSE|x64.Build.0 = Release|x64
{7028B79C-06E3-4D9A-B38C-1DC3680B1BDB}.Debug|Win32.ActiveCfg = Debug|x64
{7028B79C-06E3-4D9A-B38C-1DC3680B1BDB}.Debug|x64.ActiveCfg = Debug|x64
{7028B79C-06E3-4D9A-B38C-1DC3680B1BDB}.Debug|x64.Build.0 = Debug|x64
{7028B79C-06E3-4D9A-B38C-1DC3680B1BDB}.Distrib|Win32.ActiveCfg = Release|x64
{7028B79C-06E3-4D9A-B38C-1DC3680B1BDB}.Distrib|Win32.Build.0 = Release|x64
{7028B79C-06E3-4D9A-B38C-1DC3680B1BDB}.Distrib|x64.ActiveCfg = Debug|x64
{7028B79C-06E3-4D9A-B38C-1DC3680B1BDB}.Distrib|x64.Build.0 = Debug|x64
{7028B79C-06E3-4D9A-B38C-1DC3680B1BDB}.Release|Win32.ActiveCfg = Release|x64
{7028B79C-06E3-4D9A-B38C-1DC3680B1BDB}.Release|x64.ActiveCfg = Release|x64
{7028B79C-06E3-4D9A-B38C-1DC3680B1BDB}.Release|x64.Build.0 = Release|x64
{7028B79C-06E3-4D9A-B38C-1DC3680B1BDB}.SKSE|Win32.ActiveCfg = Release|x64
{7028B79C-06E3-4D9A-B38C-1DC3680B1BDB}.SKSE|Win32.Build.0 = Release|x64
{7028B79C-06E3-4D9A-B38C-1DC3680B1BDB}.SKSE|x64.ActiveCfg = Release|x64
{7028B79C-06E3-4D9A-B38C-1DC3680B1BDB}.SKSE|x64.Build.0 = Release|x64
{5FD1C08D-DB80-480C-A1C6-F0920005CD13}.Debug|Win32.ActiveCfg = Debug|x64
{5FD1C08D-DB80-480C-A1C6-F0920005CD13}.Debug|x64.ActiveCfg = Debug|x64
{5FD1C08D-DB80-480C-A1C6-F0920005CD13}.Debug|x64.Build.0 = Debug|x64
{5FD1C08D-DB80-480C-A1C6-F0920005CD13}.Distrib|Win32.ActiveCfg = Release|x64
{5FD1C08D-DB80-480C-A1C6-F0920005CD13}.Distrib|Win32.Build.0 = Release|x64
{5FD1C08D-DB80-480C-A1C6-F0920005CD13}.Distrib|x64.ActiveCfg = Debug|x64
{5FD1C08D-DB80-480C-A1C6-F0920005CD13}.Distrib|x64.Build.0 = Debug|x64
{5FD1C08D-DB80-480C-A1C6-F0920005CD13}.Release|Win32.ActiveCfg = Release|x64
{5FD1C08D-DB80-480C-A1C6-F0920005CD13}.Release|x64.ActiveCfg = Release|x64
{5FD1C08D-DB80-480C-A1C6-F0920005CD13}.Release|x64.Build.0 = Release|x64
{5FD1C08D-DB80-480C-A1C6-F0920005CD13}.SKSE|Win32.ActiveCfg = Release|x64
{5FD1C08D-DB80-480C-A1C6-F0920005CD13}.SKSE|Win32.Build.0 = Release|x64
{5FD1C08D-DB80-480C-A1C6-F0920005CD13}.SKSE|x64.ActiveCfg = Release|x64
{5FD1C08D-DB80-480C-A1C6-F0920005CD13}.SKSE|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
3 changes: 0 additions & 3 deletions JContainers/JContainers.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -330,9 +330,6 @@
<ProjectReference Include="..\dep\luajit\luajit.vcxproj">
<Project>{7d8b3c09-a91e-4c14-93af-059f314c601f}</Project>
</ProjectReference>
<ProjectReference Include="..\dep\skse\skse\skse.vcxproj">
<Project>{aa0365ec-47ea-45aa-bb1f-ebbcccc466f2}</Project>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="JContainers.rc" />
Expand Down
2 changes: 1 addition & 1 deletion JContainers/src/collections/collections.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

#include "common/ITypes.h"
#include "common/IDebugLog.h"
#include "skse/GameForms.h"
#include "skse64/GameForms.h"
#include "skse/skse.h"

#include "object/object_base.h"
Expand Down
2 changes: 1 addition & 1 deletion JContainers/src/reflection/detail/reflection.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include "gtest.h"
#include "util/spinlock.h"
#include "util/singleton.h"
#include "skse/PapyrusVM.h"
#include "skse64/PapyrusVM.h"

#include "reflection/detail/code_producer.hpp"
#include "reflection/detail/type_traits.hpp"
Expand Down
2 changes: 1 addition & 1 deletion JContainers/src/reflection/reflection.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include <algorithm>
#include <stdint.h>

#include "skse/PapyrusVM.h"
#include "skse64/PapyrusVM.h"
#include "meta.h"
#include "util/istring.h"

Expand Down
4 changes: 2 additions & 2 deletions JContainers/src/reflection/tes_binding.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "skse/PapyrusNativeFunctions.h"
#include "skse64/PapyrusNativeFunctions.h"
#include "skse/string.h"
#include "reflection/reflection.h"

Expand Down Expand Up @@ -112,7 +112,7 @@ namespace reflection { namespace binding {
#undef MAKE_ME_HAPPY
#define MAKE_ME_HAPPY(N)\
template<> struct state_native_function_selector<N> {\
template<class State, class... Params> using function = ::NativeFunctionWithState ## N <State, Params...>; \
template<class State, class... Params> using function = ::LatentNativeFunction ## N <State, Params...>; \
};

MAKE_ME_HAPPY(0);
Expand Down
10 changes: 5 additions & 5 deletions JContainers/src/skse/papyrus_args.hpp
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#pragma once

#include "skse/PapyrusArgs.h"
#include "skse/string.h"
#include "skse64/PapyrusArgs.h"
#include "skse64/PapyrusStringUtil.h"

template <> inline UInt32 GetTypeID <skse::string_ref>(VMClassRegistry * registry) { return VMValue::kType_String; }
template <> inline UInt32 GetTypeID <VMArray<skse::string_ref>>(VMClassRegistry * registry) { return VMValue::kType_StringArray; }
template <> inline UInt32 GetTypeID <VMResultArray<skse::string_ref>>(VMClassRegistry * registry) { return VMValue::kType_StringArray; }
template <> inline UInt64 GetTypeID <skse::string_ref>(VMClassRegistry * registry) { return VMValue::kType_String; }
template <> inline UInt64 GetTypeID <VMArray<skse::string_ref>>(VMClassRegistry * registry) { return VMValue::kType_StringArray; }
template <> inline UInt64 GetTypeID <VMResultArray<skse::string_ref>>(VMClassRegistry * registry) { return VMValue::kType_StringArray; }


template <> inline void PackValue <skse::string_ref>(VMValue * dst, skse::string_ref * src, VMClassRegistry * registry)
Expand Down
20 changes: 10 additions & 10 deletions JContainers/src/skse/skse.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
//#include <ShlObj.h>

//#include "skse/PluginAPI.h"
#include "skse/skse_version.h"
#include "skse/GameData.h"
#include "skse64_common/skse_version.h"
#include "skse64/GameData.h"
//#include "skse/PapyrusVM.h"
#include "skse/GameForms.h"
#include "skse/GameData.h"
#include "skse/InternalSerialization.h"
#include "skse/PluginAPI.h"
#include "skse/PapyrusVM.h"
#include "skse64/GameForms.h"
#include "skse64/GameData.h"
#include "skse64/InternalSerialization.h"
#include "skse64/PluginAPI.h"
#include "skse64/PapyrusVM.h"

#include "util/stl_ext.h"
#include "gtest.h"
Expand Down Expand Up @@ -139,7 +139,7 @@ namespace skse {
struct skse_real_api : skse_api {
const char * modname_from_index(uint8_t idx) override {
DataHandler * dhand = DataHandler::GetSingleton();
ModInfo * modInfo = idx < _countof(dhand->modList.loadedMods) ? dhand->modList.loadedMods[idx] : nullptr;
ModInfo * modInfo = idx < dhand->modList.loadedMods.count ? dhand->modList.loadedMods[idx] : nullptr;
return modInfo ? modInfo->name : nullptr;
}

Expand Down Expand Up @@ -174,9 +174,9 @@ namespace skse {
}

void console_print(const char * fmt, const va_list& args) override {
ConsoleManager * mgr = ConsoleManager::GetSingleton();
ConsoleManager * mgr = *g_console;
if (mgr) {
CALL_MEMBER_FN(mgr, Print)(fmt, args);
CALL_MEMBER_FN (mgr, VPrint)(fmt, args);
}
}
};
Expand Down
2 changes: 1 addition & 1 deletion JContainers/src/skse/string.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#pragma once

#include <string>
#include "skse/Utilities.h"
#include "skse64_common/Utilities.h"

namespace skse {

Expand Down
14 changes: 7 additions & 7 deletions JContainers/src/skse_callbacks.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
#include <boost/iostreams/stream.hpp>
#include <ShlObj.h>

#include "skse/PluginAPI.h"
#include "skse/skse_version.h"
#include "skse/GameData.h"
#include "skse64/PluginAPI.h"
#include "skse64_common/skse_version.h"
#include "skse64/GameData.h"
//#include "skse/PapyrusVM.h"
#include "skse/GameForms.h"
#include "skse/GameData.h"
#include "skse64/GameForms.h"
#include "skse64/GameData.h"

//#include "gtest.h"
#include "skse/skse.h"
#include "skse/PapyrusVM.h"
#include "skse64/PapyrusVM.h"
#include "util/util.h"
#include "jc_interface.h"
#include "reflection/reflection.h"
Expand Down Expand Up @@ -136,7 +136,7 @@ namespace {
JC_log("loaded in editor, marking as incompatible");
return false;
}
else if (skse->runtimeVersion != RUNTIME_VERSION_1_9_32_0) {
else if (skse->runtimeVersion != RUNTIME_VERSION_1_5_23) {
JC_log("unsupported runtime version %08X", skse->runtimeVersion);
return false;
}
Expand Down
3 changes: 0 additions & 3 deletions api_usage_example/api_usage_example.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,9 +152,6 @@
<ProjectReference Include="..\dep\common\common.vcxproj">
<Project>{20c6411c-596f-4b85-be4e-8bc91f59d8a6}</Project>
</ProjectReference>
<ProjectReference Include="..\dep\skse\skse\skse.vcxproj">
<Project>{aa0365ec-47ea-45aa-bb1f-ebbcccc466f2}</Project>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
Expand Down
1 change: 1 addition & 0 deletions dep/common/.gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,6 @@
## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.

x64/
[Dd]ebug/
[Rr]elease/
20 changes: 20 additions & 0 deletions dep/common/ICriticalSection.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,23 @@ class ICriticalSection
private:
CRITICAL_SECTION critSection;
};

class IScopedCriticalSection
{
public:
IScopedCriticalSection(ICriticalSection * cs)
:m_cs(cs)
{
m_cs->Enter();
}

~IScopedCriticalSection()
{
m_cs->Leave();
}

private:
IScopedCriticalSection(); // undefined

ICriticalSection * m_cs;
};
28 changes: 25 additions & 3 deletions dep/common/IDebugLog.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,12 @@ void IDebugLog::OpenRelative(int folderID, const char * relPath)
{
char path[MAX_PATH];

ASSERT(SUCCEEDED(SHGetFolderPath(NULL, folderID, NULL, SHGFP_TYPE_CURRENT, path)));
HRESULT err = SHGetFolderPath(NULL, folderID | CSIDL_FLAG_CREATE, NULL, SHGFP_TYPE_CURRENT, path);
if(!SUCCEEDED(err))
{
_FATALERROR("SHGetFolderPath %08X failed (result = %08X lasterr = %08X)", folderID, err, GetLastError());
}
ASSERT_CODE(SUCCEEDED(err), err);

strcat_s(path, sizeof(path), relPath);

Expand All @@ -71,7 +76,7 @@ void IDebugLog::OpenRelative(int folderID, const char * relPath)
* @param message the message
* @param source the source of the message, or NULL to use the previous source
*/
void IDebugLog::Message(const char * message, const char * source)
void IDebugLog::Message(const char * message, const char * source, bool newLine)
{
if(source)
SetSource(source);
Expand All @@ -88,7 +93,9 @@ void IDebugLog::Message(const char * message, const char * source)
}

PrintText(message);
NewLine();

if(newLine)
NewLine();
}

/**
Expand Down Expand Up @@ -134,6 +141,21 @@ void IDebugLog::Log(LogLevel level, const char * fmt, va_list args)
printf("%s\n", formatBuf);
}

void IDebugLog::LogNNL(LogLevel level, const char * fmt, va_list args)
{
bool log = (level <= logLevel);
bool print = (level <= printLevel);

if(log || print)
vsprintf_s(formatBuf, sizeof(formatBuf), fmt, args);

if(log)
Message(formatBuf, NULL, false);

if(print)
printf("%s", formatBuf);
}

/**
* Set the current message source
*/
Expand Down
3 changes: 2 additions & 1 deletion dep/common/IDebugLog.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class IDebugLog
static void Open(const char * path);
static void OpenRelative(int folderID, const char * relPath);

static void Message(const char * message, const char * source = NULL);
static void Message(const char * message, const char * source = NULL, bool newLine = true);
static void FormattedMessage(const char * fmt, ...);
static void FormattedMessage(const char * fmt, va_list args);

Expand All @@ -33,6 +33,7 @@ class IDebugLog
};

static void Log(LogLevel level, const char * fmt, va_list args);
static void LogNNL(LogLevel level, const char * fmt, va_list args); // No new line

static void SetSource(const char * source);
static void ClearSource(void);
Expand Down
2 changes: 1 addition & 1 deletion dep/common/IErrors.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@ template <int x> struct static_assert_test { };
#define __PREPRO_TOKEN_STR__(a) __PREPRO_TOKEN_STR2__(a)
#define __LOC__ __FILE__ "("__PREPRO_TOKEN_STR__(__LINE__)") : "

#define STATIC_ASSERT(a) static_assert(a, "")
#define STATIC_ASSERT(a) typedef static_assert_test <sizeof(StaticAssertFailure<(bool)(a)>)> __MACRO_JOIN__(static_assert_typedef_, __COUNTER__)
Loading

3 comments on commit 09ca264

@javierhimura
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi, i see you are triyng to migrate JContainers to x64
I already figured the problem with State Functions
It does not mean that part of SKSE has been removed in the migration to SSE, State Functions never was a part of SKSE, in any SKSE version in 32 or 64 bits
The problem is the author of Jcontainers has made custom change to the files of SKSE to include things like State Functions, you have replaced the custom SKSE of Jcontainers with the oficial SKSE64 source code.
Now to compile is needed to compare the custom SKSE of JContainers x86 with the official SKSE used initially (i think is 1.7.0.1) and bring those custom changes to the SKSE64 files in JContainers x64 branch

@javierhimura
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The files from SKSE with custom changes in JContainers seems to be
skse/PapyrusArgs.cpp
skse/PapyrusArgs.h
skse/PapyrusNativeFunctionsDef.ini
skse/PapyrusNativeFunctionsDef_Base.ini

The last two are the ones with the code for State Function

Also the file skse/GameSettings.cpp has two lines commented and the comment of JContainers' author is those lines must be commented to test JContainers

There are other files changed that does not make must sense, is just code removed from the official skse, maybe the author did not start with 1.7.0.1 and when he updated he missed some changes

@ryobg
Copy link
Owner Author

@ryobg ryobg commented on 09ca264 Feb 6, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lol, that have not occured to me as an option. Thanks for that, I will check it out.
I'm not confident in the functional behaviour, so I will try to keep as minimal my updates and any SKSE patches.

Please sign in to comment.