From: <Kha...@us...> - 2009-03-22 10:13:01
|
Revision: 3275 http://planeshift.svn.sourceforge.net/planeshift/?rev=3275&view=rev Author: KhakiLord Date: 2009-03-22 10:12:50 +0000 (Sun, 22 Mar 2009) Log Message: ----------- Fixed crash on npcclient startup. Modified Paths: -------------- trunk/src/npcclient/npcclient.cpp Modified: trunk/src/npcclient/npcclient.cpp =================================================================== --- trunk/src/npcclient/npcclient.cpp 2009-03-22 06:24:59 UTC (rev 3274) +++ trunk/src/npcclient/npcclient.cpp 2009-03-22 10:12:50 UTC (rev 3275) @@ -92,6 +92,7 @@ eventmanager = NULL; running = true; database = NULL; + network = NULL; tick_counter = 0; current_long_range_perception_index = 0; } @@ -99,6 +100,7 @@ psNPCClient::~psNPCClient() { running = false; + delete network; delete serverconsole; delete database; } @@ -806,7 +808,9 @@ bool psNPCClient::IsReady() { - return network->IsReady(); + if(network) + return network->IsReady(); + else return false; } void psNPCClient::LoadCompleted() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Kha...@us...> - 2009-03-22 11:21:18
|
Revision: 3278 http://planeshift.svn.sourceforge.net/planeshift/?rev=3278&view=rev Author: KhakiLord Date: 2009-03-22 11:21:08 +0000 (Sun, 22 Mar 2009) Log Message: ----------- Fixed crash on npcclient startup. Modified Paths: -------------- trunk/src/npcclient/npcclient.cpp Modified: trunk/src/npcclient/npcclient.cpp =================================================================== --- trunk/src/npcclient/npcclient.cpp 2009-03-22 11:11:58 UTC (rev 3277) +++ trunk/src/npcclient/npcclient.cpp 2009-03-22 11:21:08 UTC (rev 3278) @@ -174,6 +174,7 @@ CPrintf(CON_ERROR, "Couldn't connect to %s on port %d.\n",(const char *)host,port); exit(1); } + network = new NetworkManager(msghandler,connection, engine); eventmanager = new EventManager; msghandler = eventmanager; @@ -236,8 +237,6 @@ cdsys = csQueryRegistry<iCollideSystem> (objreg); PFMaps = new psPFMaps(objreg); - - network = new NetworkManager(msghandler,connection, engine); // Starts the logon process network->Authenticate(host,port,user,pass); @@ -808,9 +807,7 @@ bool psNPCClient::IsReady() { - if(network) - return network->IsReady(); - else return false; + return network->IsReady(); } void psNPCClient::LoadCompleted() @@ -829,41 +826,38 @@ psNPCClientTick *tick = new psNPCClientTick(250,this); tick->QueueEvent(); - if (IsReady()) - { - tick_counter++; + tick_counter++; - ScopedTimer st_tick(250, "tick for tick_counter %d.",tick_counter); - - csTicks when = csGetTicks(); + ScopedTimer st_tick(250, "tick for tick_counter %d.",tick_counter); + + csTicks when = csGetTicks(); - // Advance tribes - for (size_t j=0; j<tribes.GetSize(); j++) - { - csTicks start = csGetTicks(); // When did we start + // Advance tribes + for (size_t j=0; j<tribes.GetSize(); j++) + { + csTicks start = csGetTicks(); // When did we start - tribes[j]->Advance(when,eventmanager); + tribes[j]->Advance(when,eventmanager); - csTicks timeTaken = csGetTicks() - start; // How long did it take + csTicks timeTaken = csGetTicks() - start; // How long did it take - if (timeTaken > 250) // This took way to long time - { - CPrintf(CON_WARNING,"Used %u time to process tick for tribe: %s(ID: %u)\n", - timeTaken,tribes[j]->GetName(),tribes[j]->GetID()); - ListTribes(tribes[j]->GetName()); - } - } + if (timeTaken > 250) // This took way to long time + { + CPrintf(CON_WARNING,"Used %u time to process tick for tribe: %s(ID: %u)\n", + timeTaken,tribes[j]->GetName(),tribes[j]->GetID()); + ListTribes(tribes[j]->GetName()); + } + } - // Percept proximity items every 4th tick - if (tick_counter % 4 == 0) - { - ScopedTimer st(200, "tick for percept proximity items"); + // Percept proximity items every 4th tick + if (tick_counter % 4 == 0) + { + ScopedTimer st(200, "tick for percept proximity items"); - PerceptProximityItems(); - } - // Send all queued npc commands to the server - network->SendAllCommands(true); // Final - } + PerceptProximityItems(); + } + // Send all queued npc commands to the server + network->SendAllCommands(true); // Final } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Kha...@us...> - 2009-03-22 11:22:55
|
Revision: 3279 http://planeshift.svn.sourceforge.net/planeshift/?rev=3279&view=rev Author: KhakiLord Date: 2009-03-22 11:22:50 +0000 (Sun, 22 Mar 2009) Log Message: ----------- Fixed crash on npcclient startup. Modified Paths: -------------- trunk/src/npcclient/npcclient.cpp Modified: trunk/src/npcclient/npcclient.cpp =================================================================== --- trunk/src/npcclient/npcclient.cpp 2009-03-22 11:21:08 UTC (rev 3278) +++ trunk/src/npcclient/npcclient.cpp 2009-03-22 11:22:50 UTC (rev 3279) @@ -174,7 +174,6 @@ CPrintf(CON_ERROR, "Couldn't connect to %s on port %d.\n",(const char *)host,port); exit(1); } - network = new NetworkManager(msghandler,connection, engine); eventmanager = new EventManager; msghandler = eventmanager; @@ -186,6 +185,7 @@ { return false; // Attach to incoming messages. } + network = new NetworkManager(msghandler,connection, engine); vfs = csQueryRegistry<iVFS> (object_reg); if (!vfs) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Kha...@us...> - 2009-03-25 12:39:41
|
Revision: 3310 http://planeshift.svn.sourceforge.net/planeshift/?rev=3310&view=rev Author: KhakiLord Date: 2009-03-25 12:39:38 +0000 (Wed, 25 Mar 2009) Log Message: ----------- Increased npcclient inqueue size to prevent packet drops on startup. Modified Paths: -------------- trunk/src/npcclient/npcclient.cpp Modified: trunk/src/npcclient/npcclient.cpp =================================================================== --- trunk/src/npcclient/npcclient.cpp 2009-03-25 10:57:21 UTC (rev 3309) +++ trunk/src/npcclient/npcclient.cpp 2009-03-25 12:39:38 UTC (rev 3310) @@ -178,7 +178,7 @@ // Start up network, need a large queue in order to handle all // the persist messages received from server at startup. - if (!msghandler->Initialize(connection, 10000)) + if (!msghandler->Initialize(connection, 20000)) { return false; // Attach to incoming messages. } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ken...@us...> - 2009-12-24 04:52:22
|
Revision: 5037 http://planeshift.svn.sourceforge.net/planeshift/?rev=5037&view=rev Author: kennygraunke Date: 2009-12-24 04:52:14 +0000 (Thu, 24 Dec 2009) Log Message: ----------- Use the correct table name in an error message. Modified Paths: -------------- trunk/src/npcclient/npcclient.cpp Modified: trunk/src/npcclient/npcclient.cpp =================================================================== --- trunk/src/npcclient/npcclient.cpp 2009-12-23 11:44:16 UTC (rev 5036) +++ trunk/src/npcclient/npcclient.cpp 2009-12-24 04:52:14 UTC (rev 5037) @@ -231,7 +231,7 @@ if (!LoadLocations()) { - CPrintf(CON_ERROR, "Couldn't load the sc_locations table\n"); + CPrintf(CON_ERROR, "Couldn't load the sc_location_type table\n"); exit(1); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2010-02-12 14:38:02
|
Revision: 5529 http://planeshift.svn.sourceforge.net/planeshift/?rev=5529&view=rev Author: weltall2 Date: 2010-02-12 14:37:48 +0000 (Fri, 12 Feb 2010) Log Message: ----------- moved an error in a more appropriate position Modified Paths: -------------- trunk/src/npcclient/npcclient.cpp Modified: trunk/src/npcclient/npcclient.cpp =================================================================== --- trunk/src/npcclient/npcclient.cpp 2010-02-12 14:23:22 UTC (rev 5528) +++ trunk/src/npcclient/npcclient.cpp 2010-02-12 14:37:48 UTC (rev 5529) @@ -496,10 +496,8 @@ { Result result(db->Select("SELECT * FROM sc_npc_definitions WHERE char_id=%u", char_id.Unbox())); if (!result.IsValid() || !result.Count()) - { - Error2("Error loading char_id %s.", ShowID(char_id)); return NULL; - } + NPC *newnpc = new NPC(this, network, world, engine, cdsys); //note we shouldn't load it manually but reuse what's loaded already but doing this till we know if the @@ -686,7 +684,10 @@ if(masterID.IsValid()) //Probably it's mastered. Try loading the master for this npc = ReadSingleNPC(masterID, true); //loads the master npc data and assign it to this if(!npc) //last chance if false good bye + { + Error2("Error loading char_id %s.", ShowID(char_id)); return; + } } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2010-02-12 14:53:46
|
Revision: 5530 http://planeshift.svn.sourceforge.net/planeshift/?rev=5530&view=rev Author: weltall2 Date: 2010-02-12 14:53:37 +0000 (Fri, 12 Feb 2010) Log Message: ----------- fixed error Modified Paths: -------------- trunk/src/npcclient/npcclient.cpp Modified: trunk/src/npcclient/npcclient.cpp =================================================================== --- trunk/src/npcclient/npcclient.cpp 2010-02-12 14:37:48 UTC (rev 5529) +++ trunk/src/npcclient/npcclient.cpp 2010-02-12 14:53:37 UTC (rev 5530) @@ -685,7 +685,7 @@ npc = ReadSingleNPC(masterID, true); //loads the master npc data and assign it to this if(!npc) //last chance if false good bye { - Error2("Error loading char_id %s.", ShowID(char_id)); + Error2("Error loading char_id %s.", ShowID(actor->GetPID())); return; } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Kha...@us...> - 2010-03-15 00:46:06
|
Revision: 5694 http://planeshift.svn.sourceforge.net/planeshift/?rev=5694&view=rev Author: Khakilord Date: 2010-03-15 00:45:58 +0000 (Mon, 15 Mar 2010) Log Message: ----------- Fixed bug where npcclient would lag out before it had time to log in. Modified Paths: -------------- trunk/src/npcclient/npcclient.cpp Modified: trunk/src/npcclient/npcclient.cpp =================================================================== --- trunk/src/npcclient/npcclient.cpp 2010-03-14 23:30:00 UTC (rev 5693) +++ trunk/src/npcclient/npcclient.cpp 2010-03-15 00:45:58 UTC (rev 5694) @@ -171,12 +171,6 @@ delete connection; return false; } - if (!connection->Connect(host,port)) - { - CPrintf(CON_ERROR, "Couldn't resolve hostname %s on port %d.\n",(const char *)host,port); - exit(1); - } - eventmanager = new EventManager; msghandler = eventmanager; psMessageCracker::msghandler = eventmanager; @@ -261,6 +255,13 @@ CPrintf(CON_DEBUG, "Connecting to Host: '%s' User: '%s' Password: '%s' Port %d...\n", (const char*) host, (const char*) user, (const char*) pass, port); + if (!connection->Connect(host,port)) + { + CPrintf(CON_ERROR, "Couldn't resolve hostname %s on port %d.\n",(const char *)host,port); + exit(1); + } + + // Starts the logon process network->Authenticate(host,port,user,pass); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2010-03-21 08:11:28
|
Revision: 5724 http://planeshift.svn.sourceforge.net/planeshift/?rev=5724&view=rev Author: weltall2 Date: 2010-03-21 08:11:21 +0000 (Sun, 21 Mar 2010) Log Message: ----------- take repositioning from the server (probably in future use a force statement) Modified Paths: -------------- trunk/src/npcclient/npcclient.cpp Modified: trunk/src/npcclient/npcclient.cpp =================================================================== --- trunk/src/npcclient/npcclient.cpp 2010-03-20 21:23:43 UTC (rev 5723) +++ trunk/src/npcclient/npcclient.cpp 2010-03-21 08:11:21 UTC (rev 5724) @@ -825,11 +825,11 @@ gemNPCObject *obj = FindEntityID(eid); if (obj) { - if (obj->GetNPC()) + /*if (obj->GetNPC()) { // Skipp updating NPC return; - } + }*/ //WTF? obj->SetPosition(pos,sector,&instance); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ma...@us...> - 2010-04-27 20:26:51
|
Revision: 5837 http://planeshift.svn.sourceforge.net/planeshift/?rev=5837&view=rev Author: magodra Date: 2010-04-27 20:26:45 +0000 (Tue, 27 Apr 2010) Log Message: ----------- - Now forward the sameSector flag from npcclient to each NPC. Modified Paths: -------------- trunk/src/npcclient/npcclient.cpp Modified: trunk/src/npcclient/npcclient.cpp =================================================================== --- trunk/src/npcclient/npcclient.cpp 2010-04-27 20:17:50 UTC (rev 5836) +++ trunk/src/npcclient/npcclient.cpp 2010-04-27 20:26:45 UTC (rev 5837) @@ -823,7 +823,7 @@ if (npcs[i]==NULL) // one of our npcs is not active right now continue; - npcs[i]->TriggerEvent(pcpt, maxRange, basePos, baseSector); + npcs[i]->TriggerEvent(pcpt, maxRange, basePos, baseSector, sameSector); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ma...@us...> - 2010-05-13 08:48:48
|
Revision: 5903 http://planeshift.svn.sourceforge.net/planeshift/?rev=5903&view=rev Author: magodra Date: 2010-05-13 08:48:42 +0000 (Thu, 13 May 2010) Log Message: ----------- - Fixed npcclient console command "npclist summary" to print the summary. Modified Paths: -------------- trunk/src/npcclient/npcclient.cpp Modified: trunk/src/npcclient/npcclient.cpp =================================================================== --- trunk/src/npcclient/npcclient.cpp 2010-05-13 08:32:41 UTC (rev 5902) +++ trunk/src/npcclient/npcclient.cpp 2010-05-13 08:48:42 UTC (rev 5903) @@ -1124,9 +1124,7 @@ void psNPCClient::ListAllNPCs(const char * pattern) { - CPrintf(CON_CMDOUTPUT, "%-7s %-5s %-30s %-6s %-6s %-20s %-20s %-4s %-3s %-8s\n", - "NPC ID", "EID", "Name", "Entity", "Status", "Brain","Behaviour","Step","Dbg","Disabled"); - if(strcmp(pattern, "summary")) + if(strcmp(pattern, "summary")==0) { int disabled = 0; int alive = 0; @@ -1148,7 +1146,12 @@ } CPrintf(CON_CMDOUTPUT, "NPC summary for %d NPCs: %d disabled, %d alive, %d with entities, %d with current behaviour, %d with brain\n", npcs.GetSize(), disabled, alive, entity, behaviour, brain); + + return; // No point continue since no npc should be named summary :) } + + CPrintf(CON_CMDOUTPUT, "%-7s %-5s %-30s %-6s %-6s %-20s %-20s %-4s %-3s %-8s\n", + "NPC ID", "EID", "Name", "Entity", "Status", "Brain","Behaviour","Step","Dbg","Disabled"); for (size_t i = 0; i < npcs.GetSize(); i++) { if (!pattern || strstr(npcs[i]->GetName(),pattern)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2010-10-13 08:18:13
|
Revision: 6283 http://planeshift.svn.sourceforge.net/planeshift/?rev=6283&view=rev Author: weltall2 Date: 2010-10-13 08:18:07 +0000 (Wed, 13 Oct 2010) Log Message: ----------- made the npc not found error show only in the case all attempts to find the npc brain relation fails Modified Paths: -------------- trunk/src/npcclient/npcclient.cpp Modified: trunk/src/npcclient/npcclient.cpp =================================================================== --- trunk/src/npcclient/npcclient.cpp 2010-10-13 08:16:38 UTC (rev 6282) +++ trunk/src/npcclient/npcclient.cpp 2010-10-13 08:18:07 UTC (rev 6283) @@ -755,9 +755,6 @@ npc = FindNPCByPID( actor->GetPID() ); if ( !npc ) { - CPrintf(CON_NOTIFY,"NPC %s(%s) was not found in scripted npcs for this npcclient.\n", - actor->GetName(), ShowID(actor->GetPID())); - npc = ReadSingleNPC(actor->GetPID()); //try reloading the tables if we didn't find it if(!npc) //still not found. we do a last check { @@ -765,7 +762,8 @@ npc = ReadMasteredNPC(actor->GetPID(), masterID); //loads the master npc data and assign it to this if(!npc) //last chance if false good bye { - Error2("Error loading char_id %s.", ShowID(actor->GetPID())); + Error3("NPC %s(%s) was not found in scripted npcs for this npcclient.\n", + actor->GetName(), ShowID(actor->GetPID())); return; } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rly...@us...> - 2010-12-30 19:48:20
|
Revision: 6646 http://planeshift.svn.sourceforge.net/planeshift/?rev=6646&view=rev Author: rlydontknow Date: 2010-12-30 19:48:14 +0000 (Thu, 30 Dec 2010) Log Message: ----------- added missing newlines Modified Paths: -------------- trunk/src/npcclient/npcclient.cpp Modified: trunk/src/npcclient/npcclient.cpp =================================================================== --- trunk/src/npcclient/npcclient.cpp 2010-12-30 18:35:09 UTC (rev 6645) +++ trunk/src/npcclient/npcclient.cpp 2010-12-30 19:48:14 UTC (rev 6646) @@ -253,7 +253,7 @@ PFMaps = new psPFMaps(objreg); - CPrintf(CON_CMDOUTPUT,"Filling loader cache"); + CPrintf(CON_CMDOUTPUT,"Filling loader cache\n"); csRef<iBgLoader> loader = csQueryRegistry<iBgLoader>(object_reg); csRef<iThreadManager> threadManager = csQueryRegistry<iThreadManager>(object_reg); @@ -286,7 +286,7 @@ // clear up data that is only required parse time loader->ClearTemporaryData(); - CPrintf(CON_CMDOUTPUT,"Loader cache filled"); + CPrintf(CON_CMDOUTPUT,"Loader cache filled\n"); CPrintf(CON_DEBUG, "Connecting to Host: '%s' User: '%s' Password: '%s' Port %d...\n", (const char*) host, (const char*) user, (const char*) pass, port); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2011-05-24 21:23:43
|
Revision: 7320 http://planeshift.svn.sourceforge.net/planeshift/?rev=7320&view=rev Author: weltall2 Date: 2011-05-24 21:08:16 +0000 (Tue, 24 May 2011) Log Message: ----------- order by id Modified Paths: -------------- trunk/src/npcclient/npcclient.cpp Modified: trunk/src/npcclient/npcclient.cpp =================================================================== --- trunk/src/npcclient/npcclient.cpp 2011-05-24 20:45:16 UTC (rev 7319) +++ trunk/src/npcclient/npcclient.cpp 2011-05-24 21:08:16 UTC (rev 7320) @@ -439,7 +439,7 @@ bool psNPCClient::LoadNPCTypes() { - Result rs(db->Select("SELECT * from sc_npctypes")); + Result rs(db->Select("SELECT * from sc_npctypes ORDER BY id")); if (!rs.IsValid() || !(rs.Count() >= 1)) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2011-05-24 22:24:14
|
Revision: 7321 http://planeshift.svn.sourceforge.net/planeshift/?rev=7321&view=rev Author: weltall2 Date: 2011-05-24 21:32:53 +0000 (Tue, 24 May 2011) Log Message: ----------- Now the npc which failed to load iterate again to see if they can be loaded after others Modified Paths: -------------- trunk/src/npcclient/npcclient.cpp Modified: trunk/src/npcclient/npcclient.cpp =================================================================== --- trunk/src/npcclient/npcclient.cpp 2011-05-24 21:08:16 UTC (rev 7320) +++ trunk/src/npcclient/npcclient.cpp 2011-05-24 21:32:53 UTC (rev 7321) @@ -439,6 +439,7 @@ bool psNPCClient::LoadNPCTypes() { + csArray<unsigned long> postponedNPCTypeID; Result rs(db->Select("SELECT * from sc_npctypes ORDER BY id")); if (!rs.IsValid() || !(rs.Count() >= 1)) @@ -465,10 +466,36 @@ else { delete npctype; - return false; + //we keep these for a more deep inspection + postponedNPCTypeID.Push(i); } } - return true; + + size_t lastSize = 0; + //try reloading all the failures till the size of failed ones changes and it's > 0 + //as soon as one iteration didn't load anything we will exit with failure + while(postponedNPCTypeID.GetSize() != 0 && lastSize != postponedNPCTypeID.GetSize()) + { + lastSize = postponedNPCTypeID.GetSize(); //keep the starting amount of items + for(size_t y = 0; y < postponedNPCTypeID.GetSize(); y++) + { + //maybe we should reorder them by dependency? the issue with that is that + //we would need to know more about the items inner working. + NPCType *npctype = new NPCType(this, eventmanager); + if(npctype->Load(rs[postponedNPCTypeID.Get(y)])) + { + npctypes.Put(npctype->GetName(), npctype); + postponedNPCTypeID.DeleteIndex(y); + y--; + } + else + { + delete npctype; + } + } + } + //success only if the array is empty at this point, else failure. + return postponedNPCTypeID.IsEmpty(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ma...@us...> - 2011-12-20 13:13:13
|
Revision: 7861 http://planeshift.svn.sourceforge.net/planeshift/?rev=7861&view=rev Author: magodra Date: 2011-12-20 13:13:02 +0000 (Tue, 20 Dec 2011) Log Message: ----------- - Fixed core dump when debuging and no path found. Modified Paths: -------------- trunk/src/npcclient/npcclient.cpp Modified: trunk/src/npcclient/npcclient.cpp =================================================================== --- trunk/src/npcclient/npcclient.cpp 2011-12-20 13:06:30 UTC (rev 7860) +++ trunk/src/npcclient/npcclient.cpp 2011-12-20 13:13:02 UTC (rev 7861) @@ -1852,27 +1852,36 @@ { // Seams like the getdebugmeshes destroy the path, so get a separate path for debug... iCelHPath* path = GetNavStruct()->ShortestPath(from,fromSector,goal,goalSector); - csList<csSimpleRenderMesh>* list = path->GetDebugMeshes(); - csList<csSimpleRenderMesh>::Iterator countIter(*list); - uint16_t count = 0; - while (countIter.HasNext()) + if (path) { - count++; - countIter.Next(); + csList<csSimpleRenderMesh>* list = path->GetDebugMeshes(); + csList<csSimpleRenderMesh>::Iterator countIter(*list); + uint16_t count = 0; + while (countIter.HasNext()) + { + count++; + countIter.Next(); + } + + csList<csSimpleRenderMesh>::Iterator iter(*list); + uint16_t index = 0; + while (iter.HasNext()) + { + csSimpleRenderMesh& simpleRenderMesh = iter.Next(); + psSimpleRenderMeshMessage msg(0, connection->GetAccessPointers(), "NPC Path", index, count, fromSector, simpleRenderMesh); + msghandler->SendMessage(msg.msg); + index++; + } } - csList<csSimpleRenderMesh>::Iterator iter(*list); - uint16_t index = 0; - while (iter.HasNext()) - { - csSimpleRenderMesh& simpleRenderMesh = iter.Next(); - psSimpleRenderMeshMessage msg(0, connection->GetAccessPointers(), "NPC Path", index, count, fromSector, simpleRenderMesh); - msghandler->SendMessage(msg.msg); - index++; - } } iCelHPath* path = GetNavStruct()->ShortestPath(from,fromSector,goal,goalSector); + if (!path) + { + npc->Printf(5,"Failed to find path"); + } + return path; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ma...@us...> - 2011-12-22 16:39:21
|
Revision: 7877 http://planeshift.svn.sourceforge.net/planeshift/?rev=7877&view=rev Author: magodra Date: 2011-12-22 16:39:11 +0000 (Thu, 22 Dec 2011) Log Message: ----------- - Just way you allways should have {}. Modified Paths: -------------- trunk/src/npcclient/npcclient.cpp Modified: trunk/src/npcclient/npcclient.cpp =================================================================== --- trunk/src/npcclient/npcclient.cpp 2011-12-21 23:45:09 UTC (rev 7876) +++ trunk/src/npcclient/npcclient.cpp 2011-12-22 16:39:11 UTC (rev 7877) @@ -1640,8 +1640,10 @@ for(int i=0;i<tribes.GetSize();i++) { if(tribeid == tribes[i]->GetID()) + { tribes[i]->DumpRecipesToConsole(); return; + } } CPrintf(CON_CMDOUTPUT, "No Tribe with id '%d' found.\n", tribeID); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ma...@us...> - 2012-04-04 10:20:00
|
Revision: 8151 http://planeshift.svn.sourceforge.net/planeshift/?rev=8151&view=rev Author: magodra Date: 2012-04-04 10:19:49 +0000 (Wed, 04 Apr 2012) Log Message: ----------- - Fixed command list tribe to include radius and sector. Modified Paths: -------------- trunk/src/npcclient/npcclient.cpp Modified: trunk/src/npcclient/npcclient.cpp =================================================================== --- trunk/src/npcclient/npcclient.cpp 2012-04-03 21:12:54 UTC (rev 8150) +++ trunk/src/npcclient/npcclient.cpp 2012-04-04 10:19:49 UTC (rev 8151) @@ -1560,17 +1560,17 @@ // Write basic details about tribes if(strlen(pattern) == 0) { - CPrintf(CON_CMDOUTPUT, "\n%9s %-30s %-7s %-11s %5s\n", + CPrintf(CON_CMDOUTPUT, "\n%9s %-30s %-7s %-35s %5s\n", "Tribe id", "Name", "MCount", "Location","Radius"); for(size_t i=0;i<tribes.GetSize();i++) { tribes[i]->GetHome(pos,radius,sector); - CPrintf(CON_CMDOUTPUT, "%9d %-30s %-7d %15s %5f\n", + CPrintf(CON_CMDOUTPUT, "%9d %-30s %-7d %35s %5f\n", tribes[i]->GetID(), tribes[i]->GetName(), tribes[i]->GetMemberCount(), - toString(pos,sector).GetDatSafe(), + toString(pos,sector).GetDataSafe(), radius); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2012-09-21 14:22:59
|
Revision: 8437 http://planeshift.svn.sourceforge.net/planeshift/?rev=8437&view=rev Author: weltall2 Date: 2012-09-21 14:22:48 +0000 (Fri, 21 Sep 2012) Log Message: ----------- fixed uninit variable Modified Paths: -------------- trunk/src/npcclient/npcclient.cpp Modified: trunk/src/npcclient/npcclient.cpp =================================================================== --- trunk/src/npcclient/npcclient.cpp 2012-09-21 14:21:08 UTC (rev 8436) +++ trunk/src/npcclient/npcclient.cpp 2012-09-21 14:22:48 UTC (rev 8437) @@ -103,6 +103,7 @@ tick_counter = 0; current_long_range_perception_index = 0; current_long_range_perception_loc_index = 0; + current_tribe_home_perception_index = 0; } psNPCClient::~psNPCClient() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lpa...@us...> - 2012-10-03 12:42:29
|
Revision: 8462 http://planeshift.svn.sourceforge.net/planeshift/?rev=8462&view=rev Author: lpancallo Date: 2012-10-03 12:42:20 +0000 (Wed, 03 Oct 2012) Log Message: ----------- Added some more debug info to npcclient navmesh loading Modified Paths: -------------- trunk/src/npcclient/npcclient.cpp Modified: trunk/src/npcclient/npcclient.cpp =================================================================== --- trunk/src/npcclient/npcclient.cpp 2012-10-03 12:41:18 UTC (rev 8461) +++ trunk/src/npcclient/npcclient.cpp 2012-10-03 12:42:20 UTC (rev 8462) @@ -892,14 +892,20 @@ csRef<iCelHNavStructBuilder> builder = csQueryRegistry<iCelHNavStructBuilder>(objreg); if (!builder.IsValid()) { - Error1("Could find builder"); + Error1("Couldn't find builder"); return false; } csString navmesh = configmanager->GetStr("PlaneShift.NPCClient.NavMesh","/planeshift/navmesh"); navStruct = builder->LoadHNavStruct(vfs, navmesh); + if (!navStruct.IsValid()) + { + Error1("Navigation mesh is not valid, check /planeshift/navmesh"); + return false; + } + pathNetwork = new psPathNetwork(); - return pathNetwork->Load(engine, db, world) && navStruct.IsValid(); + return pathNetwork->Load(engine, db, world); } bool psNPCClient::LoadLocations() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lpa...@us...> - 2012-12-11 11:22:01
|
Revision: 8503 http://planeshift.svn.sourceforge.net/planeshift/?rev=8503&view=rev Author: lpancallo Date: 2012-12-11 11:21:53 +0000 (Tue, 11 Dec 2012) Log Message: ----------- Skipped Proximity calculations for disabled NPCs. Modified Paths: -------------- trunk/src/npcclient/npcclient.cpp Modified: trunk/src/npcclient/npcclient.cpp =================================================================== --- trunk/src/npcclient/npcclient.cpp 2012-12-11 01:12:04 UTC (rev 8502) +++ trunk/src/npcclient/npcclient.cpp 2012-12-11 11:21:53 UTC (rev 8503) @@ -1158,6 +1158,10 @@ { for(size_t i=0; i<npcs.GetSize(); i++) { + // skip disabled NPCs + if (npcs[i]->IsDisabled()) + continue; + if(npcs[i]==NULL) // one of our npcs is not active right now continue; @@ -1826,6 +1830,10 @@ for(size_t i=0; i<npcs.GetSize(); i++) { + // skip disabled NPCs + if (npcs[i]->IsDisabled()) + continue; + if(npcs[i]==NULL || npcs[i]->GetActor() == NULL) // Can't do anyting unless we have both continue; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2013-01-17 10:22:45
|
Revision: 8547 http://planeshift.svn.sourceforge.net/planeshift/?rev=8547&view=rev Author: weltall2 Date: 2013-01-17 10:22:37 +0000 (Thu, 17 Jan 2013) Log Message: ----------- The scripting engine must be initialized before using it Modified Paths: -------------- trunk/src/npcclient/npcclient.cpp Modified: trunk/src/npcclient/npcclient.cpp =================================================================== --- trunk/src/npcclient/npcclient.cpp 2013-01-13 19:20:07 UTC (rev 8546) +++ trunk/src/npcclient/npcclient.cpp 2013-01-17 10:22:37 UTC (rev 8547) @@ -200,6 +200,8 @@ delete connection; return false; } + + mathScriptEngine = new MathScriptEngine(db,"math_script"); eventmanager = new EventManager; recipemanager = new RecipeManager(this, eventmanager); msghandler = eventmanager; @@ -257,8 +259,6 @@ exit(1); } - mathScriptEngine = new MathScriptEngine(db,"math_script"); - cdsys = csQueryRegistry<iCollideSystem> (objreg); // PFMaps = new psPFMaps(objreg); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ral...@us...> - 2015-03-08 01:56:19
|
Revision: 9726 http://sourceforge.net/p/planeshift/code/9726 Author: ralphcampbell Date: 2015-03-08 01:56:18 +0000 (Sun, 08 Mar 2015) Log Message: ----------- Print the name of the navmesh file that couldn't be loaded. Modified Paths: -------------- trunk/src/npcclient/npcclient.cpp Modified: trunk/src/npcclient/npcclient.cpp =================================================================== --- trunk/src/npcclient/npcclient.cpp 2015-03-07 20:36:49 UTC (rev 9725) +++ trunk/src/npcclient/npcclient.cpp 2015-03-08 01:56:18 UTC (rev 9726) @@ -926,7 +926,7 @@ if(!navStruct.IsValid()) { - Error1("Navigation mesh is not valid, check /planeshift/navmesh"); + Error2("Navigation mesh is not valid, check '%s'", navmesh.GetData()); return false; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |