summaryrefslogtreecommitdiff
path: root/src/daynightratio.h
diff options
context:
space:
mode:
authorLoïc Blot <nerzhul@users.noreply.github.com>2017-08-17 23:02:50 +0200
committerGitHub <noreply@github.com>2017-08-17 23:02:50 +0200
commit13e995b811e80dc48c0769274d3dca3a2221b843 (patch)
treeb75e58314fa98b57d23fefd92547f298ea419e5f /src/daynightratio.h
parent921151d97a2fb2238ab514324fb95e2732248b96 (diff)
downloadminetest-13e995b811e80dc48c0769274d3dca3a2221b843.tar.gz
minetest-13e995b811e80dc48c0769274d3dca3a2221b843.tar.bz2
minetest-13e995b811e80dc48c0769274d3dca3a2221b843.zip
Modernize src/c* src/d* and src/e* files (#6263)
* Modernize src/c* src/d* and src/e* files * default operator * redundant init * delete default constructors on CraftDefinition childs (never used) * fix some missing init values * const ref fix reported by clang-tidy * ranged-based for loops * simple conditions & returns * empty stl function instead of size * emplace_back stl function instead of push_back + construct temp obj * auto for some iterators * code style fixes * c++ stl headers instead of C stl headers (stdio.h -> cstdio)
Diffstat (limited to 'src/daynightratio.h')
-rw-r--r--src/daynightratio.h11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/daynightratio.h b/src/daynightratio.h
index 3b71ee84e..f959cdf6c 100644
--- a/src/daynightratio.h
+++ b/src/daynightratio.h
@@ -50,16 +50,17 @@ inline u32 time_to_daynight_ratio(float time_of_day, bool smooth)
return values[i][1];
}
return 1000;
- } else {
- for(u32 i=0; i<sizeof(values)/sizeof(*values); i++){
- if(values[i][0] <= t)
+ }
+
+ for (u32 i=0; i < sizeof(values) / sizeof(*values); i++) {
+ if (values[i][0] <= t)
continue;
- if(i == 0)
+ if (i == 0)
return values[i][1];
float td0 = values[i][0] - values[i-1][0];
float f = (t - values[i-1][0]) / td0;
return f * values[i][1] + (1.0 - f) * values[i-1][1];
}
return 1000;
- }
+
}