.if defined(WITH_SOUND)

SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config

LIB_DEPENDS=	SDL-1.1.5:${PORTSDIR}/devel/sdl12

MAKE_ENV=	SOUND=yes \

		SDL_CONFIG=${SDL_CONFIG}

.endif

DIGREL=		20000407

WRKSRC=		${WRKDIR}/${PORTNAME}-${DIGREL}

post-install:

$FreeBSD: ports/games/digger-vgl/files/patch-aa,v 1.2 2001/09/22 20:35:22 sobomax Exp $

--- Makefile.fbsd.orig	Mon Apr  3 23:42:48 2000

+++ Makefile.fbsd	Sat Sep 22 23:07:01 2001

@@ -4,24 +4,28 @@

 		newsnd.c ini.c input.c monster.c bags.c alpha.c vgagrafx.c \

 		title_gz.c

-CFLAGS=		-g -O -Wall -pedantic -DFREEBSD

+CFLAGS+=	-DFREEBSD

 LDADD+=		-lz

+SDL_CONFIG?=	sdl-config

+

 .if !defined(SDL)

 CFLAGS+=	-D_VGL

 LDADD+=		-lvgl 

 SRCS+=		fbsd_sup.c fbsd_vid.c fbsd_kbd.c fbsd_timer.c

 .if defined(SOUND)

 SRCS+=		sdl_snd.c

-CFLAGS+=	-D_SDL_SOUND `sdl-config --cflags`

-LDADD+=		`sdl-config --libs`

+SDL_CFLAGS!=	${SDL_CONFIG} --cflags

+SDL_LDFLAGS!=	${SDL_CONFIG} --libs

+CFLAGS+=	-D_SDL_SOUND ${SDL_CFLAGS}

+LDADD+=		${SDL_LDFLAGS}

 .else	# NO SOUND

 SRCS+=		fbsd_snd.c

 .endif	# SOUND

 .else	# SDL

-CFLAGS+=	-D_SDL `sdl-config --cflags`

-LDADD+=		`sdl-config --libs`

+CFLAGS+=	-D_SDL `${SDL_CONFIG} --cflags`

+LDADD+=		`${SDL_CONFIG} --libs`

 SRCS+=		fbsd_sup.c sdl_vid.c sdl_timer.c sdl_kbd.c sdl_snd.c icon.c

 .endif

$FreeBSD: ports/games/digger-vgl/files/patch-ab,v 1.2 2001/09/22 20:35:22 sobomax Exp $

--- fbsd_vid.c.orig	Mon Apr  3 23:42:44 2000

+++ fbsd_vid.c	Sat Sep 22 22:18:25 2001

@@ -1,4 +1,18 @@

-#include <machine/console.h>

+/*

+ * ---------------------------------------------------------------------------

+ * "THE BEER-WARE LICENSE" (Revision 42, (c) Poul-Henning Kamp): Maxim

+ * Sobolev <sobomax@altavista.net> wrote this file. As long as you retain

+ * this  notice you can  do whatever you  want with this stuff. If we meet

+ * some day, and you think this stuff is worth it, you can buy me a beer in

+ * return.

+ *

+ * Maxim Sobolev

+ * ---------------------------------------------------------------------------

+ */

+

+#include <sys/fbio.h>

+#include <sys/kbio.h>

+#include <sys/consio.h>

 #include <vgl.h>

 #include <signal.h>

 #include <osreldate.h>

@@ -272,6 +286,8 @@

     Sint4           w = 3, h = 12, size;

     Sint4           i;

+    if(((ch - 32) >= 0x5f) || (ch < 32))

+	return;

     tmp = ch2bmap(alphas[ch - 32], w, h);

     size = tmp->Xsize * tmp->Ysize;

     copy = malloc(size);

$FreeBSD: ports/games/digger-vgl/files/patch-ac,v 1.2 2001/09/22 20:35:22 sobomax Exp $

--- fbsd_kbd.c.orig	Mon Apr  3 23:42:46 2000

+++ fbsd_kbd.c	Sat Sep 22 22:19:37 2001

@@ -1,4 +1,6 @@

-#include <machine/console.h>

+#include <sys/fbio.h>

+#include <sys/kbio.h>

+#include <sys/consio.h>

 #include <vgl.h>

 #include "def.h"

$FreeBSD: ports/games/digger-vgl/files/patch-ad,v 1.2 2001/09/22 20:35:22 sobomax Exp $

--- fbsd_timer.c.orig	Mon Apr  3 23:42:44 2000

+++ fbsd_timer.c	Sat Sep 22 22:20:03 2001

@@ -2,7 +2,8 @@

 #include <stdlib.h>

 #include <time.h>

 #include <sys/time.h>

-#include <machine/console.h>

+#include <sys/fbio.h>

+#include <sys/consio.h>

 #include <vgl.h>

 #include "def.h"

$FreeBSD: ports/games/digger-vgl/files/patch-sdl_kbd.c,v 1.2 2001/09/22 20:35:22 sobomax Exp $

--- sdl_kbd.c	2001/09/12 21:53:57	1.1

+++ sdl_kbd.c	2001/09/12 21:54:03

@@ -1,3 +1,15 @@

+/*

+ * ---------------------------------------------------------------------------

+ * "THE BEER-WARE LICENSE" (Revision 42, (c) Poul-Henning Kamp): Maxim

+ * Sobolev <sobomax@altavista.net> wrote this file. As long as you retain

+ * this  notice you can  do whatever you  want with this stuff. If we meet

+ * some day, and you think this stuff is worth it, you can buy me a beer in

+ * return.

+ * 

+ * Maxim Sobolev

+ * --------------------------------------------------------------------------- 

+ */

+

 #include <SDL.h>

 #include "def.h"

@@ -14,8 +26,12 @@

 		if(klen == KBLEN) /* Buffer is full, drop some pieces */

 			memcpy(kbuffer, kbuffer + 1, --klen);

 		kbuffer[klen++] = event->key.keysym.sym;

-	}

+		/* ALT + Enter handling (fullscreen/windowed operation) */

+		if((event->key.keysym.sym == SDLK_RETURN || event->key.keysym.sym == SDLK_KP_ENTER) &&

+		    ((event->key.keysym.mod & KMOD_ALT) != 0))

+			switchmode();

+	}

 	if(event->type == SDL_QUIT)

 		exit(0);

@@ -28,7 +44,6 @@

 	SDL_PumpEvents();

 	keys = SDL_GetKeyState(NULL);

-	

 	if (keys[key] == SDL_PRESSED )

 		return(TRUE);

 	else

$FreeBSD: ports/games/digger-vgl/files/patch-sdl_snd.c,v 1.1 2001/09/22 20:35:22 sobomax Exp $

--- sdl_snd.c	2001/09/22 19:20:28	1.1

+++ sdl_snd.c	2001/09/22 19:20:38

@@ -15,7 +15,6 @@

 bool initsounddevice(void)

 {

-//	SDL_PauseAudio(0);

 	return(TRUE);

 }

$FreeBSD: ports/games/digger-vgl/files/patch-sdl_vid.c,v 1.2 2001/09/22 20:35:22 sobomax Exp $

--- sdl_vid.c.orig	Mon Apr  3 23:42:42 2000

+++ sdl_vid.c	Thu Sep 13 01:24:35 2001

@@ -1,5 +1,18 @@

-#include <stdlib.h>

+/*

+ * ---------------------------------------------------------------------------

+ * "THE BEER-WARE LICENSE" (Revision 42, (c) Poul-Henning Kamp): Maxim

+ * Sobolev <sobomax@altavista.net> wrote this file. As long as you retain

+ * this  notice you can  do whatever you  want with this stuff. If we meet

+ * some day, and you think this stuff is worth it, you can buy me a beer in

+ * return.

+ * 

+ * Maxim Sobolev

+ * --------------------------------------------------------------------------- 

+ */

+/* malloc() and friends */

+#include <stdlib.h>

+/* Lovely SDL */

 #include <SDL.h>

 #include "def.h"

@@ -48,8 +61,11 @@

 SDL_Color *ipalettes[] = {vga16_pal1i, vga16_pal2i};

 Sint4	currpal=0;

+Uint32	addflag=0;

+

 SDL_Surface *screen = NULL;

+/* Data structure holding pending updates */

 struct PendNode {

 	void *prevnode;

 	void *nextnode;

@@ -77,6 +93,46 @@

 {

 }

+bool setmode(void)

+{

+	if((screen = SDL_SetVideoMode(640, 400, 8, \

+	    SDL_HWSURFACE | SDL_HWPALETTE | addflag)) == NULL)

+		return(FALSE);

+	else

+		return(TRUE);

+}

+

+void switchmode(void)

+{

+	Uint32 saved;

+	SDL_Surface *tmp = NULL;

+	SDL_Surface *oldscreen;

+	

+	vgageti(0, 0, (Uint3 *)&tmp, 80, 200);

+	oldscreen = screen;

+	saved = addflag;

+

+	if(addflag == 0)

+		addflag = SDL_FULLSCREEN;

+	else

+		addflag = 0;

+	if(setmode() == FALSE) {

+		addflag = saved;

+		if(setmode() == FALSE) {

+			fprintf(stderr, "Fatal: failed to change videomode and"\

+				"fallback mode failed as well. Exitting.\n");

+			exit(1);

+		}

+	}

+

+	SDL_SetColors(screen, tmp->format->palette->colors, 0, \

+		tmp->format->palette->ncolors);

+	vgaputi(0, 0, (Uint3 *)&tmp, 80, 200);

+	SDL_FreeSurface(tmp);

+	SDL_FreeSurface(oldscreen);

+}

+

+

 void vgainit(void)

 {

 	SDL_Surface *tmp = NULL;

@@ -92,7 +148,7 @@

 	}

 	SDL_WM_SetCaption("D I G G E R", NULL);

 	SDL_WM_SetIcon(tmp, NULL);

-	if ((screen = SDL_SetVideoMode(640, 400, 8, SDL_HWSURFACE | SDL_HWPALETTE)) == NULL) {

+	if(setmode() == FALSE) {

 		fprintf(stderr, "Couldn't set 640x480x8 video mode: %s\n", SDL_GetError());

 		exit(1);

         }

@@ -131,7 +187,6 @@

 {

 	struct PendNode *p;

-	SDL_UnlockSurface(screen);				

 	for(p=First;p!=NULL;)

 	{

 		SDL_UpdateRect(screen,p->rect.x,p->rect.y,p->rect.w,p->rect.h);

@@ -139,7 +194,6 @@

 		free(p);

 		p = First;

 	}

-	SDL_LockSurface(screen);

 	pendnum = 0;

 }

@@ -161,12 +215,26 @@

 	tmp->format->palette = screen->format->palette;

 	SDL_BlitSurface(tmp, NULL, screen, &new->rect);

 	tmp->format->palette = reserv;

+/* 

+ * Following piece of code comparing already pending updates with current with

+ * main goal to prevent redrawing overlapping rectangles several times.

+ */ 

 	for(ptr=First;ptr!=NULL;ptr=ptr->nextnode) {

 		if((new->rect.x >= ptr->rect.x) &&

 		   (new->rect.y >= ptr->rect.y) &&

-		   ((new->rect.x+new->rect.w)<=(ptr->rect.x+ptr->rect.w)) &&

-		   ((new->rect.y+new->rect.h)<=(ptr->rect.y+ptr->rect.h))) {

+		   ((new->rect.x+new->rect.w) <= (ptr->rect.x+ptr->rect.w)) &&

+		   ((new->rect.y+new->rect.h) <= (ptr->rect.y+ptr->rect.h))) {

+			free(new);

+			return;

+		} else if((new->rect.x <= ptr->rect.x) &&

+		   (new->rect.y <= ptr->rect.y) &&

+		   ((new->rect.x+new->rect.w) >= (ptr->rect.x+ptr->rect.w)) &&

+		   ((new->rect.y+new->rect.h) >= (ptr->rect.y+ptr->rect.h))) {

+			ptr->rect.x = new->rect.x;

+			ptr->rect.y = new->rect.y;

+			ptr->rect.w = new->rect.w;

+			ptr->rect.h = new->rect.h;

 			free(new);

 			return;

 		}

@@ -211,6 +279,9 @@

 	Sint4 rval = 0;

 	Uint8 *pixels;

+	if ((x > 319) || (y > 199))

+	       return (0xff);

+

 	vgageti(x, y, (Uint3 *)&tmp, 1, 1);

 	pixels = (Uint8 *)tmp->pixels;

 	for (yi=0;yi<tmp->h;yi++)

@@ -260,6 +331,8 @@

 	Sint4 w=3, h=12, size;

 	Sint4 i;

+	if(((ch - 32) >= 0x5f) || (ch < 32))

+		return;

 	tmp = ch2bmap(alphas[ch-32], w, h);

 	size = tmp->w*tmp->h;

 	copy = malloc(size);

$FreeBSD: ports/games/digger-vgl/files/patch-sdl_vid.h,v 1.2 2001/09/22 20:35:22 sobomax Exp $

--- sdl_vid.h	2001/09/12 21:54:45	1.1

+++ sdl_vid.h	2001/09/12 21:54:59

@@ -1,2 +1,3 @@

-void doscreenupdate();

+void doscreenupdate(void);

+void switchmode(void);

$FreeBSD: ports/games/digger-vgl/files/patch-sound.c,v 1.1 2001/09/22 20:35:22 sobomax Exp $

--- sound.c.orig	Mon Apr  3 23:42:42 2000

+++ sound.c	Sat Sep 22 22:18:55 2001

@@ -172,6 +172,9 @@

 	if (!wave_device_available)

 		soundlevdoneflag=FALSE;

 #endif

+#if defined _SDL || defined _SDL_SOUND

+    SDL_Delay(10);	/* Let some CPU time go away */

+#endif

 #ifdef ARM

     gretrace();

     soundint();