R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-09-16 15:02:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix compiler error caused by merging commits from different branches

Browse Source
This commit is contained in:
Amos
2022-01-04 12:11:59 +01:00
parent 84e7729ca0
commit fbcea85631
4 changed files with 154 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
r5dev/core/init.cpp
View File

@@ -6,7 +6,6 @@
#include "core/stdafx.h"
#include "core/init.h"
#include "common/opcodes.h"
#include "tier0/ConCommand.h"
#include "tier0/completion.h"
#include "tier0/cvar.h"
@@ -15,11 +14,13 @@
#include "vpc/keyvalues.h"
#include "vpc/basefilesystem.h"
#include "vpc/keyvalues.h"
#include "common/opcodes.h"
#include "launcher/IApplication.h"
#include "ebisusdk/EbisuSDK.h"
#include "vphysics/QHull.h"
#include "bsplib/bsplib.h"
#ifndef DEDICATED
#include "materialsystem/materialsystem.h"
#include "vgui/CEngineVGui.h"
#include "vgui/vgui_fpspanel.h"
#include "vguimatsurface/MatSystemSurface.h"
@@ -42,6 +43,7 @@
#include "engine/sys_dll2.h"
#include "engine/sys_utils.h"
#ifndef DEDICATED
#include "engine/debugoverlay.h"
#include "inputsystem/inputsystem.h"
#include "windows/id3dx.h"
#endif // !DEDICATED