From 3e2efca5b7257803ea53e7aeeeef855efef41630 Mon Sep 17 00:00:00 2001 From: driAn Date: Thu, 7 Dec 2006 22:03:14 +0000 Subject: [PATCH] no message git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@770 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- bot/waypoints/ac_complex.wpt | Bin 60158 -> 56546 bytes bot/waypoints/ac_desert.wpt | Bin 57254 -> 57370 bytes bot/waypoints/ac_desert2.wpt | Bin 76112 -> 76344 bytes bot/waypoints/ac_mines.wpt | Bin 76132 -> 72380 bytes source/src/bot/bot_util.h | 7 +++++-- source/src/bot/bot_waypoint.cpp | 8 +++++++- source/src/bot/botmanager.cpp | 2 +- source/src/entities.cpp | 3 ++- source/src/protos.h | 3 +-- 9 files changed, 16 insertions(+), 7 deletions(-) diff --git a/bot/waypoints/ac_complex.wpt b/bot/waypoints/ac_complex.wpt index 528d8bdcbb2b2a6690e054c2999053756bdb4501..957ffbd7f659e60d0fb33b803eb41abca73e5ed2 100644 GIT binary patch delta 1387 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 diff --git a/bot/waypoints/ac_desert.wpt b/bot/waypoints/ac_desert.wpt index 469e1e81a25ab3655eaa3529d4d3171bd7ec1a5c..4bb7d5e5b5756d257790214418e8800758e1f68b 100644 GIT binary patch delta 196 zcmZ3spLx~+X3^x*q}2GN{1S!(3=B*R5MaDf^t-ku0|U1+1A`I}8ytj)|Nqaxzy=j- zaDa(%On$gtdh#w4uE`5@gf_eA*e&B^2g>mQ6{<~EJTE+X-X$xbfB=xMu=(<(uN;i* plTY3bo$Pm;jTK~i!)Dn#oy;bTKt0G7g4F}185}?|$krlM0RYSbEdBrh delta 59 zcmbPrfO*+|X3^x*q}2GN{1S#UXU;G&K!D*!(eK)uO?1kZF|tiweJOM^&*cvsK<3}u Lp_}9GbT9(|iBuN> diff --git a/bot/waypoints/ac_desert2.wpt b/bot/waypoints/ac_desert2.wpt index b39a320bc18e8c8be523b5b97b11ad42cba02ae9..e103a14ff62c47415c4f67a63cd7460d9faab3a0 100644 GIT binary patch delta 656 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 KZTGVI@_zvW77UO8 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