Mercurial > might-and-magic-trilogy

comparison mm7_3.cpp @ 125:b90504bbb93b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Nomad
date Fri, 16 Nov 2012 13:58:59 +0200
parents acf7f12714a7 05b2d9653abc
children 062e8a8e09bc
comparison
equal deleted inserted replaced
124:acf7f12714a7 125:b90504bbb93b
7852 *((float *)v7 - 10) = (double)v35 / v20; 7852 *((float *)v7 - 10) = (double)v35 / v20;
7853 v21 = (double)SHIDWORD(v36); 7853 v21 = (double)SHIDWORD(v36);
7854 HIDWORD(v36) = v19->uTextureHeight; 7854 HIDWORD(v36) = v19->uTextureHeight;
7855 v22 = (double)SHIDWORD(v36); 7855 v22 = (double)SHIDWORD(v36);
7856 HIDWORD(v36) = v18 >> 16; 7856 HIDWORD(v36) = v18 >> 16;
7857 v24 = __OFSUB__(v31, _this.uNumVertices); 7857 v24 = _this.uNumVertices > v31;
7858 v23 = ((v31 - _this.uNumVertices) & 0x80000000u) != 0; 7858 v23 = ((v31 - _this.uNumVertices) & 0x80000000u) != 0;
7859 *((float *)v7 - 9) = v21 / (v22 * 65536.0); 7859 *((float *)v7 - 9) = v21 / (v22 * 65536.0);
7860 *((float *)v7 - 16) = (double)pOutdoorCamera->shading_dist_mist; 7860 *((float *)v7 - 16) = (double)pOutdoorCamera->shading_dist_mist;
7861 *((float *)v7 - 11) = 1.0 / (double)SHIDWORD(v36); 7861 *((float *)v7 - 11) = 1.0 / (double)SHIDWORD(v36);
7862 if ( !(v23 ^ v24) ) 7862 if ( !(v23 ^ v24) )
18699 v16.uIndex = v8 + 2 * v9 + v9; 18699 v16.uIndex = v8 + 2 * v9 + v9;
18700 v10 = pMapStats->GetMapInfo(pCurrentMapName); 18700 v10 = pMapStats->GetMapInfo(pCurrentMapName);
18701 if ( v10 ) 18701 if ( v10 )
18702 { 18702 {
18703 v11 = uNumActors; 18703 v11 = uNumActors;
18704 SpawnEncounter((MapInfo *)&pMapStats + v10, &v16, 0, count, 0); 18704 SpawnEncounter((MapInfo *)&pMapStats->pInfos[v10], &v16, 0, count, 0);
18705 memcpy(&v15, Actor::GetDirectionInfo(8 * v11 | AI_OBJECT_ACTOR, 4u, &a3, 1), sizeof(v15)); 18705 memcpy(&v15, Actor::GetDirectionInfo(8 * v11 | AI_OBJECT_ACTOR, 4u, &a3, 1), sizeof(v15));
18706 v12 = v11; 18706 v12 = v11;
18707 if ( (signed int)v11 < (signed int)uNumActors ) 18707 if ( (signed int)v11 < (signed int)uNumActors )
18708 { 18708 {
18709 v13 = (char *)&pActors[v11].uYawAngle; 18709 v13 = (char *)&pActors[v11].uYawAngle;