- Fixed issue where powerups wouldn't show up in arsenal correctly if…

… instagib was set to 1.
q3shafe · Dec 5, 2017 · 1706473 · 1706473
1 parent 0f887c5
commit 1706473
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/Docs/CHANGELOG.TXT b/Docs/CHANGELOG.TXT
@@ -25,11 +25,11 @@ SUMMARY OF THE NEW AND NOTABLE:
 - Lots of bugfixes
 
 
-
-
 ==================================================
 Detailed Changelog - Most Recent Changes First
 ==================================================
+- Fixed issue where powerups wouldn't show up in arsenal correctly if instagib was set to 1.
+
 - Fixed issue where new buildable items are announced more than once.
 
 - Fixed issue where player remains immobilized after team scores and buildable are destroyed.

diff --git a/game-media/pak0-vms/vm/qagame.qvm b/game-media/pak0-vms/vm/qagame.qvm
diff --git a/vms-source/code/game/g_items.c b/vms-source/code/game/g_items.c
@@ -852,6 +852,7 @@ void ClearRegisteredItems( void ) {
 
 	// Let's Always Register The Rocket Launcher  - Shafe - Trep 
 	RegisterItem( BG_FindItemForWeapon( WP_ROCKET_LAUNCHER ) );
+
 	// Shafe - Trep Preregister Lighning and the Grapple For the offhand grapple
 	RegisterItem( BG_FindItemForWeapon( WP_LIGHTNING ) );
 	RegisterItem( BG_FindItemForWeapon( WP_GRAPPLING_HOOK ) );
@@ -879,15 +880,14 @@ void ClearRegisteredItems( void ) {
 			RegisterItem( BG_FindItemForWeapon( WP_SHOTGUN ) );
 			RegisterItem( BG_FindItemForWeapon( WP_RAILGUN ) );
 			RegisterItem( BG_FindItemForWeapon( WP_PLASMAGUN ) );
-			RegisterItem( BG_FindItemForWeapon( WP_BFG ) );
+			RegisterItem( BG_FindItemForWeapon( WP_BFG ) );	
+		}
 
 			// Github issue 43 - fix shafe
 			RegisterItem( BG_FindItemForPowerup( PW_QUAD ) );
 			RegisterItem( BG_FindItemForPowerup( PW_FLIGHT ) );
 			RegisterItem( BG_FindItemForPowerup( PW_BATTLESUIT ) );
 			RegisterItem( BG_FindItemForPowerup( PW_REGEN ) );
-
-		}
 	}
 
 #ifdef MISSIONPACK