From: MadMetzger <mad...@us...> - 2013-04-11 20:23:49
|
Update of /cvsroot/arianne/stendhal/src/games/stendhal/server/entity/mapstuff/block In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv25977/src/games/stendhal/server/entity/mapstuff/block Modified Files: Block.java Log Message: Fix compiler errors due to constructor changes Index: Block.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/entity/mapstuff/block/Block.java,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** Block.java 11 Apr 2013 18:23:30 -0000 1.22 --- Block.java 11 Apr 2013 20:23:45 -0000 1.23 *************** *** 67,76 **** */ public Block(int startX, int startY, boolean multiPush) { ! this(startX, startY, multiPush, "block", Arrays.asList("scrape-1", "scrape-2")); } public Block(int startX, int startY, boolean multiPush, String style, String shape) { ! this(startX, startY, multiPush, style, Collections.<String> emptyList()); ! this.put("shape", shape); } --- 67,87 ---- */ public Block(int startX, int startY, boolean multiPush) { ! this(startX, startY, multiPush, "block", null, Arrays.asList("scrape-1", "scrape-2")); ! } ! ! /** ! * ! * @param startX ! * @param startY ! * @param multiPush ! * @param style ! * @param shape ! */ ! public Block(int startX, int startY, boolean multiPush, String style) { ! this(startX, startY, multiPush, style, null, Collections.<String> emptyList()); } public Block(int startX, int startY, boolean multiPush, String style, String shape) { ! this(startX, startY, multiPush, style, shape, Collections.<String> emptyList()); } *************** *** 89,93 **** * what sounds should be played on push? */ ! public Block(int startX, int startY, boolean multiPush, String style, List<String> sounds) { super(); this.put(START_X, startX); --- 100,104 ---- * what sounds should be played on push? */ ! public Block(int startX, int startY, boolean multiPush, String style, String shape, List<String> sounds) { super(); this.put(START_X, startX); *************** *** 101,105 **** // Count as collision for the client and pathfinder setResistance(100); - // a nice description TODO make it dynamically computed setDescription("You see a solid block of rock. Are you strong enough to push it away?"); if(style != null) { --- 112,115 ---- *************** *** 108,113 **** --- 118,127 ---- put("name", "block"); } + if(shape != null) { + put("shape", shape); + } this.reset(); } + /** |