Oops, Fixed wrongly removed stuffs from Common

FriskTheFallenHuman · Aug 5, 2024 · 6963c99 · 6963c99
1 parent 2920351
commit 6963c99
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 12 deletions.
diff --git a/neo/framework/Common.cpp b/neo/framework/Common.cpp
@@ -29,8 +29,6 @@ If you have questions concerning this license or the applicable additional terms
 #include "precompiled.h"
 #pragma hdrstop
 
-#include <SDL.h>
-
 #include "Common_local.h"
 
 #include "ConsoleHistory.h"
@@ -71,7 +69,6 @@ idCVar com_asyncInput( "com_asyncInput", "0", CVAR_BOOL|CVAR_SYSTEM, "sample inp
 #define ASYNCSOUND_INFO "0: mix sound inline, 1 or 3: async update every 16ms 2: async update about every 100ms (original behavior)"
 idCVar com_asyncSound( "com_asyncSound", "1", CVAR_INTEGER|CVAR_SYSTEM, ASYNCSOUND_INFO, 0, 3 );
 
-idCVar com_timescale( "timescale", "1", CVAR_SYSTEM | CVAR_FLOAT, "scales the time", 0.1f, 10.0f );
 idCVar com_makingBuild( "com_makingBuild", "0", CVAR_BOOL | CVAR_SYSTEM, "1 when making a build" );
 
 idCVar com_enableDebuggerServer( "com_enableDebuggerServer", "0", CVAR_BOOL | CVAR_SYSTEM, "toggle debugger server and try to connect to com_dbgClientAdr" );

diff --git a/neo/framework/Common_Local.h b/neo/framework/Common_Local.h
@@ -29,6 +29,8 @@ If you have questions concerning this license or the applicable additional terms
 #ifndef __COMMON_LOCAL_H__
 #define __COMMON_LOCAL_H__
 
+#include <SDL.h>
+
 typedef enum {
 	ERP_NONE,
 	ERP_FATAL,						// exit the entire game with a popup window
@@ -57,6 +59,7 @@ class idCommonLocal : public idCommon {
 	virtual bool				IsInitialized( void ) const;
 	virtual void				Frame( void );
 	virtual void				GUIFrame( bool execCmd, bool network );
+	virtual void				Async( void );
 	virtual void				StartupVariable( const char *match, bool once );
 	virtual void				InitTool( const toolFlag_t tool, const idDict *dict );
 	virtual void				ActivateTool( bool active );
@@ -76,10 +79,6 @@ class idCommonLocal : public idCommon {
 	virtual void				FatalError( const char *fmt, ... ) id_attribute((format(printf,2,3)));
 	virtual const idLangDict *	GetLanguageDict( void );
 
-	virtual float				Get_com_engineHz_latched( void );
-	virtual int64_t				Get_com_engineHz_numerator( void );
-	virtual int64_t				Get_com_engineHz_denominator( void );
-
 	virtual const char *		KeysFromBinding( const char *bind );
 	virtual const char *		BindingFromKey( const char *key );
 
@@ -125,8 +124,6 @@ class idCommonLocal : public idCommon {
 
 	void						SetMachineSpec( void );
 
-	bool						IsShuttingDown( void ) { return com_shuttingDown; }
-
 private:
 	void						InitCommands( void );
 	void						InitRenderSystem( void );
@@ -138,6 +135,7 @@ class idCommonLocal : public idCommon {
 	void						CheckToolMode( void );
 	void						WriteConfiguration( void );
 	void						DumpWarnings( void );
+	void						SingleAsyncTic( void );
 	void						LoadGameDLL( void );
 	void						LoadGameDLLbyName( const char *dll, idStr& s );
 	void						UnloadGameDLL( void );
@@ -147,7 +145,6 @@ class idCommonLocal : public idCommon {
 	bool						com_fullyInitialized;
 	bool						com_refreshOnPrint;		// update the screen every print for dmap
 	int							com_errorEntered;		// 0, ERP_DROP, etc
-	bool						com_shuttingDown;
 
 	char						errorMessage[MAX_PRINT_MSG_SIZE];
 
@@ -167,8 +164,7 @@ class idCommonLocal : public idCommon {
 	idCompressor *				config_compressor;
 #endif
 
-	int							gameFrame;			// Frame number of the local game
-	double						gameTimeResidual;	// left over msec from the last game frame
+	SDL_TimerID					async_timer;
 };
 
 extern idCommonLocal commonLocal;