comparison UI/UiGame.cpp @ 1477:7ef4b64f6329

* LODFile::LoadBitmaps & LODFile::LoadIconsOrEvents are merged into LODFile::Load Added support for most of mm6 resources, placeholders for mm8 resources. Fixed few C4258
author Nomad
date Wed, 28 Aug 2013 18:43:07 +0200
parents c987b5ed09af
children cb396f55671e 6306a33af531
comparison
equal deleted inserted replaced
1475:d7720c1f1d3b 1477:7ef4b64f6329
858 v19 = (signed __int64)((double)(pX - 557) * v3 + (double)v24); 858 v19 = (signed __int64)((double)(pX - 557) * v3 + (double)v24);
859 v20 = (signed __int64)((double)v0 - (double)(signed int)(pY - 74) * v3); 859 v20 = (signed __int64)((double)v0 - (double)(signed int)(pY - 74) * v3);
860 if ( uCurrentlyLoadedLevelType != LEVEL_Outdoor || (*(float *)&v23 = 0.0, (signed int)v1 <= 0) ) 860 if ( uCurrentlyLoadedLevelType != LEVEL_Outdoor || (*(float *)&v23 = 0.0, (signed int)v1 <= 0) )
861 { 861 {
862 LABEL_14: 862 LABEL_14:
863 v17 = pMapStats->GetMapInfo(pCurrentMapName.data()); 863 v17 = pMapStats->GetMapInfo(pCurrentMapName);
864 if ( v17 == v2 ) 864 if ( v17 == v2 )
865 result = "No Maze Info for this maze on file!"; 865 result = "No Maze Info for this maze on file!";
866 else 866 else
867 result = pMapStats->pInfos[v17].pName; 867 result = pMapStats->pInfos[v17].pName;
868 } 868 }