summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--source/cmodel.c24
-rw-r--r--source/com_local.h4
-rw-r--r--source/mvd_game.c43
-rw-r--r--source/mvd_local.h1
-rw-r--r--source/mvd_parse.c2
5 files changed, 54 insertions, 20 deletions
diff --git a/source/cmodel.c b/source/cmodel.c
index 5a499e2..07b7dad 100644
--- a/source/cmodel.c
+++ b/source/cmodel.c
@@ -787,17 +787,19 @@ qboolean CM_LoadMap( cm_t *cm, const char *name, int flags, uint32_t *checksum )
} while( 0 )
// load into heap
- CM_LOAD( Visibility, VISIBILITY );
- CM_LOAD( Surfaces, TEXINFO );
- CM_LOAD( Planes, PLANES );
- CM_LOAD( BrushSides, BRUSHSIDES );
- CM_LOAD( Brushes, BRUSHES );
- CM_LOAD( LeafBrushes, LEAFBRUSHES );
- CM_LOAD( AreaPortals, AREAPORTALS );
- CM_LOAD( Areas, AREAS );
- CM_LOAD( Leafs, LEAFS );
- CM_LOAD( Nodes, NODES );
- CM_LOAD( Submodels, MODELS );
+ if( !( flags & CM_LOAD_ENTONLY ) ) {
+ CM_LOAD( Visibility, VISIBILITY );
+ CM_LOAD( Surfaces, TEXINFO );
+ CM_LOAD( Planes, PLANES );
+ CM_LOAD( BrushSides, BRUSHSIDES );
+ CM_LOAD( Brushes, BRUSHES );
+ CM_LOAD( LeafBrushes, LEAFBRUSHES );
+ CM_LOAD( AreaPortals, AREAPORTALS );
+ CM_LOAD( Areas, AREAS );
+ CM_LOAD( Leafs, LEAFS );
+ CM_LOAD( Nodes, NODES );
+ CM_LOAD( Submodels, MODELS );
+ }
#if 0
// Load the entity string from file, if specified
diff --git a/source/com_local.h b/source/com_local.h
index c7e29ed..20ce634 100644
--- a/source/com_local.h
+++ b/source/com_local.h
@@ -242,6 +242,9 @@ extern int cvar_infoModified;
void Cvar_SetByVar( cvar_t *var, const char *value, cvarSetSource_t source );
+#define Cvar_Reset( x ) \
+ Cvar_SetByVar( x, (x)->default_string, CVAR_SET_CONSOLE )
+
cvar_t *Cvar_UserSet( const char *var_name, const char *value );
cvar_t *Cvar_ForceSet (const char *var_name, const char *value);
@@ -743,6 +746,7 @@ typedef struct {
#define CM_LOAD_CLIENT 1
#define CM_LOAD_VISONLY 2
+#define CM_LOAD_ENTONLY 4
void CM_Init( void );
diff --git a/source/mvd_game.c b/source/mvd_game.c
index 80eb593..9816412 100644
--- a/source/mvd_game.c
+++ b/source/mvd_game.c
@@ -305,6 +305,7 @@ static void MVD_FollowStart( udpClient_t *client, mvd_player_t *target ) {
return;
}
+ client->oldtarget = client->target;
client->target = target;
// send delta configstrings
@@ -629,10 +630,19 @@ static void MVD_Follow_f( udpClient_t *client ) {
case 'b':
mask = EF_FLAG2;
break;
+ case 'p':
+ if( client->oldtarget && client->oldtarget->inuse ) {
+ MVD_FollowStart( client, client->oldtarget );
+ } else {
+ SV_ClientPrintf( client->cl, PRINT_HIGH,
+ "Previous target is not active.\n" );
+ }
+ return;
default:
SV_ClientPrintf( client->cl, PRINT_HIGH,
- "[MVD] Unknown powerup '%s'. Valid powerups:\n"
- "q (quad), i (invulner), r (red flag), b (blue flag).\n", s + 1 );
+ "[MVD] Unknown target '%s'. Valid targets:\n"
+ "q (quad), i (invulner), r (red flag), "
+ "b (blue flag), p (previous target).\n", s + 1 );
return;
}
for( i = 0; i < mvd->maxclients; i++ ) {
@@ -806,6 +816,9 @@ void MVD_RemoveClient( client_t *client ) {
static void MVD_GameInit( void ) {
mvd_t *mvd = &mvd_waitingRoom;
edict_t *edicts;
+ cvar_t *mvd_default_map;
+ char buffer[MAX_QPATH];
+ unsigned checksum;
int i;
Com_Printf( "----- MVD_GameInit -----\n" );
@@ -815,6 +828,7 @@ static void MVD_GameInit( void ) {
mvd_flood_persecond = Cvar_Get( "flood_persecond", "4", 0 ); // FIXME: rename this
mvd_flood_waitdelay = Cvar_Get( "flood_waitdelay", "10", 0 );
mvd_flood_mute = Cvar_Get( "flood_mute", "0", 0 );
+ mvd_default_map = Cvar_Get( "mvd_default_map", "q2dm1", CVAR_LATCH );
Z_TagReserve( ( sizeof( edict_t ) +
sizeof( udpClient_t ) ) * sv_maxclients->integer +
@@ -834,18 +848,31 @@ static void MVD_GameInit( void ) {
mvd_ge.num_edicts = sv_maxclients->integer + 1;
mvd_ge.max_edicts = sv_maxclients->integer + 1;
+ Com_sprintf( buffer, sizeof( buffer ),
+ "maps/%s.bsp", mvd_default_map->string );
+
+ if( CM_LoadMap( &mvd->cm, buffer, CM_LOAD_CLIENT|CM_LOAD_ENTONLY, &checksum ) ) {
+ // get the spectator spawn point
+ MVD_ParseEntityString( mvd );
+ CM_FreeMap( &mvd->cm );
+ } else {
+ Com_WPrintf( "Couldn't load %s.\n", buffer );
+ Cvar_Reset( mvd_default_map );
+ strcpy( buffer, "maps/q2dm1.bsp" );
+ checksum = 80717714;
+ VectorSet( mvd->spawnOrigin, 984, 192, 784 );
+ VectorSet( mvd->spawnAngles, 25, 72, 0 );
+ }
+
strcpy( mvd->name, "Waiting Room" );
- strcpy( mvd->mapname, "q2dm1" );
+ strcpy( mvd->mapname, mvd_default_map->string );
List_Init( &mvd->udpClients );
strcpy( mvd->configstrings[CS_NAME], "Waiting Room" );
strcpy( mvd->configstrings[CS_SKY], "unit1_" );
strcpy( mvd->configstrings[CS_MAXCLIENTS], "8" );
- strcpy( mvd->configstrings[CS_MAPCHECKSUM], "80717714" );
- strcpy( mvd->configstrings[CS_MODELS + 1], "maps/q2dm1.bsp" );
-
- VectorSet( mvd->spawnOrigin, 984, 192, 784 );
- VectorSet( mvd->spawnAngles, 25, 72, 0 );
+ sprintf( mvd->configstrings[CS_MAPCHECKSUM], "%d", checksum );
+ strcpy( mvd->configstrings[CS_MODELS + 1], buffer );
mvd->dummy = &mvd_dummy;
mvd->pm_type = PM_FREEZE;
diff --git a/source/mvd_local.h b/source/mvd_local.h
index 520a47b..9215f15 100644
--- a/source/mvd_local.h
+++ b/source/mvd_local.h
@@ -203,6 +203,7 @@ int MVD_Frame( void );
//
qboolean MVD_Parse( mvd_t *mvd );
+void MVD_ParseEntityString( mvd_t *mvd );
//
diff --git a/source/mvd_parse.c b/source/mvd_parse.c
index f111430..887fd2f 100644
--- a/source/mvd_parse.c
+++ b/source/mvd_parse.c
@@ -106,7 +106,7 @@ static void MVD_LinkEdict( mvd_t *mvd, edict_t *ent ) {
SV_LinkEdict( &mvd->cm, ent );
}
-static void MVD_ParseEntityString( mvd_t *mvd ) {
+void MVD_ParseEntityString( mvd_t *mvd ) {
const char *data, *p;
char key[MAX_STRING_CHARS];
char value[MAX_STRING_CHARS];
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-23 11:05:22 +0000