r224 - trunk/rott

[DONOTREPLY at icculus.org]

Author: jwrdegoede
Date: 2008-05-24 02:23:07 -0400 (Sat, 24 May 2008)
New Revision: 224

Modified:
   trunk/rott/Makefile
   trunk/rott/rt_actor.h
   trunk/rott/rt_in.h
Log:
Stop compile errors due to static / extern mismatch between .h and .c files

Modified: trunk/rott/Makefile
===================================================================
--- trunk/rott/Makefile	2008-05-05 14:19:49 UTC (rev 223)
+++ trunk/rott/Makefile	2008-05-24 06:23:07 UTC (rev 224)
@@ -47,7 +47,7 @@
 
 
 CC = gcc
-CFLAGS = -g $(SDL_CFLAGS) -DUSE_SDL=1 -DPLATFORM_UNIX=1 -W -Wall -Wno-unused $(EXTRACFLAGS)
+CFLAGS = -g $(SDL_CFLAGS) -DUSE_SDL=1 -DPLATFORM_UNIX=1 -W -Wall -Wno-unused -Wno-pointer-sign $(EXTRACFLAGS)
 LDLIBS = $(SDL_LDFLAGS) -lSDL -lSDL_mixer $(EXTRALDFLAGS) -Wl,-E
 
 all: rott

Modified: trunk/rott/rt_actor.h
===================================================================
--- trunk/rott/rt_actor.h	2008-05-05 14:19:49 UTC (rev 223)
+++ trunk/rott/rt_actor.h	2008-05-24 06:23:07 UTC (rev 224)
@@ -315,7 +315,7 @@
 extern  void             *actorat[MAPSIZE][MAPSIZE];
 extern  int              angletodir[ANGLES];
 extern _2Dpoint          SNAKEPATH[512];
-extern  int              STOPSPEED;
+/* extern  int              STOPSPEED; */
 extern  int              FRICTION;
 
 extern  int              objcount;

Modified: trunk/rott/rt_in.h
===================================================================
--- trunk/rott/rt_in.h	2008-05-05 14:19:49 UTC (rev 223)
+++ trunk/rott/rt_in.h	2008-05-24 06:23:07 UTC (rev 224)
@@ -147,9 +147,9 @@
 
 extern boolean  Paused;
 extern volatile int LastScan;
-extern KeyboardDef KbdDefs;
+/* extern KeyboardDef KbdDefs;
 extern JoystickDef JoyDefs[];
-extern ControlType Controls[MAXPLAYERS];
+extern ControlType Controls[MAXPLAYERS]; */
 
 extern boolean  SpaceBallPresent;
 extern boolean  CybermanPresent;