comparison mm7_data.h @ 1585:e42073046f92

Merge
author Nomad
date Tue, 10 Sep 2013 21:08:43 +0200
parents 75fafd8ced59 d3d539924e5e
children 5792fdafe2f5
comparison
equal deleted inserted replaced
1584:cff02d7d3460 1585:e42073046f92
1220 void SimpleHouseAndBoatsDialog(); 1220 void SimpleHouseAndBoatsDialog();
1221 void CreateButtonInColumn(int a1, unsigned int a2); 1221 void CreateButtonInColumn(int a1, unsigned int a2);
1222 void FillAviableSkillsToTeach(int _this); 1222 void FillAviableSkillsToTeach(int _this);
1223 void sub_4B3E1E(); 1223 void sub_4B3E1E();
1224 void DrawJoinGuildWindow(int pEventCode); 1224 void DrawJoinGuildWindow(int pEventCode);
1225 void __fastcall sub_4B3FE5(int a4); 1225 void __fastcall _4B3FE5_training_dialogue(int a4);
1226 void NPCHireableDialogPrepare(); 1226 void NPCHireableDialogPrepare();
1227 void _4B4224_UpdateNPCTopics(int _this); 1227 void _4B4224_UpdateNPCTopics(int _this);
1228 void __fastcall DrawTextAtStatusBar(const char *Str, int a5); 1228 void __fastcall DrawTextAtStatusBar(const char *Str, int a5);
1229 __int64 GetExperienceRequiredForLevel(int a1); 1229 __int64 GetExperienceRequiredForLevel(int a1);
1230 void CheckBountyRespawnAndAward(); 1230 void CheckBountyRespawnAndAward();