comparison Arcomage.cpp @ 938:016e3577865c

stru289 removed, some data movements
author Nomad
date Wed, 01 May 2013 13:45:31 +0200
parents b462b598b97a
children c0d0656aa662
comparison
equal deleted inserted replaced
937:ae747684f644 938:016e3577865c
13 #include "Events2D.h" 13 #include "Events2D.h"
14 #include "VectorTypes.h" 14 #include "VectorTypes.h"
15 #include "texts.h" 15 #include "texts.h"
16 #include "mm7_data.h" 16 #include "mm7_data.h"
17 17
18
19
20 void sub_409BE8();
21
22
23
24
25 /* 388 */
26 #pragma pack(push, 1)
27 struct stru348
28 {
29 __int16 field_0;
30 __int16 field_2;
31 __int16 field_4;
32 __int16 field_6;
33 __int16 field_8;
34 __int16 field_A;
35 __int16 field_C;
36 __int16 field_E;
37 __int16 field_10;
38 __int16 field_12;
39 int field_14;
40 };
41 #pragma pack(pop)
42 stru348 stru_4E1890[13] =
43 {
44 { 30, 100, 15, 5, 2, 2, 2, 10, 10, 10, 0},
45 { 50, 150, 20, 5, 2, 2, 2, 5, 5, 5, 1},
46 { 50, 150, 20, 5, 2, 2, 2, 5, 5, 5, 2},
47 { 75, 200, 25, 10, 3, 3, 3, 5, 5, 5, 2},
48 { 75, 200, 20, 10, 3, 3, 3, 5, 5, 5, 1},
49 {100, 300, 30, 15, 4, 4, 4, 10, 10, 10, 1},
50 {100, 300, 30, 15, 4, 4, 4, 10, 10, 10, 2},
51 {150, 400, 20, 10, 5, 5, 5, 25, 25, 25, 0},
52 {200, 500, 20, 10, 1, 1, 1, 15, 15, 15, 2},
53 {100, 300, 20, 50, 1, 1, 5, 5, 5, 25, 0},
54 {125, 350, 10, 20, 3, 1, 2, 15, 5, 10, 2},
55 {125, 350, 10, 20, 3, 1, 2, 15, 5, 10, 1},
56 {100, 300, 50, 50, 5, 3, 5, 20, 10, 20, 0}
57 };
18 58
19 59
20 60
21 61
22 ArcomageGame *pArcomageGame = new ArcomageGame; 62 ArcomageGame *pArcomageGame = new ArcomageGame;
1399 pSoundList->UnloadSound((unsigned __int16)*v4, 1); 1439 pSoundList->UnloadSound((unsigned __int16)*v4, 1);
1400 ++v4; 1440 ++v4;
1401 } 1441 }
1402 while ( (signed int)v4 <= (signed int)&unk_4FAA20 ); 1442 while ( (signed int)v4 <= (signed int)&unk_4FAA20 );
1403 } 1443 }
1404 // 40DFA7: using guessed type uint __stdcall retzero_sub_40DFA7(uint); 1444
1405 // 4E1874: using guessed type int dword_4E1874; 1445
1406 // 4FAA24: using guessed type char byte_4FAA24; 1446
1407 // 4FAA2C: using guessed type char byte_4FAA2C;
1408 // 4FAA70: using guessed type int dword_4FAA70;
1409 // 4FAA77: using guessed type char am_byte_4FAA77;
1410 1447
1411 //----- (00409FE9) -------------------------------------------------------- 1448 //----- (00409FE9) --------------------------------------------------------
1412 char __cdecl am_409FE9() 1449 char __cdecl am_409FE9()
1413 { 1450 {
1414 signed int v0; // edi@1 1451 signed int v0; // edi@1
5796 //RGBTexture::RGBTexture(&this->pGameBackground); 5833 //RGBTexture::RGBTexture(&this->pGameBackground);
5797 //RGBTexture::RGBTexture(&v1->pSprites); 5834 //RGBTexture::RGBTexture(&v1->pSprites);
5798 v1->bGameInProgress = 0; 5835 v1->bGameInProgress = 0;
5799 v1->field_F9 = 0; 5836 v1->field_F9 = 0;
5800 } 5837 }
5838
5839
5840
5841
5842
5843
5844 //----- (00409BE8) --------------------------------------------------------
5845 void __cdecl sub_409BE8()
5846 {
5847 void *v0; // eax@1
5848 stru348 *v1; // eax@1
5849 int v2; // ecx@1
5850 int v3; // eax@1
5851
5852 v0 = window_SpeakInHouse->ptr_1C;
5853 dword_4E1874 = 5;
5854 v1 = &stru_4E1890[(int)((char *)v0 - 108)];
5855 amuint_4E1860 = v1->field_4;
5856 amuint_4E1864 = v1->field_6;
5857 amuint_4E1868 = v1->field_8 - 1;
5858 amuint_4E186C = v1->field_A - 1;
5859 amuint_4E1870 = v1->field_C - 1;
5860 amuint_505884 = v1->field_E;
5861 amuint_505888 = v1->field_10;
5862 amuint_50588C = v1->field_12;
5863 dword_4E1878 = 1;
5864 dword_4E187C = 1;
5865 dword_4E1880 = 1;
5866 dword_4E1884 = v1->field_0;
5867 v2 = v1->field_2;
5868 v3 = v1->field_14;
5869 dword_4E1888 = v2;
5870 dword_4DF3A4 = v3;
5871 }