Mercurial > mm7

diff Outdoor.cpp @ 515:cb0ad52d6a26

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
LayingItem -> SpriteObject (long-waited rename, old name was inaccurate and confused people) Some object-related subs moved to SpriteObject.cpp
author Nomad
date Fri, 01 Mar 2013 21:13:12 +0200
parents 870358928460
children 1b813023fcbd
line wrap: on
line diff
--- a/Outdoor.cpp	Fri Mar 01 18:23:49 2013 +0200
+++ b/Outdoor.cpp	Fri Mar 01 21:13:12 2013 +0200
@@ -2,7 +2,7 @@
 
 #include "Outdoor.h"
 #include "Party.h"
-#include "LayingItem.h"
+#include "SpriteObject.h"
 #include "LOD.h"
 #include "Render.h"
 #include "MapInfo.h"
@@ -135,7 +135,7 @@
   if (!pOutdoorCamera->bDoNotRenderDecorations)
     pRenderer->PrepareDecorationsRenderList_ODM();
 
-  pRenderer->DrawLayingItems_Shooting_Magic_ODM();
+  pRenderer->DrawSpriteObjects_ODM();
   pRenderer->TransformBillboardsAndSetPalettesODM();
   sub_485F53((Vec2_int_ *)unnamed_6BE060);
 }
@@ -1209,7 +1209,7 @@
   __int16 v20; // ax@16
   int v21; // ecx@16
   ODMFace *v22; // ebx@26
-  LayingItem *pItems; // ecx@27
+  SpriteObject *pItems; // ecx@27
   unsigned int v24; // eax@28
   //unsigned __int8 v25; // zf@28
   //unsigned __int8 v26; // sf@28
@@ -1391,7 +1391,7 @@
     fseek((FILE *)v7, v114, 0);
     fread(&uNumBModels, 4u, 1u, (FILE *)v7);
     fseek((FILE *)v7, v115, 0);
-    fread(&uNumLayingItems, 4u, 1u, (FILE *)v7);
+    fread(&uNumSpriteObjects, 4u, 1u, (FILE *)v7);
     fseek((FILE *)v7, v116, 0);
     fread(&uNumLevelDecorations, 4u, 1u, (FILE *)v7);
     fseek((FILE *)v7, v117, 0);
@@ -1518,11 +1518,11 @@
 LABEL_26:
     v22 = File;
     fseek((FILE *)File, v124, 0);
-    fread(pLayingItems, 0x70u, uNumLayingItems, (FILE *)v22);
-    if ( (signed int)uNumLayingItems > 0 )
+    fread(pSpriteObjects, 0x70u, uNumSpriteObjects, (FILE *)v22);
+    if ( (signed int)uNumSpriteObjects > 0 )
     {
-      pItems = pLayingItems;
-      pNumItems = uNumLayingItems;
+      pItems = pSpriteObjects;
+      pNumItems = uNumSpriteObjects;
       do
       {
         v24 = pItems->stru_24.uItemID;
@@ -2222,15 +2222,15 @@
   //v92 = (char *)v91 + (int)pFilename;
   pGameLoadingUI_ProgressBar->Progress();
 
-  memcpy(&uNumLayingItems, pSrc, 4);
-  assert(uNumLayingItems <= 1000 && "Too many objects");
-  assert(sizeof(LayingItem) == 112);
+  memcpy(&uNumSpriteObjects, pSrc, 4);
+  assert(uNumSpriteObjects <= 1000 && "Too many objects");
+  assert(sizeof(SpriteObject) == 112);
 
   pGameLoadingUI_ProgressBar->Progress();
 
-  //pFilename = (char *)(112 * uNumLayingItems);
-  memcpy(pLayingItems, pSrc + 4, uNumLayingItems * sizeof(LayingItem));
-  pSrc += 4 + uNumLayingItems * sizeof(LayingItem);
+  //pFilename = (char *)(112 * uNumSpriteObjects);
+  memcpy(pSpriteObjects, pSrc + 4, uNumSpriteObjects * sizeof(SpriteObject));
+  pSrc += 4 + uNumSpriteObjects * sizeof(SpriteObject);
 
   //v94 = (char *)v93 + (int)pFilename;
   pGameLoadingUI_ProgressBar->Progress();
@@ -2730,9 +2730,9 @@
 
   v5 = this;
   v1 = 0;
-  if ( (signed int)uNumLayingItems > 0 )
+  if ( (signed int)uNumSpriteObjects > 0 )
   {
-    v2 = (char *)&pLayingItems[0].uObjectDescID;
+    v2 = (char *)&pSpriteObjects[0].uObjectDescID;
     do
     {
       if ( *(short *)v2 )
@@ -2750,7 +2750,7 @@
       ++v1;
       v2 += 112;
     }
-    while ( v1 < (signed int)uNumLayingItems );
+    while ( v1 < (signed int)uNumSpriteObjects );
   }
   pGameLoadingUI_ProgressBar->Progress();
   return 1;