[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] r2743 - in branches/pingus_sdl: data/images/fonts src src/c
From: |
nehalmistry |
Subject: |
[Pingus-CVS] r2743 - in branches/pingus_sdl: data/images/fonts src src/components src/worldmap |
Date: |
Tue, 17 Jul 2007 05:10:16 +0200 |
Author: nehalmistry
Date: 2007-07-17 05:10:07 +0200 (Tue, 17 Jul 2007)
New Revision: 2743
Modified:
branches/pingus_sdl/data/images/fonts/courier_small-iso-8859-1.font
branches/pingus_sdl/src/components/menu_button.cpp
branches/pingus_sdl/src/pingus_menu.cpp
branches/pingus_sdl/src/pingus_menu_manager.cpp
branches/pingus_sdl/src/worldmap/level_dot.cpp
Log:
polish up the main screen. fix spelling errors.
Modified: branches/pingus_sdl/data/images/fonts/courier_small-iso-8859-1.font
===================================================================
--- branches/pingus_sdl/data/images/fonts/courier_small-iso-8859-1.font
2007-07-17 02:58:37 UTC (rev 2742)
+++ branches/pingus_sdl/data/images/fonts/courier_small-iso-8859-1.font
2007-07-17 03:10:07 UTC (rev 2743)
@@ -1,11 +1,11 @@
-;; -*- scheme -*-
-(pingus-font
- (name "Pingus Small")
- (space-length 8)
- (alpha-threshold 0)
- (characters "!\"#$%&'()*+,-./0123456789:;<=>?@"
- "ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"
-
"���������������������������������������������������������������������������������������������")
- (image "data/images/fonts/pingus_small-iso-8859-1.png"))
-
-;; EOF ;;
+;; -*- scheme -*-
+(pingus-font
+ (name "Pingus Small")
+ (space-length 8)
+ (alpha-threshold 0)
+ (characters "!\"#$%&'()*+,-./0123456789:;<=>?@"
+ "ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"
+
"���������������������������������������������������������������������������������������������")
+ (image "data/images/fonts/courier_small2.png"))
+
+;; EOF ;;
Modified: branches/pingus_sdl/src/components/menu_button.cpp
===================================================================
--- branches/pingus_sdl/src/components/menu_button.cpp 2007-07-17 02:58:37 UTC
(rev 2742)
+++ branches/pingus_sdl/src/components/menu_button.cpp 2007-07-17 03:10:07 UTC
(rev 2743)
@@ -79,7 +79,7 @@
if (mouse_over && !pressed)
{
gc.print_center(font, (float)Display::get_width() / 2,
- (float)(Display::get_height() - font.get_height()),
+ (float)(Display::get_height() - font.get_height() - 2),
desc.c_str());
gc.draw(surface_p, Vector3f((float)(x_pos - surface_p.get_width()/2),
Modified: branches/pingus_sdl/src/pingus_menu.cpp
===================================================================
--- branches/pingus_sdl/src/pingus_menu.cpp 2007-07-17 02:58:37 UTC (rev
2742)
+++ branches/pingus_sdl/src/pingus_menu.cpp 2007-07-17 03:10:07 UTC (rev
2743)
@@ -60,7 +60,7 @@
Display::get_height() * 450 / 600),
Resource::load_sprite("core/menu/options_on"),
_("Contrib\nLevels"),
- _("..:: Play User Build levels ::.."));
+ _("..:: Play User Built levels ::.."));
story_button = new MenuButton(this, Vector2i(Display::get_width() * 400 /
800,
Display::get_height() * 340 / 600),
@@ -220,12 +220,12 @@
static_cast<float>(Display::get_height()-100),
"Pingus version "VERSION", Copyright (C) 2003 Ingo Ruhnke
<address@hidden>\n");
#else
- gc.print_left(Fonts::pingus_small, 20.0f,
- static_cast<float>(Display::get_height()-100),
+ gc.print_left(Fonts::courier_small, 20.0f,
+ static_cast<float>(Display::get_height()-80),
"Pingus version "VERSION" (unofficial build), Copyright (C)
2003 Ingo Ruhnke <address@hidden>\n");
#endif
- gc.print_left(Fonts::pingus_small, 20.0f,
- static_cast<float>(Display::get_height()-70),
+ gc.print_left(Fonts::courier_small, 20.0f,
+ static_cast<float>(Display::get_height()-60),
"Pingus comes with ABSOLUTELY NO WARRANTY. This is free
software, and you are welcome\n"
"to redistribute it under certain conditions; see the file
COPYING for details.\n");
}
Modified: branches/pingus_sdl/src/pingus_menu_manager.cpp
===================================================================
--- branches/pingus_sdl/src/pingus_menu_manager.cpp 2007-07-17 02:58:37 UTC
(rev 2742)
+++ branches/pingus_sdl/src/pingus_menu_manager.cpp 2007-07-17 03:10:07 UTC
(rev 2743)
@@ -71,7 +71,7 @@
background.draw(gc);
gc.draw_fillrect(0.0,
- static_cast<float>(Display::get_height () - 22),
+ static_cast<float>(Display::get_height () - 26),
static_cast<float>(Display::get_width ()),
static_cast<float>(Display::get_height ()),
Color(0, 0, 0, 255));
Modified: branches/pingus_sdl/src/worldmap/level_dot.cpp
===================================================================
--- branches/pingus_sdl/src/worldmap/level_dot.cpp 2007-07-17 02:58:37 UTC
(rev 2742)
+++ branches/pingus_sdl/src/worldmap/level_dot.cpp 2007-07-17 03:10:07 UTC
(rev 2743)
@@ -42,7 +42,7 @@
: Dot(reader.read_section("dot")),
green_dot_sur(Resource::load_sprite("core/worldmap/dot_green")),
red_dot_sur(Resource::load_sprite("core/worldmap/dot_red")),
- unaccessible_dot_sur(Resource::load_sprite("core/worldmap/dot_invalid")),
+ inaccessible_dot_sur(Resource::load_sprite("core/worldmap/dot_invalid")),
highlight_green_dot_sur(Resource::load_sprite("core/worldmap/dot_green_hl")),
highlight_red_dot_sur(Resource::load_sprite("core/worldmap/dot_red_hl"))
{
@@ -89,7 +89,7 @@
}
else
{
- gc.draw (unaccessible_dot_sur, pos);
+ gc.draw (inaccessible_dot_sur, pos);
}
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] r2743 - in branches/pingus_sdl: data/images/fonts src src/components src/worldmap,
nehalmistry <=