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

Another change that looks bigger than it is: changed out the global extern WResourceManager to a real singleton. This means that it's no longer being init'ed at static initialization time, and we can debug construction/destruction properly; it's also safer in a multithreaded context.

Browse Source
This commit is contained in:
wrenczes@gmail.com
2010-12-01 08:22:17 +00:00
parent aa6aa20ba5
commit 65e38b0694
53 changed files with 369 additions and 346 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -262,7 +262,7 @@ void GameStateDuel::End()
//TODO Move This to utils or ResourceManager. Don't we have more generic functions that can do that?
bool GameStateDuel::MusicExist(string FileName)
{
string filepath = JGE_GET_RES(resources.musicFile(FileName));
string filepath = JGE_GET_RES(WResourceManager::Instance()->musicFile(FileName));
std::ifstream file(filepath.c_str());
if (file)
{
@@ -512,7 +512,7 @@ void GameStateDuel::Update(float dt)
void GameStateDuel::Render()
{
WFont * mFont = resources.GetWFont(Fonts::MAIN_FONT);
WFont * mFont = WResourceManager::Instance()->GetWFont(Fonts::MAIN_FONT);
JRenderer * r = JRenderer::GetInstance();
r->ClearScreen(ARGB(0,0,0,0));