comparison mm7_3.cpp @ 823:c1da83d8223f

More spell renames
author Nomad
date Tue, 26 Mar 2013 20:05:57 +0200
parents c232f160e6f3
children fe4c8b113548
comparison
equal deleted inserted replaced
822:c232f160e6f3 823:c1da83d8223f
1388 { 1388 {
1389 //v3 = item->uObjectDescID; 1389 //v3 = item->uObjectDescID;
1390 v4 = &pObjectList->pObjects[item->uObjectDescID]; 1390 v4 = &pObjectList->pObjects[item->uObjectDescID];
1391 if (item->AttachedToActor()) 1391 if (item->AttachedToActor())
1392 { 1392 {
1393 v5 = item->field_5C >> 3; 1393 v5 = item->spell_target_pid >> 3;
1394 *(int *)(v2 - 26) = pActors[v5].vPosition.x; 1394 *(int *)(v2 - 26) = pActors[v5].vPosition.x;
1395 *(int *)(v2 - 22) = pActors[v5].vPosition.y; 1395 *(int *)(v2 - 22) = pActors[v5].vPosition.y;
1396 *(int *)(v2 - 18) = pActors[v5].vPosition.z + pActors[v5].uActorHeight; 1396 *(int *)(v2 - 18) = pActors[v5].vPosition.z + pActors[v5].uActorHeight;
1397 if ( !item->uObjectDescID || (v6 = LOWORD(pEventTimer->uTimeElapsed) + *(short *)v2, *(short *)v2 = v6, !(v4->uFlags & 4)) ) 1397 if ( !item->uObjectDescID || (v6 = LOWORD(pEventTimer->uTimeElapsed) + *(short *)v2, *(short *)v2 = v6, !(v4->uFlags & 4)) )
1398 goto LABEL_36; 1398 goto LABEL_36;
13851 a1.uAttributes = 16; 13851 a1.uAttributes = 16;
13852 a1.uSectorID = pIndoor->GetSector(fromx, fromy, fromz); 13852 a1.uSectorID = pIndoor->GetSector(fromx, fromy, fromz);
13853 a1.field_60_distance_related_prolly_lod = v55; 13853 a1.field_60_distance_related_prolly_lod = v55;
13854 a1.uSpriteFrameID = 0; 13854 a1.uSpriteFrameID = 0;
13855 a1.spell_caster_pid = 8000 | OBJECT_Item; 13855 a1.spell_caster_pid = 8000 | OBJECT_Item;
13856 a1.field_5C = 4; 13856 a1.spell_target_pid = 4;
13857 a1.uSoundID = 0; 13857 a1.uSoundID = 0;
13858 for ( i = a7c / -2; i <= a7c / 2; i += a8b ) 13858 for ( i = a7c / -2; i <= a7c / 2; i += a8b )
13859 { 13859 {
13860 a1.uFacing = i + yaw; 13860 a1.uFacing = i + yaw;
13861 a1.Create( 13861 a1.Create(
13892 a1.uSectorID = pIndoor->GetSector(fromx, fromy, fromz); 13892 a1.uSectorID = pIndoor->GetSector(fromx, fromy, fromz);
13893 a1.field_60_distance_related_prolly_lod = v55; 13893 a1.field_60_distance_related_prolly_lod = v55;
13894 v20 = yaw; 13894 v20 = yaw;
13895 a1.uSpriteFrameID = 0; 13895 a1.uSpriteFrameID = 0;
13896 a1.spell_caster_pid = 8000 | OBJECT_Item; 13896 a1.spell_caster_pid = 8000 | OBJECT_Item;
13897 a1.field_5C = 0; 13897 a1.spell_target_pid = 0;
13898 a1.uFacing = yaw; 13898 a1.uFacing = yaw;
13899 a1.uSoundID = 0; 13899 a1.uSoundID = 0;
13900 v51 = 0; 13900 v51 = 0;
13901 v49 = pObjectList->pObjects[(signed __int16)a1.uObjectDescID].uSpeed; 13901 v49 = pObjectList->pObjects[(signed __int16)a1.uObjectDescID].uSpeed;
13902 v47 = pitch; 13902 v47 = pitch;
13946 a1.uAttributes = 16; 13946 a1.uAttributes = 16;
13947 a1.uSectorID = pIndoor->GetSector(fromx, fromy, fromz); 13947 a1.uSectorID = pIndoor->GetSector(fromx, fromy, fromz);
13948 a1.field_60_distance_related_prolly_lod = v55; 13948 a1.field_60_distance_related_prolly_lod = v55;
13949 a1.uSpriteFrameID = 0; 13949 a1.uSpriteFrameID = 0;
13950 a1.spell_caster_pid = 8000 | OBJECT_Item; 13950 a1.spell_caster_pid = 8000 | OBJECT_Item;
13951 a1.field_5C = 4; 13951 a1.spell_target_pid = 4;
13952 a1.uSoundID = 0; 13952 a1.uSoundID = 0;
13953 for ( j = a7d / -2; j <= a7d / 2; j += a8c ) 13953 for ( j = a7d / -2; j <= a7d / 2; j += a8c )
13954 { 13954 {
13955 a1.uFacing = j + yaw; 13955 a1.uFacing = j + yaw;
13956 a1.Create( 13956 a1.Create(
14100 a1.uAttributes = 16; 14100 a1.uAttributes = 16;
14101 a1.uSectorID = pIndoor->GetSector(fromx, fromy, fromz); 14101 a1.uSectorID = pIndoor->GetSector(fromx, fromy, fromz);
14102 a1.field_60_distance_related_prolly_lod = v55; 14102 a1.field_60_distance_related_prolly_lod = v55;
14103 a1.uSpriteFrameID = 0; 14103 a1.uSpriteFrameID = 0;
14104 a1.spell_caster_pid = 8000 | OBJECT_Item; 14104 a1.spell_caster_pid = 8000 | OBJECT_Item;
14105 a1.field_5C = 4; 14105 a1.spell_target_pid = 4;
14106 a1.uSoundID = 0; 14106 a1.uSoundID = 0;
14107 v51 = 0; 14107 v51 = 0;
14108 v49 = pObjectList->pObjects[(signed __int16)a1.uObjectDescID].uSpeed; 14108 v49 = pObjectList->pObjects[(signed __int16)a1.uObjectDescID].uSpeed;
14109 v20 = yaw; 14109 v20 = yaw;
14110 v47 = (signed int)stru_5C6E00->uIntegerHalfPi / 2; 14110 v47 = (signed int)stru_5C6E00->uIntegerHalfPi / 2;