From bfc364b8abd38f9f53b0b0a5aedf0a5adfe07d6a Mon Sep 17 00:00:00 2001 From: torcs-ng Date: Sun, 25 Jun 2023 20:44:12 +0000 Subject: [PATCH] - remove double assign values git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@9044 30fe4595-0a0c-4342-8851-515496e4dcbd Former-commit-id: 3742e8086a7eb0da1e52a20397243b3aacf80ff5 Former-commit-id: 725db28a44059943b8de3eedb100ca9eeb891d8a --- src/modules/csnetworking/csrobotxml.cpp | 13 +++---------- .../legacymenu/racescreens/csnetworkingmenu.cpp | 7 ------- 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/src/modules/csnetworking/csrobotxml.cpp b/src/modules/csnetworking/csrobotxml.cpp index ede8b4639..49a91a598 100644 --- a/src/modules/csnetworking/csrobotxml.cpp +++ b/src/modules/csnetworking/csrobotxml.cpp @@ -88,34 +88,27 @@ bool RobotXml::ReadRobotDrivers(const char*pRobotName,std::vector &ve { sprintf(path2, "Robots/index/%i",i); NetDriver driver; - strncpy(driver.name,GfParmGetStr(params, path2, "name",NULL),63); + memcpy(driver.name, GfParmGetStr(params, path2, "name", NULL), sizeof(driver.name)); + //strncpy(driver.name,GfParmGetStr(params, path2, "name",NULL),63); std::string strClient = GfParmGetStr(params, path2, "client",NULL); if (strClient == "yes") driver.client = true; else driver.client = false; - memcpy(driver.name, GfParmGetStr(params, path2, "name", NULL), sizeof(driver.name)); + //memcpy(driver.name, GfParmGetStr(params, path2, "name", NULL), sizeof(driver.name)); memcpy(driver.sname, GfParmGetStr(params, path2, "short name", NULL), sizeof(driver.sname)); memcpy(driver.cname, GfParmGetStr(params, path2, "code name", NULL), sizeof(driver.cname)); memcpy(driver.car,GfParmGetStr(params, path2, "car name", NULL), sizeof(driver.car)); memcpy(driver.type,GfParmGetStr(params, path2, "type", NULL), sizeof(driver.type)); memcpy(driver.skilllevel,GfParmGetStr(params, path2, "skill level", NULL), sizeof(driver.skilllevel)); - /*strncpy(driver.name, GfParmGetStr(params, path2, "name", NULL), 64); - strncpy(driver.sname, GfParmGetStr(params, path2, "short name", NULL), 64); - strncpy(driver.cname, GfParmGetStr(params, path2, "code name", 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);*/ - driver.racenumber = (int)GfParmGetNum(params, path2, "race number", NULL, 1.0); driver.red = GfParmGetNum(params, path2, "red", NULL, 1.0); driver.green = GfParmGetNum(params, path2, "green", NULL, 1.0); driver.blue = GfParmGetNum(params, path2, "blue", NULL, 1.0); std::string strHost = GfParmGetStr(params, path2, "host",""); - //memcpy(driver.module, NETWORKROBOT, sizeof(driver.module)); strncpy(driver.module, NETWORKROBOT, 64); vecDrivers.push_back(driver); } diff --git a/src/modules/userinterface/legacymenu/racescreens/csnetworkingmenu.cpp b/src/modules/userinterface/legacymenu/racescreens/csnetworkingmenu.cpp index 9cc7d8fec..e682e16b8 100644 --- a/src/modules/userinterface/legacymenu/racescreens/csnetworkingmenu.cpp +++ b/src/modules/userinterface/legacymenu/racescreens/csnetworkingmenu.cpp @@ -1139,13 +1139,6 @@ GetHumanDriver(NetDriver &driver,int index) memcpy(driver.type,GfParmGetStr(params, path2, "type", NULL), sizeof(driver.type)); memcpy(driver.skilllevel,GfParmGetStr(params, path2, "skill level", NULL), sizeof(driver.skilllevel)); - /*strncpy(driver.name, GfParmGetStr(params, path2, "name", NULL), 64); - strncpy(driver.sname, GfParmGetStr(params, path2, "short name", NULL), 64); - strncpy(driver.cname, GfParmGetStr(params, path2, "code name", 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);*/ - driver.racenumber = GfParmGetNum(params, path2, "race number",NULL,1.0); driver.red = GfParmGetNum(params, path2, "red",NULL,1.0); driver.green = GfParmGetNum(params, path2, "green",NULL,1.0);