1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-29 13:52:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

remove magic numbers from the usLimitedToSystem bitflag

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9355 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
rftr
2022-04-02 01:11:25 +00:00
parent c334d4a0d4
commit 746d15a1ba
5 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Laptop/AimMembers.cpp
+1 -1
View File
@@ -5650,7 +5650,7 @@ void EnableWeaponKitSelectionButtons()
{
bShow = true;
//shadooow: if any of the item in kit is limited to specific system and this system isn't enabled then disable the whole kit from selection
if (((Item[usItem].usLimitedToSystem & 1) && !UsingFoodSystem()) || ((Item[usItem].usLimitedToSystem & 2) && !gGameExternalOptions.fDisease))
if (((Item[usItem].usLimitedToSystem & FOOD_SYSTEM_FLAG) && !UsingFoodSystem()) || ((Item[usItem].usLimitedToSystem & DISEASE_SYSTEM_FLAG) && !gGameExternalOptions.fDisease))
{
bShow = false;
break;
Tactical/Item Types.h
+4
View File
@@ -947,6 +947,10 @@ extern OBJECTTYPE gTempObject;
// autofiretohitbonus,
// bursttohitbonus
// bitflags for usLimitedToSystem
#define FOOD_SYSTEM_FLAG 1
#define DISEASE_SYSTEM_FLAG 2
typedef struct
{
UINT32 usItemClass;
Tactical/Items.cpp
+1 -1
View File
@@ -1283,7 +1283,7 @@ BOOLEAN ItemIsLegal( UINT16 usItemIndex, BOOLEAN fIgnoreCoolness )
}
//shadooow: exclude also any item that is limited to specific system and this system isn't enabled
if (((Item[usItemIndex].usLimitedToSystem & 1) && !UsingFoodSystem()) || ((Item[usItemIndex].usLimitedToSystem & 2) && !gGameExternalOptions.fDisease))
if (((Item[usItemIndex].usLimitedToSystem & FOOD_SYSTEM_FLAG) && !UsingFoodSystem()) || ((Item[usItemIndex].usLimitedToSystem & DISEASE_SYSTEM_FLAG) && !gGameExternalOptions.fDisease))
{
return FALSE;
}
Tactical/ShopKeeper Interface.cpp
+1 -1
View File
@@ -2901,7 +2901,7 @@ BOOLEAN DetermineArmsDealersSellingInventory( )
}
//shadooow: do not sell any item that is limited to specific system and this system isn't enabled
if (((Item[iter->object.usItem].usLimitedToSystem & 1) && !UsingFoodSystem()) || ((Item[iter->object.usItem].usLimitedToSystem & 2) && !gGameExternalOptions.fDisease))
if (((Item[iter->object.usItem].usLimitedToSystem & FOOD_SYSTEM_FLAG) && !UsingFoodSystem()) || ((Item[iter->object.usItem].usLimitedToSystem & DISEASE_SYSTEM_FLAG) && !gGameExternalOptions.fDisease))
{
++iter;
continue;
Utils/XML_Items.cpp
+2 -2
View File
@@ -1620,13 +1620,13 @@ itemEndElementHandle(void *userData, const XML_Char *name)
{
pData->curElement == ELEMENT;
if (atol(pData->szCharData))
pData->curItem.usLimitedToSystem|= 1;
pData->curItem.usLimitedToSystem|= FOOD_SYSTEM_FLAG;
}
else if (strcmp(name, "DiseaseSystemExclusive") == 0)
{
pData->curElement == ELEMENT;
if (atol(pData->szCharData))
pData->curItem.usLimitedToSystem|= 2;
pData->curItem.usLimitedToSystem|= DISEASE_SYSTEM_FLAG;
}
--pData->maxReadDepth;