Mercurial > mm7

comparison GUIWindow.cpp @ 1639:b60ddd777d50

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Nomad
date Tue, 17 Sep 2013 15:40:36 +0200
parents ccde94f02b75 08ebd0fee604
children afc1c3514dd5
comparison
equal deleted inserted replaced
1638:ccde94f02b75 1639:b60ddd777d50
991 { 991 {
992 pRenderer->DrawTextureIndexed(471, 445, &pIcons_LOD->pTextures[uExitCancelTextureId]); 992 pRenderer->DrawTextureIndexed(471, 445, &pIcons_LOD->pTextures[uExitCancelTextureId]);
993 } 993 }
994 return; 994 return;
995 } 995 }
996 if ( v4 || !dword_591080 ) 996 if ( v4 || !dword_591080 )//на изумрудном острове заходит на корабле пока не выполнены квесты
997 { 997 {
998 SimpleHouseAndBoatsDialog(); 998 SimpleHouseDialog();
999 } 999 }
1000 else 1000 else
1001 { 1001 {
1002 sprintfex( pTmpBuf.data(), pGlobalTXT_LocalizationStrings[429], 1002 sprintfex( pTmpBuf.data(), pGlobalTXT_LocalizationStrings[429],
1003 p2DEvents[(unsigned int)window_SpeakInHouse->ptr_1C - 1].pProprieterName, 1003 p2DEvents[(unsigned int)window_SpeakInHouse->ptr_1C - 1].pProprieterName,