Permalink
Browse files

Fiddle with lander fonts

git-svn-id: http://svn.nickg.me.uk/work/lander/trunk@318 a97b1542-0b21-0410-a459-e47997c36f34
  • Loading branch information...
1 parent 095b27c commit 21053178c0635aef3678eb205fb4a4917d12e64a nick committed Mar 17, 2008
View
Binary file not shown.
View
Binary file not shown.
File renamed without changes.
@@ -0,0 +1,77 @@
++=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+
++=+=+=+=+=+=+=+=+=+= A GreyWolf WebWorks Free Font =+=+=+=+=+=+=+=+=+=+
++=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+
++=+=+=+=+=+=+= "Abduction" Copyright� 1998-2001 R. Gast =+=+=+=+=+=+=+
++=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+
+
+"Abduction" is the 8th free font from Rich Gast.
+
+It was originally created on 06/14/98.
+
+Version 4.0 was completed on 2/05/01. This version adds additional
+extended characters and punctuation.
+
+############ EMBEDDABLE FONTS ############
+NOTE: This font is coded so that it can be embedded in MS Word (.DOC)
+documents. Thus, if you use this font in an MS Word document and save
+the document with the font embedded, the recipient of the document will
+see it with this font even though they may not have the font loaded on
+their system. To embed a font in an MS Word document select "Tools"
+from the MS Word menu bar and then select "Options". Under the "Save"
+tab, check the box marked "Embed True Type fonts". VOILA !
+(The recipient must open the document in MS Word for this to work.)
+############ EMBEDDABLE FONT #############
+
+GreyWolf WebWorks Free Fonts (and versions previously released as
+DarkSide's Free Fonts) are FREE for personal use. They do, however,
+remain the property of Rich Gast and GreyWolf WebWorks. They are not
+in the public domain.
+
+Commercial use in any manner, including (but not limited to) use in
+advertising or corporate logo design, inclusion in any software,
+archive, collection or library for distribution to the public which
+either directly or indirectly generates income for the distributor
+requires written permission from the author and copyright holder,
+who is specifically identified as:
+
+R. Gast
+5818 Prophet's Rock Rd.
+W. Lafayette, IN 47906
+e-mail: greywolfww@earthlink.net
+URL: http://home.earthlink.net/~greywolfww/index.html
+
+Commercial ventures granted permission to include any GreyWolf Free
+Font in their software, archive, library or collection will be provided
+with new font files at no charge in which the version specifically
+identifies them as a licensed user. In this manner, the author and
+copyright holder of the fonts can best retain control of the type of
+product/company with which his fonts are to be associated.
+
+Commercial ventures who include any GreyWolf Free Font in any software,
+archive, library or collection without receiving written permission
+from the author and copyright holder, will be subject to any and all
+legal remedies available to the copyright holder. All GreyWolf Free
+Fonts are Copyright � R. Gast, GreyWolf WebWorks. All Rights Reserved.
+
+All GreyWolf Free Fonts may be redistributed via FREE web sites,
+e-mail, newsgroups and bulletin boards, as long as the original zip
+file is kept intact, including the accompanying text file(s). If you
+wish to include them on a free web site, please just ask in advance.
+
+NOTE TO PERSONAL USERS: Maybe, just maybe, you'll make a fortune using
+this font in some manner. If you do, all I ask is that you remember me
+with a token of your appreciation. Any modest amount (at least $1 and
+not to exceed $1,000,000) would be an appropriate gesture for my
+contribution to your monumental financial success. Hey! I can dream!
+
+The character set includes:
+
+Upper and lower (Alternate) case letters, numbers, most punctuation,
+extended and international characters.
+
+Oh, yeah....I almost forgot. If (for some unknown reason) you really
+do want to make a donation to encourage me to continue my creative
+efforts, send it to the address above. (Yeah....As If!) Thanks & Enjoy!
+
+..... Rich Gast
+GreyWolf WebWorks
File renamed without changes.
File renamed without changes.
View
@@ -520,7 +520,8 @@ void Game::StartLevel(int level)
}
// Create gateways
- int gatewaycount = level/2 + rand()%(level);
+ int gatewaycount = level/2 + rand()%level;
+ gateways.clear();
if (gatewaycount > MAX_GATEWAYS)
gatewaycount = MAX_GATEWAYS;
for (int i = 0; i < gatewaycount; i++) {
@@ -548,6 +549,7 @@ void Game::StartLevel(int level)
// Create mines (MUST BE CREATED LAST)
int minecount = level/2 + rand()%level;
+ mines.clear();
if (minecount > MAX_MINES)
minecount = MAX_MINES;
for (int i = 0; i < minecount; i++) {
View
@@ -23,7 +23,7 @@
#include "Screens.hpp"
#define HS_FADE_IN_SPEED 0.2f
-#define HS_FADE_OUT_SPEED -0.015f
+#define HS_FADE_OUT_SPEED -0.02f
class HighScores : public Screen {
public:
@@ -62,7 +62,7 @@ class HighScores : public Screen {
} scores[NUM_SCORES];
// Fireworks
- static const int MAX_FIREWORKS = 10;
+ static const int MAX_FIREWORKS = 7;
class Firework {
public:
Firework() : active(false)
View
@@ -47,7 +47,7 @@ class ObjectGrid {
class StaticObject {
public:
- StaticObject() : xpos(0), ypos(0), width(0), height(0) {}
+ StaticObject() : xpos(0), ypos(0), width(1), height(1) {}
bool ObjectInScreen(Viewport *viewport);
View
@@ -31,7 +31,7 @@
#define S_HSCORE "Well done - You got a high score"
#define S_HCONT "Press ENTER or FIRE to continue"
#define S_HNAME "Name? %s"
-#define S_TITLE "Lunar Lander"
+#define S_TITLE "LUNAR LANDER"
#define S_GAME_OVER "Game Over"
#define S_PAUSED "Paused"
View
@@ -51,8 +51,8 @@ void Viewport::SetYAdjust(int y)
*/
bool Viewport::PointInScreen(int xpos, int ypos, int width, int height)
{
- return (xpos + width > adjustX && xpos - adjustX < screenWidth
- && ypos + height > adjustY && ypos - adjustY < screenHeight);
+ return ((xpos + width > adjustX && xpos - adjustX < screenWidth)
+ && (ypos + height > adjustY && ypos - adjustY < screenHeight));
}
/*
@@ -62,9 +62,8 @@ bool Viewport::PointInScreen(int xpos, int ypos, int width, int height)
*/
bool Viewport::ObjectInScreen(int xpos, int ypos, int width, int height)
{
- int yoff = ObjectGrid::OBJ_GRID_TOP / ObjectGrid::OBJ_GRID_SIZE;
return PointInScreen(xpos * ObjectGrid::OBJ_GRID_SIZE,
- ypos * ObjectGrid::OBJ_GRID_SIZE + yoff,
+ ypos * ObjectGrid::OBJ_GRID_SIZE + ObjectGrid::OBJ_GRID_TOP,
width * ObjectGrid::OBJ_GRID_SIZE,
height * ObjectGrid::OBJ_GRID_SIZE);
}
View
@@ -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
@@ -0,0 +1,11 @@
+Contained herin is the Bitstream Vera font family.
+
+The Copyright information is found in the COPYRIGHT.TXT file (along
+with being incoporated into the fonts themselves).
+
+The releases notes are found in the file "RELEASENOTES.TXT".
+
+We hope you enjoy Vera!
+
+ Bitstream, Inc.
+ The Gnome Project
Oops, something went wrong.

0 comments on commit 2105317

Please sign in to comment.