comparison UI/UiGame.cpp @ 1487:cb396f55671e

Слияние
author Ritor1
date Thu, 29 Aug 2013 22:02:00 +0600
parents 47c89461be23 7ef4b64f6329
children ab6bf38b2940
comparison
equal deleted inserted replaced
1486:47c89461be23 1487:cb396f55671e
851 v19 = (signed __int64)((double)(pX - 557) * v3 + (double)v24); 851 v19 = (signed __int64)((double)(pX - 557) * v3 + (double)v24);
852 v20 = (signed __int64)((double)v0 - (double)(signed int)(pY - 74) * v3); 852 v20 = (signed __int64)((double)v0 - (double)(signed int)(pY - 74) * v3);
853 if ( uCurrentlyLoadedLevelType != LEVEL_Outdoor || (*(float *)&v23 = 0.0, (signed int)v1 <= 0) ) 853 if ( uCurrentlyLoadedLevelType != LEVEL_Outdoor || (*(float *)&v23 = 0.0, (signed int)v1 <= 0) )
854 { 854 {
855 LABEL_14: 855 LABEL_14:
856 v17 = pMapStats->GetMapInfo(pCurrentMapName.data()); 856 v17 = pMapStats->GetMapInfo(pCurrentMapName);
857 if ( v17 == v2 ) 857 if ( v17 == v2 )
858 result = "No Maze Info for this maze on file!"; 858 result = "No Maze Info for this maze on file!";
859 else 859 else
860 result = pMapStats->pInfos[v17].pName; 860 result = pMapStats->pInfos[v17].pName;
861 } 861 }