Finish matching xSurface

configure.py

@@ -333,7 +333,7 @@ def Rel(lib_name: str, objects: List[Object]) -> Dict[str, Any]:
             Object(NonMatching, "SB/Core/x/xSpline.cpp"),
             Object(NonMatching, "SB/Core/x/xstransvc.cpp"),
             Object(NonMatching, "SB/Core/x/xString.cpp"),
-            Object(NonMatching, "SB/Core/x/xSurface.cpp"),
+            Object(Matching, "SB/Core/x/xSurface.cpp"),
             Object(NonMatching, "SB/Core/x/xTimer.cpp"),
             Object(NonMatching, "SB/Core/x/xTRC.cpp"),
             Object(Matching, "SB/Core/x/xutil.cpp"),

src/SB/Core/x/xSurface.cpp

@@ -3,18 +3,16 @@
 
 #include <types.h>
 
-extern xSurface* surfs;
-extern uint16 nsurfs;
+xSurface* surfs;
+uint16 nsurfs;
 
-#if 0
-// The for loop is off.
 void xSurfaceInit(uint16 num_surfs)
 {
     nsurfs = num_surfs;
     if (num_surfs != 0)
     {
         surfs = (xSurface*)xMemAllocSize(num_surfs * sizeof(xSurface));
-        for (int32 i = 0; i < nsurfs; i++)
+        for (uint16 i = 0; i < nsurfs; i++)
         {
             surfs[i].idx = i;
         }
@@ -25,32 +23,22 @@ void xSurfaceInit(uint16 num_surfs)
     }
 }
 
-#endif
+extern "C" {
+extern void __copy(void* dst, const void* src, uint32 n);
+}
 
-#if 0
-// Close to being finished.
-void xSurface::operator=(const xSurface& ent)
+xSurface& xSurface::operator=(const xSurface& ent)
 {
     xBase::operator=(ent);
     this->idx = ent.idx;
     this->type = ent.type;
     this->ent = ent.ent;
     this->friction = ent.friction;
     this->state = ent.state;
-    this->pad = ent.pad; // Make this call __copy();
+    // FIXME: Is this auto-inserted by the compiler?
+    __copy(&pad, &ent.pad, 3);
     this->moprops = ent.moprops;
-}
-
-#endif
-
-void xSurface::operator=(const xBase& ent)
-{
-    this->id = ent.id;
-    this->baseType = ent.baseType;
-    this->linkCount = ent.linkCount;
-    this->baseFlags = ent.baseFlags;
-    this->link = ent.link;
-    this->eventFunc = ent.eventFunc;
+    return *this;
 }
 
 void xSurfaceExit()
@@ -67,7 +55,7 @@ void xSurfaceLoad(xSurface* ent, xSerial* s)
     xBaseLoad((xBase*)ent, s);
 }
 
-void xSurfaceReset()
+void xSurfaceReset(xSurface* ent)
 {
 }
 

src/SB/Core/x/xSurface.h

@@ -20,8 +20,7 @@ struct xSurface : xBase
     uint8 pad[3];
     void* moprops;
 
-    void operator=(const xSurface& ent);
-    void operator=(const xBase& ent);
+    xSurface& operator=(const xSurface& ent);
 };
 
 #define XSURFACE_TYPE_1 1
@@ -31,8 +30,8 @@ void xSurfaceInit(uint16 num_surfs);
 void xSurfaceExit();
 void xSurfaceSave(xSurface* ent, xSerial* s);
 void xSurfaceLoad(xSurface* ent, xSerial* s);
-void xSurfaceReset();
+void xSurfaceReset(xSurface* ent);
 uint16 xSurfaceGetNumSurfaces();
 xSurface* xSurfaceGetByIdx(uint16 n);
 
-#endif
+#endif

src/SB/Game/zSurface.cpp

@@ -48,7 +48,7 @@ void zSurfaceExit()
 
 void zSurfaceResetSurface(xSurface* surf)
 {
-    xSurfaceReset();
+    xSurfaceReset(surf);
     surf->friction = ((zSurfaceProps*)(surf->moprops))->asset->friction;
 }