Changed a bit of the code that is and should still be commented out.

diff --git a/src/main.cpp b/src/main.cpp
index 1f178ab6e085c462d934cf8271504f70eb4d6844..2122985633bb05f010b5ad97cec3d912f10accdf 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -124,6 +124,10 @@ Game content:
 - A bomb\r
 - A spread-items-on-map routine for the bomb, and for dying players\r
 \r
+- Fighting:\r
+  - Proper sword swing simulation\r
+  - Player should get damage from colliding to a wall at high speed\r
+\r
 Documentation:\r
 --------------\r
 \r

diff --git a/src/map.cpp b/src/map.cpp
index e8bd7bf6f6dada0fc877655fbb7da0ad5c1c9592..e81ddb3af76785dd164e5ebfc8ecd5cc0e46004e 100644 (file)
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -2244,7 +2244,7 @@ void makeChunk(ChunkMakeData *data)
 
 #if 0
        NoiseBuffer noisebuf1;
-       NoiseBuffer noisebuf2;
+       //NoiseBuffer noisebuf2;
        {
                v3f minpos_f(
                        data->sectorpos_bigbase.X*MAP_BLOCKSIZE,
@@ -2260,18 +2260,18 @@ void makeChunk(ChunkMakeData *data)
 
                TimeTaker timer("noisebuf.create");
                
-               /*noisebuf.create(data->seed+25104, 6, 0.60, 200.0,
+               noisebuf1.create(data->seed+25104, 6, 0.60, 200.0,
                                minpos_f.X, minpos_f.Y, minpos_f.Z,
                                maxpos_f.X, maxpos_f.Y, maxpos_f.Z,
-                               samplelength_f.X, samplelength_f.Y, samplelength_f.Z);*/
-               noisebuf1.create(data->seed+25104, 3, 0.60, 25.0,
+                               samplelength_f.X, samplelength_f.Y, samplelength_f.Z);
+               /*noisebuf1.create(data->seed+25104, 3, 0.60, 25.0,
                                minpos_f.X, minpos_f.Y, minpos_f.Z,
                                maxpos_f.X, maxpos_f.Y, maxpos_f.Z,
                                samplelength_f.X, samplelength_f.Y, samplelength_f.Z);
                noisebuf2.create(data->seed+25105, 4, 0.50, 200.0,
                                minpos_f.X, minpos_f.Y, minpos_f.Z,
                                maxpos_f.X, maxpos_f.Y, maxpos_f.Z,
-                               samplelength_f.X, samplelength_f.Y, samplelength_f.Z);
+                               samplelength_f.X, samplelength_f.Y, samplelength_f.Z);*/
        }
 
        for(s16 x=0; x<data->sectorpos_bigbase_size*MAP_BLOCKSIZE; x++)
@@ -2315,12 +2315,12 @@ void makeChunk(ChunkMakeData *data)
                                                0.5+(float)y/100.0,
                                                0.5+(float)p2d.Y/100.0,
                                                data->seed+123, 5, 0.5);*/
-                               //double noiseval = 64.0 * noisebuf1.get(p2d.X, y, p2d.Y);
-                               double noiseval = 30.0 * noisebuf1.get(p2d.X, y, p2d.Y);
-                               noiseval *= MYMAX(0, -0.2 + noisebuf2.get(p2d.X, y, p2d.Y));
+                               double noiseval = 64.0 * noisebuf1.get(p2d.X, y, p2d.Y);
+                               /*double noiseval = 30.0 * noisebuf1.get(p2d.X, y, p2d.Y);
+                               noiseval *= MYMAX(0, -0.2 + noisebuf2.get(p2d.X, y, p2d.Y));*/
                                
-                               if(y < surface_y + noiseval)
-                               //if(noiseval > 0)
+                               //if(y < surface_y + noiseval)
+                               if(noiseval > 0)
                                //if(noiseval > y)
                                        data->vmanip.m_data[i].d = CONTENT_STONE;