diff --git a/bot/waypoints/ac_complex.wpt b/bot/waypoints/ac_complex.wpt index 528d8bdc..957ffbd7 100644 Binary files a/bot/waypoints/ac_complex.wpt and b/bot/waypoints/ac_complex.wpt differ diff --git a/bot/waypoints/ac_desert.wpt b/bot/waypoints/ac_desert.wpt index 469e1e81..4bb7d5e5 100644 Binary files a/bot/waypoints/ac_desert.wpt and b/bot/waypoints/ac_desert.wpt differ diff --git a/bot/waypoints/ac_desert2.wpt b/bot/waypoints/ac_desert2.wpt index b39a320b..e103a14f 100644 Binary files a/bot/waypoints/ac_desert2.wpt and b/bot/waypoints/ac_desert2.wpt differ diff --git a/bot/waypoints/ac_mines.wpt b/bot/waypoints/ac_mines.wpt index d49ccdbe..14a9165c 100644 Binary files a/bot/waypoints/ac_mines.wpt and b/bot/waypoints/ac_mines.wpt differ diff --git a/source/src/bot/bot_util.h b/source/src/bot/bot_util.h index 1b9d4dd5..fe1a41a8 100644 --- a/source/src/bot/bot_util.h +++ b/source/src/bot/bot_util.h @@ -254,7 +254,9 @@ public: return Entry; } - node_s *GetFirst(void) { return pNodeList; }; + node_s *GetFirst(void) { + return pNodeList; + }; node_s *GetLast(void) { return pLastNode; }; void EditEntry(C OrigEntry, C NewVal) @@ -287,7 +289,8 @@ public: DeleteAllNodes(); }; -private: + //fixmebot +//private: node_s *pNodeList; node_s *pLastNode; int iNodeCount; diff --git a/source/src/bot/bot_waypoint.cpp b/source/src/bot/bot_waypoint.cpp index 9e93fd4a..33b4a73d 100644 --- a/source/src/bot/bot_waypoint.cpp +++ b/source/src/bot/bot_waypoint.cpp @@ -79,6 +79,9 @@ void CWaypointClass::Clear() } } +//fixme +TLinkedList::node_s *testx; + // returns true if waypoints succesfull loaded bool CWaypointClass::LoadWaypoints() { @@ -197,7 +200,7 @@ bool CWaypointClass::LoadWaypoints() (triggernr < BotManager.m_sCurrentTriggerNr)) BotManager.m_sCurrentTriggerNr = triggernr; } - + for (i=0; i < header.iWPCount; i++) { // read the number of paths from this node... @@ -272,6 +275,9 @@ bool CWaypointClass::LoadWaypoints() ReCalcCosts(); conoutf("Waypoints for map %s loaded", (m_szMapName)); + + testx = m_Waypoints[1][1].pNodeList; + return true; } diff --git a/source/src/bot/botmanager.cpp b/source/src/bot/botmanager.cpp index 89d50f0a..badccef5 100644 --- a/source/src/bot/botmanager.cpp +++ b/source/src/bot/botmanager.cpp @@ -46,7 +46,7 @@ void CBotManager::Init() CreateSkillData(); LoadBotNamesFile(); LoadBotTeamsFile(); - WaypointClass.Init(); + //WaypointClass.Init(); lsrand(time(NULL)); } diff --git a/source/src/entities.cpp b/source/src/entities.cpp index 6876ae45..6df5011b 100644 --- a/source/src/entities.cpp +++ b/source/src/entities.cpp @@ -106,7 +106,8 @@ void equipitem(playerent *d, int i, int &v, int t) ents[i].spawned = false; v += is.add; if(v>is.max) v = is.max; - playsound(is.sound, &d->o); + if(d==player1) playsoundc(is.sound); + else playsound(is.sound, &d->o); }; void realpickup(int n, playerent *d) diff --git a/source/src/protos.h b/source/src/protos.h index 2003139a..b87463c5 100644 --- a/source/src/protos.h +++ b/source/src/protos.h @@ -304,5 +304,4 @@ extern void equip(playerent *d); extern bool intersect(entity *e, vec &from, vec &to, vec *end=NULL); // rndmap -extern void perlinarea(block &b, int scale, int seed, int psize); - +extern void perlinarea(block &b, int scale, int seed, int psize); \ No newline at end of file