From b2e9cc1cd1ee364910e0a52acf7c96f4c7444138 Mon Sep 17 00:00:00 2001 From: torcs-ng Date: Sun, 26 Jan 2020 04:51:22 +0000 Subject: [PATCH] - Update Shadow's driver git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@6816 30fe4595-0a0c-4342-8851-515496e4dcbd Former-commit-id: 485c48bad0103f746105c3c2f56f9129696ba8b6 Former-commit-id: 4f595f0e2771e9d429fd71f8cdc44e49e7f25965 --- src/drivers/shadow/src/Stuck.cpp | 2 +- src/drivers/shadow/src/Stuck.h | 20 ++++++++++---------- src/drivers/shadow/src/TeamInfo.cpp | 2 +- src/drivers/shadow/src/TeamInfo.h | 6 +++--- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/drivers/shadow/src/Stuck.cpp b/src/drivers/shadow/src/Stuck.cpp index 4ca94bce..fdff6b45 100644 --- a/src/drivers/shadow/src/Stuck.cpp +++ b/src/drivers/shadow/src/Stuck.cpp @@ -1127,7 +1127,7 @@ bool Stuck::solveR( const tCarElt* me ) void Stuck::dumpGrid() const { - set pts; + set pts; for( int i = 0; i < _plan.size(); i++ ) { const GridPoint& pt = _plan[i]; diff --git a/src/drivers/shadow/src/Stuck.h b/src/drivers/shadow/src/Stuck.h index ec783c93..9b3844ed 100644 --- a/src/drivers/shadow/src/Stuck.h +++ b/src/drivers/shadow/src/Stuck.h @@ -49,9 +49,9 @@ private: struct GridPoint { - uint pt; // current position. - float est_time; // estimated time to finish. - float time; // current time. + unsigned int pt; // current position. + float est_time; // estimated time to finish. + float time; // current time. GridPoint() : pt(0), est_time(0), time(0) @@ -137,13 +137,13 @@ private: struct Cell { enum { EDGE_MASK = 0x80000000 }; - uint occupied_mask; - float est_time_to_car; - float est_time_to_dest; - int dist_from_walls; - float times[N_ANGLES * 2]; // indexed by fwang - int from[N_ANGLES * 2]; // indexed by fwang - char solution[N_ANGLES * 2]; // indexed by fwang + unsigned int occupied_mask; + float est_time_to_car; + float est_time_to_dest; + int dist_from_walls; + float times[N_ANGLES * 2]; // indexed by fwang + int from[N_ANGLES * 2]; // indexed by fwang + char solution[N_ANGLES * 2]; // indexed by fwang Cell() { clear(); } diff --git a/src/drivers/shadow/src/TeamInfo.cpp b/src/drivers/shadow/src/TeamInfo.cpp index 61777caa..04322781 100644 --- a/src/drivers/shadow/src/TeamInfo.cpp +++ b/src/drivers/shadow/src/TeamInfo.cpp @@ -39,7 +39,7 @@ TeamInfo::~TeamInfo() void TeamInfo::Empty() { - LogMOUSE.debug( "TeamInfo::Empty()\n" ); + LogSHADOW.debug( "TeamInfo::Empty()\n" ); for( int i = 0; i < (int)m_items.size(); i++ ) delete m_items[i]; diff --git a/src/drivers/shadow/src/TeamInfo.h b/src/drivers/shadow/src/TeamInfo.h index c595955e..525ad144 100644 --- a/src/drivers/shadow/src/TeamInfo.h +++ b/src/drivers/shadow/src/TeamInfo.h @@ -26,9 +26,9 @@ #include -// The "MOUSE" logger instance. -extern GfLogger* PLogMOUSE; -#define LogMOUSE (*PLogMOUSE) +// The "SHADOW" logger instance. +extern GfLogger* PLogSHADOW; +#define LogSHADOW (*PLogSHADOW) class TeamInfo {