Mercurial > mm7
diff mm7_unsorted_subs.h @ 2243:9e1bd714d1d2
Слияние
author | Ritor1 |
---|---|
date | Mon, 24 Feb 2014 16:19:09 +0600 |
parents | 1fc4223bddf6 |
children | 0be4f17b7986 |
line wrap: on
line diff
--- a/mm7_unsorted_subs.h Mon Feb 24 16:19:01 2014 +0600 +++ b/mm7_unsorted_subs.h Mon Feb 24 16:19:09 2014 +0600 @@ -156,14 +156,14 @@ char __fastcall DoInteractionWithTopmostZObject(int a1, int a2); void OracleDialogue(); void __fastcall ClickNPCTopic(signed int uMessageParam); -char * _4B254D_SkillMasteryTeacher(int _this); +const char * _4B254D_SkillMasteryTeacher(int trainerInfo); const char *ContractSelectText(int pEventCode); void SimpleHouseDialog(); void CreateButtonInColumn(int a1, unsigned int a2); void FillAviableSkillsToTeach(int _this); void sub_4B3E1E(); void DrawJoinGuildWindow(int pEventCode); -void __fastcall _4B3FE5_training_dialogue(int a4); +void _4B3FE5_training_dialogue(int a4); void NPCHireableDialogPrepare(); void _4B4224_UpdateNPCTopics(int _this); void __fastcall DrawTextAtStatusBar(const char *Str, int a5);