summaryrefslogtreecommitdiff
path: root/src/game
diff options
context:
space:
mode:
Diffstat (limited to 'src/game')
-rw-r--r--src/game/bg_public.h25
-rw-r--r--src/game/g_buildable.c15
-rw-r--r--src/game/g_cmds.c40
-rw-r--r--src/game/g_local.h1
-rw-r--r--src/game/g_utils.c16
5 files changed, 49 insertions, 48 deletions
diff --git a/src/game/bg_public.h b/src/game/bg_public.h
index 3c753092..c645f915 100644
--- a/src/game/bg_public.h
+++ b/src/game/bg_public.h
@@ -592,21 +592,30 @@ typedef enum
MN_A_NOEROOM,
MN_A_TOOCLOSE,
MN_A_NOOVMND_EVOLVE,
+ MN_A_TEAMCHANGEBUILDTIMER,
+ MN_A_EVOLVEBUILDTIMER,
+ MN_A_CANTEVOLVE,
+ MN_A_EVOLVEWALLWALK,
+ MN_A_UNKNOWNCLASS,
+ MN_A_CLASSNOTSPAWN,
+ MN_A_CLASSNOTALLOWED,
+ MN_A_CLASSNOTATSTAGE,
//shared build
MN_B_NOROOM,
MN_B_NORMAL,
+ MN_B_CANNOT,
+ MN_B_SUDDENDEATH,
+ MN_B_REVOKED,
+ MN_B_SURRENDER,
//alien build
- MN_A_SPWNWARN, // not currently used
MN_A_ONEOVERMIND,
+ MN_A_ONEHOVEL,
MN_A_NOBP,
MN_A_NOCREEP,
MN_A_NOOVMND,
- MN_A_ONEHOVEL,
MN_A_HOVEL_EXIT,
- MN_A_TEAMCHANGEBUILDTIMER,
- MN_A_EVOLVEBUILDTIMER,
//human stuff
MN_H_SPAWN,
@@ -615,10 +624,14 @@ typedef enum
MN_H_NOSLOTS,
MN_H_NOFUNDS,
MN_H_ITEMHELD,
+ MN_H_TEAMCHANGEBUILDTIMER,
MN_H_NOENERGYAMMOHERE,
MN_H_NOARMOURYHERE,
MN_H_NOROOMBSUITON,
MN_H_NOROOMBSUITOFF,
+ MN_H_ARMOURYBUILDTIMER,
+ MN_H_DEADTOCLASS,
+ MN_H_UNKNOWNSPAWNITEM,
//human build
MN_H_NOPOWERHERE,
@@ -626,11 +639,7 @@ typedef enum
MN_H_NOTPOWERED,
MN_H_NODCC,
MN_H_ONEREACTOR,
- MN_H_TNODEWARN, // not currently used
- MN_H_RPTNOREAC,
MN_H_RPTPOWERHERE,
- MN_H_TEAMCHANGEBUILDTIMER,
- MN_H_ARMOURYBUILDTIMER
} dynMenu_t;
// animations
diff --git a/src/game/g_buildable.c b/src/game/g_buildable.c
index ee5a55ce..911884b0 100644
--- a/src/game/g_buildable.c
+++ b/src/game/g_buildable.c
@@ -3481,21 +3481,6 @@ qboolean G_BuildIfValid( gentity_t *ent, buildable_t buildable )
G_TriggerMenu( ent->client->ps.clientNum, MN_H_NODCC );
return qfalse;
- case IBE_SPWNWARN:
- G_TriggerMenu( ent->client->ps.clientNum, MN_A_SPWNWARN );
- G_Build( ent, buildable, origin, ent->s.apos.trBase );
- return qtrue;
-
- case IBE_TNODEWARN:
- G_TriggerMenu( ent->client->ps.clientNum, MN_H_TNODEWARN );
- G_Build( ent, buildable, origin, ent->s.apos.trBase );
- return qtrue;
-
- case IBE_RPTNOREAC:
- G_TriggerMenu( ent->client->ps.clientNum, MN_H_RPTNOREAC );
- G_Build( ent, buildable, origin, ent->s.apos.trBase );
- return qtrue;
-
case IBE_RPTPOWERHERE:
G_TriggerMenu( ent->client->ps.clientNum, MN_H_RPTPOWERHERE );
return qfalse;
diff --git a/src/game/g_cmds.c b/src/game/g_cmds.c
index e6bc45f2..0b1857d0 100644
--- a/src/game/g_cmds.c
+++ b/src/game/g_cmds.c
@@ -1534,23 +1534,19 @@ void Cmd_Class_f( gentity_t *ent )
newClass != PCL_ALIEN_BUILDER0_UPG &&
newClass != PCL_ALIEN_LEVEL0 )
{
- trap_SendServerCommand( ent-g_entities,
- va( "print \"You cannot spawn with class %s\n\"", s ) );
+ G_TriggerMenu2( ent->client->ps.clientNum, MN_A_CLASSNOTSPAWN, newClass );
return;
}
if( !BG_ClassIsAllowed( newClass ) )
{
- trap_SendServerCommand( ent-g_entities,
- va( "print \"Class %s is not allowed\n\"", s ) );
+ G_TriggerMenu2( ent->client->ps.clientNum, MN_A_CLASSNOTALLOWED, newClass );
return;
}
if( !BG_FindStagesForClass( newClass, g_alienStage.integer ) )
{
- trap_SendServerCommand( ent-g_entities,
- va( "print \"Class %s not allowed at stage %d\n\"",
- s, g_alienStage.integer + 1 ) );
+ G_TriggerMenu2( ent->client->ps.clientNum, MN_A_CLASSNOTATSTAGE, newClass );
return;
}
@@ -1582,8 +1578,7 @@ void Cmd_Class_f( gentity_t *ent )
}
else
{
- trap_SendServerCommand( ent-g_entities,
- "print \"Unknown starting item\n\"" );
+ G_TriggerMenu( ent->client->ps.clientNum, MN_H_UNKNOWNSPAWNITEM );
return;
}
// spawn from a telenode
@@ -1605,7 +1600,7 @@ void Cmd_Class_f( gentity_t *ent )
{
if( newClass == PCL_NONE )
{
- trap_SendServerCommand( ent-g_entities, "print \"Unknown class\n\"" );
+ G_TriggerMenu( ent->client->ps.clientNum, MN_A_UNKNOWNCLASS );
return;
}
@@ -1617,8 +1612,7 @@ void Cmd_Class_f( gentity_t *ent )
if( ( ent->client->ps.stats[ STAT_STATE ] & SS_WALLCLIMBING ) ||
( ent->client->ps.stats[ STAT_STATE ] & SS_WALLCLIMBINGCEILING ) )
{
- trap_SendServerCommand( ent-g_entities,
- "print \"You cannot evolve while wallwalking\n\"" );
+ G_TriggerMenu( clientNum, MN_A_EVOLVEWALLWALK );
return;
}
@@ -1681,8 +1675,7 @@ void Cmd_Class_f( gentity_t *ent )
}
else
{
- trap_SendServerCommand( ent-g_entities,
- "print \"You cannot evolve from your current class\n\"" );
+ G_TriggerMenu2( clientNum, MN_A_CANTEVOLVE, newClass );
return;
}
}
@@ -1695,9 +1688,7 @@ void Cmd_Class_f( gentity_t *ent )
}
else if( ent->client->pers.teamSelection == PTE_HUMANS )
{
- //humans cannot use this command whilst alive
- trap_SendServerCommand( ent-g_entities,
- "print \"You must be dead to use the class command\n\"" );
+ G_TriggerMenu( clientNum, MN_H_DEADTOCLASS );
return;
}
}
@@ -2333,15 +2324,13 @@ void Cmd_Build_f( gentity_t *ent )
if( ent->client->pers.denyBuild )
{
- trap_SendServerCommand( ent-g_entities,
- "print \"Your building rights have been revoked\n\"" );
+ G_TriggerMenu( ent->client->ps.clientNum, MN_B_REVOKED );
return;
}
if( ent->client->pers.teamSelection == level.surrenderTeam )
{
- trap_SendServerCommand( ent-g_entities,
- "print \"Building has been denied to traitorous cowards\n\"" );
+ G_TriggerMenu( ent->client->ps.clientNum, MN_B_SURRENDER );
return;
}
@@ -2351,8 +2340,7 @@ void Cmd_Build_f( gentity_t *ent )
if( G_TimeTilSuddenDeath( ) <= 0 )
{
- trap_SendServerCommand( ent-g_entities,
- "print \"Building is not allowed during Sudden Death\n\"" );
+ G_TriggerMenu( ent->client->ps.clientNum, MN_B_SUDDENDEATH );
return;
}
@@ -2399,6 +2387,10 @@ void Cmd_Build_f( gentity_t *ent )
G_TriggerMenu( ent->client->ps.clientNum, MN_A_ONEOVERMIND );
break;
+ case IBE_ONEHOVEL:
+ G_TriggerMenu( ent->client->ps.clientNum, MN_A_ONEHOVEL );
+ break;
+
case IBE_ONEREACTOR:
G_TriggerMenu( ent->client->ps.clientNum, MN_H_ONEREACTOR );
break;
@@ -2416,7 +2408,7 @@ void Cmd_Build_f( gentity_t *ent )
}
}
else
- trap_SendServerCommand( ent-g_entities, va( "print \"Cannot build this item\n\"" ) );
+ G_TriggerMenu( ent->client->ps.clientNum, MN_B_CANNOT );
}
/*
diff --git a/src/game/g_local.h b/src/game/g_local.h
index a4a5cd26..bfda00b4 100644
--- a/src/game/g_local.h
+++ b/src/game/g_local.h
@@ -804,6 +804,7 @@ const char *BuildShaderStateConfig( void );
qboolean G_ClientIsLagging( gclient_t *client );
void G_TriggerMenu( int clientNum, dynMenu_t menu );
+void G_TriggerMenu2( int clientNum, dynMenu_t menu, int arg );
void G_CloseMenus( int clientNum );
qboolean G_Visible( gentity_t *ent1, gentity_t *ent2 );
diff --git a/src/game/g_utils.c b/src/game/g_utils.c
index c03dacf5..926a7cd2 100644
--- a/src/game/g_utils.c
+++ b/src/game/g_utils.c
@@ -825,10 +825,24 @@ void G_TriggerMenu( int clientNum, dynMenu_t menu )
{
char buffer[ 32 ];
- Com_sprintf( buffer, 32, "servermenu %d", menu );
+ Com_sprintf( buffer, sizeof( buffer ), "servermenu %d", menu );
trap_SendServerCommand( clientNum, buffer );
}
+/*
+===============
+G_TriggerMenu2
+
+Trigger a menu on some client and passes an argument
+===============
+*/
+void G_TriggerMenu2( int clientNum, dynMenu_t menu, int arg )
+{
+ char buffer[ 64 ];
+
+ Com_sprintf( buffer, sizeof( buffer ), "servermenu %d %d", menu, arg );
+ trap_SendServerCommand( clientNum, buffer );
+}
/*
===============
generated by cgit (git 2.34.1) at 2025-04-03 09:35:08 +0000