Mercurial > mm7
diff Outdoor.cpp @ 430:58b71c1af7d8
Objects are drawn (items, spells sfx)
author | Nomad |
---|---|
date | Sun, 24 Feb 2013 00:54:25 +0200 |
parents | d720a13e2273 |
children | 8c45cac1c5e1 |
line wrap: on
line diff
--- a/Outdoor.cpp Sat Feb 23 23:04:00 2013 +0200 +++ b/Outdoor.cpp Sun Feb 24 00:54:25 2013 +0200 @@ -131,9 +131,9 @@ uNumSpritesDrawnThisFrame = 0; uNumBillboardsToDraw = 0; - PrepareActorsDrawList(); + /*PrepareActorsDrawList(); if (!pOutdoorCamera->bDoNotRenderDecorations) - pRenderer->PrepareDecorationsRenderList_ODM(); + pRenderer->PrepareDecorationsRenderList_ODM();*/ pRenderer->DrawLayingItems_Shooting_Magic_ODM(); pRenderer->TransformBillboardsAndSetPalettesODM(); @@ -2223,14 +2223,11 @@ pGameLoadingUI_ProgressBar->Progress(); memcpy(&uNumLayingItems, pSrc, 4); - //v93 = (char *)v92 + 4; - if (uNumLayingItems > 1000) - MessageBoxW(nullptr, L"Can't load file!", - L"E:\\WORK\\MSDEV\\MM7\\MM7\\Code\\Odmap.cpp:954", 0); + assert(uNumLayingItems <= 1000 && "Too many objects"); + assert(sizeof(LayingItem) == 112); pGameLoadingUI_ProgressBar->Progress(); - assert(sizeof(LayingItem) == 112); //pFilename = (char *)(112 * uNumLayingItems); memcpy(pLayingItems, pSrc + 4, uNumLayingItems * sizeof(LayingItem)); pSrc += 4 + uNumLayingItems * sizeof(LayingItem); @@ -3111,9 +3108,9 @@ } v28->uScreenSpaceX = v27; v28->uScreenSpaceY = v46; - v28->some_x = x; - v28->some_y = y; - v28->some_z = z; + v28->world_x = x; + v28->world_y = y; + v28->world_z = z; HIWORD(v34) = HIWORD(X); LOWORD(v34) = 0; v28->uPaletteSubindex = 0;