diff mm7_data.h @ 1441:b67a3e0d6fc3

Слияние
author Ritor1
date Sat, 27 Jul 2013 09:36:55 +0600
parents 2423bc2af692
children 182d58b2a34c
line wrap: on
line diff
--- a/mm7_data.h	Sat Jul 27 09:36:29 2013 +0600
+++ b/mm7_data.h	Sat Jul 27 09:36:55 2013 +0600
@@ -607,7 +607,7 @@
 extern int dword_507CC0_activ_ch; // weak
 extern __int64 GameUI_RightPanel_BookFlashTimer; // weak
 extern int _507CD4_RestUI_hourglass_anim_controller; // weak
-extern int dword_507CD8; // weak
+extern bool OpenedTelekinesis; // weak
 extern std::array<int, 50> dword_50B570; // weak
 extern std::array<int, 50> dword_50B638; // weak
 extern struct stru367 PortalFace;
@@ -993,8 +993,8 @@
 extern int dword_A75070; // weak
 extern std::array<struct Player *, 5> pPlayers;
 extern __int64 qword_A750D8; // weak
-extern __int16 word_A750E0; // weak
-extern __int16 word_A750E2; // weak
+extern enum PlayerSpeech PlayerSpeechID;
+extern int uSpeakingCharacter; // weak
 extern std::array<char *, 36> pClassNames;
 extern std::array<char *, 19> aCharacterConditionNames;
 extern std::array<char *, 38> pSkillNames;
@@ -1217,10 +1217,10 @@
 
 void __cdecl OnMapLeave();
 void /*__usercall*/ OnMapLoad();
-void __thiscall Level_LoadEvtAndStr(const char *pLevelName);
+void Level_LoadEvtAndStr(const char *pLevelName);
 const char *__cdecl sub_444564();
 char *__thiscall GetEventHintString(unsigned int uEventID); // idb
-signed int __cdecl GetTravelTime();
+int GetTravelTime();
 void __fastcall sub_4451A8_press_any_key(int a1, int a2, int a4);
 void __cdecl sub_4452BB();
 const char *GetProfessionActionText(int a1);
@@ -1293,7 +1293,7 @@
 void __fastcall PrepareToLoadODM(unsigned int bLoading, struct OutdoorCamera *a2);
 void __cdecl sub_461103();
 int __cdecl sub_4613C4();
-int __fastcall int_get_vector_length(signed int a1, signed int a2, signed int a3);
+int int_get_vector_length(signed int x, signed int y, signed int z);
 int __cdecl sub_46224A();
 int __cdecl crt_init_globals_462620();
 void __cdecl crt_init_globals_462659();
@@ -1376,21 +1376,17 @@
 void __cdecl loc_47907F(); // idb
 bool __fastcall IsBModelVisible(unsigned int uModelID, int *unused);
 void __thiscall ODM_LoadAndInitialize(const char *pLevelFilename, struct OutdoorCamera *thisa);
-unsigned __int16 *__fastcall GetBillboardPalette(struct RenderBillboard *a1, int a2, signed int a3, int a4);
-unsigned int __cdecl GetLevelFogColor();
+unsigned int GetLevelFogColor();
 int __fastcall sub_47C3D7_get_fog_related_stuff(int a1, int a2, float a3);
 signed int __fastcall GetActorTintColor(int max_dim, int min_dim, float distance, int a4, struct RenderBillboard *a5);
 unsigned int __stdcall WorldPosToGridCellX(int); // weak
 unsigned int __stdcall WorldPosToGridCellZ(int); // weak
 int __stdcall GridCellToWorldPosX(int); // weak
 int __stdcall GridCellToWorldPosZ(int); // weak
-void __fastcall sub_47F4D3(int band1, int band2, int band3);
 void __cdecl loc_48118F(); // idb
 void __cdecl loc_481199(); // idb
-void __cdecl ResetPolygons();
+void ResetPolygons();
 void __cdecl sub_481ED9_MessWithOutdoorCamera();
-bool __fastcall sub_481EFA(RenderVertexSoft *a1, RenderVertexSoft *a2, RenderVertexSoft *a3, RenderVertexSoft *a4, int a5);
-signed int __fastcall sub_481FC9(RenderVertexSoft *_ECX, RenderVertexSoft *a2, RenderVertexSoft *a3, struct Polygon *a4);
 bool IsTerrainSlopeTooHigh(int pos_x, int pos_y);
 int __fastcall GetTerrainHeightsAroundParty2(int a1, int a2, int *a3, int a4);
 signed int __cdecl const_1_0();
@@ -1413,7 +1409,7 @@
 unsigned int __fastcall _494820_training_time(unsigned int a1);
 char *__fastcall sub_495366(unsigned __int8 a1, unsigned __int8 a2);
 char *GetReputationString(signed int a1);
-char *BuilDialogueString(char *lpsz, unsigned __int8 uPlayerID, struct ItemGen *a3, char *a4, int a5, __int64 *a6);
+char *BuildDialogueString(char *lpsz, unsigned __int8 uPlayerID, struct ItemGen *a3, char *a4, int a5, __int64 *a6);
 void PlayerCreationUI_Draw();
 void PlayerCreationUI_Initialize();
 void DeleteCCharFont();
@@ -1427,11 +1423,11 @@
 void Present_ColorKey();
 void Present_NoColorKey();
 unsigned int ModulateColor(unsigned int diffuse, float multiplier); // idb
-struct SoundHeader *__fastcall FindSound_BinSearch(unsigned int uStart, unsigned int uEnd, const char *pName);
+struct SoundHeader *FindSound_BinSearch(unsigned int uStart, unsigned int uEnd, const char *pName);
 struct SoundData *LoadSound(const char *pSoundName, struct SoundData *pOutBuff, unsigned int uID);
 int __fastcall sub_4AAEA6_transform(RenderVertexSoft *a1);
 int __fastcall sub_4AB66C(int, int); // weak
-int __fastcall GetSoundStrengthByDistanceFromParty(int a1, int a2, int a3);
+int GetSoundStrengthByDistanceFromParty(int x, int y, int z);
 struct _DIG_DRIVER *Audio_GetFirstHardwareDigitalDriver(void);
 void __cdecl PlayLevelMusic();
 unsigned int __fastcall sub_4B0E07(unsigned int uFaceID); // idb
@@ -1439,7 +1435,7 @@
 void __thiscall sub_4B1523(int *_this);
 void __cdecl ShowPopupShopItem();
 void __stdcall RestAndHeal(__int64 uNumMinutes); // idb
-void __cdecl sub_4B1D27();
+void __cdecl GetHouseGoodbyeSpeech();
 
 void __cdecl sub_4B1ECE();
 void __fastcall ClickNPCTopic(signed int uMessageParam);
@@ -1448,9 +1444,6 @@
 void SimpleHouseAndBoatsDialog();
 void  CreateButtonInColumn(int a1, unsigned int a2);
 void FillAviableSkillsToTeach(int _this);
-void  sub_4B3A72(int a1); // idb
-void sub_4B3AD4(signed int a1);
-void sub_4B3B42(signed int a1);
 void __cdecl sub_4B3E1E();
 void DrawJoinGuildWindow(int pEventCode);
 void __fastcall sub_4B3FE5(int a4);