Update TS++

Author: ZivDero

TSpp

@@ -415,8 +415,8 @@ bool AnimTypeClassExtension::Read_INI(CCINIClass &ini)
      *  A special value of "-1" will set the biggest frame to the actual middle frame
      *  of the shape file. This behavior was observed in Red Alert 2.
      */
-    if (This()->Image && This()->Image->Get_Frame_Count() > 0) {
-        MiddleFrame = ini.Get_Int_Clamp(ini_name, "MiddleFrame", -1, This()->Image->Get_Frame_Count() - 1, MiddleFrame);
+    if (This()->Image && This()->Image->Get_Count() > 0) {
+        MiddleFrame = ini.Get_Int_Clamp(ini_name, "MiddleFrame", -1, This()->Image->Get_Count() - 1, MiddleFrame);
     }
 
     ExplosionDamage = ini.Get_Int(ini_name, "ExplosionDamage", ExplosionDamage);
@@ -434,8 +434,8 @@ bool AnimTypeClassExtension::Read_INI(CCINIClass &ini)
  */
 void AnimTypeClassExtension::Set_Biggest_Frame()
 {
-    if (MiddleFrame < 0 && This()->Image && This()->Image->Get_Frame_Count() >= 2) {
-        This()->Biggest = This()->Image->Get_Frame_Count() / 2;
+    if (MiddleFrame < 0 && This()->Image && This()->Image->Get_Count() >= 2) {
+        This()->Biggest = This()->Image->Get_Count() / 2;
     } else {
         This()->Biggest = MiddleFrame;
     }

src/extensions/animtype/animtypeext.cpp

@@ -100,7 +100,7 @@ DECLARE_PATCH(_AnimTypeClass_SDDTOR_Free_Image_Patch) { GET_REGISTER_STATIC(Anim
 DECLARE_PATCH(_AnimTypeClass_Get_Image_Data_Assertion_Patch)
 {
     GET_REGISTER_STATIC(AnimTypeClass *, this_ptr, esi);
-    GET_REGISTER_STATIC(const ShapeFileStruct *, image, eax);
+    GET_REGISTER_STATIC(const ShapeSet *, image, eax);
 
     if (image == nullptr) {
         DEBUG_WARNING("Anim %s has NULL image data!\n", this_ptr->Name());

src/extensions/animtype/animtypeext_hooks.cpp

@@ -855,7 +855,7 @@ DECLARE_PATCH(_BuildingClass_Draw_Spied_Cameo_Palette_Patch)
     GET_REGISTER_STATIC(Rect *, window_rect, ebp);
     static TechnoTypeClass *technotype;
     static TechnoTypeClassExtension *technotypeext;
-    static const ShapeFileStruct *cameo_shape;
+    static const ShapeSet *cameo_shape;
     static Surface *pcx_image;
     static Rect pcxrect;
 
@@ -891,7 +891,7 @@ DECLARE_PATCH(_BuildingClass_Draw_Spied_Cameo_Palette_Patch)
          *  Original code used NormalDrawer, which is the old Red Alert shape
          *  drawer, so we need to use CameoDrawer here for the correct palette.
          */
-        Draw_Shape(LogicSurface, CameoDrawer, cameo_shape, 0, pos_xy, window_rect, ShapeFlagsType(SHAPE_CENTER|SHAPE_WIN_REL|SHAPE_ALPHA|SHAPE_NORMAL));
+        Draw_Shape(*LogicSurface, *CameoDrawer, cameo_shape, 0, *pos_xy, *window_rect, SHAPE_CENTER|SHAPE_WIN_REL|SHAPE_ALPHA|SHAPE_NORMAL);
     }
 
     JMP(0x00428B13);

src/extensions/building/buildingext_hooks.cpp

@@ -207,7 +207,7 @@ DECLARE_PATCH(_BuildingTypeClass_DTOR_Free_Image_Patch) { GET_REGISTER_STATIC(Bu
 DECLARE_PATCH(_BuildingTypeClass_Get_Image_Data_Assertion_Patch)
 {
     GET_REGISTER_STATIC(BuildingTypeClass *, this_ptr, esi);
-    GET_REGISTER_STATIC(const ShapeFileStruct *, image, eax);
+    GET_REGISTER_STATIC(const ShapeSet *, image, eax);
 
     if (image == nullptr) {
         DEBUG_WARNING("Building %s has NULL image data!\n", this_ptr->Name());

src/extensions/buildingtype/buildingtypeext_hooks.cpp

@@ -51,8 +51,8 @@
 DECLARE_PATCH(_CellClass_Draw_Shroud_Fog_Patch)
 {
 	static bool _shroud_one_time = false;
-	static const ShapeFileStruct *_shroud_shape;
-	static const ShapeFileStruct *_fog_shape;
+	static const ShapeSet *_shroud_shape;
+	static const ShapeSet *_fog_shape;
 
 	/**
 	 *  Stolen bytes/code.
@@ -63,17 +63,17 @@ DECLARE_PATCH(_CellClass_Draw_Shroud_Fog_Patch)
 	 *  Perform a one-time load of the shroud and fog shape data.
 	 */
 	if (!_shroud_one_time) {
-		_shroud_shape = (const ShapeFileStruct *)MFCC::Retrieve("SHROUD.SHP");
-		_fog_shape = (const ShapeFileStruct *)MFCC::Retrieve("FOG.SHP");
+		_shroud_shape = (const ShapeSet *)MFCC::Retrieve("SHROUD.SHP");
+		_fog_shape = (const ShapeSet *)MFCC::Retrieve("FOG.SHP");
 		_shroud_one_time = true;
 	}
 
 	/**
 	 *  If we are playing a multiplayer game, use the hardcoded shape data.
 	 */
 	if (!Session.Singleplayer_Game()) {
-		Cell_ShroudShape = (const ShapeFileStruct *)&ShroudShapeBinary;
-		Cell_FogShape = (const ShapeFileStruct *)&FogShapeBinary;
+		Cell_ShroudShape = (const ShapeSet *)&ShroudShapeBinary;
+		Cell_FogShape = (const ShapeSet *)&FogShapeBinary;
 
 	} else {
 		Cell_ShroudShape = _shroud_shape;
@@ -98,7 +98,7 @@ DECLARE_PATCH(_CellClass_Draw_Shroud_Fog_Patch)
 DECLARE_PATCH(_CellClass_Draw_Fog_Patch)
 {
 	static bool _fog_one_time = false;
-	static const ShapeFileStruct *_fog_shape;
+	static const ShapeSet *_fog_shape;
 
 	/**
 	 *  Stolen bytes/code.
@@ -109,15 +109,15 @@ DECLARE_PATCH(_CellClass_Draw_Fog_Patch)
 	 *  Perform a one-time load of the fog shape data.
 	 */
 	if (!_fog_one_time) {
-		_fog_shape = (const ShapeFileStruct *)MFCC::Retrieve("FOG.SHP");
+		_fog_shape = (const ShapeSet *)MFCC::Retrieve("FOG.SHP");
 		_fog_one_time = true;
 	}
 
 	/**
 	 *  If we are playing a multiplayer game, use the hardcoded shape data.
 	 */
 	if (!Session.Singleplayer_Game()) {
-		Cell_FixupFogShape = (const ShapeFileStruct *)&FogShapeBinary;
+		Cell_FixupFogShape = (const ShapeSet *)&FogShapeBinary;
 
 	} else {
 		Cell_FixupFogShape = _fog_shape;

src/extensions/cell/cellext_hooks.cpp

@@ -68,7 +68,7 @@
 static class InfantryClassExt : public InfantryClass
 {
 public:
-    const ShapeFileStruct* _Get_Image_Data() const;
+    const ShapeSet* _Get_Image_Data() const;
 };
 
 
@@ -82,7 +82,7 @@ static class InfantryClassExt : public InfantryClass
  *
  *  @author: ZivDero
  */
-const ShapeFileStruct* InfantryClassExt::_Get_Image_Data() const
+const ShapeSet* InfantryClassExt::_Get_Image_Data() const
 {
     if (Doing == DO_STRUGGLE && Rule->WebbedInfantry) {
         return Rule->WebbedInfantry->Get_Image_Data();

src/extensions/infantry/infantryext_hooks.cpp

@@ -47,7 +47,7 @@
 static class IsometricTileTypeClassExt : public IsometricTileTypeClass
 {
     public:
-        const ShapeFileStruct * _Get_Image_Data();
+        const ShapeSet * _Get_Image_Data();
 };
 
 
@@ -56,7 +56,7 @@ static class IsometricTileTypeClassExt : public IsometricTileTypeClass
  * 
  *  @author: CCHyper
  */
-const ShapeFileStruct * IsometricTileTypeClassExt::_Get_Image_Data()
+const ShapeSet * IsometricTileTypeClassExt::_Get_Image_Data()
 {
     if (Image) {
         return Image;

src/extensions/isotiletype/isotiletypeext_hooks.cpp

@@ -59,7 +59,7 @@ static class ObjectTypeClassExt : public ObjectTypeClass
 {
     public:
         void _Assign_Theater_Name(char *buffer, TheaterType theater);
-        const ShapeFileStruct * _Get_Image_Data() const;
+        const ShapeSet * _Get_Image_Data() const;
         void _Fetch_Voxel_Image();
         static void _Clear_Voxel_Indexes();
 };
@@ -150,7 +150,7 @@ DECLARE_PATCH(_ObjectTypeClass_Load_Theater_Art_Assign_Theater_Name_Theater_Patc
  * 
  *  @author: CCHyper
  */
-const ShapeFileStruct * ObjectTypeClassExt::_Get_Image_Data() const
+const ShapeSet * ObjectTypeClassExt::_Get_Image_Data() const
 {
     if (Image == nullptr) {
         DEBUG_WARNING("Object %s has NULL image data!\n", Name());

src/extensions/objecttype/objecttypeext_hooks.cpp

@@ -88,7 +88,7 @@ DECLARE_PATCH(_OverlayTypeClass_SDDTOR_Free_Image_Patch) { GET_REGISTER_STATIC(O
 DECLARE_PATCH(_OverlayTypeClass_Get_Image_Data_Assertion_Patch)
 {
     GET_REGISTER_STATIC(OverlayTypeClass *, this_ptr, esi);
-    GET_REGISTER_STATIC(const ShapeFileStruct *, image, eax);
+    GET_REGISTER_STATIC(const ShapeSet *, image, eax);
 
     if (image == nullptr) {
         DEBUG_WARNING("Overlay %s has NULL image data!\n", this_ptr->Name());