quick and dirty fix to get menus loading again. libr.a really needs to be

cleaned up: most of the stuff in it should /not/ be in the standard library
This commit is contained in:
Bill Currie 2004-01-05 09:06:06 +00:00
parent 0ddb5eb822
commit 6f1dd54e99
13 changed files with 39 additions and 23 deletions

View file

@ -2,8 +2,8 @@ AUTOMAKE_OPTIONS= foreign
includedir= $(prefix)/include/QF/ruamoko
include_HEADERS= \
crudefile.h debug.h entities.h infokey.h math.h message.h nq_message.h \
physics.h qfile.h qw_message.h qw_physics.h qw_sys.h sound.h string.h \
system.h \
physics.h qfile.h qw_message.h qw_physics.h qw_sys.h server.h sound.h \
string.h system.h \
\
draw.h key.h \
\

View file

@ -87,13 +87,6 @@
@extern vector v_forward, v_up, v_right;
/*
makevectors
Set v_forward, v_up, v_right global vectors from the vector ang
*/
@extern void (vector ang) makevectors;
/*
normalize

View file

@ -35,6 +35,7 @@
#define MULTICAST_PVS_R 5
@extern void (...) bprint;
@extern void (entity client, string s) sprint;
@extern void (float to, ...) WriteBytes;
@extern void (float to, float f) WriteByte;
@extern void (float to, float f) WriteChar;

View file

@ -11,6 +11,12 @@
@extern float trace_inopen;
@extern float trace_inwater;
/*
makevectors
Set v_forward, v_up, v_right global vectors from the vector ang
*/
@extern void (vector ang) makevectors;
@extern void (vector v1, vector v2, float nomonsters, entity forent) traceline;
@extern entity () checkclient;
@extern float (float yaw, float dist) walkmove;

15
ruamoko/include/server.h Normal file
View file

@ -0,0 +1,15 @@
#ifndef __ruamoko_server_h
#define __ruamoko_server_h
@extern void (string s) precache_sound;
@extern void (string s) precache_model;
@extern void (entity client, string s) stuffcmd;
@extern void (string s) localcmd;
@extern void (string s) changelevel;
@extern string (string s) precache_file;
@extern string (string s) precache_model2;
@extern string (string s) precache_sound2;
@extern string (string s) precache_file2;
@extern float () checkextension;
#endif//__ruamoko_server_h

View file

@ -1,7 +1,6 @@
#ifndef __ruamoko_string_h
#define __ruamoko_string_h
@extern void (entity client, string s) sprint;
@extern string (float f) ftos;
@extern string (vector v) vtos;
@extern float (string s) stof;

View file

@ -29,7 +29,7 @@ EXTRA_LIBRARIES= $(ruamoko_libs)
libr_a_SOURCES=\
crudefile.r debug.r hash.r entities.r infokey.r math.r message.r \
nq_message.r physics.r plist.r qfile.r qw_message.r qw_physics.r qw_sys.r \
sound.r \
server.r sound.r \
string.r system.r \
Object.r AutoreleasePool.r Array.r Entity.r List.r ListNode.r Point.r \
Rect.r Size.r Stack.r

View file

@ -2,7 +2,6 @@
vector v_forward, v_up, v_right;
void (vector ang) makevectors = #1;
float () random = #7;
integer (float f) ftoi = #110;
float (integer i) itof = #111;

View file

@ -1,6 +1,7 @@
#include "message.h"
void (...) bprint = #23;
void (entity client, string s) sprint = #24;
void (float to, float f) WriteByte = #52;
void (float to, float f) WriteChar = #53;
void (float to, float f) WriteShort = #54;

View file

@ -11,6 +11,7 @@ float trace_inopen;
float trace_inwater;
void (vector ang) makevectors = #1;
void (vector v1, vector v2, float nomonsters, entity forent) traceline = #16;
entity () checkclient = #17;
float (float yaw, float dist) walkmove = #32;

12
ruamoko/lib/server.r Normal file
View file

@ -0,0 +1,12 @@
#include "server.h"
void (string s) precache_sound = #19;
void (string s) precache_model = #20;
void (entity client, string s) stuffcmd = #21;
void (string s) localcmd = #46;
void (string s) changelevel = #70;
string (string s) precache_file = #68;
string (string s) precache_model2 = #75;
string (string s) precache_sound2 = #76;
string (string s) precache_file2 = #77;
float () checkextension = #99;

View file

@ -1,6 +1,5 @@
#include "string.h"
void (entity client, string s) sprint = #24;
string (float f) ftos = #26;
string (vector v) vtos = #27;
float (string s) stof = #81;

View file

@ -2,16 +2,6 @@
float time;
void (string s) precache_sound = #19;
void (string s) precache_model = #20;
void (entity client, string s) stuffcmd = #21;
float (string s) cvar = #45;
void (string s) localcmd = #46;
void (string s) changelevel = #70;
void (string var, string val) cvar_set = #72;
string (string s) precache_file = #68;
string (string s) precache_model2 = #75;
string (string s) precache_sound2 = #76;
string (string s) precache_file2 = #77;
float () checkextension = #99;
string () gametype = #115;