shading of labels now dependent on the font size

This commit is contained in:
2011-04-19 10:38:59 +02:00
parent 7fddb0848d
commit 8954cf0db0
6 changed files with 77 additions and 25 deletions
+1 -1
View File
@@ -794,7 +794,7 @@ void Model::OnKillEntity (const Engine::EntityBase *entity) {
const AsteroidEntity *asteroid = static_cast<const AsteroidEntity*>(entity);
if (GetPlayerEntityId() != Engine::NullEntityId) {
mLevelPoints += 150 + asteroid->mSubAsteroidsCount * 75;
mLevelPoints += (150 + asteroid->mSubAsteroidsCount * 75) * 6;
}
for (i = 0; i < mAsteroids.size(); i++) {
+32 -19
View File
@@ -583,10 +583,40 @@ void View::DrawUiGameOver() {
SelectFont("console.ttf size=23 color=#ffffff");
if (GetModel()->GetPlayerLives() == 0) {
int text_xpos = screen_right * 0.5,
text_ypos = screen_bottom * 0.5 - 64;
Engine::GUI::LabelCentered(5,
"That was pathetic!",
screen_right * 0.5,
screen_bottom * 0.5 - 8);
text_xpos,
text_ypos);
const static int value_width = 10;
text_ypos += 64;
// ----- New Score -----
unsigned int player_points = GetModel()->GetPoints();
Engine::GUI::Label (1, "At least you made a score of:",
text_xpos, text_ypos + 3
);
text_ypos += 32;
stringstream temp_stream;
temp_stream.str("");
temp_stream << setw(value_width) << player_points;
Engine::GUI::Label (1, temp_stream.str().c_str(),
text_xpos, text_ypos + 3
);
text_ypos += 64;
Engine::GUI::Label (1, "Play harder!",
text_xpos, text_ypos + 3
);
} else {
Engine::GUI::LabelCentered (6, "You earned yourself the",
screen_right * 0.5,
@@ -667,28 +697,11 @@ void View::DrawUiLevelIntro() {
level_title_dest_x - Engine::GetTimer("LevelIntroLevelTitle") * level_title_delta_x - 2,
level_title_dest_y - Engine::GetTimer("LevelIntroLevelTitle") * level_title_delta_y + 2 + 40
);
SelectFont("console.ttf size=46 color=#ffffff");
Engine::GUI::LabelCentered (22, first_line.c_str(),
level_title_dest_x - Engine::GetTimer("LevelIntroLevelTitle") * level_title_delta_x,
level_title_dest_y - Engine::GetTimer("LevelIntroLevelTitle") * level_title_delta_y
);
Engine::GUI::LabelCentered (22, second_line.c_str(),
level_title_dest_x - Engine::GetTimer("LevelIntroLevelTitle") * level_title_delta_x,
level_title_dest_y - Engine::GetTimer("LevelIntroLevelTitle") * level_title_delta_y + 40
);
} else {
Engine::GUI::LabelCentered (21, level_title.c_str(),
level_title_dest_x - Engine::GetTimer("LevelIntroLevelTitle") * level_title_delta_x - 2,
level_title_dest_y - Engine::GetTimer("LevelIntroLevelTitle") * level_title_delta_y + 2
);
SelectFont("console.ttf size=46 color=#ffffff");
Engine::GUI::LabelCentered (22, level_title.c_str(),
level_title_dest_x - Engine::GetTimer("LevelIntroLevelTitle") * level_title_delta_x,
level_title_dest_y - Engine::GetTimer("LevelIntroLevelTitle") * level_title_delta_y
);
}
SelectFont ("console.ttf size=23");