Mercurial > mm7

comparison UI/UiGame.cpp @ 2343:5d263539bbec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Moving functions from unsorted_subs.h pt5
author Grumpy7
date Sun, 06 Apr 2014 21:12:24 +0200
parents d6887ee81068
children 4100fb5c4913
comparison
equal deleted inserted replaced
2342:d7f4dac06dc0 2343:5d263539bbec
1 #define _CRT_SECURE_NO_WARNINGS 1 #define _CRT_SECURE_NO_WARNINGS
2 #include "..\Events.h"
2 #include "..\mm7_unsorted_subs.h" 3 #include "..\mm7_unsorted_subs.h"
3 #include "..\Texture.h" 4 #include "..\Texture.h"
4 #include "..\MM7.h" 5 #include "..\MM7.h"
5 #include "..\ErrorHandling.h" 6 #include "..\ErrorHandling.h"
6 7
30 #include "..\texts.h" 31 #include "..\texts.h"
31 #include "UIHouses.h" 32 #include "UIHouses.h"
32 #include "..\BSPModel.h" 33 #include "..\BSPModel.h"
33 #include "..\OurMath.h" 34 #include "..\OurMath.h"
34 #include "..\Level/Decoration.h" 35 #include "..\Level/Decoration.h"
36 #include "..\Chest.h"
35 37
36 38
37 int uTextureID_GameUI_CharSelectionFrame; // 50C98C 39 int uTextureID_GameUI_CharSelectionFrame; // 50C98C
38 40
39 //----- (00421D00) -------------------------------------------------------- 41 //----- (00421D00) --------------------------------------------------------
1340 return; 1342 return;
1341 } 1343 }
1342 //окно(область) ящика------------------------------------------- 1344 //окно(область) ящика-------------------------------------------
1343 if ( pCurrentScreen == SCREEN_CHEST ) 1345 if ( pCurrentScreen == SCREEN_CHEST )
1344 { 1346 {
1345 ChestUI_WritePointedObjectStatusString(); 1347 Chest::ChestUI_WritePointedObjectStatusString();
1346 if ( pMouse->uPointingObjectID == 0 ) 1348 if ( pMouse->uPointingObjectID == 0 )
1347 { 1349 {
1348 if ( uLastPointedObjectID != 0 ) 1350 if ( uLastPointedObjectID != 0 )
1349 { 1351 {
1350 pFooterString[0] = 0; 1352 pFooterString[0] = 0;