Add the OpenWolf Engine submodule.
diff --git a/.gitignore b/.gitignore
index e4b856b..b5570e4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,7 +7,7 @@ CPackConfig.cmake
CPackSourceConfig.cmake
Makefile
cmake_install.cmake
-src/engine/framework/appConfig.h
+OpenWolf-Engine/src/engine/framework/appConfig.h
# OS X
####################
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..0fd3c3c
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "OpenWolf-Engine"]
+ path = OpenWolf-Engine
+ url = https://github.com/GrangerHub/OpenWolf-Engine.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 74c6e49..903adfc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -63,7 +63,7 @@ set( CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.txt" )
set( CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/GPL.txt" )
include( CPack )
-set( MOUNT_DIR ${CMAKE_SOURCE_DIR}/src/engine )
+set( MOUNT_DIR ${CMAKE_SOURCE_DIR}/OpenWolf-Engine/src/engine )
set( LIB_DIR ${CMAKE_SOURCE_DIR}/libs )
set( TREMGAME_DIR ${CMAKE_SOURCE_DIR}/src/gameLogics )
diff --git a/OpenWolf-Engine b/OpenWolf-Engine
new file mode 160000
index 0000000..9dd11ba
--- /dev/null
+++ b/OpenWolf-Engine
@@ -0,0 +1 @@
+Subproject commit 9dd11ba1e80dddb999b128d763afeba9ad3222dc
diff --git a/src/engine/API/CVarSystem_api.h b/src/engine/API/CVarSystem_api.h
deleted file mode 100644
index 4dd2d7f..0000000
--- a/src/engine/API/CVarSystem_api.h
+++ /dev/null
@@ -1,152 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////////////
-// Copyright(C) 2011 - 2019 Dusan Jocic <dusanjocic@msn.com>
-//
-// This file is part of the OpenWolf GPL Source Code.
-// OpenWolf Source Code is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// OpenWolf Source Code is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with OpenWolf Source Code. If not, see <http://www.gnu.org/licenses/>.
-//
-// In addition, the OpenWolf Source Code is also subject to certain additional terms.
-// You should have received a copy of these additional terms immediately following the
-// terms and conditions of the GNU General Public License which accompanied the
-// OpenWolf Source Code. If not, please request a copy in writing from id Software
-// at the address below.
-//
-// If you have questions concerning this license or the applicable additional terms,
-// you may contact in writing id Software LLC, c/o ZeniMax Media Inc.,
-// Suite 120, Rockville, Maryland 20850 USA.
-//
-// -------------------------------------------------------------------------------------
-// File name: CVarSystem_api.h
-// Version: v1.01
-// Created:
-// Compilers: Visual Studio 2019, gcc 7.3.0
-// Description:
-// -------------------------------------------------------------------------------------
-////////////////////////////////////////////////////////////////////////////////////////
-
-#ifndef __CVARSYSTEM_API_H__
-#define __CVARSYSTEM_API_H__
-
-/*
-==========================================================
-CVARS (console variables)
-
-Many variables can be used for cheating purposes, so when
-cheats is zero, force all unspecified variables to their
-default values.
-==========================================================
-*/
-
-//Dushan
-typedef enum cvar_flags_s
-{
- CVAR_ARCHIVE = BIT( 0 ), // set to cause it to be saved to vars.rc
- // used for system variables, not for player
- // specific configurations
- CVAR_USERINFO = BIT( 1 ), // sent to server on connect or change
- CVAR_SERVERINFO = BIT( 2 ), // sent in response to front end requests
- CVAR_SYSTEMINFO = BIT( 3 ), // these cvars will be duplicated on all clients
- CVAR_INIT = BIT( 4 ), // don't allow change from console at all,
- // but can be set from the command line
- CVAR_LATCH = BIT( 5 ), // will only change when C code next does
- // a Cvar_Get(), so it can't be changed
- // without proper initialization. modified
- // will be set, even though the value hasn't
- // changed yet
- CVAR_ROM = BIT( 6 ), // display only, cannot be set by user at all
- CVAR_USER_CREATED = BIT( 7 ), // created by a set command
- CVAR_TEMP = BIT( 8 ), // can be set even when cheats are disabled, but is not archived
- CVAR_CHEAT = BIT( 9 ), // can not be changed if cheats are disabled
- CVAR_NORESTART = BIT( 10 ), // do not clear when a cvar_restart is issued
- CVAR_WOLFINFO = BIT( 11 ), // DHM - NERVE :: Like userinfo, but for wolf multiplayer info
- CVAR_UNSAFE = BIT( 12 ), // ydnar: unsafe system cvars (renderer, sound settings, anything that might cause a crash)
- CVAR_SERVERINFO_NOUPDATE = BIT( 13 ), // gordon: WONT automatically send this to clients, but server browsers will see it
- CVAR_SHADER = BIT( 14 ), // tell renderer to recompile shaders.
- CVAR_NONEXISTENT = 0xFFFFFFFF // Cvar doesn't exist.
-} cvar_flags_t;
-
-// nothing outside the Cvar_*() functions should modify these fields!
-typedef struct convar_s
-{
- S32 flags;
- S32 modificationCount; // incremented each time the cvar is changed
- S32 integer; // atoi( string )
- F32 value; // atof( string )
- F32 min;
- F32 max;
- UTF8* name;
- UTF8* string;
- UTF8* resetString; // cvar_restart will reset to this value
- UTF8* latchedString; // for CVAR_LATCH vars
- UTF8* description;
- bool modified; // set each time the cvar is changed
- bool validate;
- bool integral;
-
- struct convar_s* next;
- struct convar_s* hashNext;
-} convar_t;
-
-#define MAX_CVAR_VALUE_STRING 256
-
-typedef S32 cvarHandle_t;
-
-// the modules that run in the virtual machine can't access the convar_t directly,
-// so they must ask for structured updates
-typedef struct
-{
- S32 modificationCount;
- S32 integer;
- F32 value;
- UTF8 string[MAX_CVAR_VALUE_STRING];
- cvarHandle_t handle;
-} vmConvar_t;
-
-//
-// idCVarSystem
-//
-class idCVarSystem
-{
-public:
- virtual F32 VariableValue( StringEntry var_name ) = 0;
- virtual S32 VariableIntegerValue( StringEntry var_name ) = 0;
- virtual UTF8* VariableString( StringEntry var_name ) = 0;
- virtual void VariableStringBuffer( StringEntry var_name, UTF8* buffer, S32 bufsize ) = 0;
- virtual void LatchedVariableStringBuffer( StringEntry var_name, UTF8* buffer, S32 bufsize ) = 0;
- virtual S32 Flags( StringEntry var_name ) = 0;
- virtual void CommandCompletion( void( *callback )( StringEntry s ) ) = 0;
- virtual UTF8* ClearForeignCharacters( StringEntry value ) = 0;
- virtual convar_t* Get( StringEntry var_name, StringEntry var_value, S32 flags, StringEntry description ) = 0;
- virtual convar_t* GetSet2( StringEntry var_name, StringEntry value, bool force ) = 0;
- virtual void Set( StringEntry var_name, StringEntry value ) = 0;
- virtual void SetLatched( StringEntry var_name, StringEntry value ) = 0;
- virtual void SetValue( StringEntry var_name, F32 value ) = 0;
- virtual void SetValueSafe( StringEntry var_name, F32 value ) = 0;
- virtual void SetValueLatched( StringEntry var_name, F32 value ) = 0;
- virtual void Reset( StringEntry var_name ) = 0;
- virtual void SetCheatState( void ) = 0;
[... diff too long, it was truncated ...]
GitHub
sha: d3cd9872