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

Fix comparing with the wrong variable when trying to make pathfinding deterministic. 

(Fixed before, hope it's the right variable this time.)
master
Cyp 2010-08-15 20:23:56 +02:00
parent 8f55883a61
commit 19bfa0d8f6
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/astar.cpp
View File

@ -51,6 +51,9 @@
#include <vector>
#include <algorithm>
#include "lib/framework/crc.h"
#include "lib/netplay/netplay.h"
/// A coordinate.
struct PathCoord
{
@ -112,9 +115,6 @@ struct PathBlockingMap
std::vector<bool> map;
};
/// Game time for all blocking maps in fpathBlockingMaps.
static uint32_t fpathCurrentGameTime;
// Data structures used for pathfinding, can contain cached results.
struct PathfindContext
{
@ -126,8 +126,8 @@ struct PathfindContext
}
bool matches(PathBlockingMap const *blockingMap_, PathCoord tileS_) const
{
// Must check myGameTime == fpathCurrentGameTime, otherwise blockingMap be a deleted pointer which coincidentally compares equal to the valid pointer blockingMap_.
return myGameTime == fpathCurrentGameTime && blockingMap == blockingMap_ && tileS == tileS_;
// Must check myGameTime == blockingMap_->type.gameTime, otherwise blockingMap be a deleted pointer which coincidentally compares equal to the valid pointer blockingMap_.
return myGameTime == blockingMap_->type.gameTime && blockingMap == blockingMap_ && tileS == tileS_;
}
void assign(PathBlockingMap const *blockingMap_, PathCoord tileS_)
{
@ -168,6 +168,8 @@ static std::list<PathfindContext> fpathContexts;
static std::list<PathBlockingMap> fpathBlockingMaps;
/// Lists of blocking maps from previous tick, will be cleared next tick (since it will be no longer needed after that).
static std::list<PathBlockingMap> fpathPrevBlockingMaps;
/// Game time for all blocking maps in fpathBlockingMaps.
static uint32_t fpathCurrentGameTime;
// Convert a direction into an offset
// dir 0 => x = 0, y = -1

7
src/fpath.c
View File

@ -164,6 +164,7 @@ static int fpathThreadFunc(WZ_DECL_UNUSED void *data)
psResult->done = false;
psResult->droidID = job.droidID;
psResult->sMove.asPath = NULL;
psResult->sMove.numPoints = 0;
psResult->retval = FPR_FAILED;
// Add to beginning of result list
@ -540,11 +541,7 @@ static FPATH_RETVAL fpathRoute(MOVE_CONTROL *psMove, int id, int startX, int sta
// We were not waiting for a result, and found no trivial path, so create new job and start waiting
psJob = malloc(sizeof(*psJob));
ASSERT(psJob, "Out of memory");
if (!psJob)
{
return FPR_FAILED;
}
ASSERT_OR_RETURN(FPR_FAILED, psJob, "Out of memory");
psJob->origX = startX;
psJob->origY = startY;
psJob->droidID = id;