From c8e07873927a3dbf1b4d6ef14d54d1838cde04b2 Mon Sep 17 00:00:00 2001 From: briangr Date: Sat, 10 Jul 2010 17:50:44 +0000 Subject: [PATCH] fixed race time problem that causes network play to work incorrectly git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@2556 30fe4595-0a0c-4342-8851-515496e4dcbd Former-commit-id: 410197fc82386ecac5b9d6e3af954741271f193c Former-commit-id: 4a07d1ee4f1490063fa2a3f7234f29a4fb5a42b7 --- src/libs/raceengineclient/raceengine.cpp | 3 ++- src/libs/raceengineclient/racestate.cpp | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/libs/raceengineclient/raceengine.cpp b/src/libs/raceengineclient/raceengine.cpp index c912d6f2..94a2578d 100644 --- a/src/libs/raceengineclient/raceengine.cpp +++ b/src/libs/raceengineclient/raceengine.cpp @@ -1019,7 +1019,8 @@ ReOneStep(double deltaTimeIncrement) if (s->currentTime < -2.0) { - sprintf(buf,"Race will start in %i seconds", -s->currentTime); + int t = -s->currentTime; + sprintf(buf,"Race will start in %i seconds", t); ReRaceBigMsgSet(buf, 1.0); } } diff --git a/src/libs/raceengineclient/racestate.cpp b/src/libs/raceengineclient/racestate.cpp index 4a82f26e..806fb695 100644 --- a/src/libs/raceengineclient/racestate.cpp +++ b/src/libs/raceengineclient/racestate.cpp @@ -124,6 +124,9 @@ ReStateManage(void) mode = ReRaceStart(); if (GetNetwork()) { + float f = GfTimeClock(); + float rs = GetNetwork()->GetRaceStartTime(); + ReInfo->s->currentTime = GfTimeClock() - GetNetwork()->GetRaceStartTime(); GetNetwork()->RaceInit(ReInfo->s); GetNetwork()->SetRaceActive(true); } @@ -136,7 +139,11 @@ ReStateManage(void) case RE_STATE_NETWORK_WAIT: if (!WaitForNetwork()) + { ReInfo->_reState = RE_STATE_RACE; + ReSetRaceBigMsg(""); + break; + } if (GetNetwork()) {