Mercurial > mm7
diff AudioPlayer.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 | bbd8888534dc |
children | 96f48cfdd657 |
line wrap: on
line diff
--- a/AudioPlayer.cpp Fri Mar 01 18:23:49 2013 +0200 +++ b/AudioPlayer.cpp Fri Mar 01 21:13:12 2013 +0200 @@ -5,7 +5,7 @@ #include "Allocator.h" #include "FrameTableInc.h" #include "Indoor.h" -#include "LayingItem.h" +#include "SpriteObject.h" #include "Party.h" #include "Actor.h" #include "Game.h" @@ -635,7 +635,7 @@ signed int v14; // eax@20 int v15; // eax@24 signed int v16; // eax@25 - LayingItem *pLayingItem; // eax@28 + SpriteObject *pLayingItem; // eax@28 signed int v18; // eax@29 Actor *pActor1; // eax@32 signed int v20; // ecx@32 @@ -662,7 +662,7 @@ char *v41; // edi@82 int v42; // esi@82 double v43; // st7@91 - LayingItem *pLayingItem2; // eax@92 + SpriteObject *pLayingItem2; // eax@92 Actor *pActor; // eax@93 signed int v46; // ecx@93 double v47; // st7@93 @@ -675,7 +675,7 @@ float v54; // ST04_4@106 //AudioPlayer *pAudioPlayer3; // edx@106 SoundDesc *pSoundDesc; // edx@107 - LayingItem *pLayingItem3; // eax@114 + SpriteObject *pLayingItem3; // eax@114 //int v58; // edx@115 //int v59; // ecx@115 //Actor *pActor2; // eax@118 @@ -695,7 +695,7 @@ //unsigned int pVolume; // eax@157 //int pPartyX; // ebx@159 //int v76; // ebx@160 - //LayingItem *pLayingItem4; // edi@164 + //SpriteObject *pLayingItem4; // edi@164 //unsigned int pPosY; // edx@166 //unsigned int pPosX; // ecx@166 //int v80; // eax@167 @@ -829,8 +829,8 @@ start_channel = 5; end_channel = 7; - assert(object_id < uNumLayingItems); - auto object = &pLayingItems[object_id]; + assert(object_id < uNumSpriteObjects); + auto object = &pSpriteObjects[object_id]; sample_volume = GetSoundStrengthByDistanceFromParty(object->vPosition.x, object->vPosition.y, object->vPosition.z); if (!sample_volume) @@ -1008,8 +1008,8 @@ } else if (object_type == OBJECT_Item) { - assert(object_id < uNumLayingItems); - auto object = &pLayingItems[object_id]; + assert(object_id < uNumSpriteObjects); + auto object = &pSpriteObjects[object_id]; if (!GetSoundStrengthByDistanceFromParty(object->vPosition.x, object->vPosition.y, object->vPosition.z) ) return; AIL_set_sample_pan(channel->hSample, sub_4AB66C(object->vPosition.x, object->vPosition.y)); @@ -1087,7 +1087,7 @@ v96 = 7; v12 = 5; } - pLayingItem = &pLayingItems[a3 >> 3]; + pLayingItem = &pSpriteObjects[a3 >> 3]; } else { @@ -1160,7 +1160,7 @@ v12 = 4; v96 = 4; } - pLayingItem = (LayingItem *)&pLevelDecorations[a3 >> 3]; + pLayingItem = (SpriteObject *)&pLevelDecorations[a3 >> 3]; } pRenderVertexSoft.vWorldPosition.x = (double)pLayingItem->vPosition.x; pRenderVertexSoft.vWorldPosition.y = (double)pLayingItem->vPosition.y; @@ -1334,7 +1334,7 @@ } if ( (a3 & 7) == 2 ) { - pLayingItem2 = &pLayingItems[a3 >> 3]; + pLayingItem2 = &pSpriteObjects[a3 >> 3]; } else { @@ -1357,7 +1357,7 @@ v47 = (double)pParty->sEyelevel + (double)pParty->vPosition.z; goto LABEL_101; } - pLayingItem2 = (LayingItem *)&pLevelDecorations[a3 >> 3]; + pLayingItem2 = (SpriteObject *)&pLevelDecorations[a3 >> 3]; } pRenderVertexSoft.vWorldPosition.x = (double)pLayingItem2->vPosition.x; pRenderVertexSoft.vWorldPosition.y = (double)pLayingItem2->vPosition.y; @@ -1393,7 +1393,7 @@ int v9; // ebx@10 int v10; // ebx@11 double v11; // st7@13 - LayingItem *v12; // eax@14 + SpriteObject *v12; // eax@14 Actor *v13; // eax@15 signed int v14; // edx@15 BLVDoor *v15; // eax@19 @@ -1413,12 +1413,12 @@ //unsigned __int8 v29; // of@43 //MixerChannel *v30; // esi@44 //int v31; // eax@45 - //LayingItem *v32; // eax@49 + //SpriteObject *v32; // eax@49 //Actor *v33; // edi@50 //int v34; // eax@50 //unsigned int v35; // edx@51 //unsigned int v36; // ecx@51 - //LayingItem *v37; // edi@53 + //SpriteObject *v37; // edi@53 int v38; // eax@53 //BLVDoor *v39; // edi@56 //int v40; // eax@57 @@ -1527,11 +1527,11 @@ v11 = (double)pParty->sEyelevel + (double)pParty->vPosition.z; goto LABEL_21; } - v12 = (LayingItem *)&pLevelDecorations[v6->field_4 >> 3]; + v12 = (SpriteObject *)&pLevelDecorations[v6->field_4 >> 3]; } else { - v12 = &pLayingItems[v6->field_4 >> 3]; + v12 = &pSpriteObjects[v6->field_4 >> 3]; } a1.vWorldPosition.x = (double)v12->vPosition.x; a1.vWorldPosition.y = (double)v12->vPosition.y; @@ -1662,8 +1662,8 @@ case OBJECT_Item: { - assert(source_id < uNumLayingItems); - auto object = &pLayingItems[source_id]; + assert(source_id < uNumSpriteObjects); + auto object = &pSpriteObjects[source_id]; source_x = object->vPosition.x; source_y = object->vPosition.y; @@ -1674,7 +1674,7 @@ case OBJECT_Decoration: { assert(source_id < uNumLevelDecorations); - auto object = (LayingItem *)&pLevelDecorations[source_id]; + auto object = (SpriteObject *)&pLevelDecorations[source_id]; source_x = object->vPosition.x; source_y = object->vPosition.y;