X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavecraft%2Fgame%2FWorldGen.java;h=954bdffd799366b314056582e8043d4949d9de3a;hb=fe86b2fc3788c58fb134415780b312b4c7ef5c97;hp=48c8db8d1d84542b60627b0e41db0aadf456eb15;hpb=c6925c7674b71e9b6fe537aaca3aa7330e04e13f;p=cavedroid.git

diff --git a/core/src/ru/deadsoftware/cavecraft/game/WorldGen.java b/core/src/ru/deadsoftware/cavecraft/game/WorldGen.java
index 48c8db8..954bdff 100644
--- a/core/src/ru/deadsoftware/cavecraft/game/WorldGen.java
+++ b/core/src/ru/deadsoftware/cavecraft/game/WorldGen.java
@@ -54,16 +54,14 @@ public class WorldGen {
         genWorld(width, height, TimeUtils.millis());
     }
 
-    static void genWorld(int width, int height, long s) {
+    static void genWorld(int width, int height, long worldseed) {
         int dirtH;
-        seed = s;
+        seed = worldseed;
         rand = new RandomXS128(seed);
         foreMap = new int[width][height];
         backMap = new int[width][height];
         hMap = genLandscape(width, height/4, height/8, height/2);
         for (int x=0; x<width; x++) {
-            for (int y=0; y<height; y++) {
-            }
             dirtH = 4+rand.nextInt(2);
             for (int y = height- hMap[x]; y<height; y++) {
                 if (y==height- hMap[x]) {
@@ -81,13 +79,16 @@ public class WorldGen {
                 }
             }
             for (int y = height-64; y<height-1; y++) {
-                if (foreMap[x][height-y]==0){
-                    foreMap[x][height-y] = 8;
-                    backMap[x][height-y] = 8;
+                if (foreMap[x][y]==0){
+                    foreMap[x][y] = 8;
+                    backMap[x][y] = 8;
+                    if (y==height-hMap[x]-1) {
+                        foreMap[x][y+1] = 3;
+                    }
                 }
             }
             if (x>2 && x<width-2 && rand.nextInt(100)<5){
-                genOak(x,height-hMap[x]-1);
+                if (foreMap[x][height-hMap[x]]-1==0) genOak(x,height-hMap[x]-1);
             }
         }
     }