Initial import of urban-1.5.2.

URBAN is a bloody, violent sidescrolling shoot-em-up in which you're a
renegade military cyborg fighting your way out of the military base
where you were created.

7 files changed, 249 insertions, 0 deletions

diff --git a/games/urban/patches/patch-aa b/games/urban/patches/patch-aa
new file mode 100644
index 00000000000..78b487a64db
--- /dev/null
+++ b/games/urban/patches/patch-aa
@@ -0,0 +1,19 @@
+$NetBSD: patch-aa,v 1.1.1.1 2004/04/16 18:18:27 xtraeme Exp $
+
+--- src/config/config.cc.orig	2004-04-16 19:31:36.000000000 +0200
++++ src/config/config.cc	2004-04-16 19:32:17.000000000 +0200
+@@ -91,10 +91,10 @@
+ 	/* Ask for the number of buttons */
+ 
+         fnt.print_centre("Gamepad type:", 160, 100);
+-	fnt.print_centre("  1. 2 buttons
+-  2. 4 buttons
+-  3. 6 buttons
+-  4. 8 buttons", 160, 140);
++	fnt.print_centre("  1. 2 buttons\n"
++  "2. 4 buttons\n"
++  "3. 6 buttons\n"
++  "4. 8 buttons", 160, 140);
+ 	int running = 1;
+ 
+ 	while(running) {
diff --git a/games/urban/patches/patch-ab b/games/urban/patches/patch-ab
new file mode 100644
index 00000000000..1c6724694ef
--- /dev/null
+++ b/games/urban/patches/patch-ab
@@ -0,0 +1,83 @@
+$NetBSD: patch-ab,v 1.1.1.1 2004/04/16 18:18:28 xtraeme Exp $
+
+--- src/credits/credits.cc.orig	2004-04-16 19:33:15.000000000 +0200
++++ src/credits/credits.cc	2004-04-16 19:35:57.000000000 +0200
+@@ -72,50 +72,46 @@
+         int erase_title;
+ } _ci[] = {
+ {"PROGRAMMING",
+-"THOMAS
+-NYBERG", 0},
++"THOMAS\n"
++"NYBERG", 0},
+ {"PROGRAMMING",
+-"  JONAS
+-BORGSTROM", 1},
++"  JONAS\n"
++"BORGSTROM", 1},
+ {"GRAPHICS",
+-"  DICK
+-ADOLFSSON", 1},
++"  DICK\n"
++"ADOLFSSON", 1},
+ {"DESIGN",
+-" PETTER
+-HOLMBERG", 0},
++" PETTER\n"
++"HOLMBERG", 0},
+ {"DESIGN",
+-"MARKUS
+-BOMAN", 1},
++"MARKUS\n"
++"BOMAN", 1},
+ {"SOUND",
+-"  EMIL
+-ERIKSSON", 0},
++"  EMIL\n"
++"ERIKSSON", 0},
+ {"SOUND",
+-"RICHARD
+-BERGMARK", 1},
++"RICHARD\n"
++"BERGMARK", 1},
+ {"MUSIC",
+-"SAMUEL
+-PERSSON", 1},
++"SAMUEL\n"
++"PERSSON", 1},
+ };
+ 
+ #define NUMCI ((signed)(sizeof(_ci) / sizeof(_ci[0])))
+ 
+ char *special_thanks =
+-"
+- SPECIAL THANKS
+-
+- PER JONNY KACK
+-  TOR SANDEN
+-MARKUS WILLANDER
+-    UFFEMAN
+-    HASSEMAN
+-  ANNA NORBERG
+-
+-    DESCENT
+-
+- AND OURSELVES
+-
+-      NOW
+-  PLAY URBAN";
++"\n"
++"SPECIAL THANKS\n\n"
++" PER JONNY KACK\n"
++"  TOR SANDEN\n"
++"MARKUS WILLANDER\n"
++    "UFFEMAN\n"
++    "HASSEMAN\n"
++  "ANNA NORBERG\n\n"
++    "DESCENT\n\n"
++ "AND OURSELVES\n\n"
++      "NOW\n"
++  "PLAY URBAN";
+ 
+ 
+ uchar lightmap[256 * 256] = {};
diff --git a/games/urban/patches/patch-ac b/games/urban/patches/patch-ac
new file mode 100644
index 00000000000..2b14eff1f38
--- /dev/null
+++ b/games/urban/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1.1.1 2004/04/16 18:18:28 xtraeme Exp $
+
+--- src/meny/meny.cc.orig	Fri Jul  2 02:23:30 1999
++++ src/meny/meny.cc	Sun Jan 25 23:17:19 2004
+@@ -124,7 +124,7 @@
+ 	return 1;
+ }
+ /*****************************************************************************************/
+-int Do_Menu(char *text, int num_items, int pos = 1) {
++int Do_Menu(char *text, int num_items, int pos) {
+ 	PALETTE pal;
+ 	UrbanFont m(LARGE_FONT);
+         m.SetScale(65);
diff --git a/games/urban/patches/patch-ad b/games/urban/patches/patch-ad
new file mode 100644
index 00000000000..4a34d8ad7a3
--- /dev/null
+++ b/games/urban/patches/patch-ad
@@ -0,0 +1,31 @@
+$NetBSD: patch-ad,v 1.1.1.1 2004/04/16 18:18:28 xtraeme Exp $
+
+--- src/gfx/ggidrv.cc.orig	Sun Jan 25 03:56:28 2004
++++ src/gfx/ggidrv.cc	Sun Jan 25 03:57:34 2004
+@@ -383,7 +383,7 @@
+ }
+ /**************************************************************************/
+ int set_palette(PALETTE p) {
+-	struct ggi_color pal[256];
++	ggi_color pal[256];
+ 	int i;
+ 
+         for(i=0;i<256;i++) {
+@@ -398,7 +398,7 @@
+ };
+ /**************************************************************************/
+ void get_palette(PALETTE p) {
+-	struct ggi_color pal[256];
++	ggi_color pal[256];
+ 	int i;
+ 
+         ggiGetPalette(screen->vis, 0, 1 << 8, pal);
+@@ -715,7 +715,7 @@
+ }
+ /**************************************************************************/
+ int set_color(int i, RGB *rgb) {
+-	struct ggi_color Color;
++	ggi_color Color;
+ 
+         Color.r = rgb->r << 10;
+         Color.g = rgb->g << 10;
diff --git a/games/urban/patches/patch-ae b/games/urban/patches/patch-ae
new file mode 100644
index 00000000000..283cd5bd08e
--- /dev/null
+++ b/games/urban/patches/patch-ae
@@ -0,0 +1,75 @@
+$NetBSD: patch-ae,v 1.1.1.1 2004/04/16 18:18:29 xtraeme Exp $
+
+--- src/objects/player.cc.orig	Wed Jun 23 21:28:13 1999
++++ src/objects/player.cc	Sun Jan 25 23:31:48 2004
+@@ -29,6 +29,7 @@
+     thomas.nyberg@usa.net				jonas_b@bitsmart.com
+ *****************************************************************************/
+ #include <stdlib.h>
++#include <string.h>
+ #include <allegro.h>
+ #include "object.h"
+ #include "object2.h"
+@@ -104,7 +105,7 @@
+         {30, 31, 32, 33, 34, 35},
+         {24, 25, 26, 27, 28, 29},
+ //        {5}, {25}, {-1}, {1}},
+-        {3}, {10}, {-1}, {1}, {1}, {-1}},
++        3, 10, -1, 1, 1, -1},
+         /* Flame thrower*/
+ /*	int walk_left[6];
+         int walk_right[6];
+@@ -121,7 +122,7 @@
+ //        {12, 13, 14, 15, 16, 17},
+         {42, 43, 44, 45, 46, 47},
+         {36, 37, 38, 39, 40, 41},
+-        {5}, {8}, {0}, {0}, {0}, {500}},
++        5, 8, 0, 0, 0, 500},
+         /* IceMaker(tm)*/
+         {{84, 85, 86, 87, 88, 89},
+         {78, 79, 80, 81, 82, 83},
+@@ -130,7 +131,7 @@
+ //        {12, 13, 14, 15, 16, 17},
+         {72, 73, 74, 75, 76, 77},
+         {66, 67, 68, 69, 70, 71},
+-        {5}, {8}, {0}, {0}, {0}, {500}},
++        5, 8, 0, 0, 0, 500},
+ 	/* Grenade launcher */
+         {{102, 103, 104, 105, 106, 107},
+         {96, 97, 98, 99, 100, 101},
+@@ -139,7 +140,7 @@
+         {126, 127, 128, 129, 130, 131},
+         {120, 121, 122, 123, 124, 125},
+ //        {5}, {25}, {-1}, {1}},
+-        {3}, {60}, {0}, {0}, {1}, {32}},
++        3, 60, 0, 0, 1, 32},
+ 	/* Plasma Weapon */
+         {{138, 139, 140, 141, 142, 143},
+         {132, 133, 134, 135, 136, 137},
+@@ -147,7 +148,7 @@
+         {144, 145, 146, 147, 148, 149},
+         {162, 163, 164, 165, 166, 167},
+         {156, 157, 158, 159, 160, 161},
+-        {3}, {5}, {0}, {0}, {0}, {100}},
++        3, 5, 0, 0, 0, 100},
+         /* Minigun */
+         {{174, 175, 176, 177, 178, 179},
+         {168, 169, 170, 171, 172, 173},
+@@ -155,7 +156,7 @@
+         {180, 181, 182, 183, 184, 185},
+         {198, 199, 200, 201, 202, 203},
+         {192, 193, 194, 195, 196, 197},
+-        {1}, {1}, {0}, {0}, {1}, {1000}},
++        1, 1, 0, 0, 1, 1000},
+         /* Electric */
+         {{210, 211, 212, 213, 214, 215},
+         {204, 205, 206, 207, 208, 209},
+@@ -163,7 +164,7 @@
+         {216, 217, 218, 219, 220, 221},
+         {234, 235, 236, 237, 238, 239},
+         {228, 229, 230, 231, 232, 233},
+-        {6}, {6}, {0}, {0}, {0}, {100}}
++        6, 6, 0, 0, 0, 100}
+ };
+ 
+ /*struct Weapon {
diff --git a/games/urban/patches/patch-af b/games/urban/patches/patch-af
new file mode 100644
index 00000000000..b0661d9a5fc
--- /dev/null
+++ b/games/urban/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1.1.1 2004/04/16 18:18:29 xtraeme Exp $
+
+--- src/sound/sound.cc.orig	2004-04-16 19:42:23.000000000 +0200
++++ src/sound/sound.cc	2004-04-16 19:42:33.000000000 +0200
+@@ -90,7 +90,7 @@
+ 	md_mode = DMODE_SOFT_SNDFX | DMODE_SOFT_MUSIC | DMODE_16BITS;
+ 	md_mixfreq = 22050;
+         
+-	if(MikMod_Init()) {
++	if(MikMod_Init(NULL)) {
+         	fprintf(stderr,"Could not initialize sound, reason: %s\n",
+                 	MikMod_strerror(MikMod_errno));
+ 			
diff --git a/games/urban/patches/patch-ag b/games/urban/patches/patch-ag
new file mode 100644
index 00000000000..04919a74e3f
--- /dev/null
+++ b/games/urban/patches/patch-ag
@@ -0,0 +1,15 @@
+$NetBSD: patch-ag,v 1.1.1.1 2004/04/16 18:18:29 xtraeme Exp $
+
+--- src/engine/game.cc.orig	Mon Jun  7 17:20:59 1999
++++ src/engine/game.cc	Sun Jan 25 23:33:14 2004
+@@ -93,10 +93,10 @@
+ char *demo_filename;
+ 
+ struct PlayerData DefaultPData = {
+-	{3},
++	3,
+ 	{-1, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+         {1, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+-        {300}, {0}
++        300, 0
+ };