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

USR use global skill.xml.

Browse source 
Untested. Re #50

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

Former-commit-id: a0040c09d7bf43074747903fb611325e05a414c0
Former-commit-id: 49bdf3df0bc9ced7016d1fd363ef18a2b9620eec
This commit is contained in:
kmetykog 2009-12-22 00:52:11 +00:00
parent 5cbdcf8125
commit 6ff78eb85d
3 changed files with 8268 additions and 8280 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/drivers/usr_36GP/driver.cpp
View file

@ -257,23 +257,20 @@ void Driver::initTrack(tTrack* t, void *carHandle, void **carParmHandle, tSituat
global_skill = skill = decel_adjust_perc = driver_aggression = 0.0; global_skill = skill = decel_adjust_perc = driver_aggression = 0.0;
#ifdef CONTROL_SKILL #ifdef CONTROL_SKILL
// load the skill level // load the global skill level, range 0 - 10
//if (s->_raceType == RM_TYPE_PRACTICE) snprintf(buffer, BUFSIZE, "%sconfig/raceman/extra/skill.xml", GetLocalDir());
// global_skill = 0.0;
//else
{
snprintf(buffer, BUFSIZE, "config/raceman/extra/skill.xml");
void *skillHandle = GfParmReadFile(buffer, GFPARM_RMODE_REREAD); void *skillHandle = GfParmReadFile(buffer, GFPARM_RMODE_REREAD);
if (skillHandle) if(!skillHandle) {
{ snprintf(buffer, BUFSIZE, "%sconfig/raceman/extra/skill.xml", GetDataDir());
skillHandle = GfParmReadFile(buffer, GFPARM_RMODE_REREAD);
}//if !skillHandle
if (skillHandle) {
global_skill = GfParmGetNum(skillHandle, (char *)SECT_SKILL, (char *)PRV_SKILL_LEVEL, (char *) NULL, 10.0f); global_skill = GfParmGetNum(skillHandle, (char *)SECT_SKILL, (char *)PRV_SKILL_LEVEL, (char *) NULL, 10.0f);
} }
else
{
global_skill = 0.0f;
}
global_skill = MAX(0.0f, MIN(10.0f, global_skill)); global_skill = MAX(0.0f, MIN(10.0f, global_skill));
//load the driver skill level, range 0 - 1
float driver_skill = 0.0f; float driver_skill = 0.0f;
snprintf(buffer, BUFSIZE, "drivers/%s/%d/skill.xml",robot_name,INDEX); snprintf(buffer, BUFSIZE, "drivers/%s/%d/skill.xml",robot_name,INDEX);
skillHandle = GfParmReadFile(buffer, GFPARM_RMODE_STD); skillHandle = GfParmReadFile(buffer, GFPARM_RMODE_STD);
@ -285,7 +282,6 @@ void Driver::initTrack(tTrack* t, void *carHandle, void **carParmHandle, tSituat
} }
skill = (global_skill + driver_skill * 2) * (1.0 + driver_skill); skill = (global_skill + driver_skill * 2) * (1.0 + driver_skill);
}
#endif #endif
// Load a custom setup if one is available. // Load a custom setup if one is available.

22
src/drivers/usr_sc/driver.cpp
View file

@ -257,23 +257,20 @@ void Driver::initTrack(tTrack* t, void *carHandle, void **carParmHandle, tSituat
global_skill = skill = decel_adjust_perc = driver_aggression = 0.0; global_skill = skill = decel_adjust_perc = driver_aggression = 0.0;
#ifdef CONTROL_SKILL #ifdef CONTROL_SKILL
// load the skill level // load the global skill level, range 0 - 10
//if (s->_raceType == RM_TYPE_PRACTICE) snprintf(buffer, BUFSIZE, "%sconfig/raceman/extra/skill.xml", GetLocalDir());
// global_skill = 0.0;
//else
{
snprintf(buffer, BUFSIZE, "config/raceman/extra/skill.xml");
void *skillHandle = GfParmReadFile(buffer, GFPARM_RMODE_REREAD); void *skillHandle = GfParmReadFile(buffer, GFPARM_RMODE_REREAD);
if (skillHandle) if(!skillHandle) {
{ snprintf(buffer, BUFSIZE, "%sconfig/raceman/extra/skill.xml", GetDataDir());
skillHandle = GfParmReadFile(buffer, GFPARM_RMODE_REREAD);
}//if !skillHandle
if (skillHandle) {
global_skill = GfParmGetNum(skillHandle, (char *)SECT_SKILL, (char *)PRV_SKILL_LEVEL, (char *) NULL, 10.0f); global_skill = GfParmGetNum(skillHandle, (char *)SECT_SKILL, (char *)PRV_SKILL_LEVEL, (char *) NULL, 10.0f);
} }
else
{
global_skill = 0.0f;
}
global_skill = MAX(0.0f, MIN(10.0f, global_skill)); global_skill = MAX(0.0f, MIN(10.0f, global_skill));
//load the driver skill level, range 0 - 1
float driver_skill = 0.0f; float driver_skill = 0.0f;
snprintf(buffer, BUFSIZE, "drivers/%s/%d/skill.xml",robot_name,INDEX); snprintf(buffer, BUFSIZE, "drivers/%s/%d/skill.xml",robot_name,INDEX);
skillHandle = GfParmReadFile(buffer, GFPARM_RMODE_STD); skillHandle = GfParmReadFile(buffer, GFPARM_RMODE_STD);
@ -285,7 +282,6 @@ void Driver::initTrack(tTrack* t, void *carHandle, void **carParmHandle, tSituat
} }
skill = (global_skill + driver_skill * 2) * (1.0 + driver_skill); skill = (global_skill + driver_skill * 2) * (1.0 + driver_skill);
}
#endif #endif
// Load a custom setup if one is available. // Load a custom setup if one is available.

22
src/drivers/usr_trb1/driver.cpp
View file

@ -257,23 +257,20 @@ void Driver::initTrack(tTrack* t, void *carHandle, void **carParmHandle, tSituat
global_skill = skill = decel_adjust_perc = driver_aggression = 0.0; global_skill = skill = decel_adjust_perc = driver_aggression = 0.0;
#ifdef CONTROL_SKILL #ifdef CONTROL_SKILL
// load the skill level // load the global skill level, range 0 - 10
//if (s->_raceType == RM_TYPE_PRACTICE) snprintf(buffer, BUFSIZE, "%sconfig/raceman/extra/skill.xml", GetLocalDir());
// global_skill = 0.0;
//else
{
snprintf(buffer, BUFSIZE, "config/raceman/extra/skill.xml");
void *skillHandle = GfParmReadFile(buffer, GFPARM_RMODE_REREAD); void *skillHandle = GfParmReadFile(buffer, GFPARM_RMODE_REREAD);
if (skillHandle) if(!skillHandle) {
{ snprintf(buffer, BUFSIZE, "%sconfig/raceman/extra/skill.xml", GetDataDir());
skillHandle = GfParmReadFile(buffer, GFPARM_RMODE_REREAD);
}//if !skillHandle
if (skillHandle) {
global_skill = GfParmGetNum(skillHandle, (char *)SECT_SKILL, (char *)PRV_SKILL_LEVEL, (char *) NULL, 10.0f); global_skill = GfParmGetNum(skillHandle, (char *)SECT_SKILL, (char *)PRV_SKILL_LEVEL, (char *) NULL, 10.0f);
} }
else
{
global_skill = 0.0f;
}
global_skill = MAX(0.0f, MIN(10.0f, global_skill)); global_skill = MAX(0.0f, MIN(10.0f, global_skill));
//load the driver skill level, range 0 - 1
float driver_skill = 0.0f; float driver_skill = 0.0f;
snprintf(buffer, BUFSIZE, "drivers/%s/%d/skill.xml",robot_name,INDEX); snprintf(buffer, BUFSIZE, "drivers/%s/%d/skill.xml",robot_name,INDEX);
skillHandle = GfParmReadFile(buffer, GFPARM_RMODE_STD); skillHandle = GfParmReadFile(buffer, GFPARM_RMODE_STD);
@ -285,7 +282,6 @@ void Driver::initTrack(tTrack* t, void *carHandle, void **carParmHandle, tSituat
} }
skill = (global_skill + driver_skill * 2) * (1.0 + driver_skill); skill = (global_skill + driver_skill * 2) * (1.0 + driver_skill);
}
#endif #endif
// Load a custom setup if one is available. // Load a custom setup if one is available.