pkgsrc/games/urban/patches/patch-ab
2011-11-27 19:40:50 +00:00

100 lines
1.8 KiB
Text

$NetBSD: patch-ab,v 1.2 2011/11/27 19:40:50 joerg Exp $
--- src/credits/credits.cc.orig 1999-06-11 12:25:40.000000000 +0000
+++ src/credits/credits.cc
@@ -33,6 +33,7 @@
*****************************************************************************/
+#include <algorithm>
#include <stdlib.h>
#include <stdio.h>
#include <math.h>
@@ -72,50 +73,46 @@ struct CreditsInfo {
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] = {};
@@ -141,7 +138,7 @@ static void InitLightmap() {
nz = 0;
lightmap[x + y * 256] =
- (uchar)(255 <? nz * 191 + nz * nz * nz * nz * nz * nz * nz * nz * nz * 64);
+ (uchar)std::min(255.0f, nz * 191 + nz * nz * nz * nz * nz * nz * nz * nz * nz * 64);
}
}