diff --git a/Makefile b/Makefile index 1222dea..c6e4939 100644 --- a/Makefile +++ b/Makefile @@ -39,7 +39,7 @@ USE_VULKAN_API = 1 USE_RENDERER_DLOPEN = 0 # valid options: opengl, vulkan, opengl2 -RENDERER_DEFAULT = vulkan +RENDERER_DEFAULT = opengl CNAME = qsand_$(RENDERER_DEFAULT) DNAME = qsand_server diff --git a/code/qcommon/common.c b/code/qcommon/common.c index bb0f48a..742f3f8 100644 --- a/code/qcommon/common.c +++ b/code/qcommon/common.c @@ -38,13 +38,7 @@ const int demo_protocols[] = { 66, 67, OLD_PROTOCOL_VERSION, NEW_PROTOCOL_VERSIO #define USE_MULTI_SEGMENT // allocate additional zone segments on demand -#ifdef DEDICATED //1023 for 32bit - 2047 for 64bit -#define MIN_COMHUNKMEGS 2047 -#define DEF_COMHUNKMEGS 2047 -#else -#define MIN_COMHUNKMEGS 2047 -#define DEF_COMHUNKMEGS 2047 -#endif +#define MIN_COMHUNKMEGS 2047 //1023 for 32bit - 2047 for 64bit #ifdef USE_MULTI_SEGMENT #define DEF_COMZONEMEGS 128 @@ -52,6 +46,8 @@ const int demo_protocols[] = { 66, 67, OLD_PROTOCOL_VERSION, NEW_PROTOCOL_VERSIO #define DEF_COMZONEMEGS 128 #endif +#define DEF_COMHUNKMEGS 1023 //NOT CHANGE!!! + static jmp_buf abortframe; // an ERR_DROP occurred, exit the entire frame int CPU_Flags = 0; @@ -2201,7 +2197,7 @@ static void Com_InitHunkMemory( void ) { Cvar_CheckRange( cv, XSTRING( MIN_COMHUNKMEGS ), NULL, CV_INTEGER ); Cvar_SetDescription( cv, "The size of the hunk memory segment." ); - s_hunkTotal = cv->integer * 1024 * 1024; + s_hunkTotal = MIN_COMHUNKMEGS * 1024 * 1024; s_hunkData = calloc( s_hunkTotal + 63, 1 ); if ( !s_hunkData ) { diff --git a/code/qcommon/q_shared.h b/code/qcommon/q_shared.h index 576de9a..c30fd69 100644 --- a/code/qcommon/q_shared.h +++ b/code/qcommon/q_shared.h @@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA // q_shared.h -- included first by ALL program modules. // A user mod should never modify this file -#define Q3_VERSION "MiTech 2.3" +#define Q3_VERSION "MiTech 3.2" #ifndef SVN_VERSION #define SVN_VERSION Q3_VERSION #endif @@ -36,18 +36,18 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA //#define DEFAULT_GAME "edawn" -#define BASEGAME "MiLab" -#define BASEDEMO "MiLabT" -#define BASETA "MiLabC" -#define STEAMPATH_NAME "MiTech" +#define BASEGAME "milab" +#define BASEDEMO "milabt" +#define BASETA "milabc" +#define STEAMPATH_NAME "mitech" #define STEAMPATH_APPID "2207" #define STANDALONE 1 #define MAX_TEAMNAME 32 #define MAX_MASTER_SERVERS 5 // number of supported master servers -#define GAMENAME_FOR_MASTER "MiTech" -#define HEARTBEAT_FOR_MASTER "MiTech" +#define GAMENAME_FOR_MASTER "mitech" +#define HEARTBEAT_FOR_MASTER "mitech" #define DEMOEXT "dm_" // standard demo extension diff --git a/code/unix/quake3.png b/code/unix/quake3.png index 082b68e..7e86e7c 100644 Binary files a/code/unix/quake3.png and b/code/unix/quake3.png differ diff --git a/code/unix/unix_shared.c b/code/unix/unix_shared.c index bbacd22..aa24abc 100644 --- a/code/unix/unix_shared.c +++ b/code/unix/unix_shared.c @@ -71,6 +71,15 @@ int Sys_Milliseconds( void ) return curtime; } +/* + = *============= + Sys_Cmd + ============== + */ +void Sys_Cmd( const char *command ) +{ + system(va("%s", command)); +} char *strlwr( char *s ) { if ( s==NULL ) { // bk001204 - paranoia