[Pkg-allegro-commits] r17 - in unstable/kq/debian: . patches
Sam Hocevar
sho at costa.debian.org
Sat May 27 22:38:58 UTC 2006
Author: sho
Date: 2006-05-27 22:38:58 +0000 (Sat, 27 May 2006)
New Revision: 17
Added:
unstable/kq/debian/patches/020_alternate_keys.diff
unstable/kq/debian/patches/020_cosmetic_credits.diff
unstable/kq/debian/patches/020_stretch_view.diff
unstable/kq/debian/patches/020_usr_share_games.diff
Removed:
unstable/kq/debian/patches/020_misc.diff
Modified:
unstable/kq/debian/changelog
unstable/kq/debian/patches/010_luac50.diff
unstable/kq/debian/patches/series
Log:
kq (0.99.cvs20060528-1) unstable; urgency=low
* New CVS snapshot.
* Upstream greatly reduced CPU usage.
* Moving diagonally now works.
* debian/patches/020_misc.diff: Split patch.
+ 020_cosmetic_credits.diff: slightly move the credits scrolling text.
+ 020_alternate_keys.diff: add a set of more intuitive default keys.
+ 020_usr_share_games.diff: allow installation of data in the standard
/usr/share/games directory.
+ 020_stretch_view.diff: double-pixel window by default.
Modified: unstable/kq/debian/changelog
===================================================================
--- unstable/kq/debian/changelog 2006-05-23 12:44:54 UTC (rev 16)
+++ unstable/kq/debian/changelog 2006-05-27 22:38:58 UTC (rev 17)
@@ -1,3 +1,18 @@
+kq (0.99.cvs20060528-1) unstable; urgency=low
+
+ * New CVS snapshot.
+ * Upstream greatly reduced CPU usage.
+ * Moving diagonally now works.
+
+ * debian/patches/020_misc.diff: Split patch.
+ + 020_cosmetic_credits.diff: slightly move the credits scrolling text.
+ + 020_alternate_keys.diff: add a set of more intuitive default keys.
+ + 020_usr_share_games.diff: allow installation of data in the standard
+ /usr/share/games directory.
+ + 020_stretch_view.diff: double-pixel window by default.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Sun, 28 May 2006 00:15:48 +0200
+
kq (0.99.cvs20060330-2) unstable; urgency=low
* debian/control:
Modified: unstable/kq/debian/patches/010_luac50.diff
===================================================================
--- unstable/kq/debian/patches/010_luac50.diff 2006-05-23 12:44:54 UTC (rev 16)
+++ unstable/kq/debian/patches/010_luac50.diff 2006-05-27 22:38:58 UTC (rev 17)
@@ -1,7 +1,7 @@
-Index: kq-0.99.cvs20060330/mkfiles/makefile.cfg
+Index: kq-0.99.cvs20060528/mkfiles/makefile.cfg
===================================================================
---- kq-0.99.cvs20060330.orig/mkfiles/makefile.cfg 2005-11-12 10:32:24.000000000 +0100
-+++ kq-0.99.cvs20060330/mkfiles/makefile.cfg 2006-03-30 13:52:13.000000000 +0200
+--- kq-0.99.cvs20060528.orig/mkfiles/makefile.cfg 2005-11-12 10:32:24.000000000 +0100
++++ kq-0.99.cvs20060528/mkfiles/makefile.cfg 2006-05-28 00:16:59.000000000 +0200
@@ -74,7 +74,7 @@
# DFLAGS are the flags used to build the dependencies. #
# #
@@ -20,10 +20,10 @@
ifdef KQ_USE_JGMOD
LIBRARY += jgmod
else
-Index: kq-0.99.cvs20060330/readme.txt
+Index: kq-0.99.cvs20060528/readme.txt
===================================================================
---- kq-0.99.cvs20060330.orig/readme.txt 2006-03-30 12:57:58.000000000 +0200
-+++ kq-0.99.cvs20060330/readme.txt 2006-03-30 13:52:13.000000000 +0200
+--- kq-0.99.cvs20060528.orig/readme.txt 2006-03-30 12:57:58.000000000 +0200
++++ kq-0.99.cvs20060528/readme.txt 2006-05-28 00:16:59.000000000 +0200
@@ -132,7 +132,7 @@
script into a .lob file, do the following if you have perl:
@@ -42,10 +42,10 @@
If you don't use DOS for doing this, things might be slightly
different for you.
-Index: kq-0.99.cvs20060330/scripts/compall.sh
+Index: kq-0.99.cvs20060528/scripts/compall.sh
===================================================================
---- kq-0.99.cvs20060330.orig/scripts/compall.sh 2002-09-03 23:13:53.000000000 +0200
-+++ kq-0.99.cvs20060330/scripts/compall.sh 2006-03-30 13:52:13.000000000 +0200
+--- kq-0.99.cvs20060528.orig/scripts/compall.sh 2002-09-03 23:13:53.000000000 +0200
++++ kq-0.99.cvs20060528/scripts/compall.sh 2006-05-28 00:16:59.000000000 +0200
@@ -1,5 +1,5 @@
for a in `cat allsc.txt`
do
@@ -53,20 +53,20 @@
- perl prep.pl < $a.lua | ./luac.exe -o $a.lob -
+ perl prep.pl < $a.lua | ./luac50.exe -o $a.lob -
done
-Index: kq-0.99.cvs20060330/scripts/comp.bat
+Index: kq-0.99.cvs20060528/scripts/comp.bat
===================================================================
---- kq-0.99.cvs20060330.orig/scripts/comp.bat 2002-09-03 23:13:53.000000000 +0200
-+++ kq-0.99.cvs20060330/scripts/comp.bat 2006-03-30 13:52:13.000000000 +0200
+--- kq-0.99.cvs20060528.orig/scripts/comp.bat 2002-09-03 23:13:53.000000000 +0200
++++ kq-0.99.cvs20060528/scripts/comp.bat 2006-05-28 00:16:59.000000000 +0200
@@ -1,4 +1,4 @@
perl prep.pl < %1.lua > _tmpfile.$$$
-luac -o %1.lob _tmpfile.$$$
+luac50 -o %1.lob _tmpfile.$$$
erase _tmpfile.$$$
-Index: kq-0.99.cvs20060330/scripts/Makefile.am
+Index: kq-0.99.cvs20060528/scripts/Makefile.am
===================================================================
---- kq-0.99.cvs20060330.orig/scripts/Makefile.am 2006-03-30 13:13:00.000000000 +0200
-+++ kq-0.99.cvs20060330/scripts/Makefile.am 2006-03-30 14:55:09.000000000 +0200
+--- kq-0.99.cvs20060528.orig/scripts/Makefile.am 2006-05-28 00:12:34.000000000 +0200
++++ kq-0.99.cvs20060528/scripts/Makefile.am 2006-05-28 00:16:59.000000000 +0200
@@ -15,7 +15,7 @@
all-am: Makefile confirm-dir $(LOBS)
@@ -76,11 +76,11 @@
pscripts/%.lua: $(srcdir)/%.lua
-Index: kq-0.99.cvs20060330/scripts/Makefile.in
+Index: kq-0.99.cvs20060528/scripts/Makefile.in
===================================================================
---- kq-0.99.cvs20060330.orig/scripts/Makefile.in 2006-03-30 14:09:44.000000000 +0200
-+++ kq-0.99.cvs20060330/scripts/Makefile.in 2006-03-30 14:55:29.000000000 +0200
-@@ -308,7 +308,7 @@
+--- kq-0.99.cvs20060528.orig/scripts/Makefile.in 2006-05-28 00:14:30.000000000 +0200
++++ kq-0.99.cvs20060528/scripts/Makefile.in 2006-05-28 00:16:59.000000000 +0200
+@@ -317,7 +317,7 @@
all-am: Makefile confirm-dir $(LOBS)
%.lob: pscripts/%.lua $(INCLUDES)
Added: unstable/kq/debian/patches/020_alternate_keys.diff
===================================================================
--- unstable/kq/debian/patches/020_alternate_keys.diff 2006-05-23 12:44:54 UTC (rev 16)
+++ unstable/kq/debian/patches/020_alternate_keys.diff 2006-05-27 22:38:58 UTC (rev 17)
@@ -0,0 +1,79 @@
+Index: kq-0.99.cvs20060528/src/kq.c
+===================================================================
+--- kq-0.99.cvs20060528.orig/src/kq.c 2006-05-28 00:12:34.000000000 +0200
++++ kq-0.99.cvs20060528/src/kq.c 2006-05-28 00:17:31.000000000 +0200
+@@ -355,16 +355,16 @@
+ poll_keyboard ();
+ }
+
+- balt = key[kalt];
+- besc = key[kesc];
+- bctrl = key[kctrl];
+- benter = key[kenter];
++ balt = key[kalt] | key[KEY_SPACE];
++ besc = key[kesc] | key[KEY_ESC];
++ bctrl = key[kctrl] | key[KEY_ESC];
++ benter = key[kenter] | key[KEY_ENTER];
+ bhelp = key[KEY_F1];
+
+- up = key[kup];
+- down = key[kdown];
+- left = key[kleft];
+- right = key[kright];
++ up = key[kup] | key[KEY_UP];
++ down = key[kdown] | key[KEY_DOWN];
++ left = key[kleft] | key[KEY_LEFT];
++ right = key[kright] | key[KEY_RIGHT];
+
+ // TT: Is there a reason this has to be called twice in one function?
+ // poll_music ();
+Index: kq-0.99.cvs20060528/src/setup.c
+===================================================================
+--- kq-0.99.cvs20060528.orig/src/setup.c 2006-05-28 00:12:35.000000000 +0200
++++ kq-0.99.cvs20060528/src/setup.c 2006-05-28 00:20:10.000000000 +0200
+@@ -774,25 +774,36 @@
+ */
+ void show_help (void)
+ {
++ char key[80];
+ menubox (double_buffer, 116 + xofs, yofs, 9, 1, BLUE);
+ print_font (double_buffer, 132 + xofs, 8 + yofs, "KQ Help", FGOLD);
+ menubox (double_buffer, 32 + xofs, 32 + yofs, 30, 20, BLUE);
+ menubox (double_buffer, xofs, 216 + yofs, 38, 1, BLUE);
++#if 0
+ print_font (double_buffer, 16 + xofs, 224 + yofs,
+ "Press CONFIRM to exit this screen", FNORMAL);
+- citem (72, "Up Key:", kq_keyname (kup), FNORMAL);
+- citem (80, "Down Key:", kq_keyname (kdown), FNORMAL);
+- citem (88, "Left Key:", kq_keyname (kleft), FNORMAL);
+- citem (96, "Right Key:", kq_keyname (kright), FNORMAL);
+- citem (104, "Confirm Key:", kq_keyname (kalt), FNORMAL);
+- citem (112, "Cancel Key:", kq_keyname (kctrl), FNORMAL);
+- citem (120, "Menu Key:", kq_keyname (kenter), FNORMAL);
+- citem (128, "System Menu Key:", kq_keyname (kesc), FNORMAL);
++#endif
++ sprintf(key, kup != KEY_UP ? "UP/%s" : "%s", kq_keyname (kup));
++ citem (80, "Up Key:", key, FNORMAL);
++ sprintf(key, kdown != KEY_DOWN ? "DOWN/%s" : "%s", kq_keyname (kdown));
++ citem (88, "Down Key:", key, FNORMAL);
++ sprintf(key, kleft != KEY_LEFT ? "LEFT/%s" : "%s", kq_keyname (kleft));
++ citem (96, "Left Key:", key, FNORMAL);
++ sprintf(key, kright != KEY_RIGHT ? "RIGHT/%s" : "%s", kq_keyname (kright));
++ citem (104, "Right Key:", key, FNORMAL);
++ sprintf(key, kalt != KEY_SPACE ? "SPACE/%s" : "%s", kq_keyname (kalt));
++ citem (112, "Confirm Key:", key, FNORMAL);
++ sprintf(key, kctrl != KEY_ESC ? "ESC/%s" : "%s", kq_keyname (kctrl));
++ citem (120, "Cancel Key:", key, FNORMAL);
++ sprintf(key, kenter != KEY_ENTER ? "ENTER/%s" : "%s", kq_keyname (kenter));
++ citem (128, "Menu Key:", key, FNORMAL);
++ sprintf(key, kesc != KEY_ESC ? "ESC/%s" : "%s", kq_keyname (kesc));
++ citem (136, "System Menu Key:", key, FNORMAL);
+ do {
+ blit2screen (xofs, yofs);
+ readcontrols ();
+ }
+- while (!balt && !bctrl);
++ while (!balt && !bctrl && !besc);
+ unpress ();
+ }
+
Added: unstable/kq/debian/patches/020_cosmetic_credits.diff
===================================================================
--- unstable/kq/debian/patches/020_cosmetic_credits.diff 2006-05-23 12:44:54 UTC (rev 16)
+++ unstable/kq/debian/patches/020_cosmetic_credits.diff 2006-05-27 22:38:58 UTC (rev 17)
@@ -0,0 +1,13 @@
+Index: kq-0.99.cvs20060528/src/credits.c
+===================================================================
+--- kq-0.99.cvs20060528.orig/src/credits.c 2005-11-12 10:32:25.000000000 +0100
++++ kq-0.99.cvs20060528/src/credits.c 2006-05-28 00:17:31.000000000 +0200
+@@ -131,7 +131,7 @@
+ }
+ e = 320 - ticks;
+ if (e != last_e) {
+- x0 = (320 - wk->w) / 2;
++ x0 = (320 - wk->w) / 2 + 8;
+ for (i = 0; i < wk->w; ++i) {
+ blit (wk, double_buffer, i, ease (i + e), i + x0, 185, 1, 32);
+ }
Deleted: unstable/kq/debian/patches/020_misc.diff
===================================================================
--- unstable/kq/debian/patches/020_misc.diff 2006-05-23 12:44:54 UTC (rev 16)
+++ unstable/kq/debian/patches/020_misc.diff 2006-05-27 22:38:58 UTC (rev 17)
@@ -1,178 +0,0 @@
-Index: kq-0.99.cvs20060330/include/kq.h
-===================================================================
---- kq-0.99.cvs20060330.orig/include/kq.h 2006-03-02 23:38:44.000000000 +0100
-+++ kq-0.99.cvs20060330/include/kq.h 2006-03-30 13:52:13.000000000 +0200
-@@ -31,6 +31,7 @@
-
-
- #include <allegro.h>
-+#include "config.h"
- #include "entity.h"
-
- #define MAX_TILES 1024
-Index: kq-0.99.cvs20060330/scripts/cult.lua
-===================================================================
---- kq-0.99.cvs20060330.orig/scripts/cult.lua 2005-11-12 10:32:25.000000000 +0100
-+++ kq-0.99.cvs20060330/scripts/cult.lua 2006-03-30 13:52:13.000000000 +0200
-@@ -372,7 +372,7 @@
- local a, b, dx, dy
- local ax, ay, z
-
-- create_df("data/mpcx.dat", "LFLAME_PCX")
-+ create_df("/usr/share/games/kq/data/mpcx.dat", "LFLAME_PCX")
- create_bmp(0, 24, 24)
- df2bmp(0, 0, 16, 0, 0, 24, 24)
- create_bmp(1, 64, 16)
-Index: kq-0.99.cvs20060330/src/credits.c
-===================================================================
---- kq-0.99.cvs20060330.orig/src/credits.c 2005-11-12 10:32:25.000000000 +0100
-+++ kq-0.99.cvs20060330/src/credits.c 2006-03-30 13:52:13.000000000 +0200
-@@ -131,7 +131,7 @@
- }
- e = 320 - ticks;
- if (e != last_e) {
-- x0 = (320 - wk->w) / 2;
-+ x0 = (320 - wk->w) / 2 + 8;
- for (i = 0; i < wk->w; ++i) {
- blit (wk, double_buffer, i, ease (i + e), i + x0, 185, 1, 32);
- }
-Index: kq-0.99.cvs20060330/src/kq.c
-===================================================================
---- kq-0.99.cvs20060330.orig/src/kq.c 2006-03-30 12:57:58.000000000 +0200
-+++ kq-0.99.cvs20060330/src/kq.c 2006-03-30 13:52:13.000000000 +0200
-@@ -164,7 +164,7 @@
- /*! True if the intro is to be skipped (the bit where the heroes learn of the quest) */
- unsigned char skip_intro = 0;
- /*! Graphics mode settings */
--unsigned char wait_retrace = 0, windowed = 0, stretch_view = 0, cpu_usage = 0;
-+unsigned char wait_retrace = 0, windowed = 0, stretch_view = 1, cpu_usage = 0;
- /*! Current sequence position of animated tiles */
- unsigned short tilex[MAX_TILES];
- /*! Current 'time' for animated tiles. When this increments to adata[].delay,
-@@ -353,16 +353,16 @@
- poll_keyboard ();
- }
-
-- balt = key[kalt];
-- besc = key[kesc];
-- bctrl = key[kctrl];
-- benter = key[kenter];
-+ balt = key[kalt] | key[KEY_SPACE];
-+ besc = key[kesc] | key[KEY_ESC];
-+ bctrl = key[kctrl] | key[KEY_ESC];
-+ benter = key[kenter] | key[KEY_ENTER];
- bhelp = key[KEY_F1];
-
-- up = key[kup];
-- down = key[kdown];
-- left = key[kleft];
-- right = key[kright];
-+ up = key[kup] | key[KEY_UP];
-+ down = key[kdown] | key[KEY_DOWN];
-+ left = key[kleft] | key[KEY_LEFT];
-+ right = key[kright] | key[KEY_RIGHT];
-
- // TT: Is there a reason this has to be called twice in one function?
- // poll_music ();
-@@ -1826,7 +1826,7 @@
- startup ();
- game_on = 1;
- /* Also this can be overridden by settings in config */
-- skip_splash = 0;
-+ skip_splash = 1;
- while (game_on) {
- switch (start_menu (skip_splash)) {
- case 0:
-Index: kq-0.99.cvs20060330/src/setup.c
-===================================================================
---- kq-0.99.cvs20060330.orig/src/setup.c 2006-03-30 12:57:58.000000000 +0200
-+++ kq-0.99.cvs20060330/src/setup.c 2006-03-30 13:52:13.000000000 +0200
-@@ -781,26 +781,37 @@
- */
- void show_help (void)
- {
-+ char key[80];
- menubox (double_buffer, 116 + xofs, yofs, 9, 1, BLUE);
- print_font (double_buffer, 132 + xofs, 8 + yofs, "KQ Help", FGOLD);
- menubox (double_buffer, 32 + xofs, 32 + yofs, 30, 20, BLUE);
- menubox (double_buffer, xofs, 216 + yofs, 38, 1, BLUE);
-+#if 0
- print_font (double_buffer, 16 + xofs, 224 + yofs,
- "Press CONFIRM to exit this screen", FNORMAL);
-- citem (72, "Up Key:", kq_keyname (kup), FNORMAL);
-- citem (80, "Down Key:", kq_keyname (kdown), FNORMAL);
-- citem (88, "Left Key:", kq_keyname (kleft), FNORMAL);
-- citem (96, "Right Key:", kq_keyname (kright), FNORMAL);
-- citem (104, "Confirm Key:", kq_keyname (kalt), FNORMAL);
-- citem (112, "Cancel Key:", kq_keyname (kctrl), FNORMAL);
-- citem (120, "Menu Key:", kq_keyname (kenter), FNORMAL);
-- citem (128, "System Menu Key:", kq_keyname (kesc), FNORMAL);
-+#endif
-+ sprintf(key, kup != KEY_UP ? "UP/%s" : "%s", kq_keyname (kup));
-+ citem (80, "Up Key:", key, FNORMAL);
-+ sprintf(key, kdown != KEY_DOWN ? "DOWN/%s" : "%s", kq_keyname (kdown));
-+ citem (88, "Down Key:", key, FNORMAL);
-+ sprintf(key, kleft != KEY_LEFT ? "LEFT/%s" : "%s", kq_keyname (kleft));
-+ citem (96, "Left Key:", key, FNORMAL);
-+ sprintf(key, kright != KEY_RIGHT ? "RIGHT/%s" : "%s", kq_keyname (kright));
-+ citem (104, "Right Key:", key, FNORMAL);
-+ sprintf(key, kalt != KEY_SPACE ? "SPACE/%s" : "%s", kq_keyname (kalt));
-+ citem (112, "Confirm Key:", key, FNORMAL);
-+ sprintf(key, kctrl != KEY_ESC ? "ESC/%s" : "%s", kq_keyname (kctrl));
-+ citem (120, "Cancel Key:", key, FNORMAL);
-+ sprintf(key, kenter != KEY_ENTER ? "ENTER/%s" : "%s", kq_keyname (kenter));
-+ citem (128, "Menu Key:", key, FNORMAL);
-+ sprintf(key, kesc != KEY_ESC ? "ESC/%s" : "%s", kq_keyname (kesc));
-+ citem (136, "System Menu Key:", key, FNORMAL);
- do {
- blit2screen (xofs, yofs);
- readcontrols ();
- kq_yield ();
- }
-- while (!balt && !bctrl);
-+ while (!balt && !bctrl && !besc);
- unpress ();
- }
-
-Index: kq-0.99.cvs20060330/src/unix.c
-===================================================================
---- kq-0.99.cvs20060330.orig/src/unix.c 2006-03-30 12:57:58.000000000 +0200
-+++ kq-0.99.cvs20060330/src/unix.c 2006-03-30 14:00:23.000000000 +0200
-@@ -41,6 +41,9 @@
-
-
-
-+#define LIB_DIR "/usr/lib/games/kq"
-+#define SHARE_DIR "/usr/share/games/kq"
-+
- /*! \brief Return the name of 'significant' directories.
- *
- * Checks to see if the exe is in its correct, install location (set
-@@ -75,17 +78,7 @@
- strcpy (user_dir, ".");
- }
- /* Now the data directory */
-- get_executable_name(exe, sizeof(exe));
-- if (strcmp(exe, KQ_BIN)==0)
-- {
-- /* It's in its proper installed location */
-- strcpy(game_dir, KQ_DATA);
-- }
-- else
-- {
-- /* Not installed, development version */
-- strcpy(game_dir, ".");
-- }
-+ strcpy(game_dir, SHARE_DIR);
- init_path = 1;
- }
- switch (dir) {
-@@ -103,7 +96,7 @@
- sprintf (ans, "%s/%s", user_dir, file);
- break;
- case SCRIPT_DIR:
-- sprintf (ans, "%s/scripts/%s", game_dir, file);
-+ sprintf (ans, "%s/scripts/%s", LIB_DIR, file);
- break;
- default:
- return NULL;
Added: unstable/kq/debian/patches/020_stretch_view.diff
===================================================================
--- unstable/kq/debian/patches/020_stretch_view.diff 2006-05-23 12:44:54 UTC (rev 16)
+++ unstable/kq/debian/patches/020_stretch_view.diff 2006-05-27 22:38:58 UTC (rev 17)
@@ -0,0 +1,13 @@
+Index: kq-0.99.cvs20060528/src/kq.c
+===================================================================
+--- kq-0.99.cvs20060528.orig/src/kq.c 2006-05-28 00:12:34.000000000 +0200
++++ kq-0.99.cvs20060528/src/kq.c 2006-05-28 00:17:31.000000000 +0200
+@@ -162,7 +162,7 @@
+ /*! True if the intro is to be skipped (the bit where the heroes learn of the quest) */
+ unsigned char skip_intro = 0;
+ /*! Graphics mode settings */
+-unsigned char wait_retrace = 0, windowed = 0, stretch_view = 0, cpu_usage = 0;
++unsigned char wait_retrace = 0, windowed = 0, stretch_view = 1, cpu_usage = 0;
+ /*! Current sequence position of animated tiles */
+ unsigned short tilex[MAX_TILES];
+ /*! Current 'time' for animated tiles. When this increments to adata[].delay,
Added: unstable/kq/debian/patches/020_usr_share_games.diff
===================================================================
--- unstable/kq/debian/patches/020_usr_share_games.diff 2006-05-23 12:44:54 UTC (rev 16)
+++ unstable/kq/debian/patches/020_usr_share_games.diff 2006-05-27 22:38:58 UTC (rev 17)
@@ -0,0 +1,64 @@
+Index: kq-0.99.cvs20060528/include/kq.h
+===================================================================
+--- kq-0.99.cvs20060528.orig/include/kq.h 2006-05-28 00:12:30.000000000 +0200
++++ kq-0.99.cvs20060528/include/kq.h 2006-05-28 00:17:31.000000000 +0200
+@@ -40,6 +40,7 @@
+ #endif
+
+ #include <allegro.h>
++#include "config.h"
+ #include "entity.h"
+
+ #define MAX_TILES 1024
+Index: kq-0.99.cvs20060528/scripts/cult.lua
+===================================================================
+--- kq-0.99.cvs20060528.orig/scripts/cult.lua 2006-05-28 00:12:34.000000000 +0200
++++ kq-0.99.cvs20060528/scripts/cult.lua 2006-05-28 00:17:31.000000000 +0200
+@@ -363,7 +363,7 @@
+ local a, b, dx, dy
+ local ax, ay, z
+
+- create_df("data/mpcx.dat", "LFLAME_PCX")
++ create_df("/usr/share/games/kq/data/mpcx.dat", "LFLAME_PCX")
+ create_bmp(0, 24, 24)
+ df2bmp(0, 0, 16, 0, 0, 24, 24)
+ create_bmp(1, 64, 16)
+Index: kq-0.99.cvs20060528/src/unix.c
+===================================================================
+--- kq-0.99.cvs20060528.orig/src/unix.c 2006-05-28 00:12:35.000000000 +0200
++++ kq-0.99.cvs20060528/src/unix.c 2006-05-28 00:20:42.000000000 +0200
+@@ -41,6 +41,9 @@
+
+
+
++#define LIB_DIR "/usr/lib/games/kq"
++#define SHARE_DIR "/usr/share/games/kq"
++
+ /*! \brief Return the name of 'significant' directories.
+ *
+ * Checks to see if the exe is in its correct, install location (set
+@@ -75,14 +78,7 @@
+ strcpy (user_dir, ".");
+ }
+ /* Now the data directory */
+- get_executable_name (exe, sizeof (exe));
+- if (strcmp (exe, KQ_BIN) == 0) {
+- /* It's in its proper installed location */
+- strcpy (game_dir, KQ_DATA);
+- } else {
+- /* Not installed, development version */
+- strcpy (game_dir, ".");
+- }
++ strcpy(game_dir, SHARE_DIR);
+ init_path = 1;
+ }
+ switch (dir) {
+@@ -100,7 +96,7 @@
+ sprintf (ans, "%s/%s", user_dir, file);
+ break;
+ case SCRIPT_DIR:
+- sprintf (ans, "%s/scripts/%s", game_dir, file);
++ sprintf (ans, "%s/scripts/%s", LIB_DIR, file);
+ break;
+ default:
+ return NULL;
Modified: unstable/kq/debian/patches/series
===================================================================
--- unstable/kq/debian/patches/series 2006-05-23 12:44:54 UTC (rev 16)
+++ unstable/kq/debian/patches/series 2006-05-27 22:38:58 UTC (rev 17)
@@ -1,2 +1,5 @@
-010_luac50.diff -p1
-020_misc.diff -p1
+010_luac50.diff
+020_alternate_keys.diff
+020_cosmetic_credits.diff
+020_stretch_view.diff
+020_usr_share_games.diff
More information about the Pkg-allegro-commits
mailing list