The following commit has been merged in the master branch:
commit 8693dca810fcb5fb0ac026a6601cd5360e9c8394
Author: Damyan Ivanov <[EMAIL PROTECTED]>
Date: Wed Jun 25 10:13:05 2008 +0300
Move changes to graphics/window.* and kobo.cpp into separate patches
diff --git a/debian/patches/01_graphics_window-signed-char.patch
b/debian/patches/01_graphics_window-signed-char.patch
new file mode 100644
index 0000000..9251575
--- /dev/null
+++ b/debian/patches/01_graphics_window-signed-char.patch
@@ -0,0 +1,35 @@
+--- kobodeluxe-0.5.1.orig/graphics/window.cpp
++++ kobodeluxe-0.5.1/graphics/window.cpp
+@@ -331,7 +331,7 @@
+ }
+
+
+-void window_t::center_token(int _x, int _y, const char *txt, char token)
++void window_t::center_token(int _x, int _y, const char *txt, signed char
token)
+ {
+ center_token_fxp(PIXEL2CS(_x), PIXEL2CS(_y), txt, token);
+ }
+@@ -374,7 +374,7 @@
+ }
+
+
+-void window_t::center_token_fxp(int _x, int _y, const char *txt, char token)
++void window_t::center_token_fxp(int _x, int _y, const char *txt, signed char
token)
+ {
+ _x = CS2PIXEL((_x * xs + 128) >> 8);
+ _y = CS2PIXEL((_y * ys + 128) >> 8);
+--- kobodeluxe-0.5.1.orig/graphics/window.h
++++ kobodeluxe-0.5.1/graphics/window.h
+@@ -265,10 +265,10 @@
+ void font(int fnt);
+ void string(int _x, int _y, const char *txt);
+ void center(int _y, const char *txt);
+- void center_token(int _x, int _y, const char *txt, char token = 0);
++ void center_token(int _x, int _y, const char *txt, signed char token =
0);
+ void string_fxp(int _x, int _y, const char *txt);
+ void center_fxp(int _y, const char *txt);
+- void center_token_fxp(int _x, int _y, const char *txt, char token = 0);
++ void center_token_fxp(int _x, int _y, const char *txt, signed char
token = 0);
+ int textwidth(const char *txt, int min = 0, int max = 255);
+ int textwidth_fxp(const char *txt, int min = 0, int max = 255);
+ int fontheight();
diff --git a/debian/patches/02_paths.patch b/debian/patches/02_paths.patch
new file mode 100644
index 0000000..09fef36
--- /dev/null
+++ b/debian/patches/02_paths.patch
@@ -0,0 +1,37 @@
+--- kobodeluxe-0.5.1.orig/kobo.cpp
++++ kobodeluxe-0.5.1/kobo.cpp
+@@ -141,21 +141,21 @@
+ * Graphics data
+ */
+ /* Current dir; from within the build tree */
+- fmap->addpath("GFX", "./data/gfx");
++ //fmap->addpath("GFX", "./data/gfx");
+ /* Real data dir */
+ fmap->addpath("GFX", "DATA>>gfx");
+ /* Current dir */
+- fmap->addpath("GFX", "./gfx");
++ //fmap->addpath("GFX", "./gfx");
+
+ /*
+ * Sound data
+ */
+ /* Current dir; from within the build tree */
+- fmap->addpath("SFX", "./data/sfx");
++ //fmap->addpath("SFX", "./data/sfx");
+ /* Real data dir */
+ fmap->addpath("SFX", "DATA>>sfx");
+ /* Current dir */
+- fmap->addpath("SFX", "./sfx");
++ //fmap->addpath("SFX", "./sfx");
+
+ /*
+ * Score files (user and global)
+@@ -173,7 +173,7 @@
+ /* System local */
+ fmap->addpath("CONFIG", SYSCONF_DIR);
+ /* In current dir (last resort) */
+- fmap->addpath("CONFIG", "./");
++ //fmap->addpath("CONFIG", "./");
+ }
+
+
diff --git a/graphics/window.cpp b/graphics/window.cpp
index 1db81a9..9a889c7 100644
--- a/graphics/window.cpp
+++ b/graphics/window.cpp
@@ -331,7 +331,7 @@ void window_t::center(int _y, const char *txt)
}
-void window_t::center_token(int _x, int _y, const char *txt, signed char token)
+void window_t::center_token(int _x, int _y, const char *txt, char token)
{
center_token_fxp(PIXEL2CS(_x), PIXEL2CS(_y), txt, token);
}
@@ -374,7 +374,7 @@ void window_t::center_fxp(int _y, const char *txt)
}
-void window_t::center_token_fxp(int _x, int _y, const char *txt, signed char
token)
+void window_t::center_token_fxp(int _x, int _y, const char *txt, char token)
{
_x = CS2PIXEL((_x * xs + 128) >> 8);
_y = CS2PIXEL((_y * ys + 128) >> 8);
diff --git a/graphics/window.h b/graphics/window.h
index 1f100d5..702ec1d 100644
--- a/graphics/window.h
+++ b/graphics/window.h
@@ -265,10 +265,10 @@ class window_t
void font(int fnt);
void string(int _x, int _y, const char *txt);
void center(int _y, const char *txt);
- void center_token(int _x, int _y, const char *txt, signed char token =
0);
+ void center_token(int _x, int _y, const char *txt, char token = 0);
void string_fxp(int _x, int _y, const char *txt);
void center_fxp(int _y, const char *txt);
- void center_token_fxp(int _x, int _y, const char *txt, signed char
token = 0);
+ void center_token_fxp(int _x, int _y, const char *txt, char token = 0);
int textwidth(const char *txt, int min = 0, int max = 255);
int textwidth_fxp(const char *txt, int min = 0, int max = 255);
int fontheight();
diff --git a/kobo.cpp b/kobo.cpp
index 5994a85..5ae1baa 100644
--- a/kobo.cpp
+++ b/kobo.cpp
@@ -141,21 +141,21 @@ static void setup_dirs(char *xpath)
* Graphics data
*/
/* Current dir; from within the build tree */
- //fmap->addpath("GFX", "./data/gfx");
+ fmap->addpath("GFX", "./data/gfx");
/* Real data dir */
fmap->addpath("GFX", "DATA>>gfx");
/* Current dir */
- //fmap->addpath("GFX", "./gfx");
+ fmap->addpath("GFX", "./gfx");
/*
* Sound data
*/
/* Current dir; from within the build tree */
- //fmap->addpath("SFX", "./data/sfx");
+ fmap->addpath("SFX", "./data/sfx");
/* Real data dir */
fmap->addpath("SFX", "DATA>>sfx");
/* Current dir */
- //fmap->addpath("SFX", "./sfx");
+ fmap->addpath("SFX", "./sfx");
/*
* Score files (user and global)
@@ -173,7 +173,7 @@ static void setup_dirs(char *xpath)
/* System local */
fmap->addpath("CONFIG", SYSCONF_DIR);
/* In current dir (last resort) */
- //fmap->addpath("CONFIG", "./");
+ fmap->addpath("CONFIG", "./");
}
--
Packaging of kobodeluxe
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
