fix build (after sdl update?)

rename variable time, which conflicts with time.h

no PKGNAME bump needed
This commit is contained in:
sturm 2007-10-14 13:25:01 +00:00
parent 8ebddb7fb6
commit 23632a2491
3 changed files with 73 additions and 8 deletions

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.1 2002/04/08 23:21:33 naddy Exp $ $OpenBSD: patch-Makefile_in,v 1.2 2007/10/14 13:25:01 sturm Exp $
--- Makefile.in.orig Wed Feb 20 18:28:42 2002 --- Makefile.in.orig Wed Feb 20 10:28:42 2002
+++ Makefile.in Tue Apr 9 01:10:47 2002 +++ Makefile.in Sun Oct 14 06:23:16 2007
@@ -379,10 +379,13 @@ maintainer-clean-generic clean mostlycle @@ -379,10 +379,13 @@ maintainer-clean-generic clean mostlyclean distclean m
install-exec-hook: install-exec-hook:

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-screen_cc,v 1.1 2002/10/09 12:21:43 naddy Exp $ $OpenBSD: patch-screen_cc,v 1.2 2007/10/14 13:25:01 sturm Exp $
--- screen.cc.orig Wed Oct 9 13:43:55 2002 --- screen.cc.orig Wed Feb 20 09:40:50 2002
+++ screen.cc Wed Oct 9 13:44:10 2002 +++ screen.cc Sun Oct 14 06:23:15 2007
@@ -540,7 +540,7 @@ void scr_writetext(long x, long y, const @@ -540,7 +540,7 @@ void scr_writetext(long x, long y, const char *s) {
} }
} }

View File

@ -0,0 +1,65 @@
$OpenBSD: patch-snowball_cc,v 1.1 2007/10/14 13:25:01 sturm Exp $
--- snowball.cc.orig Sun Oct 14 06:24:00 2007
+++ snowball.cc Sun Oct 14 06:25:14 2007
@@ -6,10 +6,10 @@
static int an;
static long subKind;
static long ve;
-static long time;
+static long my_time;
void snb_init(void) {
- time = -1;
+ my_time = -1;
}
/* move the snowball and check if it hits something */
@@ -22,19 +22,19 @@ void snb_movesnowball(void) {
int nr;
- if (time < 0) return;
+ if (my_time < 0) return;
- if (time == 12) {
- time = -1;
+ if (my_time == 12) {
+ my_time = -1;
return;
}
- time++;
+ my_time++;
an = (an + subKind * 2) & 0x7f;
- ve += schusshoch[time - 1];
+ ve += schusshoch[my_time - 1];
if (!lev_testfigure(an, ve, -1, 0, 2, 2, 5)) {
- time = -1;
+ my_time = -1;
return;
}
@@ -45,11 +45,11 @@ void snb_movesnowball(void) {
else {
snd_hit();
pts_add(rob_gothit(nr));
- time = -1;
+ my_time = -1;
}
}
-bool snb_exists(void) { return time != -1; }
+bool snb_exists(void) { return my_time != -1; }
void snb_start(int verticalpos, int anglepos, bool look_left) {
@@ -62,7 +62,7 @@ void snb_start(int verticalpos, int anglepos, bool loo
subKind = 1;
}
an &= 0x7f;
- time = 0;
+ my_time = 0;
}
int snb_verticalpos(void) { return ve; }