r3686 - in packages/trunk/hex-a-hop/debian: . i18n patches
Jens Seidel
jseidel-guest at alioth.debian.org
Wed Aug 15 00:43:44 UTC 2007
Author: jseidel-guest
Date: 2007-08-15 00:43:44 +0000 (Wed, 15 Aug 2007)
New Revision: 3686
Added:
packages/trunk/hex-a-hop/debian/patches/compiler_warnings.patch
Modified:
packages/trunk/hex-a-hop/debian/changelog
packages/trunk/hex-a-hop/debian/i18n/de.po
packages/trunk/hex-a-hop/debian/i18n/es.po
packages/trunk/hex-a-hop/debian/patches/series
packages/trunk/hex-a-hop/debian/rules
Log:
* Fixed all compiler warnings and use e.g. -Wall -Wextra
by default. Closes: #437313
Modified: packages/trunk/hex-a-hop/debian/changelog
===================================================================
--- packages/trunk/hex-a-hop/debian/changelog 2007-08-14 23:39:36 UTC (rev 3685)
+++ packages/trunk/hex-a-hop/debian/changelog 2007-08-15 00:43:44 UTC (rev 3686)
@@ -10,9 +10,11 @@
limitation, to ship a POT file and to update PO files.
Closes: #437338
* Added German translation. Thanks to Helge Kreutzmann
- <debian at helgefjell.de>. Closes: 437438
+ <debian at helgefjell.de>. Closes: #437438
* Fixed some typos. Thanks to Helge Kreutzmann
- <debian at helgefjell.de>. Closes: 437440, #437439.
+ <debian at helgefjell.de>. Closes: #437440, #437439
+ * Fixed all compiler warnings and use e.g. -Wall -Wextra
+ default. Closes: #437313
-- Miriam Ruiz <little_miry at yahoo.es> Wed, 8 Aug 2007 16:34:41 +0200
Modified: packages/trunk/hex-a-hop/debian/i18n/de.po
===================================================================
--- packages/trunk/hex-a-hop/debian/i18n/de.po 2007-08-14 23:39:36 UTC (rev 3685)
+++ packages/trunk/hex-a-hop/debian/i18n/de.po 2007-08-15 00:43:44 UTC (rev 3686)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: hex-a-hop\n"
"Report-Msgid-Bugs-To: hex-a-hop at packages.debian.org\n"
-"POT-Creation-Date: 2007-08-15 00:51+0200\n"
+"POT-Creation-Date: 2007-08-15 02:43+0200\n"
"PO-Revision-Date: 2007-08-07 18:54+0200\n"
"Last-Translator: Helge Kreutzmann <debian at helgefjell.de>\n"
"Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -14,130 +14,130 @@
"Content-Type: text/plain; charset=ISO-8859-15\n"
"Content-Transfer-Encoding: 8bit\n"
-#: hex_puzzzle.cpp:1584
+#: hex_puzzzle.cpp:1582
#, c-format
msgid "Complete 1 more level to unlock!"
msgstr "Einen weiteren Level zum Entsperren abschließen!"
-#: hex_puzzzle.cpp:1586
+#: hex_puzzzle.cpp:1584
#, c-format
msgid "Complete %d more levels to unlock!"
msgstr "%d weitere Level zum Entsperren abschließen!"
-#: hex_puzzzle.cpp:1593
+#: hex_puzzzle.cpp:1591
msgid "<<NO NAME>>"
msgstr "<<KEIN NAME>>"
-#: hex_puzzzle.cpp:2632
+#: hex_puzzzle.cpp:2629
#, c-format
msgid "Anti-Ice: %d"
msgstr "Anti-Eis: %d"
-#: hex_puzzzle.cpp:2633
+#: hex_puzzzle.cpp:2630
#, c-format
msgid "Jumps: %d"
msgstr "Sprünge: %d"
-#: hex_puzzzle.cpp:2634
+#: hex_puzzzle.cpp:2631
#, c-format
msgid "Score: %d (%d)"
msgstr "Punktzahl: %d (%d)"
-#: hex_puzzzle.cpp:2635
+#: hex_puzzzle.cpp:2632
#, c-format
msgid "Par: %d"
msgstr "Erwartet: %d"
-#: hex_puzzzle.cpp:2636
+#: hex_puzzzle.cpp:2633
#, c-format
msgid "Diff: %d"
msgstr "Diff: %d"
-#: hex_puzzzle.cpp:2639
+#: hex_puzzzle.cpp:2636
#, c-format
msgid " Par: %d Current: %d"
msgstr " Erwartet: %d Derzeit: %d"
-#: hex_puzzzle.cpp:2642
+#: hex_puzzzle.cpp:2639
#, c-format
msgid " Anti-Ice: %d"
msgstr " Anti-Eis: %d"
-#: hex_puzzzle.cpp:2644
+#: hex_puzzzle.cpp:2641
#, c-format
msgid " Jumps: %d"
msgstr " Sprünge: %d"
-#: hex_puzzzle.cpp:2650
+#: hex_puzzzle.cpp:2647
#, c-format
msgid "Points: %d"
msgstr "Punkte: %d"
-#: hex_puzzzle.cpp:2651
+#: hex_puzzzle.cpp:2648
#, c-format
msgid "Discovered: %d%% (%d/%d)"
msgstr "Entdeckt: %d%% (%d/%d)"
-#: hex_puzzzle.cpp:2652
+#: hex_puzzzle.cpp:2649
#, c-format
msgid "Complete: %d%% (%d)"
msgstr "Komplett: %d%% (%d)"
-#: hex_puzzzle.cpp:2653
+#: hex_puzzzle.cpp:2650
#, c-format
msgid "Mastered: %d%% (%d)"
msgstr "Gemeistert: %d%% (%d)"
-#: hex_puzzzle.cpp:2656
+#: hex_puzzzle.cpp:2653
#, c-format
msgid " %d%% Mastered"
msgstr " %d%% gemeistert"
-#: hex_puzzzle.cpp:2658
+#: hex_puzzzle.cpp:2655
#, c-format
msgid " %d%% Complete"
msgstr " %d%% komplett"
-#: hex_puzzzle.cpp:2710
+#: hex_puzzzle.cpp:2707
#, c-format
msgid "Best:% 3d"
msgstr "Bestwert:% 3d"
-#: hex_puzzzle.cpp:2711
+#: hex_puzzzle.cpp:2708
#, c-format
msgid "Par:% 3d"
msgstr "Erwartet:% 3d"
-#: hex_puzzzle.cpp:2714
+#: hex_puzzzle.cpp:2711
msgid "Completed"
msgstr "Erledigt"
-#: hex_puzzzle.cpp:2717
+#: hex_puzzzle.cpp:2714
msgid "Incomplete"
msgstr "Nicht erledigt"
-#: hex_puzzzle.cpp:2758 menus.h:525
+#: hex_puzzzle.cpp:2755 menus.h:520
msgid "Level Complete!"
msgstr "Level erledigt!"
-#: hex_puzzzle.cpp:2878
+#: hex_puzzzle.cpp:2875
#, c-format
msgid "Special(%d,%d): %s (%d)"
msgstr "Spezial(%d,%d): %s (%d)"
-#: hex_puzzzle.cpp:2878
+#: hex_puzzzle.cpp:2875
msgid "<None>"
msgstr "<Keine>"
-#: hex_puzzzle.cpp:3023
+#: hex_puzzzle.cpp:3020
msgid "Select level"
msgstr "Level auswählen"
-#: hex_puzzzle.cpp:4078
+#: hex_puzzzle.cpp:4073
msgid "Save level"
msgstr "Level speichern"
-#: hex_puzzzle.cpp:4084
+#: hex_puzzzle.cpp:4079
msgid "Open level"
msgstr "Level öffnen"
@@ -298,8 +298,8 @@
"help pages. More pages will be added as you progress through the game."
msgstr ""
"Willkommen zu Hex-a-hop! Dies ist ein Puzzle-Spiel basierend auf "
-"hexagonalen Platten. Es gibt kein Zeitlimit und keine Echtzeit-Elemente, "
-"nehmen Sie sich die Zeit die Sie benötigen. Verwenden Sie die "
+"hexagonalen Platten. Es gibt kein Zeitlimit und keine Echtzeit-"
+"Elemente, nehmen Sie sich die Zeit die Sie benötigen. Verwenden Sie die "
"Cursor-Tasten oder klicken Sie auf die Pfeile, um durch die Hilfe-Seiten "
"zu scrollen. Weitere Seiten werden dargestellt, je nachdem, wie Sie das "
"Spiel durchlaufen."
@@ -333,7 +333,7 @@
msgid "Toggle Fullscreen"
msgstr "Vollbild umschalten"
-#: menus.h:377 menus.h:1053
+#: menus.h:377 menus.h:1052
msgid "Options"
msgstr "Optionen"
@@ -381,126 +381,126 @@
msgid "View Credits Sequence"
msgstr "Danksagungssequenz anschauen"
-#: menus.h:525
+#: menus.h:520
msgid "Emi can't swim..."
msgstr "Emi kann nicht schwimmen ..."
-#: menus.h:560
+#: menus.h:559
#, c-format
msgid "New Best Score: %d Par Score: %d Par Beaten!"
msgstr "Neue Bestpunktzahl: %d Erwartete Punktzahl: %d Erwartung geschlagen!"
-#: menus.h:562
+#: menus.h:561
#, c-format
msgid "New Best Score: %d Par Score: %d"
msgstr "Neue Bestpunktzahl: %d Erwartete Punktzahl: %d"
-#: menus.h:564
+#: menus.h:563
#, c-format
msgid "Score: %d Previous Best: %d Par Score: %d"
msgstr "Punktzahl: %d Bisherige Bestpunktzahl: %d Erwartete Punktzahl: %d"
-#: menus.h:566
+#: menus.h:565
msgid "Well Done! Level Completed!"
msgstr "Gut gemacht! Level beendet!"
-#: menus.h:645
+#: menus.h:644
msgid " Very Well Done! "
msgstr " Sehr gut gemacht!"
-#: menus.h:650
+#: menus.h:649
msgid "All Levels Cleared!"
msgstr "Alle Level geschafft!"
-#: menus.h:654
+#: menus.h:653
msgid "Not a single green hexagon is left unbroken."
msgstr "Kein einziges grünes Sechseck ist nicht gebrochen."
-#: menus.h:656
+#: menus.h:655
msgid "Truly, you are a master of hexagon hopping!"
msgstr "Sie sind wirklich ein Meister des Sechseck-Springens!"
-#: menus.h:660
+#: menus.h:659
msgid "Credits"
msgstr "Danksagungen"
-#: menus.h:661
+#: menus.h:660
msgid "<Design & Direction:"
msgstr "<Design & Leitung:"
-#: menus.h:662
+#: menus.h:661
msgid "<Programming:"
msgstr "<Programmierung:"
-#: menus.h:663
+#: menus.h:662
msgid "<Graphics:"
msgstr "<Graphik:"
-#: menus.h:664
+#: menus.h:663
msgid "<Thanks to:"
msgstr "<Danke an:"
-#: menus.h:666
+#: menus.h:665
msgid "<Tools and libraries used:"
msgstr "<Benutzte Werkzeuge und Bibliotheken:"
-#: menus.h:667
+#: menus.h:666
msgid "<Fonts used:"
msgstr "<Benutzte Schriften:"
-#: menus.h:671
+#: menus.h:670
msgid "Thanks for playing!"
msgstr "Danke fürs Spielen!"
-#: menus.h:675
+#: menus.h:674
msgid " Absolutely Amazing! "
msgstr " Unglaublich! "
-#: menus.h:680
+#: menus.h:679
msgid "All Levels Mastered!!"
msgstr "Alle Level gemeistert!!"
-#: menus.h:684
+#: menus.h:683
msgid "You crushed every last green hexagon with"
msgstr "Sie haben jedes letzte Sechseck zerstört mit"
-#: menus.h:685
+#: menus.h:684
msgid "breathtaking efficiency!"
msgstr "atemberaubender Effizienz!"
-#: menus.h:687
+#: menus.h:686
msgid "You truly are a grand master of hexagon hopping!"
msgstr "Sie sind wirklich ein Großmeister des Sechseck-Springens!"
-#: menus.h:836
+#: menus.h:835
msgid "The End"
msgstr "Das Ende"
-#: menus.h:923
+#: menus.h:922
#, c-format
msgid "Continue game %d (All Clear!)"
msgstr "Spiel fortfahren %d (Alles klar!)"
-#: menus.h:925
+#: menus.h:924
#, c-format
msgid "Continue game %d (%d%% + %d%%)"
msgstr "Spiel fortfahren %d (%d%% + %d%%)"
-#: menus.h:927
+#: menus.h:926
#, c-format
msgid "Continue game %d (%d%% complete)"
msgstr "Spiel fortfahren %d (%d%% komplett)"
-#: menus.h:966
+#: menus.h:965
msgid "Quit: Are you sure?"
msgstr "Beenden: Sind Sie sicher?"
-#: menus.h:986
+#: menus.h:985
#, c-format
msgid "Really delete game %d?"
msgstr "Wirklich Spiel %d löschen?"
-#: menus.h:1026
+#: menus.h:1025
msgid "Paused"
msgstr "Pausiert"
Modified: packages/trunk/hex-a-hop/debian/i18n/es.po
===================================================================
--- packages/trunk/hex-a-hop/debian/i18n/es.po 2007-08-14 23:39:36 UTC (rev 3685)
+++ packages/trunk/hex-a-hop/debian/i18n/es.po 2007-08-15 00:43:44 UTC (rev 3686)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: levels.es\n"
"Report-Msgid-Bugs-To: hex-a-hop at packages.debian.org\n"
-"POT-Creation-Date: 2007-08-14 22:28+0200\n"
+"POT-Creation-Date: 2007-08-15 02:43+0200\n"
"PO-Revision-Date: 2007-08-05 10:42+0200\n"
"Last-Translator: Miriam Ruiz <little_miry at yahoo.es>\n"
"Language-Team: Español <es at li.org>\n"
@@ -17,131 +17,131 @@
"X-Generator: KBabel 1.11.4\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: hex_puzzzle.cpp:1584
+#: hex_puzzzle.cpp:1582
#, fuzzy, c-format
msgid "Complete 1 more level to unlock!"
msgstr "Completa __ niveles para desbloquear"
-#: hex_puzzzle.cpp:1586
+#: hex_puzzzle.cpp:1584
#, fuzzy, c-format
msgid "Complete %d more levels to unlock!"
msgstr "Completa __ niveles para desbloquear"
-#: hex_puzzzle.cpp:1593
+#: hex_puzzzle.cpp:1591
msgid "<<NO NAME>>"
msgstr ""
-#: hex_puzzzle.cpp:2632
+#: hex_puzzzle.cpp:2629
#, c-format
msgid "Anti-Ice: %d"
msgstr ""
-#: hex_puzzzle.cpp:2633
+#: hex_puzzzle.cpp:2630
#, c-format
msgid "Jumps: %d"
msgstr ""
-#: hex_puzzzle.cpp:2634
+#: hex_puzzzle.cpp:2631
#, c-format
msgid "Score: %d (%d)"
msgstr ""
-#: hex_puzzzle.cpp:2635
+#: hex_puzzzle.cpp:2632
#, c-format
msgid "Par: %d"
msgstr ""
-#: hex_puzzzle.cpp:2636
+#: hex_puzzzle.cpp:2633
#, c-format
msgid "Diff: %d"
msgstr ""
-#: hex_puzzzle.cpp:2639
+#: hex_puzzzle.cpp:2636
#, c-format
msgid " Par: %d Current: %d"
msgstr ""
-#: hex_puzzzle.cpp:2642
+#: hex_puzzzle.cpp:2639
#, c-format
msgid " Anti-Ice: %d"
msgstr ""
-#: hex_puzzzle.cpp:2644
+#: hex_puzzzle.cpp:2641
#, c-format
msgid " Jumps: %d"
msgstr ""
-#: hex_puzzzle.cpp:2650
+#: hex_puzzzle.cpp:2647
#, c-format
msgid "Points: %d"
msgstr ""
-#: hex_puzzzle.cpp:2651
+#: hex_puzzzle.cpp:2648
#, c-format
msgid "Discovered: %d%% (%d/%d)"
msgstr ""
-#: hex_puzzzle.cpp:2652
+#: hex_puzzzle.cpp:2649
#, fuzzy, c-format
msgid "Complete: %d%% (%d)"
msgstr "Nivel terminado"
-#: hex_puzzzle.cpp:2653
+#: hex_puzzzle.cpp:2650
#, c-format
msgid "Mastered: %d%% (%d)"
msgstr ""
-#: hex_puzzzle.cpp:2656
+#: hex_puzzzle.cpp:2653
#, c-format
msgid " %d%% Mastered"
msgstr ""
-#: hex_puzzzle.cpp:2658
+#: hex_puzzzle.cpp:2655
#, fuzzy, c-format
msgid " %d%% Complete"
msgstr "Nivel terminado"
-#: hex_puzzzle.cpp:2710
+#: hex_puzzzle.cpp:2707
#, c-format
msgid "Best:% 3d"
msgstr ""
-#: hex_puzzzle.cpp:2711
+#: hex_puzzzle.cpp:2708
#, c-format
msgid "Par:% 3d"
msgstr ""
-#: hex_puzzzle.cpp:2714
+#: hex_puzzzle.cpp:2711
#, fuzzy
msgid "Completed"
msgstr "Nivel terminado"
-#: hex_puzzzle.cpp:2717
+#: hex_puzzzle.cpp:2714
msgid "Incomplete"
msgstr ""
-#: hex_puzzzle.cpp:2758 menus.h:525
+#: hex_puzzzle.cpp:2755 menus.h:520
msgid "Level Complete!"
msgstr "Nivel terminado"
-#: hex_puzzzle.cpp:2878
+#: hex_puzzzle.cpp:2875
#, c-format
msgid "Special(%d,%d): %s (%d)"
msgstr ""
-#: hex_puzzzle.cpp:2878
+#: hex_puzzzle.cpp:2875
msgid "<None>"
msgstr ""
-#: hex_puzzzle.cpp:3023
+#: hex_puzzzle.cpp:3020
msgid "Select level"
msgstr ""
-#: hex_puzzzle.cpp:4078
+#: hex_puzzzle.cpp:4073
msgid "Save level"
msgstr ""
-#: hex_puzzzle.cpp:4084
+#: hex_puzzzle.cpp:4079
msgid "Open level"
msgstr ""
@@ -284,7 +284,7 @@
msgid "Toggle Fullscreen"
msgstr "Pantalla completa"
-#: menus.h:377 menus.h:1053
+#: menus.h:377 menus.h:1052
msgid "Options"
msgstr "Opciones"
@@ -332,127 +332,127 @@
msgid "View Credits Sequence"
msgstr ""
-#: menus.h:525
+#: menus.h:520
msgid "Emi can't swim..."
msgstr "Emi no sabe nadar..."
-#: menus.h:560
+#: menus.h:559
#, c-format
msgid "New Best Score: %d Par Score: %d Par Beaten!"
msgstr ""
-#: menus.h:562
+#: menus.h:561
#, c-format
msgid "New Best Score: %d Par Score: %d"
msgstr ""
-#: menus.h:564
+#: menus.h:563
#, c-format
msgid "Score: %d Previous Best: %d Par Score: %d"
msgstr ""
-#: menus.h:566
+#: menus.h:565
msgid "Well Done! Level Completed!"
msgstr "Bien hecho Nivel terminado"
-#: menus.h:645
+#: menus.h:644
msgid " Very Well Done! "
msgstr "Muy bien hecho"
-#: menus.h:650
+#: menus.h:649
msgid "All Levels Cleared!"
msgstr "Terminados todos los niveles"
-#: menus.h:654
+#: menus.h:653
msgid "Not a single green hexagon is left unbroken."
msgstr "No ha quedado ni un solo hexagono sin romper."
-#: menus.h:656
+#: menus.h:655
msgid "Truly, you are a master of hexagon hopping!"
msgstr ""
-#: menus.h:660
+#: menus.h:659
msgid "Credits"
msgstr "Creditos"
-#: menus.h:661
+#: menus.h:660
msgid "<Design & Direction:"
msgstr "<Diseño y direccion:"
-#: menus.h:662
+#: menus.h:661
msgid "<Programming:"
msgstr "<Programacion:"
-#: menus.h:663
+#: menus.h:662
msgid "<Graphics:"
msgstr "<Graficos:"
-#: menus.h:664
+#: menus.h:663
msgid "<Thanks to:"
msgstr "<Gracias a:"
-#: menus.h:666
+#: menus.h:665
msgid "<Tools and libraries used:"
msgstr "<Herramientas y bibliotecas usadas:"
-#: menus.h:667
+#: menus.h:666
msgid "<Fonts used:"
msgstr "<Fuentes de texto usadas:"
-#: menus.h:671
+#: menus.h:670
msgid "Thanks for playing!"
msgstr "Gracias por jugar"
-#: menus.h:675
+#: menus.h:674
msgid " Absolutely Amazing! "
msgstr " Realmente increible "
-#: menus.h:680
+#: menus.h:679
#, fuzzy
msgid "All Levels Mastered!!"
msgstr "Terminados todos los niveles"
-#: menus.h:684
+#: menus.h:683
msgid "You crushed every last green hexagon with"
msgstr ""
-#: menus.h:685
+#: menus.h:684
msgid "breathtaking efficiency!"
msgstr ""
-#: menus.h:687
+#: menus.h:686
msgid "You truly are a grand master of hexagon hopping!"
msgstr ""
-#: menus.h:836
+#: menus.h:835
msgid "The End"
msgstr "Fin"
-#: menus.h:923
+#: menus.h:922
#, c-format
msgid "Continue game %d (All Clear!)"
msgstr "Continuar el juego %d (terminado)"
-#: menus.h:925
+#: menus.h:924
#, fuzzy, c-format
msgid "Continue game %d (%d%% + %d%%)"
msgstr "Continuar el juego (%d%% + %d%%)"
-#: menus.h:927
+#: menus.h:926
#, c-format
msgid "Continue game %d (%d%% complete)"
msgstr "Continuar juego %d (%d%% terminado)"
-#: menus.h:966
+#: menus.h:965
msgid "Quit: Are you sure?"
msgstr "Abandonar el juego"
-#: menus.h:986
+#: menus.h:985
#, c-format
msgid "Really delete game %d?"
msgstr "Eliminar el juego %d"
-#: menus.h:1026
+#: menus.h:1025
msgid "Paused"
msgstr ""
Added: packages/trunk/hex-a-hop/debian/patches/compiler_warnings.patch
===================================================================
--- packages/trunk/hex-a-hop/debian/patches/compiler_warnings.patch (rev 0)
+++ packages/trunk/hex-a-hop/debian/patches/compiler_warnings.patch 2007-08-15 00:43:44 UTC (rev 3686)
@@ -0,0 +1,457 @@
+Index: hex-a-hop.svn/menus.h
+===================================================================
+--- hex-a-hop.svn.orig/menus.h 2007-08-15 02:43:25.000000000 +0200
++++ hex-a-hop.svn/menus.h 2007-08-15 02:43:25.000000000 +0200
+@@ -31,7 +31,7 @@
+ struct Menu {
+ bool renderBG;
+
+- Menu() : under(activeMenu), time(0), renderBG(true) { activeMenu = this; }
++ Menu() : renderBG(true), under(activeMenu), time(0) { activeMenu = this; }
+
+ virtual ~Menu() {
+ if(this!=deadMenu) FATAL("this!=deadMenu");
+@@ -47,7 +47,7 @@
+ deadMenu = m;
+ }
+
+- virtual bool KeyPressed(int key, int mod)
++ virtual bool KeyPressed(int key, int /*mod*/)
+ {
+ if (key=='w' || key==SDLK_UP || key==SDLK_KP8 || key=='q' || key=='e' || key==SDLK_KP7 || key==SDLK_KP9)
+ Move(-1), noMouse=1;
+@@ -64,13 +64,13 @@
+ return false;
+ return true;
+ }
+- virtual void Mouse(int x, int y, int dx, int dy, int buttons_pressed, int buttons_released, int buttons)
++ virtual void Mouse(int /*x*/, int /*y*/, int /*dx*/, int /*dy*/, int buttons_pressed, int /*buttons_released*/, int /*buttons*/)
+ {
+ if (buttons_pressed==4 || buttons_pressed==2)
+ Cancel();
+ }
+
+- virtual void Move(int dir) {}
++ virtual void Move(int /*dir*/) {}
+ virtual void Select() {}
+ virtual void Cancel() {}
+
+@@ -209,13 +209,13 @@
+ PrintC(true, x+SCREEN_W/2, y+FONT_SPACING/2, msg);
+ }
+
+- virtual void Mouse(int x, int y, int dx, int dy, int buttons_pressed, int buttons_released, int buttons)
++ virtual void Mouse(int /*x*/, int /*y*/, int /*dx*/, int /*dy*/, int buttons_pressed, int /*buttons_released*/, int /*buttons*/)
+ {
+ if (buttons_pressed && state==0 && time>0.2)
+ state = 1, time=0;
+ }
+
+- bool KeyPressed(int key, int mod)
++ bool KeyPressed(int /*key*/, int /*mod*/)
+ {
+ if (state==0 && time>0.2)
+ state = 1, time=0;
+@@ -355,7 +355,7 @@
+ OPT_END, OPT_END2,
+ };
+
+-char optionSlotName[MAX_GAMESLOT][40] = {0};
++char optionSlotName[MAX_GAMESLOT][40] = { {0} };
+ char currentSlot[80] = "";
+ int freeSlot = -1;
+ char* GetSlotName(int i, char * t)
+@@ -496,7 +496,6 @@
+ }
+ void RenderTitle()
+ {
+- int y = r2.y + FONT_SPACING / 2;
+ if (left_align)
+ Print(r2.x+font[' '].w, r.y+4, title);
+ else
+@@ -518,11 +517,11 @@
+ bool win;
+ int score, par, best_score;
+ WinLoseScreen(bool _win, int _score=0, int _par=0, int _prev_score=0) :
++ OptMenu(_win ? _("Level Complete!") : _("Emi can't swim...")),
++ win(_win),
+ score(_score),
+ par(_par),
+- best_score(_prev_score),
+- win(_win),
+- OptMenu(_win ? _("Level Complete!") : _("Emi can't swim..."))
++ best_score(_prev_score)
+ {
+ if (!win)
+ opt[num_opt++] = OPT_UNDO;
+@@ -752,7 +751,7 @@
+ }
+
+ Particle() : type(EMPTY) {}
+- Particle(int t, int _x) : type(t), x(_x)
++ Particle(int t, int _x) : x(_x), type(t)
+ {
+ xa=ys=xs=0; ya=400;
+ //if (t==1)
+@@ -806,7 +805,7 @@
+ SDL_Rect a = {0,0,SCREEN_W,SCREEN_H};
+ SDL_FillRect(screen, &a, SDL_MapRGB(screen->format, 10,25,25));
+
+- for (int i=0; i<sizeof(p)/sizeof(p[0]); i++)
++ for (unsigned int i=0; i<sizeof(p)/sizeof(p[0]); i++)
+ p[i].Update(t);
+
+ int x = a.x + a.w/2;
+@@ -863,7 +862,7 @@
+ t = MAX(-td*5, -time);
+
+ Menu::Update(t);
+- double s = scroll = time * 50;
++ double scroll = time * 50;
+ // if (scroll > scrollMax)
+ // scroll = fmod(scroll, scrollMax);
+ // scroll = 0, time = 0;
+@@ -887,7 +886,7 @@
+ };
+
+ Ending* Ending::ending = 0;
+-void* Ending::Particle::operator new(size_t sz)
++void* Ending::Particle::operator new(size_t /*sz*/)
+ {
+ static int start = 0;
+ const int max = sizeof(ending->p)/sizeof(ending->p[0]);
+@@ -920,7 +919,7 @@
+ fclose(f);
+
+ if (p.general.completionPercentage==100 && p.general.masteredPercentage==100)
+- sprintf(optionSlotName[i], _("Continue game %d (All Clear!)"), i+1, p.general.completionPercentage, p.general.masteredPercentage);
++ sprintf(optionSlotName[i], _("Continue game %d (All Clear!)"), i+1);
+ else if (p.general.completionPercentage==100)
+ sprintf(optionSlotName[i], _("Continue game %d (%d%% + %d%%)"), i+1, p.general.completionPercentage, p.general.masteredPercentage);
+ else
+@@ -1081,7 +1080,7 @@
+ int dir;
+ double speed;
+ int result;
+- Fader(int _dir, int _result, double _speed=1) : dir(_dir), result(_result), speed(_speed)
++ Fader(int _dir, int _result, double _speed=1) : dir(_dir), speed(_speed), result(_result)
+ {
+ renderBG = under ? under->renderBG : true;
+ }
+Index: hex-a-hop.svn/Makefile
+===================================================================
+--- hex-a-hop.svn.orig/Makefile 2007-08-15 02:43:25.000000000 +0200
++++ hex-a-hop.svn/Makefile 2007-08-15 02:43:25.000000000 +0200
+@@ -3,7 +3,9 @@
+ VERSION = 1.0.0
+ CC = gcc
+ DATA_DIR="."
+-CXXFLAGS += -g
++# See http://www.thescripts.com/forum/thread471291.html for
++# details to -Wno-char-subscripts
++CXXFLAGS += -Wall -W -Wno-char-subscripts -g
+ GCC =g++
+ CXXSOURCES = gfx.cpp hex_puzzzle.cpp i18n.cpp
+ #INCLUDES =
+Index: hex-a-hop.svn/gfx.cpp
+===================================================================
+--- hex-a-hop.svn.orig/gfx.cpp 2007-08-15 02:43:25.000000000 +0200
++++ hex-a-hop.svn/gfx.cpp 2007-08-15 02:44:33.000000000 +0200
+@@ -92,7 +92,7 @@
+ return 0;
+ }
+ #else
+- char* LoadSaveDialog(bool save, bool levels, const char * title)
++ char* LoadSaveDialog(bool /*save*/, bool /*levels*/, const char * /*title*/)
+ {
+ return 0;
+ }
+@@ -170,7 +170,7 @@
+ return x;
+ }
+
+-int main(int argc, char * argv[])
++int main(int /*argc*/, char * /*argv*/[])
+ {
+ base_path = DATA_DIR "/";
+ for (int i=strlen(base_path)-1; i>=0; i--)
+@@ -268,7 +268,6 @@
+ // printf("Main loop...\n");
+
+ StateMakerBase::GetNew();
+- int time = SDL_GetTicks();
+
+ while(!quitting)
+ {
+Index: hex-a-hop.svn/gfx_list.h
+===================================================================
+--- hex-a-hop.svn.orig/gfx_list.h 2007-08-15 02:40:42.000000000 +0200
++++ hex-a-hop.svn/gfx_list.h 2007-08-15 02:43:25.000000000 +0200
+@@ -30,4 +30,5 @@
+ //X(uiGraphics, "ui", true)
+
+
+-#undef X
+\ No newline at end of file
++#undef X
++
+Index: hex-a-hop.svn/hex_puzzzle.cpp
+===================================================================
+--- hex-a-hop.svn.orig/hex_puzzzle.cpp 2007-08-15 02:43:25.000000000 +0200
++++ hex-a-hop.svn/hex_puzzzle.cpp 2007-08-15 02:45:18.000000000 +0200
+@@ -535,8 +535,9 @@
+
+ struct RenderStage
+ {
++ virtual ~RenderStage() {}
+ virtual void Render(RenderObject* r, double time, bool reflect) = 0;
+- virtual int GetDepth(double time) { return 1; }
++ virtual int GetDepth(double /*time*/) { return 1; }
+ };
+
+ class RenderObject
+@@ -795,7 +796,7 @@
+ void RenderTile(bool reflect, int t, int x, int y, int cliplift)
+ {
+ SDL_Rect src = tile[reflect][t];
+- SDL_Rect dst = {x-scrollX-GFX_SIZE/2, y-scrollY-GFX_SIZE+TILE_H1};
++ SDL_Rect dst = {x-scrollX-GFX_SIZE/2, y-scrollY-GFX_SIZE+TILE_H1, 0, 0};
+ dst.x += tileOffset[reflect][t][0];
+ dst.y += tileOffset[reflect][t][1];
+ if (reflect)
+@@ -834,7 +835,7 @@
+ else
+ y -= h;
+ SDL_Rect src = {sx, sy, 64, 80};
+- SDL_Rect dst = {x-scrollX-32, y-scrollY-65};
++ SDL_Rect dst = {x-scrollX-32, y-scrollY-65, 0, 0};
+ SDL_BlitSurface(girlGraphics, &src, screen, &dst);
+ }
+
+@@ -898,7 +899,7 @@
+ isFadeRendering = d;
+ }
+
+- void Render(RenderObject* r, double time, bool reflect)
++ void Render(RenderObject* /*r*/, double time, bool reflect)
+ {
+ if (reflect) return;
+ if (time > 0.5)
+@@ -916,7 +917,7 @@
+ bool done;
+ ScrollRender(int a,int b) : x(a), y(b), done(false) {}
+
+- void Render(RenderObject* r, double time, bool reflect)
++ void Render(RenderObject* /*r*/, double /*time*/, bool /*reflect*/)
+ {
+ if (done) return;
+ scrollX = x, scrollY = y;
+@@ -937,7 +938,7 @@
+ LevelSelectRender(Pos const & _p, int i2, int adj) : p(_p), item(i2), adj(adj)
+ {}
+
+- void Render(RenderObject* r, double time, bool reflect)
++ void Render(RenderObject* /*r*/, double /*time*/, bool reflect)
+ {
+ if (item==0)
+ return;
+@@ -975,7 +976,7 @@
+ ItemCollectRender(int i2, Pos const & p) : ItemRender(i2, 0, p)
+ {}
+
+- void Render(RenderObject* r, double time, bool reflect)
++ void Render(RenderObject* /*r*/, double /*time*/, bool /*reflect*/)
+ {
+ }
+ };
+@@ -1005,7 +1006,7 @@
+ Pos p;
+ double specialDuration;
+
+- TileRender(int i, Pos const & _p, int _special=0) : t(i), p(_p), special(_special), specialDuration(LASER_LINE_TIME)
++ TileRender(int i, Pos const & _p, int _special=0) : special(_special), t(i), p(_p), specialDuration(LASER_LINE_TIME)
+ {}
+
+ void Render(RenderObject* r, double time, bool reflect)
+@@ -1133,7 +1134,7 @@
+ LaserRender(Pos _p, int dir, int r) : p(_p), d(dir), range(r)
+ {}
+
+- void Render(RenderObject* r, double time)
++ void Render(RenderObject* /*r*/, double /*time*/)
+ {
+ }
+ };
+@@ -1150,12 +1151,12 @@
+ seed = rand();
+ }
+
+- virtual int GetDepth(double time)
++ virtual int GetDepth(double /*time*/)
+ {
+ return p.x + p.y*2;
+ }
+
+- void Render(RenderObject* r, double time, bool reflect)
++ void Render(RenderObject* /*r*/, double time, bool reflect)
+ {
+ if (type==1 && time > 2.5)
+ type = -1, new WinLoseScreen(false);
+@@ -1226,7 +1227,7 @@
+ seed = rand();
+ }
+
+- void Render(RenderObject* r, double time, bool reflect)
++ void Render(RenderObject* /*r*/, double time, bool reflect)
+ {
+ if (type)
+ RenderTile(reflect, height ? COLLAPSE_DOOR : COLLAPSABLE, p.getScreenX(), p.getScreenY());
+@@ -1269,11 +1270,11 @@
+ int height;
+ int type;
+
+- BuildRender(Pos _p, Dir _d, int _h, int _r=0, int _type=0) : p(_p), dir(_d), height(_h), reverse(_r), type(_type)
++ BuildRender(Pos _p, Dir _d, int _h, int _r=0, int _type=0) : p(_p), dir(_d), reverse(_r), height(_h), type(_type)
+ {
+ }
+
+- void Render(RenderObject* r, double time, bool reflect)
++ void Render(RenderObject* /*r*/, double time, bool reflect)
+ {
+ if (time >= BUILD_TIME)
+ RenderTile(reflect, height ^ reverse ? (type ? COLLAPSE_DOOR2 : COLLAPSE_DOOR) : (type ? COLLAPSABLE2 : COLLAPSABLE), p.getScreenX(), p.getScreenY());
+@@ -1349,9 +1350,9 @@
+ double speed;
+ bool dead;
+
+- PlayerRender(Pos a, int h, bool d) : p(a), dead(d), target(a), speed(0), p_h(h), target_h(h), r(3), type(0)
++ PlayerRender(Pos a, int h, bool d) : p(a), target(a), p_h(h), target_h(h), r(3), type(0), speed(0), dead(d)
+ {}
+- PlayerRender(int _r, Pos a, int h1, Pos t, int h2, bool d) : p(a), dead(d), target(t), speed(JUMP_TIME), p_h(h1), target_h(h2), r(_r), type(0)
++ PlayerRender(int _r, Pos a, int h1, Pos t, int h2, bool d) : p(a), target(t), p_h(h1), target_h(h2), r(_r), type(0), speed(JUMP_TIME), dead(d)
+ {
+ int dist = MAX(ABS(p.x-target.x), ABS(p.y-target.y));
+ if (dist > 1)
+@@ -1366,15 +1367,12 @@
+ if (f>1) f=1;
+ if (f==1) dead = this->dead;
+
+- double x = p.x + (target.x - p.x) * f;
+- double y = p.y + (target.y - p.y) * f;
+-
+ if (f==1 || f>0.5 && p_h>target_h)
+ return target.x+target.y*2;
+ return MAX(target.x+target.y*2 , p.x+p.y*2);
+ }
+
+- void Render(RenderObject* ro, double time, bool reflect)
++ void Render(RenderObject* /*ro*/, double time, bool reflect)
+ {
+ bool dead = false;
+ double f = speed ? time / speed : 1;
+@@ -1581,13 +1579,13 @@
+ static char tmp1[100];
+ static LevelInfo tmp = {0, "", tmp1};
+ if (t-numComplete==1)
+- sprintf(tmp1, _("Complete 1 more level to unlock!"), t-numComplete);
++ sprintf(tmp1, _("Complete 1 more level to unlock!"));
+ else
+ sprintf(tmp1, _("Complete %d more levels to unlock!"), t-numComplete);
+ return &tmp;
+ }
+
+- for (int i=0; i<sizeof(levelNames)/sizeof(levelNames[0]); i++)
++ for (unsigned int i=0; i<sizeof(levelNames)/sizeof(levelNames[0]); i++)
+ if (strcmp(f, levelNames[i].file)==0)
+ return &levelNames[i];
+ static LevelInfo tmp = {0, "", _("<<NO NAME>>")};
+@@ -2594,7 +2592,6 @@
+ src.w = SCREEN_W;
+ src.h = 1;
+
+- const bool farView = false;
+ if (isRenderMap)
+ {
+ src.x += (int)( sin(i*0.9 + time*3.7) * sin(i*0.3 + time*0.7)*4 );
+@@ -3164,7 +3161,7 @@
+ {
+ static Pos hits[100];
+ static Dir hitDir[100];
+- static int numHits=0;
++ static unsigned int numHits=0;
+ if (!recurse)
+ numHits = 0;
+
+@@ -3176,7 +3173,7 @@
+
+ Pos p = newpos + fd;
+ int range = 0;
+- for (range; range<MAP_SIZE; range++, p=p+fd)
++ for (; range<MAP_SIZE; range++, p=p+fd)
+ {
+ Tile t = GetTile(p);
+ if (tileSolid[t]!=-1)
+@@ -3184,7 +3181,7 @@
+ if (t!=TRAP)
+ renderer(p).Add(new TileRender(tileSolid[t]==1 ? TILE_WHITE_WALL : TILE_WHITE_TILE, p), fireTime+0.1);
+
+- int i;
++ unsigned int i;
+ for (i=0; i<numHits; i++)
+ if (hits[i]==p)
+ break;
+@@ -3234,9 +3231,9 @@
+
+ if (!recurse)
+ {
+- double _time = time;
++ //double _time = time;
+ time += LASER_LINE_TIME;
+- for (int i=0; i<numHits; i++)
++ for (unsigned int i=0; i<numHits; i++)
+ {
+ Pos p = hits[i];
+ Tile t = GetTile(p);
+@@ -3366,8 +3363,6 @@
+ player_items[1]--;
+ }
+
+- int old_score=player_score;
+-
+ double time0 = time;
+ time += 0.15; //Time for leave-tile fx
+
+Index: hex-a-hop.svn/packfile.h
+===================================================================
+--- hex-a-hop.svn.orig/packfile.h 2007-08-15 02:43:25.000000000 +0200
++++ hex-a-hop.svn/packfile.h 2007-08-15 02:43:25.000000000 +0200
+@@ -50,7 +50,7 @@
+ Entry** e;
+ void* data;
+
+- PackFile1() : e(0), data(0), numfiles(0)
++ PackFile1() : numfiles(0), e(0), data(0)
+ {}
+
+ Entry* Find(const char* name)
+Index: hex-a-hop.svn/state.h
+===================================================================
+--- hex-a-hop.svn.orig/state.h 2007-08-15 02:40:42.000000000 +0200
++++ hex-a-hop.svn/state.h 2007-08-15 02:43:25.000000000 +0200
+@@ -81,7 +81,7 @@
+ virtual ~State() {}
+
+ virtual bool KeyPressed(int key, int mod) = 0;
+- virtual void KeyReleased(int key) {};
++ virtual void KeyReleased(int /*key*/) {};
+ virtual void Mouse(int x, int y, int dx, int dy, int buttons_pressed, int buttons_released, int buttons) = 0;
+ virtual void Update(double timedelta) = 0;
+ virtual void Render() = 0;
+@@ -151,6 +151,7 @@
+ next = first;
+ first = this;
+ }
++ virtual ~StateMakerBase() {}
+ virtual State* Create() = 0;
+ void Destroy()
+ {
Modified: packages/trunk/hex-a-hop/debian/patches/series
===================================================================
--- packages/trunk/hex-a-hop/debian/patches/series 2007-08-14 23:39:36 UTC (rev 3685)
+++ packages/trunk/hex-a-hop/debian/patches/series 2007-08-15 00:43:44 UTC (rev 3686)
@@ -4,3 +4,4 @@
gettext_i18n.patch
patch-hex-a-hop-better-than-par.diff
typos.patch
+compiler_warnings.patch
Modified: packages/trunk/hex-a-hop/debian/rules
===================================================================
--- packages/trunk/hex-a-hop/debian/rules 2007-08-14 23:39:36 UTC (rev 3685)
+++ packages/trunk/hex-a-hop/debian/rules 2007-08-15 00:43:44 UTC (rev 3686)
@@ -3,7 +3,8 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-CFLAGS = -Wall -g -DUSE_GETTEXT
+# TODO: -Wno-char-subscripts needs to be removed later but for now it's save
+CFLAGS = -Wall -W -Wno-char-subscripts -g -DUSE_GETTEXT
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
More information about the Pkg-games-commits
mailing list