Mercurial > mm7
diff mm7_data.h @ 2086:3920278a2905
Слияние
author | Ritor1 |
---|---|
date | Wed, 11 Dec 2013 23:28:05 +0600 |
parents | 52abdea20b9e 0d535449c04f |
children | ee2724b9ca05 85e9766d6124 |
line wrap: on
line diff
--- a/mm7_data.h Wed Dec 11 23:12:54 2013 +0600 +++ b/mm7_data.h Wed Dec 11 23:28:05 2013 +0600 @@ -652,7 +652,6 @@ extern int bRingsShownInCharScreen; // weak -extern std::array<std::array<unsigned __int16, 137>, 117> pOdmMinimap; extern unsigned int uNumBlueFacesInBLVMinimap; extern std::array<unsigned __int16, 50> pBlueFacesInBLVMinimapIDs; extern std::array<int, 14> pTextureIDs_PartyBuffIcons; @@ -843,7 +842,7 @@ extern char pCurrentMapName[32]; // idb extern unsigned int uLevelMapStatsID; - +extern bool FORCE_16_BITS; // related to GAME_SETTINGS_INVALID_RESOLUTION #define GAME_SETTINGS_0001 0x0001 #define GAME_SETTINGS_INVALID_RESOLUTION 0x0002 #define GAME_SETTINGS_NO_INTRO 0x0004 @@ -1074,7 +1073,6 @@ unsigned int SearchActorByGroup(unsigned int *pTotalActors, unsigned int uGroup); unsigned int SearchActorByID(unsigned int *pTotalActors, unsigned int a2); void PrepareArcomage(); -unsigned short TargetColor(unsigned __int16 r, unsigned __int16 g, unsigned __int16 b); // idb void DoBlt_Copy(unsigned __int16 *pPixels); // idb void __fastcall ZBuffer_Fill(int *pZBuffer, int uTextureId, int iZValue); void __fastcall ZBuffer_DoFill(int *pZBuffer, struct Texture *pTex, int uZValue); @@ -1266,8 +1264,6 @@ bool AreRenderSurfacesOk(); unsigned int BlendColors(unsigned int c1, unsigned int c2); // weak void DoRenderBillboards_D3D(); -int __fastcall sr_4A46E6_draw_particle_segment(unsigned int x, signed int y, signed int z, int a4, unsigned int lightColor); -void Present_ColorKey(); void Present_NoColorKey(); unsigned int ModulateColor(unsigned int diffuse, float multiplier); // idb struct SoundHeader *FindSound_BinSearch(unsigned int uStart, unsigned int uEnd, const char *pName);