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

Erwan

Browse Source 
- updated pt translation (thanks to almosthumane)
- Added/updated some Themes by Ilya B
- Added a random wallpaper loading at loading screen (see wallpapers.txt in Res/graphics)
- Saving decks and collection should now be a bit more secure (attempt at minimizing issue 393)
This commit is contained in:
wagic.the.homebrew@gmail.com
2010-05-02 12:49:36 +00:00
parent c26f453b16
commit 755bb04475
54 changed files with 304 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -160,6 +160,8 @@ void GameStateMenu::Start(){
if(currentState == MENU_STATE_MAJOR_MAINMENU){
currentState = currentState | MENU_STATE_MINOR_FADEIN;
}
wallpaper = "";
}
void GameStateMenu::genNbCardsStr(){
@@ -280,6 +282,28 @@ void GameStateMenu::End()
SAFE_DELETE(mGuiController);
}
string GameStateMenu::loadRandomWallpaper() {
if (wallpaper.size())
return wallpaper;
vector<string> wallpapers;
std::ifstream file("Res/graphics/wallpapers.txt");
if (!file) return wallpaper;
string s;
while (std::getline(file,s)) {
if (!s.size()) continue;
if (s[s.size()-1] == '\r') s.erase(s.size()-1); //Handle DOS files
wallpapers.push_back(s);
}
int rnd = rand() % (wallpapers.size());
wallpaper = wallpapers[rnd];
return wallpaper;
}
string GameStateMenu::getLang(string s){
if (!s.size()) return "";
if (s[s.size()-1] == '\r') s.erase(s.size()-1); //Handle DOS files
@@ -530,8 +554,17 @@ void GameStateMenu::Render()
}
if (mSplash)
renderer->RenderQuad(mSplash,0,0);
else {
string wp = loadRandomWallpaper();
if (wp.size()) {
JTexture * wpTex = resources.RetrieveTexture(wp);
if (wpTex) {
JQuad * wpQuad = resources.RetrieveTempQuad(wp);
renderer->RenderQuad(wpQuad,0,0,0,SCREEN_WIDTH_F / wpQuad->mWidth, SCREEN_HEIGHT_F / wpQuad->mHeight);
}
}
}
char text[512];
mFont->SetColor(ARGB(255,255,255,255));
if (mCurrentSetName[0]) {
sprintf(text, _("LOADING SET: %s").c_str(), mCurrentSetName);
}else{
@@ -540,7 +573,10 @@ void GameStateMenu::Render()
else
sprintf(text,"LOADING...");
}
mFont->DrawString(text,SCREEN_WIDTH/2,SCREEN_HEIGHT/2,JGETEXT_CENTER);
mFont->SetColor(ARGB(170,0,0,0));
mFont->DrawString(text,SCREEN_WIDTH/2 + 2 ,SCREEN_HEIGHT - 50 + 2,JGETEXT_CENTER);
mFont->SetColor(ARGB(255,255,255,255));
mFont->DrawString(text,SCREEN_WIDTH/2,SCREEN_HEIGHT - 50,JGETEXT_CENTER);
}else{
mFont = resources.GetJLBFont(Constants::MAIN_FONT);
PIXEL_TYPE colors[] =