Jeck - CommonRes transparently finds themed versions of files. Use JRenderer::LoadTexture for unthemed files, and CommonRes::LoadTexture for themed files. Res/graphics/back.jpg renamed to Res/graphics/backdrop.jpg due to collision with sets/back.jpg.

This commit is contained in:
wagic.jeck
2009-08-27 05:58:26 +00:00
parent c6406737c5
commit 5e14efed3c
25 changed files with 527 additions and 286 deletions

View File

@@ -4,7 +4,7 @@
GuiFrame::GuiFrame()
{
if (JTexture* woodTex = GameApp::CommonRes->GetTexture("graphics/wood.png"))
if (JTexture* woodTex = GameApp::CommonRes->GetTexture("wood.png"))
wood = NEW JQuad(woodTex, 0, 0, SCREEN_WIDTH, 16);
else
{
@@ -12,7 +12,7 @@ GuiFrame::GuiFrame()
GameApp::systemError += "Can't load wood texture : " __FILE__ "\n";
}
if (JTexture* goldTex = GameApp::CommonRes->GetTexture("graphics/gold.png"))
if (JTexture* goldTex = GameApp::CommonRes->GetTexture("gold.png"))
{
gold1 = NEW JQuad(goldTex, 0, 0, SCREEN_WIDTH, 6);
gold2 = NEW JQuad(goldTex, 0, 6, SCREEN_WIDTH, 6);
@@ -22,7 +22,7 @@ GuiFrame::GuiFrame()
gold1 = gold2 = NULL;
GameApp::systemError += "Can't load gold texture : " __FILE__ "\n";
}
if (JTexture* goldGlowTex = GameApp::CommonRes->GetTexture("graphics/goldglow.png"))
if (JTexture* goldGlowTex = GameApp::CommonRes->GetTexture("goldglow.png"))
goldGlow = NEW JQuad(goldGlowTex, 0, 1, SCREEN_WIDTH, 18);
else
{