Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2024-11-22 05:27:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17 from m888r/clangfix

Browse Source 
Small fixes for windows clang compile
This commit is contained in:
Avery 2021-12-05 19:09:47 -05:00 committed by GitHub
commit 3c3a3dba8f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dCommon/Diagnostics.cpp
View File

@ -2,8 +2,9 @@
// If we're on Win32, we'll include our minidump writer // If we're on Win32, we'll include our minidump writer
#ifdef _WIN32 #ifdef _WIN32
#include <Dbghelp.h>
#include <Windows.h> #include <Windows.h>
#include <Dbghelp.h>
#include "Game.h" #include "Game.h"
#include "dLogger.h" #include "dLogger.h"

2
dScripts/NjMonastryBossInstance.cpp
View File

@ -16,7 +16,7 @@
// // // // // // // // // // // // // //
void NjMonastryBossInstance::OnStartup(Entity *self) { void NjMonastryBossInstance::OnStartup(Entity *self) {
auto spawnerNames = std::vector { LedgeFrakjawSpawner, LowerFrakjawSpawner, BaseEnemiesSpawner + std::to_string(1), auto spawnerNames = std::vector<std::string> { LedgeFrakjawSpawner, LowerFrakjawSpawner, BaseEnemiesSpawner + std::to_string(1),
BaseEnemiesSpawner + std::to_string(2), BaseEnemiesSpawner + std::to_string(3), BaseEnemiesSpawner + std::to_string(2), BaseEnemiesSpawner + std::to_string(3),
BaseEnemiesSpawner + std::to_string(4), CounterweightSpawner }; BaseEnemiesSpawner + std::to_string(4), CounterweightSpawner };