speed-dreams/speed-dreams-code
speed-dreams/speed-dreams-code
7
1
Fork 3
Code Issues 8 Pull requests Projects Releases 1 Packages Wiki Activity Actions

Fixed network race strangely lasting 0 lap + added a few network menu traces

Browse source 
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@3619 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 4b8eb5d38c8c3d14574556c3f2b1f13cda9ff9f9
Former-commit-id: d86caa6e85224946eb90da7c813537f98f91d765
This commit is contained in:
pouillot 2011-05-28 17:35:17 +00:00
parent 1e089c28f3
commit ea280e08cc
4 changed files with 19 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/libs/raceengine/racenetwork.cpp
View file

@ -193,7 +193,7 @@ ReNetworkWaitReady()
{
GetClient()->SendReadyToStartPacket();
ReInfo->s->currentTime = GetClient()->WaitForRaceStart();
GfLogInfo("Client beginning race in %lf seconds!\n", ReInfo->s->currentTime);
GfLogInfo("Client beginning race in %lf seconds!\n", - ReInfo->s->currentTime);
bWaitFinished = true;
}
@ -202,7 +202,7 @@ ReNetworkWaitReady()
if (GetServer()->ClientsReadyToRace())
{
ReInfo->s->currentTime = GetServer()->WaitForRaceStart();
GfLogInfo("Server beginning race in %lf seconds!\n", ReInfo->s->currentTime);
GfLogInfo("Server beginning race in %lf seconds!\n", - ReInfo->s->currentTime);
bWaitFinished = true;
}
}

7
src/modules/networking/server.cpp
View file

@ -252,12 +252,9 @@ void Server::GenerateDriversForXML()
{
Driver driver;
ReadDriverData(driver,i,params);
if ((strcmp(driver.module,NETWORKROBOT)!=0)
&&(strcmp(driver.module,HUMANROBOT)!=0))
{
if (strcmp(driver.module,NETWORKROBOT) && strcmp(driver.module,HUMANROBOT))
vecRDrivers.push_back(driver);
}
}
//Recreate drivers section robots first
char drvSec[256];
@ -955,7 +952,7 @@ void Server::SendFinishTimePacket()
double time = pNData->m_finishTime;
UnlockNetworkData();
GfLogInfo("Server finish time is %lf",time);
GfLogInfo("Server finish time is %lf\n",time);
memcpy(pData,&time,sizeof(time));
pData+=sizeof(time);

15
src/modules/userinterface/legacymenu/racescreens/networkingmenu.cpp
View file

@ -218,7 +218,7 @@ UpdateNetworkPlayers()
sprintf(buf, "%s", strTrackName.c_str());
GfuiLabelSetText(racemanMenuHdle,g_trackHd,buf);
int laps = (int)GfParmGetNum(reInfo->params, reInfo->_reName,"laps", "",0);
int laps = (int)GfParmGetNum(reInfo->params, reInfo->_reName,"laps", "", 1);
sprintf(buf, "%i", laps);
GfuiLabelSetText(racemanMenuHdle,g_lapsHd,buf);
@ -506,9 +506,7 @@ OnActivateNetworkHost(void *)
MutexData *pNData = GetNetwork()->LockNetworkData();
for (unsigned int i=0;i<pNData->m_vecReadyStatus.size();i++)
{
pNData->m_vecReadyStatus[i] = false;
};
GetNetwork()->UnlockNetworkData();
@ -557,6 +555,8 @@ rmNetworkHostSettingsMenu(void *pMenu)
void
RmNetworkHostMenu(void * /* dummy */)
{
GfLogTrace("Entering Network Host menu.\n");
if (!GetNetwork())
{
SetServer(true);
@ -588,6 +588,7 @@ RmNetworkHostMenu(void * /* dummy */)
g_catHd = GfuiMenuCreateLabelControl(racemanMenuHdle,mparam,"carcatname");
g_OutlineId = GfuiMenuCreateStaticImageControl(racemanMenuHdle,mparam,"outlineimage");
//Show players
for (int i = 0; i < MAXNETWORKPLAYERS; i++)
{
@ -635,6 +636,8 @@ RmNetworkHostMenu(void * /* dummy */)
static void
ShowWaitingToConnectScreen()
{
GfLogTrace("Entering Network Wait Connection menu.\n");
if (racemanMenuHdle)
GfuiScreenRelease(racemanMenuHdle);
@ -654,6 +657,8 @@ ShowWaitingToConnectScreen()
void
RmNetworkClientMenu(void * /* dummy */)
{
GfLogTrace("Entering Network Client menu.\n");
ShowWaitingToConnectScreen();
if (!GetClient())
@ -777,6 +782,8 @@ LookupPlayerSetup(std::string & strDriver,std::string & strCar)
static void
NetworkClientConnectMenu(void * /* dummy */)
{
GfLogTrace("Entering Network Client Connect menu.\n");
tRmInfo* reInfo = LmRaceEngine().inData();
LookupPlayerSetup(g_strDriver,g_strCar);
@ -817,6 +824,8 @@ NetworkClientConnectMenu(void * /* dummy */)
void
RmNetworkMenu(void *)
{
GfLogTrace("Entering Network menu.\n");
tRmInfo* reInfo = LmRaceEngine().inData();
void *params = reInfo->params;

4
src/raceman/networkrace.xml
View file

@ -15,7 +15,7 @@
<!DOCTYPE params SYSTEM "../params.dtd">
<params name="Online Race" version="1.19">
<params name="Online Race" version="1.20">
<section name="Header">
<attstr name="name" val="Online Race"/>
@ -42,7 +42,7 @@
</section>
<section name="Online Race">
<attnum name="distance" val="0"/>
<attnum name="laps" val="10"/>
<attstr name="type" val="race"/>
<attstr name="starting order" val="drivers list"/>
<attstr name="restart" val="yes"/>