Mercurial > mm7

comparison Outdoor.cpp @ 430:58b71c1af7d8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Objects are drawn (items, spells sfx)
author Nomad
date Sun, 24 Feb 2013 00:54:25 +0200
parents d720a13e2273
children 8c45cac1c5e1
comparison
equal deleted inserted replaced
427:49d945ce4285 430:58b71c1af7d8
129 uNumDecorationsDrawnThisFrame = 0; 129 uNumDecorationsDrawnThisFrame = 0;
130 _unused000 = 0; 130 _unused000 = 0;
131 uNumSpritesDrawnThisFrame = 0; 131 uNumSpritesDrawnThisFrame = 0;
132 uNumBillboardsToDraw = 0; 132 uNumBillboardsToDraw = 0;
133 133
134 PrepareActorsDrawList(); 134 /*PrepareActorsDrawList();
135 if (!pOutdoorCamera->bDoNotRenderDecorations) 135 if (!pOutdoorCamera->bDoNotRenderDecorations)
136 pRenderer->PrepareDecorationsRenderList_ODM(); 136 pRenderer->PrepareDecorationsRenderList_ODM();*/
137 137
138 pRenderer->DrawLayingItems_Shooting_Magic_ODM(); 138 pRenderer->DrawLayingItems_Shooting_Magic_ODM();
139 pRenderer->TransformBillboardsAndSetPalettesODM(); 139 pRenderer->TransformBillboardsAndSetPalettesODM();
140 sub_485F53((Vec2_int_ *)unnamed_6BE060); 140 sub_485F53((Vec2_int_ *)unnamed_6BE060);
141 } 141 }
2221 pSrc += 4 + uNumActors * sizeof(Actor); 2221 pSrc += 4 + uNumActors * sizeof(Actor);
2222 //v92 = (char *)v91 + (int)pFilename; 2222 //v92 = (char *)v91 + (int)pFilename;
2223 pGameLoadingUI_ProgressBar->Progress(); 2223 pGameLoadingUI_ProgressBar->Progress();
2224 2224
2225 memcpy(&uNumLayingItems, pSrc, 4); 2225 memcpy(&uNumLayingItems, pSrc, 4);
2226 //v93 = (char *)v92 + 4; 2226 assert(uNumLayingItems <= 1000 && "Too many objects");
2227 if (uNumLayingItems > 1000) 2227 assert(sizeof(LayingItem) == 112);
2228 MessageBoxW(nullptr, L"Can't load file!",
2229 L"E:\\WORK\\MSDEV\\MM7\\MM7\\Code\\Odmap.cpp:954", 0);
2230 2228
2231 pGameLoadingUI_ProgressBar->Progress(); 2229 pGameLoadingUI_ProgressBar->Progress();
2232 2230
2233 assert(sizeof(LayingItem) == 112);
2234 //pFilename = (char *)(112 * uNumLayingItems); 2231 //pFilename = (char *)(112 * uNumLayingItems);
2235 memcpy(pLayingItems, pSrc + 4, uNumLayingItems * sizeof(LayingItem)); 2232 memcpy(pLayingItems, pSrc + 4, uNumLayingItems * sizeof(LayingItem));
2236 pSrc += 4 + uNumLayingItems * sizeof(LayingItem); 2233 pSrc += 4 + uNumLayingItems * sizeof(LayingItem);
2237 2234
2238 //v94 = (char *)v93 + (int)pFilename; 2235 //v94 = (char *)v93 + (int)pFilename;
3109 goto LABEL_53; 3106 goto LABEL_53;
3110 } 3107 }
3111 } 3108 }
3112 v28->uScreenSpaceX = v27; 3109 v28->uScreenSpaceX = v27;
3113 v28->uScreenSpaceY = v46; 3110 v28->uScreenSpaceY = v46;
3114 v28->some_x = x; 3111 v28->world_x = x;
3115 v28->some_y = y; 3112 v28->world_y = y;
3116 v28->some_z = z; 3113 v28->world_z = z;
3117 HIWORD(v34) = HIWORD(X); 3114 HIWORD(v34) = HIWORD(X);
3118 LOWORD(v34) = 0; 3115 LOWORD(v34) = 0;
3119 v28->uPaletteSubindex = 0; 3116 v28->uPaletteSubindex = 0;
3120 v28->sZValue = v34 + (8 * i | OBJECT_Actor); 3117 v28->sZValue = v34 + (8 * i | OBJECT_Actor);
3121 v28->field_14_actor_id = i; 3118 v28->field_14_actor_id = i;