Skip to content
Browse files

Remove the last non-free fonts

git-svn-id: http://svn.nickg.me.uk/work/lander@429 a97b1542-0b21-0410-a459-e47997c36f34
  • Loading branch information...
1 parent b062b33 commit 1d2dadaa5ae7b41e865b9de9995595550dc67c52 nick committed Jun 1, 2008
View
124 COPYRIGHT.vera
@@ -0,0 +1,124 @@
+Bitstream Vera Fonts Copyright
+
+The fonts have a generous copyright, allowing derivative works (as
+long as "Bitstream" or "Vera" are not in the names), and full
+redistribution (so long as they are not *sold* by themselves). They
+can be be bundled, redistributed and sold with any software.
+
+The fonts are distributed under the following copyright:
+
+Copyright
+=========
+
+Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream
+Vera is a trademark of Bitstream, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the fonts accompanying this license ("Fonts") and associated
+documentation files (the "Font Software"), to reproduce and distribute
+the Font Software, including without limitation the rights to use,
+copy, merge, publish, distribute, and/or sell copies of the Font
+Software, and to permit persons to whom the Font Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright and trademark notices and this permission notice
+shall be included in all copies of one or more of the Font Software
+typefaces.
+
+The Font Software may be modified, altered, or added to, and in
+particular the designs of glyphs or characters in the Fonts may be
+modified and additional glyphs or characters may be added to the
+Fonts, only if the fonts are renamed to names not containing either
+the words "Bitstream" or the word "Vera".
+
+This License becomes null and void to the extent applicable to Fonts
+or Font Software that has been modified and is distributed under the
+"Bitstream Vera" names.
+
+The Font Software may be sold as part of a larger software package but
+no copy of one or more of the Font Software typefaces may be sold by
+itself.
+
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL
+BITSTREAM OR THE GNOME FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL,
+OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT
+SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE.
+
+Except as contained in this notice, the names of Gnome, the Gnome
+Foundation, and Bitstream Inc., shall not be used in advertising or
+otherwise to promote the sale, use or other dealings in this Font
+Software without prior written authorization from the Gnome Foundation
+or Bitstream Inc., respectively. For further information, contact:
+fonts at gnome dot org.
+
+Copyright FAQ
+=============
+
+ 1. I don't understand the resale restriction... What gives?
+
+ Bitstream is giving away these fonts, but wishes to ensure its
+ competitors can't just drop the fonts as is into a font sale system
+ and sell them as is. It seems fair that if Bitstream can't make money
+ from the Bitstream Vera fonts, their competitors should not be able to
+ do so either. You can sell the fonts as part of any software package,
+ however.
+
+ 2. I want to package these fonts separately for distribution and
+ sale as part of a larger software package or system. Can I do so?
+
+ Yes. A RPM or Debian package is a "larger software package" to begin
+ with, and you aren't selling them independently by themselves.
+ See 1. above.
+
+ 3. Are derivative works allowed?
+ Yes!
+
+ 4. Can I change or add to the font(s)?
+ Yes, but you must change the name(s) of the font(s).
+
+ 5. Under what terms are derivative works allowed?
+
+ You must change the name(s) of the fonts. This is to ensure the
+ quality of the fonts, both to protect Bitstream and Gnome. We want to
+ ensure that if an application has opened a font specifically of these
+ names, it gets what it expects (though of course, using fontconfig,
+ substitutions could still could have occurred during font
+ opening). You must include the Bitstream copyright. Additional
+ copyrights can be added, as per copyright law. Happy Font Hacking!
+
+ 6. If I have improvements for Bitstream Vera, is it possible they might get
+ adopted in future versions?
+
+ Yes. The contract between the Gnome Foundation and Bitstream has
+ provisions for working with Bitstream to ensure quality additions to
+ the Bitstream Vera font family. Please contact us if you have such
+ additions. Note, that in general, we will want such additions for the
+ entire family, not just a single font, and that you'll have to keep
+ both Gnome and Jim Lyles, Vera's designer, happy! To make sense to add
+ glyphs to the font, they must be stylistically in keeping with Vera's
+ design. Vera cannot become a "ransom note" font. Jim Lyles will be
+ providing a document describing the design elements used in Vera, as a
+ guide and aid for people interested in contributing to Vera.
+
+ 7. I want to sell a software package that uses these fonts: Can I do so?
+
+ Sure. Bundle the fonts with your software and sell your software
+ with the fonts. That is the intent of the copyright.
+
+ 8. If applications have built the names "Bitstream Vera" into them,
+ can I override this somehow to use fonts of my choosing?
+
+ This depends on exact details of the software. Most open source
+ systems and software (e.g., Gnome, KDE, etc.) are now converting to
+ use fontconfig (see www.fontconfig.org) to handle font configuration,
+ selection and substitution; it has provisions for overriding font
+ names and subsituting alternatives. An example is provided by the
+ supplied local.conf file, which chooses the family Bitstream Vera for
+ "sans", "serif" and "monospace". Other software (e.g., the XFree86
+ core server) has other mechanisms for font substitution.
+
View
2 Makefile.am
@@ -2,6 +2,6 @@ SUBDIRS = po data src
ACLOCAL_AMFLAGS = -I m4
-EXTRA_DIST = config.rpath m4/ChangeLog
+EXTRA_DIST = config.rpath m4/ChangeLog COPYRIGHT.vera
View
2 configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([Lunar Lander], [0.9],
+AC_INIT([Lunar Lander], [0.2],
[Nick Gasson <nick@cakesniffer.co.uk>],
[lander])
AM_INIT_AUTOMAKE([-Wall -Werror])
View
0 Default_Font.ttf → data/Default_Font.ttf
File renamed without changes.
View
4 data/Makefile.am
@@ -12,6 +12,8 @@ EXTRA_DIST = images/ship.png images/star.png images/start_option.png \
images/snow_surface2.png images/dirt_surface2.png \
images/grass_surface2.png images/fade.png images/fuelmeter.png \
images/fuelbar.png images/speedmeter.png images/particle.png \
- images/landingpad.png images/landingpadred.png
+ images/landingpad.png images/landingpadred.png images/title.png \
+ images/gameover.png \
+ Default_Font.ttf
nobase_dist_pkgdata_DATA = $(EXTRA_DIST)
View
BIN data/images/gameover.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN data/images/title.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
13 src/Game.cpp
@@ -62,7 +62,8 @@ Game::Game()
fadeTexture("images/fade.png"),
starImage("images/star.png"),
levelComp("images/levelcomp.png"),
- smallShip("images/shipsmall.png")
+ smallShip("images/shipsmall.png"),
+ gameOver("images/gameover.png")
{
}
@@ -710,13 +711,9 @@ void Game::Display()
// Draw game over message
if (lives == 0 || (lives == 1 && life_alpha < LIFE_ALPHA_BASE)) {
- opengl.Colour(0.9f, 0.0f, 0.0f);
- const char *sgo = i18n("Game Over");
- ft.Print
- (ftHollow,
- (opengl.GetWidth() - ft.GetStringWidth(ftHollow, sgo) - 20)/2,
- (opengl.GetHeight() - 150)/2,
- sgo);
+ int draw_x = (opengl.GetWidth() - gameOver.GetWidth()) / 2;
+ int draw_y = (opengl.GetHeight() - 150)/2;
+ gameOver.Draw(draw_x, draw_y);
}
// Draw paused message
View
4 src/Lander.hpp
@@ -40,7 +40,7 @@
#include "Key.hpp"
// Different fonts to be loaded
-enum FontType { ftNormal, ftBig, ftScore, ftHollow, ftScoreName, ftLarge };
+enum FontType { ftNormal, ftBig, ftScore, ftScoreName, ftLarge };
#define MIN(a, b) (a < b ? a : b)
#define MAX(a, b) (a > b ? a : b)
@@ -124,7 +124,7 @@ class Game : public Screen {
Texture fadeTexture;
Image levelComp, smallShip;
- Image starImage;
+ Image starImage, gameOver;
// Stars
static const int MAX_GAME_STARS = 2048;
View
3 src/Main.cpp
@@ -42,7 +42,7 @@ int main(int argc, char **argv)
#ifdef DEBUG_WINDOW
width = DEBUG_WIN_X;
height = DEBUG_WIN_Y;
- fullscreen = true;
+ fullscreen = false;
#else
// width = GetSystemMetrics(SM_CXSCREEN);
// height = GetSystemMetrics(SM_CYSCREEN);
@@ -81,7 +81,6 @@ int main(int argc, char **argv)
ft.LoadFont(ftNormal, File::LocateResource("Default_Font", "ttf"), 11);
ft.LoadFont(ftBig, File::LocateResource("Default_Font", "ttf"), 20);
ft.LoadFont(ftScore, File::LocateResource("Default_Font", "ttf"), 16);
- ft.LoadFont(ftHollow, File::LocateResource("Hollow_Font", "ttf"), 40);
ft.LoadFont(ftScoreName, File::LocateResource("Default_Font", "ttf"), 14);
ft.LoadFont(ftLarge, File::LocateResource("Default_Font", "ttf"), 15);
View
4 src/Makefile.am
@@ -16,10 +16,8 @@ lander_SOURCES = Main.cpp Lander.hpp Game.cpp \
Image.cpp AnimatedImage.hpp AnimatedImage.cpp \
Texture.hpp Texture.cpp
-dist_pkgdata_DATA = ../Default_Font.ttf ../Hollow_Font.ttf
-
localedir = $(datadir)/locale
# Add -DSHOW_FPS here to show FPS in title bar
DEFS = -DLOCALEDIR=\"$(localedir)\" -DLINUX -DUNIX \
- -DDATADIR=\"$(pkgdatadir)\" @DEFS@
+ -DDATADIR=\"$(pkgdatadir)\" @DEFS@
View
33 src/Menu.cpp
@@ -42,7 +42,8 @@ MainMenu::MainMenu()
: startOpt("images/start_option.png", OPTIONS_OFFSET, 0),
scoreOpt("images/score_option.png", OPTIONS_OFFSET, 1),
optionsOpt("images/options_option.png", OPTIONS_OFFSET, 2),
- exitOpt("images/exit_option.png", OPTIONS_OFFSET, 3)
+ exitOpt("images/exit_option.png", OPTIONS_OFFSET, 3),
+ titleImage("images/title.png")
{
}
@@ -213,9 +214,8 @@ void MainMenu::Display()
OpenGL &opengl = OpenGL::GetInstance();
- for (StarListIt it = stars.begin(); it != stars.end(); ++it) {
+ for (StarListIt it = stars.begin(); it != stars.end(); ++it)
(*it).Display();
- }
// Draw logo and menu items
startOpt.Display(selOption == optStart, bigness, fade);
@@ -225,19 +225,23 @@ void MainMenu::Display()
FreeType &ft = FreeType::GetInstance();
- opengl.Colour(0.0f, 1.0f, 0.0f, fade);
- const char *stitle = i18n("LUNAR LANDER");
- ft.Print(ftHollow, (opengl.GetWidth() - ft.GetStringWidth(ftHollow, stitle))/2, 100, stitle);
+ int title_x = (opengl.GetWidth() - titleImage.GetWidth()) / 2;
+ int title_y = 100;
+ titleImage.Draw(title_x, title_y, 0.0, 1.0, fade);
+
// Draw some hint texts
const int numhints = 7;
const char *hints[][2] = {
- { "Use the arrow keys to rotate the ship", "" },
- { "Press the up arrow to fire the thruster", "" },
- { "Smaller landing pads give you more points", "" },
- { "Press P to pause the game", "" },
- { "Press escape to self destruct", "" },
- { "You can only land safely when the", "speed bar is green" },
- { "Collect the spinning rings to", "unlock the landing pads" }
+ { i18n("Use the arrow keys to rotate the ship"), "" },
+ { i18n("Press the up arrow to fire the thruster"), "" },
+ { i18n("Smaller landing pads give you more points"), "" },
+ { i18n("Press P to pause the game"), "" },
+ { i18n("Press escape to self destruct"), "" },
+ // TODO: automatically split text into multiple lines
+ { i18n("You can only land safely when the"),
+ i18n("speed bar is green") },
+ { i18n("Collect the spinning rings to"),
+ i18n("unlock the landing pads") }
};
if (hint_timeout == 0) {
@@ -246,7 +250,8 @@ void MainMenu::Display()
}
else
hint_timeout--;
-
+
+ opengl.Colour(0.0f, 1.0f, 0.0f, fade);
ft.Print(ftNormal,
(opengl.GetWidth() - ft.GetStringWidth(ftNormal, hints[hintidx][0])) / 2,
opengl.GetHeight() - 120,
View
1 src/Menu.hpp
@@ -75,6 +75,7 @@ class MainMenu : public Screen {
SelOption selOption;
double fade, bigness;
MenuState state;
+ Image titleImage;
int hint_timeout, hintidx;

0 comments on commit 1d2dada

Please sign in to comment.
Something went wrong with that request. Please try again.