summaryrefslogtreecommitdiff
path: root/games/xrobots/files/patch-xrobots.h
diff options
context:
space:
mode:
authorChristian Weisgerber <naddy@FreeBSD.org>2015-09-21 12:36:55 +0000
committerChristian Weisgerber <naddy@FreeBSD.org>2015-09-21 12:36:55 +0000
commit7537f9bef042a7e9f34f21a5b1ada7278513d37a (patch)
treee1c61f9540d534926550cefb52e1a45875a76347 /games/xrobots/files/patch-xrobots.h
parentdeskutils/owncloudclient: update 1.8.4 -> 2.0.1 (diff)
Properly fix the LP64 issue in the application resource handling rather
than praying that globals end up in the lower 32-bit address space. Add a number of missing includes, etc. Approved by: edwin
Notes
Notes: svn path=/head/; revision=397492
Diffstat (limited to 'games/xrobots/files/patch-xrobots.h')
-rw-r--r--games/xrobots/files/patch-xrobots.h70
1 files changed, 56 insertions, 14 deletions
diff --git a/games/xrobots/files/patch-xrobots.h b/games/xrobots/files/patch-xrobots.h
index 7061fa8835c2..c070e442fa37 100644
--- a/games/xrobots/files/patch-xrobots.h
+++ b/games/xrobots/files/patch-xrobots.h
@@ -1,14 +1,56 @@
-*** xrobots.h.orig Fri Nov 17 14:37:40 1989
---- xrobots.h Mon Jan 2 22:47:56 1995
-***************
-*** 146,154 ****
- game_active,
- sonic_used;
-
-- #define MIN(a,b) ((a<b)?a:b)
-- #define MAX(a,b) ((a>b)?a:b)
--
- #define INXRANGE( _x_ ) (((_x_) >=0) && ((_x_)<MAXX))
- #define INYRANGE( _y_ ) (((_y_) >=0) && ((_y_)<MAXY))
-
---- 146,151 ----
+--- xrobots.h.orig 1989-11-17 22:37:40 UTC
++++ xrobots.h
+@@ -33,21 +33,27 @@
+ *
+ */
+
++typedef struct {
++ Pixel fg,
++ bg;
++ Boolean spiffy, /* limited graphics */
++ autoteleport, /* teleport when sonic used, and no moves */
++ autoteleportalways, /* teleport when no available moves */
++ showjumps, /* show no intermediate moves */
++ diewaiting; /* die if you use wait unsafely */
++ XtTranslations translations;
++ char *score_filename;
++} AppData;
++
+ /*
+ * from main.c
+ */
++extern AppData app_data;
+ extern Display *display;
+ extern Window playfield;
+ extern Widget playfield_widget;
+ extern GC gc,
+ cleargc;
+-extern Pixel fg,
+- bg;
+-extern Boolean spiffy,
+- autoteleport,
+- autoteleportalways,
+- showjumps,
+- diewaiting;
+ extern unsigned int
+ chasetime;
+
+@@ -106,8 +112,6 @@ extern void check_score(),
+
+ extern void show_scores_callback();
+
+-extern char *score_filename;
+-
+ /*
+ * from game.c
+ */
+@@ -146,9 +150,6 @@ extern int score,
+ game_active,
+ sonic_used;
+
+-#define MIN(a,b) ((a<b)?a:b)
+-#define MAX(a,b) ((a>b)?a:b)
+-
+ #define INXRANGE( _x_ ) (((_x_) >=0) && ((_x_)<MAXX))
+ #define INYRANGE( _y_ ) (((_y_) >=0) && ((_y_)<MAXY))
+