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

Fixes a bug that prevents Slylandro Probes from ever showing up in IP (found by SvdB, bug #768)

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1889 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
avolkov
2005-10-05 23:40:50 +00:00
parent 8f721f60ac
commit 3d6c6e9f2f
1 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/sc2code/grpinfo.c
+20 -10
View File
@@ -134,16 +134,23 @@ BuildGroups (void)
{ {
SIZE dx, dy; SIZE dx, dy;
DWORD d_squared; DWORD d_squared;
BYTE race_enc;
// XXX: BUG: i is redefined in the line below, so the assignment race_enc = HomeWorld[Index];
// to i a few lines ago is useless. if (race_enc && CurStarDescPtr->Index == race_enc)
// EncounterPercent is never used in practice. { // In general, there are always ships at the Homeworld for
// BestIndex may be used uninitialised. - SvdB // the races specified in HomeWorld[] array.
if ((i = HomeWorld[Index]) && CurStarDescPtr->Index == (BYTE)i) // XXX: This code is somewhat broken and the intent is not
{ // 100% clear. Finding a Homeworld does not break you out
// of the loop, so another race could override with its
// ships when another race's SoI covers the Homeworld.
// However, only a race later in the order can do that, so
// for example, there will *always* be Yehat Rebel ships
// at the Rebel Homeworld, but the same is not true for the
// regular Yehat.
BestIndex = Index; BestIndex = Index;
BestPercent = 70; BestPercent = 70;
if (i == SPATHI_DEFINED || i == SUPOX_DEFINED) if (race_enc == SPATHI_DEFINED || race_enc == SUPOX_DEFINED)
BestPercent = 2; BestPercent = 2;
hNextShip = 0; hNextShip = 0;
@@ -166,6 +173,9 @@ BuildGroups (void)
{ {
DWORD rand_val; DWORD rand_val;
// EncounterPercent is only used in practice for the Slylandro
// Probes, for the rest of races the chance of encounter is
// calced directly below from the distance to the Homeworld
if (TemplatePtr->ShipInfo.actual_strength != (COUNT)~0) if (TemplatePtr->ShipInfo.actual_strength != (COUNT)~0)
{ {
i = 70 - (COUNT)((DWORD)square_root (d_squared) i = 70 - (COUNT)((DWORD)square_root (d_squared)
@@ -178,9 +188,9 @@ BuildGroups (void)
|| (HIWORD (rand_val) % (i + BestPercent)) < i)) || (HIWORD (rand_val) % (i + BestPercent)) < i))
{ {
if (TemplatePtr->ShipInfo.actual_strength == (COUNT)~0) if (TemplatePtr->ShipInfo.actual_strength == (COUNT)~0)
{ { // The prevailing encounter chance is hereby limitted
// XXX: BUG: This code is never reached. // to 4% for races with infinite SoI (currently, it
// When actual_strength == ~0, i is always 0. // is only the Slylandro Probes)
i = 4; i = 4;
} }