Mercurial > mm7
comparison Events.cpp @ 1018:9ac94d00012e
Merge
author | Grumpy7 |
---|---|
date | Tue, 21 May 2013 02:24:31 +0200 |
parents | c45d51b3f4f4 e865f349aa41 |
children | 3a5c8df8381d |
comparison
equal
deleted
inserted
replaced
1017:af20650a052f | 1018:9ac94d00012e |
---|---|
1332 viewparams->bRedrawGameUI = 1; | 1332 viewparams->bRedrawGameUI = 1; |
1333 pDialogueNPCCount = 0; | 1333 pDialogueNPCCount = 0; |
1334 pDialogueWindow->Release(); | 1334 pDialogueWindow->Release(); |
1335 dialog_menu_id = HOUSE_DIALOGUE_NULL; | 1335 dialog_menu_id = HOUSE_DIALOGUE_NULL; |
1336 pDialogueWindow = 0; | 1336 pDialogueWindow = 0; |
1337 pIcons_LOD->_40F9C5(); | 1337 pIcons_LOD->SyncLoadedFilesCount(); |
1338 } | 1338 } |
1339 OnMapLeave(); | 1339 OnMapLeave(); |
1340 return; | 1340 return; |
1341 } | 1341 } |
1342 } | 1342 } |