Changeset 1130 for cpp/frams/genetics/f1

Timestamp:

04/16/21 15:55:34 (4 years ago)

Author:

Maciej Komosinski

Message:

Used std::min(), std::max() explicitly to avoid compiler confusion. Used std::size() explicitly instead of the equivalent macro

File:

• cpp/frams/genetics/f1/f1_conv.cpp (modified) (3 diffs)

cpp/frams/genetics/f1/f1_conv.cpp

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2018  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2021  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
 #include "f1_conv.h"
-#include <common/nonstd_stl.h>
 #include <common/log.h>
 #include <frams/util/multirange.h>
@@ -11 +10 @@
 #include <ctype.h>
 #include <assert.h>
+#include <algorithm>
 
 //#define v1f1COMPATIBLE //as in ancient Framsticks 1.x
@@ -273 +273 @@
 int Builder::growJoint(int part1, int part2, Pt3D &angle, GeneProps &c, const char *g)
 {
-        double len = min(2.0, c.length);
+        double len = std::min(2.0, c.length);
         sprintf(tmp, "p1=%d,p2=%d,dx=%lg,rx=%lg,ry=%lg,rz=%lg,stam=%lg,vr=%g,vg=%g,vb=%g",
                 part1, part2, len, angle.x, angle.y, angle.z, c.stamina, c.cred, c.cgreen, c.cblue);