diff mm7_2.cpp @ 1296:c423f946dc99

moving files continue
author Ritor1
date Tue, 18 Jun 2013 17:28:11 +0600
parents d8033eb56d7e
children 5450af4f57ef
line wrap: on
line diff
--- a/mm7_2.cpp	Mon Jun 17 17:34:01 2013 +0600
+++ b/mm7_2.cpp	Tue Jun 18 17:28:11 2013 +0600
@@ -4671,220 +4671,6 @@
   return 1;
 }
 
-//----- (00459064) --------------------------------------------------------
-void ObjectList::InitializeSprites()
-{
-  for (uint i = 0; i < uNumObjects; ++i)
-    pSpriteFrameTable->InitializeSprite(pObjects[i].uSpriteID);
-}
-
-//----- (00459090) --------------------------------------------------------
-void ObjectList::ToFile()
-{
-  ObjectList *v1; // esi@1
-  FILE *v2; // eax@1
-  FILE *v3; // edi@1
-
-  v1 = this;
-  v2 = fopen("data\\dobjlist.bin", "wb");
-  v3 = v2;
-  if ( !v2 )
-    Abortf("Unable to save dobjlist.bin!");
-  fwrite(v1, 4u, 1u, v2);
-  fwrite(v1->pObjects, 0x38u, v1->uNumObjects, v3);
-  fclose(v3);
-}
-
-//----- (004590DC) --------------------------------------------------------
-void ObjectList::FromFile(void *pSerialized)
-{
-  uNumObjects = *(int *)pSerialized;
-  pObjects = (ObjectDesc *)pAllocator->AllocNamedChunk(pObjects, 56 * uNumObjects, "Obj Descrip");
-  memcpy(pObjects, (char *)pSerialized + 4, 56 * uNumObjects);
-}
-
-//----- (00459123) --------------------------------------------------------
-bool ObjectList::FromFileTxt(const char *Args)
-{
-  ObjectList *v2; // ebx@1
-  __int32 v3; // edi@1
-  FILE *v4; // eax@1
-  unsigned int v5; // esi@3
-  void *v6; // eax@9
-  FILE *v7; // ST0C_4@11
-  char *i; // eax@11
-  unsigned __int16 v9; // ax@14
-  const char *v10; // ST20_4@14
-  __int16 v11; // ax@14
-  const char *v12; // ST1C_4@14
-  __int16 v13; // ax@14
-  const char *v14; // ST18_4@14
-  __int16 v15; // ax@14
-  const char *v16; // ST14_4@14
-  __int16 v17; // ax@14
-  const char *v18; // ST10_4@14
-  __int16 v19; // ax@14
-  const char *v20; // ST0C_4@14
-  int v21; // esi@16
-  const char *v22; // edi@16
-  int v23; // eax@17
-  int v24; // eax@19
-  int v25; // eax@21
-  int v26; // eax@21
-  int v27; // eax@21
-  int v28; // eax@23
-  int v29; // eax@25
-  int v30; // eax@27
-  int v31; // eax@29
-  const char *v32; // edi@30
-  const char *v33; // ST20_4@35
-  int v34; // eax@35
-  char v35; // al@35
-  const char *v36; // ST1C_4@35
-  char v37; // al@35
-  const char *v38; // ST18_4@35
-  FrameTableTxtLine v40; // [sp+8h] [bp-460h]@14
-  FrameTableTxtLine v41; // [sp+84h] [bp-3E4h]@12
-  char Dest; // [sp+100h] [bp-368h]@14
-  char Buf; // [sp+178h] [bp-2F0h]@3
-  FrameTableTxtLine v44; // [sp+36Ch] [bp-FCh]@4
-  FrameTableTxtLine v45; // [sp+3E8h] [bp-80h]@4
-  FILE *File; // [sp+464h] [bp-4h]@1
-  unsigned int Argsa; // [sp+470h] [bp+8h]@3
-  int Argsb; // [sp+470h] [bp+8h]@15
-
-  v2 = this;
-  pAllocator->FreeChunk(this->pObjects);
-  v3 = 0;
-  v2->pObjects = 0;
-  v2->uNumObjects = 0;
-  v4 = fopen(Args, "r");
-  File = v4;
-  if ( !v4 )
-    Abortf("ObjectDescriptionList::load - Unable to open file: %s.");
-  v5 = 0;
-  Argsa = 0;
-  if ( fgets(&Buf, 490, v4) )
-  {
-    do
-    {
-      *strchr(&Buf, 10) = 0;
-      memcpy(&v45, frame_table_txt_parser(&Buf, &v44), sizeof(v45));
-      if ( v45.uPropCount && *v45.pProperties[0] != '/' )
-        ++Argsa;
-    }
-    while ( fgets(&Buf, 490, File) );
-    v5 = Argsa;
-    v3 = 0;
-  }
-  v2->uNumObjects = v5;
-  v6 = pAllocator->AllocNamedChunk(v2->pObjects, 56 * v5, "Obj Descrip");
-  v2->pObjects = (ObjectDesc *)v6;
-  if ( v6 == (void *)v3 )
-    Abortf("ObjectDescriptionList::load - Out of Memory!");
-  memset(v6, v3, 56 * v2->uNumObjects);
-  v7 = File;
-  v2->uNumObjects = v3;
-  fseek(v7, v3, v3);
-  for ( i = fgets(&Buf, 490, File); i; i = fgets(&Buf, 490, File) )
-  {
-    *strchr(&Buf, 10) = 0;
-    memcpy(&v45, frame_table_txt_parser(&Buf, &v41), sizeof(v45));
-    if ( v45.uPropCount && *v45.pProperties[0] != 47 )
-    {
-      strcpy(v2->pObjects[v2->uNumObjects].field_0, v45.pProperties[0]);
-      v9 = pSpriteFrameTable->FastFindSprite((char *)v45.pProperties[1]);
-      v10 = v45.pProperties[2];
-      v2->pObjects[v2->uNumObjects].uSpriteID = v9;
-      v11 = atoi(v10);
-      v12 = v45.pProperties[3];
-      v2->pObjects[v2->uNumObjects].uObjectID = v11;
-      v13 = atoi(v12);
-      v14 = v45.pProperties[4];
-      v2->pObjects[v2->uNumObjects].uRadius = v13;
-      v15 = atoi(v14);
-      v16 = v45.pProperties[5];
-      v2->pObjects[v2->uNumObjects].uHeight = v15;
-      v17 = atoi(v16);
-      v18 = v45.pProperties[6];
-      v2->pObjects[v2->uNumObjects].uLifetime = v17;
-      v19 = atoi(v18);
-      v20 = v45.pProperties[7];
-      v2->pObjects[v2->uNumObjects].uSpeed = v19;
-      strcpy(&Dest, v20);
-      memcpy(&v44, frame_table_txt_parser(&Dest, &v40), sizeof(v44));
-      if ( v45.uPropCount > 7 )
-      {
-        for ( Argsb = 0; Argsb < v44.uPropCount; ++Argsb )
-        {
-          v21 = Argsb;
-          v22 = v44.pProperties[Argsb];
-          if ( !_stricmp(v44.pProperties[Argsb], "NoDraw") )
-          {
-            v23 = (int)&v2->pObjects[v2->uNumObjects].uFlags;
-            *(char *)v23 |= 1u;
-          }
-          if ( !_stricmp(v22, "Lifetime") )
-          {
-            v24 = (int)&v2->pObjects[v2->uNumObjects].uFlags;
-            *(char *)v24 |= 4u;
-          }
-          if ( !_stricmp(v22, "FTLifetime") )
-          {
-            v25 = (int)&v2->pObjects[v2->uNumObjects];
-            *(short *)(v25 + 42) = 8 * pSpriteFrameTable->pSpriteSFrames[*(short *)(v25 + 40)].uAnimLength;
-            v26 = (int)&v2->pObjects[v2->uNumObjects].uFlags;
-            *(char *)v26 |= 8u;
-            v27 = (int)&v2->pObjects[v2->uNumObjects].uFlags;
-            *(char *)v27 |= 4u;
-          }
-          if ( !_stricmp(v22, "NoPickup") )
-          {
-            v28 = (int)&v2->pObjects[v2->uNumObjects].uFlags;
-            *(char *)v28 |= 0x10u;
-          }
-          if ( !_stricmp(v22, "NoGravity") )
-          {
-            v29 = (int)&v2->pObjects[v2->uNumObjects].uFlags;
-            *(char *)v29 |= 0x20u;
-          }
-          if ( !_stricmp(v22, "FlagOnIntercept") )
-          {
-            v30 = (int)&v2->pObjects[v2->uNumObjects].uFlags;
-            *(char *)v30 |= 0x40u;
-          }
-          if ( !_stricmp(v22, "Bounce") )
-          {
-            v31 = (int)&v2->pObjects[v2->uNumObjects].uFlags;
-            *(char *)v31 |= 0x80u;
-          }
-          v32 = v45.pProperties[v21];
-          if ( !_stricmp(v45.pProperties[v21], "Fire") )
-            HIBYTE(v2->pObjects[v2->uNumObjects].uFlags) |= 2u;
-          if ( !_stricmp(v32, "Lines") )
-            HIBYTE(v2->pObjects[v2->uNumObjects].uFlags) |= 4u;
-          if ( !_stricmp(v44.pProperties[v21], "bits") )
-          {
-            v33 = v44.pProperties[v21 + 1];
-            v34 = (int)&v2->pObjects[v2->uNumObjects].uFlags;
-            *(char *)(v34 + 1) |= 1u;
-            v35 = atoi(v33);
-            v36 = v44.pProperties[v21 + 2];
-            v2->pObjects[v2->uNumObjects].uParticleTrailColorR = v35;
-            v37 = atoi(v36);
-            v38 = v44.pProperties[v21 + 3];
-            v2->pObjects[v2->uNumObjects].uParticleTrailColorG = v37;
-            v2->pObjects[v2->uNumObjects].uParticleTrailColorB = atoi(v38);
-          }
-        }
-      }
-      ++v2->uNumObjects;
-    }
-  }
-  fclose(File);
-  return 1;
-}
-
 //----- (0045E03A) --------------------------------------------------------
 unsigned short * MakeScreenshot( signed int width, signed int height )
 {