From b80caa11a6815354670fc569aa41b8fdf3999842 Mon Sep 17 00:00:00 2001 From: Zeno Rogue Date: Fri, 8 Nov 2019 14:56:54 +0100 Subject: [PATCH] moved zgmod to util --- nonisotropic.cpp | 2 -- util.cpp | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nonisotropic.cpp b/nonisotropic.cpp index aa0c86b0..aeacd987 100644 --- a/nonisotropic.cpp +++ b/nonisotropic.cpp @@ -776,8 +776,6 @@ EX namespace nilv { { point31(0,0,0.5), point31(-0.5,0.5,0.25), point31(-0.5,-0.5,0.75), point31(0,0,0.5), point31(-0.5,-0.5,0.75), point31(-0.5,-0.5,0.5), point31(0,0,0.5), point31(-0.5,-0.5,0.5), point31(0.5,-0.5,0.5), point31(0,0,0.5), point31(0.5,-0.5,0.5), point31(0.5,-0.5,0.25), point31(0,0,0.5), point31(0.5,-0.5,0.25), point31(0.5,0.5,0.75), point31(0,0,0.5), point31(0.5,0.5,0.75), point31(0.5,0.5,0.5), point31(0,0,0.5), point31(0.5,0.5,0.5), point31(-0.5,0.5,0.5), point31(0,0,0.5), point31(-0.5,0.5,0.5), point31(-0.5,0.5,0.25), }, }}; - EX int zgmod(int a, int b) { return b ? gmod(a, b) : a; } - EX array nilperiod, nilperiod_edit; struct hrmap_nil : hrmap { diff --git a/util.cpp b/util.cpp index 485a637d..077ddaf9 100644 --- a/util.cpp +++ b/util.cpp @@ -41,6 +41,8 @@ EX int gmod(int i, int j) { return i; } +EX int zgmod(int a, int b) { return b ? gmod(a, b) : a; } + EX int gdiv(int i, int j) { return (i - gmod(i, j)) / j; }