diff --git a/projects/mtg/bin/Res/graphics/shop_light.jpg b/projects/mtg/bin/Res/graphics/shop_light.jpg new file mode 100644 index 000000000..4f4c5b6fc Binary files /dev/null and b/projects/mtg/bin/Res/graphics/shop_light.jpg differ diff --git a/projects/mtg/bin/Res/graphics/shop_light.png b/projects/mtg/extra/graphic sources/shop_light.png similarity index 100% rename from projects/mtg/bin/Res/graphics/shop_light.png rename to projects/mtg/extra/graphic sources/shop_light.png diff --git a/projects/mtg/include/WResourceManager.h b/projects/mtg/include/WResourceManager.h index 3737b8a4d..23f0a4b0d 100644 --- a/projects/mtg/include/WResourceManager.h +++ b/projects/mtg/include/WResourceManager.h @@ -135,7 +135,7 @@ public: JSample * RetrieveSample(string filename, int style = RETRIEVE_NORMAL, int submode = CACHE_NORMAL); JTexture * RetrieveTexture(string filename, int style = RETRIEVE_NORMAL, int submode = CACHE_NORMAL); JQuad * RetrieveQuad(string filename, float offX=0.0f, float offY=0.0f, float width=0.0f, float height=0.0f, string resname="", int style = RETRIEVE_LOCK, int submode = CACHE_NORMAL, int id = 0); - JQuad * RetrieveTempQuad(string filename); + JQuad * RetrieveTempQuad(string filename, int submode = CACHE_NORMAL); hgeParticleSystemInfo * RetrievePSI(string filename, JQuad * texture, int style = RETRIEVE_NORMAL, int submode = CACHE_NORMAL); int RetrieveError(); diff --git a/projects/mtg/src/ShopItem.cpp b/projects/mtg/src/ShopItem.cpp index 14f7c2a5c..e27a68752 100644 --- a/projects/mtg/src/ShopItem.cpp +++ b/projects/mtg/src/ShopItem.cpp @@ -298,7 +298,7 @@ void ShopItems::Render(){ if (mBgAA) r->RenderQuad(mBgAA,0,SCREEN_HEIGHT-128); - JQuad * quad = resources.RetrieveTempQuad("shop_light.png"); + JQuad * quad = resources.RetrieveTempQuad("shop_light.jpg",TEXTURE_SUB_5551); if (quad){ r->SetTexBlend(BLEND_SRC_ALPHA, BLEND_ONE); quad->SetColor(ARGB(lightAlpha,255,255,255)); diff --git a/projects/mtg/src/WResourceManager.cpp b/projects/mtg/src/WResourceManager.cpp index 979e1a525..7aa9af2fd 100644 --- a/projects/mtg/src/WResourceManager.cpp +++ b/projects/mtg/src/WResourceManager.cpp @@ -272,8 +272,8 @@ JQuad * WResourceManager::GetQuad(int id){ return jtex->GetQuad(managedQuads[id]->resname); } -JQuad * WResourceManager::RetrieveTempQuad(string filename){ - return RetrieveQuad(filename,0,0,0,0,"temporary",RETRIEVE_NORMAL); +JQuad * WResourceManager::RetrieveTempQuad(string filename,int submode){ + return RetrieveQuad(filename,0,0,0,0,"temporary",RETRIEVE_NORMAL,submode); } JQuad * WResourceManager::RetrieveQuad(string filename, float offX, float offY, float width, float height, string resname, int style, int submode, int id){