From e4f12a68aa2e4424761c641bb185394ca7270b8c Mon Sep 17 00:00:00 2001 From: Sevenfm Date: Wed, 5 May 2021 08:08:37 +0000 Subject: [PATCH] Reverted optimization code which prevented 40mm grenades to load if tag is not set in mod (by Shadooow). git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9003 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Tactical/Items.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Tactical/Items.cpp b/Tactical/Items.cpp index 04834730..fb0be974 100644 --- a/Tactical/Items.cpp +++ b/Tactical/Items.cpp @@ -2392,8 +2392,8 @@ BOOLEAN ValidItemAttachmentSlot( OBJECTTYPE * pObj, UINT16 usAttachment, BOOLEAN return FALSE; // shadooow: efficiency check, we are passing all kinds of items into this function that are not neccessary attachments at all - if (!Item[usAttachment].attachment && !Item[usAttachment].hiddenaddon) - return FALSE; + //if (!Item[usAttachment].attachment && !Item[usAttachment].hiddenaddon) + //return FALSE; //It's possible we could get here without being sent the usAttachmentSlotIndexVector parameter if(usAttachmentSlotIndexVector.empty()) @@ -2688,8 +2688,8 @@ BOOLEAN TwoHandedItem( UINT16 usItem ) BOOLEAN ValidLaunchable( UINT16 usLaunchable, UINT16 usItem ) { // shadooow: efficiency check, we are passing all kinds of items into this function that are not neccessary attachments at all - if (!Item[usLaunchable].attachment && !Item[usLaunchable].hiddenaddon) - return FALSE; + //if (!Item[usLaunchable].attachment && !Item[usLaunchable].hiddenaddon) + //return FALSE; INT32 iLoop = 0; // Flugente: as this would cause launchers to happily launch attachments around the landscape, we really have to check the list of launchables