From: Martin F. <mar...@us...> - 2011-01-14 21:41:56
|
Update of /cvsroot/arianne/stendhal/src/games/stendhal/server/maps/quests In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv23302/src/games/stendhal/server/maps/quests Modified Files: Maze.java Log Message: add a test for the maze dialog to solve tracker entry 3118477 Index: Maze.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/maps/quests/Maze.java,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** Maze.java 30 Dec 2010 15:53:00 -0000 1.15 --- Maze.java 14 Jan 2011 21:41:47 -0000 1.16 *************** *** 17,20 **** --- 17,21 ---- import games.stendhal.server.core.engine.SingletonRepository; import games.stendhal.server.core.engine.StendhalRPZone; + import games.stendhal.server.entity.mapstuff.portal.Portal; import games.stendhal.server.entity.npc.ChatAction; import games.stendhal.server.entity.npc.ConversationPhrases; *************** *** 39,42 **** --- 40,44 ---- private static final int COOLING_TIME = MathHelper.MINUTES_IN_ONE_HOUR * 24; private MazeSign sign; + MazeGenerator maze; @Override *************** *** 156,160 **** private class SendToMazeChatAction implements ChatAction { - public SendToMazeChatAction() { // empty constructor to prevent warning --- 158,161 ---- *************** *** 162,166 **** public void fire(final Player player, final Sentence sentence, final EventRaiser raiser) { ! MazeGenerator maze = new MazeGenerator(player.getName() + "_maze", 128, 128); maze.setReturnLocation(player.getZone().getName(), player.getX(), player.getY()); maze.setSign(getSign()); --- 163,167 ---- public void fire(final Player player, final Sentence sentence, final EventRaiser raiser) { ! maze = new MazeGenerator(player.getName() + "_maze", 128, 128); maze.setReturnLocation(player.getZone().getName(), player.getX(), player.getY()); maze.setSign(getSign()); *************** *** 173,175 **** --- 174,183 ---- } } + + /** + * Access the portal from MazeTest. + */ + protected Portal getPortal() { + return maze.getPortal(); + } } |