Mercurial > mm7
diff LOD.h @ 1572:19f1735fca80
Слияние
author | Ritor1 |
---|---|
date | Sun, 08 Sep 2013 17:07:58 +0600 |
parents | c4ab816fcc5e |
children | 69ab7593e7af |
line wrap: on
line diff
--- a/LOD.h Sun Sep 08 17:07:47 2013 +0600 +++ b/LOD.h Sun Sep 08 17:07:58 2013 +0600 @@ -1,9 +1,9 @@ #pragma once #include <stdio.h> #include <memory.h> -#include <assert.h> #include "Texture.h" +#include "ErrorHandling.h" class Sprite; @@ -166,7 +166,7 @@ inline struct Texture *GetTexture(int idx) { - assert(idx < 1000); + Assert(idx < 1000, "Texture index out of bounds (%u)", idx); if (idx == -1) return nullptr; // we need to return dummy texture here return &pTextures[idx]; @@ -302,14 +302,18 @@ extern LODFile_IconsBitmaps *pEvents_LOD; + extern LODFile_IconsBitmaps *pIcons_LOD; extern LODFile_IconsBitmaps *pIcons_LOD_mm6; +extern LODFile_IconsBitmaps *pIcons_LOD_mm8; extern LODFile_IconsBitmaps *pBitmaps_LOD; extern LODFile_IconsBitmaps *pBitmaps_LOD_mm6; +extern LODFile_IconsBitmaps *pBitmaps_LOD_mm8; extern LODFile_Sprites *pSprites_LOD; extern LODFile_Sprites *pSprites_LOD_mm6; +extern LODFile_Sprites *pSprites_LOD_mm8; extern LODWriteableFile *pNew_LOD; extern LODWriteableFile *pGames_LOD;