games/clonekeen: fix patch that got screwed up on import to git

1 files changed, 110 insertions, 110 deletions

diff --git a/games/clonekeen/slackbuild.diff b/games/clonekeen/slackbuild.diff
index f95cc882db..351f9f3302 100644
--- a/games/clonekeen/slackbuild.diff
+++ b/games/clonekeen/slackbuild.diff
@@ -21,136 +21,136 @@ diff -Naur keen.orig/src/keen.h keen/src/keen.h
 --- keen.orig/src/keen.h	2005-11-07 16:39:12.000000000 -0500
 +++ keen/src/keen.h	2010-03-26 03:06:24.000000000 -0400
 @@ -14,6 +14,10 @@
-   #include <windows.h>
- #endif
- 
-+#ifdef TARGET_LNX
-+  #include "unix_fopen_wrapper.h"
-+#endif
-+
- #include "sounds.h"
- #include "funcdefs.h"
- #include "latch.h"
+   #include <windows.h>

+ #endif

+ 

++#ifdef TARGET_LNX

++  #include "unix_fopen_wrapper.h"

++#endif

++

+ #include "sounds.h"

+ #include "funcdefs.h"

+ #include "latch.h"

 diff -Naur keen.orig/src/main.c keen/src/main.c
 --- keen.orig/src/main.c	2005-11-09 23:35:10.000000000 -0500
 +++ keen/src/main.c	2010-03-26 03:11:56.000000000 -0400
 @@ -75,7 +75,7 @@
- 
- char loadinggame, loadslot;
- 
--FILE *log=NULL;
-+/* FILE *log=NULL; */
- 
- stFade fade;
- stMap map;
+ 

+ char loadinggame, loadslot;

+ 

+-FILE *log=NULL;

++/* FILE *log=NULL; */

+ 

+ stFade fade;

+ stMap map;

 @@ -161,7 +161,7 @@
-   SetDefaultOptions();
-   setoption(OPT_FULLSCREEN, "SDL Fullscreen Mode", 0);
-   setoption(OPT_ZOOM, "Image Zoom", 1);
--  setoption(OPT_FRAMESKIP, "Frameskip", 2);
-+  setoption(OPT_FRAMESKIP, "Frameskip", 1);
- 
-   /* process command line options */
-   VidDrv_printf("Processing command-line options.\n");
+   SetDefaultOptions();

+   setoption(OPT_FULLSCREEN, "SDL Fullscreen Mode", 0);

+   setoption(OPT_ZOOM, "Image Zoom", 1);

+-  setoption(OPT_FRAMESKIP, "Frameskip", 2);

++  setoption(OPT_FRAMESKIP, "Frameskip", 1);

+ 

+   /* process command line options */

+   VidDrv_printf("Processing command-line options.\n");

 @@ -180,6 +180,7 @@
-       {
-         numplayers = 2;
-       }
-+		/*
-       else if (strcmp(tempbuf, "-3player")==0)
-       {
-         numplayers = 3;
+       {

+         numplayers = 2;

+       }

++		/*

+       else if (strcmp(tempbuf, "-3player")==0)

+       {

+         numplayers = 3;

 @@ -188,6 +189,7 @@
-       {
-         numplayers = 4;
-       }
-+		*/
-       else if (strcmp(tempbuf, "-single")==0)
-       {
-         numplayers = 1;
+       {

+         numplayers = 4;

+       }

++		*/

+       else if (strcmp(tempbuf, "-single")==0)

+       {

+         numplayers = 1;

 @@ -240,6 +242,7 @@
-       {
-         showfps = 1;
-       }
-+		/*
-       else if (strcmp(tempbuf, "-host")==0)     // start network server
-       {
-         is_server = 1;
+       {

+         showfps = 1;

+       }

++		/*

+       else if (strcmp(tempbuf, "-host")==0)     // start network server

+       {

+         is_server = 1;

 @@ -250,6 +253,7 @@
-         is_client = 1;
-         localmp = 0;
-       }
-+		*/
-       else if (i!=1 || atoi(argv[i])==0)
-       {
-         VidDrv_printf("Wait a minute...what the hell does '%s' mean?\n",tempbuf);
+         is_client = 1;

+         localmp = 0;

+       }

++		*/

+       else if (i!=1 || atoi(argv[i])==0)

+       {

+         VidDrv_printf("Wait a minute...what the hell does '%s' mean?\n",tempbuf);

 diff -Naur keen.orig/src/misc.c keen/src/misc.c
 --- keen.orig/src/misc.c	2005-11-16 20:04:28.000000000 -0500
 +++ keen/src/misc.c	2010-03-26 03:15:46.000000000 -0400
 @@ -1103,7 +1103,7 @@
- {
-   VidDrv_printf("Usage: keen [lvlnum] [-*player] [-nopk] [-ep*] [-dtm] [-nocheat] [-rec] -[eseq]\n\n");
-   VidDrv_printf("lvlnum          specify a level number (such as 2) to go directly to that level\n");
--  VidDrv_printf("-*player        select number of players (1-4); defaults to 1\n");
-+  VidDrv_printf("-*player        select number of players (1-2); defaults to 1\n");
-   VidDrv_printf("-nopk           do not allow players to kill each other in multiplayer games\n");
-   VidDrv_printf("-ep*            select episode 1, 2, or 3; defaults to 1\n");
-   VidDrv_printf("-dtm            go directly to the world map, bypassing intro and title screen\n");
+ {

+   VidDrv_printf("Usage: keen [lvlnum] [-*player] [-nopk] [-ep*] [-dtm] [-nocheat] [-rec] -[eseq]\n\n");

+   VidDrv_printf("lvlnum          specify a level number (such as 2) to go directly to that level\n");

+-  VidDrv_printf("-*player        select number of players (1-4); defaults to 1\n");

++  VidDrv_printf("-*player        select number of players (1-2); defaults to 1\n");

+   VidDrv_printf("-nopk           do not allow players to kill each other in multiplayer games\n");

+   VidDrv_printf("-ep*            select episode 1, 2, or 3; defaults to 1\n");

+   VidDrv_printf("-dtm            go directly to the world map, bypassing intro and title screen\n");

 diff -Naur keen.orig/src/sdl/viddrv.c keen/src/sdl/viddrv.c
 --- keen.orig/src/sdl/viddrv.c	2005-11-16 20:08:30.000000000 -0500
 +++ keen/src/sdl/viddrv.c	2010-03-26 03:06:24.000000000 -0400
 @@ -29,8 +29,10 @@
- 
- SDL_Rect dstrect;
- 
-+#ifndef TARGET_LNX
- extern FILE *log;
- #define CKLOGFILENAME            "ck.log"
-+#endif
- 
- #define MAX_CONSOLE_MESSAGES     3
- #define CONSOLE_MESSAGE_X        3
+ 

+ SDL_Rect dstrect;

+ 

++#ifndef TARGET_LNX

+ extern FILE *log;

+ #define CKLOGFILENAME            "ck.log"

++#endif

+ 

+ #define MAX_CONSOLE_MESSAGES     3

+ #define CONSOLE_MESSAGE_X        3

 @@ -222,11 +224,11 @@
- // applies all changes to the palette made with pal_set
- void pal_apply(void)
- {
--  SDL_SetColors(screen, &MyPalette, 0, 256);
--  SDL_SetColors(ScrollSurface, &MyPalette, 0, 256);
-+  SDL_SetColors(screen, MyPalette, 0, 256);
-+  SDL_SetColors(ScrollSurface, MyPalette, 0, 256);
-   if (blitsurface_alloc)
-   {
--    SDL_SetColors(BlitSurface, &MyPalette, 0, 256);
-+    SDL_SetColors(BlitSurface, MyPalette, 0, 256);
-   }
- }
- 
+ // applies all changes to the palette made with pal_set

+ void pal_apply(void)

+ {

+-  SDL_SetColors(screen, &MyPalette, 0, 256);

+-  SDL_SetColors(ScrollSurface, &MyPalette, 0, 256);

++  SDL_SetColors(screen, MyPalette, 0, 256);

++  SDL_SetColors(ScrollSurface, MyPalette, 0, 256);

+   if (blitsurface_alloc)

+   {

+-    SDL_SetColors(BlitSurface, &MyPalette, 0, 256);

++    SDL_SetColors(BlitSurface, MyPalette, 0, 256);

+   }

+ }

+ 

 @@ -338,9 +340,9 @@
- // shuts down the video driver
- void VidDrv_Stop(void)
- {
--  if(screen) { SDL_FreeSurface(screen); VidDrv_printf("freed screen\n"); }
--  if(ScrollSurface) { SDL_FreeSurface(ScrollSurface); VidDrv_printf("freed scrollsurface\n"); }
--  if(blitsurface_alloc) { blitsurface_alloc = 0; SDL_FreeSurface(BlitSurface); VidDrv_printf("freed blitsurface\n"); }
-+  if(screen) { SDL_FreeSurface(screen); screen = NULL; VidDrv_printf("freed screen\n"); }
-+  if(ScrollSurface) { SDL_FreeSurface(ScrollSurface); ScrollSurface = NULL; VidDrv_printf("freed scrollsurface\n"); }
-+  if(blitsurface_alloc) { blitsurface_alloc = 0; SDL_FreeSurface(BlitSurface); BlitSurface = NULL; VidDrv_printf("freed blitsurface\n"); }
- }
- 
- // resets graphics to allow changing of resolution or zoom settings
+ // shuts down the video driver

+ void VidDrv_Stop(void)

+ {

+-  if(screen) { SDL_FreeSurface(screen); VidDrv_printf("freed screen\n"); }

+-  if(ScrollSurface) { SDL_FreeSurface(ScrollSurface); VidDrv_printf("freed scrollsurface\n"); }

+-  if(blitsurface_alloc) { blitsurface_alloc = 0; SDL_FreeSurface(BlitSurface); VidDrv_printf("freed blitsurface\n"); }

++  if(screen) { SDL_FreeSurface(screen); screen = NULL; VidDrv_printf("freed screen\n"); }

++  if(ScrollSurface) { SDL_FreeSurface(ScrollSurface); ScrollSurface = NULL; VidDrv_printf("freed scrollsurface\n"); }

++  if(blitsurface_alloc) { blitsurface_alloc = 0; SDL_FreeSurface(BlitSurface); BlitSurface = NULL; VidDrv_printf("freed blitsurface\n"); }

+ }

+ 

+ // resets graphics to allow changing of resolution or zoom settings

 @@ -365,10 +367,12 @@
- // SDL-specific, not win32-specific)
- void VidDrv_InitConsole(void)
- {
-+#ifndef TARGET_LNX
- FILE *fp;
-   // erase contents of log file
-   fp = fopen(CKLOGFILENAME, "wb");
-   fclose(fp);
-+#endif
- }
- 
- void VidDrv_printf(const char *str, ...)
+ // SDL-specific, not win32-specific)

+ void VidDrv_InitConsole(void)

+ {

++#ifndef TARGET_LNX

+ FILE *fp;

+   // erase contents of log file

+   fp = fopen(CKLOGFILENAME, "wb");

+   fclose(fp);

++#endif

+ }

+ 

+ void VidDrv_printf(const char *str, ...)

 diff -Naur keen.orig/src/unix_fopen_wrapper.c keen/src/unix_fopen_wrapper.c
 --- keen.orig/src/unix_fopen_wrapper.c	1969-12-31 19:00:00.000000000 -0500
 +++ keen/src/unix_fopen_wrapper.c	2010-03-26 03:06:24.000000000 -0400