diff options
| -rw-r--r-- | games/bfm/files/patch-src__editor__editloop.c | 11 | ||||
| -rw-r--r-- | games/bfm/files/patch-src__include__myendian.h | 20 | ||||
| -rw-r--r-- | games/bfm/files/patch-src__unit__unittype.c | 24 | ||||
| -rw-r--r-- | games/q2p/files/patch-client__cl_scrn.c | 21 | ||||
| -rw-r--r-- | games/q2p/files/patch-unix__sys_unix.c | 18 |
5 files changed, 94 insertions, 0 deletions
diff --git a/games/bfm/files/patch-src__editor__editloop.c b/games/bfm/files/patch-src__editor__editloop.c new file mode 100644 index 000000000000..b65ab340f691 --- /dev/null +++ b/games/bfm/files/patch-src__editor__editloop.c @@ -0,0 +1,11 @@ +--- ./src/editor/editloop.c.orig Thu Apr 14 12:09:25 2005 ++++ ./src/editor/editloop.c Thu Mar 22 10:50:07 2007 +@@ -2043,7 +2043,7 @@ + ---------------------------------------------------------------------------*/ + + // Deletes all units, changes player properties and fills map with grass. +-local int EditorClearMap(void) ++int EditorClearMap(void) + { + Unit* unit; + int mz; diff --git a/games/bfm/files/patch-src__include__myendian.h b/games/bfm/files/patch-src__include__myendian.h new file mode 100644 index 000000000000..df135322d8f5 --- /dev/null +++ b/games/bfm/files/patch-src__include__myendian.h @@ -0,0 +1,20 @@ +--- ./src/include/myendian.h.orig Thu Apr 14 12:09:25 2005 ++++ ./src/include/myendian.h Thu Mar 22 10:53:40 2007 +@@ -102,7 +102,7 @@ + + #else + +-#define FetchLE16(p) SDL_SwapLE16(*((unsigned short*)(p))++) ++inline Uint16 FetchLE16(Uint16 **p); + + #endif + +@@ -122,7 +122,7 @@ + + #else + +-#define FetchLE32(p) SDL_SwapLE32(*((unsigned int*)(p))++) ++inline Uint32 FetchLE32(Uint32 **p); + + #endif + diff --git a/games/bfm/files/patch-src__unit__unittype.c b/games/bfm/files/patch-src__unit__unittype.c new file mode 100644 index 000000000000..29a10ea006a9 --- /dev/null +++ b/games/bfm/files/patch-src__unit__unittype.c @@ -0,0 +1,24 @@ +--- ./src/unit/unittype.c.orig Thu Apr 14 12:09:25 2005 ++++ ./src/unit/unittype.c Thu Mar 22 10:54:41 2007 +@@ -263,7 +263,20 @@ + } + + /// Macro to fetch an 8bit value, to have some looking 8/16/32 bit funcs. +-#define Fetch8(p) (*((unsigned char*)(p))++) ++inline Uint8 Fetch8(Uint8 **p) ++{ ++ return (*p++); ++} ++ ++inline Uint16 FetchLE16(Uint16 **p) ++{ ++ return (SDL_SwapLE16(*p++)); ++} ++ ++inline Uint32 FetchLE32(Uint32 **p) ++{ ++ return (SDL_SwapLE32(*p++)); ++} + + /** + ** Parse UDTA area from puds. diff --git a/games/q2p/files/patch-client__cl_scrn.c b/games/q2p/files/patch-client__cl_scrn.c new file mode 100644 index 000000000000..7b03b2ddda52 --- /dev/null +++ b/games/q2p/files/patch-client__cl_scrn.c @@ -0,0 +1,21 @@ +--- client/cl_scrn.c.orig Sun Dec 31 14:01:34 2006 ++++ client/cl_scrn.c Thu Mar 22 10:20:16 2007 +@@ -34,6 +34,10 @@ + + #include "client.h" + ++#ifdef __unix__ ++#include <sys/utsname.h> ++#endif ++ + float scr_con_current; // aproaches scr_conlines at scr_conspeed + float scr_conlines; // 0.0 to 1.0 lines of console to display + qboolean scr_initialized; // ready to draw +@@ -471,7 +475,6 @@ + player_state_t *player_speed; + vec3_t hvel; + #if defined (__unix__) +-#include <sys/utsname.h> + struct utsname info; + uname (&info); + #endif diff --git a/games/q2p/files/patch-unix__sys_unix.c b/games/q2p/files/patch-unix__sys_unix.c new file mode 100644 index 000000000000..34d02e0d220f --- /dev/null +++ b/games/q2p/files/patch-unix__sys_unix.c @@ -0,0 +1,18 @@ +--- unix/sys_unix.c.orig Sun Dec 31 14:01:34 2006 ++++ unix/sys_unix.c Thu Mar 22 10:20:55 2007 +@@ -35,6 +35,7 @@ + #include <sys/wait.h> + #include <sys/mman.h> + #include <errno.h> ++#include <sys/utsname.h> + + #if defined (__linux__) + #include <mntent.h> +@@ -543,7 +544,6 @@ + + void OS_Info(void) + { +-#include <sys/utsname.h> + struct utsname info; + + uname (&info); |