Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' of git://github.com/Maescool/Catacomb-Snatch in…

…to develop
  • Loading branch information...
commit 17c3f28ab0fd78579f978f958dbdf8662da16244 2 parents 89722fc + 7417171
@Marlinc Marlinc authored
View
18 res/properties/texts.properties
@@ -1,10 +1,14 @@
-titlemenu.start=Start
-titlemenu.host=Host
-titlemenu.join=Join
-titlemenu.help=How to play
-titlemenu.options=Options
-titlemenu.exit=Exit
-back=back
+titlemenu.start = Start
+titlemenu.host = Host
+titlemenu.join = Join
+titlemenu.help = How to play
+titlemenu.options = Options
+titlemenu.exit = Exit
+back= back
+
+pausemenu.help = Help
+pausemenu.backtomain = Main
+pausemenu.resume = Resume
options.on=On
options.off=Off
View
18 res/properties/texts_de.properties
@@ -1,10 +1,14 @@
-titlemenu.start=Starten
-titlemenu.host=Host
-titlemenu.join=Beitreten
-titlemenu.help=Anleitung
-titlemenu.options=Optionen
-titlemenu.exit=Schliessen
-back=Zurueck
+titlemenu.start = Starten
+titlemenu.host = Host
+titlemenu.join = Beitreten
+titlemenu.help = Anleitung
+titlemenu.options = Optionen
+titlemenu.exit = Schliessen
+back = Zurueck
+
+pausemenu.help = Hilfe
+pausemenu.backtomain = Hauptmenue
+pausemenu.resume = Fortsetzen
options.on=An
options.off=Aus
View
7 src/com/mojang/mojam/gui/PauseMenu.java
@@ -2,6 +2,7 @@
import java.awt.event.KeyEvent;
+import com.mojang.mojam.MojamComponent;
import com.mojang.mojam.screen.Art;
import com.mojang.mojam.screen.Screen;
@@ -16,10 +17,10 @@ public PauseMenu(int gameWidth, int gameHeight) {
this.gameWidth = gameWidth;
resumeButton = (Button) addButton(new Button(TitleMenu.RETURN_ID,
- "Resume", (gameWidth - 128) / 2, 200));
- addButton(new Button(TitleMenu.HOW_TO_PLAY, "Help menu",
+ MojamComponent.texts.getStatic("pausemenu.resume"), (gameWidth - 128) / 2, 200));
+ addButton(new Button(TitleMenu.HOW_TO_PLAY, MojamComponent.texts.getStatic("pausemenu.help"),
(gameWidth - 128) / 2, 230));
- addButton(new Button(TitleMenu.RETURN_TO_TITLESCREEN, "Main menu",
+ addButton(new Button(TitleMenu.RETURN_TO_TITLESCREEN, MojamComponent.texts.getStatic("pausemenu.backtomain"),
(gameWidth - 128) / 2, 260));
}
View
5 src/com/mojang/mojam/level/tile/FloorTile.java
@@ -7,7 +7,6 @@
public class FloorTile extends Tile {
- private int orgImg;
// Binary West|North|East
static final int[] shadowImages = new int[] { -1, // 000
3, // 001
@@ -22,7 +21,6 @@
public void init(Level level, int x, int y) {
super.init(level, x, y);
neighbourChanged(null);
- orgImg = img;
}
public void render(Screen screen) {
@@ -42,7 +40,6 @@ public void neighbourChanged(Tile tile) {
if (e != null && e.castShadow())
index |= 0x1;
- img = orgImg;
if (n instanceof SandTile) {
img = 4 + 8;
index = 0;
@@ -59,8 +56,6 @@ public void neighbourChanged(Tile tile) {
else
// Row 2, first 4 columns
img = 2 * Art.floorTiles.length + (imageIndex & 3);
- } else {
- img = TurnSynchronizer.synchedRandom.nextInt(4);
}
minimapColor = Art.floorTileColors[img & 7][img / 8];
}
View
4 src/com/mojang/mojam/level/tile/Tile.java
@@ -17,14 +17,14 @@
public Level level;
public int x, y;
- public int img;
+ public int img = -1; // no image set yet
public int minimapColor;
public void init(Level level, int x, int y) {
this.level = level;
this.x = x;
this.y = y;
- img = TurnSynchronizer.synchedRandom.nextInt(4);
+ if (img == -1) img = TurnSynchronizer.synchedRandom.nextInt(4);
minimapColor = Art.floorTileColors[img & 7][img / 8];
}
Please sign in to comment.
Something went wrong with that request. Please try again.