use cube array semantics

project-imprimis · Aug 27, 2023 · b51795a · b51795a
1 parent 0117510
commit b51795a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/game/edit.cpp b/game/edit.cpp
@@ -956,7 +956,7 @@ void replacetexcube(cube &c, int oldtex, int newtex)
     {
         for(int i = 0; i < 8; ++i)
         {
-            replacetexcube(c.children[i], oldtex, newtex);
+            replacetexcube((*c.children)[i], oldtex, newtex);
         }
     }
 }
@@ -976,7 +976,7 @@ void mpreplacetex(int oldtex, int newtex, bool insel, selinfo &sel, bool local)
     {
         for(int i = 0; i < 8; ++i)
         {
-            replacetexcube(rootworld.worldroot[i], oldtex, newtex);
+            replacetexcube((*rootworld.worldroot)[i], oldtex, newtex);
         }
     }
     rootworld.allchanged();
@@ -1060,7 +1060,7 @@ void flipcube(cube &c, int d)
         }
         for(int i = 0; i < 8; ++i)
         {
-            flipcube(c.children[i], d);
+            flipcube((*c.children)[i], d);
         }
     }
 }
@@ -1100,17 +1100,16 @@ void rotatecube(cube &c, int d)
     {
         int row = octadim(R[d]);
         int col = octadim(C[d]);
-        for(int i=0; i<=octadim(d); i+=octadim(d)) rotatequad
-        (
-            c.children[i+row],
-            c.children[i],
-            c.children[i+col],
-            c.children[i+col+row]
+        for(int i=0; i<=octadim(d); i+=octadim(d))
+        rotatequad ((*c.children)[i+row],
+                    (*c.children)[i],
+                    (*c.children)[i+col],
+                    (*c.children)[i+col+row]
         );
         //recursively apply to children
         for(int i = 0; i < 8; ++i)
         {
-            rotatecube(c.children[i], d);
+            rotatecube((*c.children)[i], d);
         }
     }
 }

diff --git a/game/render.cpp b/game/render.cpp
@@ -549,7 +549,7 @@ namespace game
         sel.corner = (cor[R[d]]-(lu[R[d]]*2)/gridsize)+(cor[C[d]]-(lu[C[d]]*2)/gridsize)*2;
         selchildcount = 0;
         selchildmat = -1;
-        countselchild(rootworld.worldroot, ivec(0, 0, 0), rootworld.mapsize()/2);
+        countselchild(*rootworld.worldroot, ivec(0, 0, 0), rootworld.mapsize()/2);
         if(mag>=1 && selchildcount==1)
         {
             selchildmat = c->material;
@@ -991,7 +991,7 @@ namespace game
                 sel.corner = (cor[R[d]]-(lu[R[d]]*2)/gridsize)+(cor[C[d]]-(lu[C[d]]*2)/gridsize)*2;
                 selchildcount = 0;
                 selchildmat = -1;
-                countselchild(rootworld.worldroot, ivec(0, 0, 0), rootworld.mapsize()/2);
+                countselchild(*rootworld.worldroot, ivec(0, 0, 0), rootworld.mapsize()/2);
                 if(mag>=1 && selchildcount==1)
                 {
                     selchildmat = c->material;