diff stru6.cpp @ 515:cb0ad52d6a26

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 dd5124185551
children 8b77231088d8
line wrap: on
line diff
--- a/stru6.cpp	Fri Mar 01 18:23:49 2013 +0200
+++ b/stru6.cpp	Fri Mar 01 21:13:12 2013 +0200
@@ -1,5 +1,5 @@
 #include "stru6.h"
-#include "LayingItem.h"
+#include "SpriteObject.h"
 #include "IndoorCameraD3D.h"
 #include "ParticleEngine.h"
 #include "Game.h"
@@ -146,10 +146,10 @@
 }
 
 //----- (004A73AA) --------------------------------------------------------
-void stru6::_4A73AA_hanging_trace_particles___like_fire_strike_ice_blast_etc(LayingItem *a2, unsigned int uDiffuse, unsigned int uTextureID)
+void stru6::_4A73AA_hanging_trace_particles___like_fire_strike_ice_blast_etc(SpriteObject *a2, unsigned int uDiffuse, unsigned int uTextureID)
 {
   stru6 *v4; // edi@1
-  LayingItem *v5; // esi@1
+  SpriteObject *v5; // esi@1
   int v6; // eax@1
   stru6_stru2 *v7; // eax@2
   double v8; // st7@2
@@ -217,7 +217,7 @@
 }
 
 //----- (004A75CC) --------------------------------------------------------
-void stru6::_4A75CC_single_spell_collision_particle(LayingItem *a1, unsigned int uDiffuse, unsigned int uTextureID)
+void stru6::_4A75CC_single_spell_collision_particle(SpriteObject *a1, unsigned int uDiffuse, unsigned int uTextureID)
 {
   double v4; // st7@1
   signed int v5; // edi@1
@@ -246,9 +246,9 @@
 }
 
 //----- (004A7688) --------------------------------------------------------
-void stru6::_4A7688_fireball_collision_particle(LayingItem *a2)
+void stru6::_4A7688_fireball_collision_particle(SpriteObject *a2)
 {
-  LayingItem *v2; // esi@1
+  SpriteObject *v2; // esi@1
   double v3; // st7@1
   double v4; // st7@2
   double v5; // st7@4
@@ -309,9 +309,9 @@
 }
 
 //----- (004A77FD) --------------------------------------------------------
-void stru6::_4A77FD_some_stuff_d3d(LayingItem *a1)
+void stru6::_4A77FD_some_stuff_d3d(SpriteObject *a1)
 {
-  LayingItem *v2; // esi@1
+  SpriteObject *v2; // esi@1
   stru6 *v3; // edi@1
   double v4; // st7@1
   double v5; // st7@2
@@ -343,7 +343,7 @@
 }
 
 //----- (004A78AE) --------------------------------------------------------
-void stru6::_4A78AE_sparks_spell(LayingItem *a1)
+void stru6::_4A78AE_sparks_spell(SpriteObject *a1)
 {
   ObjectDesc *v2; // esi@1
   unsigned int v3; // eax@1
@@ -369,7 +369,7 @@
 }
 
 //----- (004A7948) --------------------------------------------------------
-void stru6::_4A7948_mind_blast_after_effect(LayingItem *a1)
+void stru6::_4A7948_mind_blast_after_effect(SpriteObject *a1)
 {
   ObjectDesc *v2; // esi@1
   unsigned int v3; // eax@1
@@ -404,7 +404,7 @@
 }
 
 //----- (004A7A27) --------------------------------------------------------
-bool stru6::AddMobileLight(LayingItem *a1, unsigned int uDiffuse, int uRadius)
+bool stru6::AddMobileLight(SpriteObject *a1, unsigned int uDiffuse, int uRadius)
 {
   return pMobileLightsStack->AddLight(
            a1->vPosition.x,
@@ -420,7 +420,7 @@
 // 4E94D3: using guessed type char byte_4E94D3;
 
 //----- (004A7A66) --------------------------------------------------------
-void stru6::_4A7A66_miltiple_spell_collision_partifles___like_after_sparks_or_lightning(LayingItem *a1, unsigned int uDiffuse, unsigned int uTextureID, float a4)
+void stru6::_4A7A66_miltiple_spell_collision_partifles___like_after_sparks_or_lightning(SpriteObject *a1, unsigned int uDiffuse, unsigned int uTextureID, float a4)
 {
   int v5; // eax@1
   char v6; // al@1
@@ -488,10 +488,10 @@
 }
 
 //----- (004A7C07) --------------------------------------------------------
-void stru6::_4A7C07(LayingItem *a2)
+void stru6::_4A7C07(SpriteObject *a2)
 {
   stru6 *v2; // edi@1
-  LayingItem *v3; // esi@1
+  SpriteObject *v3; // esi@1
   int v4; // eax@1
   ObjectDesc *v5; // ebx@1
   stru6_stru2 *v6; // eax@2
@@ -563,7 +563,7 @@
 }
 
 //----- (004A7E05) --------------------------------------------------------
-void stru6::AddProjectile(LayingItem *a2, int a3, unsigned int uTextureID)
+void stru6::AddProjectile(SpriteObject *a2, int a3, unsigned int uTextureID)
 {
   int v4; // edx@1
   float v5; // ST14_4@2
@@ -710,7 +710,7 @@
 }
 
 //----- (004A80DC) --------------------------------------------------------
-void stru6::_4A80DC_some_stuff_sw(LayingItem *a2)
+void stru6::_4A80DC_some_stuff_sw(SpriteObject *a2)
 {
   stru6 *v2; // esi@1
   signed int v3; // ebx@1
@@ -739,7 +739,7 @@
 }
 
 //----- (004A81CA) --------------------------------------------------------
-bool stru6::_4A81CA(LayingItem *a2)
+bool stru6::_4A81CA(SpriteObject *a2)
 {
   stru6 *v2; // ebx@1
   int result; // eax@1
@@ -761,7 +761,7 @@
   int v19; // eax@141
   int v20; // eax@151
   unsigned int v21; // [sp-8h] [bp-20h]@66
-  LayingItem *v22; // [sp-8h] [bp-20h]@81
+  SpriteObject *v22; // [sp-8h] [bp-20h]@81
   unsigned int v23; // [sp-4h] [bp-1Ch]@4
   unsigned int v24; // [sp-4h] [bp-1Ch]@5
   unsigned int v25; // [sp-4h] [bp-1Ch]@30
@@ -779,7 +779,7 @@
 
   __debugbreak(); // need to refactor carefully & collect data
   v2 = this;
-  result = a2->uItemType;
+  result = a2->uType;
   if ( result <= 545 )
   {
     if ( result != 545 )