Mercurial > mm7
comparison mm7_data.h @ 2086:3920278a2905
Слияние
author | Ritor1 |
---|---|
date | Wed, 11 Dec 2013 23:28:05 +0600 |
parents | 52abdea20b9e 0d535449c04f |
children | ee2724b9ca05 85e9766d6124 |
comparison
equal
deleted
inserted
replaced
2085:52abdea20b9e | 2086:3920278a2905 |
---|---|
650 extern std::array<char, 17> byte_5111F6; | 650 extern std::array<char, 17> byte_5111F6; |
651 extern std::array<unsigned int, 16> papredoll_dbrds; | 651 extern std::array<unsigned int, 16> papredoll_dbrds; |
652 | 652 |
653 extern int bRingsShownInCharScreen; // weak | 653 extern int bRingsShownInCharScreen; // weak |
654 | 654 |
655 extern std::array<std::array<unsigned __int16, 137>, 117> pOdmMinimap; | |
656 extern unsigned int uNumBlueFacesInBLVMinimap; | 655 extern unsigned int uNumBlueFacesInBLVMinimap; |
657 extern std::array<unsigned __int16, 50> pBlueFacesInBLVMinimapIDs; | 656 extern std::array<unsigned __int16, 50> pBlueFacesInBLVMinimapIDs; |
658 extern std::array<int, 14> pTextureIDs_PartyBuffIcons; | 657 extern std::array<int, 14> pTextureIDs_PartyBuffIcons; |
659 extern unsigned int uIconIdx_FlySpell; | 658 extern unsigned int uIconIdx_FlySpell; |
660 extern unsigned int uIconIdx_WaterWalk; | 659 extern unsigned int uIconIdx_WaterWalk; |
841 //extern HWND hWnd; // idb | 840 //extern HWND hWnd; // idb |
842 extern class OSWindow *window; | 841 extern class OSWindow *window; |
843 extern char pCurrentMapName[32]; // idb | 842 extern char pCurrentMapName[32]; // idb |
844 extern unsigned int uLevelMapStatsID; | 843 extern unsigned int uLevelMapStatsID; |
845 | 844 |
846 | 845 extern bool FORCE_16_BITS; // related to GAME_SETTINGS_INVALID_RESOLUTION |
847 #define GAME_SETTINGS_0001 0x0001 | 846 #define GAME_SETTINGS_0001 0x0001 |
848 #define GAME_SETTINGS_INVALID_RESOLUTION 0x0002 | 847 #define GAME_SETTINGS_INVALID_RESOLUTION 0x0002 |
849 #define GAME_SETTINGS_NO_INTRO 0x0004 | 848 #define GAME_SETTINGS_NO_INTRO 0x0004 |
850 #define GAME_SETTINGS_NO_LOGO 0x0008 | 849 #define GAME_SETTINGS_NO_LOGO 0x0008 |
851 #define GAME_SETTINGS_NO_SOUND 0x0010 | 850 #define GAME_SETTINGS_NO_SOUND 0x0010 |
1072 unsigned int SearchAliveActors(unsigned int *pTotalActors); | 1071 unsigned int SearchAliveActors(unsigned int *pTotalActors); |
1073 unsigned int SearchActorByMonsterID(unsigned int *pTotalActors, int uMonsterID); | 1072 unsigned int SearchActorByMonsterID(unsigned int *pTotalActors, int uMonsterID); |
1074 unsigned int SearchActorByGroup(unsigned int *pTotalActors, unsigned int uGroup); | 1073 unsigned int SearchActorByGroup(unsigned int *pTotalActors, unsigned int uGroup); |
1075 unsigned int SearchActorByID(unsigned int *pTotalActors, unsigned int a2); | 1074 unsigned int SearchActorByID(unsigned int *pTotalActors, unsigned int a2); |
1076 void PrepareArcomage(); | 1075 void PrepareArcomage(); |
1077 unsigned short TargetColor(unsigned __int16 r, unsigned __int16 g, unsigned __int16 b); // idb | |
1078 void DoBlt_Copy(unsigned __int16 *pPixels); // idb | 1076 void DoBlt_Copy(unsigned __int16 *pPixels); // idb |
1079 void __fastcall ZBuffer_Fill(int *pZBuffer, int uTextureId, int iZValue); | 1077 void __fastcall ZBuffer_Fill(int *pZBuffer, int uTextureId, int iZValue); |
1080 void __fastcall ZBuffer_DoFill(int *pZBuffer, struct Texture *pTex, int uZValue); | 1078 void __fastcall ZBuffer_DoFill(int *pZBuffer, struct Texture *pTex, int uZValue); |
1081 void __fastcall ZBuffer_DoFill2(int *pZBuffer, struct Texture *a2, int a3); // idb | 1079 void __fastcall ZBuffer_DoFill2(int *pZBuffer, struct Texture *a2, int a3); // idb |
1082 void SetMoonPhaseNames(); | 1080 void SetMoonPhaseNames(); |
1264 unsigned int __fastcall GetMaxMipLevels(unsigned int uDim); | 1262 unsigned int __fastcall GetMaxMipLevels(unsigned int uDim); |
1265 bool CheckTextureStages(); | 1263 bool CheckTextureStages(); |
1266 bool AreRenderSurfacesOk(); | 1264 bool AreRenderSurfacesOk(); |
1267 unsigned int BlendColors(unsigned int c1, unsigned int c2); // weak | 1265 unsigned int BlendColors(unsigned int c1, unsigned int c2); // weak |
1268 void DoRenderBillboards_D3D(); | 1266 void DoRenderBillboards_D3D(); |
1269 int __fastcall sr_4A46E6_draw_particle_segment(unsigned int x, signed int y, signed int z, int a4, unsigned int lightColor); | |
1270 void Present_ColorKey(); | |
1271 void Present_NoColorKey(); | 1267 void Present_NoColorKey(); |
1272 unsigned int ModulateColor(unsigned int diffuse, float multiplier); // idb | 1268 unsigned int ModulateColor(unsigned int diffuse, float multiplier); // idb |
1273 struct SoundHeader *FindSound_BinSearch(unsigned int uStart, unsigned int uEnd, const char *pName); | 1269 struct SoundHeader *FindSound_BinSearch(unsigned int uStart, unsigned int uEnd, const char *pName); |
1274 struct SoundData *LoadSound(const char *pSoundName, struct SoundData *pOutBuff, unsigned int uID); | 1270 struct SoundData *LoadSound(const char *pSoundName, struct SoundData *pOutBuff, unsigned int uID); |
1275 int __fastcall sub_4AAEA6_transform(struct RenderVertexSoft *a1); | 1271 int __fastcall sub_4AAEA6_transform(struct RenderVertexSoft *a1); |