From d97a584c4f9b06a227b33781dcc11bbe7eede421 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 15 Aug 2002 07:05:17 +0000
Subject: [PATCH] get everything compiling again. there are likely still
 incorrect prototypes

---
 ruamoko/game/axe.r           | 6 +++---
 ruamoko/game/tempent.r       | 2 +-
 ruamoko/game/world.r         | 4 ----
 ruamoko/include/math.h       | 2 +-
 ruamoko/include/physics.h    | 2 +-
 ruamoko/include/qw_message.h | 2 ++
 ruamoko/include/sound.h      | 2 +-
 ruamoko/lib/math.r           | 2 +-
 ruamoko/lib/physics.r        | 3 +--
 ruamoko/lib/sound.r          | 2 +-
 10 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/ruamoko/game/axe.r b/ruamoko/game/axe.r
index f1762b004..9c7fd05fc 100644
--- a/ruamoko/game/axe.r
+++ b/ruamoko/game/axe.r
@@ -1,10 +1,10 @@
 #include "axe.h"
 #include "gameent.h"
-#include "message.h"
+#include "math.h"
+#include "physics.h"
+#include "qw_message.h"
 #include "sound.h"
 #include "tempent.h"
-#include "trace.h"
-#include "vector.h"
 #include "world.h"
 
 @implementation Axe
diff --git a/ruamoko/game/tempent.r b/ruamoko/game/tempent.r
index d2fcc129b..ff9596296 100644
--- a/ruamoko/game/tempent.r
+++ b/ruamoko/game/tempent.r
@@ -1,4 +1,4 @@
-#include "message.h"
+#include "qw_message.h"
 #include "tempent.h"
 
 void(vector org, float damage) SpawnBlood =
diff --git a/ruamoko/game/world.r b/ruamoko/game/world.r
index 34171d16e..ce4c0ed09 100644
--- a/ruamoko/game/world.r
+++ b/ruamoko/game/world.r
@@ -4,10 +4,6 @@
 id world;
 integer deathmatch;
 
-void(entity e, vector min, vector max) setsize = #0;
-void(entity e, vector o) setorigin = #0;
-
-
 #define MAX_BODIES 8
 
 @interface BodyQue : Object
diff --git a/ruamoko/include/math.h b/ruamoko/include/math.h
index 89bfe5f74..46f2c3548 100644
--- a/ruamoko/include/math.h
+++ b/ruamoko/include/math.h
@@ -3,7 +3,7 @@
 
 @extern vector v_forward, v_up, v_right;
 
-@extern void (entity e) makevectors;
+@extern void (vector ang) makevectors;
 @extern float () random;
 @extern integer (float f) ftoi;
 @extern float (integer i) itof;
diff --git a/ruamoko/include/physics.h b/ruamoko/include/physics.h
index dd990e2dd..6df1b8c92 100644
--- a/ruamoko/include/physics.h
+++ b/ruamoko/include/physics.h
@@ -11,7 +11,7 @@
 @extern float		trace_inopen;
 @extern float		trace_inwater;
 
-@extern float (vector v1, vector v2, float tryents) traceline;
+@extern void (vector v1, vector v2, float nomonsters, entity forent) traceline;
 @extern entity () checkclient;
 @extern float (float yaw, float dist) walkmove;
 @extern float () droptofloor;
diff --git a/ruamoko/include/qw_message.h b/ruamoko/include/qw_message.h
index 4c331165c..854f2c8a6 100644
--- a/ruamoko/include/qw_message.h
+++ b/ruamoko/include/qw_message.h
@@ -1,6 +1,8 @@
 #ifndef __qw_message_h
 #define __qw_message_h
 
+#include "message.h"
+
 @extern void (vector where, float set) multicast;
 
 #endif//__qw_message_h
diff --git a/ruamoko/include/sound.h b/ruamoko/include/sound.h
index 85fefd6d9..60bc29274 100644
--- a/ruamoko/include/sound.h
+++ b/ruamoko/include/sound.h
@@ -13,7 +13,7 @@
 #define ATTN_IDLE 2
 #define ATTN_STATIC 3
 
-@extern void (entity e, float chan, string samp) sound;
+@extern void (entity e, float chan, string samp, float vol, float atten) sound;
 @extern void (vector pos, string samp, float vol, float atten) ambientsound;
 
 #endif//__sound_h
diff --git a/ruamoko/lib/math.r b/ruamoko/lib/math.r
index a6f2882b6..9171060d2 100644
--- a/ruamoko/lib/math.r
+++ b/ruamoko/lib/math.r
@@ -2,7 +2,7 @@
 
 vector v_forward, v_up, v_right;
 
-void (entity e) makevectors = #1;
+void (vector ang) makevectors = #1;
 float () random = #7;
 integer (float f) ftoi = #110;
 float (integer i) itof = #111;
diff --git a/ruamoko/lib/physics.r b/ruamoko/lib/physics.r
index e75271563..97af9e132 100644
--- a/ruamoko/lib/physics.r
+++ b/ruamoko/lib/physics.r
@@ -10,9 +10,8 @@ entity		trace_ent;
 float		trace_inopen;
 float		trace_inwater;
 
-void(vector v1, vector v2, float nomonsters, entity forent) traceline = #0;
 
-float (vector v1, vector v2, float tryents) traceline = #16;
+void (vector v1, vector v2, float nomonsters, entity forent) traceline = #16;
 entity () checkclient = #17;
 float (float yaw, float dist) walkmove = #32;
 float () droptofloor = #34;
diff --git a/ruamoko/lib/sound.r b/ruamoko/lib/sound.r
index 8df985e65..7880c6b1b 100644
--- a/ruamoko/lib/sound.r
+++ b/ruamoko/lib/sound.r
@@ -1,4 +1,4 @@
 #include "sound.h"
 
-void (entity e, float chan, string samp) sound = #8;
+void (entity e, float chan, string samp, float vol, float atten) sound = #8;
 void (vector pos, string samp, float vol, float atten) ambientsound = #74;