Update the engine.
diff --git a/source/OpenWolf-Engine b/source/OpenWolf-Engine
index 489ffce..35ebac1 160000
--- a/source/OpenWolf-Engine
+++ b/source/OpenWolf-Engine
@@ -1 +1 @@
-Subproject commit 489ffcea1b533f2ef11a5b7c0a4d47c74cc62eb9
+Subproject commit 35ebac1193388948c4d1133b62e1c0a9eab78b80
diff --git a/source/game-logic/CMakeLists.txt b/source/game-logic/CMakeLists.txt
index 8dfd177..fe33cbe 100644
--- a/source/game-logic/CMakeLists.txt
+++ b/source/game-logic/CMakeLists.txt
@@ -120,7 +120,7 @@ set( GUI_HEADERS
${MOUNT_DIR}/API/clientLAN_api.hpp
${MOUNT_DIR}/API/clientGUI_api.hpp
${MOUNT_DIR}/API/renderer_api.hpp
- ${MOUNT_DIR}/API/sound_api.hpp
+ ${MOUNT_DIR}/API/soundSystem_api.hpp
${MOUNT_DIR}/API/FileSystem_api.hpp
${MOUNT_DIR}/API/CVarSystem_api.hpp
${MOUNT_DIR}/GPURenderer/r_types.hpp
@@ -160,7 +160,7 @@ set( SGAMELIST_HEADERS
${MOUNT_DIR}/API/CmdSystem_api.hpp
${MOUNT_DIR}/API/serverDemo_api.hpp
${MOUNT_DIR}/API/system_api.hpp
- ${MOUNT_DIR}/API/sound_api.hpp
+ ${MOUNT_DIR}/API/soundSystem_api.hpp
${MOUNT_DIR}/API/FileSystem_api.hpp
${MOUNT_DIR}/API/CVarSystem_api.hpp
${MOUNT_DIR}/API/serverMain_api.hpp
@@ -239,7 +239,7 @@ set( CGAMELIST_HEADERS
${MOUNT_DIR}/API/clientLAN_api.hpp
${MOUNT_DIR}/API/clientGUI_api.hpp
${MOUNT_DIR}/API/renderer_api.hpp
- ${MOUNT_DIR}/API/sound_api.hpp
+ ${MOUNT_DIR}/API/soundSystem_api.hpp
${MOUNT_DIR}/API/FileSystem_api.hpp
${MOUNT_DIR}/API/CVarSystem_api.hpp
${MOUNT_DIR}/API/cgame_api.hpp
diff --git a/source/game-logic/src/gameLogics/GUI/gui_precompiled.hpp b/source/game-logic/src/gameLogics/GUI/gui_precompiled.hpp
index d6e78b2..4055f70 100644
--- a/source/game-logic/src/gameLogics/GUI/gui_precompiled.hpp
+++ b/source/game-logic/src/gameLogics/GUI/gui_precompiled.hpp
@@ -67,9 +67,9 @@
#include <API/CmdSystem_api.hpp>
#include <API/CVarSystem_api.hpp>
#include <API/renderer_api.hpp>
-#include <API/sound_api.hpp>
#include <API/FileSystem_api.hpp>
#include <API/system_api.hpp>
+#include <API/soundSystem_api.hpp>
#include <API/cgame_api.hpp>
#include <API/gui_api.hpp>
#include <bgame/bgame_local.hpp>
diff --git a/source/game-logic/src/gameLogics/cgame/cgame_precompiled.hpp b/source/game-logic/src/gameLogics/cgame/cgame_precompiled.hpp
index 6c01b18..0f14f54 100644
--- a/source/game-logic/src/gameLogics/cgame/cgame_precompiled.hpp
+++ b/source/game-logic/src/gameLogics/cgame/cgame_precompiled.hpp
@@ -68,9 +68,9 @@
#include <API/CmdSystem_api.hpp>
#include <API/CVarSystem_api.hpp>
#include <API/renderer_api.hpp>
-#include <API/sound_api.hpp>
#include <API/FileSystem_api.hpp>
#include <API/system_api.hpp>
+#include <API/soundSystem_api.hpp>
#include <API/cgame_api.hpp>
#include <API/bgame_api.hpp>
#include <API/gui_api.hpp>
diff --git a/source/game-logic/src/gameLogics/cgame/cgame_view.cpp b/source/game-logic/src/gameLogics/cgame/cgame_view.cpp
index 2f52653..b03abde 100644
--- a/source/game-logic/src/gameLogics/cgame/cgame_view.cpp
+++ b/source/game-logic/src/gameLogics/cgame/cgame_view.cpp
@@ -92,10 +92,11 @@ can then be moved around
void idCGameView::TestModel_f( void )
{
vec3_t angles;
-
+
+ cg.testGun = false;
+
::memset( &cg.testModelEntity, 0, sizeof( cg.testModelEntity ) );
- ::memset( &cg.testModelBarrelEntity, 0, sizeof( cg.testModelBarrelEntity ) );
-
+
if( trap_Argc() < 2 )
{
return;
@@ -104,11 +105,6 @@ void idCGameView::TestModel_f( void )
Q_strncpyz( cg.testModelName, idCGameMain::Argv( 1 ), MAX_QPATH );
cg.testModelEntity.hModel = trap_R_RegisterModel( cg.testModelName );
- Q_strncpyz( cg.testModelBarrelName, idCGameMain::Argv( 1 ), MAX_QPATH );
- cg.testModelBarrelName[ strlen( cg.testModelBarrelName ) - 4 ] = '\0';
- Q_strcat( cg.testModelBarrelName, MAX_QPATH, "_barrel.md3" );
- cg.testModelBarrelEntity.hModel = trap_R_RegisterModel( cg.testModelBarrelName );
-
if( trap_Argc( ) == 3 )
{
cg.testModelEntity.backlerp = atof( idCGameMain::Argv( 2 ) );
@@ -129,15 +125,6 @@ void idCGameView::TestModel_f( void )
angles[ ROLL ] = 0;
AnglesToAxis( angles, cg.testModelEntity.axis );
- cg.testGun = false;
-
- if( cg.testModelBarrelEntity.hModel )
- {
- angles[ YAW ] = 0;
- angles[ PITCH ] = 0;
- angles[ ROLL ] = 0;
- AnglesToAxis( angles, cg.testModelBarrelEntity.axis );
- }
}
/*
@@ -1698,4 +1685,3 @@ void idCGameLocal::DrawActiveFrame( sint serverTime, stereoFrame_t stereoView, b
Printf( "cg.clientFrame:%i\n", cg.clientFrame );
}
}
-
diff --git a/source/game-logic/src/gameLogics/sgame/sgame_precompiled.hpp b/source/game-logic/src/gameLogics/sgame/sgame_precompiled.hpp
index adfd8f6..12354d5 100644
--- a/source/game-logic/src/gameLogics/sgame/sgame_precompiled.hpp
+++ b/source/game-logic/src/gameLogics/sgame/sgame_precompiled.hpp
@@ -62,7 +62,6 @@
#include <API/CVarSystem_api.hpp>
#include <GPURenderer/r_types.hpp>
#include <API/renderer_api.hpp>
-#include <API/sound_api.hpp>
#include <API/FileSystem_api.hpp>
#include <API/serverDemo_api.hpp>
#include <API/serverGame_api.hpp>
@@ -71,6 +70,7 @@
#include <API/serverWorld_api.hpp>
#include <API/CmdSystem_api.hpp>
#include <API/system_api.hpp>
+#include <API/soundSystem_api.hpp>
#include <API/bgame_api.hpp>
#include <bgame/bgame_local.hpp>
#include <sgame/tremulous.hpp>
GitHub
sha: a71080b2