[fenix] 48/127: Updated patches Corrected endianess FTBFS problem
Peter Pentchev
roam at ringlet.net
Thu Dec 17 14:39:34 UTC 2015
This is an automated email from the git hooks/post-receive script.
roam-guest pushed a commit to branch master
in repository fenix.
commit 7e952d788eee65a84edf49bd66923066a799bbff
Author: Miriam Ruiz <miriam at debian.org>
Date: Tue Aug 28 13:09:22 2007 +0000
Updated patches
Corrected endianess FTBFS problem
---
debian/patches/0.92a_to_cvs-20070713.1513.patch | 721 +++++++++++++-----------
debian/patches/common_stdfiles.patch | 13 +-
debian/patches/configure.patch | 14 +-
debian/patches/endianess.patch | 15 +
debian/patches/fxc_nosdlinit.patch | 6 +-
debian/patches/fxc_output.patch | 12 +-
debian/patches/fxc_return_values.patch | 7 +-
debian/patches/fxdll_version.patch | 42 +-
debian/patches/fxi_apptitle.patch | 10 +-
debian/patches/fxi_binname.patch | 10 +-
debian/patches/fxi_input.patch | 16 +-
debian/patches/fxi_return_values.patch | 11 +-
debian/patches/i18n_fpg.patch | 7 +-
debian/patches/i18n_fxc.patch | 91 +--
debian/patches/i18n_fxi.patch | 196 ++++---
debian/patches/i18n_map.patch | 7 +-
debian/patches/plugins_dir.patch | 36 +-
debian/patches/series | 1 +
18 files changed, 669 insertions(+), 546 deletions(-)
diff --git a/debian/patches/0.92a_to_cvs-20070713.1513.patch b/debian/patches/0.92a_to_cvs-20070713.1513.patch
index 5ff19e1..7caef17 100644
--- a/debian/patches/0.92a_to_cvs-20070713.1513.patch
+++ b/debian/patches/0.92a_to_cvs-20070713.1513.patch
@@ -1,6 +1,7 @@
-diff -ruN fenix-0.92/common/files.c fenix-0.92+cvs20070713.1513/common/files.c
---- fenix-0.92/common/files.c 2007-07-13 15:40:59.000000000 +0000
-+++ fenix-0.92+cvs20070713.1513/common/files.c 2007-07-13 20:31:37.000000000 +0000
+Index: fenix-0.92a.dfsg1/common/files.c
+===================================================================
+--- fenix-0.92a.dfsg1.orig/common/files.c 2007-08-28 14:40:08.000000000 +0200
++++ fenix-0.92a.dfsg1/common/files.c 2007-08-28 14:41:08.000000000 +0200
@@ -120,7 +120,7 @@
/* Guarda una cadena "cuoteada" al disco */
@@ -83,9 +84,10 @@ diff -ruN fenix-0.92/common/files.c fenix-0.92+cvs20070713.1513/common/files.c
/* Escribe en un fichero binario un dato de tipo entero */
int file_writeSint8 (file * fp, Sint8 * buffer)
-diff -ruN fenix-0.92/configure fenix-0.92+cvs20070713.1513/configure
---- fenix-0.92/configure 2007-07-13 15:40:19.000000000 +0000
-+++ fenix-0.92+cvs20070713.1513/configure 2007-07-13 20:31:37.000000000 +0000
+Index: fenix-0.92a.dfsg1/configure
+===================================================================
+--- fenix-0.92a.dfsg1.orig/configure 2007-08-28 14:39:47.000000000 +0200
++++ fenix-0.92a.dfsg1/configure 2007-08-28 14:41:08.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
@@ -168,18 +170,20 @@ diff -ruN fenix-0.92/configure fenix-0.92+cvs20070713.1513/configure
configured by $0, generated by GNU Autoconf 2.56,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
-diff -ruN fenix-0.92/configure.in fenix-0.92+cvs20070713.1513/configure.in
---- fenix-0.92/configure.in 2007-07-13 15:40:19.000000000 +0000
-+++ fenix-0.92+cvs20070713.1513/configure.in 2007-07-13 20:31:37.000000000 +0000
+Index: fenix-0.92a.dfsg1/configure.in
+===================================================================
+--- fenix-0.92a.dfsg1.orig/configure.in 2007-08-28 14:39:48.000000000 +0200
++++ fenix-0.92a.dfsg1/configure.in 2007-08-28 14:41:08.000000000 +0200
@@ -1,4 +1,4 @@
-AC_INIT(fenix,0.92a)
+AC_INIT(fenix,0.93)
AC_CANONICAL_SYSTEM
AC_ARG_PROGRAM
-diff -ruN fenix-0.92/fxc/src/c_code.c fenix-0.92+cvs20070713.1513/fxc/src/c_code.c
---- fenix-0.92/fxc/src/c_code.c 2007-04-12 22:08:14.000000000 +0000
-+++ fenix-0.92+cvs20070713.1513/fxc/src/c_code.c 2007-07-13 20:31:37.000000000 +0000
+Index: fenix-0.92a.dfsg1/fxc/src/c_code.c
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxc/src/c_code.c 2007-08-28 14:38:23.000000000 +0200
++++ fenix-0.92a.dfsg1/fxc/src/c_code.c 2007-08-28 14:41:09.000000000 +0200
@@ -58,7 +58,7 @@
{
if (typedef_is_pointer(exp->type))
@@ -476,7 +480,7 @@ diff -ruN fenix-0.92/fxc/src/c_code.c fenix-0.92+cvs20070713.1513/fxc/src/c_code
if (dcb_options & DCB_DEBUG) {
codeblock_add (code, MN_SENTENCE, line_count + (current_file << 24)) ;
}
-@@ -3370,7 +3394,7 @@
+@@ -3370,7 +3395,7 @@
if (token.type != IDENTIFIER || token.code != identifier_semicolon) /* ";" */
compile_error (MSG_EXPECTED, ";") ;
}
@@ -485,9 +489,10 @@ diff -ruN fenix-0.92/fxc/src/c_code.c fenix-0.92+cvs20070713.1513/fxc/src/c_code
codeblock_loop_end (code, loop, code->current) ;
continue ;
}
-diff -ruN fenix-0.92/fxc/src/c_debug.c fenix-0.92+cvs20070713.1513/fxc/src/c_debug.c
---- fenix-0.92/fxc/src/c_debug.c 2007-04-12 22:08:16.000000000 +0000
-+++ fenix-0.92+cvs20070713.1513/fxc/src/c_debug.c 2007-07-13 20:31:37.000000000 +0000
+Index: fenix-0.92a.dfsg1/fxc/src/c_debug.c
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxc/src/c_debug.c 2007-08-28 14:38:23.000000000 +0200
++++ fenix-0.92a.dfsg1/fxc/src/c_debug.c 2007-08-28 14:41:09.000000000 +0200
@@ -144,7 +144,7 @@
{ "STR2FLOAT", MN_STR2FLOAT, 1 },
{ "FLOAT2STR", MN_FLOAT2STR, 1 },
@@ -497,10 +502,11 @@ diff -ruN fenix-0.92/fxc/src/c_debug.c fenix-0.92+cvs20070713.1513/fxc/src/c_deb
{ "A2STR", MN_A2STR, 0 },
{ "STR2A", MN_STR2A, 0 },
-diff -ruN fenix-0.92/fxc/src/c_main.c fenix-0.92+cvs20070713.1513/fxc/src/c_main.c
---- fenix-0.92/fxc/src/c_main.c 2007-07-13 15:40:29.000000000 +0000
-+++ fenix-0.92+cvs20070713.1513/fxc/src/c_main.c 2007-07-13 20:31:37.000000000 +0000
-@@ -579,35 +579,35 @@
+Index: fenix-0.92a.dfsg1/fxc/src/c_main.c
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxc/src/c_main.c 2007-08-28 14:41:03.000000000 +0200
++++ fenix-0.92a.dfsg1/fxc/src/c_main.c 2007-08-28 14:41:09.000000000 +0200
+@@ -621,35 +621,35 @@
}
if (tcode == identifier_word){
@@ -541,7 +547,7 @@ diff -ruN fenix-0.92/fxc/src/c_main.c fenix-0.92+cvs20070713.1513/fxc/src/c_main
compile_error (MSG_PROTO_ERROR) ;
proc->type = unsigned_prefix ? TYPE_WORD : TYPE_SHORT;
signed_prefix = unsigned_prefix = 0;
-@@ -878,11 +878,10 @@
+@@ -920,11 +920,10 @@
los datos declarados aqu� tienen el mismo efecto que si son
declarados externamente y afectar�n a todos los procesos (Ya no va mas esto, ahora los datos locales son locales, Splinter) */
@@ -554,7 +560,7 @@ diff -ruN fenix-0.92/fxc/src/c_main.c fenix-0.92+cvs20070713.1513/fxc/src/c_main
{
/* (2006/11/19 19:34 GMT-03:00, Splinter - jj_arg at yahoo.com) */
/* Ahora las declaraciones locales, son solo locales al proceso, pero visibles desde todo proceso */
-@@ -898,7 +897,6 @@
+@@ -940,7 +939,6 @@
token_next () ;
}
@@ -562,9 +568,10 @@ diff -ruN fenix-0.92/fxc/src/c_main.c fenix-0.92+cvs20070713.1513/fxc/src/c_main
/* Gestiona procesos cuyos par�metros son variables locales */
-diff -ruN fenix-0.92/fxc/src/dcbw.c fenix-0.92+cvs20070713.1513/fxc/src/dcbw.c
---- fenix-0.92/fxc/src/dcbw.c 2007-07-13 15:40:29.000000000 +0000
-+++ fenix-0.92+cvs20070713.1513/fxc/src/dcbw.c 2007-07-13 20:31:37.000000000 +0000
+Index: fenix-0.92a.dfsg1/fxc/src/dcbw.c
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxc/src/dcbw.c 2007-08-28 14:39:51.000000000 +0200
++++ fenix-0.92a.dfsg1/fxc/src/dcbw.c 2007-08-28 14:41:09.000000000 +0200
@@ -74,11 +74,9 @@
if (!fp) return ;
while (!file_eof(fp))
@@ -580,9 +587,10 @@ diff -ruN fenix-0.92/fxc/src/dcbw.c fenix-0.92+cvs20070713.1513/fxc/src/dcbw.c
dcb_add_file(buffer) ;
}
file_close(fp) ;
-diff -ruN fenix-0.92/fxc/src/error.c fenix-0.92+cvs20070713.1513/fxc/src/error.c
---- fenix-0.92/fxc/src/error.c 2007-04-12 22:08:20.000000000 +0000
-+++ fenix-0.92+cvs20070713.1513/fxc/src/error.c 2007-07-13 20:31:37.000000000 +0000
+Index: fenix-0.92a.dfsg1/fxc/src/error.c
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxc/src/error.c 2007-08-28 14:38:23.000000000 +0200
++++ fenix-0.92a.dfsg1/fxc/src/error.c 2007-08-28 14:41:09.000000000 +0200
@@ -54,6 +54,7 @@
int size ;
char * msg = NULL ;
@@ -600,9 +608,10 @@ diff -ruN fenix-0.92/fxc/src/error.c fenix-0.92+cvs20070713.1513/fxc/src/error.c
// Check for multiline...
if (line[0]=='_') {
// must resize the string and concatenate
-diff -ruN fenix-0.92/fxc/src/main_div.c fenix-0.92+cvs20070713.1513/fxc/src/main_div.c
---- fenix-0.92/fxc/src/main_div.c 2007-04-12 22:08:20.000000000 +0000
-+++ fenix-0.92+cvs20070713.1513/fxc/src/main_div.c 2007-07-13 20:31:37.000000000 +0000
+Index: fenix-0.92a.dfsg1/fxc/src/main_div.c
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxc/src/main_div.c 2007-08-28 14:38:23.000000000 +0200
++++ fenix-0.92a.dfsg1/fxc/src/main_div.c 2007-08-28 14:41:10.000000000 +0200
@@ -183,6 +183,7 @@
" y ; \n"
" z ; \n"
@@ -625,9 +634,10 @@ diff -ruN fenix-0.92/fxc/src/main_div.c fenix-0.92+cvs20070713.1513/fxc/src/main
" angle ; \n"
" alpha ; \n"
" blendop ; \n"
-diff -ruN fenix-0.92/fxc/src/sysstub.c fenix-0.92+cvs20070713.1513/fxc/src/sysstub.c
---- fenix-0.92/fxc/src/sysstub.c 2007-04-12 22:08:22.000000000 +0000
-+++ fenix-0.92+cvs20070713.1513/fxc/src/sysstub.c 2007-07-13 20:31:37.000000000 +0000
+Index: fenix-0.92a.dfsg1/fxc/src/sysstub.c
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxc/src/sysstub.c 2007-08-28 14:38:24.000000000 +0200
++++ fenix-0.92a.dfsg1/fxc/src/sysstub.c 2007-08-28 14:41:10.000000000 +0200
@@ -76,8 +76,7 @@
last[1].next = NULL ;
last++ ;
@@ -671,9 +681,10 @@ diff -ruN fenix-0.92/fxc/src/sysstub.c fenix-0.92+cvs20070713.1513/fxc/src/sysst
table = malloc(sizeof(SYSPROC *) * 32) ;
do
-diff -ruN fenix-0.92/fxi/inc/fmath.h fenix-0.92+cvs20070713.1513/fxi/inc/fmath.h
---- fenix-0.92/fxi/inc/fmath.h 2007-04-12 22:08:26.000000000 +0000
-+++ fenix-0.92+cvs20070713.1513/fxi/inc/fmath.h 2007-07-13 20:31:37.000000000 +0000
+Index: fenix-0.92a.dfsg1/fxi/inc/fmath.h
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxi/inc/fmath.h 2007-08-28 14:38:24.000000000 +0200
++++ fenix-0.92a.dfsg1/fxi/inc/fmath.h 2007-08-28 14:41:10.000000000 +0200
@@ -24,15 +24,23 @@
*
*/
@@ -706,9 +717,10 @@ diff -ruN fenix-0.92/fxi/inc/fmath.h fenix-0.92+cvs20070713.1513/fxi/inc/fmath.h
}
+
+#endif
-diff -ruN fenix-0.92/fxi/inc/fxi.h fenix-0.92+cvs20070713.1513/fxi/inc/fxi.h
---- fenix-0.92/fxi/inc/fxi.h 2007-04-12 22:08:28.000000000 +0000
-+++ fenix-0.92+cvs20070713.1513/fxi/inc/fxi.h 2007-07-13 20:31:37.000000000 +0000
+Index: fenix-0.92a.dfsg1/fxi/inc/fxi.h
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxi/inc/fxi.h 2007-08-28 14:38:24.000000000 +0200
++++ fenix-0.92a.dfsg1/fxi/inc/fxi.h 2007-08-28 14:41:10.000000000 +0200
@@ -55,6 +55,8 @@
#include "files.h"
#include "xctype.h"
@@ -718,9 +730,10 @@ diff -ruN fenix-0.92/fxi/inc/fxi.h fenix-0.92+cvs20070713.1513/fxi/inc/fxi.h
/*
* CONSTANTS
*/
-diff -ruN fenix-0.92/fxi/inc/grlib.h fenix-0.92+cvs20070713.1513/fxi/inc/grlib.h
---- fenix-0.92/fxi/inc/grlib.h 2007-04-12 22:08:28.000000000 +0000
-+++ fenix-0.92+cvs20070713.1513/fxi/inc/grlib.h 2007-07-13 20:31:37.000000000 +0000
+Index: fenix-0.92a.dfsg1/fxi/inc/grlib.h
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxi/inc/grlib.h 2007-08-28 14:38:24.000000000 +0200
++++ fenix-0.92a.dfsg1/fxi/inc/grlib.h 2007-08-28 14:41:10.000000000 +0200
@@ -42,6 +42,8 @@
extern int enable_16bits ; /* 1 = 16bpp MODE on */
extern int enable_filtering ; /* 1 = 16bpp filter MODE on */
@@ -769,9 +782,10 @@ diff -ruN fenix-0.92/fxi/inc/grlib.h fenix-0.92+cvs20070713.1513/fxi/inc/grlib.h
/* Bitmaps */
extern void gr_blit (GRAPH * dest, REGION * clip, int x, int y, int flags, GRAPH * gr) ;
-diff -ruN fenix-0.92/fxi/inc/grlib_st.h fenix-0.92+cvs20070713.1513/fxi/inc/grlib_st.h
---- fenix-0.92/fxi/inc/grlib_st.h 2007-04-12 22:08:28.000000000 +0000
-+++ fenix-0.92+cvs20070713.1513/fxi/inc/grlib_st.h 2007-07-13 20:31:37.000000000 +0000
+Index: fenix-0.92a.dfsg1/fxi/inc/grlib_st.h
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxi/inc/grlib_st.h 2007-08-28 14:38:24.000000000 +0200
++++ fenix-0.92a.dfsg1/fxi/inc/grlib_st.h 2007-08-28 14:41:11.000000000 +0200
@@ -95,6 +95,16 @@
}
CPOINT ;
@@ -798,9 +812,10 @@ diff -ruN fenix-0.92/fxi/inc/grlib_st.h fenix-0.92+cvs20070713.1513/fxi/inc/grli
Sint16 * blend_table ; /* Pointer to 16 bits blend table if any */
int modified ; /* 1 if bitmap needs analysis */
-diff -ruN fenix-0.92/fxi/inc/instance_st.h fenix-0.92+cvs20070713.1513/fxi/inc/instance_st.h
---- fenix-0.92/fxi/inc/instance_st.h 2007-04-12 22:08:28.000000000 +0000
-+++ fenix-0.92+cvs20070713.1513/fxi/inc/instance_st.h 2007-07-13 20:31:37.000000000 +0000
+Index: fenix-0.92a.dfsg1/fxi/inc/instance_st.h
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxi/inc/instance_st.h 2007-08-28 14:38:24.000000000 +0200
++++ fenix-0.92a.dfsg1/fxi/inc/instance_st.h 2007-08-28 14:41:11.000000000 +0200
@@ -27,6 +27,10 @@
#ifndef __INSTANCE_ST_H
#define __INSTANCE_ST_H
@@ -840,9 +855,10 @@ diff -ruN fenix-0.92/fxi/inc/instance_st.h fenix-0.92+cvs20070713.1513/fxi/inc/i
/* Macros para acceder a datos locales o privados de una instancia */
#define LOCDWORD(a,b) ( *(Sint32 *) ((Uint8 *)(a->locdata)+b) )
#define LOCWORD(a,b) ( *(Uint16 *) ((Uint8 *)(a->locdata)+b) )
-diff -ruN fenix-0.92/fxi/src/Be_compat/be_compat.cpp fenix-0.92+cvs20070713.1513/fxi/src/Be_compat/be_compat.cpp
---- fenix-0.92/fxi/src/Be_compat/be_compat.cpp 1970-01-01 00:00:00.000000000 +0000
-+++ fenix-0.92+cvs20070713.1513/fxi/src/Be_compat/be_compat.cpp 2007-07-13 20:31:37.000000000 +0000
+Index: fenix-0.92a.dfsg1/fxi/src/Be_compat/be_compat.cpp
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ fenix-0.92a.dfsg1/fxi/src/Be_compat/be_compat.cpp 2007-08-28 14:41:11.000000000 +0200
@@ -0,0 +1,29 @@
+/*-------------------------------------------------------------------------------------------------------
+Copyright (c) 2003 Joseba García Etxebarria, under the GPL, as described
@@ -873,24 +889,27 @@ diff -ruN fenix-0.92/fxi/src/Be_compat/be_compat.cpp fenix-0.92+cvs20070713.1513
+ alert_p -> Go();
+ free (error_msg);
+}
-diff -ruN fenix-0.92/fxi/src/Be_compat/be_compat.h fenix-0.92+cvs20070713.1513/fxi/src/Be_compat/be_compat.h
---- fenix-0.92/fxi/src/Be_compat/be_compat.h 1970-01-01 00:00:00.000000000 +0000
-+++ fenix-0.92+cvs20070713.1513/fxi/src/Be_compat/be_compat.h 2007-07-13 20:31:37.000000000 +0000
+Index: fenix-0.92a.dfsg1/fxi/src/Be_compat/be_compat.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ fenix-0.92a.dfsg1/fxi/src/Be_compat/be_compat.h 2007-08-28 14:41:11.000000000 +0200
@@ -0,0 +1,5 @@
+#ifndef _BE_COMPAT_H
+#define _BE_COMPAT_H
+
+void be_alert (const char *error);
+#endif
-diff -ruN fenix-0.92/fxi/src/Be_compat/libbe_compat.proj fenix-0.92+cvs20070713.1513/fxi/src/Be_compat/libbe_compat.proj
---- fenix-0.92/fxi/src/Be_compat/libbe_compat.proj 1970-01-01 00:00:00.000000000 +0000
-+++ fenix-0.92+cvs20070713.1513/fxi/src/Be_compat/libbe_compat.proj 2007-07-13 20:31:37.000000000 +0000
+Index: fenix-0.92a.dfsg1/fxi/src/Be_compat/libbe_compat.proj
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ fenix-0.92a.dfsg1/fxi/src/Be_compat/libbe_compat.proj 2007-08-28 14:41:11.000000000 +0200
@@ -0,0 +1 @@
+MIDE
\ No newline at end of file
-diff -ruN fenix-0.92/fxi/src/dcbr.c fenix-0.92+cvs20070713.1513/fxi/src/dcbr.c
---- fenix-0.92/fxi/src/dcbr.c 2007-07-13 15:40:26.000000000 +0000
-+++ fenix-0.92+cvs20070713.1513/fxi/src/dcbr.c 2007-07-13 20:31:37.000000000 +0000
+Index: fenix-0.92a.dfsg1/fxi/src/dcbr.c
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxi/src/dcbr.c 2007-08-28 14:40:57.000000000 +0200
++++ fenix-0.92a.dfsg1/fxi/src/dcbr.c 2007-08-28 14:41:11.000000000 +0200
@@ -124,7 +124,7 @@
while (!file_eof(fp))
@@ -900,9 +919,10 @@ diff -ruN fenix-0.92/fxi/src/dcbr.c fenix-0.92+cvs20070713.1513/fxi/src/dcbr.c
trim(line);
if (allocated == count)
{
-diff -ruN fenix-0.92/fxi/src/fbm.c fenix-0.92+cvs20070713.1513/fxi/src/fbm.c
---- fenix-0.92/fxi/src/fbm.c 2007-07-13 15:40:26.000000000 +0000
-+++ fenix-0.92+cvs20070713.1513/fxi/src/fbm.c 2007-07-13 20:39:59.000000000 +0000
+Index: fenix-0.92a.dfsg1/fxi/src/fbm.c
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxi/src/fbm.c 2007-08-28 14:39:54.000000000 +0200
++++ fenix-0.92a.dfsg1/fxi/src/fbm.c 2007-08-28 14:41:11.000000000 +0200
@@ -87,6 +87,46 @@
}
}
@@ -1017,7 +1037,7 @@ diff -ruN fenix-0.92/fxi/src/fbm.c fenix-0.92+cvs20070713.1513/fxi/src/fbm.c
else
{
if (sequences) free(sequences);
-@@ -396,6 +436,7 @@
+@@ -396,6 +435,7 @@
static char color_palette[768];
char * data_copy = NULL;
char * data = NULL;
@@ -1025,7 +1045,7 @@ diff -ruN fenix-0.92/fxi/src/fbm.c fenix-0.92+cvs20070713.1513/fxi/src/fbm.c
// Prepare the header
-@@ -446,11 +487,13 @@
+@@ -446,11 +486,13 @@
if (map->depth == 8 && with_palette)
{
@@ -1054,9 +1074,10 @@ diff -ruN fenix-0.92/fxi/src/fbm.c fenix-0.92+cvs20070713.1513/fxi/src/fbm.c
if (map->depth == 16)
{
-diff -ruN fenix-0.92/fxi/src/f_cd.c fenix-0.92+cvs20070713.1513/fxi/src/f_cd.c
---- fenix-0.92/fxi/src/f_cd.c 2007-04-12 22:08:30.000000000 +0000
-+++ fenix-0.92+cvs20070713.1513/fxi/src/f_cd.c 2007-07-13 20:31:37.000000000 +0000
+Index: fenix-0.92a.dfsg1/fxi/src/f_cd.c
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxi/src/f_cd.c 2007-08-28 14:38:24.000000000 +0200
++++ fenix-0.92a.dfsg1/fxi/src/f_cd.c 2007-08-28 14:41:11.000000000 +0200
@@ -105,11 +105,11 @@
GLODWORD(CD_TRACK) = sdl_cd->cur_track;
FRAMES_TO_MSF (sdl_cd->cur_frame, &GLODWORD(CD_MINUTE), &GLODWORD(CD_SECOND), &GLODWORD(CD_SUBFRAME));
@@ -1086,9 +1107,10 @@ diff -ruN fenix-0.92/fxi/src/f_cd.c fenix-0.92+cvs20070713.1513/fxi/src/f_cd.c
}
+*/
-diff -ruN fenix-0.92/fxi/src/fgc.c fenix-0.92+cvs20070713.1513/fxi/src/fgc.c
---- fenix-0.92/fxi/src/fgc.c 2007-07-13 15:40:26.000000000 +0000
-+++ fenix-0.92+cvs20070713.1513/fxi/src/fgc.c 2007-07-13 20:39:18.000000000 +0000
+Index: fenix-0.92a.dfsg1/fxi/src/fgc.c
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxi/src/fgc.c 2007-08-28 14:39:54.000000000 +0200
++++ fenix-0.92a.dfsg1/fxi/src/fgc.c 2007-08-28 14:41:11.000000000 +0200
@@ -75,6 +75,7 @@
FGC_HEADER header;
Uint32 * offsets;
@@ -1222,9 +1244,10 @@ diff -ruN fenix-0.92/fxi/src/fgc.c fenix-0.92+cvs20070713.1513/fxi/src/fgc.c
assert (file_pos(fp) == (int)offsets[n]);
if (!fbm_save_to (lib->maps[i], fp, 0))
-diff -ruN fenix-0.92/fxi/src/fnc_exports.c fenix-0.92+cvs20070713.1513/fxi/src/fnc_exports.c
---- fenix-0.92/fxi/src/fnc_exports.c 2007-07-13 15:40:26.000000000 +0000
-+++ fenix-0.92+cvs20070713.1513/fxi/src/fnc_exports.c 2007-07-13 20:31:37.000000000 +0000
+Index: fenix-0.92a.dfsg1/fxi/src/fnc_exports.c
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxi/src/fnc_exports.c 2007-08-28 14:39:54.000000000 +0200
++++ fenix-0.92a.dfsg1/fxi/src/fnc_exports.c 2007-08-28 14:41:12.000000000 +0200
@@ -72,6 +72,8 @@
{ "file_write" , file_write },
{ "file_gets" , file_gets },
@@ -1234,9 +1257,10 @@ diff -ruN fenix-0.92/fxi/src/fnc_exports.c fenix-0.92+cvs20070713.1513/fxi/src/f
{ "file_size" , file_size },
{ "file_pos" , file_pos },
{ "file_seek" , file_seek },
-diff -ruN fenix-0.92/fxi/src/fpl.c fenix-0.92+cvs20070713.1513/fxi/src/fpl.c
---- fenix-0.92/fxi/src/fpl.c 2007-07-13 15:40:26.000000000 +0000
-+++ fenix-0.92+cvs20070713.1513/fxi/src/fpl.c 2007-07-13 20:31:37.000000000 +0000
+Index: fenix-0.92a.dfsg1/fxi/src/fpl.c
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxi/src/fpl.c 2007-08-28 14:39:55.000000000 +0200
++++ fenix-0.92a.dfsg1/fxi/src/fpl.c 2007-08-28 14:44:03.000000000 +0200
@@ -100,7 +100,7 @@
}
@@ -1255,9 +1279,10 @@ diff -ruN fenix-0.92/fxi/src/fpl.c fenix-0.92+cvs20070713.1513/fxi/src/fpl.c
color_palette[3*n + 1] = palette[n].g;
color_palette[3*n + 2] = palette[n].b;
}
-diff -ruN fenix-0.92/fxi/src/g_blendop.c fenix-0.92+cvs20070713.1513/fxi/src/g_blendop.c
---- fenix-0.92/fxi/src/g_blendop.c 2007-04-12 22:08:34.000000000 +0000
-+++ fenix-0.92+cvs20070713.1513/fxi/src/g_blendop.c 2007-07-13 20:31:37.000000000 +0000
+Index: fenix-0.92a.dfsg1/fxi/src/g_blendop.c
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxi/src/g_blendop.c 2007-08-28 14:38:25.000000000 +0200
++++ fenix-0.92a.dfsg1/fxi/src/g_blendop.c 2007-08-28 14:41:12.000000000 +0200
@@ -323,8 +323,8 @@
r = GETR(i);
g = GETG(i);
@@ -1278,9 +1303,10 @@ diff -ruN fenix-0.92/fxi/src/g_blendop.c fenix-0.92+cvs20070713.1513/fxi/src/g_b
blend[i] = MAKERGB(max, max, max) ;
}
}
-diff -ruN fenix-0.92/fxi/src/g_blit.c fenix-0.92+cvs20070713.1513/fxi/src/g_blit.c
---- fenix-0.92/fxi/src/g_blit.c 2007-07-13 15:40:26.000000000 +0000
-+++ fenix-0.92+cvs20070713.1513/fxi/src/g_blit.c 2007-07-13 20:31:37.000000000 +0000
+Index: fenix-0.92a.dfsg1/fxi/src/g_blit.c
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxi/src/g_blit.c 2007-08-28 14:39:55.000000000 +0200
++++ fenix-0.92a.dfsg1/fxi/src/g_blit.c 2007-08-28 14:41:12.000000000 +0200
@@ -96,6 +96,8 @@
Sint16 * ghost2;
Uint8 * ghost8;
@@ -1525,9 +1551,10 @@ diff -ruN fenix-0.92/fxi/src/g_blit.c fenix-0.92+cvs20070713.1513/fxi/src/g_blit
dest->modified = 1 ;
}
-diff -ruN fenix-0.92/fxi/src/g_console.c fenix-0.92+cvs20070713.1513/fxi/src/g_console.c
---- fenix-0.92/fxi/src/g_console.c 2007-07-13 15:40:26.000000000 +0000
-+++ fenix-0.92+cvs20070713.1513/fxi/src/g_console.c 2007-07-13 20:31:37.000000000 +0000
+Index: fenix-0.92a.dfsg1/fxi/src/g_console.c
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxi/src/g_console.c 2007-08-28 14:39:56.000000000 +0200
++++ fenix-0.92a.dfsg1/fxi/src/g_console.c 2007-08-28 14:41:12.000000000 +0200
@@ -53,9 +53,9 @@
#define CHARHEIGHT 8
@@ -1701,9 +1728,10 @@ diff -ruN fenix-0.92/fxi/src/g_console.c fenix-0.92+cvs20070713.1513/fxi/src/g_c
{
char act=*action;
i = findproc(NULL, action, ptr);
-diff -ruN fenix-0.92/fxi/src/g_conversion.c fenix-0.92+cvs20070713.1513/fxi/src/g_conversion.c
---- fenix-0.92/fxi/src/g_conversion.c 2007-07-13 15:40:26.000000000 +0000
-+++ fenix-0.92+cvs20070713.1513/fxi/src/g_conversion.c 2007-07-13 20:31:37.000000000 +0000
+Index: fenix-0.92a.dfsg1/fxi/src/g_conversion.c
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxi/src/g_conversion.c 2007-08-28 14:39:56.000000000 +0200
++++ fenix-0.92a.dfsg1/fxi/src/g_conversion.c 2007-08-28 14:41:13.000000000 +0200
@@ -76,10 +76,8 @@
int i, color, inc, next = 0, factor;
Uint16 * table16 = NULL;
@@ -1741,9 +1769,10 @@ diff -ruN fenix-0.92/fxi/src/g_conversion.c fenix-0.92+cvs20070713.1513/fxi/src/
return alpha16[alpha];
}
-diff -ruN fenix-0.92/fxi/src/g_draw.c fenix-0.92+cvs20070713.1513/fxi/src/g_draw.c
---- fenix-0.92/fxi/src/g_draw.c 2007-07-13 15:40:26.000000000 +0000
-+++ fenix-0.92+cvs20070713.1513/fxi/src/g_draw.c 2007-07-13 20:38:15.000000000 +0000
+Index: fenix-0.92a.dfsg1/fxi/src/g_draw.c
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxi/src/g_draw.c 2007-08-28 14:39:56.000000000 +0200
++++ fenix-0.92a.dfsg1/fxi/src/g_draw.c 2007-08-28 14:41:13.000000000 +0200
@@ -46,17 +46,15 @@
#include "files.h"
#include "grlib.h"
@@ -1858,7 +1887,7 @@ diff -ruN fenix-0.92/fxi/src/g_draw.c fenix-0.92+cvs20070713.1513/fxi/src/g_draw
dest->modified = 1 ;
-@@ -221,12 +211,14 @@
+@@ -221,12 +210,14 @@
case 16:
_Pixel16(((Uint16 *)dest->data) + x + dest->pitch*y/2, color, gr_alpha16(drawing_alpha)[color]) ;
break;
@@ -1875,7 +1904,7 @@ diff -ruN fenix-0.92/fxi/src/g_draw.c fenix-0.92+cvs20070713.1513/fxi/src/g_draw
default:
gr_error (_("gr_put_pixel: Unsupported colour depth"));
}
-@@ -252,6 +244,8 @@
+@@ -252,6 +243,8 @@
{
if (clip && x >= clip->x && x <= clip->x2 && y >= clip->y && y <= clip->y2)
gr_put_pixel (dest, x, y, color);
@@ -1884,7 +1913,7 @@ diff -ruN fenix-0.92/fxi/src/g_draw.c fenix-0.92+cvs20070713.1513/fxi/src/g_draw
}
/*
-@@ -273,8 +267,7 @@
+@@ -273,8 +266,7 @@
memset (dest->data, 0, dest->pitch * dest->height) ;
@@ -1894,7 +1923,7 @@ diff -ruN fenix-0.92/fxi/src/g_draw.c fenix-0.92+cvs20070713.1513/fxi/src/g_draw
}
/*
-@@ -300,21 +293,46 @@
+@@ -300,21 +292,46 @@
switch (dest->depth)
{
case 8:
@@ -1948,7 +1977,7 @@ diff -ruN fenix-0.92/fxi/src/g_draw.c fenix-0.92+cvs20070713.1513/fxi/src/g_draw
default:
gr_error (_("gr_clear_as: Unsupported colour depth"));
}
-@@ -324,6 +342,87 @@
+@@ -324,6 +341,87 @@
}
/*
@@ -2036,7 +2065,7 @@ diff -ruN fenix-0.92/fxi/src/g_draw.c fenix-0.92+cvs20070713.1513/fxi/src/g_draw
* FUNCTION : gr_vline
*
* Draw a vertical rectangle
-@@ -342,8 +441,11 @@
+@@ -342,8 +440,11 @@
void gr_vline (GRAPH * dest, REGION * clip, int x, int y, int h)
{
REGION base_clip ;
@@ -2048,7 +2077,7 @@ diff -ruN fenix-0.92/fxi/src/g_draw.c fenix-0.92+cvs20070713.1513/fxi/src/g_draw
if (!clip)
{
clip = &base_clip ;
-@@ -353,15 +455,13 @@
+@@ -353,15 +454,13 @@
clip->y2 = dest->height-1 ;
}
@@ -2067,7 +2096,7 @@ diff -ruN fenix-0.92/fxi/src/g_draw.c fenix-0.92+cvs20070713.1513/fxi/src/g_draw
if (dest->depth == 8)
{
-@@ -371,9 +471,8 @@
+@@ -371,9 +470,8 @@
{
while (h--)
{
@@ -2079,7 +2108,7 @@ diff -ruN fenix-0.92/fxi/src/g_draw.c fenix-0.92+cvs20070713.1513/fxi/src/g_draw
ptr += dest->pitch ;
}
}
-@@ -389,15 +488,15 @@
+@@ -389,15 +487,15 @@
else if (dest->depth == 16)
{
Uint16 * ptr = dest->data ;
@@ -2100,15 +2129,15 @@ diff -ruN fenix-0.92/fxi/src/g_draw.c fenix-0.92+cvs20070713.1513/fxi/src/g_draw
}
}
else
-@@ -405,10 +504,43 @@
+@@ -405,10 +503,43 @@
while (h--)
{
_Pixel16 (ptr, syscolor16, syscolor16_alpha) ;
- ptr += dest->pitch / 2 ;
+ ptr += inc ;
- }
- }
- }
++ }
++ }
++ }
+ else if (dest->depth == 1)
+ {
+ Uint8 * ptr = dest->data;
@@ -2136,16 +2165,16 @@ diff -ruN fenix-0.92/fxi/src/g_draw.c fenix-0.92+cvs20070713.1513/fxi/src/g_draw
+ else
+ *ptr |= mask;
+ ptr += dest->pitch ;
-+ }
-+ }
-+ }
+ }
+ }
+ }
+
+ drawing_stipple = old_stipple;
+
}
/*
-@@ -430,6 +562,7 @@
+@@ -430,6 +561,7 @@
void gr_hline (GRAPH * dest, REGION * clip, int x, int y, int w)
{
REGION base_clip ;
@@ -2153,7 +2182,7 @@ diff -ruN fenix-0.92/fxi/src/g_draw.c fenix-0.92+cvs20070713.1513/fxi/src/g_draw
if (!dest) dest = scrbitmap ;
if (!clip)
-@@ -443,13 +576,13 @@
+@@ -443,13 +575,13 @@
dest->modified = 1 ;
@@ -2170,7 +2199,7 @@ diff -ruN fenix-0.92/fxi/src/g_draw.c fenix-0.92+cvs20070713.1513/fxi/src/g_draw
if (dest->depth == 8)
{
-@@ -475,6 +608,26 @@
+@@ -475,6 +607,26 @@
int mask ;
ptr += dest->pitch * y + x/8;
mask = (1 << (7-(x & 7)));
@@ -2197,7 +2226,7 @@ diff -ruN fenix-0.92/fxi/src/g_draw.c fenix-0.92+cvs20070713.1513/fxi/src/g_draw
while (w--)
{
if (!syscolor8)
-@@ -491,6 +644,9 @@
+@@ -491,6 +643,9 @@
}
}
@@ -2207,7 +2236,7 @@ diff -ruN fenix-0.92/fxi/src/g_draw.c fenix-0.92+cvs20070713.1513/fxi/src/g_draw
/*
* FUNCTION : gr_box
*
-@@ -513,6 +669,8 @@
+@@ -513,6 +668,8 @@
REGION base_clip ;
if (!dest) dest = scrbitmap ;
@@ -2216,7 +2245,7 @@ diff -ruN fenix-0.92/fxi/src/g_draw.c fenix-0.92+cvs20070713.1513/fxi/src/g_draw
if (!clip)
{
clip = &base_clip ;
-@@ -521,18 +679,29 @@
+@@ -521,18 +678,29 @@
clip->x2 = dest->width-1 ;
clip->y2 = dest->height-1 ;
}
@@ -2253,7 +2282,7 @@ diff -ruN fenix-0.92/fxi/src/g_draw.c fenix-0.92+cvs20070713.1513/fxi/src/g_draw
if (dest->depth == 8)
{
-@@ -547,17 +716,23 @@
+@@ -547,17 +715,23 @@
else if (dest->depth == 16)
{
Uint16 * ptr = dest->data ;
@@ -2279,7 +2308,7 @@ diff -ruN fenix-0.92/fxi/src/g_draw.c fenix-0.92+cvs20070713.1513/fxi/src/g_draw
}
}
-@@ -582,18 +757,17 @@
+@@ -582,18 +756,17 @@
{
int stipple = drawing_stipple;
@@ -2307,7 +2336,7 @@ diff -ruN fenix-0.92/fxi/src/g_draw.c fenix-0.92+cvs20070713.1513/fxi/src/g_draw
}
/*
-@@ -615,8 +789,9 @@
+@@ -615,8 +788,9 @@
void gr_circle (GRAPH * dest, REGION * clip, int x, int y, int r)
{
int cx = 0, cy = r ;
@@ -2318,7 +2347,7 @@ diff -ruN fenix-0.92/fxi/src/g_draw.c fenix-0.92+cvs20070713.1513/fxi/src/g_draw
REGION base_clip ;
int color = 0;
-@@ -631,7 +806,8 @@
+@@ -631,7 +805,8 @@
}
dest->modified = 1 ;
@@ -2328,7 +2357,7 @@ diff -ruN fenix-0.92/fxi/src/g_draw.c fenix-0.92+cvs20070713.1513/fxi/src/g_draw
color = syscolor8;
} else if (dest->depth == 16) {
color = syscolor16;
-@@ -639,36 +815,34 @@
+@@ -639,36 +814,34 @@
do {
if (drawing_stipple & 1) {
@@ -2379,7 +2408,7 @@ diff -ruN fenix-0.92/fxi/src/g_draw.c fenix-0.92+cvs20070713.1513/fxi/src/g_draw
}
-@@ -691,31 +865,29 @@
+@@ -691,31 +864,29 @@
void gr_fcircle (GRAPH * dest, REGION * clip, int x, int y, int r)
{
int cx = 0, cy = r ;
@@ -2424,7 +2453,7 @@ diff -ruN fenix-0.92/fxi/src/g_draw.c fenix-0.92+cvs20070713.1513/fxi/src/g_draw
drawing_stipple = old_stipple;
}
-@@ -740,6 +912,7 @@
+@@ -740,6 +911,7 @@
int n, m, hinc, vinc ;
int i1, i2, dd ;
REGION base_clip ;
@@ -2432,7 +2461,7 @@ diff -ruN fenix-0.92/fxi/src/g_draw.c fenix-0.92+cvs20070713.1513/fxi/src/g_draw
if (!w) {
gr_vline (dest, clip, x, y, h) ;
-@@ -764,42 +938,47 @@
+@@ -764,42 +936,47 @@
/* Clipping de la l�nea - INCORRECTO pero funcional */
@@ -2489,7 +2518,7 @@ diff -ruN fenix-0.92/fxi/src/g_draw.c fenix-0.92+cvs20070713.1513/fxi/src/g_draw
{
n = (x+w) - clip->x2 ;
m = w ? n*h/ABS(w) : 0;
-@@ -808,22 +987,23 @@
+@@ -808,22 +985,23 @@
}
if (y > clip->y2) /* abajo */
{
@@ -2518,7 +2547,7 @@ diff -ruN fenix-0.92/fxi/src/g_draw.c fenix-0.92+cvs20070713.1513/fxi/src/g_draw
if (dest->depth == 16) vinc /= 2;
/* Aqu� va una implementaci�n deprisa y corriendo de Bresenham */
-@@ -831,17 +1011,10 @@
+@@ -831,17 +1009,10 @@
w = ABS(w) ;
h = ABS(h) ;
@@ -2540,7 +2569,7 @@ diff -ruN fenix-0.92/fxi/src/g_draw.c fenix-0.92+cvs20070713.1513/fxi/src/g_draw
}
if (dest->depth == 8)
-@@ -850,17 +1023,15 @@
+@@ -850,17 +1021,15 @@
if (w > h) while (w--)
{
@@ -2562,7 +2591,7 @@ diff -ruN fenix-0.92/fxi/src/g_draw.c fenix-0.92+cvs20070713.1513/fxi/src/g_draw
if (dd >= 0) ptr += vinc+hinc, dd += i2 ;
else ptr += vinc, dd += i1 ;
}
-@@ -872,18 +1043,45 @@
+@@ -872,18 +1041,45 @@
if (w > h) while (w--)
{
if (drawing_stipple & 1) _Pixel16(ptr, syscolor16, syscolor16_alpha) ;
@@ -2610,7 +2639,7 @@ diff -ruN fenix-0.92/fxi/src/g_draw.c fenix-0.92+cvs20070713.1513/fxi/src/g_draw
}
/*
-@@ -929,14 +1127,13 @@
+@@ -929,14 +1125,13 @@
int i;
int n = 1;
@@ -2630,7 +2659,7 @@ diff -ruN fenix-0.92/fxi/src/g_draw.c fenix-0.92+cvs20070713.1513/fxi/src/g_draw
delta = 1.0f / (float)n;
/* Compute finite differences */
-@@ -993,6 +1190,7 @@
+@@ -993,6 +1188,7 @@
switch (dr->type)
{
case DRAWOBJ_CIRCLE:
@@ -2638,7 +2667,7 @@ diff -ruN fenix-0.92/fxi/src/g_draw.c fenix-0.92+cvs20070713.1513/fxi/src/g_draw
newclip.x = dr->x1-dr->x2;
newclip.y = dr->y1-dr->x2;
newclip.x2 = dr->x1+dr->x2;
-@@ -1034,7 +1232,7 @@
+@@ -1034,7 +1230,7 @@
*
*/
@@ -2647,7 +2676,7 @@ diff -ruN fenix-0.92/fxi/src/g_draw.c fenix-0.92+cvs20070713.1513/fxi/src/g_draw
{
int b8 = syscolor8;
int b16 = syscolor16;
-@@ -1042,6 +1240,8 @@
+@@ -1042,6 +1238,8 @@
syscolor8 = dr->color8;
syscolor16 = dr->color16;
@@ -2656,7 +2685,7 @@ diff -ruN fenix-0.92/fxi/src/g_draw.c fenix-0.92+cvs20070713.1513/fxi/src/g_draw
switch (dr->type)
{
case DRAWOBJ_LINE:
-@@ -1165,8 +1365,7 @@
+@@ -1165,8 +1363,7 @@
dr->x1 += incx;
dr->y1 += incy;
@@ -2666,7 +2695,7 @@ diff -ruN fenix-0.92/fxi/src/g_draw.c fenix-0.92+cvs20070713.1513/fxi/src/g_draw
dr->x2 += incx;
dr->y2 += incy;
dr->x3 += incx;
-@@ -1250,7 +1449,6 @@
+@@ -1250,7 +1447,6 @@
syscolor16 = c ;
}
@@ -2675,9 +2704,10 @@ diff -ruN fenix-0.92/fxi/src/g_draw.c fenix-0.92+cvs20070713.1513/fxi/src/g_draw
+ if (drawing_alpha != 255) syscolor16_alpha = gr_alpha16(drawing_alpha)[syscolor16];
}
-diff -ruN fenix-0.92/fxi/src/g_font.c fenix-0.92+cvs20070713.1513/fxi/src/g_font.c
---- fenix-0.92/fxi/src/g_font.c 2007-07-13 15:40:26.000000000 +0000
-+++ fenix-0.92+cvs20070713.1513/fxi/src/g_font.c 2007-07-13 20:31:37.000000000 +0000
+Index: fenix-0.92a.dfsg1/fxi/src/g_font.c
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxi/src/g_font.c 2007-08-28 14:39:56.000000000 +0200
++++ fenix-0.92a.dfsg1/fxi/src/g_font.c 2007-08-28 14:41:13.000000000 +0200
@@ -159,8 +159,7 @@
for (y = 0 ; y < height ; y++, ptr += bitmap->pitch)
memcpy (ptr, charptr + linesize*y, linesize);
@@ -2804,7 +2834,7 @@ diff -ruN fenix-0.92/fxi/src/g_font.c fenix-0.92+cvs20070713.1513/fxi/src/g_font
if (fontid < 0 || fontid > 255 || !fonts[fontid])
{
-@@ -554,19 +562,36 @@
+@@ -554,36 +562,42 @@
header[7] = font->bpp;
gzwrite (file, &header, 8);
@@ -2847,10 +2877,6 @@ diff -ruN fenix-0.92/fxi/src/g_font.c fenix-0.92+cvs20070713.1513/fxi/src/g_font
gzwrite (file, &colors, 768) ;
gzwrite (file, block, 576) ;
free(block) ;
-@@ -570,20 +595,9 @@
- gzwrite (file, &colors, 768) ;
- gzwrite (file, block, 576) ;
- free(block) ;
+ palette_saved = 1;
}
@@ -2889,7 +2915,7 @@ diff -ruN fenix-0.92/fxi/src/g_font.c fenix-0.92+cvs20070713.1513/fxi/src/g_font
}
}
-@@ -701,6 +714,7 @@
+@@ -701,6 +713,7 @@
int xadvance = 0;
int yadvance = 0;
int minyoffset = 0;
@@ -2897,7 +2923,7 @@ diff -ruN fenix-0.92/fxi/src/g_font.c fenix-0.92+cvs20070713.1513/fxi/src/g_font
/* Arrays used to convert hex ASCII to binary */
-@@ -737,8 +751,8 @@
+@@ -737,8 +750,8 @@
for (line[2047] = 0 ; ; )
{
@@ -2908,7 +2934,7 @@ diff -ruN fenix-0.92/fxi/src/g_font.c fenix-0.92+cvs20070713.1513/fxi/src/g_font
/* Handle global-level commands */
-@@ -799,27 +813,22 @@
+@@ -799,27 +812,22 @@
font->glyph[encoding].xoffset = xoffset;
font->glyph[encoding].yoffset = -yoffset-height;
@@ -2943,7 +2969,7 @@ diff -ruN fenix-0.92/fxi/src/g_font.c fenix-0.92+cvs20070713.1513/fxi/src/g_font
for (x = 0 ; x < width ; x += 8)
{
-@@ -869,7 +878,6 @@
+@@ -869,7 +877,6 @@
FONT * gr_font_get (int id)
{
@@ -2952,9 +2978,10 @@ diff -ruN fenix-0.92/fxi/src/g_font.c fenix-0.92+cvs20070713.1513/fxi/src/g_font
+ if (id >= 0 && id <= 255) return fonts[id];
return NULL;
}
-diff -ruN fenix-0.92/fxi/src/g_fpg.c fenix-0.92+cvs20070713.1513/fxi/src/g_fpg.c
---- fenix-0.92/fxi/src/g_fpg.c 2007-07-13 15:40:26.000000000 +0000
-+++ fenix-0.92+cvs20070713.1513/fxi/src/g_fpg.c 2007-07-13 20:39:39.000000000 +0000
+Index: fenix-0.92a.dfsg1/fxi/src/g_fpg.c
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxi/src/g_fpg.c 2007-08-28 14:39:56.000000000 +0200
++++ fenix-0.92a.dfsg1/fxi/src/g_fpg.c 2007-08-28 14:41:13.000000000 +0200
@@ -128,8 +128,7 @@
GRLIB * grlib_get (int libid)
@@ -3033,7 +3060,7 @@ diff -ruN fenix-0.92/fxi/src/g_fpg.c fenix-0.92+cvs20070713.1513/fxi/src/g_fpg.c
for (c = 0 ; c < gr->ncpoints ; c++)
{
file_readSint16 (fp, &px) ;
-@@ -426,14 +418,14 @@
+@@ -426,20 +418,23 @@
Uint8 * ptr = (Uint8 *)gr->data + gr->pitch*y;
if (!file_read (fp, ptr, len))
{
@@ -3051,10 +3078,6 @@ diff -ruN fenix-0.92/fxi/src/g_fpg.c fenix-0.92+cvs20070713.1513/fxi/src/g_fpg.c
}
}
-@@ -437,9 +429,12 @@
- }
- }
-
-
grlib_add_map (libid, gr) ;
+ pal_map_assign (libid, gr, pal) ;
@@ -3076,9 +3099,10 @@ diff -ruN fenix-0.92/fxi/src/g_fpg.c fenix-0.92+cvs20070713.1513/fxi/src/g_fpg.c
+ if (!syslib) syslib = grlib_create() ;
}
-diff -ruN fenix-0.92/fxi/src/g_main.c fenix-0.92+cvs20070713.1513/fxi/src/g_main.c
---- fenix-0.92/fxi/src/g_main.c 2007-07-13 15:40:26.000000000 +0000
-+++ fenix-0.92+cvs20070713.1513/fxi/src/g_main.c 2007-07-13 20:31:37.000000000 +0000
+Index: fenix-0.92a.dfsg1/fxi/src/g_main.c
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxi/src/g_main.c 2007-08-28 14:39:56.000000000 +0200
++++ fenix-0.92a.dfsg1/fxi/src/g_main.c 2007-08-28 14:41:13.000000000 +0200
@@ -111,7 +111,7 @@
static int sdl_equiv[SDLK_LAST+1] ;
@@ -3107,7 +3131,7 @@ diff -ruN fenix-0.92/fxi/src/g_main.c fenix-0.92+cvs20070713.1513/fxi/src/g_main
GLODWORD(MOUSEWHEELUP) = 0 ;
GLODWORD(MOUSEWHEELDOWN) = 0 ;
-@@ -623,8 +622,13 @@
+@@ -623,8 +620,13 @@
switch (e.type)
{
case SDL_MOUSEMOTION:
@@ -3121,7 +3145,7 @@ diff -ruN fenix-0.92/fxi/src/g_main.c fenix-0.92+cvs20070713.1513/fxi/src/g_main
break ;
/*
case SDL_JOYAXISMOTION:
-@@ -716,8 +720,7 @@
+@@ -716,8 +718,7 @@
}
if (e.key.keysym.sym == SDLK_p)
{
@@ -3131,7 +3155,7 @@ diff -ruN fenix-0.92/fxi/src/g_main.c fenix-0.92+cvs20070713.1513/fxi/src/g_main
background_dirty = 1;
break ;
}
-@@ -870,8 +873,8 @@
+@@ -870,8 +871,8 @@
/* Now actualized every frame... */
GLODWORD(SHIFTSTATUS) = ((m & KMOD_LSHIFT) ? 1 : 0) +
((m & KMOD_RSHIFT) ? 2 : 0) +
@@ -3142,7 +3166,7 @@ diff -ruN fenix-0.92/fxi/src/g_main.c fenix-0.92+cvs20070713.1513/fxi/src/g_main
last_mouse_x = GLODWORD(MOUSEX) ;
last_mouse_y = GLODWORD(MOUSEY) ;
-@@ -1055,7 +1059,8 @@
+@@ -1055,7 +1056,8 @@
}
// PATCH - XGRAPH DOES NOT ROTATE DESTINATION GRAPHIC
@@ -3152,7 +3176,7 @@ diff -ruN fenix-0.92/fxi/src/g_main.c fenix-0.92+cvs20070713.1513/fxi/src/g_main
if (LOCDWORD(i,XGRAPH) && scalex == 100 && scaley == 100) {
gr_blit (0, region, x, y, flags, map) ;
} else {
-@@ -1117,7 +1123,8 @@
+@@ -1117,7 +1119,8 @@
fclip = regions[r];
if (clip) region_union (&fclip, clip);
@@ -3162,7 +3186,7 @@ diff -ruN fenix-0.92/fxi/src/g_main.c fenix-0.92+cvs20070713.1513/fxi/src/g_main
if (LOCDWORD(i,XGRAPH) && scalex == 100 && scaley == 100) {
gr_blit (0, ®ions[r], x, y, flags, map) ;
} else {
-@@ -1198,7 +1205,8 @@
+@@ -1198,7 +1201,8 @@
region = regions[r];
if (clip) region_union (®ion, clip);
@@ -3172,7 +3196,7 @@ diff -ruN fenix-0.92/fxi/src/g_main.c fenix-0.92+cvs20070713.1513/fxi/src/g_main
gr_rotated_blit (0, ®ion, GLODWORD(MOUSEX),
GLODWORD(MOUSEY), GLODWORD(MOUSEFLAGS),
GLODWORD(MOUSEANGLE), GLODWORD(MOUSESIZE),
-@@ -1311,9 +1319,10 @@
+@@ -1311,9 +1315,10 @@
first_dll_object = object->next;
if (object->x.bbox.x == -2)
(*object->x.info)(object->x.what, &object->x.bbox);
@@ -3185,7 +3209,7 @@ diff -ruN fenix-0.92/fxi/src/g_main.c fenix-0.92+cvs20070713.1513/fxi/src/g_main
free (object);
dll_object_count--;
}
-@@ -1323,11 +1332,10 @@
+@@ -1323,11 +1328,10 @@
{
next = object->next;
object->next = next->next;
@@ -3200,7 +3224,7 @@ diff -ruN fenix-0.92/fxi/src/g_main.c fenix-0.92+cvs20070713.1513/fxi/src/g_main
free (next);
dll_object_count--;
break;
-@@ -1338,8 +1346,7 @@
+@@ -1338,8 +1342,7 @@
int compare_actions (const OBJECT * a1, const OBJECT * a2)
{
@@ -3210,7 +3234,7 @@ diff -ruN fenix-0.92/fxi/src/g_main.c fenix-0.92+cvs20070713.1513/fxi/src/g_main
}
void draw_mode7 (void * ptr, REGION * clip)
-@@ -1414,9 +1421,14 @@
+@@ -1414,9 +1417,14 @@
w = scr_width / 16;
h = scr_height / 8;
@@ -3227,7 +3251,7 @@ diff -ruN fenix-0.92/fxi/src/g_main.c fenix-0.92+cvs20070713.1513/fxi/src/g_main
{
if (cx/w < 16 && cx/w >= 0)
zonearray[cx/w] |= (1 << (cy / h));
-@@ -1438,19 +1450,7 @@
+@@ -1438,19 +1446,7 @@
void gr_mark_instance (INSTANCE * r)
{
@@ -3248,7 +3272,7 @@ diff -ruN fenix-0.92/fxi/src/g_main.c fenix-0.92+cvs20070713.1513/fxi/src/g_main
}
/*
-@@ -1491,44 +1491,21 @@
+@@ -1491,44 +1487,21 @@
if (onlychanged)
{
@@ -3297,7 +3321,7 @@ diff -ruN fenix-0.92/fxi/src/g_main.c fenix-0.92+cvs20070713.1513/fxi/src/g_main
/* Update the bounding box */
instance_update_bbox (r);
-@@ -1543,24 +1520,17 @@
+@@ -1543,24 +1516,17 @@
if (!onlychanged || object_list[i].changed)
{
@@ -3327,7 +3351,7 @@ diff -ruN fenix-0.92/fxi/src/g_main.c fenix-0.92+cvs20070713.1513/fxi/src/g_main
}
}
}
-@@ -1630,11 +1600,9 @@
+@@ -1630,11 +1596,9 @@
{
/* Si hay algun hueco, entonces corto aca, ahora vuelve a entrar y esto entra en otra recta */
for (x2 = x ; x2 < x+cw ; x2++)
@@ -3341,7 +3365,7 @@ diff -ruN fenix-0.92/fxi/src/g_main.c fenix-0.92+cvs20070713.1513/fxi/src/g_main
for (x2 = x ; x2 < x+cw ; x2++)
zonearray[x2] &= ~(1 << (y+ch));
-@@ -1872,19 +1842,18 @@
+@@ -1872,19 +1836,18 @@
gr_mark_instances (dump_type == 0);
n = updaterects_count = gr_mark_rects (updaterects);
@@ -3365,7 +3389,7 @@ diff -ruN fenix-0.92/fxi/src/g_main.c fenix-0.92+cvs20070713.1513/fxi/src/g_main
}
gprof_end ("Background");
-@@ -1903,18 +1872,18 @@
+@@ -1903,18 +1866,18 @@
if (object_list[a].draw == draw_instance)
{
INSTANCE * i = (INSTANCE *)object_list[a].what;
@@ -3392,7 +3416,7 @@ diff -ruN fenix-0.92/fxi/src/g_main.c fenix-0.92+cvs20070713.1513/fxi/src/g_main
continue;
}
(*object_list[a].draw) (object_list[a].what, &updaterects[n]) ;
-@@ -1960,11 +1929,19 @@
+@@ -1960,11 +1923,19 @@
/* Fading */
@@ -3413,7 +3437,7 @@ diff -ruN fenix-0.92/fxi/src/g_main.c fenix-0.92+cvs20070713.1513/fxi/src/g_main
}
/* Visualiza la consola */
-@@ -1972,8 +1949,7 @@
+@@ -1972,8 +1943,7 @@
gr_con_show(show_console) ;
gr_con_draw() ;
@@ -3423,7 +3447,7 @@ diff -ruN fenix-0.92/fxi/src/g_main.c fenix-0.92+cvs20070713.1513/fxi/src/g_main
/* Actualiza la paleta y la pantalla */
-@@ -1983,7 +1959,7 @@
+@@ -1983,7 +1953,7 @@
}
@@ -3432,7 +3456,7 @@ diff -ruN fenix-0.92/fxi/src/g_main.c fenix-0.92+cvs20070713.1513/fxi/src/g_main
static int screen_locked = 0 ;
-@@ -1992,11 +1968,12 @@
+@@ -1992,11 +1962,12 @@
if (screen_locked) return 1 ;
screen_locked = 1 ;
@@ -3447,7 +3471,7 @@ diff -ruN fenix-0.92/fxi/src/g_main.c fenix-0.92+cvs20070713.1513/fxi/src/g_main
if (!scrbitmap)
{
scrbitmap = bitmap_new (0, screen->w, screen->h, enable_16bits ? 16:8, 1) ;
-@@ -2023,6 +2000,12 @@
+@@ -2023,6 +1994,12 @@
}
else
{
@@ -3460,7 +3484,7 @@ diff -ruN fenix-0.92/fxi/src/g_main.c fenix-0.92+cvs20070713.1513/fxi/src/g_main
scrbitmap_is_fake = 0 ;
if (!scrbitmap)
-@@ -2042,6 +2025,7 @@
+@@ -2042,6 +2019,7 @@
{
int a ;
GRAPH * scr;
@@ -3468,7 +3492,7 @@ diff -ruN fenix-0.92/fxi/src/g_main.c fenix-0.92+cvs20070713.1513/fxi/src/g_main
if (!screen_locked) return ;
screen_locked = 0 ;
-@@ -2050,10 +2034,9 @@
+@@ -2050,10 +2028,9 @@
if (enable_scale || scale_mode != SCALE_NONE)
{
int aux_scale_mode;
@@ -3481,7 +3505,7 @@ diff -ruN fenix-0.92/fxi/src/g_main.c fenix-0.92+cvs20070713.1513/fxi/src/g_main
aux_scale_mode = (scale_mode != SCALE_NONE) ? scale_mode : SCALE_SCALE2X;
if (scrbitmap->depth == 8)
-@@ -2062,12 +2045,11 @@
+@@ -2062,12 +2039,11 @@
Uint16 * extra;
int length = scrbitmap->width * scrbitmap->height, n;
@@ -3498,7 +3522,7 @@ diff -ruN fenix-0.92/fxi/src/g_main.c fenix-0.92+cvs20070713.1513/fxi/src/g_main
scrbitmap_extra = bitmap_new (0, scrbitmap->width, scrbitmap->height, 16, 1);
}
-@@ -2088,27 +2070,19 @@
+@@ -2088,49 +2064,40 @@
/* Esto podria ir en un modulo aparte */
switch ( aux_scale_mode ) {
case SCALE_SCALE2X:
@@ -3530,7 +3554,6 @@ diff -ruN fenix-0.92/fxi/src/g_main.c fenix-0.92+cvs20070713.1513/fxi/src/g_main
break;
case SCALE_NONE:
-@@ -2115,22 +2089,21 @@
/* No usado */
break;
}
@@ -3560,7 +3583,7 @@ diff -ruN fenix-0.92/fxi/src/g_main.c fenix-0.92+cvs20070713.1513/fxi/src/g_main
SDL_Rect rects[128];
int i;
-@@ -2138,14 +2111,11 @@
+@@ -2138,14 +2105,11 @@
{
rects[i].x = updaterects[i].x;
rects[i].y = updaterects[i].y;
@@ -3577,7 +3600,7 @@ diff -ruN fenix-0.92/fxi/src/g_main.c fenix-0.92+cvs20070713.1513/fxi/src/g_main
}
else
{
-@@ -2198,7 +2168,8 @@
+@@ -2198,7 +2162,8 @@
}
SDL_UnlockSurface (screen) ;
@@ -3587,7 +3610,7 @@ diff -ruN fenix-0.92/fxi/src/g_main.c fenix-0.92+cvs20070713.1513/fxi/src/g_main
}
}
-@@ -2235,7 +2206,7 @@
+@@ -2235,7 +2200,7 @@
if (scr_initialized && scrbitmap)
{
if (scrbitmap_is_fake)
@@ -3596,7 +3619,7 @@ diff -ruN fenix-0.92/fxi/src/g_main.c fenix-0.92+cvs20070713.1513/fxi/src/g_main
else
bitmap_destroy (scrbitmap) ;
-@@ -2355,6 +2325,8 @@
+@@ -2355,6 +2320,8 @@
regions[0].x2 = width-1 ;
regions[0].y2 = height-1 ;
@@ -3605,7 +3628,7 @@ diff -ruN fenix-0.92/fxi/src/g_main.c fenix-0.92+cvs20070713.1513/fxi/src/g_main
/* Bitmaps de fondo */
if (!background || scr_width != width || scr_height != height)
-@@ -2384,10 +2356,11 @@
+@@ -2384,10 +2351,11 @@
scr_width = width ;
scr_height = height ;
@@ -3619,9 +3642,10 @@ diff -ruN fenix-0.92/fxi/src/g_main.c fenix-0.92+cvs20070713.1513/fxi/src/g_main
for (n = 0 ; n < 256 ; n++)
gr_set_rgb (n, default_palette[n*3]/4, default_palette[n*3+1]/4, default_palette[n*3+2]/4) ;
}
-diff -ruN fenix-0.92/fxi/src/g_maps.c fenix-0.92+cvs20070713.1513/fxi/src/g_maps.c
---- fenix-0.92/fxi/src/g_maps.c 2007-07-13 15:40:26.000000000 +0000
-+++ fenix-0.92+cvs20070713.1513/fxi/src/g_maps.c 2007-07-13 20:40:34.000000000 +0000
+Index: fenix-0.92a.dfsg1/fxi/src/g_maps.c
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxi/src/g_maps.c 2007-08-28 14:39:56.000000000 +0200
++++ fenix-0.92a.dfsg1/fxi/src/g_maps.c 2007-08-28 14:41:13.000000000 +0200
@@ -128,6 +128,8 @@
gr->prev = NULL;
gr->current_keyframe = -1;
@@ -3751,9 +3775,10 @@ diff -ruN fenix-0.92/fxi/src/g_maps.c fenix-0.92+cvs20070713.1513/fxi/src/g_maps
gr->code = bitmap_next_code() ;
assert (syslib) ;
grlib_add_map (0, gr) ;
-diff -ruN fenix-0.92/fxi/src/g_mode7.c fenix-0.92+cvs20070713.1513/fxi/src/g_mode7.c
---- fenix-0.92/fxi/src/g_mode7.c 2007-04-13 18:19:04.000000000 +0000
-+++ fenix-0.92+cvs20070713.1513/fxi/src/g_mode7.c 2007-07-13 20:31:37.000000000 +0000
+Index: fenix-0.92a.dfsg1/fxi/src/g_mode7.c
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxi/src/g_mode7.c 2007-08-28 14:38:26.000000000 +0200
++++ fenix-0.92a.dfsg1/fxi/src/g_mode7.c 2007-08-28 14:41:14.000000000 +0200
@@ -71,8 +71,7 @@
void gr_mode7_bbox (int n, REGION * r)
@@ -3832,9 +3857,10 @@ diff -ruN fenix-0.92/fxi/src/g_mode7.c fenix-0.92+cvs20070713.1513/fxi/src/g_mod
}
/* Crea una lista ordenada de instancias a dibujar */
-diff -ruN fenix-0.92/fxi/src/g_pal.c fenix-0.92+cvs20070713.1513/fxi/src/g_pal.c
---- fenix-0.92/fxi/src/g_pal.c 2007-07-13 15:40:26.000000000 +0000
-+++ fenix-0.92+cvs20070713.1513/fxi/src/g_pal.c 2007-07-13 20:37:31.000000000 +0000
+Index: fenix-0.92a.dfsg1/fxi/src/g_pal.c
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxi/src/g_pal.c 2007-08-28 14:39:57.000000000 +0200
++++ fenix-0.92a.dfsg1/fxi/src/g_pal.c 2007-08-28 14:41:14.000000000 +0200
@@ -54,10 +54,15 @@
extern GRAPH * gr_read_png (const char * filename) ;
@@ -4051,7 +4077,7 @@ diff -ruN fenix-0.92/fxi/src/g_pal.c fenix-0.92+cvs20070713.1513/fxi/src/g_pal.c
GLODWORD(FADING) = 1 ;
fade_step += fade_inc ;
-@@ -255,8 +420,16 @@
+@@ -255,8 +419,16 @@
(fade_pos.r == 100 && fade_pos.g == 100 && fade_pos.b == 100))
{
GLODWORD(FADING) = 0 ;
@@ -4068,7 +4094,7 @@ diff -ruN fenix-0.92/fxi/src/g_pal.c fenix-0.92+cvs20070713.1513/fxi/src/g_pal.c
activate_vpalette() ;
-@@ -265,15 +438,15 @@
+@@ -265,15 +437,15 @@
gr_fade16 (scrbitmap, fade_pos.r, fade_pos.g, fade_pos.b);
}
}
@@ -4087,24 +4113,24 @@ diff -ruN fenix-0.92/fxi/src/g_pal.c fenix-0.92+cvs20070713.1513/fxi/src/g_pal.c
/* Ignora definiciones de gama */
file_seek (fp, 576, SEEK_CUR) ;
-@@ -283,16 +456,53 @@
+@@ -283,16 +455,53 @@
palette[i].r = colors[i][0] << 2 ;
palette[i].g = colors[i][1] << 2 ;
palette[i].b = colors[i][2] << 2 ;
+ }
-
++
+ palette_loaded = 1 ;
+ palette_changed = 1 ;
-
++
+ return 1 ;
- }
++ }
+#endif
-+
+
+PALETTE * gr_read_pal (file * fp)
+{
+ int i ;
+ PALETTE * pal;
-+
+
+ if (!file_read (fp, colors, 3 * 256)) return NULL ;
+
+ for (i = 0 ; i < 256 ; i++)
@@ -4117,10 +4143,10 @@ diff -ruN fenix-0.92/fxi/src/g_pal.c fenix-0.92+cvs20070713.1513/fxi/src/g_pal.c
+ palette[i].g = colors[i][1] ;
+ palette[i].b = colors[i][2] ;
+ }
-+ }
-+
-+ pal = pal_new2(colors);
+ }
++ pal = pal_new2(colors);
++
palette_loaded = 1 ;
palette_changed = 1 ;
@@ -4142,7 +4168,7 @@ diff -ruN fenix-0.92/fxi/src/g_pal.c fenix-0.92+cvs20070713.1513/fxi/src/g_pal.c
/*
* FUNCTION : gr_save_pal
*
-@@ -309,7 +519,6 @@
+@@ -309,7 +518,6 @@
{
file * fp = file_open (filename, "wb");
char header[8] = "pal\x1A\x0D\x0A";
@@ -4150,7 +4176,7 @@ diff -ruN fenix-0.92/fxi/src/g_pal.c fenix-0.92+cvs20070713.1513/fxi/src/g_pal.c
int i;
if (!fp)
-@@ -341,18 +550,18 @@
+@@ -341,18 +549,18 @@
int r = 0 ;
int i = 0 ;
@@ -4172,7 +4198,7 @@ diff -ruN fenix-0.92/fxi/src/g_pal.c fenix-0.92+cvs20070713.1513/fxi/src/g_pal.c
}
else if (memcmp (header, "\x89PNG", 4) == 0)
{
-@@ -361,8 +570,11 @@
+@@ -361,8 +569,11 @@
file_close (fp);
palette_loaded = 0;
graph = gr_read_png(filename);
@@ -4186,7 +4212,7 @@ diff -ruN fenix-0.92/fxi/src/g_pal.c fenix-0.92+cvs20070713.1513/fxi/src/g_pal.c
}
else {
// Soporte para FGC
-@@ -374,7 +586,7 @@
+@@ -374,7 +585,7 @@
{
fgc_error = _("FGC file corrupt or truncated");
file_close(fp);
@@ -4195,7 +4221,7 @@ diff -ruN fenix-0.92/fxi/src/g_pal.c fenix-0.92+cvs20070713.1513/fxi/src/g_pal.c
}
ARRANGE_DWORD(&fgcHeader.version);
ARRANGE_DWORD(&fgcHeader.depth);
-@@ -383,43 +595,42 @@
+@@ -383,43 +594,42 @@
if (fgcHeader.depth == 8) {
@@ -4249,7 +4275,7 @@ diff -ruN fenix-0.92/fxi/src/g_pal.c fenix-0.92+cvs20070713.1513/fxi/src/g_pal.c
}
ARRANGE_DWORD(&fbmHeader.depth);
-@@ -427,27 +638,30 @@
+@@ -427,27 +637,30 @@
if (fbmHeader.depth!=8) {
fbm_error = _("FBM file does not contain information about the colour palette");
file_close(fp);
@@ -4286,7 +4312,7 @@ diff -ruN fenix-0.92/fxi/src/g_pal.c fenix-0.92+cvs20070713.1513/fxi/src/g_pal.c
} else if (strcmp (header, FPL_MAGIC) == 0) {
-@@ -473,9 +687,7 @@
+@@ -473,9 +686,7 @@
g >>= screen->format->Gloss ;
b >>= screen->format->Bloss ;
@@ -4297,7 +4323,7 @@ diff -ruN fenix-0.92/fxi/src/g_pal.c fenix-0.92+cvs20070713.1513/fxi/src/g_pal.c
if (!color) return 1 ;
return color ;
}
-@@ -530,9 +742,9 @@
+@@ -530,9 +741,9 @@
for (n = first ; n <= last ; n++)
{
c = &palette[color_list[n]] ;
@@ -4310,7 +4336,7 @@ diff -ruN fenix-0.92/fxi/src/g_pal.c fenix-0.92+cvs20070713.1513/fxi/src/g_pal.c
if (diff < bestdiff) {
bestdiff = diff ;
best = n ;
-@@ -740,22 +952,22 @@
+@@ -740,22 +951,22 @@
/* Actualiza la paleta */
palette_changed = 0 ;
@@ -4337,9 +4363,10 @@ diff -ruN fenix-0.92/fxi/src/g_pal.c fenix-0.92+cvs20070713.1513/fxi/src/g_pal.c
}
void gr_set_rgb (int color, int r, int g, int b)
-diff -ruN fenix-0.92/fxi/src/g_scroll.c fenix-0.92+cvs20070713.1513/fxi/src/g_scroll.c
---- fenix-0.92/fxi/src/g_scroll.c 2007-07-13 15:40:26.000000000 +0000
-+++ fenix-0.92+cvs20070713.1513/fxi/src/g_scroll.c 2007-07-13 20:31:37.000000000 +0000
+Index: fenix-0.92a.dfsg1/fxi/src/g_scroll.c
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxi/src/g_scroll.c 2007-08-28 14:39:57.000000000 +0200
++++ fenix-0.92a.dfsg1/fxi/src/g_scroll.c 2007-08-28 14:41:14.000000000 +0200
@@ -36,9 +36,6 @@
#include "fxi.h"
@@ -4350,9 +4377,10 @@ diff -ruN fenix-0.92/fxi/src/g_scroll.c fenix-0.92+cvs20070713.1513/fxi/src/g_sc
/* Indicadores de bloqueo */
#define GRAPH_HWRAP 1
#define GRAPH_VWRAP 2
-diff -ruN fenix-0.92/fxi/src/g_texts.c fenix-0.92+cvs20070713.1513/fxi/src/g_texts.c
---- fenix-0.92/fxi/src/g_texts.c 2007-07-13 15:40:26.000000000 +0000
-+++ fenix-0.92+cvs20070713.1513/fxi/src/g_texts.c 2007-07-13 20:31:37.000000000 +0000
+Index: fenix-0.92a.dfsg1/fxi/src/g_texts.c
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxi/src/g_texts.c 2007-08-28 14:39:57.000000000 +0200
++++ fenix-0.92a.dfsg1/fxi/src/g_texts.c 2007-08-28 14:41:14.000000000 +0200
@@ -84,8 +84,7 @@
{
char *p1, *p2;
@@ -4438,9 +4466,10 @@ diff -ruN fenix-0.92/fxi/src/g_texts.c fenix-0.92+cvs20070713.1513/fxi/src/g_tex
}
else
{
-diff -ruN fenix-0.92/fxi/src/i_debug.c fenix-0.92+cvs20070713.1513/fxi/src/i_debug.c
---- fenix-0.92/fxi/src/i_debug.c 2007-07-13 15:40:26.000000000 +0000
-+++ fenix-0.92+cvs20070713.1513/fxi/src/i_debug.c 2007-07-13 20:31:37.000000000 +0000
+Index: fenix-0.92a.dfsg1/fxi/src/i_debug.c
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxi/src/i_debug.c 2007-08-28 14:39:58.000000000 +0200
++++ fenix-0.92a.dfsg1/fxi/src/i_debug.c 2007-08-28 14:41:14.000000000 +0200
@@ -155,7 +155,7 @@
{ "STR2FLOAT", MN_STR2FLOAT, 1 },
{ "FLOAT2STR", MN_FLOAT2STR, 1 },
@@ -4468,10 +4497,11 @@ diff -ruN fenix-0.92/fxi/src/i_debug.c fenix-0.92+cvs20070713.1513/fxi/src/i_deb
}
line[0] = 0 ;
-diff -ruN fenix-0.92/fxi/src/i_func.c fenix-0.92+cvs20070713.1513/fxi/src/i_func.c
---- fenix-0.92/fxi/src/i_func.c 2007-07-13 15:40:26.000000000 +0000
-+++ fenix-0.92+cvs20070713.1513/fxi/src/i_func.c 2007-07-13 20:38:44.000000000 +0000
-@@ -158,10 +158,10 @@
+Index: fenix-0.92a.dfsg1/fxi/src/i_func.c
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxi/src/i_func.c 2007-08-28 14:41:05.000000000 +0200
++++ fenix-0.92a.dfsg1/fxi/src/i_func.c 2007-08-28 14:41:15.000000000 +0200
+@@ -173,10 +173,10 @@
static int fxi_rand (INSTANCE * my, int * params)
{
@@ -4485,7 +4515,7 @@ diff -ruN fenix-0.92/fxi/src/i_func.c fenix-0.92+cvs20070713.1513/fxi/src/i_func
}
static int fxi_rand_seed (INSTANCE * my, int * params)
-@@ -173,7 +173,7 @@
+@@ -188,7 +188,7 @@
static int fxi_abs (INSTANCE * my, int * params)
{
float num = *(float *)¶ms[0] ;
@@ -4494,7 +4524,7 @@ diff -ruN fenix-0.92/fxi/src/i_func.c fenix-0.92+cvs20070713.1513/fxi/src/i_func
return *(int *)&res ;
}
-@@ -189,11 +189,11 @@
+@@ -204,11 +204,11 @@
double dy = params[3] - params[1] ;
int angle ;
@@ -4508,7 +4538,7 @@ diff -ruN fenix-0.92/fxi/src/i_func.c fenix-0.92+cvs20070713.1513/fxi/src/i_func
}
static int fxi_fget_dist (INSTANCE * my, int * params)
-@@ -210,11 +210,11 @@
+@@ -225,11 +225,11 @@
int dest = params[1] ;
int incr = params[2] ;
@@ -4524,7 +4554,7 @@ diff -ruN fenix-0.92/fxi/src/i_func.c fenix-0.92+cvs20070713.1513/fxi/src/i_func
if (angle < dest)
{
-@@ -227,8 +227,8 @@
+@@ -242,8 +242,8 @@
if (angle < dest) angle = dest ;
}
@@ -4535,7 +4565,7 @@ diff -ruN fenix-0.92/fxi/src/i_func.c fenix-0.92+cvs20070713.1513/fxi/src/i_func
return angle ;
}
-@@ -382,7 +382,7 @@
+@@ -397,7 +397,7 @@
if (instance_visible(i))
gr_mark_instance(i);
@@ -4544,7 +4574,7 @@ diff -ruN fenix-0.92/fxi/src/i_func.c fenix-0.92+cvs20070713.1513/fxi/src/i_func
{
case 0: /* S_KILL */
LOCDWORD(i, STATUS) = (LOCDWORD(i, STATUS) & STATUS_WAITING_MASK) | STATUS_KILLED ;
-@@ -501,6 +501,7 @@
+@@ -516,6 +516,7 @@
if (!params[0])
{
@@ -4552,7 +4582,7 @@ diff -ruN fenix-0.92/fxi/src/i_func.c fenix-0.92+cvs20070713.1513/fxi/src/i_func
if (LOCDWORD(my, ID_SCAN))
{
ptr = instance_get (LOCDWORD(my,ID_SCAN)) ;
-@@ -515,10 +516,10 @@
+@@ -530,10 +531,10 @@
}
ptr = ptr->next ;
}
@@ -4564,7 +4594,7 @@ diff -ruN fenix-0.92/fxi/src/i_func.c fenix-0.92+cvs20070713.1513/fxi/src/i_func
if (LOCDWORD(my,TYPE_SCAN))
{
ptr = instance_get (LOCDWORD(my,TYPE_SCAN)) ;
-@@ -539,7 +540,6 @@
+@@ -554,7 +555,6 @@
}
ptr = ptr->next ;
}
@@ -4572,7 +4602,7 @@ diff -ruN fenix-0.92/fxi/src/i_func.c fenix-0.92+cvs20070713.1513/fxi/src/i_func
return 0 ;
}
-@@ -694,8 +694,7 @@
+@@ -709,13 +709,14 @@
scalex = LOCDWORD(i,GRAPHSIZEX);
scaley = LOCDWORD(i,GRAPHSIZEY);
@@ -4582,10 +4612,6 @@ diff -ruN fenix-0.92/fxi/src/i_func.c fenix-0.92+cvs20070713.1513/fxi/src/i_func
map = instance_graph (i) ;
if (!map) return ;
-@@ -699,8 +698,10 @@
-
- map = instance_graph (i) ;
- if (!map) return ;
+
// PATCH - XGRAPH DOES NOT ROTATE DESTINATION GRAPHIC
- if (LOCDWORD(i,ANGLE) || scaley != 100 || scalex != 100) {
@@ -4594,7 +4620,7 @@ diff -ruN fenix-0.92/fxi/src/i_func.c fenix-0.92+cvs20070713.1513/fxi/src/i_func
if (LOCDWORD(i,XGRAPH) && scalex == 100 && scaley == 100) {
gr_blit (dest, r, x, y, LOCDWORD(i,FLAGS), map) ;
} else {
-@@ -770,10 +771,8 @@
+@@ -785,10 +786,8 @@
/* Creates a temporary bitmap (only once) */
@@ -4607,7 +4633,7 @@ diff -ruN fenix-0.92/fxi/src/i_func.c fenix-0.92+cvs20070713.1513/fxi/src/i_func
memset (bmp->data, 0, 2) ;
/* Retrieves process information */
-@@ -795,11 +794,9 @@
+@@ -810,11 +809,9 @@
{
REGION * r = scrolls[i].region;
@@ -4621,7 +4647,7 @@ diff -ruN fenix-0.92/fxi/src/i_func.c fenix-0.92+cvs20070713.1513/fxi/src/i_func
}
}
return 0;
-@@ -841,8 +838,8 @@
+@@ -856,8 +853,8 @@
bitmap_destroy (bmp) ;
return 0;
}
@@ -4632,7 +4658,7 @@ diff -ruN fenix-0.92/fxi/src/i_func.c fenix-0.92+cvs20070713.1513/fxi/src/i_func
get_pos (proc1, &x, &y) ;
x -= bbox1.x ;
-@@ -904,20 +901,18 @@
+@@ -919,20 +916,18 @@
{
INSTANCE * ptr = instance_get(params[0]) ;
@@ -4656,7 +4682,7 @@ diff -ruN fenix-0.92/fxi/src/i_func.c fenix-0.92+cvs20070713.1513/fxi/src/i_func
if (LOCDWORD(my, ID_SCAN))
{
ptr = instance_get (LOCDWORD(my, ID_SCAN)) ;
-@@ -939,17 +934,18 @@
+@@ -954,17 +949,18 @@
}
ptr = ptr->next ;
}
@@ -4679,7 +4705,7 @@ diff -ruN fenix-0.92/fxi/src/i_func.c fenix-0.92+cvs20070713.1513/fxi/src/i_func
while (ptr)
{
if (LOCDWORD(ptr,PROCESS_TYPE) == params[0] && ptr != my)
-@@ -964,7 +960,6 @@
+@@ -979,7 +975,6 @@
}
ptr = ptr->next ;
}
@@ -4687,7 +4713,7 @@ diff -ruN fenix-0.92/fxi/src/i_func.c fenix-0.92+cvs20070713.1513/fxi/src/i_func
return 0 ;
}
-@@ -1018,7 +1013,7 @@
+@@ -1033,7 +1028,7 @@
if (params[0]>1600 || params[1]>1400)
gr_error (_("Unsupported graphic mode"));
@@ -4696,7 +4722,7 @@ diff -ruN fenix-0.92/fxi/src/i_func.c fenix-0.92+cvs20070713.1513/fxi/src/i_func
gr_init(params[0], params[1]) ;
return 1 ;
}
-@@ -1150,10 +1145,71 @@
+@@ -1165,10 +1160,71 @@
/* Paleta de colores */
@@ -4769,7 +4795,7 @@ diff -ruN fenix-0.92/fxi/src/i_func.c fenix-0.92+cvs20070713.1513/fxi/src/i_func
string_discard (params[0]) ;
return r ;
}
-@@ -1169,7 +1225,11 @@
+@@ -1184,7 +1240,11 @@
static int fxi_load_pal (INSTANCE * my, int * params)
{
const char * palname = string_get (params[0]) ;
@@ -4782,7 +4808,7 @@ diff -ruN fenix-0.92/fxi/src/i_func.c fenix-0.92+cvs20070713.1513/fxi/src/i_func
string_discard (params[0]) ;
return r ;
}
-@@ -1648,7 +1708,7 @@
+@@ -1663,7 +1723,7 @@
background_8bits_used = 0;
}
@@ -4791,7 +4817,7 @@ diff -ruN fenix-0.92/fxi/src/i_func.c fenix-0.92+cvs20070713.1513/fxi/src/i_func
{
gr_blit (background, ®ions[r], params[2], params[3], params[6], map) ;
return 0 ;
-@@ -1826,7 +1886,7 @@
+@@ -1841,7 +1901,7 @@
GRAPH * dest = bitmap_get (params[0], params[1]) ;
GRAPH * orig = bitmap_get (params[0], params[2]) ;
@@ -4800,7 +4826,7 @@ diff -ruN fenix-0.92/fxi/src/i_func.c fenix-0.92+cvs20070713.1513/fxi/src/i_func
gr_blit (dest, 0, params[3], params[4], params[7], orig) ;
else
gr_rotated_blit (dest, 0, params[3], params[4], params[7], params[5], params[6], params[6], orig) ;
-@@ -1842,7 +1902,7 @@
+@@ -1857,7 +1917,7 @@
GRAPH * dest = bitmap_get (params[0], params[1]) ;
GRAPH * orig = bitmap_get (params[2], params[3]) ;
@@ -4809,7 +4835,7 @@ diff -ruN fenix-0.92/fxi/src/i_func.c fenix-0.92+cvs20070713.1513/fxi/src/i_func
gr_blit (dest, 0, params[4], params[5], params[9], orig) ;
else
gr_rotated_blit (dest, 0, params[4], params[5], params[9], params[6], params[7], params[8], orig) ;
-@@ -2093,8 +2153,7 @@
+@@ -2108,8 +2168,7 @@
GRAPH * map ;
unsigned char c = params[1];
@@ -4819,7 +4845,7 @@ diff -ruN fenix-0.92/fxi/src/i_func.c fenix-0.92+cvs20070713.1513/fxi/src/i_func
if (!scr_initialized) gr_init (320, 200) ;
if (!font) return 0;
-@@ -2118,13 +2177,11 @@
+@@ -2133,13 +2192,11 @@
GRAPH * map = bitmap_get(params[2], params[3]);
unsigned char c = params[1];
@@ -4835,7 +4861,7 @@ diff -ruN fenix-0.92/fxi/src/i_func.c fenix-0.92+cvs20070713.1513/fxi/src/i_func
font->glyph[c].bitmap = bitmap_clone(map);
if (map->ncpoints >= 3 && map->cpoints)
{
-@@ -2386,11 +2443,49 @@
+@@ -2401,11 +2458,49 @@
static int fxi_fputs (INSTANCE * my, int * params)
{
@@ -4886,7 +4912,7 @@ diff -ruN fenix-0.92/fxi/src/i_func.c fenix-0.92+cvs20070713.1513/fxi/src/i_func
static int fxi_file (INSTANCE * my, int * params)
{
char buffer[1024] ;
-@@ -2415,39 +2510,6 @@
+@@ -2430,39 +2525,6 @@
return str ;
}
@@ -4926,7 +4952,7 @@ diff -ruN fenix-0.92/fxi/src/i_func.c fenix-0.92+cvs20070713.1513/fxi/src/i_func
static int fxi_feof (INSTANCE * my, int * params)
{
return file_eof ((file *)params[0]) ;
-@@ -3977,9 +4039,9 @@
+@@ -3992,9 +4054,9 @@
}
}
r1/=tabla[9];g1/=tabla[9];b1/=tabla[9];
@@ -4939,7 +4965,7 @@ diff -ruN fenix-0.92/fxi/src/i_func.c fenix-0.92+cvs20070713.1513/fxi/src/i_func
if(r<0)r=0;
if(g<0)g=0;
-@@ -4816,7 +4878,7 @@
+@@ -4831,7 +4893,7 @@
}
stat (globd.gl_pathv[currentFile], &s);
@@ -4948,7 +4974,7 @@ diff -ruN fenix-0.92/fxi/src/i_func.c fenix-0.92+cvs20070713.1513/fxi/src/i_func
/* Store the file name and path */
if (GLODWORD(FILE_NAME))
-@@ -4847,7 +4909,7 @@
+@@ -4862,7 +4924,7 @@
}
/* Store integer and boolean variables */
@@ -4957,9 +4983,10 @@ diff -ruN fenix-0.92/fxi/src/i_func.c fenix-0.92+cvs20070713.1513/fxi/src/i_func
GLODWORD(FILE_HIDDEN) = (*ptr == '.');
GLODWORD(FILE_READONLY) = !(s.st_mode & 0444);
GLODWORD(FILE_SIZE) = s.st_size;
-diff -ruN fenix-0.92/fxi/src/i_main.c fenix-0.92+cvs20070713.1513/fxi/src/i_main.c
---- fenix-0.92/fxi/src/i_main.c 2007-07-13 15:40:26.000000000 +0000
-+++ fenix-0.92+cvs20070713.1513/fxi/src/i_main.c 2007-07-13 20:39:05.000000000 +0000
+Index: fenix-0.92a.dfsg1/fxi/src/i_main.c
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxi/src/i_main.c 2007-08-28 14:39:59.000000000 +0200
++++ fenix-0.92a.dfsg1/fxi/src/i_main.c 2007-08-28 14:41:15.000000000 +0200
@@ -182,7 +182,7 @@
return result;
}
@@ -5059,7 +5086,7 @@ diff -ruN fenix-0.92/fxi/src/i_main.c fenix-0.92+cvs20070713.1513/fxi/src/i_main
/* Dibuja el frame */
-@@ -326,8 +321,7 @@
+@@ -326,8 +323,7 @@
int instance_go (INSTANCE * r)
{
@@ -5069,7 +5096,7 @@ diff -ruN fenix-0.92/fxi/src/i_main.c fenix-0.92+cvs20070713.1513/fxi/src/i_main
register int * ptr = r->codeptr ;
register int * stack_ptr = stack_gptr ;
-@@ -335,10 +329,10 @@
+@@ -335,10 +331,10 @@
int n ;
int return_value = LOCDWORD(r, PROCESS_ID) ;
int was_visible;
@@ -5084,7 +5111,7 @@ diff -ruN fenix-0.92/fxi/src/i_main.c fenix-0.92+cvs20070713.1513/fxi/src/i_main
/* This variable contains a pointer to the private area at the stack.
It is 0 if the current process uses the instance's private area instead */
-@@ -353,17 +347,22 @@
+@@ -353,17 +349,22 @@
/* ------------------------------------------------------------------------------- */
/* Restauro si salio por debug */
@@ -5109,7 +5136,7 @@ diff -ruN fenix-0.92/fxi/src/i_main.c fenix-0.92+cvs20070713.1513/fxi/src/i_main
stack_ptr += ((*r->stack) & STACK_SIZE_MASK);
free (r->stack);
r->stack = NULL;
-@@ -385,7 +384,11 @@
+@@ -385,7 +386,11 @@
trace_sentence = -1;
@@ -5122,7 +5149,7 @@ diff -ruN fenix-0.92/fxi/src/i_main.c fenix-0.92+cvs20070713.1513/fxi/src/i_main
{
if (debug_next && trace_sentence != -1) {
force_debug = 1;
-@@ -393,11 +396,16 @@
+@@ -393,11 +398,16 @@
r->codeptr = ptr ;
stack_gptr = stack_ptr ;
return_value = LOCDWORD(r, PROCESS_ID);
@@ -5140,7 +5167,7 @@ diff -ruN fenix-0.92/fxi/src/i_main.c fenix-0.92+cvs20070713.1513/fxi/src/i_main
break;
}
-@@ -462,11 +470,12 @@
+@@ -462,11 +472,12 @@
case MN_CALL:
case MN_PROC:
@@ -5156,7 +5183,7 @@ diff -ruN fenix-0.92/fxi/src/i_main.c fenix-0.92+cvs20070713.1513/fxi/src/i_main
{
/* Process uses FRAME or locals, must create an instance */
i = instance_new (proc, r) ;
-@@ -483,7 +492,8 @@
+@@ -483,7 +494,8 @@
LOCDWORD(r,STATUS) |= STATUS_WAITING_MASK;
i->called_by = r;
@@ -5166,7 +5193,7 @@ diff -ruN fenix-0.92/fxi/src/i_main.c fenix-0.92+cvs20070713.1513/fxi/src/i_main
if (*ptr == MN_CALL) {
*stack_ptr++ = instance_go (i);
} else {
-@@ -499,7 +509,12 @@
+@@ -499,7 +511,12 @@
/* If the process is a function in a frame, save the stack and leave */
/* Si sigue corriendo la funcion/proceso que lance, es porque esta en un frame.
Si esta ejecutando codigo, es porque su STATUS es RUNNING */
@@ -5180,7 +5207,7 @@ diff -ruN fenix-0.92/fxi/src/i_main.c fenix-0.92+cvs20070713.1513/fxi/src/i_main
{
/* En este caso me pongo a dormir y retorno */
i->called_by = r;
-@@ -516,7 +531,7 @@
+@@ -516,7 +533,7 @@
/* Esta instancia no va a ejecutar otro codigo hasta que retorne el hijo */
r->codeptr = ptr ;
@@ -5189,7 +5216,7 @@ diff -ruN fenix-0.92/fxi/src/i_main.c fenix-0.92+cvs20070713.1513/fxi/src/i_main
stack_gptr = stack_begin;
/* Si no fue un call, seteo un flag en la len para no retornar valor */
-@@ -538,6 +553,7 @@
+@@ -538,6 +555,7 @@
}
proc = r->proc;
}
@@ -5197,7 +5224,7 @@ diff -ruN fenix-0.92/fxi/src/i_main.c fenix-0.92+cvs20070713.1513/fxi/src/i_main
else
{
/* This process can be called locally: create a private memory area using the stack */
-@@ -561,6 +577,7 @@
+@@ -561,6 +579,7 @@
*stack_ptr++ = (Sint32) old_data; // (stack_ptr[-2] in return)
base_code = ptr = proc->code;
}
@@ -5205,7 +5232,7 @@ diff -ruN fenix-0.92/fxi/src/i_main.c fenix-0.92+cvs20070713.1513/fxi/src/i_main
break ;
case MN_SYSCALL:
-@@ -639,7 +656,7 @@
+@@ -639,7 +658,7 @@
case MN_REMOTE | MN_STRING:
case MN_REMOTE | MN_FLOAT:
i = instance_get (stack_ptr[-1]) ;
@@ -5214,7 +5241,7 @@ diff -ruN fenix-0.92/fxi/src/i_main.c fenix-0.92+cvs20070713.1513/fxi/src/i_main
gr_error (_("Error executing process %s (%d): Inactive procedure %d\n"), proc->name, LOCDWORD(r,PROCESS_ID), stack_ptr[-1]) ;
else
stack_ptr[-1] = (int) &LOCDWORD(i, ptr[1]) ;
-@@ -655,7 +672,7 @@
+@@ -655,7 +674,7 @@
case MN_REMOTE_PUBLIC | MN_STRING:
case MN_REMOTE_PUBLIC | MN_FLOAT:
i = instance_get (stack_ptr[-1]) ;
@@ -5223,7 +5250,7 @@ diff -ruN fenix-0.92/fxi/src/i_main.c fenix-0.92+cvs20070713.1513/fxi/src/i_main
gr_error (_("Error executing process %s (%d): Inactive procedure %d\n"), proc->name, LOCDWORD(r,PROCESS_ID), stack_ptr[-1]) ;
else
stack_ptr[-1] = (int) &PUBDWORD(i, ptr[1]) ;
-@@ -696,7 +713,7 @@
+@@ -696,7 +715,7 @@
case MN_GET_REMOTE | MN_FLOAT:
case MN_GET_REMOTE | MN_UNSIGNED:
i = instance_get (stack_ptr[-1]) ;
@@ -5232,7 +5259,7 @@ diff -ruN fenix-0.92/fxi/src/i_main.c fenix-0.92+cvs20070713.1513/fxi/src/i_main
gr_error (_("Error executing process %s (%d): Inactive procedure %d\n"), proc->name, LOCDWORD(r,PROCESS_ID), stack_ptr[-1]) ;
else
stack_ptr[-1] = LOCDWORD(i,ptr[1]) ;
-@@ -707,7 +724,7 @@
+@@ -707,7 +726,7 @@
case MN_GET_REMOTE_PUBLIC | MN_FLOAT:
case MN_GET_REMOTE_PUBLIC | MN_UNSIGNED:
i = instance_get (stack_ptr[-1]) ;
@@ -5241,7 +5268,7 @@ diff -ruN fenix-0.92/fxi/src/i_main.c fenix-0.92+cvs20070713.1513/fxi/src/i_main
gr_error (_("Error executing process %s (%d): Inactive procedure %d\n"), proc->name, LOCDWORD(r,PROCESS_ID), stack_ptr[-1]) ;
else
stack_ptr[-1] = PUBDWORD(i,ptr[1]) ;
-@@ -755,7 +772,7 @@
+@@ -755,7 +774,7 @@
case MN_GET_REMOTE | MN_STRING:
i = instance_get (stack_ptr[-1]) ;
@@ -5250,7 +5277,7 @@ diff -ruN fenix-0.92/fxi/src/i_main.c fenix-0.92+cvs20070713.1513/fxi/src/i_main
gr_error (_("Error executing process %s (%d): Inactive procedure %d\n"), proc->name, LOCDWORD(r,PROCESS_ID), stack_ptr[-1]) ;
else
stack_ptr[-1] = LOCDWORD(i,ptr[1]) ;
-@@ -765,7 +782,7 @@
+@@ -765,7 +784,7 @@
case MN_GET_REMOTE_PUBLIC | MN_STRING:
i = instance_get (stack_ptr[-1]) ;
@@ -5259,7 +5286,7 @@ diff -ruN fenix-0.92/fxi/src/i_main.c fenix-0.92+cvs20070713.1513/fxi/src/i_main
gr_error (_("Error executing process %s (%d): Inactive procedure %d\n"), proc->name, LOCDWORD(r,PROCESS_ID), stack_ptr[-1]) ;
else
stack_ptr[-1] = PUBDWORD(i,ptr[1]) ;
-@@ -830,7 +847,7 @@
+@@ -830,7 +849,7 @@
case MN_WORD | MN_GET_REMOTE:
case MN_WORD | MN_GET_REMOTE | MN_UNSIGNED:
i = instance_get (stack_ptr[-1]) ;
@@ -5268,7 +5295,7 @@ diff -ruN fenix-0.92/fxi/src/i_main.c fenix-0.92+cvs20070713.1513/fxi/src/i_main
gr_error (_("Error executing process %s (%d): Inactive procedure %d\n"), proc->name, LOCDWORD(r,PROCESS_ID), stack_ptr[-1]) ;
else
stack_ptr[-1] = LOCWORD(i,ptr[1]) ;
-@@ -840,7 +857,7 @@
+@@ -840,7 +859,7 @@
case MN_WORD | MN_GET_REMOTE_PUBLIC:
case MN_WORD | MN_GET_REMOTE_PUBLIC | MN_UNSIGNED:
i = instance_get (stack_ptr[-1]) ;
@@ -5277,7 +5304,7 @@ diff -ruN fenix-0.92/fxi/src/i_main.c fenix-0.92+cvs20070713.1513/fxi/src/i_main
gr_error (_("Error executing process %s (%d): Inactive procedure %d\n"), proc->name, LOCDWORD(r,PROCESS_ID), stack_ptr[-1]) ;
else
stack_ptr[-1] = PUBWORD(i,ptr[1]) ;
-@@ -853,11 +870,11 @@
+@@ -853,11 +872,11 @@
ptr++ ;
break ;
@@ -5291,7 +5318,7 @@ diff -ruN fenix-0.92/fxi/src/i_main.c fenix-0.92+cvs20070713.1513/fxi/src/i_main
/* Acceso a variables tipo BYTE */
-@@ -903,7 +920,7 @@
+@@ -903,7 +922,7 @@
case MN_BYTE | MN_GET_REMOTE:
i = instance_get (stack_ptr[-1]) ;
@@ -5300,7 +5327,7 @@ diff -ruN fenix-0.92/fxi/src/i_main.c fenix-0.92+cvs20070713.1513/fxi/src/i_main
gr_error (_("Error executing process %s (%d): Inactive procedure %d\n"), proc->name, LOCDWORD(r,PROCESS_ID), stack_ptr[-1]) ;
else
stack_ptr[-1] = (signed char) LOCBYTE(i,ptr[1]) ;
-@@ -912,7 +929,7 @@
+@@ -912,7 +931,7 @@
case MN_BYTE | MN_GET_REMOTE | MN_UNSIGNED:
i = instance_get (stack_ptr[-1]) ;
@@ -5309,7 +5336,7 @@ diff -ruN fenix-0.92/fxi/src/i_main.c fenix-0.92+cvs20070713.1513/fxi/src/i_main
gr_error (_("Error executing process %s (%d): Inactive procedure %d\n"), proc->name, LOCDWORD(r,PROCESS_ID), stack_ptr[-1]) ;
else
stack_ptr[-1] = LOCBYTE(i,ptr[1]) ;
-@@ -921,7 +938,7 @@
+@@ -921,7 +940,7 @@
case MN_BYTE | MN_GET_REMOTE_PUBLIC:
i = instance_get (stack_ptr[-1]) ;
@@ -5318,7 +5345,7 @@ diff -ruN fenix-0.92/fxi/src/i_main.c fenix-0.92+cvs20070713.1513/fxi/src/i_main
gr_error (_("Error executing process %s (%d): Inactive procedure %d\n"), proc->name, LOCDWORD(r,PROCESS_ID), stack_ptr[-1]) ;
else
stack_ptr[-1] = (signed char) PUBBYTE(i,ptr[1]) ;
-@@ -930,7 +947,7 @@
+@@ -930,7 +949,7 @@
case MN_BYTE | MN_GET_REMOTE_PUBLIC | MN_UNSIGNED:
i = instance_get (stack_ptr[-1]) ;
@@ -5327,7 +5354,7 @@ diff -ruN fenix-0.92/fxi/src/i_main.c fenix-0.92+cvs20070713.1513/fxi/src/i_main
gr_error (_("Error executing process %s (%d): Inactive procedure %d\n"), proc->name, LOCDWORD(r,PROCESS_ID), stack_ptr[-1]) ;
else
stack_ptr[-1] = PUBBYTE(i,ptr[1]) ;
-@@ -947,11 +964,11 @@
+@@ -947,11 +966,11 @@
ptr++ ;
break ;
@@ -5341,7 +5368,7 @@ diff -ruN fenix-0.92/fxi/src/i_main.c fenix-0.92+cvs20070713.1513/fxi/src/i_main
/* Operaciones matem�ticas en coma floatante */
-@@ -1098,49 +1115,42 @@
+@@ -1098,121 +1117,101 @@
/* Operaciones a nivel de bit */
case MN_ROR:
@@ -5391,9 +5418,6 @@ diff -ruN fenix-0.92/fxi/src/i_main.c fenix-0.92+cvs20070713.1513/fxi/src/i_main
(stack_ptr[-2]) = (Sint32)(stack_ptr[-2]) << stack_ptr[-1] ;
stack_ptr-- ;
ptr++ ;
-@@ -1145,74 +1155,61 @@
- stack_ptr-- ;
- ptr++ ;
break ;
+
/* Todos estos ROL siguientes no serian necesarios, pero bueno... */
@@ -5471,7 +5495,7 @@ diff -ruN fenix-0.92/fxi/src/i_main.c fenix-0.92+cvs20070713.1513/fxi/src/i_main
stack_ptr[-1] = ~(stack_ptr[-1]) ;
ptr++ ;
break ;
-@@ -1495,21 +1492,23 @@
+@@ -1495,21 +1494,23 @@
string_use (stack_ptr[-ptr[1]-1]) ;
ptr += 2 ;
break ;
@@ -5500,7 +5524,7 @@ diff -ruN fenix-0.92/fxi/src/i_main.c fenix-0.92+cvs20070713.1513/fxi/src/i_main
stack_ptr[-ptr[1]-1] = str ? atoi(str) : 0 ;
string_discard (n) ;
ptr += 2 ;
-@@ -2035,8 +2034,7 @@
+@@ -2035,8 +2036,7 @@
break ;
case MN_SWITCH | MN_STRING:
@@ -5510,7 +5534,7 @@ diff -ruN fenix-0.92/fxi/src/i_main.c fenix-0.92+cvs20070713.1513/fxi/src/i_main
switchval_string = *--stack_ptr;
cased = 0;
ptr++;
-@@ -2099,11 +2097,9 @@
+@@ -2099,11 +2099,9 @@
stack_gptr = stack_ptr ;
return_value = LOCDWORD(r, PROCESS_ID);
@@ -5525,7 +5549,7 @@ diff -ruN fenix-0.92/fxi/src/i_main.c fenix-0.92+cvs20070713.1513/fxi/src/i_main
{
/* We're returning and the parent is waiting: wake it up */
if (r->called_by->stack && !(r->called_by->stack[0] & STACK_NO_RETURN_VALUE)) {
-@@ -2116,28 +2112,30 @@
+@@ -2116,28 +2114,30 @@
goto break_all ;
case MN_END:
@@ -5563,7 +5587,7 @@ diff -ruN fenix-0.92/fxi/src/i_main.c fenix-0.92+cvs20070713.1513/fxi/src/i_main
/* The process is inside a stack-call */
proc = (PROCDEF *)stack_ptr[-4]; // stack_ptr[-4] = Recupero el proc de la instancia actual
freestrings(proc, private_data);
-@@ -2159,7 +2157,7 @@
+@@ -2159,7 +2159,7 @@
r->inpridata = NULL;
r->inproc = NULL;
@@ -5572,7 +5596,7 @@ diff -ruN fenix-0.92/fxi/src/i_main.c fenix-0.92+cvs20070713.1513/fxi/src/i_main
break;
/* Otros */
-@@ -2195,7 +2193,7 @@
+@@ -2195,7 +2195,7 @@
}
/* Si me killearon o estoy en waiting salgo */
@@ -5581,7 +5605,7 @@ diff -ruN fenix-0.92/fxi/src/i_main.c fenix-0.92+cvs20070713.1513/fxi/src/i_main
r->codeptr = ptr;
stack_gptr = stack_ptr ;
return_value = LOCDWORD(r, PROCESS_ID);
-@@ -2217,40 +2216,34 @@
+@@ -2217,40 +2217,34 @@
gprof_end (proc->name);
@@ -5634,7 +5658,7 @@ diff -ruN fenix-0.92/fxi/src/i_main.c fenix-0.92+cvs20070713.1513/fxi/src/i_main
}
else if (LOCDWORD(r, STATUS) != STATUS_KILLED && r->first_run)
{
-@@ -2266,13 +2259,15 @@
+@@ -2266,13 +2260,15 @@
object_list_unsorted = 1;
}
@@ -5652,9 +5676,10 @@ diff -ruN fenix-0.92/fxi/src/i_main.c fenix-0.92+cvs20070713.1513/fxi/src/i_main
+
return return_value;
}
-diff -ruN fenix-0.92/fxi/src/img_pcx.c fenix-0.92+cvs20070713.1513/fxi/src/img_pcx.c
---- fenix-0.92/fxi/src/img_pcx.c 2007-07-13 15:40:26.000000000 +0000
-+++ fenix-0.92+cvs20070713.1513/fxi/src/img_pcx.c 2007-07-13 20:37:04.000000000 +0000
+Index: fenix-0.92a.dfsg1/fxi/src/img_pcx.c
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxi/src/img_pcx.c 2007-08-28 14:39:59.000000000 +0200
++++ fenix-0.92a.dfsg1/fxi/src/img_pcx.c 2007-08-28 14:41:16.000000000 +0200
@@ -81,6 +81,10 @@
Uint8 Filler[54];
} PCXheader ;
@@ -5710,9 +5735,10 @@ diff -ruN fenix-0.92/fxi/src/img_pcx.c fenix-0.92+cvs20070713.1513/fxi/src/img_p
} else {
gr_error (_("%s: unsupported color depth\n"), filename) ;
}
-diff -ruN fenix-0.92/fxi/src/img_png.c fenix-0.92+cvs20070713.1513/fxi/src/img_png.c
---- fenix-0.92/fxi/src/img_png.c 2007-07-13 15:40:26.000000000 +0000
-+++ fenix-0.92+cvs20070713.1513/fxi/src/img_png.c 2007-07-13 20:40:15.000000000 +0000
+Index: fenix-0.92a.dfsg1/fxi/src/img_png.c
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxi/src/img_png.c 2007-08-28 14:39:59.000000000 +0200
++++ fenix-0.92a.dfsg1/fxi/src/img_png.c 2007-08-28 14:41:16.000000000 +0200
@@ -144,35 +144,41 @@
/* Recupera el fichero, convirtiendo a 16 bits si es preciso */
@@ -5824,7 +5850,7 @@ diff -ruN fenix-0.92/fxi/src/img_png.c fenix-0.92+cvs20070713.1513/fxi/src/img_p
file_close (png) ;
bitmap->modified = 1 ;
-@@ -335,6 +332,7 @@
+@@ -335,6 +333,7 @@
png_colorp pal ;
Uint32 * data, * ptr ;
Uint16 * orig ;
@@ -5832,7 +5858,7 @@ diff -ruN fenix-0.92/fxi/src/img_png.c fenix-0.92+cvs20070713.1513/fxi/src/img_p
if (!file) return(0) ;
-@@ -347,8 +345,7 @@
+@@ -347,8 +346,7 @@
png_ptr = png_create_write_struct (PNG_LIBPNG_VER_STRING, 0, 0, 0) ;
info_ptr = png_create_info_struct (png_ptr) ;
@@ -5842,7 +5868,7 @@ diff -ruN fenix-0.92/fxi/src/img_png.c fenix-0.92+cvs20070713.1513/fxi/src/img_p
free ( rowpointers ) ;
fclose(file) ;
return(0) ;
-@@ -356,8 +353,7 @@
+@@ -356,8 +354,7 @@
/* Error handling... */
@@ -5852,7 +5878,7 @@ diff -ruN fenix-0.92/fxi/src/img_png.c fenix-0.92+cvs20070713.1513/fxi/src/img_p
fclose (file) ;
png_destroy_write_struct (&png_ptr, NULL) ;
free ( rowpointers ) ;
-@@ -368,8 +364,7 @@
+@@ -368,8 +365,7 @@
/* NOTE: NO SUPPORT FOR ANIMATIONS! */
@@ -5862,7 +5888,7 @@ diff -ruN fenix-0.92/fxi/src/img_png.c fenix-0.92+cvs20070713.1513/fxi/src/img_p
/* 8 bits PNG file */
png_set_IHDR (png_ptr, info_ptr, gr->width,
gr->height, 8, PNG_COLOR_TYPE_PALETTE,
-@@ -377,20 +372,20 @@
+@@ -377,20 +373,20 @@
PNG_FILTER_TYPE_BASE) ;
pal = (png_colorp) png_malloc (png_ptr, 256*sizeof(png_color)) ;
@@ -5890,7 +5916,7 @@ diff -ruN fenix-0.92/fxi/src/img_png.c fenix-0.92+cvs20070713.1513/fxi/src/img_p
}
png_set_PLTE (png_ptr, info_ptr, pal, 256) ;
png_write_info (png_ptr, info_ptr) ;
-@@ -403,9 +398,7 @@
+@@ -403,9 +399,7 @@
/* Free allocated palette... */
png_free (png_ptr, (png_voidp) pal) ;
info_ptr->palette = NULL ;
@@ -5901,7 +5927,7 @@ diff -ruN fenix-0.92/fxi/src/img_png.c fenix-0.92+cvs20070713.1513/fxi/src/img_p
png_set_IHDR (png_ptr, info_ptr, gr->width,
gr->height, 8, PNG_COLOR_TYPE_RGB_ALPHA,
PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_BASE,
-@@ -413,24 +406,20 @@
+@@ -413,24 +407,20 @@
png_write_info (png_ptr, info_ptr) ;
data = malloc (gr->width * gr->height * 4) ;
@@ -5930,9 +5956,10 @@ diff -ruN fenix-0.92/fxi/src/img_png.c fenix-0.92+cvs20070713.1513/fxi/src/img_p
*ptr = ((*orig & 0xf800) >> 8) |
((*orig & 0x07e0) << 5) |
((*orig & 0x001f) << 19)|
-diff -ruN fenix-0.92/fxi/src/instance.c fenix-0.92+cvs20070713.1513/fxi/src/instance.c
---- fenix-0.92/fxi/src/instance.c 2007-04-12 22:08:56.000000000 +0000
-+++ fenix-0.92+cvs20070713.1513/fxi/src/instance.c 2007-07-13 20:31:37.000000000 +0000
+Index: fenix-0.92a.dfsg1/fxi/src/instance.c
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxi/src/instance.c 2007-08-28 14:38:27.000000000 +0200
++++ fenix-0.92a.dfsg1/fxi/src/instance.c 2007-08-28 14:41:16.000000000 +0200
@@ -53,12 +53,12 @@
/* destrucci�n, duplicado, etc. */
/* ---------------------------------------------------------------------- */
@@ -6040,11 +6067,11 @@ diff -ruN fenix-0.92/fxi/src/instance.c fenix-0.92+cvs20070713.1513/fxi/src/inst
/* Remove the instance from the priority list */
- if (first_by_priority == r)
- first_by_priority = r->next_by_priority;
--
-- if (r->prev_by_priority)
-- r->prev_by_priority->next_by_priority = r->next_by_priority;
+ if (first_by_priority == r) first_by_priority = r->next_by_priority;
+- if (r->prev_by_priority)
+- r->prev_by_priority->next_by_priority = r->next_by_priority;
+-
- if (r->next_by_priority)
- r->next_by_priority->prev_by_priority = r->prev_by_priority;
+ if (r->prev_by_priority) r->prev_by_priority->next_by_priority = r->next_by_priority;
@@ -6254,7 +6281,7 @@ diff -ruN fenix-0.92/fxi/src/instance.c fenix-0.92+cvs20070713.1513/fxi/src/inst
// There are no instances in the list
first_by_priority = i;
-@@ -915,12 +874,19 @@
+@@ -915,12 +875,19 @@
dirty_list = NULL;
@@ -6274,9 +6301,10 @@ diff -ruN fenix-0.92/fxi/src/instance.c fenix-0.92+cvs20070713.1513/fxi/src/inst
return i;
}
-diff -ruN fenix-0.92/include/files.h fenix-0.92+cvs20070713.1513/include/files.h
---- fenix-0.92/include/files.h 2007-04-12 22:09:04.000000000 +0000
-+++ fenix-0.92+cvs20070713.1513/include/files.h 2007-07-13 20:31:37.000000000 +0000
+Index: fenix-0.92a.dfsg1/include/files.h
+===================================================================
+--- fenix-0.92a.dfsg1.orig/include/files.h 2007-08-28 14:38:27.000000000 +0200
++++ fenix-0.92a.dfsg1/include/files.h 2007-08-28 14:41:16.000000000 +0200
@@ -51,6 +51,8 @@
extern int file_writeUint16 (file * fp, Uint16 * buffer) ;
extern int file_writeSint32 (file * fp, Sint32 * buffer) ;
@@ -6286,10 +6314,11 @@ diff -ruN fenix-0.92/include/files.h fenix-0.92+cvs20070713.1513/include/files.h
extern int file_gets (file * fp, char * buffer, int len) ;
extern int file_puts (file * fp, const char * buffer) ;
extern int file_size (file * fp) ;
-diff -ruN fenix-0.92/include/fxdll.h fenix-0.92+cvs20070713.1513/include/fxdll.h
---- fenix-0.92/include/fxdll.h 2007-04-12 22:09:06.000000000 +0000
-+++ fenix-0.92+cvs20070713.1513/include/fxdll.h 2007-07-13 20:31:37.000000000 +0000
-@@ -128,6 +128,8 @@
+Index: fenix-0.92a.dfsg1/include/fxdll.h
+===================================================================
+--- fenix-0.92a.dfsg1.orig/include/fxdll.h 2007-08-28 14:41:04.000000000 +0200
++++ fenix-0.92a.dfsg1/include/fxdll.h 2007-08-28 14:41:17.000000000 +0200
+@@ -136,6 +136,8 @@
FXEXTERN int (*_file_write )(file * fp, const void * buffer, int len) ;
FXEXTERN int (*_file_gets )(file * fp, char * buffer, int len) ;
FXEXTERN int (*_file_puts )(file * fp, const char * buffer) ;
@@ -6298,7 +6327,7 @@ diff -ruN fenix-0.92/include/fxdll.h fenix-0.92+cvs20070713.1513/include/fxdll.h
FXEXTERN int (*_file_size )(file * fp) ;
FXEXTERN int (*_file_pos )(file * fp) ;
FXEXTERN int (*_file_seek )(file * fp, int pos, int where) ;
-@@ -142,6 +144,9 @@
+@@ -150,6 +152,9 @@
#define file_read (*_file_read)
#define file_write (*_file_write)
#define file_gets (*_file_gets)
@@ -6308,7 +6337,7 @@ diff -ruN fenix-0.92/include/fxdll.h fenix-0.92+cvs20070713.1513/include/fxdll.h
#define file_size (*_file_size)
#define file_pos (*_file_pos)
#define file_seek (*_file_seek)
-@@ -399,7 +404,8 @@
+@@ -407,7 +412,8 @@
FXEXTERN int * _fade_on ; /* �Hay un fade activo? */
FXEXTERN int * _fade_step ; /* Si lo hay, posici�n (0=off) */
@@ -6318,7 +6347,7 @@ diff -ruN fenix-0.92/include/fxdll.h fenix-0.92+cvs20070713.1513/include/fxdll.h
FXEXTERN void (*_gr_refresh_palette )() ;
FXEXTERN void (*_gr_fade_init )(int r, int g, int b, int speed, int dir) ;
FXEXTERN void (*_gr_fade_step )() ;
-@@ -412,6 +418,7 @@
+@@ -420,6 +426,7 @@
FXEXTERN void (*_gr_get_colors )(int color, int num, Uint8 * pal) ;
#define gr_read_pal (*_gr_read_pal)
@@ -6326,7 +6355,7 @@ diff -ruN fenix-0.92/include/fxdll.h fenix-0.92+cvs20070713.1513/include/fxdll.h
#define gr_refresh_palette (*_gr_refresh_palette)
#define gr_fade_init (*_gr_fade_init)
#define gr_fade_step (*_gr_fade_step)
-@@ -948,6 +955,8 @@
+@@ -956,6 +963,8 @@
_file_write = FENIX_import ( "file_write" ); \
_file_gets = FENIX_import ( "file_gets" ); \
_file_puts = FENIX_import ( "file_puts" ); \
@@ -6335,9 +6364,10 @@ diff -ruN fenix-0.92/include/fxdll.h fenix-0.92+cvs20070713.1513/include/fxdll.h
_file_size = FENIX_import ( "file_size" ); \
_file_pos = FENIX_import ( "file_pos" ); \
_file_seek = FENIX_import ( "file_seek" ); \
-diff -ruN fenix-0.92/include/offsets.h fenix-0.92+cvs20070713.1513/include/offsets.h
---- fenix-0.92/include/offsets.h 2007-04-12 22:09:06.000000000 +0000
-+++ fenix-0.92+cvs20070713.1513/include/offsets.h 2007-07-13 20:31:37.000000000 +0000
+Index: fenix-0.92a.dfsg1/include/offsets.h
+===================================================================
+--- fenix-0.92a.dfsg1.orig/include/offsets.h 2007-08-28 14:38:27.000000000 +0200
++++ fenix-0.92a.dfsg1/include/offsets.h 2007-08-28 14:41:17.000000000 +0200
@@ -160,28 +160,30 @@
#define COORDY 4*24
#define COORDZ 4*25
@@ -6394,9 +6424,10 @@ diff -ruN fenix-0.92/include/offsets.h fenix-0.92+cvs20070713.1513/include/offse
+#define SAVED_FILE 4*51
+#define SAVED_XGRAPH 4*52
+#define SAVED_PRIORITY 4*53
-diff -ruN fenix-0.92/include/pslang.h fenix-0.92+cvs20070713.1513/include/pslang.h
---- fenix-0.92/include/pslang.h 2007-04-12 22:09:06.000000000 +0000
-+++ fenix-0.92+cvs20070713.1513/include/pslang.h 2007-07-13 20:31:37.000000000 +0000
+Index: fenix-0.92a.dfsg1/include/pslang.h
+===================================================================
+--- fenix-0.92a.dfsg1.orig/include/pslang.h 2007-08-28 14:38:27.000000000 +0200
++++ fenix-0.92a.dfsg1/include/pslang.h 2007-08-28 14:41:17.000000000 +0200
@@ -236,7 +236,7 @@
/* Funciones de cadena (2) */
@@ -6406,9 +6437,10 @@ diff -ruN fenix-0.92/include/pslang.h fenix-0.92+cvs20070713.1513/include/pslang
#define MN_STR2INT (0x77| MN_1_PARAMS)
#define MN_STR2FLOAT (0x78| MN_1_PARAMS)
#define MN_STR2CHR (0x79| MN_1_PARAMS)
-diff -ruN fenix-0.92/include/sysprocs.h fenix-0.92+cvs20070713.1513/include/sysprocs.h
---- fenix-0.92/include/sysprocs.h 2007-04-13 18:19:04.000000000 +0000
-+++ fenix-0.92+cvs20070713.1513/include/sysprocs.h 2007-07-13 20:31:37.000000000 +0000
+Index: fenix-0.92a.dfsg1/include/sysprocs.h
+===================================================================
+--- fenix-0.92a.dfsg1.orig/include/sysprocs.h 2007-08-28 14:38:27.000000000 +0200
++++ fenix-0.92a.dfsg1/include/sysprocs.h 2007-08-28 14:41:17.000000000 +0200
@@ -97,7 +97,6 @@
{ 0x5A, "JOY_BUTTONS" , "I" , TYPE_DWORD , 1 , SYSMACRO(fxi_joy_buttons_specific) },
{ 0x5B, "JOY_AXES" , "I" , TYPE_DWORD , 1 , SYSMACRO(fxi_joy_axes_specific) },
@@ -6619,9 +6651,10 @@ diff -ruN fenix-0.92/include/sysprocs.h fenix-0.92+cvs20070713.1513/include/sysp
{ 0 , 0 , "" , 0 , 0 , 0 }
} ;
-diff -ruN fenix-0.92/NEWS fenix-0.92+cvs20070713.1513/NEWS
---- fenix-0.92/NEWS 2007-04-13 18:21:52.000000000 +0000
-+++ fenix-0.92+cvs20070713.1513/NEWS 2007-07-13 20:31:37.000000000 +0000
+Index: fenix-0.92a.dfsg1/NEWS
+===================================================================
+--- fenix-0.92a.dfsg1.orig/NEWS 2007-08-28 14:38:27.000000000 +0200
++++ fenix-0.92a.dfsg1/NEWS 2007-08-28 14:41:17.000000000 +0200
@@ -1,3 +1,85 @@
+0.93
+- Se corrige convesion a negativo de n�meros unsigned.
diff --git a/debian/patches/common_stdfiles.patch b/debian/patches/common_stdfiles.patch
index 8f6b6ab..1bb14c3 100644
--- a/debian/patches/common_stdfiles.patch
+++ b/debian/patches/common_stdfiles.patch
@@ -1,5 +1,7 @@
---- fenix-0.92a.dfsg1/include/files_st.h.orig 2007-07-31 14:31:07.000000000 +0000
-+++ fenix-0.92a.dfsg1/include/files_st.h 2007-07-31 14:31:24.000000000 +0000
+Index: fenix-0.92a.dfsg1/include/files_st.h
+===================================================================
+--- fenix-0.92a.dfsg1.orig/include/files_st.h 2007-08-28 14:38:36.000000000 +0200
++++ fenix-0.92a.dfsg1/include/files_st.h 2007-08-28 14:40:08.000000000 +0200
@@ -39,6 +39,7 @@
#define F_XFILE 1
#define F_FILE 2
@@ -8,9 +10,10 @@
#include <zlib.h>
-diff -ruN Fenix/common/files.c fenix-0.92a.dfsg1/common/files.c
---- Fenix/common/files.c 2007-04-12 22:07:56.000000000 +0000
-+++ fenix-0.92a.dfsg1/common/files.c 2007-07-29 17:55:07.531111567 +0000
+Index: fenix-0.92a.dfsg1/common/files.c
+===================================================================
+--- fenix-0.92a.dfsg1.orig/common/files.c 2007-08-28 14:38:36.000000000 +0200
++++ fenix-0.92a.dfsg1/common/files.c 2007-08-28 14:44:28.000000000 +0200
@@ -460,6 +460,31 @@
memset (f, 0, sizeof(file)) ;
strncpy (f->name, filename, MAX_PATH);
diff --git a/debian/patches/configure.patch b/debian/patches/configure.patch
index 92b89bb..63bda72 100644
--- a/debian/patches/configure.patch
+++ b/debian/patches/configure.patch
@@ -1,6 +1,7 @@
-diff -ruN fenix0.92-0.92a.orig/configure fenix0.92-0.92a/configure
---- fenix0.92-0.92a.orig/configure 2007-04-13 18:19:02.000000000 +0000
-+++ fenix0.92-0.92a/configure 2007-06-05 18:40:44.000000000 +0000
+Index: fenix-0.92a.dfsg1/configure
+===================================================================
+--- fenix-0.92a.dfsg1.orig/configure 2007-08-28 14:38:55.000000000 +0200
++++ fenix-0.92a.dfsg1/configure 2007-08-28 14:44:28.000000000 +0200
@@ -1629,7 +1629,7 @@
*)
@@ -19,9 +20,10 @@ diff -ruN fenix0.92-0.92a.orig/configure fenix0.92-0.92a/configure
fi
-diff -ruN fenix0.92-0.92a.orig/configure.in fenix0.92-0.92a/configure.in
---- fenix0.92-0.92a.orig/configure.in 2007-04-13 18:19:02.000000000 +0000
-+++ fenix0.92-0.92a/configure.in 2007-06-05 18:40:39.000000000 +0000
+Index: fenix-0.92a.dfsg1/configure.in
+===================================================================
+--- fenix-0.92a.dfsg1.orig/configure.in 2007-08-28 14:38:55.000000000 +0200
++++ fenix-0.92a.dfsg1/configure.in 2007-08-28 14:44:29.000000000 +0200
@@ -48,7 +48,7 @@
*)
diff --git a/debian/patches/endianess.patch b/debian/patches/endianess.patch
new file mode 100644
index 0000000..b235514
--- /dev/null
+++ b/debian/patches/endianess.patch
@@ -0,0 +1,15 @@
+Index: fenix-0.92a.dfsg1/fxi/src/fpl.c
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxi/src/fpl.c 2007-08-28 14:43:22.000000000 +0200
++++ fenix-0.92a.dfsg1/fxi/src/fpl.c 2007-08-28 14:43:53.000000000 +0200
+@@ -81,8 +81,8 @@
+ return 0 ;
+ }
+
+- ARRANGE_DWORD(&file_header.depth);
+- ARRANGE_DWORD(&file_header.version);
++ ARRANGE_DWORD(&header.depth);
++ ARRANGE_DWORD(&header.version);
+
+ if (!FPL_VALID_DEPTH(header.depth)) {
+ fpl_error = _("Invalid colour depth in the FPL file") ;
diff --git a/debian/patches/fxc_nosdlinit.patch b/debian/patches/fxc_nosdlinit.patch
index 56f35da..1f9dd82 100644
--- a/debian/patches/fxc_nosdlinit.patch
+++ b/debian/patches/fxc_nosdlinit.patch
@@ -1,5 +1,7 @@
---- fenix0.92-0.92a.dfsg1.orig/fxc/src/main.c 2007-07-02 18:29:53.000000000 +0000
-+++ fenix0.92-0.92a.dfsg1/fxc/src/main.c 2007-07-02 18:26:59.000000000 +0000
+Index: fenix-0.92a.dfsg1/fxc/src/main.c
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxc/src/main.c 2007-08-28 14:39:51.000000000 +0200
++++ fenix-0.92a.dfsg1/fxc/src/main.c 2007-08-28 14:46:05.000000000 +0200
@@ -154,14 +154,6 @@
srand (time(NULL)) ;
diff --git a/debian/patches/fxc_output.patch b/debian/patches/fxc_output.patch
index b2286fb..f8acf2b 100644
--- a/debian/patches/fxc_output.patch
+++ b/debian/patches/fxc_output.patch
@@ -1,6 +1,8 @@
---- fenix0.92-0.92a.dfsg1.orig/fxc/src/main.c
-+++ fenix0.92-0.92a.dfsg1/fxc/src/main.c
-@@ -114,6 +114,7 @@
+Index: fenix-0.92a.dfsg1/fxc/src/main.c
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxc/src/main.c 2007-08-28 14:40:06.000000000 +0200
++++ fenix-0.92a.dfsg1/fxc/src/main.c 2007-08-28 14:45:56.000000000 +0200
+@@ -126,6 +126,7 @@
{
char * filename = 0 ;
char dcbname[256] ;
@@ -8,7 +10,7 @@
char stubname[256] = "";
int i, j ;
-@@ -226,6 +227,17 @@
+@@ -239,6 +240,17 @@
break ;
}
@@ -26,7 +28,7 @@
j++ ;
}
}
-@@ -246,10 +258,17 @@
+@@ -262,10 +274,17 @@
return 0 ;
}
diff --git a/debian/patches/fxc_return_values.patch b/debian/patches/fxc_return_values.patch
index 6b97a20..bdb586a 100644
--- a/debian/patches/fxc_return_values.patch
+++ b/debian/patches/fxc_return_values.patch
@@ -1,6 +1,7 @@
-diff -ruN fenix-0.92a.dfsg1.orig/fxc/src/main.c fenix-0.92a.dfsg1/fxc/src/main.c
---- fenix-0.92a.dfsg1.orig/fxc/src/main.c 2007-07-31 13:59:25.000000000 +0000
-+++ fenix-0.92a.dfsg1/fxc/src/main.c 2007-07-31 14:02:05.000000000 +0000
+Index: fenix-0.92a.dfsg1/fxc/src/main.c
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxc/src/main.c 2007-08-28 14:40:55.000000000 +0200
++++ fenix-0.92a.dfsg1/fxc/src/main.c 2007-08-28 14:40:58.000000000 +0200
@@ -260,7 +260,7 @@
{
fprintf (stderr, MSG_TOO_MANY_FILES) ;
diff --git a/debian/patches/fxdll_version.patch b/debian/patches/fxdll_version.patch
index bc6da8a..5d70f11 100644
--- a/debian/patches/fxdll_version.patch
+++ b/debian/patches/fxdll_version.patch
@@ -1,5 +1,7 @@
---- fenix-0.92a.dfsg1.orig/fxc/src/c_main.c
-+++ fenix-0.92a.dfsg1/fxc/src/c_main.c
+Index: fenix-0.92a.dfsg1/fxc/src/c_main.c
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxc/src/c_main.c 2007-08-28 14:41:01.000000000 +0200
++++ fenix-0.92a.dfsg1/fxc/src/c_main.c 2007-08-28 14:44:29.000000000 +0200
@@ -36,6 +36,11 @@
#include <fnx_loadlib.h>
@@ -12,7 +14,7 @@
#ifdef USE_GETTEXT
#include <libintl.h>
#include <locale.h>
-@@ -342,6 +347,9 @@
+@@ -351,6 +356,9 @@
const char * filename ;
void * library = NULL;
dlfunc RegisterFunctions ;
@@ -20,9 +22,9 @@
+ unsigned int * PluginVersion ;
+#endif
- #if defined( TARGET_Linux ) || defined ( TARGET_BEOS ) || defined ( TARGET_MAC ) || defined ( TARGET_BSD )
- char soname[1024];
-@@ -409,8 +417,13 @@
+ #if defined( TARGET_Linux ) || defined ( TARGET_BEOS ) || defined ( TARGET_BSD )
+ struct stat stat_buf;
+@@ -438,8 +446,13 @@
library = dlopen (filename, RTLD_NOW | RTLD_GLOBAL) ;
if (!library) compile_error (dlerror()) ;
@@ -37,8 +39,10 @@
(*RegisterFunctions)(compile_export, sysproc_add) ;
}
---- fenix-0.92a.dfsg1.orig/include/fnx_loadlib.h
-+++ fenix-0.92a.dfsg1/include/fnx_loadlib.h
+Index: fenix-0.92a.dfsg1/include/fnx_loadlib.h
+===================================================================
+--- fenix-0.92a.dfsg1.orig/include/fnx_loadlib.h 2007-08-28 14:38:30.000000000 +0200
++++ fenix-0.92a.dfsg1/include/fnx_loadlib.h 2007-08-28 14:41:04.000000000 +0200
@@ -61,7 +61,7 @@
#ifdef WIN32
@@ -48,8 +52,10 @@
static char * dlerror (void)
{
---- fenix-0.92a.dfsg1.orig/include/fxdll.h
-+++ fenix-0.92a.dfsg1/include/fxdll.h
+Index: fenix-0.92a.dfsg1/include/fxdll.h
+===================================================================
+--- fenix-0.92a.dfsg1.orig/include/fxdll.h 2007-08-28 14:38:31.000000000 +0200
++++ fenix-0.92a.dfsg1/include/fxdll.h 2007-08-28 14:44:32.000000000 +0200
@@ -54,6 +54,14 @@
#else
#define FXEXTERN extern
@@ -65,8 +71,10 @@
/*
* Declaracion de funciones
---- fenix-0.92a.dfsg1.orig/include/fxdll_version.h
-+++ fenix-0.92a.dfsg1/include/fxdll_version.h
+Index: fenix-0.92a.dfsg1/include/fxdll_version.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ fenix-0.92a.dfsg1/include/fxdll_version.h 2007-08-28 14:41:04.000000000 +0200
@@ -0,0 +1,11 @@
+#ifndef FXDLL_VERSION
+
@@ -79,8 +87,10 @@
+#define FXDLL_VERSION 0x0001
+
+#endif
---- fenix-0.92a.dfsg1.orig/fxi/src/i_func.c
-+++ fenix-0.92a.dfsg1/fxi/src/i_func.c
+Index: fenix-0.92a.dfsg1/fxi/src/i_func.c
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxi/src/i_func.c 2007-08-28 14:41:02.000000000 +0200
++++ fenix-0.92a.dfsg1/fxi/src/i_func.c 2007-08-28 14:44:31.000000000 +0200
@@ -125,6 +125,11 @@
#include <fnx_loadlib.h>
@@ -93,7 +103,7 @@
#ifdef USE_GETTEXT
#include <libintl.h>
#define _(String) gettext (String)
-@@ -5089,6 +5094,9 @@
+@@ -5037,6 +5042,9 @@
SYSPROC * proc = sysprocs ;
void * library ;
dlfunc RegisterFunctions ;
@@ -103,7 +113,7 @@
const char * filename;
unsigned int n ;
-@@ -5155,8 +5163,13 @@
+@@ -5121,8 +5129,13 @@
if (!library) gr_error (dlerror()) ;
diff --git a/debian/patches/fxi_apptitle.patch b/debian/patches/fxi_apptitle.patch
index 4b06827..0e30776 100644
--- a/debian/patches/fxi_apptitle.patch
+++ b/debian/patches/fxi_apptitle.patch
@@ -1,6 +1,8 @@
---- fenix-0.92a.dfsg1/fxi/src/main.c.orig 2007-08-02 10:27:57.000000000 +0000
-+++ fenix-0.92a.dfsg1/fxi/src/main.c 2007-08-02 10:35:37.000000000 +0000
-@@ -258,6 +258,19 @@
+Index: fenix-0.92a.dfsg1/fxi/src/main.c
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxi/src/main.c 2007-08-28 14:41:00.000000000 +0200
++++ fenix-0.92a.dfsg1/fxi/src/main.c 2007-08-28 14:41:06.000000000 +0200
+@@ -260,6 +260,19 @@
//if (argv[i][j] == 'b') double_buffer = 1 ;
if (argv[i][j] == 'f') enable_filtering = 1 ;
@@ -20,7 +22,7 @@
if (argv[i][j] == 'i')
{
if (argv[i][j+1] == 0)
-@@ -315,7 +328,13 @@
+@@ -317,7 +330,13 @@
/* Init application title for windowed modes */
strcpy (dcbname, filename) ;
diff --git a/debian/patches/fxi_binname.patch b/debian/patches/fxi_binname.patch
index 7dd6874..5618fc6 100644
--- a/debian/patches/fxi_binname.patch
+++ b/debian/patches/fxi_binname.patch
@@ -1,6 +1,8 @@
---- fenix-inniyah-0.93.20070803/fxi/src/main.c.orig 2007-08-03 18:27:25.000000000 +0200
-+++ fenix-inniyah-0.93.20070803/fxi/src/main.c 2007-08-03 18:29:46.000000000 +0200
-@@ -158,7 +158,8 @@
+Index: fenix-0.92a.dfsg1/fxi/src/main.c
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxi/src/main.c 2007-08-28 14:39:59.000000000 +0200
++++ fenix-0.92a.dfsg1/fxi/src/main.c 2007-08-28 14:46:00.000000000 +0200
+@@ -174,7 +174,8 @@
ptr = argv[0] + strlen(argv[0]) ;
while (ptr > argv[0] && ptr[-1] != '\\' && ptr[-1] != '/')
ptr-- ;
@@ -10,7 +12,7 @@
/* Init RAND generator */
-@@ -236,8 +241,10 @@
+@@ -236,8 +237,10 @@
/* No embedded DCB; search for a DCB with similar name */
filename = ptr ;
diff --git a/debian/patches/fxi_input.patch b/debian/patches/fxi_input.patch
index 92d04f8..ef0a9e1 100644
--- a/debian/patches/fxi_input.patch
+++ b/debian/patches/fxi_input.patch
@@ -1,6 +1,7 @@
-diff -ruN fenix-0.92a.raw/fxi/src/dcbr.c fenix-0.92a/fxi/src/dcbr.c
---- fenix-0.92a.raw/fxi/src/dcbr.c 2007-07-28 11:07:02.566318000 +0000
-+++ fenix-0.92a/fxi/src/dcbr.c 2007-07-29 17:40:47.485362067 +0000
+Index: fenix-0.92a.dfsg1/fxi/src/dcbr.c
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxi/src/dcbr.c 2007-08-28 14:39:54.000000000 +0200
++++ fenix-0.92a.dfsg1/fxi/src/dcbr.c 2007-08-28 14:44:30.000000000 +0200
@@ -144,7 +144,7 @@
file * fp ;
@@ -10,10 +11,11 @@ diff -ruN fenix-0.92a.raw/fxi/src/dcbr.c fenix-0.92a/fxi/src/dcbr.c
fp = file_open (filename, "rb0") ;
if (!fp)
-diff -ruN fenix-0.92a.raw/fxi/src/main.c fenix-0.92a/fxi/src/main.c
---- fenix-0.92a.raw/fxi/src/main.c 2007-07-28 11:06:34.620571000 +0000
-+++ fenix-0.92a/fxi/src/main.c 2007-07-28 11:10:59.733140328 +0000
-@@ -248,7 +248,7 @@
+Index: fenix-0.92a.dfsg1/fxi/src/main.c
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxi/src/main.c 2007-08-28 14:40:05.000000000 +0200
++++ fenix-0.92a.dfsg1/fxi/src/main.c 2007-08-28 14:45:52.000000000 +0200
+@@ -250,7 +250,7 @@
for (i = 1 ; i < argc ; i++)
{
diff --git a/debian/patches/fxi_return_values.patch b/debian/patches/fxi_return_values.patch
index 63cfa00..72810fd 100644
--- a/debian/patches/fxi_return_values.patch
+++ b/debian/patches/fxi_return_values.patch
@@ -1,7 +1,8 @@
-diff -ruN fenix-0.92a.dfsg1.orig/fxi/src/main.c fenix-0.92a.dfsg1/fxi/src/main.c
---- fenix-0.92a.dfsg1.orig/fxi/src/main.c 2007-07-31 13:59:25.000000000 +0000
-+++ fenix-0.92a.dfsg1/fxi/src/main.c 2007-07-31 14:03:36.000000000 +0000
-@@ -302,7 +302,7 @@
+Index: fenix-0.92a.dfsg1/fxi/src/main.c
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxi/src/main.c 2007-08-28 14:40:57.000000000 +0200
++++ fenix-0.92a.dfsg1/fxi/src/main.c 2007-08-28 14:45:34.000000000 +0200
+@@ -304,7 +304,7 @@
"agreement (GNU GPL version 2 or later).\n"
"See COPYING for license details.\n"),
argv[0]) ;
@@ -10,7 +11,7 @@ diff -ruN fenix-0.92a.dfsg1.orig/fxi/src/main.c fenix-0.92a.dfsg1/fxi/src/main.c
}
}
-@@ -340,7 +340,7 @@
+@@ -342,7 +342,7 @@
if (!dcb_load(dcbname))
{
gr_error (_("'%s': file does not exist or it's not a DCB version %d file or compatible"), filename, DCB_VERSION >> 8) ;
diff --git a/debian/patches/i18n_fpg.patch b/debian/patches/i18n_fpg.patch
index 833b537..0a8688c 100644
--- a/debian/patches/i18n_fpg.patch
+++ b/debian/patches/i18n_fpg.patch
@@ -1,6 +1,7 @@
-diff -ruN fenix0.92-0.92a.dfsg1.orig/fpg/fpg.c fenix0.92-0.92a.dfsg1/fpg/fpg.c
---- fenix0.92-0.92a.dfsg1.orig/fpg/fpg.c 2007-04-12 22:08:04.000000000 +0000
-+++ fenix0.92-0.92a.dfsg1/fpg/fpg.c 2007-07-02 17:28:09.000000000 +0000
+Index: fenix-0.92a.dfsg1/fpg/fpg.c
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fpg/fpg.c 2007-08-28 14:38:39.000000000 +0200
++++ fenix-0.92a.dfsg1/fpg/fpg.c 2007-08-28 14:40:02.000000000 +0200
@@ -24,6 +24,14 @@
#ifndef WIN32
#include <unistd.h>
diff --git a/debian/patches/i18n_fxc.patch b/debian/patches/i18n_fxc.patch
index 47e24ff..b22a08a 100644
--- a/debian/patches/i18n_fxc.patch
+++ b/debian/patches/i18n_fxc.patch
@@ -1,6 +1,7 @@
-diff -ruN fenix0.92-0.92a.dfsg1.orig/fxc/src/c_data.c fenix0.92-0.92a.dfsg1/fxc/src/c_data.c
---- fenix0.92-0.92a.dfsg1.orig/fxc/src/c_data.c 2007-04-12 22:08:14.000000000 +0000
-+++ fenix0.92-0.92a.dfsg1/fxc/src/c_data.c 2007-07-02 18:19:48.000000000 +0000
+Index: fenix-0.92a.dfsg1/fxc/src/c_data.c
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxc/src/c_data.c 2007-08-28 14:38:52.000000000 +0200
++++ fenix-0.92a.dfsg1/fxc/src/c_data.c 2007-08-28 14:39:50.000000000 +0200
@@ -33,6 +33,14 @@
#include <string.h>
#include <stdlib.h>
@@ -25,9 +26,10 @@ diff -ruN fenix0.92-0.92a.dfsg1.orig/fxc/src/c_data.c fenix0.92-0.92a.dfsg1/fxc/
exit(1) ;
}
varspace_init (members) ;
-diff -ruN fenix0.92-0.92a.dfsg1.orig/fxc/src/c_main.c fenix0.92-0.92a.dfsg1/fxc/src/c_main.c
---- fenix0.92-0.92a.dfsg1.orig/fxc/src/c_main.c 2007-04-12 22:08:18.000000000 +0000
-+++ fenix0.92-0.92a.dfsg1/fxc/src/c_main.c 2007-07-02 18:19:48.000000000 +0000
+Index: fenix-0.92a.dfsg1/fxc/src/c_main.c
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxc/src/c_main.c 2007-08-28 14:38:52.000000000 +0200
++++ fenix-0.92a.dfsg1/fxc/src/c_main.c 2007-08-28 14:45:44.000000000 +0200
@@ -36,6 +36,14 @@
#include <fnx_loadlib.h>
@@ -105,9 +107,10 @@ diff -ruN fenix0.92-0.92a.dfsg1.orig/fxc/src/c_main.c fenix0.92-0.92a.dfsg1/fxc/
varspace_dump (&local, 0) ;
//segment_dump (localdata) ;
}
-diff -ruN fenix0.92-0.92a.dfsg1.orig/fxc/src/codeblock.c fenix0.92-0.92a.dfsg1/fxc/src/codeblock.c
---- fenix0.92-0.92a.dfsg1.orig/fxc/src/codeblock.c 2007-04-12 22:08:18.000000000 +0000
-+++ fenix0.92-0.92a.dfsg1/fxc/src/codeblock.c 2007-07-02 18:19:48.000000000 +0000
+Index: fenix-0.92a.dfsg1/fxc/src/codeblock.c
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxc/src/codeblock.c 2007-08-28 14:38:52.000000000 +0200
++++ fenix-0.92a.dfsg1/fxc/src/codeblock.c 2007-08-28 14:39:51.000000000 +0200
@@ -32,6 +32,14 @@
#include <assert.h>
#endif
@@ -168,9 +171,10 @@ diff -ruN fenix0.92-0.92a.dfsg1.orig/fxc/src/codeblock.c fenix0.92-0.92a.dfsg1/f
}
if (c->current > 0)
-diff -ruN fenix0.92-0.92a.dfsg1.orig/fxc/src/constants.c fenix0.92-0.92a.dfsg1/fxc/src/constants.c
---- fenix0.92-0.92a.dfsg1.orig/fxc/src/constants.c 2007-04-12 22:08:18.000000000 +0000
-+++ fenix0.92-0.92a.dfsg1/fxc/src/constants.c 2007-07-02 18:19:48.000000000 +0000
+Index: fenix-0.92a.dfsg1/fxc/src/constants.c
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxc/src/constants.c 2007-08-28 14:38:52.000000000 +0200
++++ fenix-0.92a.dfsg1/fxc/src/constants.c 2007-08-28 14:39:51.000000000 +0200
@@ -26,6 +26,14 @@
#include <stdio.h>
#include <stdlib.h>
@@ -206,9 +210,10 @@ diff -ruN fenix0.92-0.92a.dfsg1.orig/fxc/src/constants.c fenix0.92-0.92a.dfsg1/f
+ fprintf (stderr, "%4d: %-16s= %d\n", i,
identifier_name(constants[i].code), constants[i].value) ;
}
-diff -ruN fenix0.92-0.92a.dfsg1.orig/fxc/src/dcbw.c fenix0.92-0.92a.dfsg1/fxc/src/dcbw.c
---- fenix0.92-0.92a.dfsg1.orig/fxc/src/dcbw.c 2007-04-12 22:08:18.000000000 +0000
-+++ fenix0.92-0.92a.dfsg1/fxc/src/dcbw.c 2007-07-02 18:19:48.000000000 +0000
+Index: fenix-0.92a.dfsg1/fxc/src/dcbw.c
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxc/src/dcbw.c 2007-08-28 14:38:52.000000000 +0200
++++ fenix-0.92a.dfsg1/fxc/src/dcbw.c 2007-08-28 14:44:29.000000000 +0200
@@ -33,6 +33,14 @@
#include <stdio.h>
#include <string.h>
@@ -311,9 +316,10 @@ diff -ruN fenix0.92-0.92a.dfsg1.orig/fxc/src/dcbw.c fenix0.92-0.92a.dfsg1/fxc/sr
return 1 ;
}
-diff -ruN fenix0.92-0.92a.dfsg1.orig/fxc/src/identifier.c fenix0.92-0.92a.dfsg1/fxc/src/identifier.c
---- fenix0.92-0.92a.dfsg1.orig/fxc/src/identifier.c 2007-04-12 22:08:20.000000000 +0000
-+++ fenix0.92-0.92a.dfsg1/fxc/src/identifier.c 2007-07-02 18:19:48.000000000 +0000
+Index: fenix-0.92a.dfsg1/fxc/src/identifier.c
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxc/src/identifier.c 2007-08-28 14:38:52.000000000 +0200
++++ fenix-0.92a.dfsg1/fxc/src/identifier.c 2007-08-28 14:39:51.000000000 +0200
@@ -32,6 +32,15 @@
#else
#include <assert.h>
@@ -365,9 +371,10 @@ diff -ruN fenix0.92-0.92a.dfsg1.orig/fxc/src/identifier.c fenix0.92-0.92a.dfsg1/
exit(1);
}
w->line = line_count ; // Save First appearance
-diff -ruN fenix0.92-0.92a.dfsg1.orig/fxc/src/main.c fenix0.92-0.92a.dfsg1/fxc/src/main.c
---- fenix0.92-0.92a.dfsg1.orig/fxc/src/main.c 2007-04-12 22:08:20.000000000 +0000
-+++ fenix0.92-0.92a.dfsg1/fxc/src/main.c 2007-07-02 18:19:48.000000000 +0000
+Index: fenix-0.92a.dfsg1/fxc/src/main.c
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxc/src/main.c 2007-08-28 14:38:53.000000000 +0200
++++ fenix-0.92a.dfsg1/fxc/src/main.c 2007-08-28 14:46:13.000000000 +0200
@@ -38,6 +38,14 @@
#include "Shlwapi.h"
#endif
@@ -486,9 +493,10 @@ diff -ruN fenix0.92-0.92a.dfsg1.orig/fxc/src/main.c fenix0.92-0.92a.dfsg1/fxc/sr
return -1;
}
}
-diff -ruN fenix0.92-0.92a.dfsg1.orig/fxc/src/messages.c fenix0.92-0.92a.dfsg1/fxc/src/messages.c
---- fenix0.92-0.92a.dfsg1.orig/fxc/src/messages.c 2007-04-12 22:08:20.000000000 +0000
-+++ fenix0.92-0.92a.dfsg1/fxc/src/messages.c 2007-07-02 18:19:48.000000000 +0000
+Index: fenix-0.92a.dfsg1/fxc/src/messages.c
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxc/src/messages.c 2007-08-28 14:38:53.000000000 +0200
++++ fenix-0.92a.dfsg1/fxc/src/messages.c 2007-08-28 14:39:52.000000000 +0200
@@ -24,16 +24,22 @@
*
*/
@@ -662,9 +670,10 @@ diff -ruN fenix0.92-0.92a.dfsg1.orig/fxc/src/messages.c fenix0.92-0.92a.dfsg1/fx
-#endif
+*/
-diff -ruN fenix0.92-0.92a.dfsg1.orig/fxc/src/procedure.c fenix0.92-0.92a.dfsg1/fxc/src/procedure.c
---- fenix0.92-0.92a.dfsg1.orig/fxc/src/procedure.c 2007-04-12 22:08:20.000000000 +0000
-+++ fenix0.92-0.92a.dfsg1/fxc/src/procedure.c 2007-07-02 18:19:48.000000000 +0000
+Index: fenix-0.92a.dfsg1/fxc/src/procedure.c
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxc/src/procedure.c 2007-08-28 14:38:53.000000000 +0200
++++ fenix-0.92a.dfsg1/fxc/src/procedure.c 2007-08-28 14:39:52.000000000 +0200
@@ -33,6 +33,14 @@
#include <assert.h>
#endif
@@ -698,9 +707,10 @@ diff -ruN fenix0.92-0.92a.dfsg1.orig/fxc/src/procedure.c fenix0.92-0.92a.dfsg1/f
exit (1) ;
}
}
-diff -ruN fenix0.92-0.92a.dfsg1.orig/fxc/src/segment.c fenix0.92-0.92a.dfsg1/fxc/src/segment.c
---- fenix0.92-0.92a.dfsg1.orig/fxc/src/segment.c 2007-04-12 22:08:22.000000000 +0000
-+++ fenix0.92-0.92a.dfsg1/fxc/src/segment.c 2007-07-02 18:19:48.000000000 +0000
+Index: fenix-0.92a.dfsg1/fxc/src/segment.c
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxc/src/segment.c 2007-08-28 14:38:53.000000000 +0200
++++ fenix-0.92a.dfsg1/fxc/src/segment.c 2007-08-28 14:39:52.000000000 +0200
@@ -28,6 +28,14 @@
#include <stdlib.h>
#include <string.h>
@@ -727,9 +737,10 @@ diff -ruN fenix0.92-0.92a.dfsg1.orig/fxc/src/segment.c fenix0.92-0.92a.dfsg1/fxc
}
void segment_copy(segment *s, int base_offset, int total_length)
-diff -ruN fenix0.92-0.92a.dfsg1.orig/fxc/src/strings.c fenix0.92-0.92a.dfsg1/fxc/src/strings.c
---- fenix0.92-0.92a.dfsg1.orig/fxc/src/strings.c 2007-04-12 22:08:22.000000000 +0000
-+++ fenix0.92-0.92a.dfsg1/fxc/src/strings.c 2007-07-02 18:19:48.000000000 +0000
+Index: fenix-0.92a.dfsg1/fxc/src/strings.c
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxc/src/strings.c 2007-08-28 14:38:53.000000000 +0200
++++ fenix-0.92a.dfsg1/fxc/src/strings.c 2007-08-28 14:39:52.000000000 +0200
@@ -33,6 +33,14 @@
#include <assert.h>
#endif
@@ -784,9 +795,10 @@ diff -ruN fenix0.92-0.92a.dfsg1.orig/fxc/src/strings.c fenix0.92-0.92a.dfsg1/fxc
exit(1) ;
}
}
-diff -ruN fenix0.92-0.92a.dfsg1.orig/fxc/src/token.c fenix0.92-0.92a.dfsg1/fxc/src/token.c
---- fenix0.92-0.92a.dfsg1.orig/fxc/src/token.c 2007-04-12 22:08:22.000000000 +0000
-+++ fenix0.92-0.92a.dfsg1/fxc/src/token.c 2007-07-02 18:19:48.000000000 +0000
+Index: fenix-0.92a.dfsg1/fxc/src/token.c
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxc/src/token.c 2007-08-28 14:38:53.000000000 +0200
++++ fenix-0.92a.dfsg1/fxc/src/token.c 2007-08-28 14:39:52.000000000 +0200
@@ -29,6 +29,14 @@
#include <string.h>
#include <stdlib.h>
@@ -843,9 +855,10 @@ diff -ruN fenix0.92-0.92a.dfsg1.orig/fxc/src/token.c fenix0.92-0.92a.dfsg1/fxc/s
exit(1) ;
}
-diff -ruN fenix0.92-0.92a.dfsg1.orig/fxc/src/varspace.c fenix0.92-0.92a.dfsg1/fxc/src/varspace.c
---- fenix0.92-0.92a.dfsg1.orig/fxc/src/varspace.c 2007-04-12 22:08:22.000000000 +0000
-+++ fenix0.92-0.92a.dfsg1/fxc/src/varspace.c 2007-07-02 18:19:48.000000000 +0000
+Index: fenix-0.92a.dfsg1/fxc/src/varspace.c
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxc/src/varspace.c 2007-08-28 14:38:53.000000000 +0200
++++ fenix-0.92a.dfsg1/fxc/src/varspace.c 2007-08-28 14:39:52.000000000 +0200
@@ -28,6 +28,14 @@
#include <stdlib.h>
#include <string.h>
diff --git a/debian/patches/i18n_fxi.patch b/debian/patches/i18n_fxi.patch
index d8da801..e2f7e3b 100644
--- a/debian/patches/i18n_fxi.patch
+++ b/debian/patches/i18n_fxi.patch
@@ -1,6 +1,7 @@
-diff -ruN fenix0.92-0.92a.dfsg1.orig/fxi/src/dcbr.c fenix0.92-0.92a.dfsg1/fxi/src/dcbr.c
---- fenix0.92-0.92a.dfsg1.orig/fxi/src/dcbr.c 2007-04-12 22:08:30.000000000 +0000
-+++ fenix0.92-0.92a.dfsg1/fxi/src/dcbr.c 2007-07-02 18:41:48.000000000 +0000
+Index: fenix-0.92a.dfsg1/fxi/src/dcbr.c
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxi/src/dcbr.c 2007-08-28 14:38:47.000000000 +0200
++++ fenix-0.92a.dfsg1/fxi/src/dcbr.c 2007-08-28 14:46:00.000000000 +0200
@@ -45,6 +45,14 @@
#else
#include <direct.h>
@@ -25,9 +26,10 @@ diff -ruN fenix0.92-0.92a.dfsg1.orig/fxi/src/dcbr.c fenix0.92-0.92a.dfsg1/fxi/sr
return dcb_load_from (fp, 0);
}
-diff -ruN fenix0.92-0.92a.dfsg1.orig/fxi/src/fbm.c fenix0.92-0.92a.dfsg1/fxi/src/fbm.c
---- fenix0.92-0.92a.dfsg1.orig/fxi/src/fbm.c 2007-04-12 22:08:32.000000000 +0000
-+++ fenix0.92-0.92a.dfsg1/fxi/src/fbm.c 2007-07-02 18:41:48.000000000 +0000
+Index: fenix-0.92a.dfsg1/fxi/src/fbm.c
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxi/src/fbm.c 2007-08-28 14:38:47.000000000 +0200
++++ fenix-0.92a.dfsg1/fxi/src/fbm.c 2007-08-28 14:44:30.000000000 +0200
@@ -34,6 +34,13 @@
#include <string.h>
#include <stdlib.h>
@@ -243,9 +245,10 @@ diff -ruN fenix0.92-0.92a.dfsg1.orig/fxi/src/fbm.c fenix0.92-0.92a.dfsg1/fxi/src
file_close (fp);
return 0;
}
-diff -ruN fenix0.92-0.92a.dfsg1.orig/fxi/src/fgc.c fenix0.92-0.92a.dfsg1/fxi/src/fgc.c
---- fenix0.92-0.92a.dfsg1.orig/fxi/src/fgc.c 2007-04-12 22:08:32.000000000 +0000
-+++ fenix0.92-0.92a.dfsg1/fxi/src/fgc.c 2007-07-02 18:41:48.000000000 +0000
+Index: fenix-0.92a.dfsg1/fxi/src/fgc.c
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxi/src/fgc.c 2007-08-28 14:38:47.000000000 +0200
++++ fenix-0.92a.dfsg1/fxi/src/fgc.c 2007-08-28 14:44:30.000000000 +0200
@@ -39,6 +39,13 @@
#include <assert.h>
#endif
@@ -373,9 +376,10 @@ diff -ruN fenix0.92-0.92a.dfsg1.orig/fxi/src/fgc.c fenix0.92-0.92a.dfsg1/fxi/src
free(offsets);
file_close(fp);
return -1;
-diff -ruN fenix0.92-0.92a.dfsg1.orig/fxi/src/fnc_exports.c fenix0.92-0.92a.dfsg1/fxi/src/fnc_exports.c
---- fenix0.92-0.92a.dfsg1.orig/fxi/src/fnc_exports.c 2007-04-12 22:08:32.000000000 +0000
-+++ fenix0.92-0.92a.dfsg1/fxi/src/fnc_exports.c 2007-07-02 18:41:48.000000000 +0000
+Index: fenix-0.92a.dfsg1/fxi/src/fnc_exports.c
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxi/src/fnc_exports.c 2007-08-28 14:38:47.000000000 +0200
++++ fenix-0.92a.dfsg1/fxi/src/fnc_exports.c 2007-08-28 14:44:30.000000000 +0200
@@ -35,6 +35,13 @@
#include <stdlib.h>
@@ -423,9 +427,10 @@ diff -ruN fenix0.92-0.92a.dfsg1.orig/fxi/src/fnc_exports.c fenix0.92-0.92a.dfsg1
+ gr_con_printf (_("[FXI] %4d symbols not found"), global_notfound);
}
-diff -ruN fenix0.92-0.92a.dfsg1.orig/fxi/src/fpl.c fenix0.92-0.92a.dfsg1/fxi/src/fpl.c
---- fenix0.92-0.92a.dfsg1.orig/fxi/src/fpl.c 2007-04-12 22:08:32.000000000 +0000
-+++ fenix0.92-0.92a.dfsg1/fxi/src/fpl.c 2007-07-02 18:41:48.000000000 +0000
+Index: fenix-0.92a.dfsg1/fxi/src/fpl.c
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxi/src/fpl.c 2007-08-28 14:38:47.000000000 +0200
++++ fenix-0.92a.dfsg1/fxi/src/fpl.c 2007-08-28 14:44:30.000000000 +0200
@@ -34,6 +34,13 @@
#include <string.h>
#include <stdlib.h>
@@ -512,9 +517,10 @@ diff -ruN fenix0.92-0.92a.dfsg1.orig/fxi/src/fpl.c fenix0.92-0.92a.dfsg1/fxi/src
return 0;
}
-diff -ruN fenix0.92-0.92a.dfsg1.orig/fxi/src/f_sort.c fenix0.92-0.92a.dfsg1/fxi/src/f_sort.c
---- fenix0.92-0.92a.dfsg1.orig/fxi/src/f_sort.c 2007-04-12 22:08:32.000000000 +0000
-+++ fenix0.92-0.92a.dfsg1/fxi/src/f_sort.c 2007-07-02 18:41:48.000000000 +0000
+Index: fenix-0.92a.dfsg1/fxi/src/f_sort.c
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxi/src/f_sort.c 2007-08-28 14:38:47.000000000 +0200
++++ fenix-0.92a.dfsg1/fxi/src/f_sort.c 2007-08-28 14:39:55.000000000 +0200
@@ -32,6 +32,13 @@
#include <stdlib.h>
#include <string.h>
@@ -643,9 +649,10 @@ diff -ruN fenix0.92-0.92a.dfsg1.orig/fxi/src/f_sort.c fenix0.92-0.92a.dfsg1/fxi/
return 0;
}
-diff -ruN fenix0.92-0.92a.dfsg1.orig/fxi/src/g_blit.c fenix0.92-0.92a.dfsg1/fxi/src/g_blit.c
---- fenix0.92-0.92a.dfsg1.orig/fxi/src/g_blit.c 2007-04-12 22:08:36.000000000 +0000
-+++ fenix0.92-0.92a.dfsg1/fxi/src/g_blit.c 2007-07-02 18:41:48.000000000 +0000
+Index: fenix-0.92a.dfsg1/fxi/src/g_blit.c
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxi/src/g_blit.c 2007-08-28 14:38:47.000000000 +0200
++++ fenix-0.92a.dfsg1/fxi/src/g_blit.c 2007-08-28 14:44:30.000000000 +0200
@@ -44,6 +44,13 @@
#include "fmath.h"
@@ -678,9 +685,10 @@ diff -ruN fenix0.92-0.92a.dfsg1.orig/fxi/src/g_blit.c fenix0.92-0.92a.dfsg1/fxi/
/* Calculate the graphic center */
-diff -ruN fenix0.92-0.92a.dfsg1.orig/fxi/src/g_console.c fenix0.92-0.92a.dfsg1/fxi/src/g_console.c
---- fenix0.92-0.92a.dfsg1.orig/fxi/src/g_console.c 2007-04-12 22:08:38.000000000 +0000
-+++ fenix0.92-0.92a.dfsg1/fxi/src/g_console.c 2007-07-02 18:41:48.000000000 +0000
+Index: fenix-0.92a.dfsg1/fxi/src/g_console.c
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxi/src/g_console.c 2007-08-28 14:38:47.000000000 +0200
++++ fenix-0.92a.dfsg1/fxi/src/g_console.c 2007-08-28 14:44:30.000000000 +0200
@@ -35,6 +35,13 @@
#include <string.h>
#include <ctype.h>
@@ -1036,9 +1044,10 @@ diff -ruN fenix0.92-0.92a.dfsg1.orig/fxi/src/g_console.c fenix0.92-0.92a.dfsg1/f
}
return;
}
-diff -ruN fenix0.92-0.92a.dfsg1.orig/fxi/src/g_conversion.c fenix0.92-0.92a.dfsg1/fxi/src/g_conversion.c
---- fenix0.92-0.92a.dfsg1.orig/fxi/src/g_conversion.c 2007-04-13 18:19:04.000000000 +0000
-+++ fenix0.92-0.92a.dfsg1/fxi/src/g_conversion.c 2007-07-02 18:41:48.000000000 +0000
+Index: fenix-0.92a.dfsg1/fxi/src/g_conversion.c
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxi/src/g_conversion.c 2007-08-28 14:38:47.000000000 +0200
++++ fenix-0.92a.dfsg1/fxi/src/g_conversion.c 2007-08-28 14:44:30.000000000 +0200
@@ -34,6 +34,13 @@
#include <stdlib.h>
@@ -1062,9 +1071,10 @@ diff -ruN fenix0.92-0.92a.dfsg1.orig/fxi/src/g_conversion.c fenix0.92-0.92a.dfsg
return;
}
-diff -ruN fenix0.92-0.92a.dfsg1.orig/fxi/src/g_draw.c fenix0.92-0.92a.dfsg1/fxi/src/g_draw.c
---- fenix0.92-0.92a.dfsg1.orig/fxi/src/g_draw.c 2007-04-12 22:08:38.000000000 +0000
-+++ fenix0.92-0.92a.dfsg1/fxi/src/g_draw.c 2007-07-02 18:41:48.000000000 +0000
+Index: fenix-0.92a.dfsg1/fxi/src/g_draw.c
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxi/src/g_draw.c 2007-08-28 14:38:47.000000000 +0200
++++ fenix-0.92a.dfsg1/fxi/src/g_draw.c 2007-08-28 14:44:31.000000000 +0200
@@ -34,6 +34,13 @@
#include <math.h>
#include <stdlib.h>
@@ -1106,9 +1116,10 @@ diff -ruN fenix0.92-0.92a.dfsg1.orig/fxi/src/g_draw.c fenix0.92-0.92a.dfsg1/fxi/
}
if (dest == background && !color)
-diff -ruN fenix0.92-0.92a.dfsg1.orig/fxi/src/g_font.c fenix0.92-0.92a.dfsg1/fxi/src/g_font.c
---- fenix0.92-0.92a.dfsg1.orig/fxi/src/g_font.c 2007-04-12 22:08:40.000000000 +0000
-+++ fenix0.92-0.92a.dfsg1/fxi/src/g_font.c 2007-07-02 18:41:48.000000000 +0000
+Index: fenix-0.92a.dfsg1/fxi/src/g_font.c
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxi/src/g_font.c 2007-08-28 14:38:48.000000000 +0200
++++ fenix-0.92a.dfsg1/fxi/src/g_font.c 2007-08-28 14:44:31.000000000 +0200
@@ -40,6 +40,13 @@
#include <stdlib.h>
#include <string.h>
@@ -1201,9 +1212,10 @@ diff -ruN fenix0.92-0.92a.dfsg1.orig/fxi/src/g_font.c fenix0.92-0.92a.dfsg1/fxi/
return -1;
}
-diff -ruN fenix0.92-0.92a.dfsg1.orig/fxi/src/g_fpg.c fenix0.92-0.92a.dfsg1/fxi/src/g_fpg.c
---- fenix0.92-0.92a.dfsg1.orig/fxi/src/g_fpg.c 2007-04-13 18:19:04.000000000 +0000
-+++ fenix0.92-0.92a.dfsg1/fxi/src/g_fpg.c 2007-07-02 18:41:48.000000000 +0000
+Index: fenix-0.92a.dfsg1/fxi/src/g_fpg.c
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxi/src/g_fpg.c 2007-08-28 14:38:48.000000000 +0200
++++ fenix-0.92a.dfsg1/fxi/src/g_fpg.c 2007-08-28 14:44:31.000000000 +0200
@@ -38,6 +38,13 @@
#include <windows.h>
#endif
@@ -1248,9 +1260,10 @@ diff -ruN fenix0.92-0.92a.dfsg1.orig/fxi/src/g_fpg.c fenix0.92-0.92a.dfsg1/fxi/s
#endif
return -1 ;
}
-diff -ruN fenix0.92-0.92a.dfsg1.orig/fxi/src/g_main.c fenix0.92-0.92a.dfsg1/fxi/src/g_main.c
---- fenix0.92-0.92a.dfsg1.orig/fxi/src/g_main.c 2007-04-13 18:19:04.000000000 +0000
-+++ fenix0.92-0.92a.dfsg1/fxi/src/g_main.c 2007-07-02 18:41:48.000000000 +0000
+Index: fenix-0.92a.dfsg1/fxi/src/g_main.c
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxi/src/g_main.c 2007-08-28 14:38:48.000000000 +0200
++++ fenix-0.92a.dfsg1/fxi/src/g_main.c 2007-08-28 14:44:31.000000000 +0200
@@ -47,6 +47,13 @@
#include <assert.h>
#endif
@@ -1330,9 +1343,10 @@ diff -ruN fenix0.92-0.92a.dfsg1.orig/fxi/src/g_main.c fenix0.92-0.92a.dfsg1/fxi/
SDL_ShowCursor (0) ;
-diff -ruN fenix0.92-0.92a.dfsg1.orig/fxi/src/g_maps.c fenix0.92-0.92a.dfsg1/fxi/src/g_maps.c
---- fenix0.92-0.92a.dfsg1.orig/fxi/src/g_maps.c 2007-04-13 18:19:04.000000000 +0000
-+++ fenix0.92-0.92a.dfsg1/fxi/src/g_maps.c 2007-07-02 18:41:48.000000000 +0000
+Index: fenix-0.92a.dfsg1/fxi/src/g_maps.c
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxi/src/g_maps.c 2007-08-28 14:38:48.000000000 +0200
++++ fenix-0.92a.dfsg1/fxi/src/g_maps.c 2007-08-28 14:44:31.000000000 +0200
@@ -41,6 +41,13 @@
#include <string.h>
#include <stdlib.h>
@@ -1383,9 +1397,10 @@ diff -ruN fenix0.92-0.92a.dfsg1.orig/fxi/src/g_maps.c fenix0.92-0.92a.dfsg1/fxi/
return -1 ;
}
-diff -ruN fenix0.92-0.92a.dfsg1.orig/fxi/src/g_pal.c fenix0.92-0.92a.dfsg1/fxi/src/g_pal.c
---- fenix0.92-0.92a.dfsg1.orig/fxi/src/g_pal.c 2007-04-12 22:08:46.000000000 +0000
-+++ fenix0.92-0.92a.dfsg1/fxi/src/g_pal.c 2007-07-02 18:41:48.000000000 +0000
+Index: fenix-0.92a.dfsg1/fxi/src/g_pal.c
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxi/src/g_pal.c 2007-08-28 14:38:48.000000000 +0200
++++ fenix-0.92a.dfsg1/fxi/src/g_pal.c 2007-08-28 14:44:31.000000000 +0200
@@ -40,6 +40,13 @@
#include <string.h>
#include <stdlib.h>
@@ -1463,9 +1478,10 @@ diff -ruN fenix0.92-0.92a.dfsg1.orig/fxi/src/g_pal.c fenix0.92-0.92a.dfsg1/fxi/s
}
}
-diff -ruN fenix0.92-0.92a.dfsg1.orig/fxi/src/g_profiler.c fenix0.92-0.92a.dfsg1/fxi/src/g_profiler.c
---- fenix0.92-0.92a.dfsg1.orig/fxi/src/g_profiler.c 2007-04-12 22:08:46.000000000 +0000
-+++ fenix0.92-0.92a.dfsg1/fxi/src/g_profiler.c 2007-07-02 18:41:48.000000000 +0000
+Index: fenix-0.92a.dfsg1/fxi/src/g_profiler.c
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxi/src/g_profiler.c 2007-08-28 14:38:48.000000000 +0200
++++ fenix-0.92a.dfsg1/fxi/src/g_profiler.c 2007-08-28 14:39:57.000000000 +0200
@@ -42,6 +42,13 @@
#include <math.h>
#include <limits.h>
@@ -1498,9 +1514,10 @@ diff -ruN fenix0.92-0.92a.dfsg1.orig/fxi/src/g_profiler.c fenix0.92-0.92a.dfsg1/
return;
}
-diff -ruN fenix0.92-0.92a.dfsg1.orig/fxi/src/g_scroll.c fenix0.92-0.92a.dfsg1/fxi/src/g_scroll.c
---- fenix0.92-0.92a.dfsg1.orig/fxi/src/g_scroll.c 2007-04-13 18:19:04.000000000 +0000
-+++ fenix0.92-0.92a.dfsg1/fxi/src/g_scroll.c 2007-07-02 18:41:48.000000000 +0000
+Index: fenix-0.92a.dfsg1/fxi/src/g_scroll.c
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxi/src/g_scroll.c 2007-08-28 14:38:48.000000000 +0200
++++ fenix-0.92a.dfsg1/fxi/src/g_scroll.c 2007-08-28 14:44:31.000000000 +0200
@@ -27,6 +27,13 @@
#include <stdio.h>
#include <stdlib.h>
@@ -1527,9 +1544,10 @@ diff -ruN fenix0.92-0.92a.dfsg1.orig/fxi/src/g_scroll.c fenix0.92-0.92a.dfsg1/fx
}
}
-diff -ruN fenix0.92-0.92a.dfsg1.orig/fxi/src/g_texts.c fenix0.92-0.92a.dfsg1/fxi/src/g_texts.c
---- fenix0.92-0.92a.dfsg1.orig/fxi/src/g_texts.c 2007-04-12 22:08:48.000000000 +0000
-+++ fenix0.92-0.92a.dfsg1/fxi/src/g_texts.c 2007-07-02 18:41:48.000000000 +0000
+Index: fenix-0.92a.dfsg1/fxi/src/g_texts.c
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxi/src/g_texts.c 2007-08-28 14:38:48.000000000 +0200
++++ fenix-0.92a.dfsg1/fxi/src/g_texts.c 2007-08-28 14:44:31.000000000 +0200
@@ -43,6 +43,13 @@
#include <stdlib.h>
#include <string.h>
@@ -1598,9 +1616,10 @@ diff -ruN fenix0.92-0.92a.dfsg1.orig/fxi/src/g_texts.c fenix0.92-0.92a.dfsg1/fxi
return NULL;
}
-diff -ruN fenix0.92-0.92a.dfsg1.orig/fxi/src/i_copy.c fenix0.92-0.92a.dfsg1/fxi/src/i_copy.c
---- fenix0.92-0.92a.dfsg1.orig/fxi/src/i_copy.c 2007-04-12 22:08:48.000000000 +0000
-+++ fenix0.92-0.92a.dfsg1/fxi/src/i_copy.c 2007-07-02 18:41:48.000000000 +0000
+Index: fenix-0.92a.dfsg1/fxi/src/i_copy.c
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxi/src/i_copy.c 2007-08-28 14:38:48.000000000 +0200
++++ fenix-0.92a.dfsg1/fxi/src/i_copy.c 2007-08-28 14:39:58.000000000 +0200
@@ -43,6 +43,13 @@
#include <math.h>
#include <time.h>
@@ -1624,9 +1643,10 @@ diff -ruN fenix0.92-0.92a.dfsg1.orig/fxi/src/i_copy.c fenix0.92-0.92a.dfsg1/fxi/
break;
}
break;
-diff -ruN fenix0.92-0.92a.dfsg1.orig/fxi/src/i_debug.c fenix0.92-0.92a.dfsg1/fxi/src/i_debug.c
---- fenix0.92-0.92a.dfsg1.orig/fxi/src/i_debug.c 2007-04-12 22:08:48.000000000 +0000
-+++ fenix0.92-0.92a.dfsg1/fxi/src/i_debug.c 2007-07-02 18:41:48.000000000 +0000
+Index: fenix-0.92a.dfsg1/fxi/src/i_debug.c
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxi/src/i_debug.c 2007-08-28 14:38:48.000000000 +0200
++++ fenix-0.92a.dfsg1/fxi/src/i_debug.c 2007-08-28 14:44:31.000000000 +0200
@@ -35,6 +35,13 @@
#include <string.h>
@@ -1650,9 +1670,10 @@ diff -ruN fenix0.92-0.92a.dfsg1.orig/fxi/src/i_debug.c fenix0.92-0.92a.dfsg1/fxi
i = next ;
}
else
-diff -ruN fenix0.92-0.92a.dfsg1.orig/fxi/src/i_func.c fenix0.92-0.92a.dfsg1/fxi/src/i_func.c
---- fenix0.92-0.92a.dfsg1.orig/fxi/src/i_func.c 2007-04-13 18:21:22.000000000 +0000
-+++ fenix0.92-0.92a.dfsg1/fxi/src/i_func.c 2007-07-02 18:41:48.000000000 +0000
+Index: fenix-0.92a.dfsg1/fxi/src/i_func.c
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxi/src/i_func.c 2007-08-28 14:38:48.000000000 +0200
++++ fenix-0.92a.dfsg1/fxi/src/i_func.c 2007-08-28 14:45:44.000000000 +0200
@@ -125,6 +125,13 @@
#include <fnx_loadlib.h>
@@ -1914,9 +1935,10 @@ diff -ruN fenix0.92-0.92a.dfsg1.orig/fxi/src/i_func.c fenix0.92-0.92a.dfsg1/fxi/
(*RegisterFunctions)(fnc_import, sysproc_add) ;
}
-diff -ruN fenix0.92-0.92a.dfsg1.orig/fxi/src/i_main.c fenix0.92-0.92a.dfsg1/fxi/src/i_main.c
---- fenix0.92-0.92a.dfsg1.orig/fxi/src/i_main.c 2007-04-12 22:08:56.000000000 +0000
-+++ fenix0.92-0.92a.dfsg1/fxi/src/i_main.c 2007-07-02 18:41:48.000000000 +0000
+Index: fenix-0.92a.dfsg1/fxi/src/i_main.c
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxi/src/i_main.c 2007-08-28 14:38:49.000000000 +0200
++++ fenix-0.92a.dfsg1/fxi/src/i_main.c 2007-08-28 14:44:31.000000000 +0200
@@ -39,6 +39,13 @@
#include <string.h>
@@ -2192,9 +2214,10 @@ diff -ruN fenix0.92-0.92a.dfsg1.orig/fxi/src/i_main.c fenix0.92-0.92a.dfsg1/fxi/
}
-diff -ruN fenix0.92-0.92a.dfsg1.orig/fxi/src/img_pcx.c fenix0.92-0.92a.dfsg1/fxi/src/img_pcx.c
---- fenix0.92-0.92a.dfsg1.orig/fxi/src/img_pcx.c 2007-04-12 22:08:56.000000000 +0000
-+++ fenix0.92-0.92a.dfsg1/fxi/src/img_pcx.c 2007-07-02 18:41:48.000000000 +0000
+Index: fenix-0.92a.dfsg1/fxi/src/img_pcx.c
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxi/src/img_pcx.c 2007-08-28 14:38:49.000000000 +0200
++++ fenix-0.92a.dfsg1/fxi/src/img_pcx.c 2007-08-28 14:44:31.000000000 +0200
@@ -45,6 +45,13 @@
#include <string.h>
#include <stdlib.h>
@@ -2245,9 +2268,10 @@ diff -ruN fenix0.92-0.92a.dfsg1.orig/fxi/src/img_pcx.c fenix0.92-0.92a.dfsg1/fxi
}
bitmap->modified = 1 ;
-diff -ruN fenix0.92-0.92a.dfsg1.orig/fxi/src/img_png.c fenix0.92-0.92a.dfsg1/fxi/src/img_png.c
---- fenix0.92-0.92a.dfsg1.orig/fxi/src/img_png.c 2007-04-12 22:08:56.000000000 +0000
-+++ fenix0.92-0.92a.dfsg1/fxi/src/img_png.c 2007-07-02 18:41:48.000000000 +0000
+Index: fenix-0.92a.dfsg1/fxi/src/img_png.c
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxi/src/img_png.c 2007-08-28 14:38:49.000000000 +0200
++++ fenix-0.92a.dfsg1/fxi/src/img_png.c 2007-08-28 14:44:32.000000000 +0200
@@ -45,6 +45,13 @@
#include <string.h>
#include <stdlib.h>
@@ -2299,9 +2323,10 @@ diff -ruN fenix0.92-0.92a.dfsg1.orig/fxi/src/img_png.c fenix0.92-0.92a.dfsg1/fxi
else
{
png_get_PLTE (png_ptr, info_ptr, &png_palette, &n) ;
-diff -ruN fenix0.92-0.92a.dfsg1.orig/fxi/src/i_saveload.c fenix0.92-0.92a.dfsg1/fxi/src/i_saveload.c
---- fenix0.92-0.92a.dfsg1.orig/fxi/src/i_saveload.c 2007-04-12 22:08:56.000000000 +0000
-+++ fenix0.92-0.92a.dfsg1/fxi/src/i_saveload.c 2007-07-02 18:41:48.000000000 +0000
+Index: fenix-0.92a.dfsg1/fxi/src/i_saveload.c
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxi/src/i_saveload.c 2007-08-28 14:38:49.000000000 +0200
++++ fenix-0.92a.dfsg1/fxi/src/i_saveload.c 2007-08-28 14:39:59.000000000 +0200
@@ -43,6 +43,13 @@
#include <math.h>
#include <time.h>
@@ -2343,9 +2368,10 @@ diff -ruN fenix0.92-0.92a.dfsg1.orig/fxi/src/i_saveload.c fenix0.92-0.92a.dfsg1/
break;
}
break;
-diff -ruN fenix0.92-0.92a.dfsg1.orig/fxi/src/main.c fenix0.92-0.92a.dfsg1/fxi/src/main.c
---- fenix0.92-0.92a.dfsg1.orig/fxi/src/main.c 2007-04-12 22:08:58.000000000 +0000
-+++ fenix0.92-0.92a.dfsg1/fxi/src/main.c 2007-07-02 18:43:15.000000000 +0000
+Index: fenix-0.92a.dfsg1/fxi/src/main.c
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxi/src/main.c 2007-08-28 14:38:49.000000000 +0200
++++ fenix-0.92a.dfsg1/fxi/src/main.c 2007-08-28 14:46:17.000000000 +0200
@@ -47,6 +47,14 @@
#include <string.h>
#include <time.h>
@@ -2422,9 +2448,10 @@ diff -ruN fenix0.92-0.92a.dfsg1.orig/fxi/src/main.c fenix0.92-0.92a.dfsg1/fxi/sr
return -1 ;
}
}
-diff -ruN fenix0.92-0.92a.dfsg1.orig/fxi/src/sound.c fenix0.92-0.92a.dfsg1/fxi/src/sound.c
---- fenix0.92-0.92a.dfsg1.orig/fxi/src/sound.c 2007-04-12 22:09:02.000000000 +0000
-+++ fenix0.92-0.92a.dfsg1/fxi/src/sound.c 2007-07-02 18:41:48.000000000 +0000
+Index: fenix-0.92a.dfsg1/fxi/src/sound.c
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxi/src/sound.c 2007-08-28 14:38:49.000000000 +0200
++++ fenix-0.92a.dfsg1/fxi/src/sound.c 2007-08-28 14:40:00.000000000 +0200
@@ -40,6 +40,13 @@
#include <stdlib.h>
#include <string.h>
@@ -2507,9 +2534,10 @@ diff -ruN fenix0.92-0.92a.dfsg1.orig/fxi/src/sound.c fenix0.92-0.92a.dfsg1/fxi/s
return(0);
} else {
return ((int)music);
-diff -ruN fenix0.92-0.92a.dfsg1.orig/fxi/src/strings.c fenix0.92-0.92a.dfsg1/fxi/src/strings.c
---- fenix0.92-0.92a.dfsg1.orig/fxi/src/strings.c 2007-04-13 18:21:24.000000000 +0000
-+++ fenix0.92-0.92a.dfsg1/fxi/src/strings.c 2007-07-02 18:41:48.000000000 +0000
+Index: fenix-0.92a.dfsg1/fxi/src/strings.c
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxi/src/strings.c 2007-08-28 14:38:49.000000000 +0200
++++ fenix-0.92a.dfsg1/fxi/src/strings.c 2007-08-28 14:40:00.000000000 +0200
@@ -45,6 +45,12 @@
#include <assert.h>
#endif
diff --git a/debian/patches/i18n_map.patch b/debian/patches/i18n_map.patch
index f6e2825..4e796a5 100644
--- a/debian/patches/i18n_map.patch
+++ b/debian/patches/i18n_map.patch
@@ -1,6 +1,7 @@
-diff -ruN fenix0.92-0.92a.dfsg1.orig/map/map.c fenix0.92-0.92a.dfsg1/map/map.c
---- fenix0.92-0.92a.dfsg1.orig/map/map.c 2007-04-12 22:09:10.000000000 +0000
-+++ fenix0.92-0.92a.dfsg1/map/map.c 2007-07-02 17:28:09.000000000 +0000
+Index: fenix-0.92a.dfsg1/map/map.c
+===================================================================
+--- fenix-0.92a.dfsg1.orig/map/map.c 2007-08-28 14:38:38.000000000 +0200
++++ fenix-0.92a.dfsg1/map/map.c 2007-08-28 14:40:03.000000000 +0200
@@ -43,6 +43,14 @@
#include <png.h>
#include <gif_lib.h>
diff --git a/debian/patches/plugins_dir.patch b/debian/patches/plugins_dir.patch
index c9ec70d..acd962e 100644
--- a/debian/patches/plugins_dir.patch
+++ b/debian/patches/plugins_dir.patch
@@ -1,6 +1,8 @@
---- fenix-0.92a.dfsg1.orig/fxc/src/c_main.c
-+++ fenix-0.92a.dfsg1/fxc/src/c_main.c
-@@ -49,10 +49,19 @@
+Index: fenix-0.92a.dfsg1/fxc/src/c_main.c
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxc/src/c_main.c 2007-08-28 14:39:51.000000000 +0200
++++ fenix-0.92a.dfsg1/fxc/src/c_main.c 2007-08-28 14:45:39.000000000 +0200
+@@ -44,10 +44,19 @@
#define _(String) String
#endif
@@ -21,9 +23,9 @@
/* ---------------------------------------------------------------------- */
/* M�dulo principal del compilador. Contiene c�digo que inicializa los */
/* identificadores conocidos, as� como las funciones de compilado de */
-@@ -351,8 +360,16 @@
- unsigned int * PluginVersion ;
- #endif
+@@ -343,8 +352,16 @@
+ void * library = NULL;
+ dlfunc RegisterFunctions ;
+#if defined( TARGET_Linux ) || defined ( TARGET_BEOS ) || defined ( TARGET_BSD )
+ struct stat stat_buf;
@@ -38,7 +40,7 @@
char * ptr;
#endif
token_next() ;
-@@ -368,7 +385,7 @@
+@@ -360,7 +377,7 @@
#define DLLEXT ".so"
#define SIZEDLLEXT 3
@@ -47,7 +49,7 @@
#endif
#ifdef TARGET_MAC
-@@ -398,7 +415,7 @@
+@@ -390,7 +407,7 @@
#define DLLEXT ".dylib"
#define SIZEDLLEXT 6
@@ -56,7 +58,7 @@
#endif
#ifndef TARGET_Win32
-@@ -411,6 +428,18 @@
+@@ -403,6 +420,18 @@
strcpy (ptr-(4+SIZEDLLEXT), DLLEXT);
}
@@ -75,9 +77,11 @@
filename = soname;
#endif
---- fenix-0.92a.dfsg1.orig/fxi/src/i_func.c
-+++ fenix-0.92a.dfsg1/fxi/src/i_func.c
-@@ -137,6 +137,16 @@
+Index: fenix-0.92a.dfsg1/fxi/src/i_func.c
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxi/src/i_func.c 2007-08-28 14:39:58.000000000 +0200
++++ fenix-0.92a.dfsg1/fxi/src/i_func.c 2007-08-28 14:45:40.000000000 +0200
+@@ -132,6 +132,16 @@
#define _(String) String
#endif
@@ -94,7 +98,7 @@
#include "dcb.h"
fixed cos_table[90001] ;
-@@ -5038,8 +5048,16 @@
+@@ -5030,8 +5040,16 @@
const char * filename;
unsigned int n ;
@@ -111,7 +115,7 @@
char * ptr;
#endif
-@@ -5073,7 +5091,7 @@
+@@ -5065,7 +5083,7 @@
}
pathMac[contmac]='\0';
@@ -120,7 +124,7 @@
/* Clean the name (strip .DLL, and use lowercase) */
-@@ -5085,7 +5103,7 @@
+@@ -5077,7 +5095,7 @@
library = dlopen (soname, RTLD_NOW | RTLD_GLOBAL) ;
#else
@@ -129,7 +133,7 @@
/* Clean the name (strip .DLL, and use lowercase) */
-@@ -5093,8 +5111,18 @@
+@@ -5085,8 +5103,18 @@
*ptr = TOLOWER(*ptr);
if (strlen(soname) > 7 && strcmp(ptr-7, ".dll.so") == 0)
strcpy (ptr-7, ".so");
diff --git a/debian/patches/series b/debian/patches/series
index a1037c8..274678a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,3 +14,4 @@ plugins_dir.patch
fxdll_version.patch
fxi_apptitle.patch
0.92a_to_cvs-20070713.1513.patch
+endianess.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/fenix.git
More information about the Pkg-games-commits
mailing list