Mercurial > mm7

comparison Engine/mm7_data.cpp @ 2541:a902abdfc7f2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
1. Renamed class Game to class Engine. 2. Separated game logic as state of FSM from game logic as engine. 3. Found out that many UI screen initializers were optimized away, intially they all returned newly created window as separate object like it is done in CharacterUI_Initialize.
author a.parshin
date Sun, 10 May 2015 01:29:11 +0200
parents 407263babde8
children bacf9809126a
comparison
equal deleted inserted replaced
2540:abc6a9d079b9 2541:a902abdfc7f2
1 #define _CRTDBG_MAP_ALLOC 1 #define _CRTDBG_MAP_ALLOC
2 #include <stdlib.h> 2 #include <stdlib.h>
3 #include <crtdbg.h> 3 #include <crtdbg.h>
4 4
5 #define _CRT_SECURE_NO_WARNINGS 5 #define _CRT_SECURE_NO_WARNINGS
6 #include "mm7_data.h" 6
7 #include "Engine/Engine.h"
7 8
8 #include "GUI/GUIWindow.h" 9 #include "GUI/GUIWindow.h"
9 #include "Party.h" 10 #include "Party.h"
10 11
11 12
258 259
259 260
260 #include "Engine/Tables/PlayerFrameTable.h" 261 #include "Engine/Tables/PlayerFrameTable.h"
261 struct PlayerFrameTable *pPlayerFrameTable; // idb 262 struct PlayerFrameTable *pPlayerFrameTable; // idb
262 263
263 #include "MM7.h"
264
265 264
266 std::array<stat_coord, 26> stat_string_coord = //4E2940 265 std::array<stat_coord, 26> stat_string_coord = //4E2940
267 {{ 266 {{
268 {0x1A, 0x39, 0xDC, 0x12}, 267 {0x1A, 0x39, 0xDC, 0x12},
269 {0x1A, 0x4A, 0xDC, 0x12}, 268 {0x1A, 0x4A, 0xDC, 0x12},
333 332
334 333
335 334
336 float flt_4D84E8 = 0.0f; 335 float flt_4D84E8 = 0.0f;
337 336
338 int pCurrentScreen = SCREEN_VIDEO; // 004E28F8 337 enum CURRENT_SCREEN current_screen_type = SCREEN_VIDEO; // 004E28F8
339 unsigned int uGammaPos; 338 unsigned int uGammaPos = 0;
340 std::array<int, 8> BtnTurnCoord = 339 std::array<int, 8> BtnTurnCoord =
341 {{ 340 {{
342 0xA4, 0x5D, 0x16, 0xB, 0x5, 0xD, 0x7, 0x3B, 341 0xA4, 0x5D, 0x16, 0xB, 0x5, 0xD, 0x7, 0x3B,
343 }}; // weak 342 }}; // weak
344 std::array<__int16, 4> RightClickPortraitXmin={{0x14, 0x83, 0xF2, 0x165}}; 343 std::array<__int16, 4> RightClickPortraitXmin={{0x14, 0x83, 0xF2, 0x165}};
759 int _506568_autonote_type; // weak 758 int _506568_autonote_type; // weak
760 char bRecallingBeacon; // weak 759 char bRecallingBeacon; // weak
761 int uLastPointedObjectID; // weak 760 int uLastPointedObjectID; // weak
762 //unsigned __int8 bMonsterInfoUI_bDollInitialized; 761 //unsigned __int8 bMonsterInfoUI_bDollInitialized;
763 std::array<const char *, 44> aSpellNames; 762 std::array<const char *, 44> aSpellNames;
764 int pMainScreenNum; // weak 763 enum CURRENT_SCREEN prev_screen_type; // weak
765 int dword_506980_uW; // weak 764 int dword_506980_uW; // weak
766 int dword_506984_uZ; // weak 765 int dword_506984_uZ; // weak
767 int dword_506988_uY; // weak 766 int dword_506988_uY; // weak
768 int dword_50698C_uX; // weak 767 int dword_50698C_uX; // weak
769 int uGameMenuUI_CurentlySelectedKeyIdx; // 506E68 768 int uGameMenuUI_CurentlySelectedKeyIdx; // 506E68