forked from speed-dreams/speed-dreams-code
Re #132 (D13: Dual threaded race engine) Resurrected Result-Only = Blind mode (was crashing whatever mon or dual threaded settings)
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@2819 30fe4595-0a0c-4342-8851-515496e4dcbd Former-commit-id: bcdf00d236bd1b2b80fb295df0755e22f289b8f2 Former-commit-id: bc5be807ca00da567e5a209baeb878befcb2afe6
This commit is contained in:
parent
4b31b545d6
commit
d6017406b2
1 changed files with 2 additions and 11 deletions
|
@ -94,9 +94,6 @@ private:
|
|||
//! Release exclusive access on the race engine data.
|
||||
bool unlockData(const char* pszLocker);
|
||||
|
||||
//! Copy (after allocating if pTarget is null) the source situation into the target (deep copy for RW data, shallow copy for RO data).
|
||||
tRmInfo* deliverSituation(tRmInfo*& pTarget, const tRmInfo* pSource);
|
||||
|
||||
//! Allocate and initialize a situation (set constants from source).
|
||||
tRmInfo* initSituation(const tRmInfo* pSource);
|
||||
|
||||
|
@ -499,11 +496,6 @@ tRmInfo* reSituationUpdater::initSituation(const tRmInfo* pSource)
|
|||
return ReSituationAllocInit(pSource);
|
||||
}
|
||||
|
||||
tRmInfo* reSituationUpdater::deliverSituation(tRmInfo*& pTarget, const tRmInfo* pSource)
|
||||
{
|
||||
return ReSituationCopy(pTarget, pSource);
|
||||
}
|
||||
|
||||
void reSituationUpdater::acknowledgeEvents()
|
||||
{
|
||||
ReSituationAcknowlegdeEvents(_pCurrReInfo, _pPrevReInfo);
|
||||
|
@ -523,7 +515,7 @@ tRmInfo* reSituationUpdater::getPreviousStep()
|
|||
return 0;
|
||||
|
||||
// Get the situation data.
|
||||
deliverSituation(_pPrevReInfo, _pCurrReInfo);
|
||||
ReSituationCopy(_pPrevReInfo, _pCurrReInfo);
|
||||
|
||||
// Unlock the race engine data.
|
||||
if (!unlockData("reSituationUpdater::getPreviousStep"))
|
||||
|
@ -653,13 +645,12 @@ static void reOnBackFromPitMenu(void *pvcar)
|
|||
}
|
||||
|
||||
reMainUpdater::reMainUpdater(reSituationUpdater* pSituUpdater)
|
||||
: _pReInfo(0), _pSituationUpdater(pSituUpdater)
|
||||
: _pReInfo(pSituUpdater->getPreviousStep()), _pSituationUpdater(pSituUpdater)
|
||||
{
|
||||
}
|
||||
|
||||
void reMainUpdater::initCarGraphics(void)
|
||||
{
|
||||
_pReInfo = _pSituationUpdater->getPreviousStep();
|
||||
_pReInfo->_reGraphicItf.initcars(_pReInfo->s);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue