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

Erwan

Browse Source 
- Adding "turn" information when pressing start ingame. This closes issue 248
This commit is contained in:
wagic.the.homebrew@gmail.com
2010-01-30 09:19:57 +00:00
parent abe66333d5
commit d0212ddfa8
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -385,7 +385,8 @@ void GameStateDuel::Render()
{ {
JLBFont * mFont = resources.GetJLBFont(Constants::MAIN_FONT); JLBFont * mFont = resources.GetJLBFont(Constants::MAIN_FONT);
LOG("Start Render\n"); LOG("Start Render\n");
JRenderer::GetInstance()->ClearScreen(ARGB(0,0,0,0)); JRenderer * r = JRenderer::GetInstance();
r->ClearScreen(ARGB(0,0,0,0));
if (game) if (game)
game->Render(); game->Render();
@@ -394,7 +395,7 @@ void GameStateDuel::Render()
case DUEL_STATE_END: case DUEL_STATE_END:
{ {
JRenderer * r = JRenderer::GetInstance(); JRenderer * r = JRenderer::GetInstance();
r->ClearScreen(ARGB(200,0,0,0)); r->FillRect(0,0,SCREEN_WIDTH,SCREEN_HEIGHT,ARGB(200,0,0,0));
credits->Render(); credits->Render();
#ifdef TESTSUITE #ifdef TESTSUITE
if (mParent->players[1] == PLAYER_TYPE_TESTSUITE){ if (mParent->players[1] == PLAYER_TYPE_TESTSUITE){
@@ -424,7 +425,6 @@ void GameStateDuel::Render()
} }
case DUEL_STATE_ERROR: case DUEL_STATE_ERROR:
{ {
JRenderer * r = JRenderer::GetInstance();
r->ClearScreen(ARGB(200,0,0,0)); r->ClearScreen(ARGB(200,0,0,0));
mFont->DrawString(_("AN ERROR OCCURRED, CHECK FILE NAMES").c_str(),0,SCREEN_HEIGHT/2); mFont->DrawString(_("AN ERROR OCCURRED, CHECK FILE NAMES").c_str(),0,SCREEN_HEIGHT/2);
break; break;
@@ -450,6 +450,12 @@ void GameStateDuel::Render()
case DUEL_STATE_MENU: case DUEL_STATE_MENU:
case DUEL_STATE_CANCEL: case DUEL_STATE_CANCEL:
case DUEL_STATE_BACK_TO_MAIN_MENU: case DUEL_STATE_BACK_TO_MAIN_MENU:
if (game) {
r->FillRect(0,0,SCREEN_WIDTH,SCREEN_HEIGHT,ARGB(100,0,0,0));
char buffer[4096];
sprintf(buffer,_("Turn:%i").c_str(),game->turn);
mFont->DrawString(buffer,SCREEN_WIDTH/2,0,JGETEXT_CENTER);
}
menu->Render(); menu->Render();
} }
LOG("End Render\n"); LOG("End Render\n");

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

@@ -11,7 +11,7 @@
#include "../include/utils.h" #include "../include/utils.h"
#include "../include/DeckDataWrapper.h" #include "../include/DeckDataWrapper.h"
static const char* GAME_VERSION = "WTH?! 0.10.1 - by wololo"; static const char* GAME_VERSION = "WTH?! 0.11.0 - by wololo";
#define DEFAULT_ANGLE_MULTIPLIER 0.4 #define DEFAULT_ANGLE_MULTIPLIER 0.4
#define MAX_ANGLE_MULTIPLIER (3*M_PI) #define MAX_ANGLE_MULTIPLIER (3*M_PI)