diff options
| author | pg9182 <96569817+pg9182@users.noreply.github.com> | 2022-08-08 06:12:11 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-08 11:12:11 +0100 |
| commit | 5e7668c2cd7ef9d017536f1e2e4ec89708f5b74f (patch) | |
| tree | 6c55b909fd258251c238bfad9caf83113fd88f33 /NorthstarDedicatedTest/squirrel.cpp | |
| parent | 286cea5f6280e568f5cb4c953d93993c98625ce4 (diff) | |
| download | NorthstarLauncher-5e7668c2cd7ef9d017536f1e2e4ec89708f5b74f.tar.gz NorthstarLauncher-5e7668c2cd7ef9d017536f1e2e4ec89708f5b74f.zip | |
Fix most clang/mingw issues (#226)
- Fix include case.
- Replace MSVC-specific align with standard alignas.
- Type fixes.
- Delete operator noexcept.
- A few other minor issues.
- clang-format everything.
- Use c++20 instead of c++17.
- Rewrite ERROR macro for launcher_wsock32_proxy.
- Use a plain ifstream for the audio.cpp wavStream.
Note: When compiling with clang, you'll need -municode.
Related to #212.
Diffstat (limited to 'NorthstarDedicatedTest/squirrel.cpp')
| -rw-r--r-- | NorthstarDedicatedTest/squirrel.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/NorthstarDedicatedTest/squirrel.cpp b/NorthstarDedicatedTest/squirrel.cpp index 502afba0..2fa957fb 100644 --- a/NorthstarDedicatedTest/squirrel.cpp +++ b/NorthstarDedicatedTest/squirrel.cpp @@ -504,7 +504,7 @@ template <ScriptContext context> int64_t RegisterSquirrelFuncHook(void* sqvm, SQ if ((funcReg->devLevel == 1) && (!CommandLine()->CheckParm("-allowSquirrelDevFunctions")) && (!allowedDevFunctions.count(funcReg->squirrelFuncName))) - funcReg->funcPtr = SQ_DevFuncStub; + funcReg->funcPtr = reinterpret_cast<void*>(SQ_DevFuncStub); if (context == ScriptContext::SERVER) return ServerRegisterSquirrelFunc(sqvm, funcReg, unknown); @@ -586,4 +586,4 @@ SQReturnTypeEnum GetReturnTypeEnumFromString(const char* returnTypeString) { return SqReturnDefault; // previous default value } -}
\ No newline at end of file +} |