Wuzzy
/
BlockColor-Engine
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
Perttu Ahola 2011-04-27 00:14:16 +03:00
parent 36d299ce58
commit 8377b5f2a6
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main.cpp
View File

@ -124,6 +124,10 @@ Game content:
- A bomb - A bomb
- A spread-items-on-map routine for the bomb, and for dying players - A spread-items-on-map routine for the bomb, and for dying players
- Fighting:
- Proper sword swing simulation
- Player should get damage from colliding to a wall at high speed
Documentation: Documentation:
-------------- --------------

20
src/map.cpp
View File

@ -2244,7 +2244,7 @@ void makeChunk(ChunkMakeData *data)
#if 0 #if 0
NoiseBuffer noisebuf1; NoiseBuffer noisebuf1;
NoiseBuffer noisebuf2; //NoiseBuffer noisebuf2;
{ {
v3f minpos_f( v3f minpos_f(
data->sectorpos_bigbase.X*MAP_BLOCKSIZE, data->sectorpos_bigbase.X*MAP_BLOCKSIZE,
@ -2260,18 +2260,18 @@ void makeChunk(ChunkMakeData *data)
TimeTaker timer("noisebuf.create"); 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, minpos_f.X, minpos_f.Y, minpos_f.Z,
maxpos_f.X, maxpos_f.Y, maxpos_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);
noisebuf1.create(data->seed+25104, 3, 0.60, 25.0, /*noisebuf1.create(data->seed+25104, 3, 0.60, 25.0,
minpos_f.X, minpos_f.Y, minpos_f.Z, minpos_f.X, minpos_f.Y, minpos_f.Z,
maxpos_f.X, maxpos_f.Y, maxpos_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);
noisebuf2.create(data->seed+25105, 4, 0.50, 200.0, noisebuf2.create(data->seed+25105, 4, 0.50, 200.0,
minpos_f.X, minpos_f.Y, minpos_f.Z, minpos_f.X, minpos_f.Y, minpos_f.Z,
maxpos_f.X, maxpos_f.Y, maxpos_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++) 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)y/100.0,
0.5+(float)p2d.Y/100.0, 0.5+(float)p2d.Y/100.0,
data->seed+123, 5, 0.5);*/ data->seed+123, 5, 0.5);*/
//double noiseval = 64.0 * noisebuf1.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); /*double noiseval = 30.0 * noisebuf1.get(p2d.X, y, p2d.Y);
noiseval *= MYMAX(0, -0.2 + noisebuf2.get(p2d.X, y, p2d.Y)); noiseval *= MYMAX(0, -0.2 + noisebuf2.get(p2d.X, y, p2d.Y));*/
if(y < surface_y + noiseval) //if(y < surface_y + noiseval)
//if(noiseval > 0) if(noiseval > 0)
//if(noiseval > y) //if(noiseval > y)
data->vmanip.m_data[i].d = CONTENT_STONE; data->vmanip.m_data[i].d = CONTENT_STONE;