Mercurial > mm7

comparison mm7_data.cpp @ 1202:0dbf6c4dd029

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
arrays to std::arrays phase 1
author Grumpy7
date Sat, 08 Jun 2013 21:33:22 +0200
parents 44f37efc159c
children 1eed3e0ab666
comparison
equal deleted inserted replaced
1196:44f37efc159c 1202:0dbf6c4dd029
35 35
36 #include "TurnEngine.h" 36 #include "TurnEngine.h"
37 struct stru262_TurnBased *pTurnEngine = new stru262_TurnBased; 37 struct stru262_TurnBased *pTurnEngine = new stru262_TurnBased;
38 38
39 #include "CastSpellInfo.h" 39 #include "CastSpellInfo.h"
40 CastSpellInfo pCastSpellInfo[10]; 40 std::array<CastSpellInfo, 10> pCastSpellInfo;
41 CastSpellInfo stru_50CDB4; // idb 41 CastSpellInfo stru_50CDB4; // idb
42 42
43 #include "Viewport.h" 43 #include "Viewport.h"
44 struct Viewport *pViewport = new Viewport; 44 struct Viewport *pViewport = new Viewport;
45 struct ViewingParams *viewparams = new ViewingParams; 45 struct ViewingParams *viewparams = new ViewingParams;
51 51
52 #include "stru298.h" 52 #include "stru298.h"
53 stru298 stru_50FE08; // weak 53 stru298 stru_50FE08; // weak
54 54
55 #include "Autonotes.h" 55 #include "Autonotes.h"
56 Autonote pAutonoteTxt[195]; // weak 56 std::array<Autonote, 195> pAutonoteTxt; // weak
57 57
58 #include "Awards.h" 58 #include "Awards.h"
59 Award pAwards[105]; 59 std::array<Award, 105> pAwards;
60 AwardType achieved_awards[1000]; 60 std::array<AwardType, 1000> achieved_awards;
61 int num_achieved_awards; 61 int num_achieved_awards;
62 int num_achieved_awards_2; 62 int num_achieved_awards_2;
63 63
64 #include "stru159.h" 64 #include "stru159.h"
65 65
257 struct UIAnimation *pUIAnim_Food = &_uianim._pUIAnim_Food; 257 struct UIAnimation *pUIAnim_Food = &_uianim._pUIAnim_Food;
258 struct UIAnimation *pUIAnim_Gold = &_uianim._pUIAnim_Gold; 258 struct UIAnimation *pUIAnim_Gold = &_uianim._pUIAnim_Gold;
259 struct UIAnimation *pUIAnum_Torchlight = &_uianim._pUIAnum_Torchlight; 259 struct UIAnimation *pUIAnum_Torchlight = &_uianim._pUIAnum_Torchlight;
260 struct UIAnimation *pUIAnim_WizardEye = &_uianim._pUIAnim_WizardEye; 260 struct UIAnimation *pUIAnim_WizardEye = &_uianim._pUIAnim_WizardEye;
261 261
262 struct UIAnimation *pUIAnims[4] = 262 std::array<struct UIAnimation *, 4> pUIAnims =
263 { 263 {
264 &_uianim._pUIAnim_Food, 264 &_uianim._pUIAnim_Food,
265 &_uianim._pUIAnim_Gold, 265 &_uianim._pUIAnim_Gold,
266 &_uianim._pUIAnum_Torchlight, 266 &_uianim._pUIAnum_Torchlight,
267 &_uianim._pUIAnim_WizardEye 267 &_uianim._pUIAnim_WizardEye
273 struct PlayerFrameTable *pPlayerFrameTable; // idb 273 struct PlayerFrameTable *pPlayerFrameTable; // idb
274 274
275 #include "MM7.h" 275 #include "MM7.h"
276 276
277 277
278 stat_coord stat_string_coord[26] = //4E2940 278 std::array<stat_coord, 26> stat_string_coord = //4E2940
279 { 279 {{
280 {0x1A, 0x39, 0xDC, 0x12}, 280 {0x1A, 0x39, 0xDC, 0x12},
281 {0x1A, 0x4A, 0xDC, 0x12}, 281 {0x1A, 0x4A, 0xDC, 0x12},
282 {0x1A, 0x5B, 0xDC, 0x12}, 282 {0x1A, 0x5B, 0xDC, 0x12},
283 {0x1A, 0x6C, 0xDC, 0x12}, 283 {0x1A, 0x6C, 0xDC, 0x12},
284 {0x1A, 0x7D, 0xDC, 0x12}, 284 {0x1A, 0x7D, 0xDC, 0x12},
301 {0x111, 0xF0, 0xBA, 0x12}, 301 {0x111, 0xF0, 0xBA, 0x12},
302 {0x111, 0x103, 0xBA, 0x12}, 302 {0x111, 0x103, 0xBA, 0x12},
303 {0x111, 0x116, 0xBA, 0x12}, 303 {0x111, 0x116, 0xBA, 0x12},
304 {0x111, 0x129, 0xBA, 0x12}, 304 {0x111, 0x129, 0xBA, 0x12},
305 {0x13E, 0x12, 0x89, 0x12}, 305 {0x13E, 0x12, 0x89, 0x12},
306 }
306 }; 307 };
307 308
308 309
309 310
310 311