r4467 - in packages/trunk/excellent-bifurcation/debian: . patches
Miriam Ruiz
baby-guest at alioth.debian.org
Fri Oct 26 16:23:47 UTC 2007
Author: baby-guest
Date: 2007-10-26 16:23:46 +0000 (Fri, 26 Oct 2007)
New Revision: 4467
Modified:
packages/trunk/excellent-bifurcation/debian/patches/directories.patch
packages/trunk/excellent-bifurcation/debian/rules
Log:
Removed segfault when loading wavs due to the long name
Modified: packages/trunk/excellent-bifurcation/debian/patches/directories.patch
===================================================================
--- packages/trunk/excellent-bifurcation/debian/patches/directories.patch 2007-10-26 03:47:38 UTC (rev 4466)
+++ packages/trunk/excellent-bifurcation/debian/patches/directories.patch 2007-10-26 16:23:46 UTC (rev 4467)
@@ -3,14 +3,14 @@
Index: excellent-bifurcation-0.0.20071015/src/display_init.c
===================================================================
---- excellent-bifurcation-0.0.20071015.orig/src/display_init.c 2007-10-23 09:51:20.000000000 +0000
-+++ excellent-bifurcation-0.0.20071015/src/display_init.c 2007-10-23 09:55:31.000000000 +0000
+--- excellent-bifurcation-0.0.20071015.orig/src/display_init.c 2007-10-26 16:19:38.000000000 +0000
++++ excellent-bifurcation-0.0.20071015/src/display_init.c 2007-10-26 16:19:46.000000000 +0000
@@ -169,7 +169,7 @@
set_clip_rect(display[1], 0, 0, 320, 480);
- DATAFILE *datf = load_datafile("gfx//ebdata.dat");
-+ DATAFILE *datf = load_datafile(DATA_DIR "//gfx//ebdata.dat");
++ DATAFILE *datf = load_datafile(DATA_DIR "/gfx/ebdata.dat");
if (datf == NULL)
{
set_gfx_mode(GFX_TEXT, 0, 0, 0, 0);
@@ -19,7 +19,7 @@
destroy_bitmap(check_pattern2);
- BITMAP *file_bitmap = load_up_bitmap("gfx//explodes.bmp");
-+ BITMAP *file_bitmap = load_up_bitmap(DATA_DIR "//gfx//explodes.bmp");
++ BITMAP *file_bitmap = load_up_bitmap(DATA_DIR "/gfx/explodes.bmp");
fix_trans(file_bitmap);
@@ -28,7 +28,7 @@
- BITMAP *file_bitmap = load_up_bitmap("gfx//player.bmp");
-+ BITMAP *file_bitmap = load_up_bitmap(DATA_DIR "//gfx//player.bmp");
++ BITMAP *file_bitmap = load_up_bitmap(DATA_DIR "/gfx/player.bmp");
BITMAP *temp_bitmap1 = new_bitmap(37, 30, "Prepare player_rles temp_bitmap1");
// BITMAP *temp_bitmap2 = new_bitmap(14, 14, "Prepare player_res temp_bitmap2");
@@ -37,7 +37,7 @@
- BITMAP *file_bitmap = load_up_bitmap("gfx//platform.bmp");
-+ BITMAP *file_bitmap = load_up_bitmap(DATA_DIR "//gfx//platform.bmp");
++ BITMAP *file_bitmap = load_up_bitmap(DATA_DIR "/gfx/platform.bmp");
fix_outline(file_bitmap);
@@ -46,7 +46,7 @@
- BITMAP *file_bitmap = load_up_bitmap("gfx//s_enemy.bmp");
-+ BITMAP *file_bitmap = load_up_bitmap(DATA_DIR "//gfx//s_enemy.bmp");
++ BITMAP *file_bitmap = load_up_bitmap(DATA_DIR "/gfx/s_enemy.bmp");
fix_outline(file_bitmap);
@@ -55,7 +55,7 @@
- BITMAP *file_bitmap = load_up_bitmap("gfx//l_enemy.bmp");
-+ BITMAP *file_bitmap = load_up_bitmap(DATA_DIR "//gfx//l_enemy.bmp");
++ BITMAP *file_bitmap = load_up_bitmap(DATA_DIR "/gfx/l_enemy.bmp");
fix_outline(file_bitmap);
@@ -64,7 +64,7 @@
{
- BITMAP *file_bitmap = load_up_bitmap("gfx//little.bmp");
-+ BITMAP *file_bitmap = load_up_bitmap(DATA_DIR "//gfx//little.bmp");
++ BITMAP *file_bitmap = load_up_bitmap(DATA_DIR "/gfx/little.bmp");
fix_trans(file_bitmap);
@@ -73,7 +73,7 @@
- BITMAP *file_bitmap = load_up_bitmap("gfx//elarge.bmp");
-+ BITMAP *file_bitmap = load_up_bitmap(DATA_DIR "//gfx//elarge.bmp");
++ BITMAP *file_bitmap = load_up_bitmap(DATA_DIR "/gfx/elarge.bmp");
BITMAP *temp_bitmap1 = new_bitmap(100, 100, "Prepare enemy_rles temp_bitmap1");
@@ -82,7 +82,7 @@
clear_to_color(underlay, COL_LOWER_BG1);
- BITMAP *temp_bitmap = load_up_bitmap("gfx//underlay.bmp");
-+ BITMAP *temp_bitmap = load_up_bitmap(DATA_DIR "//gfx//underlay.bmp");
++ BITMAP *temp_bitmap = load_up_bitmap(DATA_DIR "/gfx/underlay.bmp");
blit(temp_bitmap, underlay, 0, 0, 0, 0, 320, 480);
blit(temp_bitmap, underlay, 0, 0, 0, 480, 320, 480);
@@ -91,7 +91,7 @@
clear_to_color(underlay2, COL_LOWER_BG1);
- temp_bitmap = load_up_bitmap("gfx//underlay2.bmp");
-+ temp_bitmap = load_up_bitmap(DATA_DIR "//gfx//underlay2.bmp");
++ temp_bitmap = load_up_bitmap(DATA_DIR "/gfx/underlay2.bmp");
blit(temp_bitmap, underlay2, 0, 0, 0, 0, 320, 480);
blit(temp_bitmap, underlay2, 0, 0, 0, 480, 320, 480);
@@ -100,20 +100,20 @@
/* palet [7].r = 1;
set_palette(palet);*/
- BITMAP *file_bitmap = load_up_bitmap("gfx//small.bmp");
-+ BITMAP *file_bitmap = load_up_bitmap(DATA_DIR "//gfx//small.bmp");
++ BITMAP *file_bitmap = load_up_bitmap(DATA_DIR "/gfx/small.bmp");
/* palet [7].r = 0x8d;
set_palette(palet);*/
Index: excellent-bifurcation-0.0.20071015/src/menu.c
===================================================================
---- excellent-bifurcation-0.0.20071015.orig/src/menu.c 2007-10-23 09:51:20.000000000 +0000
-+++ excellent-bifurcation-0.0.20071015/src/menu.c 2007-10-23 09:54:12.000000000 +0000
+--- excellent-bifurcation-0.0.20071015.orig/src/menu.c 2007-10-26 16:19:38.000000000 +0000
++++ excellent-bifurcation-0.0.20071015/src/menu.c 2007-10-26 16:19:46.000000000 +0000
@@ -371,7 +371,7 @@
void loading_screen(void)
{
-/* splash_bitmap = load_bitmap("gfx//splash.bmp", splash_palette);
-+/* splash_bitmap = load_bitmap(DATA_DIR "//gfx//splash.bmp", splash_palette);
++/* splash_bitmap = load_bitmap(DATA_DIR "/gfx/splash.bmp", splash_palette);
if (splash_bitmap == NULL)
{
@@ -122,7 +122,7 @@
clear_bitmap(screen);
- BITMAP *wait_bitmap = load_bitmap("gfx//wait.bmp", splash_palette);
-+ BITMAP *wait_bitmap = load_bitmap(DATA_DIR "//gfx//wait.bmp", splash_palette);
++ BITMAP *wait_bitmap = load_bitmap(DATA_DIR "/gfx/wait.bmp", splash_palette);
if (wait_bitmap == NULL)
{
@@ -131,29 +131,41 @@
{
/*
- BITMAP *press_bitmap = load_bitmap("gfx//press.bmp", splash_palette);
-+ BITMAP *press_bitmap = load_bitmap(DATA_DIR "//gfx//press.bmp", splash_palette);
++ BITMAP *press_bitmap = load_bitmap(DATA_DIR "/gfx/press.bmp", splash_palette);
if (press_bitmap == NULL)
{
Index: excellent-bifurcation-0.0.20071015/src/sound.c
===================================================================
---- excellent-bifurcation-0.0.20071015.orig/src/sound.c 2007-10-23 09:51:20.000000000 +0000
-+++ excellent-bifurcation-0.0.20071015/src/sound.c 2007-10-23 09:52:37.000000000 +0000
-@@ -1072,7 +1072,7 @@
+--- excellent-bifurcation-0.0.20071015.orig/src/sound.c 2007-10-26 16:19:38.000000000 +0000
++++ excellent-bifurcation-0.0.20071015/src/sound.c 2007-10-26 16:21:04.000000000 +0000
+@@ -45,6 +45,8 @@
+ #include "math.h"
+ #include "stuff.h"
- char sfile_name [50];
++#include <limits.h>
++
+ //int debug_sound [5];
+
+@@ -1070,9 +1072,9 @@
+ void load_new_sample_in(int samp, const char *sfile)
+ {
+
+- char sfile_name [50];
++ char sfile_name [PATH_MAX];
+
- strcpy(sfile_name, ".//wavs//");
-+ strcpy(sfile_name, DATA_DIR "//wavs//");
++ strcpy(sfile_name, DATA_DIR "/wavs/");
strcat(sfile_name, sfile);
strcat(sfile_name, ".wav");
-@@ -1091,7 +1091,7 @@
+@@ -1091,7 +1093,7 @@
char sfile_name [50];
- strcpy(sfile_name, ".//wavs//ambi//");
-+ strcpy(sfile_name, DATA_DIR "//wavs//ambi//");
++ strcpy(sfile_name, DATA_DIR "/wavs/ambi/");
strcat(sfile_name, sfile);
strcat(sfile_name, ".wav");
Modified: packages/trunk/excellent-bifurcation/debian/rules
===================================================================
--- packages/trunk/excellent-bifurcation/debian/rules 2007-10-26 03:47:38 UTC (rev 4466)
+++ packages/trunk/excellent-bifurcation/debian/rules 2007-10-26 16:23:46 UTC (rev 4467)
@@ -3,7 +3,7 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-CFLAGS = -Wall -g
+CFLAGS = -Wall -ggdb
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
@@ -51,7 +51,7 @@
# dh_installmenu
dh_installman
dh_link
- dh_strip
+# dh_strip
dh_compress
dh_fixperms
test -e /usr/bin/dh_buildinfo && dh_buildinfo
More information about the Pkg-games-commits
mailing list