adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes problem with Melnorme stripping Chmmr bomb modules from the ship in a fuel deal; bug #803

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2120 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
avolkov
2005-12-26 11:37:24 +00:00
parent 0709a5a05a
commit 2c9317c906
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/sc2code/comm/melnorm/melnorm.c
+4 -4
View File
@@ -221,10 +221,9 @@ ShipWorth (void)
which_module = GLOBAL_SIS (ModuleSlots[i]); which_module = GLOBAL_SIS (ModuleSlots[i]);
if (which_module < BOMB_MODULE_0 if (which_module < BOMB_MODULE_0
|| which_module != CREW_POD && (which_module != CREW_POD || ++crew_pods > 0))
|| ++crew_pods > 0)
{ {
worth += GLOBAL (ModuleCost[i]); worth += GLOBAL (ModuleCost[which_module]);
} }
} }
@@ -363,7 +362,8 @@ StripShip (COUNT fuel_required)
break; break;
case CREW_POD: case CREW_POD:
i = HIBYTE (LOWORD (rand_val)) % NUM_MODULE_SLOTS; i = HIBYTE (LOWORD (rand_val)) % NUM_MODULE_SLOTS;
if ((which_module = SIS_copy.ModuleSlots[i]) >= EMPTY_SLOT which_module = SIS_copy.ModuleSlots[i];
if (which_module >= BOMB_MODULE_0
|| which_module == FUEL_TANK || which_module == FUEL_TANK
|| which_module == HIGHEFF_FUELSYS || which_module == HIGHEFF_FUELSYS
|| (which_module == STORAGE_BAY || (which_module == STORAGE_BAY