Mercurial > mm7

comparison SpriteObject.cpp @ 1390:613c77e51e38

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Messed with spell effects drawing a bit.
author Nomad
date Thu, 18 Jul 2013 04:08:20 +0200
parents 13b7be8b06a0
children d071e0e9ba75
comparison
equal deleted inserted replaced
1389:4dc34f7acb0b 1390:613c77e51e38
329 v1->vVelocity.x = 0; 329 v1->vVelocity.x = 0;
330 memset(&Dst, 0, 0x68u); 330 memset(&Dst, 0, 0x68u);
331 Dst.x = (double)v1->vPosition.x; 331 Dst.x = (double)v1->vPosition.x;
332 Dst.y = (double)v1->vPosition.y; 332 Dst.y = (double)v1->vPosition.y;
333 Dst.z = (double)v1->vPosition.z; 333 Dst.z = (double)v1->vPosition.z;
334 Dst.flt_10 = 0.0; 334 Dst.r = 0.0;
335 Dst.flt_14 = 0.0; 335 Dst.g = 0.0;
336 Dst.flt_18 = 0.0; 336 Dst.b = 0.0;
337 if (v2->uFlags & OBJECT_DESC_TRIAL_FIRE ) 337 if (v2->uFlags & OBJECT_DESC_TRIAL_FIRE )
338 { 338 {
339 Dst.type = ParticleType_Bitmap | ParticleType_Rotating | ParticleType_8; 339 Dst.type = ParticleType_Bitmap | ParticleType_Rotating | ParticleType_8;
340 Dst.uDiffuse = 0xFF3C1E; 340 Dst.uDiffuse = 0xFF3C1E;
341 Dst.timeToLive = (unsigned __int8)(rand() & 0x80) + 128; 341 Dst.timeToLive = (unsigned __int8)(rand() & 0x80) + 128;
453 v1->uSectorID = LOWORD(stru_721530.uSectorID); 453 v1->uSectorID = LOWORD(stru_721530.uSectorID);
454 memset(&Dst, 0, 0x68u); 454 memset(&Dst, 0, 0x68u);
455 Dst.x = (double)v1->vPosition.x; 455 Dst.x = (double)v1->vPosition.x;
456 Dst.y = (double)v1->vPosition.y; 456 Dst.y = (double)v1->vPosition.y;
457 Dst.z = (double)v1->vPosition.z; 457 Dst.z = (double)v1->vPosition.z;
458 Dst.flt_10 = 0.0; 458 Dst.r = 0.0;
459 Dst.flt_14 = 0.0; 459 Dst.g = 0.0;
460 Dst.flt_18 = 0.0; 460 Dst.b = 0.0;
461 if ( v2->uFlags & OBJECT_DESC_TRIAL_FIRE ) 461 if ( v2->uFlags & OBJECT_DESC_TRIAL_FIRE )
462 { 462 {
463 Dst.type = ParticleType_Bitmap | ParticleType_Rotating | ParticleType_8; 463 Dst.type = ParticleType_Bitmap | ParticleType_Rotating | ParticleType_8;
464 Dst.uDiffuse = 0xFF3C1E; 464 Dst.uDiffuse = 0xFF3C1E;
465 Dst.timeToLive = (unsigned __int8)( rand() & 0x80) + 128; 465 Dst.timeToLive = (unsigned __int8)( rand() & 0x80) + 128;
736 memset(&Dst, v8, 0x68u); 736 memset(&Dst, v8, 0x68u);
737 v29 = pObject->uFlags; 737 v29 = pObject->uFlags;
738 Dst.x = (double)pSpriteObject->vPosition.x; 738 Dst.x = (double)pSpriteObject->vPosition.x;
739 Dst.y = (double)pSpriteObject->vPosition.y; 739 Dst.y = (double)pSpriteObject->vPosition.y;
740 Dst.z = (double)pSpriteObject->vPosition.z; 740 Dst.z = (double)pSpriteObject->vPosition.z;
741 Dst.flt_10 = 0.0; 741 Dst.r = 0.0;
742 Dst.flt_14 = 0.0; 742 Dst.g = 0.0;
743 Dst.flt_18 = 0.0; 743 Dst.b = 0.0;
744 if ( v29 & 0x200 ) 744 if ( v29 & 0x200 )
745 { 745 {
746 Dst.type = ParticleType_Bitmap | ParticleType_Rotating | ParticleType_8; 746 Dst.type = ParticleType_Bitmap | ParticleType_Rotating | ParticleType_8;
747 Dst.uDiffuse = 0xFF3C1E; 747 Dst.uDiffuse = 0xFF3C1E;
748 v30 = rand(); 748 v30 = rand();
926 memset(&Dst, v8, 0x68u); 926 memset(&Dst, v8, 0x68u);
927 v10 = pObject->uFlags; 927 v10 = pObject->uFlags;
928 Dst.x = (double)pSpriteObject->vPosition.x; 928 Dst.x = (double)pSpriteObject->vPosition.x;
929 Dst.y = (double)pSpriteObject->vPosition.y; 929 Dst.y = (double)pSpriteObject->vPosition.y;
930 Dst.z = (double)pSpriteObject->vPosition.z; 930 Dst.z = (double)pSpriteObject->vPosition.z;
931 Dst.flt_10 = 0.0; 931 Dst.r = 0.0;
932 Dst.flt_14 = 0.0; 932 Dst.g = 0.0;
933 Dst.flt_18 = 0.0; 933 Dst.b = 0.0;
934 if ( v10 & 0x200 ) 934 if ( v10 & 0x200 )
935 { 935 {
936 Dst.type = ParticleType_Bitmap | ParticleType_Rotating | ParticleType_8; 936 Dst.type = ParticleType_Bitmap | ParticleType_Rotating | ParticleType_8;
937 Dst.uDiffuse = 0xFF3C1E; 937 Dst.uDiffuse = 0xFF3C1E;
938 Dst.flt_28 = 1.0; 938 Dst.flt_28 = 1.0;