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

Fix research sharing. 

Fixes ticket:2508.
master
Cyp 2011-02-28 23:21:04 +01:00
parent 48f0020455
commit 9d4c9f89ed
2 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/research.cpp
View File

@ -1126,8 +1126,10 @@ void researchResult(UDWORD researchIndex, UBYTE player, BOOL bDisplay, STRUCTURE
ASSERT_OR_RETURN( , researchIndex < numResearch, "Invalid research index %u", researchIndex);
sendResearchStatus(NULL, researchIndex, player, false);
// Confused whether we should wait for our message before doing anything, and confused what this function does...
if (!isInSync())
{
sendResearchStatus(NULL, researchIndex, player, false);
}
MakeResearchCompleted(&pPlayerRes[researchIndex]);

24
src/structure.cpp
View File

@ -3186,7 +3186,9 @@ static void aiUpdateStructure(STRUCTURE *psStructure, bool isMission)
}
}
PLAYER_RESEARCH *pPlayerRes = &asPlayerResList[psStructure->player][pSubject->ref - REF_RESEARCH_START];
int researchIndex = pSubject->ref - REF_RESEARCH_START;
PLAYER_RESEARCH *pPlayerRes = &asPlayerResList[psStructure->player][researchIndex];
//check research has not already been completed by another structure
if (!IsResearchCompleted(pPlayerRes))
{
@ -3220,7 +3222,7 @@ static void aiUpdateStructure(STRUCTURE *psStructure, bool isMission)
if (myResponsibility(psStructure->player) && !isInSync())
{
// This message should have no effect if in synch.
SendResearch(psStructure->player, pSubject->ref - REF_RESEARCH_START, true);
SendResearch(psStructure->player, researchIndex, true);
}
}
@ -3238,9 +3240,25 @@ static void aiUpdateStructure(STRUCTURE *psStructure, bool isMission)
}
psResFacility->psSubject = NULL;
intResearchFinished(psStructure);
researchResult(pSubject->ref - REF_RESEARCH_START, psStructure->player, true, psStructure, true);
researchResult(researchIndex, psStructure->player, true, psStructure, true);
//check if this result has enabled another topic
intCheckResearchButton();
// Update allies research accordingly
if (game.type == SKIRMISH)
{
for (i = 0; i < MAX_PLAYERS; i++)
{
if (alliances[i][psStructure->player] == ALLIANCE_FORMED)
{
if (!IsResearchCompleted(&asPlayerResList[i][researchIndex]))
{
// Do the research for that player
researchResult(researchIndex, i, false, NULL, true);
}
}
}
}
}
}
else