Mercurial > mm7
diff mm7_data.cpp @ 283:e3b70ba42154
Слияние
author | Ritor1 |
---|---|
date | Sun, 17 Feb 2013 20:54:07 +0600 |
parents | 3395164886cd 0df4136b6aac |
children | 64770a1eb8e9 |
line wrap: on
line diff
--- a/mm7_data.cpp Sun Feb 17 20:53:53 2013 +0600 +++ b/mm7_data.cpp Sun Feb 17 20:54:07 2013 +0600 @@ -1750,7 +1750,7 @@ char *pClassTXT_Raw; char *pStatsTXT_Raw; char *pSkillDescTXT_Raw; -struct StorylineText *pStorylineText; + struct FactionTable *pFactionTable; char byte_5C8D1A[777]; // weak @@ -1764,7 +1764,7 @@ char *pHostileTXT_Raw; char *pPotionsTXT_Raw; char *pPotionNotesTXT_Raw; -char *pHistoryTXT_Raw; + int _6807B8_level_decorations_ids[777]; // idb int _6807E0_num_decorations_with_sounds_6807B8; // weak int _6807E8_level_decorations_ids[777]; // idb