Hi all,
As some of you may know, power required and hit points of droid parts
are stored in central arrays. Individual body types are an index into
this array and are used like this:
(asBodyStats + psTemplate->asParts[COMP_BODY])->buildPower
The code in intSetTemplatePowerShadowStats and
intSetTemplateBodyShadowStats did store a pointer in this index by using
the difference with the asBodyStats address, so that after this addition
the correct address would magically reappear. Guilty code looks like this:
compTempl.asParts[COMP_BODY] = (BODY_STATS *)psStats - asBodyStats;
Funny thing is: on 64bit: sizeof(SDWORD) < sizeof(void*)
In the attached patch, the calls to calcTemplatePower and
calcTemplateBody were removed, and the (simple) formula's used for
calculation were directly included in the two modified functions.
- Gerard
Index: src/design.c
===================================================================
--- src/design.c (revision 731)
+++ src/design.c (working copy)
@@ -3612,13 +3612,18 @@
static void intSetTemplatePowerShadowStats(COMP_BASE_STATS *psStats)
{
UDWORD type;
- //SDWORD Avail, Used, Total;
- DROID_TEMPLATE compTempl;
- if (&sCurrDesign != NULL && psStats != NULL)
- {
- //create the comparison Template
- memcpy(&compTempl, &sCurrDesign, sizeof(DROID_TEMPLATE));
+ if (psStats != NULL) {
+ COMP_BASE_STATS* bodyStats = asBodyStats + sCurrDesign.asParts[COMP_BODY];
+ COMP_BASE_STATS* brainStats = asBrainStats + sCurrDesign.asParts[COMP_BRAIN];
+ COMP_BASE_STATS* sensorStats = asSensorStats + sCurrDesign.asParts[COMP_SENSOR];
+ COMP_BASE_STATS* ECMStats = asECMStats + sCurrDesign.asParts[COMP_ECM];
+ COMP_BASE_STATS* repairStats = asRepairStats + sCurrDesign.asParts[COMP_REPAIRUNIT];
+ COMP_BASE_STATS* constructStats = asConstructStats + sCurrDesign.asParts[COMP_CONSTRUCT];
+ COMP_BASE_STATS* propulsionStats = asPropulsionStats + sCurrDesign.asParts[COMP_PROPULSION];
+ COMP_BASE_STATS* weaponStats = asWeaponStats + sCurrDesign.asWeaps[0];
+
+
type = statType(psStats->ref);
/*if type = BODY or PROPULSION can do a straight comparison but if the new stat is
a 'system' stat then need to find out which 'system' is currently in place so the
@@ -3648,43 +3653,56 @@
}
else
{
- type = COMP_UNKNOWN;
+ // compare it with the current weapon
+ type = COMP_WEAPON;
}
}
switch (type)
{
case COMP_BODY:
- compTempl.asParts[COMP_BODY] = (BODY_STATS *)psStats - asBodyStats;
+ bodyStats = psStats;
break;
case COMP_PROPULSION:
- compTempl.asParts[COMP_PROPULSION] = (PROPULSION_STATS *)psStats -
- asPropulsionStats;
+ propulsionStats = psStats;
break;
case COMP_ECM:
- compTempl.asParts[COMP_ECM] = (ECM_STATS *)psStats - asECMStats;
+ ECMStats = psStats;
break;
case COMP_SENSOR:
- compTempl.asParts[COMP_SENSOR] = (SENSOR_STATS *)psStats -
- asSensorStats;
+ sensorStats = psStats;
break;
case COMP_CONSTRUCT:
- compTempl.asParts[COMP_CONSTRUCT] = (CONSTRUCT_STATS *)psStats -
- asConstructStats;
+ constructStats = psStats;
break;
case COMP_REPAIRUNIT:
- compTempl.asParts[COMP_REPAIRUNIT] = (REPAIR_STATS *)psStats -
- asRepairStats;
+ repairStats = psStats;
break;
case COMP_WEAPON:
- compTempl.asWeaps[0] = (WEAPON_STATS *)psStats - asWeaponStats;
+ weaponStats = psStats;
break;
//default:
//don't want to draw for unknown comp
}
+ // this code is from calcTemplatePower
+ UDWORD power, i;
- widgSetMinorBarSize( psWScreen, IDDES_POWERBAR,
- calcTemplatePower(&compTempl));
+ //get the component power
+ power = bodyStats->buildPower + brainStats->buildPower + sensorStats->buildPower + ECMStats->buildPower + repairStats->buildPower + constructStats->buildPower;
+
+ /* propulsion power points are a percentage of the bodys' power points */
+ power += (propulsionStats->buildPower *
+ bodyStats->buildPower) / 100;
+
+ //add weapon power
+ // FIXME: Only takes first weapon into account
+ power += weaponStats->buildPower;
+ for(i=1; i<sCurrDesign.numWeaps; i++)
+ {
+ power += (asWeaponStats + sCurrDesign.asWeaps[i])->buildPower;
+ }
+ widgSetMinorBarSize( psWScreen, IDDES_POWERBAR,
+ power);
}
else
{
@@ -3705,12 +3723,18 @@
static void intSetTemplateBodyShadowStats(COMP_BASE_STATS *psStats)
{
UDWORD type;
- DROID_TEMPLATE compTempl;
- if (&sCurrDesign != NULL && psStats != NULL)
- {
- //create the comparison Template
- memcpy(&compTempl, &sCurrDesign, sizeof(DROID_TEMPLATE));
+ if (psStats != NULL) {
+ COMP_BASE_STATS* bodyStats = asBodyStats + sCurrDesign.asParts[COMP_BODY];
+ COMP_BASE_STATS* brainStats = asBrainStats + sCurrDesign.asParts[COMP_BRAIN];
+ COMP_BASE_STATS* sensorStats = asSensorStats + sCurrDesign.asParts[COMP_SENSOR];
+ COMP_BASE_STATS* ECMStats = asECMStats + sCurrDesign.asParts[COMP_ECM];
+ COMP_BASE_STATS* repairStats = asRepairStats + sCurrDesign.asParts[COMP_REPAIRUNIT];
+ COMP_BASE_STATS* constructStats = asConstructStats + sCurrDesign.asParts[COMP_CONSTRUCT];
+ COMP_BASE_STATS* propulsionStats = asPropulsionStats + sCurrDesign.asParts[COMP_PROPULSION];
+ COMP_BASE_STATS* weaponStats = asWeaponStats + sCurrDesign.asWeaps[0];
+
+
type = statType(psStats->ref);
/*if type = BODY or PROPULSION can do a straight comparison but if the new stat is
a 'system' stat then need to find out which 'system' is currently in place so the
@@ -3740,44 +3764,57 @@
}
else
{
- type = COMP_UNKNOWN;
+ // compare it with the current weapon
+ type = COMP_WEAPON;
}
}
switch (type)
{
case COMP_BODY:
- compTempl.asParts[COMP_BODY] = (BODY_STATS *)psStats - asBodyStats;
+ bodyStats = psStats;
break;
case COMP_PROPULSION:
- compTempl.asParts[COMP_PROPULSION] = (PROPULSION_STATS *)psStats -
- asPropulsionStats;
+ propulsionStats = psStats;
break;
case COMP_ECM:
- compTempl.asParts[COMP_ECM] = (ECM_STATS *)psStats - asECMStats;
+ ECMStats = psStats;
break;
case COMP_SENSOR:
- compTempl.asParts[COMP_SENSOR] = (SENSOR_STATS *)psStats -
- asSensorStats;
+ sensorStats = psStats;
break;
case COMP_CONSTRUCT:
- compTempl.asParts[COMP_CONSTRUCT] = (CONSTRUCT_STATS *)psStats -
- asConstructStats;
+ constructStats = psStats;
break;
case COMP_REPAIRUNIT:
- compTempl.asParts[COMP_REPAIRUNIT] = (REPAIR_STATS *)psStats -
- asRepairStats;
+ repairStats = psStats;
break;
case COMP_WEAPON:
-// compTempl.asWeaps[COMP_WEAPON] = (WEAPON_STATS *)psStats - asWeaponStats;
- compTempl.asWeaps[0] = (WEAPON_STATS *)psStats - asWeaponStats;
+ weaponStats = psStats;
break;
//default:
//don't want to draw for unknown comp
}
+ // this code is from calcTemplateBody
+ UDWORD body, i;
- widgSetMinorBarSize( psWScreen, IDDES_BODYPOINTS,
- calcTemplateBody(&compTempl, (UBYTE)selectedPlayer));
+ //get the component power
+ body = bodyStats->body + brainStats->body + sensorStats->body + ECMStats->body + repairStats->body + constructStats->body;
+
+ /* propulsion power points are a percentage of the bodys' power points */
+ body += (propulsionStats->body *
+ bodyStats->body) / 100;
+
+ //add weapon power
+ // FIXME: Only takes first weapon into account
+ body += weaponStats->body;
+ for(i=1; i<sCurrDesign.numWeaps; i++)
+ {
+ body += (asWeaponStats + sCurrDesign.asWeaps[i])->body;
+ }
+ body += (body * asBodyUpgrade[selectedPlayer]->body / 100);
+ widgSetMinorBarSize( psWScreen, IDDES_BODYPOINTS,
+ body);
}
else
{
_______________________________________________
Warzone-dev mailing list
[email protected]
https://mail.gna.org/listinfo/warzone-dev
