From 76c70109b1d7e31bb6ab97caedf7eab511a01e65 Mon Sep 17 00:00:00 2001 From: nick Date: Wed, 4 Jun 2008 11:49:50 +0000 Subject: [PATCH] Add LoadOnce.hpp to distribution git-svn-id: http://svn.nickg.me.uk/work/lander@432 a97b1542-0b21-0410-a459-e47997c36f34 --- ChangeLog | 4 +++ configure.ac | 2 +- po/POTFILES.in | 13 ++++++--- po/en_GB.po | 70 ++++++++++++++++++++++++++++++++++++------------- po/lander.pot | 64 +++++++++++++++++++++++++++++++------------- src/Makefile.am | 2 +- src/OpenGL.hpp | 1 + 7 files changed, 114 insertions(+), 42 deletions(-) diff --git a/ChangeLog b/ChangeLog index d5a3737..b596345 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2008-04-04 Nick Gasson + + * src/Makefile.am: Add LoadOnce.hpp missing from dist. + 2008-04-18 gettextize * Makefile.am (SUBDIRS): Add po. diff --git a/configure.ac b/configure.ac index 193ff17..7615cec 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([Lunar Lander], [0.2], +AC_INIT([Lunar Lander], [0.2.1], [Nick Gasson ], [lander]) AM_INIT_AUTOMAKE([-Wall -Werror]) diff --git a/po/POTFILES.in b/po/POTFILES.in index 97ea69d..f360437 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,12 +1,19 @@ src/Mechanics.hpp +src/Texture.cpp src/Ship.cpp +src/Texture.hpp src/Ship.hpp src/Emitter.cpp src/ObjectGrid.cpp src/Emitter.hpp src/ObjectGrid.hpp +src/Image.cpp +src/AnimatedImage.cpp +src/Image.hpp src/Mine.cpp +src/LoadOnce.hpp src/Platform.hpp +src/AnimatedImage.hpp src/ElectricGate.cpp src/Mine.hpp src/HighScores.cpp @@ -15,17 +22,15 @@ src/ElectricGate.hpp src/Geometry.hpp src/LandingPad.cpp src/HighScores.hpp -src/Menu.cpp src/Input.hpp +src/Menu.cpp src/LandingPad.hpp -src/Menu.hpp -src/DataFile.cpp src/Game.cpp +src/Menu.hpp src/Lander.hpp src/Asteroid.cpp src/ScreenManager.cpp src/Bitmap.cpp -src/DataFile.hpp src/Asteroid.hpp src/File.cpp src/ScreenManager.hpp diff --git a/po/en_GB.po b/po/en_GB.po index c124002..853a127 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: lander 0.9\n" "Report-Msgid-Bugs-To: nick@cakesniffer.co.uk\n" -"POT-Creation-Date: 2008-05-23 18:03+0100\n" +"POT-Creation-Date: 2008-06-04 12:05+0100\n" "PO-Revision-Date: 2008-04-19 01:09+0100\n" "Last-Translator: Nick Gasson \n" "Language-Team: English (British)\n" @@ -16,54 +16,88 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: src/HighScores.cpp:194 +#: src/HighScores.cpp:180 msgid "Press SPACE or FIRE to return" msgstr "Press SPACE or FIRE to return" -#: src/HighScores.cpp:209 +#: src/HighScores.cpp:198 msgid "Well done - You got a high score" msgstr "Well done - You got a high score" -#: src/HighScores.cpp:219 +#: src/HighScores.cpp:208 msgid "Press ENTER or FIRE to continue" msgstr "Press ENTER or FIRE to continue" -#: src/HighScores.cpp:228 +#: src/HighScores.cpp:217 #, c-format msgid "Name? %s" msgstr "Name? %s" -#: src/Menu.cpp:229 -msgid "LUNAR LANDER" -msgstr "LUNAR LANDER" +#: src/Menu.cpp:235 +msgid "Use the arrow keys to rotate the ship" +msgstr "" + +#: src/Menu.cpp:236 +msgid "Press the up arrow to fire the thruster" +msgstr "" + +#: src/Menu.cpp:237 +msgid "Smaller landing pads give you more points" +msgstr "" + +#: src/Menu.cpp:238 +msgid "Press P to pause the game" +msgstr "" + +#: src/Menu.cpp:239 +msgid "Press escape to self destruct" +msgstr "" + +#: src/Menu.cpp:241 +msgid "You can only land safely when the" +msgstr "" + +#: src/Menu.cpp:242 +msgid "speed bar is green" +msgstr "" + +#: src/Menu.cpp:243 +msgid "Collect the spinning rings to" +msgstr "" -#: src/Game.cpp:647 +#: src/Menu.cpp:244 +msgid "unlock the landing pads" +msgstr "" + +#: src/Game.cpp:614 msgid "Press SPACE to continue" msgstr "Press SPACE to continue" -#: src/Game.cpp:707 +#: src/Game.cpp:674 msgid "Land now" msgstr "Land now" -#: src/Game.cpp:715 +#: src/Game.cpp:682 #, c-format msgid "Score: %d" msgstr "Score: %d" -#: src/Game.cpp:730 +#: src/Game.cpp:700 #, c-format msgid "Level %d" msgstr "Level %d" -#: src/Game.cpp:745 -msgid "Game Over" -msgstr "Game Over" - -#: src/Game.cpp:755 +#: src/Game.cpp:721 msgid "Paused" msgstr "Paused" -#: src/Main.cpp:108 +#: src/Main.cpp:100 #, c-format msgid "Runtime Error: %s\n" msgstr "Runtime Error: %s\n" + +#~ msgid "LUNAR LANDER" +#~ msgstr "LUNAR LANDER" + +#~ msgid "Game Over" +#~ msgstr "Game Over" diff --git a/po/lander.pot b/po/lander.pot index 5913c7f..6b4441b 100644 --- a/po/lander.pot +++ b/po/lander.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: lander 0.9\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: nick@cakesniffer.co.uk\n" -"POT-Creation-Date: 2008-05-23 18:03+0100\n" +"POT-Creation-Date: 2008-06-04 12:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,54 +16,82 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: src/HighScores.cpp:194 +#: src/HighScores.cpp:180 msgid "Press SPACE or FIRE to return" msgstr "" -#: src/HighScores.cpp:209 +#: src/HighScores.cpp:198 msgid "Well done - You got a high score" msgstr "" -#: src/HighScores.cpp:219 +#: src/HighScores.cpp:208 msgid "Press ENTER or FIRE to continue" msgstr "" -#: src/HighScores.cpp:228 +#: src/HighScores.cpp:217 #, c-format msgid "Name? %s" msgstr "" -#: src/Menu.cpp:229 -msgid "LUNAR LANDER" +#: src/Menu.cpp:235 +msgid "Use the arrow keys to rotate the ship" msgstr "" -#: src/Game.cpp:647 +#: src/Menu.cpp:236 +msgid "Press the up arrow to fire the thruster" +msgstr "" + +#: src/Menu.cpp:237 +msgid "Smaller landing pads give you more points" +msgstr "" + +#: src/Menu.cpp:238 +msgid "Press P to pause the game" +msgstr "" + +#: src/Menu.cpp:239 +msgid "Press escape to self destruct" +msgstr "" + +#: src/Menu.cpp:241 +msgid "You can only land safely when the" +msgstr "" + +#: src/Menu.cpp:242 +msgid "speed bar is green" +msgstr "" + +#: src/Menu.cpp:243 +msgid "Collect the spinning rings to" +msgstr "" + +#: src/Menu.cpp:244 +msgid "unlock the landing pads" +msgstr "" + +#: src/Game.cpp:614 msgid "Press SPACE to continue" msgstr "" -#: src/Game.cpp:707 +#: src/Game.cpp:674 msgid "Land now" msgstr "" -#: src/Game.cpp:715 +#: src/Game.cpp:682 #, c-format msgid "Score: %d" msgstr "" -#: src/Game.cpp:730 +#: src/Game.cpp:700 #, c-format msgid "Level %d" msgstr "" -#: src/Game.cpp:745 -msgid "Game Over" -msgstr "" - -#: src/Game.cpp:755 +#: src/Game.cpp:721 msgid "Paused" msgstr "" -#: src/Main.cpp:108 +#: src/Main.cpp:100 #, c-format msgid "Runtime Error: %s\n" msgstr "" diff --git a/src/Makefile.am b/src/Makefile.am index b1e12e1..07861f4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -5,7 +5,7 @@ AM_LDFLAGS=$(LANDER_LIBS) $(SDL_LIBS) -lGLU $(LTLIBINTL) lander_SOURCES = Main.cpp Lander.hpp Game.cpp \ Bitmap.cpp Bitmap.hpp FreeType.cpp FreeType.hpp \ HighScores.cpp HighScores.hpp Input.cpp Input.hpp \ - File.cpp File.hpp Platform.hpp \ + File.cpp File.hpp Platform.hpp LoadOnce.hpp \ OpenGL.cpp OpenGL.hpp Menu.cpp Menu.hpp Emitter.cpp \ Emitter.hpp ScreenManager.cpp ScreenManager.hpp \ ObjectGrid.hpp ObjectGrid.cpp Asteroid.hpp Asteroid.cpp \ diff --git a/src/OpenGL.hpp b/src/OpenGL.hpp index 443de47..c3e79be 100644 --- a/src/OpenGL.hpp +++ b/src/OpenGL.hpp @@ -32,6 +32,7 @@ class Renderable { public: Renderable(int x, int y, int width, int height, float r, float g, float b); + virtual ~Renderable() {} virtual void Render() = 0; -- 2.39.2