comparison mm7_data.h @ 1590:5792fdafe2f5

Слияние
author Ritor1
date Wed, 11 Sep 2013 09:39:09 +0600
parents f408fbf3d9cc e42073046f92
children 89dec2be255f 61ea994a1812
comparison
equal deleted inserted replaced
1589:f408fbf3d9cc 1590:5792fdafe2f5
332 extern char aPending[]; // idb 332 extern char aPending[]; // idb
333 extern char aCanTFindS[]; // idb 333 extern char aCanTFindS[]; // idb
334 334
335 extern __int16 word_4E1D3A[]; // weak 335 extern __int16 word_4E1D3A[]; // weak
336 336
337 extern std::array<char, 7> aSbwb00; // weak 337 //extern std::array<char, 7> aSbwb00; // weak
338 extern char aW[2]; // idb 338 extern char aW[2]; // idb
339 extern char aA[2]; // idb 339 extern char aA[2]; // idb
340 extern char aSD[]; // idb 340 extern char aSD[]; // idb
341 extern char aSS03d03dS000S0[]; // idb 341 extern char aSS03d03dS000S0[]; // idb
342 extern char aLuS[]; // idb 342 extern char aLuS[]; // idb
652 extern int dword_50C9DC; // weak 652 extern int dword_50C9DC; // weak
653 extern struct NPCData *ptr_50C9E0; 653 extern struct NPCData *ptr_50C9E0;
654 //extern int dword_50C9E8; // idb 654 //extern int dword_50C9E8; // idb
655 //extern int dword_50C9EC[]; // 50C9EC 655 //extern int dword_50C9EC[]; // 50C9EC
656 extern int dword_50CDC8; 656 extern int dword_50CDC8;
657 extern int dword_50CDCC; // weak
658 extern int bProcessorIsNotIntel; // weak 657 extern int bProcessorIsNotIntel; // weak
659 extern Vec3_int_ layingitem_vel_50FDFC; 658 extern Vec3_int_ layingitem_vel_50FDFC;
660 extern char pStartingMapName[32]; // idb 659 extern char pStartingMapName[32]; // idb
661 extern std::array<unsigned __int8, 5> IsPlayerWearingWatersuit; 660 extern std::array<unsigned __int8, 5> IsPlayerWearingWatersuit;
662 extern std::array<char, 54> party_has_equipment; 661 extern std::array<char, 54> party_has_equipment;
968 extern int dword_80AA18; // weak 967 extern int dword_80AA18; // weak
969 extern int dword_80AA1C; // weak 968 extern int dword_80AA1C; // weak
970 extern int dword_80AA20; // weak 969 extern int dword_80AA20; // weak
971 extern unsigned int uNumElementsIn80AA28; 970 extern unsigned int uNumElementsIn80AA28;
972 extern std::array<struct Polygon *, 2000> ptr_80AA28; 971 extern std::array<struct Polygon *, 2000> ptr_80AA28;
973 extern struct Edge *pNewEdges;
974 extern struct Surf *pSurfs;
975 extern struct Edge *pEdges;
976 extern struct Span *pSpans;
977 extern struct Edge *ptr_80C978_Edges;
978 extern struct Surf *ptr_80C97C_Surfs;
979 extern std::array<struct Edge *, 480> ptr_80CA10;
980 extern _UNKNOWN unk_80D190; // weak 972 extern _UNKNOWN unk_80D190; // weak
981 extern int dword_A74C88; // weak 973 extern int dword_A74C88; // weak
982 extern unsigned int uPlayerCreationUI_SkySliderPos; 974 extern unsigned int uPlayerCreationUI_SkySliderPos;
983 extern int uPlayerCreationUI_ArrowAnim; 975 extern int uPlayerCreationUI_ArrowAnim;
984 extern unsigned int uPlayerCreationUI_SelectedCharacter; 976 extern unsigned int uPlayerCreationUI_SelectedCharacter;
1092 int __fastcall sub_410D99_get_map_index(int a1); 1084 int __fastcall sub_410D99_get_map_index(int a1);
1093 void __fastcall LoadThumbnailLloydTexture(unsigned int uSlot, unsigned int uPlayer); 1085 void __fastcall LoadThumbnailLloydTexture(unsigned int uSlot, unsigned int uPlayer);
1094 void SetAttributeNames(); 1086 void SetAttributeNames();
1095 void uGameUIFontMain_initialize(); 1087 void uGameUIFontMain_initialize();
1096 void uGameUIFontShadow_initialize(); 1088 void uGameUIFontShadow_initialize();
1097 void identify_item(); 1089 void OnInventoryItemRightClick();
1098 void sub_416D62_ShowPopupWindow_MonsterRecord_ItemInfo_etcsub_416D62(struct Vec2_int_ *_this); 1090 void sub_416D62_ShowPopupWindow_MonsterRecord_ItemInfo_etcsub_416D62(struct Vec2_int_ *_this);
1099 void UI_OnMouseLeftClick(int *pXY); // idb 1091 void UI_OnMouseLeftClick(int *pXY); // idb
1100 unsigned int UI_GetHealthManaAndOtherQualitiesStringColor(signed int current_pos, signed int base_pos); 1092 unsigned int UI_GetHealthManaAndOtherQualitiesStringColor(signed int current_pos, signed int base_pos);
1101 unsigned int __fastcall GetSizeInInventorySlots(unsigned int uNumPixels); 1093 unsigned int __fastcall GetSizeInInventorySlots(unsigned int uNumPixels);
1102 struct GUIButton *__fastcall GUI_HandleHotkey(unsigned __int8 uHotkey); // idb 1094 struct GUIButton *__fastcall GUI_HandleHotkey(unsigned __int8 uHotkey); // idb
1120 void reset_some_strus_flt_2Cs(); 1112 void reset_some_strus_flt_2Cs();
1121 int __fastcall GetPortalScreenCoord(unsigned int uFaceID); 1113 int __fastcall GetPortalScreenCoord(unsigned int uFaceID);
1122 bool PortalFrustrum(int pNumVertices, struct BspRenderer_PortalViewportData *a2, struct BspRenderer_PortalViewportData *near_portal, int uFaceID); 1114 bool PortalFrustrum(int pNumVertices, struct BspRenderer_PortalViewportData *a2, struct BspRenderer_PortalViewportData *near_portal, int uFaceID);
1123 int sr_424CD7(unsigned int uVertexID); // idb 1115 int sr_424CD7(unsigned int uVertexID); // idb
1124 int __fastcall sr_424EE0_MakeFanFromTriangle(unsigned int uVertexID); // idb 1116 int __fastcall sr_424EE0_MakeFanFromTriangle(unsigned int uVertexID); // idb
1125 int __fastcall _4268E3_smthn_to_a1r5g5b5(unsigned int uColor); // idb
1126 int __fastcall _42690D_colors_cvt(unsigned int a1);
1127 void __fastcall GivePartyExp(unsigned int pEXPNum); 1117 void __fastcall GivePartyExp(unsigned int pEXPNum);
1128 bool __fastcall sub_427769_spell(unsigned int uSpellID); 1118 bool __fastcall sub_427769_spell(unsigned int uSpellID);
1129 void _42777D_CastSpell_UseWand_ShootArrow(int a1, unsigned int uPlayerID, unsigned int a4, __int16 a5, int a6); 1119 void _42777D_CastSpell_UseWand_ShootArrow(int a1, unsigned int uPlayerID, unsigned int a4, __int16 a5, int a6);
1130 void _42ECB5_PlayerAttacksActor(); 1120 void _42ECB5_PlayerAttacksActor();
1131 void InitializeTurnBasedAnimations(void *); 1121 void InitializeTurnBasedAnimations(void *);
1148 void __fastcall sub_43A97E(unsigned int uLayingItemID, signed int a2); // idb 1138 void __fastcall sub_43A97E(unsigned int uLayingItemID, signed int a2); // idb
1149 double __fastcall sub_43AE12(signed int a1); 1139 double __fastcall sub_43AE12(signed int a1);
1150 int __fastcall _43AFE3_calc_spell_damage(int a1, int a2, signed int a3, int a4); 1140 int __fastcall _43AFE3_calc_spell_damage(int a1, int a2, signed int a3, int a4);
1151 void __fastcall sub_43B057(unsigned int uObjID, unsigned int uActorID, struct Vec3_int_ *pVelocity); 1141 void __fastcall sub_43B057(unsigned int uObjID, unsigned int uActorID, struct Vec3_int_ *pVelocity);
1152 void sub_43B1B0(signed int a1, unsigned int a2, struct Vec3_int_ *pVelocity, signed int a4); 1142 void sub_43B1B0(signed int a1, unsigned int a2, struct Vec3_int_ *pVelocity, signed int a4);
1153 void Software_ResetNewEdges();
1154 void CharacterUI_LoadPaperdollTextures(); 1143 void CharacterUI_LoadPaperdollTextures();
1155 int __fastcall GetItemTextureFilename(char *pOut, signed int item_id, int index, int shoulder); 1144 int __fastcall GetItemTextureFilename(char *pOut, signed int item_id, int index, int shoulder);
1156 bool _43ED6F_check_party_races(bool b); 1145 bool _43ED6F_check_party_races(bool b);
1157 bool sub_43EDB9_get_some_race_sex_relation_2(unsigned int _this); 1146 bool sub_43EDB9_get_some_race_sex_relation_2(unsigned int _this);
1158 bool __fastcall Player_has_item(unsigned int uItemID, struct Player *pPlayer, char a3); 1147 bool __fastcall Player_has_item(unsigned int uItemID, struct Player *pPlayer, char a3);
1231 void SimpleHouseAndBoatsDialog(); 1220 void SimpleHouseAndBoatsDialog();
1232 void CreateButtonInColumn(int a1, unsigned int a2); 1221 void CreateButtonInColumn(int a1, unsigned int a2);
1233 void FillAviableSkillsToTeach(int _this); 1222 void FillAviableSkillsToTeach(int _this);
1234 void sub_4B3E1E(); 1223 void sub_4B3E1E();
1235 void DrawJoinGuildWindow(int pEventCode); 1224 void DrawJoinGuildWindow(int pEventCode);
1236 void __fastcall sub_4B3FE5(int a4); 1225 void __fastcall _4B3FE5_training_dialogue(int a4);
1237 void NPCHireableDialogPrepare(); 1226 void NPCHireableDialogPrepare();
1238 void _4B4224_UpdateNPCTopics(int _this); 1227 void _4B4224_UpdateNPCTopics(int _this);
1239 void __fastcall DrawTextAtStatusBar(const char *Str, int a5); 1228 void __fastcall DrawTextAtStatusBar(const char *Str, int a5);
1240 __int64 GetExperienceRequiredForLevel(int a1); 1229 __int64 GetExperienceRequiredForLevel(int a1);
1241 void CheckBountyRespawnAndAward(); 1230 void CheckBountyRespawnAndAward();
1373 int __fastcall sub_450521_ProllyDropItemAt(int ecx0, signed int a2, int a3, int a4, int a5, unsigned __int16 a6); 1362 int __fastcall sub_450521_ProllyDropItemAt(int ecx0, signed int a2, int a3, int a4, int a5, unsigned __int16 a6);
1374 int __fastcall _45063B_spawn_some_monster(struct MapInfo *a1, int a2); 1363 int __fastcall _45063B_spawn_some_monster(struct MapInfo *a1, int a2);
1375 void RespawnGlobalDecorations(); 1364 void RespawnGlobalDecorations();
1376 bool __fastcall SpawnActor(unsigned int uMonsterID); 1365 bool __fastcall SpawnActor(unsigned int uMonsterID);
1377 int GetAlertStatus(); 1366 int GetAlertStatus();
1378 unsigned int __fastcall sub_452442(unsigned __int16 a1, unsigned __int16 a2, int a3, int a4);
1379 int integer_sqrt(int val); 1367 int integer_sqrt(int val);
1380 int __fastcall MakeColorMaskFromBitDepth(int a1); 1368 int __fastcall MakeColorMaskFromBitDepth(int a1);
1381 void __fastcall fill_pixels_fast(unsigned int a1, unsigned __int16 *pPixels, unsigned int uNumPixels); 1369 void __fastcall fill_pixels_fast(unsigned int a1, unsigned __int16 *pPixels, unsigned int uNumPixels);
1382 int __fastcall GetDiceResult(unsigned int uNumDice, unsigned int uDiceSides); // idb 1370 int __fastcall GetDiceResult(unsigned int uNumDice, unsigned int uDiceSides); // idb
1383 inline int round(float x) { return (int)floor(x + 0.5f); } 1371 inline int round(float x) { return (int)floor(x + 0.5f); }