From f0265ea26f84ad5401cf35fd004d91b4b6df34d3 Mon Sep 17 00:00:00 2001
From: kreatordxx <>
Date: Sun, 18 Feb 2007 07:29:26 +0000
Subject: [PATCH] use generic 'struct object' instead of including object.h, so
 gcc4.0 with Xcode doesn't complain about FSCALE being passed to CLIPLINE in
 2d/line.c (strange indeed)

---
 dxx-changelog.txt | 4 ++++
 include/3d.h      | 5 +++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/dxx-changelog.txt b/dxx-changelog.txt
index 2dcb7898f..2ca33c9e7 100755
--- a/dxx-changelog.txt
+++ b/dxx-changelog.txt
@@ -1,5 +1,9 @@
 D2X-Rebirth Changelog
 
+20070218
+--------
+include/3d.h: use generic 'struct object' instead of including object.h, so gcc4.0 with Xcode doesn't complain about FSCALE being passed to CLIPLINE in 2d/line.c (strange indeed)
+
 20070217
 --------
 d2x.ini, main/inferno.c, main/laser.c: added Alex' patch to add FPS independent and physics homing missiles - also implemented command-line to switch back to legacy homers
diff --git a/include/3d.h b/include/3d.h
index 04b3f20ab..a97c27db0 100755
--- a/include/3d.h
+++ b/include/3d.h
@@ -25,7 +25,8 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "fix.h"
 #include "vecmat.h" //the vector/matrix library
 #include "gr.h"
-#include "object.h"
+
+struct object;
 
 extern int g3d_interp_outline;      //if on, polygon models outlined in white
 
@@ -218,7 +219,7 @@ bool g3_draw_rod_tmap(grs_bitmap *bitmap,g3s_point *bot_point,fix bot_width,g3s_
 //returns 1 if off screen, 0 if drew
 bool g3_draw_bitmap(vms_vector *pos,fix width,fix height,grs_bitmap *bm, int orientation
 #ifdef OGL
-	,object *obj
+	, struct object *obj
 #endif
 	);