Mercurial > mm7

diff Engine/LOD.h @ 2572:d87bfbd3bb3b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Step towards unification of Texture and RGBTexture (class Image)
author a.parshin
date Sat, 05 Mar 2016 01:51:54 +0200
parents 68cdef6879a0
children dd36326a9994
line wrap: on
line diff
--- a/Engine/LOD.h	Mon Oct 05 00:19:13 2015 +0200
+++ b/Engine/LOD.h	Sat Mar 05 01:51:54 2016 +0200
@@ -168,13 +168,7 @@
   void _inlined_sub1();
   void _inlined_sub2();
 
-  inline int LoadDummyTexture()
-  {
-    for (unsigned int i = 0; i < uNumLoadedFiles; ++i)
-      if (!strcmp(pTextures[i].pName, "pending"))
-        return i;
-    return LoadTextureFromLOD(&pTextures[uNumLoadedFiles], "pending", TEXTURE_16BIT_PALETTE);
-  }
+  int LoadDummyTexture();
 
   Texture *GetTexture(int idx);
 
@@ -204,7 +198,7 @@
   int uNumPrevLoadedFiles;
   int uTexturePacksCount;
   int pFacesLock;
-  int dword_011BA4;
+  int _011BA4_debug_paletted_pixels_uncompressed;
   //int can_load_hardware_sprites;
   struct IDirectDrawSurface **pHardwareSurfaces;
   struct IDirect3DTexture2 **pHardwareTextures;