Mercurial > mm7
comparison mm7_2.cpp @ 61:6c2cefdaea3e
Слияние
author | Ritor1 |
---|---|
date | Tue, 22 Jan 2013 18:41:17 +0600 |
parents | 764abc86ce90 5a08b193507f |
children | 1faa29fd4c2d |
comparison
equal
deleted
inserted
replaced
60:b9d70af644f3 | 61:6c2cefdaea3e |
---|---|
12978 } | 12978 } |
12979 } | 12979 } |
12980 bDialogueUI_InitializeActor_NPC_ID = 0; | 12980 bDialogueUI_InitializeActor_NPC_ID = 0; |
12981 OnMapLoad(); | 12981 OnMapLoad(); |
12982 pGameLoadingUI_ProgressBar->Progress(); | 12982 pGameLoadingUI_ProgressBar->Progress(); |
12983 memset(&pRenderer->pBillboardRenderListD3D, 0, sizeof(pRenderer->pBillboardRenderListD3D));//Ritor1: fix | 12983 memset(&pRenderer->pBillboardRenderListD3D, 0, sizeof(pRenderer->pBillboardRenderListD3D)); |
12984 pGameLoadingUI_ProgressBar->Release(); | 12984 pGameLoadingUI_ProgressBar->Release(); |
12985 _flushall(); | 12985 _flushall(); |
12986 } | 12986 } |
12987 | 12987 |
12988 | 12988 |