Mercurial > mm7
diff GUIWindow.cpp @ 336:ea55d6414029
Event_proceccor preliminary
author | Gloval |
---|---|
date | Thu, 21 Feb 2013 00:33:12 +0400 |
parents | 6581a2cc21b4 |
children | 1c681ad45653 |
line wrap: on
line diff
--- a/GUIWindow.cpp Wed Feb 20 21:35:13 2013 +0400 +++ b/GUIWindow.cpp Thu Feb 21 00:33:12 2013 +0400 @@ -1047,7 +1047,7 @@ GUIWindow v18; // [sp+60h] [bp-58h]@2 int v19; // [sp+B4h] [bp-4h]@2 - if ( !ptr_507BC0 ) + if ( !window_SpeakInHouse ) return; memcpy(&v18, this, sizeof(v18)); v18.uFrameWidth -= 18; @@ -1062,7 +1062,7 @@ w.uFrameHeight = 2 * LOBYTE(pFontCreate->uFontHeight); //v2 = (const char *)p2DEvents_minus1_::04[13 * (unsigned int)ptr_507BC0->ptr_1C]; - v2 = p2DEvents[(unsigned int)ptr_507BC0->ptr_1C - 1].pName; + v2 = p2DEvents[(unsigned int)window_SpeakInHouse->ptr_1C - 1].pName; if ( v2 ) { @@ -1071,7 +1071,7 @@ v3 = 0; v18.DrawTitleText(pFontCreate, 0x1EAu, v3 / 2 + 4, v1, //(const char *)p2DEvents_minus1_::04[13 * (unsigned int)ptr_507BC0->ptr_1C], - p2DEvents[(unsigned int)ptr_507BC0->ptr_1C - 1].pName, 3); + p2DEvents[(unsigned int)window_SpeakInHouse->ptr_1C - 1].pName, 3); } } v18.uFrameWidth += 8; @@ -1094,7 +1094,7 @@ (uTextureID_Leather != -1 ? pIcons_LOD->pTextures[uTextureID_Leather].uTextureHeight : 26) - (v5 + 7)); pRenderer->DrawTextureIndexed(8u, 347 - v6, pTexture_591428); v7 = FitTextInAWindow(ptr_F8B1E8, pFontArrus, &w, 0xDu, 0); - ptr_507BC0->DrawText(pFontArrus, 13, 354 - v6, 0, v7, 0, 0, 0); + window_SpeakInHouse->DrawText(pFontArrus, 13, 354 - v6, 0, v7, 0, 0, 0); } v8 = 0; if ( uNumDialogueNPCPortraits <= 0 ) @@ -1125,7 +1125,7 @@ { v15 = 3; //v13 = (char *)p2DEvents_minus1__10[13 * (unsigned int)ptr_507BC0->ptr_1C]; - v13 = (char *)p2DEvents[(unsigned int)ptr_507BC0->ptr_1C - 1].pProprieterTitle; + v13 = (char *)p2DEvents[(unsigned int)window_SpeakInHouse->ptr_1C - 1].pProprieterTitle; v11 = v19; v10 = 113; LABEL_56: @@ -1157,9 +1157,9 @@ { sprintfex( pTmpBuf, pGlobalTXT_LocalizationStrings[429], //p2DEvents_minus1_::08[13 * (unsigned int)ptr_507BC0->ptr_1C], - p2DEvents[(unsigned int)ptr_507BC0->ptr_1C - 1].pProprieterName, + p2DEvents[(unsigned int)window_SpeakInHouse->ptr_1C - 1].pProprieterName, //p2DEvents_minus1__10[13 * (unsigned int)ptr_507BC0->ptr_1C]); - p2DEvents[(unsigned int)ptr_507BC0->ptr_1C - 1].pProprieterTitle); + p2DEvents[(unsigned int)window_SpeakInHouse->ptr_1C - 1].pProprieterTitle); v18.DrawTitleText(pFontCreate, 0x1E3u, 0x71u, v19, pTmpBuf, 3u); if ( dword_F8B198 <= 18 ) { @@ -1992,7 +1992,7 @@ } if ( v25 == 1 ) { - ptr_507BC0 = &pWindowList[uNextFreeWindowID]; + window_SpeakInHouse = &pWindowList[uNextFreeWindowID]; _4B4224_UpdateNPCTopics(0); } }