Changeset 972 for cpp/frams/vm/classes/genoobj.cpp

Timestamp:

07/03/20 00:32:23 (4 years ago)

Author:

Maciej Komosinski

Message:

• separate "0" and "0s" formats (for SHAPE_BALL_AND_STICK and SHAPE_SOLIDS, respectively)
• converting to format list (Geno::F0_FORMAT_LIST = "0,0s")
• (optional) declaring Model as SHAPE_BALL_AND_STICK or SHAPE_SOLIDS (or SHAPE_UNKNOWN)

File:

• cpp/frams/vm/classes/genoobj.cpp (modified) (5 diffs)

cpp/frams/vm/classes/genoobj.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-2020  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -64 +64 @@
 void GenoObj::get_autoname(ExtValue *ret)
 {
-        Model m(*this);
+        Model m(*this, Model::SHAPE_UNKNOWN);
         ret->setString(AutoName::makeName(m));
 }
@@ -97 +97 @@
 void GenoObj::get_f0genotype(ExtValue *ret)
 {
-        ret->setString(getConverted('0').getGenes());
+        ret->setString(getConverted(Geno::F0_FORMAT_LIST).getGenes());
 }
 
@@ -105 +105 @@
         {
                 char ch = v.getInt();
-                return SString(&ch,1);
+                return SString(&ch, 1);
         }
         if (v.getType() == TString)
@@ -144 +144 @@
 #ifdef __CODEGUARD__
         static GenoObj static_genoobj;
-        static Param static_genoparam(geno_paramtab,&static_genoobj);
+        static Param static_genoparam(geno_paramtab, &static_genoobj);
 #else
         static Param static_genoparam(geno_paramtab);