From 137eef6590205b7bcdf5273221bc22c17b218f6e Mon Sep 17 00:00:00 2001 From: sfan5 Date: Wed, 8 Jun 2022 19:33:46 +0200 Subject: Move f1000 sanitizing to the places that still use this type --- src/util/serialize.h | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'src/util') diff --git a/src/util/serialize.h b/src/util/serialize.h index 2203fff0c..4dc1a54c6 100644 --- a/src/util/serialize.h +++ b/src/util/serialize.h @@ -439,16 +439,14 @@ MAKE_STREAM_WRITE_FXN(video::SColor, ARGB8, 4); //// More serialization stuff //// -inline void clampToF1000(float &v) +inline float clampToF1000(float v) { - v = core::clamp(v, F1000_MIN, F1000_MAX); + return core::clamp(v, F1000_MIN, F1000_MAX); } -inline void clampToF1000(v3f &v) +inline v3f clampToF1000(v3f v) { - clampToF1000(v.X); - clampToF1000(v.Y); - clampToF1000(v.Z); + return {clampToF1000(v.X), clampToF1000(v.Y), clampToF1000(v.Z)}; } // Creates a string with the length as the first two bytes -- cgit v1.2.3