Unbreak for newgcc

This commit is contained in:
Chris Piazza 2000-01-09 09:19:54 +00:00
parent 0f9b0952c7
commit 2406dbb80b
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=24588
5 changed files with 64 additions and 0 deletions

View File

@ -0,0 +1,11 @@
--- carrom.C.orig Sun Jan 9 01:09:14 2000
+++ carrom.C Sun Jan 9 01:09:37 2000
@@ -114,7 +114,7 @@
void Carrom::Setup( double x, double y )
{
static int nc[5] = { 3, 4, 5, 4, 3 }; // Steine pro Spalte
-static t[19] = { -1, 1, -2, // Steinverteilung
+static int t[19] = { -1, 1, -2, // Steinverteilung
2, -3, 3, 4,
-4, 5, 0, -5, -6,
6, -7, 7, 8,

View File

@ -0,0 +1,11 @@
--- xgraph.C.orig Sun Jan 9 01:11:55 2000
+++ xgraph.C Sun Jan 9 01:12:25 2000
@@ -603,7 +603,7 @@
XSizeHints hints;
XEvent event;
static int offx=10;
-const frame = 7;
+const int frame = 7;
hints.flags = PPosition | PSize | PAspect | PMinSize | PMaxSize;
hints.x = DisplayWidth(dpy,scr) -offx-width-frame;

View File

@ -0,0 +1,11 @@
--- main.C.orig Sun Jan 9 01:15:53 2000
+++ main.C Sun Jan 9 01:15:55 2000
@@ -366,7 +366,7 @@
if (in1) p1 = new PBall( game_pball, in1 );
if (in2) p2 = new PBall( game_pball, in2 );
- if (!demo_flag&&!p1) p1 = new PBall( game_pball, (disp)?disp:"" );
+ if (!demo_flag&&!p1) p1 = new PBall( game_pball, (disp)?disp:(char *)"" );
g->DrawBackground();

View File

@ -0,0 +1,11 @@
--- xmover.C.orig Sun Jan 9 01:16:44 2000
+++ xmover.C Sun Jan 9 01:16:51 2000
@@ -101,7 +101,7 @@
private:
int ws; // Bits klein
const int wl; // Bits gross
- static mtab[9];
+ static int mtab[9];
};
int Stuffer::mtab[9] = { 0x00, 0x01, 0x03, 0x07, 0x0f, 0x1f, 0x3f, 0x7f, 0xff };

View File

@ -0,0 +1,20 @@
--- pool8.C.orig Sun Jan 9 01:17:59 2000
+++ pool8.C Sun Jan 9 01:18:18 2000
@@ -56,7 +56,7 @@
void Pool8::Triangle( const Vec2 &vec )
{
-static t[15] = { 1,
+static int t[15] = { 1,
-1, -2,
2, 0, 3,
-3, 4, -4, -5,
@@ -186,7 +186,7 @@
void Pool9::Triangle( const Vec2 &vec )
{
-static t[9] = { 1,
+static int t[9] = { 1,
2, 3,
4, -1, 5,
6, 7,