Mercurial > mm7

diff Engine/LOD.h @ 2574:dd36326a9994

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
More texture refactoring GetLeather -> DrawTextureCustomHeight
author a.parshin
date Mon, 07 Mar 2016 03:48:40 +0200
parents d87bfbd3bb3b
children a76d408c5132
line wrap: on
line diff
--- a/Engine/LOD.h	Sat Mar 05 16:25:53 2016 +0200
+++ b/Engine/LOD.h	Mon Mar 07 03:48:40 2016 +0200
@@ -153,13 +153,13 @@
   bool Load(const char *pFilename, const char *pFolderName);
   void ReleaseAll();
   unsigned int LoadTexture(const char *pContainer, enum TEXTURE_TYPE uTextureType = TEXTURE_DEFAULT);
-  struct Texture *LoadTexturePtr(const char *pContainer, enum TEXTURE_TYPE uTextureType = TEXTURE_DEFAULT);
-  int LoadTextureFromLOD(struct Texture *pOutTex, const char *pContainer, enum TEXTURE_TYPE eTextureType);
-  int ReloadTexture(struct Texture *pDst, const char *pContainer, int mode);
+  struct Texture_MM7 *LoadTexturePtr(const char *pContainer, enum TEXTURE_TYPE uTextureType = TEXTURE_DEFAULT);
+  int LoadTextureFromLOD(struct Texture_MM7 *pOutTex, const char *pContainer, enum TEXTURE_TYPE eTextureType);
+  int ReloadTexture(struct Texture_MM7 *pDst, const char *pContainer, int mode);
   void ReleaseHardwareTextures();
   void ReleaseLostHardwareTextures();
   void _410423_move_textures_to_device();
-  int _410522(struct Texture *pDst, const char *pContainer, unsigned int uTextureType);
+  int _410522(struct Texture_MM7 *pDst, const char *pContainer, unsigned int uTextureType);
   void SetupPalettes(unsigned int uTargetRBits, unsigned int uTargetGBits, unsigned int uTargetBBits);
   void ReleaseAll2();
   void RemoveTexturesPackFromTextureList();
@@ -170,7 +170,7 @@
 
   int LoadDummyTexture();
 
-  Texture *GetTexture(int idx);
+  Texture_MM7 *GetTexture(int idx);
 
 
   /*FILE *pFile;
@@ -187,7 +187,7 @@
   struct LOD::Directory *pSubIndices;
   unsigned int uOffsetToSubIndex;
   FILE *pOutputFileHandle;*/
-  Texture pTextures[MAX_LOD_TEXTURES];
+  Texture_MM7 pTextures[MAX_LOD_TEXTURES];
   unsigned int uNumLoadedFiles;
   int dword_11B80;
   int dword_11B84;