Mercurial > mm7
comparison mm7_data.cpp @ 2243:9e1bd714d1d2
Слияние
| author | Ritor1 |
|---|---|
| date | Mon, 24 Feb 2014 16:19:09 +0600 |
| parents | 699bd6ee5ad0 |
| children | aff7a7b072b7 |
comparison
equal
deleted
inserted
replaced
| 2242:c4f87fb3cfee | 2243:9e1bd714d1d2 |
|---|---|
| 1112 std::array<struct Texture *, 12> ItemsInShopTexture; | 1112 std::array<struct Texture *, 12> ItemsInShopTexture; |
| 1113 __int16 bountyHunting_monster_id_for_hunting; // word_F8B1A0 | 1113 __int16 bountyHunting_monster_id_for_hunting; // word_F8B1A0 |
| 1114 const char *bountyHunting_text; // word_F8B1A4 | 1114 const char *bountyHunting_text; // word_F8B1A4 |
| 1115 int contract_approved; // weak | 1115 int contract_approved; // weak |
| 1116 int dword_F8B1AC_award_bit_number; // idb | 1116 int dword_F8B1AC_award_bit_number; // idb |
| 1117 int dword_F8B1B0; // weak | 1117 int dword_F8B1B0_MasteryBeingTaught; // weak |
| 1118 int gold_transaction_amount; // F8B1B4 | 1118 int gold_transaction_amount; // F8B1B4 |
| 1119 std::array<char *, 4> pShopOptions; | 1119 std::array<char *, 4> pShopOptions; |
| 1120 int dword_F8B1D8; // weak | 1120 int dword_F8B1D8; // weak |
| 1121 int dword_F8B1DC; // weak | 1121 int dword_F8B1DC; // weak |
| 1122 int dword_F8B1E0; // weak | 1122 int dword_F8B1E0; // weak |