mm7: mm7_6.cpp comparison

comparison mm7_6.cpp @ 303:3dcc9d945eeb

DamageMonsterFromParty

author	Nomad
date	Tue, 19 Feb 2013 15:39:50 +0200
parents	640a176c030f
children	cc8e4dc397ec

comparison

equal deleted inserted replaced

-:af7e848d6def
+:3dcc9d945eeb
 a1.vPosition.y = pParty->vPosition.y;
 a1.uAttributes = 0;
 a1.uSpriteFrameID = 0;
 a1.vPosition.z = pParty->vPosition.z + (signed int)pParty->uPartyHeight / 3;
 v19 = 8 * v3->uPlayerID;
-LOBYTE(v19) = v19 | 4;
+LOBYTE(v19) = v19 | OBJECT_Player;
-a1.field_58 = v19;
+a1.field_58_pid = v19;
 a1.field_5C = a2;
 a1.field_60_distance_related_prolly_lod = LOBYTE(v715.uDistance);
 a1.uFacing = LOWORD(v715.uYawAngle);
 a1.uSoundID = LOWORD(v3->field_10);
 v20 = (char *)&pParty->pPlayers[v3->uPlayerID];
 a1.vPosition.y = pParty->vPosition.y;
 a1.uAttributes = 0;
 a1.uSpriteFrameID = 0;
 a1.vPosition.z = pParty->vPosition.z + (signed int)pParty->uPartyHeight / 2;
 v22 = 8 * v3->uPlayerID;
-LOBYTE(v22) = v22 | 4;
+LOBYTE(v22) = v22 | OBJECT_Player;
-a1.field_58 = v22;
+a1.field_58_pid = v22;
 a1.field_5C = a2;
 a1.field_60_distance_related_prolly_lod = LOBYTE(v715.uDistance);
 a1.uFacing = LOWORD(v715.uYawAngle);
 a1.uSoundID = LOWORD(v3->field_10);
 memcpy(
 pParty->vPosition.x,
 pParty->vPosition.y,
 pParty->vPosition.z + (signed int)pParty->uPartyHeight / 3);
 a1.uSpriteFrameID = v1;
 v34 = 8 * v3->uPlayerID;
-LOBYTE(v34) = v34 | 4;
+LOBYTE(v34) = v34 | OBJECT_Player;
-a1.field_58 = v34;
+a1.field_58_pid = v34;
 a1.field_5C = a2;
 a1.field_60_distance_related_prolly_lod = LOBYTE(v715.uDistance);
 a1.uFacing = LOWORD(v715.uYawAngle);
 a1.uSoundID = LOWORD(v3->field_10);
 if ( pParty->bTurnBasedModeOn == 1 )
 a1.uSectorID = v1;
 a1.uSpriteFrameID = v1;
 v37 = v3->uPlayerID;
 a1.field_60_distance_related_prolly_lod = 0;
 v37 *= 8;
-LOBYTE(v37) = v37 | 4;
+LOBYTE(v37) = v37 | OBJECT_Player;
 a1.uFacing = v1;
-a1.field_58 = v37;
+a1.field_58_pid = v37;
 v38 = a2 >> 3;
 a1.uSoundID = LOWORD(v3->field_10);
 v39 = a2 >> 3;
 a1.vPosition.x = pActors[v39].vPosition.x;
 v40 = pActors[v39].vPosition.y;
 a1.uSpriteFrameID = v1;
 v44 = v3->uPlayerID;
 a1.field_60_distance_related_prolly_lod = 0;
 a1.uFacing = v1;
 v44 *= 8;
-LOBYTE(v44) = v44 | 4;
+LOBYTE(v44) = v44 | OBJECT_Player;
 v38 = (signed int)v726;
-a1.field_58 = v44;
+a1.field_58_pid = v44;
 a1.uSoundID = LOWORD(v3->field_10);
 a1.vPosition.x = *(__int16 *)((char *)&pActors[0].vPosition.x + HIDWORD(v733));
 v45 = *(__int16 *)((char *)&pActors[0].vPosition.y + HIDWORD(v733));
 a1.vPosition.z = *(__int16 *)((char *)&pActors[0].vPosition.z + HIDWORD(v733));
 v46 = 8 * (int)v726;
 a1.vPosition.z = *(short *)(HIDWORD(v733) + 138);
 a1.uAttributes = v1;
 a1.uSectorID = pIndoor->GetSector(a1.vPosition.x, a1.vPosition.y, v48);
 a1.uSpriteFrameID = v1;
 v49 = 8 * v3->uPlayerID;
-LOBYTE(v49) = v49 | 4;
+LOBYTE(v49) = v49 | OBJECT_Player;
-a1.field_58 = v49;
+a1.field_58_pid = v49;
 a1.field_5C = a2;
 a1.field_60_distance_related_prolly_lod = LOBYTE(v715.uDistance);
 a1.uFacing = LOWORD(v715.uYawAngle);
 LOWORD(v49) = LOWORD(v3->field_10);
 LOBYTE(a1.uAttributes) |= 0x80u;
 pParty->vPosition.x,
 pParty->vPosition.y,
 pParty->vPosition.z + (signed int)pParty->uPartyHeight / 3);
 a1.uSpriteFrameID = v1;
 v50 = 8 * v3->uPlayerID;
-LOBYTE(v50) = v50 | 4;
+LOBYTE(v50) = v50 | OBJECT_Player;
-a1.field_58 = v50;
+a1.field_58_pid = v50;
 a1.field_5C = a2;
 a1.field_60_distance_related_prolly_lod = LOBYTE(v715.uDistance);
 a1.uFacing = LOWORD(v715.uYawAngle);
 a1.uSoundID = LOWORD(v3->field_10);
 if ( pParty->bTurnBasedModeOn == 1 )
 pParty->vPosition.x,
 pParty->vPosition.y,
 pParty->vPosition.z + (signed int)pParty->uPartyHeight / 3);
 a1.uSpriteFrameID = v1;
 v62 = 8 * v3->uPlayerID;
-LOBYTE(v62) = v62 | 4;
+LOBYTE(v62) = v62 | OBJECT_Player;
-a1.field_58 = v62;
+a1.field_58_pid = v62;
 a1.field_5C = a2;
 a1.field_60_distance_related_prolly_lod = LOBYTE(v715.uDistance);
 a1.uFacing = LOWORD(v715.uYawAngle);
 a1.uSoundID = LOWORD(v3->field_10);
 a1.field_50 = v731;
 a1.uObjectDescID = pObjectList->ObjectIDByItemID(a1.uItemType);
 a1.uAttributes = 0;
 a1.uSectorID = 0;
 a1.uSpriteFrameID = 0;
 v120 = 8 * *(short *)(v119 + 2);
-LOBYTE(v120) = v120 | 4;
+LOBYTE(v120) = v120 | OBJECT_Player;
 a1.field_60_distance_related_prolly_lod = 0;
-a1.field_58 = v120;
+a1.field_58_pid = v120;
 a1.uFacing = 0;
 a1.uSoundID = *(short *)(v119 + 16);
 a1.vPosition.x = v112->vPosition.x;
 a1.vPosition.y = v112->vPosition.y;
 v726 = (Player *)v112->uActorHeight;
 a1.vPosition.x = uRequiredMana;
 a1.vPosition.y = LODWORD(v727);
 a1.uSectorID = v1;
 a1.vPosition.z = a2 + v713;
 a1.uSpriteFrameID = v1;
-a1.field_58 = 8 * v3->uPlayerID | 4;
+a1.field_58_pid = 8 * v3->uPlayerID | OBJECT_Player;
 a1.field_5C = v730;
 a1.field_60_distance_related_prolly_lod = stru_50C198._427546(a2 + 2500);
 a1.uFacing = v687;
 a1.uSoundID = LOWORD(v3->field_10);
 if ( pParty->bTurnBasedModeOn == 1 )
 a1.uSpriteFrameID = v1;
 v161 = v3->uPlayerID;
 a1.field_60_distance_related_prolly_lod = 0;
 a1.uFacing = v1;
 v161 *= 8;
-LOBYTE(v161) = v161 | 4;
+LOBYTE(v161) = v161 | OBJECT_Player;
-a1.field_58 = v161;
+a1.field_58_pid = v161;
 a1.uSoundID = LOWORD(v3->field_10);
 a2 = v1;
 if ( (signed int)v726 > v1 )
 {
 do
 pParty->vPosition.x,
 pParty->vPosition.y,
 pParty->vPosition.z + (signed int)pParty->uPartyHeight / 3);
 a1.uSpriteFrameID = v1;
 v187 = 8 * v3->uPlayerID;
-LOBYTE(v187) = v187 | 4;
+LOBYTE(v187) = v187 | OBJECT_Player;
-a1.field_58 = v187;
+a1.field_58_pid = v187;
 a1.field_5C = a2;
 a1.field_60_distance_related_prolly_lod = LOBYTE(v715.uDistance);
 a1.uSoundID = LOWORD(v3->field_10);
 if ( pParty->bTurnBasedModeOn == 1 )
 LOBYTE(a1.uAttributes) |= 4u;
 a1.vPosition.x = LODWORD(v718);
 a1.vPosition.y = v713;
 a1.uSectorID = v1;
 a1.vPosition.z = (int)((char *)_this + LODWORD(v725));
 a1.uSpriteFrameID = v1;
-a1.field_58 = 8 * v3->uPlayerID | 4;
+a1.field_58_pid = 8 * v3->uPlayerID | OBJECT_Player;
 a1.field_5C = v730;
 a1.field_60_distance_related_prolly_lod = stru_50C198._427546((int)&_this[69].uNumCharges);
 a1.uFacing = v685;
 a1.uSoundID = LOWORD(v3->field_10);
 if ( pParty->bTurnBasedModeOn == 1 )
 a1.vPosition.z = v51;
 v52 = pIndoor->GetSector(pParty->vPosition.x, v660, v671);
 a1.uSpriteFrameID = v1;
 a1.uSectorID = v52;
 v53 = 8 * v3->uPlayerID;
-LOBYTE(v53) = v53 | 4;
+LOBYTE(v53) = v53 | OBJECT_Player;
-a1.field_58 = v53;
+a1.field_58_pid = v53;
 a1.field_5C = a2;
 a1.field_60_distance_related_prolly_lod = LOBYTE(v715.uDistance);
 a1.uFacing = LOWORD(v715.uYawAngle);
 a1.uSoundID = LOWORD(v3->field_10);
 LABEL_154:
 pParty->vPosition.x,
 pParty->vPosition.y,
 pParty->vPosition.z + (signed int)pParty->uPartyHeight / 3);
 a1.uSpriteFrameID = v1;
 v226 = 8 * v3->uPlayerID;
-LOBYTE(v226) = v226 | 4;
+LOBYTE(v226) = v226 | OBJECT_Player;
-a1.field_58 = v226;
+a1.field_58_pid = v226;
 a1.field_5C = a2;
 a1.field_60_distance_related_prolly_lod = LOBYTE(v715.uDistance);
 a1.uSoundID = LOWORD(v3->field_10);
 if ( pParty->bTurnBasedModeOn == 1 )
 LOBYTE(a1.uAttributes) |= 4u;
 pParty->vPosition.x,
 pParty->vPosition.y,
 pParty->vPosition.z + (signed int)pParty->uPartyHeight / 3);
 a1.uSpriteFrameID = v1;
 v326 = 8 * v3->uPlayerID;
-LOBYTE(v326) = v326 | 4;
+LOBYTE(v326) = v326 | OBJECT_Player;
-a1.field_58 = v326;
+a1.field_58_pid = v326;
 a1.field_5C = a2;
 a1.field_60_distance_related_prolly_lod = LOBYTE(v715.uDistance);
 a1.uFacing = LOWORD(pParty->sRotationY);
 a1.uSoundID = LOWORD(v3->field_10);
 if ( pParty->bTurnBasedModeOn == 1 )
 a1.uAttributes = v1;
 a1.uSectorID = v1;
 a1.uSpriteFrameID = v1;
 a1.vPosition.z = pParty->vPosition.z + (signed int)pParty->uPartyHeight / 3;
 v327 = 8 * v3->uPlayerID;
-LOBYTE(v327) = v327 | 4;
+LOBYTE(v327) = v327 | OBJECT_Player;
 a1.field_60_distance_related_prolly_lod = 0;
-a1.field_58 = v327;
+a1.field_58_pid = v327;
 a1.field_5C = a2;
 a1.uFacing = LOWORD(pParty->sRotationY);
 a1.uSoundID = LOWORD(v3->field_10);
 if ( pParty->bTurnBasedModeOn == 1 )
 a1.uAttributes = 4;
 a1.uSpriteFrameID = v1;
 v368 = v3->uPlayerID;
 a1.field_60_distance_related_prolly_lod = 0;
 a1.uFacing = v1;
 v368 *= 8;
-LOBYTE(v368) = v368 | 4;
+LOBYTE(v368) = v368 | OBJECT_Player;
-a1.field_58 = v368;
+a1.field_58_pid = v368;
 a1.uSoundID = LOWORD(v3->field_10);
 for ( a2 = v1; a2 < (signed int)v726; ++a2 )
 {
 v369 = &pActors[dword_50BF30[a2]];
 if ( MonsterStats::BelongsToSupertype(v369->pMonsterInfo.uID, MONSTER_SUPERTYPE_UNDEAD) )
 a1.uSpriteFrameID = v1;
 v432 = v3->uPlayerID;
 a1.field_60_distance_related_prolly_lod = 0;
 a1.uFacing = v1;
 v432 *= 8;
-LOBYTE(v432) = v432 | 4;
+LOBYTE(v432) = v432 | OBJECT_Player;
-a1.field_58 = v432;
+a1.field_58_pid = v432;
 a1.uSoundID = LOWORD(v3->field_10);
 for ( a2 = v1; a2 < (signed int)v726; ++a2 )
 {
 v433 = &pActors[dword_50BF30[a2]];
 if ( MonsterStats::BelongsToSupertype(v433->pMonsterInfo.uID, MONSTER_SUPERTYPE_UNDEAD) )
 a1.uSpriteFrameID = v1;
 v506 = v3->uPlayerID;
 a1.field_60_distance_related_prolly_lod = 0;
 a1.uFacing = v1;
 v506 *= 8;
-LOBYTE(v506) = v506 | 4;
+LOBYTE(v506) = v506 | OBJECT_Player;
-a1.field_58 = v506;
+a1.field_58_pid = v506;
 a1.uSoundID = LOWORD(v3->field_10);
 a2 = v1;
 if ( SHIDWORD(v733) > v1 )
 {
 do
 a1.uSpriteFrameID = v1;
 v532 = v3->uPlayerID;
 a1.field_60_distance_related_prolly_lod = 0;
 a1.uFacing = v1;
 v532 *= 8;
-LOBYTE(v532) = v532 | 4;
+LOBYTE(v532) = v532 | OBJECT_Player;
-a1.field_58 = v532;
+a1.field_58_pid = v532;
 a1.uSoundID = LOWORD(v3->field_10);
 a2 = v1;
 if ( (signed int)v726 > v1 )
 {
 do
 a1.uSpriteFrameID = v1;
 v580 = v3->uPlayerID;
 a1.field_60_distance_related_prolly_lod = 0;
 v581 = v721;
 v580 *= 8;
-LOBYTE(v580) = v580 | 4;
+LOBYTE(v580) = v580 | OBJECT_Player;
 a1.uFacing = v1;
-a1.field_58 = v580;
+a1.field_58_pid = v580;
 a1.uSoundID = LOWORD(v3->field_10);
 a1.vPosition.x = *(short *)(v721 + 142);
 a1.vPosition.y = *(short *)(v721 + 144);
 v732 = *(short *)(v721 + 138);
 v582 = 8 * (int)v726;
 pParty->vPosition.x,
 pParty->vPosition.y,
 pParty->vPosition.z + (signed int)pParty->uPartyHeight / 2);
 a1.uSpriteFrameID = v1;
 v595 = 8 * v3->uPlayerID;
-LOBYTE(v595) = v595 | 4;
+LOBYTE(v595) = v595 | OBJECT_Player;
-a1.field_58 = v595;
+a1.field_58_pid = v595;
 a1.field_5C = a2;
 a1.field_60_distance_related_prolly_lod = LOBYTE(v715.uDistance);
 a1.uSoundID = LOWORD(v3->field_10);
 if ( pParty->bTurnBasedModeOn == 1 )
 LOBYTE(a1.uAttributes) |= 4u;
 LABEL_1087:
 a1.uAttributes = v1;
 a1.uSectorID = pIndoor->GetSector(v657, v665, v676);
 a1.uSpriteFrameID = v1;
 v604 = 8 * v3->uPlayerID;
-LOBYTE(v604) = v604 | 4;
+LOBYTE(v604) = v604 | OBJECT_Player;
-a1.field_58 = v604;
+a1.field_58_pid = v604;
 a1.field_5C = a2;
 a1.field_60_distance_related_prolly_lod = LOBYTE(v715.uDistance);
 a1.uFacing = LOWORD(v715.uYawAngle);
 LOWORD(v604) = LOWORD(v3->field_10);
 LOBYTE(a1.uAttributes) |= 0x80u;
 a1.uSpriteFrameID = v1;
 v624 = v3->uPlayerID;
 a1.field_60_distance_related_prolly_lod = 0;
 a1.uFacing = v1;
 v624 *= 8;
-LOBYTE(v624) = v624 | 4;
+LOBYTE(v624) = v624 | OBJECT_Player;
-a1.field_58 = v624;
+a1.field_58_pid = v624;
 a1.uSoundID = LOWORD(v3->field_10);
 a2 = v1;
 if ( SHIDWORD(v733) > v1 )
 {
 v726 = (Player *)(HIDWORD(v733) * (7 * v2 + 25));
 _42777D_CastSpell_UseWand_ShootArrow(*((int *)&pSpellDatas[66].field_8 + player->pInventoryItems[main_hand_idx - 1].uItemID), uActiveCharacter - 1, 8, 0, uActiveCharacter + 8);
 if (!--player->pInventoryItems[main_hand_idx - 1].uNumCharges)
 player->pEquipment.uMainHand = 0;
 }
-else if (target_type == OBJECT_Actor)
+else if (target_type == OBJECT_Actor && actor_distance <= 407.2)
 {
-if (actor_distance <= 407.2)
+Vec3_int_ a3;
-{
+a3.x = actor->vPosition.x - pParty->vPosition.x;
-Vec3_int_ a3;
+a3.y = actor->vPosition.y - pParty->vPosition.y;
-a3.x = actor->vPosition.x - pParty->vPosition.x;
+a3.z = actor->vPosition.z - pParty->vPosition.z;
-a3.y = actor->vPosition.y - pParty->vPosition.y;
+Vec3_int_::Normalize(&a3.x, &a3.y, &a3.z);
-a3.z = actor->vPosition.z - pParty->vPosition.z;
-Vec3_int_::Normalize(&a3.x, &a3.y, &a3.z);
+DamageMonsterFromParty((8 * (uActiveCharacter - 1)) | OBJECT_Player, target_id, &a3);
+if (player->WearsItem(506, 1) || player->WearsItem(506, 0))
-DamageMonsterFromParty((8 * uActiveCharacter - 8) | OBJECT_Player, target_id, &a3);
-if (player->WearsItem(506, 1) || player->WearsItem(506, 0))
 _42FA66_do_explosive_impact(
 actor->vPosition.x,
 actor->vPosition.y,
 actor->vPosition.z + actor->uActorHeight / 2,
 0, 512, uActiveCharacter);
 }
 else if (bow_idx)
 {
 shooting_bow = true;
+_42777D_CastSpell_UseWand_ShootArrow(100, uActiveCharacter - 1, 0, 0, 0);
-_42777D_CastSpell_UseWand_ShootArrow(100, uActiveCharacter - 1, 0, 0, 0);
-if (!pParty->bTurnBasedModeOn)
-{
-int recovery = player->GetAttackRecoveryTime(0);
-if (recovery < 30)
-recovery = 30;
-player->SetRecoveryTime(flt_6BE3A4_debug_recmod1 * (double)recovery * 2.133333333333333);
-}
-}
 }
 else
 {
-if (bow_idx)
+; // actor out of range or no actor; no ranged weapon so melee attacking air
-{
+}
-shooting_bow = true;
-_42777D_CastSpell_UseWand_ShootArrow(100, uActiveCharacter - 1, 0, 0, 0);
+if (!pParty->bTurnBasedModeOn)
-}
+{
-else
+int recovery = player->GetAttackRecoveryTime(0);
-{
+if (recovery < 30 )
-if (!pParty->bTurnBasedModeOn)
+recovery = 30;
-{
+player->SetRecoveryTime((signed __int64)(flt_6BE3A4_debug_recmod1 * (double)recovery * 2.133333333333333));
-int recovery = player->GetAttackRecoveryTime(0);
-if (recovery < 30 )
-recovery = 30;
-player->SetRecoveryTime((signed __int64)(flt_6BE3A4_debug_recmod1 * (double)recovery * 2.133333333333333));
-}
-}
 }
 int v34 = 0;
 if (shooting_wand)
 a1a.vPosition.y = y;
 a1a.uSoundID = 0;
 a1a.uAttributes = attributes;
 a1a.uSectorID = pIndoor->GetSector(v21, y, z);
 a1a.uSpriteFrameID = 0;
-a1a.field_58 = 0;
+a1a.field_58_pid = 0;
 a1a.field_5C = 0;
 if ( !(a1a.uAttributes & 0x10) )
 {
 v13 = 0;
 if ( (signed int)pItemsTable->uAllItemsCount > 0 )
 a1.vPosition.z = z;
 a1.uSoundID = 0;
 a1.uAttributes = 0;
 a1.uSectorID = pIndoor->GetSector(v3, v4, z);
 a1.uSpriteFrameID = 0;
-a1.field_58 = 0;
+a1.field_58_pid = 0;
 a1.field_5C = 0;
 v8 = a1.Create(0, 0, 0, 0);
 if ( v8 != -1 )
 {
 v9 = 8 * v8;
 a1a.uFacing = 0;
 a1a.uSoundID = 0;
 if ( a6 >= 1 || a6 <= 4 )
 {
 v10 = 8 * a6 - 8;
-LOBYTE(v10) = v10 | 4;
+LOBYTE(v10) = v10 | OBJECT_Player;
-a1a.field_58 = v10;
+a1a.field_58_pid = v10;
 }
 else
 {
-a1a.field_58 = 0;
+a1a.field_58_pid = 0;
 }
 result = a1a.Create(0, 0, 0, 0);
 if ( result != -1 )
 {
 v12 = 8 * result;

Mercurial > mm7

comparison mm7_6.cpp @ 303:3dcc9d945eeb