debian/0000755000000000000000000000000012156300435007165 5ustar debian/source/0000755000000000000000000000000012156300435010465 5ustar debian/source/format0000644000000000000000000000001412156300435011673 0ustar 3.0 (quilt) debian/holotz-castle-editor.manpages0000644000000000000000000000003312156300434014751 0ustar man/holotz-castle-editor.6 debian/holotz-castle.xpm0000644000000000000000000000711612156300434012507 0ustar /* XPM */ static char *holotz[]={ "32 32 90 2", "Qt c None", ".# c #101010", ".n c #211010", ".G c #480909", ".Q c #4b0808", ".z c #510808", ".s c #521010", ".r c #551010", "#k c #5c0a0a", ".2 c #6b0c0c", ".m c #6c1111", ".b c #6c6c6c", "#t c #6d0c0c", ".R c #6e0c0c", "#h c #6f0c0c", ".0 c #700d0d", ".j c #701212", ".4 c #740c0c", "#l c #770c0c", ".P c #780d0d", "#s c #7a0e0e", ".l c #7b0c0c", "#o c #7b0d0d", ".5 c #7c0d0d", ".H c #7d0e0e", ".S c #7e0e0e", "## c #800e0e", ".6 c #810e0e", ".Z c #820e0e", ".W c #830e0e", ".t c #831111", "#w c #860e0e", "#v c #870e0e", ".q c #871010", "#p c #880e0e", ".K c #880f0f", ".V c #8a0f0f", ".a c #8a8a8a", "#c c #8b0f0f", "#b c #8d0f0f", ".U c #8d1010", ".X c #8f0f0f", "#i c #8f1010", "#e c #901010", ".L c #910f0f", "#x c #920f0f", ".9 c #921010", ".M c #931010", "#j c #931111", ".T c #941010", "#. c #951010", ".f c #961010", ".Y c #971010", "#u c #981111", ".O c #981212", ".J c #991010", ".F c #9a1010", ".A c #9a1111", ".7 c #9b1111", ".g c #9b9b9b", ".8 c #9c1111", ".1 c #9e1111", ".k c #9e1212", "#r c #9f1111", ".C c #a01111", "#m c #a11111", "#n c #a11212", "#a c #a21111", ".I c #a21212", "#f c #a31111", ".3 c #a31313", ".D c #a41212", "#d c #a51212", ".N c #a61111", ".B c #a61212", ".y c #a71212", ".v c #a81212", ".x c #a91212", "#q c #aa1212", ".u c #ab1212", "#g c #ac1212", ".d c #aeaeae", ".E c #af1313", ".w c #b01313", ".p c #b11313", ".e c #b21313", ".h c #cfcfcf", ".o c #dadada", ".i c #e8e8e8", ".c c #e9e9e9", "QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", "QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", "QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", "QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", "QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", "QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", "QtQtQtQtQtQtQtQt.#.#.#QtQtQtQtQtQtQtQtQtQt.#.#.#QtQtQtQtQtQtQtQt", "QtQtQtQtQtQtQtQtQt.#.a.#.#QtQt.#.#QtQt.#.#.b.#QtQtQtQtQtQtQtQtQt", "QtQtQtQtQtQtQtQtQtQt.#.c.d.#.#.e.f.#.#.g.h.#QtQtQtQtQtQtQtQtQtQt", "QtQtQtQtQtQtQtQtQtQtQt.#.i.#.j.k.l.m.n.o.#QtQtQtQtQtQtQtQtQtQtQt", "QtQtQtQtQtQtQtQtQtQtQt.#.#.p.q.r.s.t.u.#.#QtQtQtQtQtQtQtQtQtQtQt", "QtQtQtQtQtQtQtQtQtQt.#.v.e.e.w.x.y.w.e.e.e.#QtQtQtQtQtQtQtQtQtQt", "QtQtQtQtQtQtQtQtQt.#.z.A.e.e.x.B.C.D.u.e.E.F.#QtQtQtQtQtQtQtQtQt", "QtQtQtQtQtQtQtQtQt.#.G.H.I.x.J.K.L.M.k.N.O.P.#QtQtQtQtQtQtQtQtQt", "QtQtQtQtQtQtQtQt.#.Q.R.S.#.T.U.V.W.X.Y.#.Z.0.1.#QtQtQtQtQtQtQtQt", "QtQtQtQtQtQtQtQt.#.2.3.#.4.5.6.7.8.9#.##.##a.e.#QtQtQtQtQtQtQtQt", "QtQtQtQtQtQtQtQt.##b.p.##c#..v.E.p.E#d#e.#.e.e.#QtQtQtQtQtQtQtQt", "QtQtQtQtQtQtQtQt.#.p.#Qt.#.9#f.e.e#g.1.#Qt.#.e.#QtQtQtQtQtQtQtQt", "QtQtQtQtQtQtQtQtQt.#QtQt.##e.S#a.e#d.8.#QtQt.#QtQtQtQtQtQtQtQtQt", "QtQtQtQtQtQtQtQtQtQt.#.##h#i.S#j.e.e#d.1.#.#QtQtQtQtQtQtQtQtQtQt", "QtQtQtQtQtQtQtQtQtQt.##k#l.B#..#.##a#m#d.1.#QtQtQtQtQtQtQtQtQtQt", "QtQtQtQtQtQtQtQtQt.#.R#b#n.1.#QtQt.##o.H.M.8.#QtQtQtQtQtQtQtQtQt", "QtQtQtQtQtQtQtQtQt.##p#q#r.Y.#QtQt.##s#t.V.6.#QtQtQtQtQtQtQtQtQt", "QtQtQtQtQtQtQtQt.#.T#a#r#u.9.#QtQt.##c#v#c#w#x.#QtQtQtQtQtQtQtQt", "QtQtQtQtQtQtQtQt.#.#.#.#.#.#.#QtQt.#.#.#.#.#.#.#QtQtQtQtQtQtQtQt", "QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", "QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", "QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", "QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", "QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", "QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", "QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt"}; debian/holotz-castle-data.install0000644000000000000000000000156412156300434014261 0ustar res/languages.txt usr/share/games/holotz-castle/game/ res/playlist.txt usr/share/games/holotz-castle/game/ res/README.txt usr/share/games/holotz-castle/game/ res/credits/* usr/share/games/holotz-castle/game/credits/ res/font/* usr/share/games/holotz-castle/game/font/ res/help/* usr/share/games/holotz-castle/game/help/ res/icon/* usr/share/games/holotz-castle/game/icon/ res/intro/* usr/share/games/holotz-castle/game/intro/ res/main/* usr/share/games/holotz-castle/game/main/ res/menu/* usr/share/games/holotz-castle/game/menu/ res/messages/* usr/share/games/holotz-castle/game/messages/ res/savedata/* usr/share/games/holotz-castle/game/savedata/ res/sound/* usr/share/games/holotz-castle/game/sound/ res/stories/* usr/share/games/holotz-castle/game/stories/ res/theme/default/* usr/share/games/holotz-castle/game/theme/default/ HCedHome/res/* usr/share/games/holotz-castle/editor debian/copyright0000644000000000000000000000213412156300434011117 0ustar This package was debianized by Miriam Ruiz on Tue, 25 Jan 2005 06:36:21 +0000. It was downloaded from http://www.mainreactor.net/en/index_en.html Copyright: Copyright (C) 2003, 2004 Juan Carlos Seijo Pérez Upstream Author: Juan Carlos Seijo Pérez License: This package is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 dated June, 1991. This package is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this package; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA On Debian systems, the complete text of version 2 of the GNU General Public License can be found in `/usr/share/common-licenses/GPL-2'. debian/holotz-castle-editor.install0000644000000000000000000000004012156300434014622 0ustar holotz-castle-editor usr/games/ debian/holotz-castle.desktop0000644000000000000000000000045712156300434013355 0ustar [Desktop Entry] Type=Application Name=Holotz Castle GenericName=holotz-castle Comment=Play an exciting mystery game Comment[es]=Juega a un excitante juego de misterio Comment[ro_RO]=JucaÈ›i un joc misterios È™i antrenant Icon=holotz-castle Exec=holotz-castle Terminal=false Categories=Game;ArcadeGame; debian/changelog0000644000000000000000000002012112156300434011032 0ustar holotz-castle (1.3.14-6) unstable; urgency=low * Add patch to fix FTBFS with gcc-4.8. (Closes: #701294). + Thanks to Juhani Numminen for the patch. * Don't install themes/dungeons as they are just duplicates of themes/default. * Add patch to fix spelling errors in manpage and binaries. * Bump debhelper build-dep and compat to 9. * Bump Standards Version to 3.9.4. -- Barry deFreese Fri, 07 Jun 2013 16:47:25 -0400 holotz-castle (1.3.14-5) unstable; urgency=low * Team upload. * Build-Depends on zlib1g-dev. Fix FTBFS (Closes: #669444) * Standards-Version 3.9.3 -- Vincent Legout Sun, 29 Apr 2012 10:17:42 +0200 holotz-castle (1.3.14-4) unstable; urgency=low * Team upload [ Felix Geyer ] * Fix FTBFS with ld --as-needed. - Update 02_makefile.patch * Update Vcs-Browser control field. * Drop executable bit from data files. * Bump Standards-Version to 3.9.2, no changes needed. [ Andreas Moog ] * Fix compiler warnings -Wunused-but-set-variable and -Wunused-result (Closes: #625353) - Add 12_gcc-4.6.patch * Switch to dh-sequencer in debian/rules (Closes: #633494) - Use debian/*.install|manpages - Switch to compat level 8 -- Felix Geyer Thu, 04 Aug 2011 11:10:01 +0200 holotz-castle (1.3.14-3) unstable; urgency=low * Team upload. [ Peter Pentchev ] * Link with zlib to fix the FTBFS with recent linker versions. Closes: #615730 * Convert to the 3.0 (quilt) source format: - drop the quilt build dependency - drop the README.source file - drop the quilt snippets in the rules file * Add misc:Depends to the binary packages. * Add a DEP 3 header to the 11_dirent64 patch. [ Ansgar Burchardt ] * debian/copyright: Refer to "Debian systems" instead of only "Debian GNU/Linux systems". * Bump Standards-Version to 3.9.1 (no changes). -- Ansgar Burchardt Wed, 16 Mar 2011 11:46:03 +0100 holotz-castle (1.3.14-2) unstable; urgency=low [ Barry deFreese ] * 11_dirent64.patch-JFS.cpp change dirent64 to dirent. (Closes: #552900). * Add README.source for quilt. * Bump Standards Version to 3.8.3. (No changes needed). -- Barry deFreese Fri, 13 Nov 2009 09:12:48 -0500 holotz-castle (1.3.14-1) unstable; urgency=low [ Barry deFreese ] * New upstream release. -- Barry deFreese Fri, 15 May 2009 11:59:12 -0400 holotz-castle (1.3.13-1) unstable; urgency=low [ Miriam Ruiz ] * New Upstream Release * milanb levels are now included in the main source. Added holotz-castle-milanb to Conflicts and Provides * Removed DM-Upload-Allowed: yes from debian/control * Refreshed patches so that they apply on the newer code * Manpages are now in man/ and not in doc/ [ Barry deFreese ] * Add myself to uploaders. * Version GPL license path to GPL-2. * 10_dont_hardcode_g++41.patch - JLib/Makefile hardcoded to g++-4.1. * Bump Standards Version to 3.8.1. (No changes needed). -- Barry deFreese Wed, 08 Apr 2009 12:42:18 -0400 holotz-castle (1.3.10-1) unstable; urgency=high [ Eddy PetriÈ™or ] * remove myself from the Uploaders list [ Jon Dowland ] * update menu section to "Games/Action" for menu transition (thanks Linas Žvirblis) [ Cyril Brulebois ] * Added Vcs-Svn and Vcs-Browser fields in the control file. [ Barry deFreese ] * New upstream release. * Update copyright file. (Closes: #457257). * Add suggests for holotz-castle-milanb. (Closes: #455596). * Add watch file. * Bump debhelper build-dep to 5. * Add Homepage field in control. * Add typo fixes in manpage patches. * Remove deprecated encoding tag from desktop file. * Convert encoding to UTF-8 on debian/copyright. * Bump Standards Version to 3.7.3. + Menu policy transition. [ Ansgar Burchardt ] * debian/control: Change XS-Vcs-* to Vcs-* [ Miriam Ruiz ] * Updated 05_jlib.patch. Fixed FTBFS with GCC 4.3. Closes: #417061 Thanks to Maximiliano Curia * Added patch to fix gcc 4.3 issues: 09_gcc-4.3.patch * Added copyright statements to patches -- Debian Games Team Sat, 26 Apr 2008 02:25:38 +0200 holotz-castle (1.3.9-1) unstable; urgency=low [ Gonéri Le Bouder ] * call dh_desktop to run update-desktop-database [Miriam Ruiz] * Added debian/docs list of files * New Upstream Release: + Added translation to Portuguese + Updated translation to English -- Miriam Ruiz Wed, 14 Mar 2007 08:54:05 +0100 holotz-castle (1.3.8-2) unstable; urgency=low [Eddy PetriÈ™or] * Acknowledging NMU, thanks (Closes: #357897) * Merged patch for .desktop present in Ubuntu to be more freedesktop compilant. Thanks Barry deFreese (Closes: #376887) * Added Romanian translation of the desktop file fields. * Added myself to uploaders. [Miriam Ruiz] * Modified building system for using quilt. * Updated to Standards Version 3.7.2. No changes needed. * Added 08_jlib_jtree.patch to replace ~JTree() by ~JTree(). The former seems to give a "parse error in template argument list" in gcc-4.1 4.1.1-16 (even though 4.1.1-13 accepts it). Closes: #392172 * Added Spanish translation of the desktop file fields. * Made package safely binNMUable by replacing (= ${Source-Version}) with (= ${source:Version}) in debian/control. [ Gonéri Le Bouder ] * remove Applications from Categorie in the desktop file since it's not an official categorie -- Miriam Ruiz Thu, 12 Oct 2006 19:47:22 +0200 holotz-castle (1.3.8-1.1) unstable; urgency=low * Non-maintainer upload. * Fix warnings (treated as errors because of -Werror) about questionable casts; fixes FTBFS with g++ 4.1, patch from Ben Hutchings. (Closes: #357897) -- Steinar H. Gunderson Wed, 7 Jun 2006 21:18:09 +0200 holotz-castle (1.3.8-1) unstable; urgency=low * New Upstream Version. * Changed Maintainer field to Debian Games Team. -- Miriam Ruiz Thu, 26 Jan 2006 22:37:44 +0100 holotz-castle (1.3.7-1) unstable; urgency=low * New Upstream Version. * Added .desktop file shortcut Closes: #305333. * Updated to Standards Version 3.6.2 * Changed FSF address in debian/copyright * Removed dependency from data files to game program to avoid circuler dependencies. -- Miriam Ruiz Thu, 17 Nov 2005 07:37:59 +0100 holotz-castle (1.3.6-1) unstable; urgency=low * New Upstream Version. * Solves endianess problems and works in PowerPCs now. Closes: #304715. -- Miriam Ruiz Tue, 11 May 2005 00:37:00 +0100 holotz-castle (1.3.4-3) unstable; urgency=low * Fixed the code to solve endianess problems. It should now work in powerpc. Closes: #304715. * Thanks to Nacho Barrientos Arias for his help in testing the changes on a powerpc. -- Miriam Ruiz Mon, 18 Apr 2005 00:18:00 +0100 holotz-castle (1.3.4-2) unstable; urgency=low * Execute debhelper on arch-specific packages only in the binary-arch target. Closes: #304132. * Applied patch to solve compilation problem in amd64 architecture. Thanks to Andreas Jochens for the patch. Closes #303997. -- Miriam Ruiz Mon, 11 Apr 2005 16:48:00 +0100 holotz-castle (1.3.4-1) unstable; urgency=low * New upstream Version * Added Euskara translation. -- Miriam Ruiz Mon, 4 Apr 2005 17:02:00 +0100 holotz-castle (1.3.3-1) unstable; urgency=low * New upstream Version * Added UTF-8 support. Now it can be translated to any language. * Added Russian translation. * Fixed a bug that got the character stuck in the floor. -- Miriam Ruiz Mon, 21 Mar 2005 18:58:12 +0100 holotz-castle (1.3.1-1) unstable; urgency=low * New upstream Version -- Miriam Ruiz Tue, 8 Feb 2005 16:02:00 +0100 holotz-castle (1.3-1) unstable; urgency=low * Initial Release (Closes: #294845) -- Miriam Ruiz Tue, 25 Jan 2005 06:36:21 +0100 debian/holotz-castle.install0000644000000000000000000000017012156300434013342 0ustar debian/holotz-castle.xpm usr/share/pixmaps debian/holotz-castle.desktop usr/share/applications holotz-castle usr/games/ debian/compat0000644000000000000000000000000212156300434010362 0ustar 9 debian/watch0000644000000000000000000000013412156300435010214 0ustar version=3 http://www.mainreactor.net/holotzcastle/download/holotz-castle-(.*)-src\.tar\.gz debian/rules0000755000000000000000000000046712156300435010254 0ustar #!/usr/bin/make -f %: dh $@ override_dh_installdocs: dh_installdocs --link-doc=holotz-castle-data override_dh_fixperms: dh_fixperms if [ -d debian/holotz-castle-data ]; then \ chmod a-x debian/holotz-castle-data/usr/share/games/holotz-castle/game/stories/milanb/*.hlv; \ fi override_dh_auto_install: debian/control0000644000000000000000000000326412156300434010574 0ustar Source: holotz-castle Section: games Priority: optional Maintainer: Debian Games Team Uploaders: Miriam Ruiz , Barry deFreese Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.13.19), libsdl1.2-dev, libsdl-image1.2-dev, libsdl-mixer1.2-dev, libsdl-ttf2.0-dev, zlib1g-dev Standards-Version: 3.9.4 Homepage: http://www.mainreactor.net/holotzcastle/en/index_en.html Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/holotz-castle/ Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/holotz-castle/ Package: holotz-castle Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends}, holotz-castle-data (= ${source:Version}) Suggests: holotz-castle-milanb Description: platform game with high doses of mystery A great mystery is hidden beyond the walls of Holotz's Castle. Will you be able to help Ybelle and Ludar to escape alive from the castle? Test your dexterity with this tremendously exciting platform game! Package: holotz-castle-data Architecture: all Conflicts: holotz-castle-milanb Provides: holotz-castle-milanb Depends: ${misc:Depends} Description: platform game with high doses of mystery - data files This package contains data files for the Holotz's Castle game. . Included are the milanb and holotz-castle maps. Package: holotz-castle-editor Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends}, holotz-castle-data (= ${source:Version}) Description: platform game with high doses of mystery - level editor This package contains the level editor for the Holotz's Castle game. . The level editor allows you to modify or create new maps and levels for Holotz's Castle. debian/holotz-castle.manpages0000644000000000000000000000002412156300434013465 0ustar man/holotz-castle.6 debian/patches/0000755000000000000000000000000012156300435010614 5ustar debian/patches/03_manpage.patch0000644000000000000000000000157712156300434013560 0ustar # Copyright (C) 2006, by Miriam Ruiz # Distributed under the same license as the game. See debian/copyright. diff -ruN holotz-castle-1.3.8.orig/man/holotz-castle.6 holotz-castle-1.3.8.new/doc/holotz-castle.6 --- holotz-castle-1.3.8.orig/man/holotz-castle.6 2006-01-20 13:59:37.000000000 +0100 +++ holotz-castle-1.3.8.new/man/holotz-castle.6 2006-09-23 15:58:27.000000000 +0200 @@ -5,7 +5,7 @@ .SH "SYNOPSIS" .B holotz\-castle [\fI\-f\fR] [\fI\-w\fR] [\fI\-\-fps nn\fR] [\fI\-mWWxHHxBPP\fR] .SH "DESCRIPTION" -A great mistery is hidden beyond the walls of Holotz's Castle. ¿Will you be able to help Ybelle and Ludar to scape alive from the castle? +A great mystery is hidden beyond the walls of Holotz's Castle. Will you be able to help Ybelle and Ludar escape alive from the castle? Test your dexterity with this tremendously exciting platform game! .SH "USAGE" debian/patches/series0000644000000000000000000000045112156300434012030 0ustar 01_jlib_makefile.patch 02_makefile.patch 03_manpage.patch -p1 04_editor_manpage.patch -p1 05_jlib.patch -p1 06_casts.patch -p1 07_hcenemy.patch -p1 08_jlib_jtree.patch -p1 09_gcc-4.3.patch 10_dont_hardcode_g++41.patch 11_dirent64.patch 12_gcc-4.6.patch 13_gcc-4.8.patch 14_spelling_errors.patch debian/patches/09_gcc-4.3.patch0000644000000000000000000000607612156300434013213 0ustar # Copyright (C) 2008, by Miriam Ruiz # Distributed under the same license as the game. See debian/copyright. Index: holotz-castle-1.3.10/JLib/JLib/Graphics/JFont.h =================================================================== --- holotz-castle-1.3.10.orig/JLib/JLib/Graphics/JFont.h 2008-04-08 10:34:56.000000000 +0000 +++ holotz-castle-1.3.10/JLib/JLib/Graphics/JFont.h 2008-04-08 10:34:59.000000000 +0000 @@ -36,7 +36,7 @@ /** Alineación del texto a renderizar. */ -typedef enum JFontAlign +enum JFontAlign { JFONTALIGN_LEFT = 0, /**< Alineado a la izquierda. */ JFONTALIGN_RIGHT, /**< Alineado a la derecha. */ @@ -50,7 +50,7 @@ { /** Tipo de renderizado a usar */ - typedef enum JFontRenderType + enum JFontRenderType { JFONTRENDERTYPE_SOLID = 0, /**< Sólido con colorkey. */ JFONTRENDERTYPE_SHADED, /**< Con antialiasing en fondo sólido. */ Index: holotz-castle-1.3.10/src/HCText.h =================================================================== --- holotz-castle-1.3.10.orig/src/HCText.h 2008-04-08 10:34:56.000000000 +0000 +++ holotz-castle-1.3.10/src/HCText.h 2008-04-08 10:34:59.000000000 +0000 @@ -35,7 +35,7 @@ #include #include -typedef enum HCTextType +enum HCTextType { HCTEXTTYPE_DIALOG, /**< Dialog balloon. */ HCTEXTTYPE_NARRATIVE, /**< Narrative frame. */ Index: holotz-castle-1.3.10/src/HCCharacter.cpp =================================================================== --- holotz-castle-1.3.10.orig/src/HCCharacter.cpp 2008-04-08 10:34:59.000000000 +0000 +++ holotz-castle-1.3.10/src/HCCharacter.cpp 2008-04-08 10:34:59.000000000 +0000 @@ -739,12 +739,12 @@ if (actions & HCCA_UP && state != HCCS_HANG) { // Up requested - if (map->Cell(row, col)->Actions() & HCACTION_UP != 0) + if ((map->Cell(row, col)->Actions() & HCACTION_UP) != 0) { State(HCCS_UP); // Can go up in the current cell - if (map->Cell(row - 1, col)->Actions() & HCACTION_UP || - map->Cell(row - 1, col)->Actions() & HCACTION_FALL) + if ((map->Cell(row - 1, col)->Actions() & HCACTION_UP) || + (map->Cell(row - 1, col)->Actions() & HCACTION_FALL)) { // Can go up in the upper cell or cell above empty, continue a.y = -map->Gravity() - aMax.y; Index: holotz-castle-1.3.10/src/HCEnemyChaser.cpp =================================================================== --- holotz-castle-1.3.10.orig/src/HCEnemyChaser.cpp 2008-04-08 10:35:23.000000000 +0000 +++ holotz-castle-1.3.10/src/HCEnemyChaser.cpp 2008-04-08 10:36:11.000000000 +0000 @@ -561,7 +561,7 @@ chased->State() == HCCS_HANG || (abs(curRow - r) + abs(curCol - c) <= searchDepth && 0 == GoTo(r, c))) { - if (chasePath[chaseIndex].col != curCol || chasePath[chaseIndex].row != curRow && chaseIndex < searchDepth - 1) + if ((chasePath[chaseIndex].col != curCol || chasePath[chaseIndex].row != curRow) && chaseIndex < searchDepth - 1) { // Updates the chase index within the path when the row or column changes ++chaseIndex; debian/patches/14_spelling_errors.patch0000644000000000000000000000451412156300434015355 0ustar Description: Fix minor spelling errors in manpage and binary files. Author: Barry deFreese Index: holotz-castle-1.3.14/man/holotz-castle-editor.6 =================================================================== --- holotz-castle-1.3.14.orig/man/holotz-castle-editor.6 2013-06-08 09:33:05.000000000 -0400 +++ holotz-castle-1.3.14/man/holotz-castle-editor.6 2013-06-08 09:34:13.000000000 -0400 @@ -46,7 +46,7 @@ Other features: \- When adding an item to the map, if you press CTRL key it is adjusted to a cell. - \- To adjust a rope's lenght, you select it and, while still pressing mouse button, press ALT key and drag the mouse vertically until getting the desired length. + \- To adjust a rope's length, you select it and, while still pressing mouse button, press ALT key and drag the mouse vertically until getting the desired length. \- To adjust a rope's oscillation amplitude, you must select it and, keeping mouse button pressed, press SHIFT key. Real time amplitude is not shown, as it is determined taking into account the distance in vertical to the rope when releasing mouse button. .SH "OPTIONS" Index: holotz-castle-1.3.14/src/HolotzCastle.cpp =================================================================== --- holotz-castle-1.3.14.orig/src/HolotzCastle.cpp 2009-05-02 05:17:15.000000000 -0400 +++ holotz-castle-1.3.14/src/HolotzCastle.cpp 2013-06-08 09:35:27.000000000 -0400 @@ -272,7 +272,7 @@ { fprintf(stderr, "Could not find data directory.\n\n" - "Posible solutions are:\n" + "Possible solutions are:\n" " - Open folder JLib-1.3.1/Games/HolotzCastle and double.\n" " click 'holotz-castle' application icon.\n" " - Maybe you did 'make' but didn't do 'make install'.\n" Index: holotz-castle-1.3.14/src/HCed.cpp =================================================================== --- holotz-castle-1.3.14.orig/src/HCed.cpp 2009-05-02 05:17:15.000000000 -0400 +++ holotz-castle-1.3.14/src/HCed.cpp 2013-06-08 09:35:58.000000000 -0400 @@ -1036,7 +1036,7 @@ { fprintf(stderr, "Could not find data directory.\n\n" - "Posible solutions are:\n" + "Possible solutions are:\n" " - Open folder JLib-1.3.1/Games/HolotzCastle and double.\n" " click 'holotz-castle' application icon.\n" " - Maybe you did 'make' but didn't do 'make install'.\n" debian/patches/13_gcc-4.8.patch0000644000000000000000000000160712156300434013206 0ustar Description: Fix FTBFS with gcc-4.8 and -Werror and -Wunused-local-typedefs. Author: Juhani Numminen Bug-Debian: http://bugs.debian.org/701294 Last-Update: 2013-06-07 Index: holotz-castle-1.3.14/JLib/JLib/Util/JRW.h =================================================================== --- holotz-castle-1.3.14.orig/JLib/JLib/Util/JRW.h 2013-06-07 16:46:24.000000000 -0400 +++ holotz-castle-1.3.14/JLib/JLib/Util/JRW.h 2013-06-07 17:06:56.000000000 -0400 @@ -203,7 +203,6 @@ */ u32 ReadLE32(float *fbuff) { - typedef char pre_cxx0x_static_assert[sizeof(u32) == sizeof(float) ? 1 : -1 ]; u32 ibuff; if (ReadLE32(&ibuff) == 4) { @@ -308,7 +307,6 @@ */ u32 WriteLE32(const float *fbuff) { - typedef char pre_cxx0x_static_assert[sizeof(u32) == sizeof(float) ? 1 : -1 ]; u32 ibuff; memcpy(&ibuff, fbuff, sizeof(u32)); return WriteLE32(&ibuff); debian/patches/06_casts.patch0000644000000000000000000001115712156300435013264 0ustar # Copyright (C) 2006, by Miriam Ruiz # Distributed under the same license as the game. See debian/copyright. diff -ruN holotz-castle-1.3.8.orig/src/HCCharacter.cpp holotz-castle-1.3.8.new/src/HCCharacter.cpp --- holotz-castle-1.3.8.orig/src/HCCharacter.cpp 2006-01-20 13:59:38.000000000 +0100 +++ holotz-castle-1.3.8.new/src/HCCharacter.cpp 2006-09-23 15:58:27.000000000 +0200 @@ -873,10 +873,10 @@ u32 HCCharacter::Load(JRW &file) { if (0 == file.ReadLE32(&subtype) || - 0 == file.ReadLE32((u32 *)&pos.x) || - 0 == file.ReadLE32((u32 *)&pos.y) || - 0 == file.ReadLE32((u32 *)&vMax.x) || - 0 == file.ReadLE32((u32 *)&vMax.y) || + 0 == file.ReadLE32(&pos.x) || + 0 == file.ReadLE32(&pos.y) || + 0 == file.ReadLE32(&vMax.x) || + 0 == file.ReadLE32(&vMax.y) || 0 == file.ReadLE32(&maxJumpRows)) { fprintf(stderr, "Error reading character's common parameters.\n"); @@ -891,10 +891,10 @@ u32 HCCharacter::Save(JRW &file) { if (0 == file.WriteLE32(&subtype) || - 0 == file.WriteLE32((u32 *)&pos.x) || - 0 == file.WriteLE32((u32 *)&pos.y) || - 0 == file.WriteLE32((u32 *)&vMax.x) || - 0 == file.WriteLE32((u32 *)&vMax.y) || + 0 == file.WriteLE32(&pos.x) || + 0 == file.WriteLE32(&pos.y) || + 0 == file.WriteLE32(&vMax.x) || + 0 == file.WriteLE32(&vMax.y) || 0 == file.WriteLE32(&maxJumpRows)) { fprintf(stderr, "Error writing character's common parameters.\n"); diff -ruN holotz-castle-1.3.8.orig/src/HCLevel.cpp holotz-castle-1.3.8.new/src/HCLevel.cpp --- holotz-castle-1.3.8.orig/src/HCLevel.cpp 2006-01-20 13:59:38.000000000 +0100 +++ holotz-castle-1.3.8.new/src/HCLevel.cpp 2006-09-23 15:58:27.000000000 +0200 @@ -406,7 +406,7 @@ for (s32 i = 0; i < numEnemies; ++i) { - if (0 != file.ReadLE32((s32 *)&enemyType)) + if (0 != file.ReadLE32(&enemyType)) { // Lets the file at ist original position file.Seek(-4, SEEK_CUR); diff -ruN holotz-castle-1.3.8.orig/src/HCMap.cpp holotz-castle-1.3.8.new/src/HCMap.cpp --- holotz-castle-1.3.8.orig/src/HCMap.cpp 2006-01-20 13:59:38.000000000 +0100 +++ holotz-castle-1.3.8.new/src/HCMap.cpp 2006-09-23 15:58:27.000000000 +0200 @@ -387,7 +387,7 @@ Destroy(); // Loads the number of rows and cols, etc. - if (0 == f.ReadLE32((u32 *)&gravity) || + if (0 == f.ReadLE32(&gravity) || 0 == f.ReadLE32(&rows) || 0 == f.ReadLE32(&cols) || 0 == f.ReadLE32(&exitRow) || @@ -472,7 +472,7 @@ u32 HCMap::Save(JRW &f) { // Saves the number of rows and cols, etc. - if (0 == f.WriteLE32((u32 *)&gravity) || + if (0 == f.WriteLE32(&gravity) || 0 == f.WriteLE32(&rows) || 0 == f.WriteLE32(&cols) || 0 == f.WriteLE32(&exitRow) || diff -ruN holotz-castle-1.3.8.orig/src/HCObject.cpp holotz-castle-1.3.8.new/src/HCObject.cpp --- holotz-castle-1.3.8.orig/src/HCObject.cpp 2006-01-20 13:59:38.000000000 +0100 +++ holotz-castle-1.3.8.new/src/HCObject.cpp 2006-09-23 15:58:27.000000000 +0200 @@ -82,8 +82,8 @@ u32 HCObject::Load(JRW &file) { if (0 == file.ReadLE32(&subtype) || - 0 == file.ReadLE32((u32 *)&pos.x) || - 0 == file.ReadLE32((u32 *)&pos.y)) + 0 == file.ReadLE32(&pos.x) || + 0 == file.ReadLE32(&pos.y)) { fprintf(stderr, "Error loading the object.\n"); @@ -98,8 +98,8 @@ u32 HCObject::Save(JRW &file) { if (0 == file.WriteLE32(&subtype) || - 0 == file.WriteLE32((u32 *)&pos.x) || - 0 == file.WriteLE32((u32 *)&pos.y)) + 0 == file.WriteLE32(&pos.x) || + 0 == file.WriteLE32(&pos.y)) { fprintf(stderr, "Error saving the object.\n"); diff -ruN holotz-castle-1.3.8.orig/src/HCRope.cpp holotz-castle-1.3.8.new/src/HCRope.cpp --- holotz-castle-1.3.8.orig/src/HCRope.cpp 2006-01-20 13:59:38.000000000 +0100 +++ holotz-castle-1.3.8.new/src/HCRope.cpp 2006-09-23 15:58:27.000000000 +0200 @@ -127,12 +127,12 @@ u32 HCRope::Load(JRW &file) { - if (0 == file.ReadLE32((u32 *)&period) || + if (0 == file.ReadLE32(&period) || 0 == file.ReadLE32(&litude) || 0 == file.ReadLE32(&length) || 0 == file.ReadLE32(&subtype) || - 0 == file.ReadLE32((u32 *)&pos.x) || - 0 == file.ReadLE32((u32 *)&pos.y)) + 0 == file.ReadLE32(&pos.x) || + 0 == file.ReadLE32(&pos.y)) { fprintf(stderr, "Error reading rope parameters.\n"); @@ -161,12 +161,12 @@ u32 HCRope::Save(JRW &file) { - if (0 == file.WriteLE32((u32 *)&period) || + if (0 == file.WriteLE32(&period) || 0 == file.WriteLE32(&litude) || 0 == file.WriteLE32(&length) || 0 == file.WriteLE32(&subtype) || - 0 == file.WriteLE32((u32 *)&pos.x) || - 0 == file.WriteLE32((u32 *)&pos.y)) + 0 == file.WriteLE32(&pos.x) || + 0 == file.WriteLE32(&pos.y)) { fprintf(stderr, "Error writing rope parameters.\n"); debian/patches/04_editor_manpage.patch0000644000000000000000000000172612156300435015124 0ustar # Copyright (C) 2006, by Miriam Ruiz # Distributed under the same license as the game. See debian/copyright. diff -ruN holotz-castle-1.3.8.orig/man/holotz-castle-editor.6 holotz-castle-1.3.8.new/doc/holotz-castle-editor.6 --- holotz-castle-1.3.8.orig/man/holotz-castle-editor.6 2006-01-20 13:59:37.000000000 +0100 +++ holotz-castle-1.3.8.new/man/holotz-castle-editor.6 2006-09-23 15:58:27.000000000 +0200 @@ -4,7 +4,7 @@ .SH "SYNOPSIS" .B holotz\-castle\-editor [\fI\-f\fR] [\fI\-w\fR] [\fI\-\-fps nn\fR] [\fI\-mWWxHHxBPP\fR] [\fI\-r RR\fR] [\fI\-c CC\fR] [\fI\-t theme\fR] \fI \fR .SH "DESCRIPTION" -A great mistery is hidden beyond the walls of Holotz's Castle. ¿Will you be able to help Ybelle and Ludar to scape alive from the castle? +A great mystery is hidden beyond the walls of Holotz's Castle. Will you be able to help Ybelle and Ludar escape alive from the castle? Use the editor to design new levels for this game! .SH "USAGE" debian/patches/02_makefile.patch0000644000000000000000000000303312156300435013712 0ustar # Copyright (C) 2006, by Miriam Ruiz # Distributed under the same license as the game. See debian/copyright. --- a/src/Makefile +++ b/src/Makefile @@ -25,7 +25,7 @@ HC_BASE = /usr/share/games/holotz-castle/ HC_DATA = $(HC_BASE)game/ HCED_DATA = $(HC_BASE)editor/ -HC_BIN_DIR = /usr/local/bin/ +HC_BIN_DIR = /usr/games/ endif DEFINES = -DHC_DATA_DIR=\"$(HC_DATA)\" -DHCED_DATA_DIR=\"$(HCED_DATA)\" @@ -42,8 +42,10 @@ # Definir -D_JLIB_DEBUG para debug con JLib. Ponerlo también en el Makefile de JLib. # Define -D_JLIB_DEBUG for JLib debug mode. Put it also in JLib's Makefile. -CFLAGS=-fno-strict-aliasing -I. -I../JLib `$(SDL_CONFIG) --cflags` -I/usr/local/include/ -I/usr/local/include/SDL -O3 -Wall -Werror -Wshadow $(CPU_OPTS) -ffast-math -c -LDFLAGS=-L. -ffast-math -lSDL_image -lSDL_ttf -lSDL_mixer `$(SDL_CONFIG) --libs` +MORE_CFLAGS= -O3 +CFLAGS=-fno-strict-aliasing -I. -I../JLib `$(SDL_CONFIG) --cflags` -I/usr/local/include/ -I/usr/local/include/SDL $(MORE_CFLAGS) -Wall -Werror -Wshadow $(CPU_OPTS) -ffast-math -c +LDFLAGS=-ffast-math +LIBS=-L. -lSDL_image -lSDL_ttf -lSDL_mixer `$(SDL_CONFIG) --libs` -lz JLib: @@ -53,12 +55,12 @@ g++ $(CFLAGS) $(DEFINES) $< -o $@ HC: $(HC_OBJS) $(HC_OBJ_MAIN) ../JLib/libJLib.a - g++ $(LDFLAGS) $? -o $@;\ + g++ $(LDFLAGS) $? -o $@ $(LIBS);\ mv HC ../holotz-castle # HCed (Holotz's Castle editor). HCed: $(HC_OBJS) $(HCED_OBJ_MAIN) ../JLib/libJLib.a - g++ $(LDFLAGS) $? -o $@;\ + g++ $(LDFLAGS) $? -o $@ $(LIBS);\ mv HCed ../holotz-castle-editor install: debian/patches/08_jlib_jtree.patch0000644000000000000000000000073412156300435014261 0ustar # Copyright (C) 2006, by Miriam Ruiz # Distributed under the same license as the game. See debian/copyright. --- holotz-castle-1.3.8.orig/JLib/JLib/Util/JTree.h 2006-01-20 13:59:37.000000000 +0100 +++ holotz-castle-1.3.8/JLib/JLib/Util/JTree.h 2006-10-12 19:28:31.000000000 +0200 @@ -115,7 +115,7 @@ /** Destroys the tree. Deletes created nodes (BUT NOT its contents if they are pointers) */ - ~JTree() + ~JTree() { nodes.clear(); } debian/patches/10_dont_hardcode_g++41.patch0000644000000000000000000000152412156300435015535 0ustar #Author: Barry deFreese #Description: Don't hardcode g++-4.1 in JLib/Makefile. Index: holotz-castle-1.3.13-src/JLib/Makefile =================================================================== --- holotz-castle-1.3.13-src.orig/JLib/Makefile 2009-04-08 12:58:09.000000000 -0400 +++ holotz-castle-1.3.13-src/JLib/Makefile 2009-04-08 12:58:40.000000000 -0400 @@ -29,15 +29,15 @@ # JLib libJLib: $(JLIB_OBJS) - g++-4.1 -shared -L/usr/lib -fPIC -o $@.so $? \ + g++ -shared -L/usr/lib -fPIC -o $@.so $? \ && ar rvus $@.a $? \ $(GRAPHICS)/%.o: $(GRAPHICS)/%.cpp - g++-4.1 $(CFLAGS) -c -o $@ $< + g++ $(CFLAGS) -c -o $@ $< $(UTIL)/%.o: $(UTIL)/%.cpp - g++-4.1 $(CFLAGS) -c -o $@ $< + g++ $(CFLAGS) -c -o $@ $< $(MATH)/%.o: $(MATH)/%.cpp - g++-4.1 $(CFLAGS) -c -o $@ $< + g++ $(CFLAGS) -c -o $@ $< .PHONY: install install: debian/patches/01_jlib_makefile.patch0000644000000000000000000000154512156300435014717 0ustar # Copyright (C) 2006, by Miriam Ruiz # Distributed under the same license as the game. See debian/copyright. Index: holotz-castle-1.3.11-src/JLib/Makefile =================================================================== --- holotz-castle-1.3.11-src.orig/JLib/Makefile 2008-08-23 20:36:06.000000000 +0200 +++ holotz-castle-1.3.11-src/JLib/Makefile 2008-08-27 19:30:48.000000000 +0200 @@ -19,7 +19,8 @@ endif # Define -D_JLIB_DEBUG to debug JLib. Compile the app to debug also with this flag -CFLAGS=-I. -I/usr/local/include/SDL -O3 -ffast-math -fPIC -Wall -Wshadow `$(SDL_CONFIG) --cflags` +MORE_CFLAGS= -O3 +CFLAGS=-I. -I/usr/local/include/SDL $(MORE_CFLAGS) -ffast-math -fPIC -Wall -Wshadow `$(SDL_CONFIG) --cflags` # Sample LDFLAGS for applications # LDFLAGS=-L. -ffast-math -lSDL_image -lSDL_ttf -lSDL_mixer `$(SDL_CONFIG) --libs` debian/patches/11_dirent64.patch0000644000000000000000000000131112156300435013571 0ustar Description: Fix the FTBFS by using dirent instead of dirent64. Forwarded: no Author: Barry deFreese Last-Update: 2009-11-13 Index: holotz-castle-1.3.14/JLib/JLib/Util/JFS.cpp =================================================================== --- holotz-castle-1.3.14.orig/JLib/JLib/Util/JFS.cpp 2009-11-13 09:12:02.000000000 -0500 +++ holotz-castle-1.3.14/JLib/JLib/Util/JFS.cpp 2009-11-13 09:12:29.000000000 -0500 @@ -886,8 +886,8 @@ s32 n, k; // Si es un directorio lo importa recursivamente - struct dirent64 **namelist; - n = scandir64(filename, &namelist, 0, alphasort); + struct dirent **namelist; + n = scandir(filename, &namelist, 0, alphasort); if (n < 0) { debian/patches/07_hcenemy.patch0000644000000000000000000000232012156300435013570 0ustar # Copyright (C) 2006, by Miriam Ruiz # Distributed under the same license as the game. See debian/copyright. diff -ruN holotz-castle-1.3.8.orig/src/HCEnemy.cpp holotz-castle-1.3.8.new/src/HCEnemy.cpp --- holotz-castle-1.3.8.orig/src/HCEnemy.cpp 2006-01-20 13:59:38.000000000 +0100 +++ holotz-castle-1.3.8.new/src/HCEnemy.cpp 2006-09-23 15:58:27.000000000 +0200 @@ -130,7 +130,9 @@ u32 HCEnemy::Load(JRW &file, HCTheme &theme, HCMap *_map) { - if (0 == file.ReadLE32((s32 *)&type) || + u32 typeNum; + + if (0 == file.ReadLE32(&typeNum) || 0 == file.ReadLE32(¶m1) || 0 == file.ReadLE32(¶m2) || 0 != HCCharacter::Load(file)) @@ -141,7 +143,7 @@ bool ret = false; - switch (type) + switch (typeNum) { default: case HCENEMYTYPE_BALL: @@ -170,6 +172,8 @@ return 2; } + type = HCEnemyType(typeNum); + // Adjusts the sprite's framerate according to 1st param for (s32 i = 0; i < HCCS_COUNT; ++i) { @@ -181,7 +185,9 @@ u32 HCEnemy::Save(JRW &file) { - if (0 == file.WriteLE32((s32 *)&type) || + u32 typeNum = type; + + if (0 == file.WriteLE32(&typeNum) || 0 == file.WriteLE32(¶m1) || 0 == file.WriteLE32(¶m2) || 0 != HCCharacter::Save(file)) debian/patches/05_jlib.patch0000644000000000000000000001376612156300435013076 0ustar # Copyright (C) 2006, by Miriam Ruiz # Distributed under the same license as the game. See debian/copyright. diff -ruN holotz-castle-1.3.8.orig/JLib/JLib/Util/JFS.cpp holotz-castle-1.3.8.new/JLib/JLib/Util/JFS.cpp --- holotz-castle-1.3.8.orig/JLib/JLib/Util/JFS.cpp 2006-01-20 13:59:37.000000000 +0100 +++ holotz-castle-1.3.8.new/JLib/JLib/Util/JFS.cpp 2006-09-23 15:58:26.000000000 +0200 @@ -1112,7 +1112,7 @@ // Lee los datos desde el formato adecuado if (JFS_COMPRESSED(index[id]->res)) { - if (0 == (size = resFile.ZRead((void **)&buff))) + if (0 == (size = resFile.ZRead(&buff))) { fprintf(stderr, "JFS::Export - Error reading compressed resource\n"); delete[] buff; diff -ruN holotz-castle-1.3.8.orig/JLib/JLib/Util/JRW.cpp holotz-castle-1.3.8.new/JLib/JLib/Util/JRW.cpp --- holotz-castle-1.3.8.orig/JLib/JLib/Util/JRW.cpp 2006-01-20 13:59:37.000000000 +0100 +++ holotz-castle-1.3.8.new/JLib/JLib/Util/JRW.cpp 2006-09-23 15:58:26.000000000 +0200 @@ -7,7 +7,7 @@ #include -u32 JRW::ZRead(void **buff) +u32 JRW::ZRead(u8 **buff) { u32 len, lenUncomp; @@ -112,12 +112,9 @@ return 0; } - // For compatibility with zlib - unsigned long sizeCompUL, sizeUL; - sizeCompUL = sizeComp; - sizeUL = size; + unsigned long sizeCompUL = sizeComp; - if (Z_OK != compress2((Bytef*)buffComp, (uLongf*)&sizeComp, (Bytef*)buff, size, level)) + if (Z_OK != compress2(buffComp, &sizeCompUL, static_cast(buff), size, level)) { delete[] buffComp; return 0; diff -ruN holotz-castle-1.3.8.orig/JLib/JLib/Util/JRW.h holotz-castle-1.3.8.new/JLib/JLib/Util/JRW.h --- holotz-castle-1.3.8.orig/JLib/JLib/Util/JRW.h 2006-01-20 13:59:37.000000000 +0100 +++ holotz-castle-1.3.8.new/JLib/JLib/Util/JRW.h 2006-09-23 15:58:26.000000000 +0200 @@ -30,6 +30,8 @@ #ifndef _JRW_INCLUDED #define _JRW_INCLUDED +#include + #include #include #include @@ -139,7 +141,7 @@ * @param buff Buffer to fill with the read data uncompressed. * @return Uncompressed size of the data. */ - u32 ZRead(void **buff); + u32 ZRead(u8 **buff); /** Reads a bool data. The bool is stored as a single byte. * @param buff Variable with the result. @@ -195,6 +197,22 @@ */ u32 ReadLE32(s32 *buff) {if (0 < SDL_RWread(rwops, buff, 4, 1)) {*buff = SDL_SwapLE32(*buff); return 4;} return 0;} + /** Reads 32-bit IEEE-754 float data in little- endian format. + * @param buff Variable with the result in the machine weight. + * @return Number of bytes read or 0 (zero) if an error occured. + */ + u32 ReadLE32(float *fbuff) + { + typedef char pre_cxx0x_static_assert[sizeof(u32) == sizeof(float) ? 1 : -1 ]; + u32 ibuff; + if (ReadLE32(&ibuff) == 4) + { + memcpy(fbuff, &ibuff, sizeof(float)); + return 4; + } + return 0; + } + /** Reads a 32-bit unsigned data in big-endian format. * @param buff Variable with the result in the machine weight. * @return Number of bytes read or 0 (zero) if an error occured. @@ -284,6 +302,18 @@ */ u32 WriteLE32(s32 *buff) {s32 v = SDL_SwapLE32(*buff); return SDL_RWwrite(rwops, &v, 4, 1);} + /** Writes a 32-bit IEEE-754 float data in little-endian format. + * @param buff Variable with the data in the machine weight. + * @return Number of bytes written or 0 (zero) if an error occured. + */ + u32 WriteLE32(const float *fbuff) + { + typedef char pre_cxx0x_static_assert[sizeof(u32) == sizeof(float) ? 1 : -1 ]; + u32 ibuff; + memcpy(&ibuff, fbuff, sizeof(u32)); + return WriteLE32(&ibuff); + } + /** Writes a 32-bit unsigned data in big-endian format. * @param buff Variable with the data in the machine weight. * @return Number of bytes written or 0 (zero) if an error occured. diff -ruN holotz-castle-1.3.8.orig/JLib/JLib/Util/JTypes.h holotz-castle-1.3.8.new/JLib/JLib/Util/JTypes.h --- holotz-castle-1.3.8.orig/JLib/JLib/Util/JTypes.h 2006-01-20 13:59:37.000000000 +0100 +++ holotz-castle-1.3.8.new/JLib/JLib/Util/JTypes.h 2006-09-23 15:58:26.000000000 +0200 @@ -85,10 +85,10 @@ // use the 8bit and 16bit macros listed here, and using any of the 32-bit macros in this case could // translate in a segmentation fault during execution. Notice that he 'double' and 'long' types are normally // twice the size of the architecture -#define JCAST_8_TO_VOIDPTR(val) ((void *)size_t(*((u8 *)&(val)))) -#define JCAST_16_TO_VOIDPTR(val) ((void *)size_t(*((u16 *)&(val)))) -#define JCAST_32_TO_VOIDPTR(val) ((void *)size_t(*((u32 *)&(val)))) -#define JCAST_64_TO_VOIDPTR(val) ((void *)size_t(*((u64 *)&(val)))) +#define JCAST_8_TO_VOIDPTR(val) ((void *)(size_t)(val)) +#define JCAST_16_TO_VOIDPTR(val) ((void *)(size_t)(val)) +#define JCAST_32_TO_VOIDPTR(val) ((void *)(size_t)(val)) +#define JCAST_64_TO_VOIDPTR(val) ((void *)(size_t)(val)) #define JCAST_S8_TO_VOIDPTR(val) JCAST_8_TO_VOIDPTR((val)) #define JCAST_U8_TO_VOIDPTR(val) JCAST_8_TO_VOIDPTR((val)) @@ -101,7 +101,7 @@ #define JCAST_U64_TO_VOIDPTR(val) JCAST_64_TO_VOIDPTR((val)) #define JCAST_DOUBLE_TO_VOIDPTR(val) JCAST_64_TO_VOIDPTR((val)) -#define JCAST_VOIDPTR_TO_TYPE(p, type) (*((type *)&(p))) +#define JCAST_VOIDPTR_TO_TYPE(p, type) ((type)(size_t)(p)) #define JCAST_VOIDPTR_TO_S8(p) JCAST_VOIDPTR_TO_TYPE(p, s8) #define JCAST_VOIDPTR_TO_U8(p) JCAST_VOIDPTR_TO_TYPE(p, u8) #define JCAST_VOIDPTR_TO_S16(p) JCAST_VOIDPTR_TO_TYPE(p, s16) diff -ruN holotz-castle-1.3.8.orig/JLib/JLib/Util/JUtil.cpp holotz-castle-1.3.8.new/JLib/JLib/Util/JUtil.cpp --- holotz-castle-1.3.8.orig/JLib/JLib/Util/JUtil.cpp 2006-01-20 13:59:37.000000000 +0100 +++ holotz-castle-1.3.8.new/JLib/JLib/Util/JUtil.cpp 2006-09-23 15:58:26.000000000 +0200 @@ -209,7 +209,6 @@ s->w, s->h, fmt->BitsPerPixel, fmt->colorkey, fmt->alpha, s->flags & SDL_SRCALPHA ? "yes" : "no", s->flags & SDL_SRCCOLORKEY ? "yes" : "no", - s->flags & SDL_RLEACCEL ? "yes" : "no", s->flags & SDL_RLEACCEL ? "yes" : "no"); fprintf(stderr, "RGBAmask: R: 0x%08x G: 0x%08x B: 0x%08x A: 0x%08x\n", debian/patches/12_gcc-4.6.patch0000644000000000000000000001150512156300435013202 0ustar Description: Fix a build failure with -Werror and -Wunused-but-set-variable and -Wunused-result. Author: Andreas Moog Bug-Debian: http://bugs.debian.org/625353 --- holotz-castle-1.3.14.orig/src/HCTheme.cpp +++ holotz-castle-1.3.14/src/HCTheme.cpp @@ -51,7 +51,7 @@ s32 HCTheme::CountDirs() bool cont = true; char cwd[2048]; - getcwd(cwd, 2048); + if (0 == getcwd(cwd, 2048)){} do { @@ -103,11 +103,11 @@ bool HCTheme::LoadFloors() ret = false; } - chdir(".."); + if (0 == chdir("..")){} } } - chdir(".."); + if (0 == chdir("..")){} return ret; } @@ -170,7 +170,7 @@ bool HCTheme::LoadContFloors() ret = false; } - chdir(".."); + if (0 == chdir("..")){} } else { @@ -178,7 +178,7 @@ bool HCTheme::LoadContFloors() } } - chdir(".."); + if (0 == chdir("..")){} return ret; } @@ -224,11 +224,11 @@ bool HCTheme::LoadBreaks() ret = false; } - chdir(".."); + if (0 == chdir("..")){} } } - chdir(".."); + if (0 == chdir("..")){} return ret; } @@ -266,11 +266,11 @@ bool HCTheme::LoadBars() ret = false; } - chdir(".."); + if (0 == chdir("..")){} } } - chdir(".."); + if (0 == chdir("..")){} return ret; } @@ -308,11 +308,11 @@ bool HCTheme::LoadLadders() ret = false; } - chdir(".."); + if (0 == chdir("..")){} } } - chdir(".."); + if (0 == chdir("..")){} return ret; } @@ -364,11 +364,11 @@ bool HCTheme::LoadObjects() ret = false; } - chdir(".."); + if (0 == chdir("..")){} } } - chdir(".."); + if (0 == chdir("..")){} return ret; } @@ -413,11 +413,11 @@ bool HCTheme::LoadRopes() ret = false; } - chdir(".."); + if (0 == chdir("..")){} } } - chdir(".."); + if (0 == chdir("..")){} return ret; } @@ -489,11 +489,11 @@ bool HCTheme::LoadChar(const char *direc } } // for every state - chdir(".."); + if (0 == chdir("..")){} } // if chdir() } - chdir("../.."); + if (0 == chdir("../..")){} return true; } @@ -559,17 +559,17 @@ bool HCTheme::LoadDialogs() !imgDialog[i-1][HCTDT_RIGHT].Load("right.tga")) { char strcwd[256]; - getcwd(strcwd, 256); + if (0 == getcwd(strcwd, 256)){} perror("error"); fprintf(stderr, "HCTheme: Couldn't load dialog. %s en dir %s\n", SDL_GetError(), strcwd); ret = false; } - chdir(".."); + if (0 == chdir("..")){} } } - chdir(".."); + if (0 == chdir("..")){} return ret; } @@ -620,11 +620,11 @@ bool HCTheme::LoadNarratives() ret = false; } - chdir(".."); + if (0 == chdir("..")){} } } - chdir(".."); + if (0 == chdir("..")){} return ret; } @@ -635,7 +635,7 @@ bool HCTheme::Load(const char *themeName char themeDir[PATH_MAX]; char curDir[PATH_MAX]; - getcwd(curDir, PATH_MAX); + if (0 == getcwd(curDir, PATH_MAX)){} // Checks for the theme in any of: // - installation directory @@ -669,12 +669,12 @@ bool HCTheme::Load(const char *themeName { fprintf(stderr, "HCTheme: Couldn't load resources.\n"); - chdir(curDir); + if (0 == chdir(curDir)){} return false; } - chdir(curDir); + if (0 == chdir(curDir)){} return true; } --- holotz-castle-1.3.14.orig/src/HCRope.cpp +++ holotz-castle-1.3.14/src/HCRope.cpp @@ -41,7 +41,6 @@ bool HCRope::Init(float p, s32 a, u32 l, amplitude = abs(a) < length * theme.Rope(subtype)[HCRDT_MIDDLE].Height() ? abs(a) : length * theme.Rope(subtype)[HCRDT_MIDDLE].Height(); s32 i; - float y; JDELETE_ARRAY(middle); middle = new JImage [length]; @@ -52,12 +51,10 @@ bool HCRope::Init(float p, s32 a, u32 l, for (i = 0; i < length; ++i) { middle[i].Ref(theme.Rope(subtype)[HCRDT_MIDDLE]); - y = top.Y() + top.Height() + (i * middle[i].Height()); middle[i].Pos(top.X() + (top.Width()/2) - (middle[i].Width()/2), pos.y); } edge.Ref(theme.Rope(subtype)[HCRDT_EDGE]); - y = top.Y() + top.Height() + (i * middle[0].Height()); edge.Pos(top.X() + (top.Width()/2) - (edge.Width()/2), pos.y); // 25 fps resolution --- holotz-castle-1.3.14.orig/src/HCScript.cpp +++ holotz-castle-1.3.14/src/HCScript.cpp @@ -70,7 +70,7 @@ bool HCScript::Load(const char *filename blocks = new HCScriptBlock[numBlocks]; // Process each block - s8 *begin, *end; + s8 *begin; f.StartOfDocument(); @@ -80,7 +80,6 @@ bool HCScript::Load(const char *filename begin = f.GetPos(); f.FindNext("}"); - end = f.GetPos(); f.SetPos(begin); --- holotz-castle-1.3.14.orig/src/HCLevel.cpp +++ holotz-castle-1.3.14/src/HCLevel.cpp @@ -745,11 +745,8 @@ void HCLevel::Pos(float xPos, float yPos dy = yMap - yMapOrg; // Now move the objects - float t1, t2; for (s32 i = 0; i < numObjects; ++i) { - t1 = objects[i]->X(); - t2 = objects[i]->Y(); objects[i]->Pos(objects[i]->X() + (s32)dx, objects[i]->Y() + (s32)dy); debian/holotz-castle.menu0000644000000000000000000000024612156300434012644 0ustar ?package(holotz-castle):needs="x11" section="Games/Action" \ title="Holotz Castle" command="/usr/games/holotz-castle" \ icon="/usr/share/pixmaps/holotz-castle.xpm" debian/holotz-castle-data.docs0000644000000000000000000000002112156300434013526 0ustar doc/MANUAL_*.txt