mmo-ref/og-openarena-gamecode
1
0
Fork 0
mirror of https://github.com/OpenArena/gamecode synced 2026-08-20 18:23:03 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed grappleAll mode and CVAR_RESTART and CVAR_LATCH from the gametype flags.

Browse source
This commit is contained in:
Neon_Knight 2018-12-01 21:33:10 -03:00
parent 3d565c6774
commit 372a8e6b19
4 changed files with 10 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

8
code/game/g_client.c
View file

@ -1877,8 +1877,8 @@ void ClientSpawn(gentity_t *ent) {
client->ps.ammo[WP_RAILGUN] = 999; //Don't display any ammo
if(g_instantgib.integer>1)
{
/* Neon_Knight: In grappleAll mode, Instagib is played with Grapple. */
if (g_grapple.integer != 0 && g_grappleAll.integer != 0) {
/* Neon_Knight: In grapple mode, Instagib is played with Grapple. */
if (g_grapple.integer != 0) {
client->ps.stats[STAT_WEAPONS] |= ( 1 << WP_GRAPPLING_HOOK);
}
/* / Neon_Knight */
@ -1890,8 +1890,8 @@ void ClientSpawn(gentity_t *ent) {
//nexuiz style rocket arena (rocket launcher only)
if(g_rockets.integer)
{
/* Neon_Knight: In grappleAll mode, All Rockets is played with Grapple. */
if (g_grapple.integer != 0 && g_grappleAll.integer != 0) {
/* Neon_Knight: In grapple mode, All Rockets is played with Grapple. */
if (g_grapple.integer != 0) {
client->ps.stats[STAT_WEAPONS] |= ( 1 << WP_GRAPPLING_HOOK);
}
/* / Neon_Knight */

10
code/game/g_items.c
View file

@ -856,8 +856,8 @@ void ClearRegisteredItems( void )
if(g_instantgib.integer & 2) {
RegisterItem( BG_FindItemForWeapon( WP_GAUNTLET ) );
}
/* Neon_Knight: In grappleAll mode, the Grapple is added to the starting inventory in Instagib. */
if (g_grapple.integer != 0 && g_grappleAll.integer != 0) {
/* Neon_Knight: In grapple mode, the Grapple is added to the starting inventory in Instagib. */
if (g_grapple.integer != 0) {
RegisterItem( BG_FindItemForWeapon( WP_GRAPPLING_HOOK ) );
}
/* / Neon_Knight */
@ -865,8 +865,8 @@ void ClearRegisteredItems( void )
RegisterItem( BG_FindItemForWeapon( WP_RAILGUN ) );
}
else if(g_rockets.integer) {
/* Neon_Knight: In grappleAll mode, the Grapple is added to the starting inventory in All Rockets. */
if (g_grapple.integer != 0 && g_grappleAll.integer != 0) {
/* Neon_Knight: In grapple mode, the Grapple is added to the starting inventory in All Rockets. */
if (g_grapple.integer != 0) {
RegisterItem( BG_FindItemForWeapon( WP_GRAPPLING_HOOK ) );
}
/* / Neon_Knight */
@ -880,7 +880,7 @@ void ClearRegisteredItems( void )
RegisterItem( BG_FindItemForWeapon( WP_GAUNTLET ) );
/* Neon_Knight: In grapple mode, the Grapple is added to the starting inventory. */
if (g_grapple.integer != 0 && g_grappleAll.integer != 0) {
if (g_grapple.integer != 0) {
RegisterItem( BG_FindItemForWeapon( WP_GRAPPLING_HOOK ) );
}
/* / Neon_Knight */

1
code/game/g_local.h
View file

@ -1191,7 +1191,6 @@ extern vmCvar_t g_maxNameChanges;
/* Neon_Knight: Adding cvar for (de)activation of the Grappling Hook */
extern vmCvar_t g_grapple;
extern vmCvar_t g_grappleAll;
/* /Neon_Knight */
void trap_Printf( const char *fmt );

4
code/game/g_main.c
View file

@ -205,7 +205,6 @@ vmCvar_t g_emptyTime;
/* Neon_Knight: Adding cvar for (de)activation of the Grappling Hook. */
vmCvar_t g_grapple;
vmCvar_t g_grappleAll;
/* /Neon_Knight */
mapinfo_result_t mapinfo;
@ -417,8 +416,7 @@ static cvarTable_t gameCvarTable[] = {
{ &g_emptyTime, "g_emptytime", "0", CVAR_ARCHIVE, 0, qfalse},
/* Neon_Knight: Adding a cvar for the (de)activation of the Grappling Hook. */
{ &g_grapple, "g_grapple", "0", CVAR_ARCHIVE | CVAR_LATCH | CVAR_NORESTART, 0, qfalse},
{ &g_grappleAll, "g_grappleAll", "0", CVAR_ARCHIVE | CVAR_NORESTART, 0, qfalse},
{ &g_grapple, "g_grapple", "0", CVAR_ARCHIVE, 0, qfalse},
/* /Neon_Knight */
};