From: Miguel A. B. L. <ari...@us...> - 2005-12-13 19:19:59
|
Update of /cvsroot/arianne/stendhal/src/games/stendhal/server In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32058/src/games/stendhal/server Modified Files: Path.java StendhalRPAction.java StendhalRPRuleProcessor.java Log Message: Added key bindings. Added Move with mouse. Index: Path.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/Path.java,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** Path.java 2 Dec 2005 19:54:22 -0000 1.19 --- Path.java 13 Dec 2005 19:19:46 -0000 1.20 *************** *** 119,122 **** --- 119,127 ---- } + public static List<Node> searchPath(Entity entity,int ex, int ey) + { + return searchPath(entity, entity.getx(),entity.gety(), entity.getArea(ex,ey), -1.0); + } + /** * Finds a path for the Entity <code>entity</code>. Index: StendhalRPAction.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/StendhalRPAction.java,v retrieving revision 1.72 retrieving revision 1.73 diff -C2 -d -r1.72 -r1.73 *** StendhalRPAction.java 30 Nov 2005 16:52:27 -0000 1.72 --- StendhalRPAction.java 13 Dec 2005 19:19:46 -0000 1.73 *************** *** 411,414 **** --- 411,416 ---- { Log4J.startMethod(logger, "changeZone"); + + player.clearPath(); String source=player.getID().getZoneID(); Index: StendhalRPRuleProcessor.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/StendhalRPRuleProcessor.java,v retrieving revision 1.122 retrieving revision 1.123 diff -C2 -d -r1.122 -r1.123 *** StendhalRPRuleProcessor.java 26 Nov 2005 11:48:45 -0000 1.122 --- StendhalRPRuleProcessor.java 13 Dec 2005 19:19:46 -0000 1.123 *************** *** 256,260 **** logger.debug("lists: CO:"+corpsesToRemove.size()+",NPC:"+npcsToAdd.size()+",NPC:"+npcsToRemove.size()+",P:"+playersObjectRmText.size()+",R:"+respawnPoints.size()); - try { --- 256,259 ---- *************** *** 311,314 **** --- 310,324 ---- } + if(object.hasPath()) + { + if(Path.followPath(object,1)) + { + object.stop(); + object.clearPath(); + } + + world.modify(object); + } + if(!object.stopped()) { |