no message

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@770 e016b1c5-ed68-44aa-a2f7-31cac88cffde

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;

source/src/bot/bot_waypoint.cpp

@@ -79,6 +79,9 @@ void CWaypointClass::Clear()
      }     
 }
 
+//fixme
+TLinkedList<node_s *>::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;
 }
 

source/src/bot/botmanager.cpp

@@ -46,7 +46,7 @@ void CBotManager::Init()
      CreateSkillData();
      LoadBotNamesFile();
      LoadBotTeamsFile();
-     WaypointClass.Init();
+     //WaypointClass.Init();
      lsrand(time(NULL));
 }
      

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)

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);
-