Mercurial > mm7
comparison mm7_2.cpp @ 327:a7f15da53e82
Слияние
author | Ritor1 |
---|---|
date | Wed, 20 Feb 2013 11:27:06 +0600 |
parents | ead95219160c d720a13e2273 |
children | 8e23edf57e27 |
comparison
equal
deleted
inserted
replaced
326:ead95219160c | 327:a7f15da53e82 |
---|---|
7724 pMonster->uGroup = spawn->uGroup; | 7724 pMonster->uGroup = spawn->uGroup; |
7725 pMonster->PrepareSprites((char)pTexture); | 7725 pMonster->PrepareSprites((char)pTexture); |
7726 pMonster->pMonsterInfo.uHostilityType = MonsterInfo::Hostility_Friendly; | 7726 pMonster->pMonsterInfo.uHostilityType = MonsterInfo::Hostility_Friendly; |
7727 v32 = rand(); | 7727 v32 = rand(); |
7728 v33 = v32 % 2048; | 7728 v33 = v32 % 2048; |
7729 v34 = stru_5C6E00->SinCos(v32 % 2048); | 7729 v34 = stru_5C6E00->Cos(v32 % 2048); |
7730 a4 = v34; | 7730 a4 = v34; |
7731 a3 = (unsigned __int64)(v34 * (signed __int64)v52) >> 16; | 7731 a3 = (unsigned __int64)(v34 * (signed __int64)v52) >> 16; |
7732 pPosX = a3 + spawn->vPosition.x; | 7732 pPosX = a3 + spawn->vPosition.x; |
7733 v35 = stru_5C6E00->SinCos(v33 - stru_5C6E00->uIntegerHalfPi); | 7733 v35 = stru_5C6E00->Sin(v33); |
7734 a4 = v35; | 7734 a4 = v35; |
7735 a3 = (unsigned __int64)(v35 * (signed __int64)v52) >> 16; | 7735 a3 = (unsigned __int64)(v35 * (signed __int64)v52) >> 16; |
7736 a4 = a3 + spawn->vPosition.y; | 7736 a4 = a3 + spawn->vPosition.y; |
7737 v36 = spawn->vPosition.z; | 7737 v36 = spawn->vPosition.z; |
7738 a3 = spawn->vPosition.z; | 7738 a3 = spawn->vPosition.z; |
7842 v6->pMonsterInfo.uTreasureDiceRolls = 0; | 7842 v6->pMonsterInfo.uTreasureDiceRolls = 0; |
7843 v6->pMonsterInfo.uTreasureType = 0; | 7843 v6->pMonsterInfo.uTreasureType = 0; |
7844 v6->pMonsterInfo.uExp = 0; | 7844 v6->pMonsterInfo.uExp = 0; |
7845 v6->uMovementSpeed = v9; | 7845 v6->uMovementSpeed = v9; |
7846 v10 = rand() % 2048; | 7846 v10 = rand() % 2048; |
7847 v11 = ((unsigned __int64)(stru_5C6E00->SinCos(v10) * (signed __int64)v19) >> 16) + pParty->vPosition.x; | 7847 v11 = ((unsigned __int64)(stru_5C6E00->Cos(v10) * (signed __int64)v19) >> 16) + pParty->vPosition.x; |
7848 uFaceID = stru_5C6E00->SinCos(v10 - stru_5C6E00->uIntegerHalfPi); | 7848 uFaceID = stru_5C6E00->Sin(v10); |
7849 v23 = (unsigned __int64)(uFaceID * (signed __int64)v19) >> 16; | 7849 v23 = (unsigned __int64)(uFaceID * (signed __int64)v19) >> 16; |
7850 v12 = pParty->vPosition.y; | 7850 v12 = pParty->vPosition.y; |
7851 v13 = (unsigned __int64)(uFaceID * (signed __int64)v19) >> 16; | 7851 v13 = (unsigned __int64)(uFaceID * (signed __int64)v19) >> 16; |
7852 v6->vInitialPosition.x = v11; | 7852 v6->vInitialPosition.x = v11; |
7853 v14 = v13 + v12; | 7853 v14 = v13 + v12; |
8373 while ( 1 ) | 8373 while ( 1 ) |
8374 { | 8374 { |
8375 ++uFaceID; | 8375 ++uFaceID; |
8376 v6 = rand() % 1024 + 512; | 8376 v6 = rand() % 1024 + 512; |
8377 v7 = rand() % (signed int)stru_5C6E00->uIntegerDoublePi; | 8377 v7 = rand() % (signed int)stru_5C6E00->uIntegerDoublePi; |
8378 v20 = stru_5C6E00->SinCos(v7); | 8378 v20 = stru_5C6E00->Cos(v7); |
8379 v23 = (unsigned __int64)(v20 * (signed __int64)v6) >> 16; | 8379 v23 = (unsigned __int64)(v20 * (signed __int64)v6) >> 16; |
8380 v19.vPosition.x = pParty->vPosition.x + v23; | 8380 v19.vPosition.x = pParty->vPosition.x + v23; |
8381 v20 = stru_5C6E00->SinCos(v7 - stru_5C6E00->uIntegerHalfPi); | 8381 v20 = stru_5C6E00->Sin(v7); |
8382 v23 = (unsigned __int64)(v20 * (signed __int64)v6) >> 16; | 8382 v23 = (unsigned __int64)(v20 * (signed __int64)v6) >> 16; |
8383 v8 = 0; | 8383 v8 = 0; |
8384 v19.uIndex = v24; | 8384 v19.uIndex = v24; |
8385 v19.vPosition.y = v23 + pParty->vPosition.y; | 8385 v19.vPosition.y = v23 + pParty->vPosition.y; |
8386 v19.vPosition.z = pParty->vPosition.z; | 8386 v19.vPosition.z = pParty->vPosition.z; |
8429 { | 8429 { |
8430 ++v26; | 8430 ++v26; |
8431 v12 = rand() % 512 + 256; | 8431 v12 = rand() % 512 + 256; |
8432 v13 = rand(); | 8432 v13 = rand(); |
8433 v14 = v13 % (signed int)stru_5C6E00->uIntegerDoublePi; | 8433 v14 = v13 % (signed int)stru_5C6E00->uIntegerDoublePi; |
8434 v15 = stru_5C6E00->SinCos(v13 % (signed int)stru_5C6E00->uIntegerDoublePi); | 8434 v15 = stru_5C6E00->Cos(v13 % (signed int)stru_5C6E00->uIntegerDoublePi); |
8435 v20 = v15; | 8435 v20 = v15; |
8436 v23 = (unsigned __int64)(v15 * (signed __int64)v12) >> 16; | 8436 v23 = (unsigned __int64)(v15 * (signed __int64)v12) >> 16; |
8437 v19.vPosition.x = pParty->vPosition.x + v23; | 8437 v19.vPosition.x = pParty->vPosition.x + v23; |
8438 v16 = stru_5C6E00->SinCos(v14 - stru_5C6E00->uIntegerHalfPi); | 8438 v16 = stru_5C6E00->Sin(v13 % (signed int)stru_5C6E00->uIntegerDoublePi); |
8439 v20 = v16; | 8439 v20 = v16; |
8440 v23 = (unsigned __int64)(v16 * (signed __int64)v12) >> 16; | 8440 v23 = (unsigned __int64)(v16 * (signed __int64)v12) >> 16; |
8441 v19.vPosition.y = v23 + pParty->vPosition.y; | 8441 v19.vPosition.y = v23 + pParty->vPosition.y; |
8442 v19.vPosition.z = pParty->vPosition.z; | 8442 v19.vPosition.z = pParty->vPosition.z; |
8443 v19.uIndex = v24; | 8443 v19.uIndex = v24; |