iceflower/speed-dreams-code
1
0
Fork 0
forked from speed-dreams/speed-dreams-code
Code Pull requests Activity

- send short name and code name in network by Tom

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

Former-commit-id: c1226040c60d94c34b41dd9ac280f2e3cba0d752
Former-commit-id: 86db059ae74ec99e86a13a738dea9cb77366f6f0
This commit is contained in:
torcs-ng 2013-11-10 11:53:52 +00:00
parent 0c8191d944
commit 9773d684a7
5 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/modules/networking/client.cpp
View file

@ -296,6 +296,8 @@ bool NetClient::SendDriverInfoPacket(NetDriver *pDriver)
GfLogTrace("->port=%d\n", pDriver->address.port);
GfLogTrace("->idx=%d\n", pDriver->idx);
GfLogTrace("->name=%s\n", pDriver->name);
GfLogTrace("->sname=%s\n", pDriver->sname);
GfLogTrace("->cname=%s\n", pDriver->cname);
GfLogTrace("->car=%s\n", pDriver->car);
GfLogTrace("->team=%s\n", pDriver->team);
GfLogTrace("->author=%s\n", pDriver->author);
@ -315,6 +317,8 @@ bool NetClient::SendDriverInfoPacket(NetDriver *pDriver)
msg.pack_ubyte(PLAYERINFO_PACKET);
msg.pack_int(pDriver->idx);
msg.pack_string(pDriver->name, sizeof pDriver->name);
msg.pack_string(pDriver->sname, sizeof pDriver->sname);
msg.pack_string(pDriver->cname, sizeof pDriver->cname);
msg.pack_string(pDriver->car, sizeof pDriver->car);
msg.pack_string(pDriver->team, sizeof pDriver->team);
msg.pack_string(pDriver->author, sizeof pDriver->author);

2
src/modules/networking/network.h
View file

@ -155,7 +155,7 @@ public:
int idx;
char name[64];
char sname[64];
char cname[3];
char cname[4];
char car[64];
char team[64];
char author[64];

4
src/modules/networking/robotxml.cpp
View file

@ -41,8 +41,8 @@ bool RobotXml::CreateRobotFile(const char*pRobotName,std::vector<NetDriver> &vec
{
sprintf(path2, "Robots/index/%d",i+1);
GfParmSetStr(params, path2, "name",vecDrivers[i].name);
GfParmSetStr(params, path2, "short name",vecDrivers[i].name);
GfParmSetStr(params, path2, "code name","PLA");
GfParmSetStr(params, path2, "short name",vecDrivers[i].sname);
GfParmSetStr(params, path2, "code name", vecDrivers[i].cname);
GfParmSetStr(params, path2, "car name",vecDrivers[i].car);
GfParmSetNum(params, path2, "race number", (char*)NULL,(tdble) vecDrivers[i].racenumber);
GfParmSetNum(params, path2, "red", (char*)NULL, vecDrivers[i].red);

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

@ -649,6 +649,8 @@ void NetServer::ReadDriverInfoPacket(ENetPacket *pPacket, ENetPeer * pPeer)
msg.unpack_ubyte();
driver.idx = msg.unpack_int();
msg.unpack_string(driver.name, sizeof driver.name);
msg.unpack_string(driver.sname, sizeof driver.sname);
msg.unpack_string(driver.cname, sizeof driver.cname);
msg.unpack_string(driver.car, sizeof driver.car);
msg.unpack_string(driver.team, sizeof driver.team);
msg.unpack_string(driver.author, sizeof driver.author);

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

@ -887,6 +887,10 @@ GetHumanDriver(NetDriver &driver,int index)
char path2[256];
sprintf(path2, "Robots/index/%d",index);
strncpy(driver.name,GfParmGetStr(params, path2, "name",NULL),64);
strncpy(driver.sname, GfParmGetStr(params, path2,
ROB_ATTR_SNAME, NULL), 64);
strncpy(driver.cname, GfParmGetStr(params, path2,
ROB_ATTR_CODE, NULL), 4);
strncpy(driver.car,GfParmGetStr(params, path2, "car name",NULL),64);
strncpy(driver.type,GfParmGetStr(params, path2, "type",NULL),64);
strncpy(driver.skilllevel,GfParmGetStr(params, path2, "skill level",NULL),64);