diff options
author | Elias Fleckenstein <54945686+EliasFleckenstein03@users.noreply.github.com> | 2020-11-04 16:57:47 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-11-04 16:57:47 +0100 |
commit | 3e16c3a78fff61c20e63ba730d15e94e3bb877b4 (patch) | |
tree | c070350db219f2c4241d22bc31949685c7b42fe9 /src/daynightratio.h | |
parent | 5d9ae5a91c544fc7fbd475decf47cef7e09ef8fc (diff) | |
parent | 6ccb5835ff55d85156be91473c598eca9d6cb9a6 (diff) | |
download | dragonfireclient-3e16c3a78fff61c20e63ba730d15e94e3bb877b4.tar.xz |
Merge branch 'master' into master
Diffstat (limited to 'src/daynightratio.h')
-rw-r--r-- | src/daynightratio.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/daynightratio.h b/src/daynightratio.h index 110ff855b..538767cad 100644 --- a/src/daynightratio.h +++ b/src/daynightratio.h @@ -30,15 +30,15 @@ inline u32 time_to_daynight_ratio(float time_of_day, bool smooth) t = 24000.0f - t; const float values[9][2] = { - {4250.0f + 125.0f, 175.0f}, - {4500.0f + 125.0f, 175.0f}, - {4750.0f + 125.0f, 250.0f}, - {5000.0f + 125.0f, 350.0f}, - {5250.0f + 125.0f, 500.0f}, - {5500.0f + 125.0f, 675.0f}, - {5750.0f + 125.0f, 875.0f}, - {6000.0f + 125.0f, 1000.0f}, - {6250.0f + 125.0f, 1000.0f}, + {4250.0f + 125.0f, 175.0f}, + {4500.0f + 125.0f, 175.0f}, + {4750.0f + 125.0f, 250.0f}, + {5000.0f + 125.0f, 350.0f}, + {5250.0f + 125.0f, 500.0f}, + {5500.0f + 125.0f, 675.0f}, + {5750.0f + 125.0f, 875.0f}, + {6000.0f + 125.0f, 1000.0f}, + {6250.0f + 125.0f, 1000.0f}, }; if (!smooth) { |