[iortcw] 84/89: SP: Remove g_skipcutscenes

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit ec4f63da300f1c2f4cf7ec6fad1bbe66ddc94e85
Author: MAN-AT-ARMS <M4N4T4RMS at gmail.com>
Date:   Sun Aug 6 17:12:53 2017 -0400

    SP: Remove g_skipcutscenes
    
    This was basically a temporary workaround for a clang compiler bug
    that read function arguments out of order and was never intended to be permanent.
    The code that clang had trouble with has since been modified and fixed so this is
    no longer needed as a workaround.
---
 SP/code/game/ai_cast_script_actions.c | 5 -----
 SP/code/game/g_cmds.c                 | 3 ---
 SP/code/game/g_local.h                | 2 --
 SP/code/game/g_main.c                 | 4 ----
 4 files changed, 14 deletions(-)

diff --git a/SP/code/game/ai_cast_script_actions.c b/SP/code/game/ai_cast_script_actions.c
index 8abdc4d..10a5f08 100644
--- a/SP/code/game/ai_cast_script_actions.c
+++ b/SP/code/game/ai_cast_script_actions.c
@@ -2652,11 +2652,6 @@ qboolean ScriptStartCam( cast_state_t *cs, char *params, qboolean black ) {
 	char *pString, *token;
 	gentity_t *ent;
 
-	if ( g_skipcutscenes.integer ) {
-		AICast_ScriptEvent( cs, "trigger", "cameraInterrupt" );
-		return qtrue;
-	}
-
 	ent = &g_entities[cs->entityNum];
 
 	pString = params;
diff --git a/SP/code/game/g_cmds.c b/SP/code/game/g_cmds.c
index fa82b43..e60ddf6 100644
--- a/SP/code/game/g_cmds.c
+++ b/SP/code/game/g_cmds.c
@@ -1318,9 +1318,6 @@ void Cmd_StartCamera_f( gentity_t *ent ) {
 	ent->client->ps.eFlags |= EF_VIEWING_CAMERA;
 	ent->s.eFlags |= EF_VIEWING_CAMERA;
 
-	if ( g_skipcutscenes.integer )
-		AICast_ScriptEvent( AICast_GetCastState( ent->s.number ), "trigger", "cameraInterrupt" );
-
 // (SA) trying this in client to avoid 1 frame of player drawing
 //	ent->client->ps.eFlags |= EF_NODRAW;
 //	ent->s.eFlags |= EF_NODRAW;
diff --git a/SP/code/game/g_local.h b/SP/code/game/g_local.h
index 8818c31..6ab283a 100644
--- a/SP/code/game/g_local.h
+++ b/SP/code/game/g_local.h
@@ -1067,8 +1067,6 @@ extern gentity_t       *g_camEnt;
 
 extern vmCvar_t g_gametype;
 
-extern vmCvar_t g_skipcutscenes;
-
 // Rafael gameskill
 extern vmCvar_t g_gameskill;
 // done
diff --git a/SP/code/game/g_main.c b/SP/code/game/g_main.c
index e1ae155..5e57639 100644
--- a/SP/code/game/g_main.c
+++ b/SP/code/game/g_main.c
@@ -54,8 +54,6 @@ extern int bg_pmove_gameskill_integer;
 
 vmCvar_t g_gametype;
 
-vmCvar_t g_skipcutscenes;
-
 // Rafael gameskill
 vmCvar_t g_gameskill;
 // done
@@ -171,8 +169,6 @@ cvarTable_t gameCvarTable[] = {
 	{ &g_soldierChargeTime, "g_soldierChargeTime", "20000", CVAR_SERVERINFO | CVAR_LATCH, 0, qfalse },
 // jpw
 
-	{ &g_skipcutscenes, "g_skipcutscenes", "0", CVAR_ARCHIVE, 0, qtrue  },
-
 	{ &g_playerStart, "g_playerStart", "0", CVAR_ROM, 0, qfalse  },
 
 	{ &g_maxclients, "sv_maxclients", "8", CVAR_SERVERINFO | CVAR_LATCH | CVAR_ARCHIVE, 0, qfalse  },

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git