Galak Mech support

redsaurus · Dec 14, 2015 · 94a552f · 94a552f
1 parent ef005bc
commit 94a552f
Show file tree

Hide file tree

Showing 13 changed files with 1,914 additions and 587 deletions.
diff --git a/code/cgame/cg_main.cpp b/code/cgame/cg_main.cpp
@@ -1499,7 +1499,7 @@ static void CG_RegisterGraphics( void ) {
 	// FIXME: do these conditionally
 	cgi_R_RegisterShader( "gfx/2d/workingCamera" );
 	cgi_R_RegisterShader( "gfx/2d/brokenCamera" );
-	//cgi_R_RegisterShader( "gfx/effects/irid_shield" ); // for galak, but he doesn't have his own weapon so I can't register the shader there.
+	cgi_R_RegisterShader( "gfx/effects/irid_shield" ); // for galak, but he doesn't have his own weapon so I can't register the shader there.
 
 	//interface
 	for ( i = 0 ; i < NUM_CROSSHAIRS ; i++ ) {

diff --git a/code/cgame/cg_players.cpp b/code/cgame/cg_players.cpp
@@ -4976,9 +4976,9 @@ void CG_AddRefEntityWithPowerups( refEntity_t *ent, int powerups, centity_t *cen
 
 	// Galak Mech shield bubble
 	//------------------------------------------------------
-	if ( powerups & ( 1 << PW_GALAK_SHIELD ))
+	if ( powerups & ( 1 << PW_GALAK_SHIELD ) && cent->gent->client->NPC_class == CLASS_GALAKMECH )
 	{
-/*		refEntity_t tent;
+		refEntity_t tent;
 
 		memset( &tent, 0, sizeof( refEntity_t ));
 
@@ -5005,7 +5005,7 @@ void CG_AddRefEntityWithPowerups( refEntity_t *ent, int powerups, centity_t *cen
 		tent.endTime = gent->fx_time + 1000;			// if you want the shell to build around the guy, pass in a time that is 1000ms after the start of the turn-on-effect
 		tent.customShader = cgi_R_RegisterShader( "gfx/effects/irid_shield" );
 
-		cgi_R_AddRefEntityToScene( &tent );*/
+		cgi_R_AddRefEntityToScene( &tent );
 	}
 
 	// Invincibility -- effect needs work