diff options
| author | kwolekr <kwolekr@minetest.net> | 2014-10-29 01:54:11 -0400 |
|---|---|---|
| committer | kwolekr <kwolekr@minetest.net> | 2014-10-29 01:56:37 -0400 |
| commit | 1cb6ea6346f568cd068380c5af52f7be269e3490 (patch) | |
| tree | 1eab8e93b1621b5065c16c0973efecd4d5770939 /src/clouds.cpp | |
| parent | 7c6da2f38468b1eaf3b6c9b5cd0ee985e6675e31 (diff) | |
| download | minetest-1cb6ea6346f568cd068380c5af52f7be269e3490.tar.gz minetest-1cb6ea6346f568cd068380c5af52f7be269e3490.tar.bz2 minetest-1cb6ea6346f568cd068380c5af52f7be269e3490.zip | |
Refactor decoration-related code
Split up ModApiMapgen::l_register_decoration()
Define and make use of CONTAINS() and ARRLEN() macros
Diffstat (limited to 'src/clouds.cpp')
| -rw-r--r-- | src/clouds.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/clouds.cpp b/src/clouds.cpp index 1bf6dc9c1..10ac8f5b3 100644 --- a/src/clouds.cpp +++ b/src/clouds.cpp @@ -189,7 +189,7 @@ void Clouds::render() } #define GETINDEX(x, z, radius) (((z)+(radius))*(radius)*2 + (x)+(radius)) -#define CONTAINS(x, z, radius) \ +#define INAREA(x, z, radius) \ ((x) >= -(radius) && (x) < (radius) && (z) >= -(radius) && (z) < (radius)) for(s16 zi0=-cloud_radius_i; zi0<cloud_radius_i; zi0++) @@ -247,7 +247,7 @@ void Clouds::render() v[3].Pos.set( rx, ry,-rz); break; case 1: // back - if(CONTAINS(xi, zi-1, cloud_radius_i)){ + if(INAREA(xi, zi-1, cloud_radius_i)){ u32 j = GETINDEX(xi, zi-1, cloud_radius_i); if(grid[j]) continue; @@ -262,7 +262,7 @@ void Clouds::render() v[3].Pos.set(-rx,-ry,-rz); break; case 2: //right - if(CONTAINS(xi+1, zi, cloud_radius_i)){ + if(INAREA(xi+1, zi, cloud_radius_i)){ u32 j = GETINDEX(xi+1, zi, cloud_radius_i); if(grid[j]) continue; @@ -277,7 +277,7 @@ void Clouds::render() v[3].Pos.set( rx,-ry,-rz); break; case 3: // front - if(CONTAINS(xi, zi+1, cloud_radius_i)){ + if(INAREA(xi, zi+1, cloud_radius_i)){ u32 j = GETINDEX(xi, zi+1, cloud_radius_i); if(grid[j]) continue; @@ -292,7 +292,7 @@ void Clouds::render() v[3].Pos.set( rx,-ry, rz); break; case 4: // left - if(CONTAINS(xi-1, zi, cloud_radius_i)){ + if(INAREA(xi-1, zi, cloud_radius_i)){ u32 j = GETINDEX(xi-1, zi, cloud_radius_i); if(grid[j]) continue; |