Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Erwan

Browse Source 
-attempt at fixing shop crash introduced in r1231 (size needed in ram divided by 4)
This commit is contained in:
wagic.the.homebrew@gmail.com
2009-11-04 13:33:21 +00:00
parent 500c1fc1a2
commit f33d37d9f2
5 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
projects/mtg/bin/Res/graphics/shop_light.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

0
projects/mtg/bin/Res/graphics/shop_light.png → projects/mtg/extra/graphic sources/shop_light.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 86 KiB

After

Width:  |  Height:  |  Size: 86 KiB

2
projects/mtg/include/WResourceManager.h
View File

@@ -135,7 +135,7 @@ public:
JSample * RetrieveSample(string filename, int style = RETRIEVE_NORMAL, int submode = CACHE_NORMAL); JSample * RetrieveSample(string filename, int style = RETRIEVE_NORMAL, int submode = CACHE_NORMAL);
JTexture * RetrieveTexture(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 * 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); hgeParticleSystemInfo * RetrievePSI(string filename, JQuad * texture, int style = RETRIEVE_NORMAL, int submode = CACHE_NORMAL);
int RetrieveError(); int RetrieveError();

2
projects/mtg/src/ShopItem.cpp
View File

@@ -298,7 +298,7 @@ void ShopItems::Render(){
if (mBgAA) if (mBgAA)
r->RenderQuad(mBgAA,0,SCREEN_HEIGHT-128); 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){ if (quad){
r->SetTexBlend(BLEND_SRC_ALPHA, BLEND_ONE); r->SetTexBlend(BLEND_SRC_ALPHA, BLEND_ONE);
quad->SetColor(ARGB(lightAlpha,255,255,255)); quad->SetColor(ARGB(lightAlpha,255,255,255));

4
projects/mtg/src/WResourceManager.cpp
View File

@@ -272,8 +272,8 @@ JQuad * WResourceManager::GetQuad(int id){
return jtex->GetQuad(managedQuads[id]->resname); return jtex->GetQuad(managedQuads[id]->resname);
} }
JQuad * WResourceManager::RetrieveTempQuad(string filename){ JQuad * WResourceManager::RetrieveTempQuad(string filename,int submode){
return RetrieveQuad(filename,0,0,0,0,"temporary",RETRIEVE_NORMAL); 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){ JQuad * WResourceManager::RetrieveQuad(string filename, float offX, float offY, float width, float height, string resname, int style, int submode, int id){