diff options
author | MW | 2007-05-24 13:37:52 +0000 |
---|---|---|
committer | MW | 2007-05-24 13:37:52 +0000 |
commit | 773e1834df94c291431f05037c20d329768ac71a (patch) | |
tree | f27880ae2b02d896f1ec1a90f52a5f108e7c77f4 | |
parent | * re-prebuilt (diff) | |
download | opensim-SC_OLD-773e1834df94c291431f05037c20d329768ac71a.zip opensim-SC_OLD-773e1834df94c291431f05037c20d329768ac71a.tar.gz opensim-SC_OLD-773e1834df94c291431f05037c20d329768ac71a.tar.bz2 opensim-SC_OLD-773e1834df94c291431f05037c20d329768ac71a.tar.xz |
All back and no one suspected a thing.
-rw-r--r-- | OpenSim/OpenSim.RegionServer/world/World.PacketHandlers.cs | 4 | ||||
-rw-r--r-- | OpenSim/OpenSim.Terrain.BasicTerrain/TerrainEngine.cs | 13 |
2 files changed, 9 insertions, 8 deletions
diff --git a/OpenSim/OpenSim.RegionServer/world/World.PacketHandlers.cs b/OpenSim/OpenSim.RegionServer/world/World.PacketHandlers.cs index 348cd30..4f32335 100644 --- a/OpenSim/OpenSim.RegionServer/world/World.PacketHandlers.cs +++ b/OpenSim/OpenSim.RegionServer/world/World.PacketHandlers.cs | |||
@@ -21,12 +21,12 @@ namespace OpenSim.world | |||
21 | { | 21 | { |
22 | case 1: | 22 | case 1: |
23 | // raise terrain | 23 | // raise terrain |
24 | Terrain.raise(north, west, 10.0, 0.1); | 24 | Terrain.raise(north, west, 10.0, 0.001); |
25 | RegenerateTerrain(true, (int)north, (int)west); | 25 | RegenerateTerrain(true, (int)north, (int)west); |
26 | break; | 26 | break; |
27 | case 2: | 27 | case 2: |
28 | //lower terrain | 28 | //lower terrain |
29 | Terrain.lower(north, west, 10.0, 0.1); | 29 | Terrain.lower(north, west, 10.0, 0.001); |
30 | RegenerateTerrain(true, (int)north, (int)west); | 30 | RegenerateTerrain(true, (int)north, (int)west); |
31 | break; | 31 | break; |
32 | } | 32 | } |
diff --git a/OpenSim/OpenSim.Terrain.BasicTerrain/TerrainEngine.cs b/OpenSim/OpenSim.Terrain.BasicTerrain/TerrainEngine.cs index a0f37f9..c6a3eb8 100644 --- a/OpenSim/OpenSim.Terrain.BasicTerrain/TerrainEngine.cs +++ b/OpenSim/OpenSim.Terrain.BasicTerrain/TerrainEngine.cs | |||
@@ -94,7 +94,7 @@ namespace OpenSim.Terrain | |||
94 | { | 94 | { |
95 | for (y = 0; y < h; y++) | 95 | for (y = 0; y < h; y++) |
96 | { | 96 | { |
97 | heightmap.set(x,y,(double)heights[x,y]); | 97 | heightmap.set(x, y, (double)heights[x, y]); |
98 | } | 98 | } |
99 | } | 99 | } |
100 | tainted++; | 100 | tainted++; |
@@ -290,7 +290,7 @@ namespace OpenSim.Terrain | |||
290 | { | 290 | { |
291 | for (y = 0; y < h; y++) | 291 | for (y = 0; y < h; y++) |
292 | { | 292 | { |
293 | bs.Write(heightmap.get(x,y)); | 293 | bs.Write(heightmap.get(x, y)); |
294 | } | 294 | } |
295 | } | 295 | } |
296 | 296 | ||
@@ -385,7 +385,8 @@ namespace OpenSim.Terrain | |||
385 | /// <param name="meep">The heightfield</param> | 385 | /// <param name="meep">The heightfield</param> |
386 | /// <param name="val">The multiplier</param> | 386 | /// <param name="val">The multiplier</param> |
387 | /// <returns></returns> | 387 | /// <returns></returns> |
388 | public static TerrainEngine operator *(TerrainEngine meep, Double val) { | 388 | public static TerrainEngine operator *(TerrainEngine meep, Double val) |
389 | { | ||
389 | meep.heightmap *= val; | 390 | meep.heightmap *= val; |
390 | meep.tainted++; | 391 | meep.tainted++; |
391 | return meep; | 392 | return meep; |
@@ -401,12 +402,12 @@ namespace OpenSim.Terrain | |||
401 | { | 402 | { |
402 | get | 403 | get |
403 | { | 404 | { |
404 | return (float)heightmap.get(x,y); | 405 | return (float)heightmap.get(x, y); |
405 | } | 406 | } |
406 | set | 407 | set |
407 | { | 408 | { |
408 | tainted++; | 409 | tainted++; |
409 | heightmap.set(x,y,(double)value); | 410 | heightmap.set(x, y, (double)value); |
410 | } | 411 | } |
411 | } | 412 | } |
412 | 413 | ||
@@ -450,4 +451,4 @@ namespace OpenSim.Terrain | |||
450 | } | 451 | } |
451 | } | 452 | } |
452 | } | 453 | } |
453 | } | 454 | } \ No newline at end of file |