Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prevent power assert for "instant" (no research points needed) research. This fixes bug #424.

master
Gerard Krol 2009-04-27 14:04:32 +02:00
parent 8a11947b31
commit 98acead64b
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/structure.c
View File

@ -2810,6 +2810,7 @@ static void aiUpdateStructure(STRUCTURE *psStructure, bool mission)
BASE_STATS *pSubject = NULL;
UDWORD pointsToAdd;//, iPower;
PLAYER_RESEARCH *pPlayerRes = asPlayerResList[psStructure->player];
RESEARCH *pResearch;
UDWORD structureMode = 0;
DROID *psDroid;
BASE_OBJECT *psChosenObjs[STRUCT_MAXWEAPS] = {NULL};
@ -3197,6 +3198,7 @@ static void aiUpdateStructure(STRUCTURE *psStructure, bool mission)
//check research has not already been completed by another structure
if (IsResearchCompleted(pPlayerRes)==0)
{
pResearch = (RESEARCH *)pSubject;
// don't update if not responsible (106)
if(bMultiPlayer && !myResponsibility(psStructure->player))
{
@ -3212,16 +3214,18 @@ static void aiUpdateStructure(STRUCTURE *psStructure, bool mission)
ASSERT_OR_RETURN(, gameTime >= psResFacility->timeStarted, "research seems to have started in the future");
pointsToAdd = (psResFacility->researchPoints * (gameTime -
psResFacility->timeStarted)) / GAME_TICKS_PER_SEC;
pointsToAdd = MIN(pointsToAdd, pResearch->researchPoints - pPlayerRes->currentPoints);
if (pointsToAdd > 0)
if (pointsToAdd > 0 &&
pResearch->researchPoints > 0) // might be a "free" research
{
float powerNeeded = (((RESEARCH *)pSubject)->researchPower * pointsToAdd) / (float)((RESEARCH *)pSubject)->researchPoints;
float powerNeeded = (pResearch->researchPower * pointsToAdd) / (float)pResearch->researchPoints;
pPlayerRes->currentPoints += requestPowerFor(psStructure->player, powerNeeded, pointsToAdd);
psResFacility->timeStarted = gameTime;
}
//check if Research is complete
if (pPlayerRes->currentPoints > ((RESEARCH *)pSubject)->researchPoints)
if (pPlayerRes->currentPoints >= pResearch->researchPoints)
{
if(bMultiPlayer)
{
@ -3235,7 +3239,7 @@ static void aiUpdateStructure(STRUCTURE *psStructure, bool mission)
}
else
{
if (((RESEARCH *)psResFacility->psSubject)->researchPoints >
if (pResearch->researchPoints >
((RESEARCH *)psResFacility->psBestTopic)->researchPoints)
{
psResFacility->psSubject = psResFacility->psSubject;