aboutsummaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorJeroen van Rijn <Kelimion@users.noreply.github.com>2024-06-26 20:46:46 +0200
committerGitHub <noreply@github.com>2024-06-26 20:46:46 +0200
commite37afa3ada710a0f4e38efc8889f15cce51b2d05 (patch)
treeec456b06156d0f4fad001cab024bd09119c4d758 /core
parent3726f0b73c980fa7e14f3ed668bdf5ca3441e57a (diff)
parentc33bf7673f316733786813965b3934b1c9e8f6d4 (diff)
Merge pull request #3814 from Kelimion/fix_fixed
Fix core:math/fixed.
Diffstat (limited to 'core')
-rw-r--r--core/math/fixed/fixed.odin2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/math/fixed/fixed.odin b/core/math/fixed/fixed.odin
index d55e24175..b23090307 100644
--- a/core/math/fixed/fixed.odin
+++ b/core/math/fixed/fixed.odin
@@ -41,7 +41,7 @@ init_from_f64 :: proc(x: ^$T/Fixed($Backing, $Fraction_Width), val: f64) {
init_from_parts :: proc(x: ^$T/Fixed($Backing, $Fraction_Width), integer, fraction: Backing) {
x.i = fraction
x.i &= 1<<Fraction_Width - 1
- x.i |= integer
+ x.i |= (integer << Fraction_Width)
}
to_f64 :: proc(x: $T/Fixed($Backing, $Fraction_Width)) -> f64 {