move the bulk of what whas libQFcsqc to libQFruamoko.

configure.ac

@@ -2112,6 +2112,7 @@ AC_OUTPUT(
 	libs/net/nc/Makefile
 	libs/net/nm/Makefile
 	libs/object/Makefile
+	libs/ruamoko/Makefile
 	libs/util/Makefile
 	libs/video/Makefile
 	libs/video/renderer/Makefile

include/QF/Makefile.am

@@ -7,5 +7,6 @@ include_HEADERS = bspfile.h cbuf.h cdaudio.h checksum.h clip_hull.h cmd.h \
 	llist.h locs.h mathlib.h mdfour.h model.h modelgen.h msg.h object.h pak.h \
 	pakfile.h pcx.h png.h plugin.h pr_comp.h pr_debug.h pr_obj.h progs.h \
 	qargs.h qdefs.h qendian.h qfplist.h qtypes.h quakefs.h quakeio.h render.h \
-	riff.h screen.h sizebuf.h skin.h sound.h spritegn.h sys.h teamplay.h \
-	tga.h uint32.h va.h ver_check.h vid.h view.h wad.h wadfile.h zone.h
+	riff.h ruamoko.h screen.h sizebuf.h skin.h sound.h spritegn.h sys.h \
+	teamplay.h tga.h uint32.h va.h ver_check.h vid.h view.h wad.h wadfile.h \
+	zone.h

include/QF/csqc.h

@@ -32,43 +32,14 @@
 #ifndef __QF_csqc_h
 #define __QF_csqc_h
 
-void BI_Init (void);
-
 struct progs_s;
 struct cbuf_s;
 struct inputline_s;
 
-void Cbuf_Progs_Init (struct progs_s *pr);
-void Cbuf_Progs_SetCbuf (struct progs_s *pr, struct cbuf_s *cbuf);
-
-void Cmd_Progs_Init (struct progs_s *pr);
-
-void Cvar_Progs_Init (struct progs_s *pr);
-
-void File_Progs_Init (struct progs_s *pr);
-
-void Hash_Progs_Init (struct progs_s *pr);
-
 void GIB_Progs_Init (struct progs_s *pr);
 
 void InputLine_Progs_Init (struct progs_s *pr);
 void InputLine_Progs_SetDraw (struct progs_s *pr,
 							  void (*draw)(struct inputline_s*));
 
-void Key_Progs_Init (struct progs_s *pr);
-
-void Plist_Progs_Init (struct progs_s *pr);
-
-void String_Progs_Init (struct progs_s *pr);
-
-#include "QF/quakeio.h"
-#define QFILE_MAX_HANDLES 20
-typedef struct {
-	QFile      *handles[QFILE_MAX_HANDLES];
-} qfile_resources_t;
-
-void QFile_Progs_Init (struct progs_s *pr, int secure);
-QFile **QFile_AllocHandle (struct progs_s *pr, qfile_resources_t *res);
-void QFS_Progs_Init (struct progs_s *pr);
-
 #endif//__QF_csqc_h

include/QF/keys.h

@@ -399,6 +399,8 @@ void Key_SetBinding (imt_t target, knum_t keynum, const char *binding);
 
 
 const char *Key_KeynumToString (knum_t keynum);
+struct progs_s;
+void Key_Progs_Init (struct progs_s *pr);
 #endif
 
 #endif // _KEYS_H

include/QF/ruamoko.h

@@ -0,0 +1,66 @@
+/*
+	ruamoko.h
+
+	ruamoko prototypes
+
+	Copyright (C) 2001 Bill Currie
+
+	Author: Bill Currie
+	Date: 2002/1/19
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+	$Id$
+*/
+
+#ifndef __QF_ruamoko_h
+#define __QF_ruamoko_h
+
+
+struct progs_s;
+struct cbuf_s;
+
+void RUA_Init (void);
+
+void RUA_Cbuf_Init (struct progs_s *pr);
+void Cbuf_Progs_SetCbuf (struct progs_s *pr, struct cbuf_s *cbuf);
+
+void RUA_Cmd_Init (struct progs_s *pr);
+
+void RUA_Cvar_Init (struct progs_s *pr);
+
+void RUA_File_Init (struct progs_s *pr);
+
+void RUA_Hash_Init (struct progs_s *pr);
+
+void RUA_Plist_Init (struct progs_s *pr);
+
+void RUA_String_Init (struct progs_s *pr);
+
+#include "QF/quakeio.h"
+#define QFILE_MAX_HANDLES 20
+typedef struct {
+	QFile      *handles[QFILE_MAX_HANDLES];
+} qfile_resources_t;
+
+void RUA_QFile_Init (struct progs_s *pr, int secure);
+QFile **QFile_AllocHandle (struct progs_s *pr, qfile_resources_t *res);
+void RUA_QFS_Init (struct progs_s *pr);
+
+#endif//__QF_ruamoko_h

libs/Makefile.am

@@ -1,3 +1,3 @@
 AUTOMAKE_OPTIONS= foreign
 
-SUBDIRS=	audio console gamecode gib image models net object video util
+SUBDIRS=audio console gamecode gib image models net object video ruamoko util

libs/console/menu.c

@@ -47,6 +47,7 @@ static __attribute__ ((unused)) const char rcsid[] =
 #include "QF/progs.h"
 #include "QF/quakefs.h"
 #include "QF/render.h"
+#include "QF/ruamoko.h"
 #include "QF/sys.h"
 #include "QF/view.h"
 
@@ -452,18 +453,19 @@ Menu_Init (void)
 
 	PR_Obj_Progs_Init (&menu_pr_state);
 
-	Cbuf_Progs_Init (&menu_pr_state);
-	Cmd_Progs_Init (&menu_pr_state);
-	GIB_Progs_Init (&menu_pr_state);
-	Cvar_Progs_Init (&menu_pr_state);
-	File_Progs_Init (&menu_pr_state);
 	InputLine_Progs_Init (&menu_pr_state);
 	Key_Progs_Init (&menu_pr_state);
-	QFile_Progs_Init (&menu_pr_state, 1);
-	QFS_Progs_Init (&menu_pr_state);
+	GIB_Progs_Init (&menu_pr_state);
 	PR_Cmds_Init (&menu_pr_state);
 	R_Progs_Init (&menu_pr_state);
-	String_Progs_Init (&menu_pr_state);
+
+	RUA_Cbuf_Init (&menu_pr_state);
+	RUA_Cmd_Init (&menu_pr_state);
+	RUA_Cvar_Init (&menu_pr_state);
+	RUA_File_Init (&menu_pr_state);
+	RUA_QFile_Init (&menu_pr_state, 1);
+	RUA_QFS_Init (&menu_pr_state);
+	RUA_String_Init (&menu_pr_state);
 
 	PR_AddLoadFunc (&menu_pr_state, menu_resolve_globals);
 

libs/gamecode/builtins/Makefile.am

@@ -3,12 +3,7 @@ AUTOMAKE_OPTIONS= foreign
 AM_CFLAGS= @PREFER_PIC@
 INCLUDES= -I$(top_srcdir)/include
 
-lib_LTLIBRARIES= libQFgamecode_builtins.la libQFcsqc.la
+lib_LTLIBRARIES= libQFgamecode_builtins.la
 
 libQFgamecode_builtins_la_LDFLAGS=	-version-info 1:0:0
-libQFgamecode_builtins_la_SOURCES=	pr_cmds.c
-
-libQFcsqc_la_LDFLAGS=	-version-info 1:0:0
-libQFcsqc_la_SOURCES=\
-		bi_cbuf.c bi_cmd.c bi_cvar.c bi_file.c bi_gib.c bi_hash.c bi_init.c \
-		bi_inputline.c bi_plist.c bi_qfile.c bi_qfs.c bi_string.c
+libQFgamecode_builtins_la_SOURCES=	pr_cmds.c bi_gib.c bi_inputline.c

libs/gamecode/builtins/pr_cmds.c

@@ -52,6 +52,13 @@ static __attribute__ ((unused)) const char rcsid[] =
 
 #include "compat.h"
 
+//FIXME lines to #undef U really shouldn't be here
+#include "QF/csqc.h"
+#define U __attribute__ ((unused))
+static U void (*const gib_progs_init)(progs_t *) = GIB_Progs_Init;
+static U void (*const inputline_progs_init)(progs_t *) = InputLine_Progs_Init;
+#undef U
+
 const char *pr_gametype = "";
 
 /* BUILT-IN FUNCTIONS */

libs/ruamoko/.gitignore

@@ -0,0 +1,8 @@
+*.la
+*.lo
+.deps
+.libs
+.vimrc
+Makefile
+Makefile.in
+

libs/ruamoko/Makefile.am

@@ -0,0 +1,11 @@
+AUTOMAKE_OPTIONS= foreign
+
+AM_CFLAGS= @PREFER_PIC@
+INCLUDES= -I$(top_srcdir)/include
+
+lib_LTLIBRARIES= libQFruamoko.la
+
+libQFruamoko_la_LDFLAGS=	-version-info 1:0:0
+libQFruamoko_la_SOURCES= \
+		rua_cbuf.c rua_cmd.c rua_cvar.c rua_file.c rua_hash.c rua_init.c \
+		rua_plist.c rua_qfile.c rua_qfs.c rua_string.c

libs/ruamoko/rua_cbuf.c

@@ -34,9 +34,9 @@ static __attribute__ ((unused)) const char rcsid[] =
 #include <stdlib.h>
 
 #include "QF/cbuf.h"
-#include "QF/csqc.h"
 #include "QF/idparse.h" // For now, use the id console parser
 #include "QF/progs.h"
+#include "QF/ruamoko.h"
 
 
 typedef struct {
@@ -111,7 +111,7 @@ static builtin_t builtins[] = {
 };
 
 void
-Cbuf_Progs_Init (progs_t *pr)
+RUA_Cbuf_Init (progs_t *pr)
 {
 	cbuf_resources_t *res = calloc (sizeof (cbuf_resources_t), 1);
 	PR_Resources_Register (pr, "Cbuf", res, bi_cbuf_clear);

libs/ruamoko/rua_cmd.c

@@ -1,7 +1,7 @@
 /*
 	bi_cmd.c
 
-	Command api for csqc
+	Command api for ruamoko
 
 	Copyright (C) 2002 Bill Currie
 
@@ -43,9 +43,9 @@ static __attribute__ ((unused)) const char rcsid[] =
 #endif
 
 #include "QF/cmd.h"
-#include "QF/csqc.h"
 #include "QF/hash.h"
 #include "QF/progs.h"
+#include "QF/ruamoko.h"
 #include "QF/sys.h"
 
 typedef struct bi_cmd_s {
@@ -156,7 +156,7 @@ static builtin_t builtins[] = {
 };
 
 void
-Cmd_Progs_Init (progs_t *pr)
+RUA_Cmd_Init (progs_t *pr)
 {
 	cmd_resources_t *res = malloc (sizeof (cmd_resources_t));
 

libs/ruamoko/rua_cvar.c

@@ -38,9 +38,9 @@ static __attribute__ ((unused)) const char rcsid[] =
 # include <strings.h>
 #endif
 
-#include "QF/csqc.h"
 #include "QF/cvar.h"
 #include "QF/progs.h"
+#include "QF/ruamoko.h"
 #include "QF/zone.h"
 
 /*
@@ -62,7 +62,7 @@ static builtin_t builtins[] = {
 };
 
 void
-Cvar_Progs_Init (progs_t *pr)
+RUA_Cvar_Init (progs_t *pr)
 {
 	PR_RegisterBuiltins (pr, builtins);
 }

libs/ruamoko/rua_file.c

@@ -53,10 +53,10 @@ static __attribute__ ((unused)) const char rcsid[] =
 int         fnmatch (const char *__pattern, const char *__string, int __flags);
 #endif
 
-#include "QF/csqc.h"
 #include "QF/cvar.h"
 #include "QF/progs.h"
 #include "QF/quakefs.h"
+#include "QF/ruamoko.h"
 #include "QF/va.h"
 #include "QF/zone.h"
 
@@ -179,7 +179,7 @@ static builtin_t builtins[] = {
 };
 
 void
-File_Progs_Init (progs_t *pr)
+RUA_File_Init (progs_t *pr)
 {
 	PR_RegisterBuiltins (pr, builtins);
 }

libs/ruamoko/rua_hash.c

@@ -42,9 +42,9 @@ static __attribute__ ((unused)) const char rcsid[] =
 #endif
 #include <stdlib.h>
 
-#include "QF/csqc.h"
 #include "QF/hash.h"
 #include "QF/progs.h"
+#include "QF/ruamoko.h"
 
 typedef struct bi_hashtab_s {
 	struct bi_hashtab_s *next;
@@ -325,7 +325,7 @@ static builtin_t builtins[] = {
 };
 
 void
-Hash_Progs_Init (progs_t *pr)
+RUA_Hash_Init (progs_t *pr)
 {
 	hash_resources_t *res = malloc (sizeof (hash_resources_t));
 	res->tabs = 0;

libs/ruamoko/rua_init.c

@@ -31,25 +31,23 @@
 static __attribute__ ((unused)) const char rcsid[] = 
 	"$Id$";
 
-#include "QF/csqc.h"
 #include "QF/progs.h"
+#include "QF/ruamoko.h"
 
 #define U __attribute__ ((unused))
-static U void (*const cbuf_progs_init)(progs_t *) = Cbuf_Progs_Init;
-static U void (*const cmd_progs_init)(progs_t *) = Cmd_Progs_Init;
-static U void (*const gib_progs_init)(progs_t *) = GIB_Progs_Init;
-static U void (*const cvar_progs_init)(progs_t *) = Cvar_Progs_Init;
-static U void (*const file_progs_init)(progs_t *) = File_Progs_Init;
-static U void (*const hash_progs_init)(progs_t *) = Hash_Progs_Init;
-static U void (*const inputline_progs_init)(progs_t *) = InputLine_Progs_Init;
-static U void (*const plist_progs_init)(progs_t *) = Plist_Progs_Init;
-static U void (*const qfile_progs_init)(progs_t *, int) = QFile_Progs_Init;
-static U void (*const qfs_progs_init)(progs_t *) = QFS_Progs_Init;
-static U void (*const string_progs_init)(progs_t *) = String_Progs_Init;
+static U void (*const cbuf_progs_init)(progs_t *) = RUA_Cbuf_Init;
+static U void (*const cmd_progs_init)(progs_t *) = RUA_Cmd_Init;
+static U void (*const cvar_progs_init)(progs_t *) = RUA_Cvar_Init;
+static U void (*const file_progs_init)(progs_t *) = RUA_File_Init;
+static U void (*const hash_progs_init)(progs_t *) = RUA_Hash_Init;
+static U void (*const plist_progs_init)(progs_t *) = RUA_Plist_Init;
+static U void (*const qfile_progs_init)(progs_t *, int) = RUA_QFile_Init;
+static U void (*const qfs_progs_init)(progs_t *) = RUA_QFS_Init;
+static U void (*const string_progs_init)(progs_t *) = RUA_String_Init;
 #undef U
 
 void
-BI_Init ()
+RUA_Init (void)
 {
 	// do nothing stub for now. used to force linking
 }

libs/ruamoko/rua_plist.c

@@ -42,10 +42,10 @@ static __attribute__ ((unused)) const char rcsid[] =
 #endif
 #include <stdlib.h>
 
-#include "QF/csqc.h"
 #include "QF/hash.h"
 #include "QF/progs.h"
 #include "QF/qfplist.h"
+#include "QF/ruamoko.h"
 
 typedef struct {
 	hashtab_t  *items;
@@ -184,7 +184,7 @@ static builtin_t builtins[] = {
 };
 
 void
-Plist_Progs_Init (progs_t *pr)
+RUA_Plist_Init (progs_t *pr)
 {
 	plist_resources_t *res = malloc (sizeof (plist_resources_t));
 	res->items = Hash_NewTable (1021, 0, 0, 0);

libs/ruamoko/rua_qfile.c

@@ -39,9 +39,9 @@ static __attribute__ ((unused)) const char rcsid[] =
 # include <strings.h>
 #endif
 
-#include "QF/csqc.h"
 #include "QF/progs.h"
 #include "QF/quakefs.h"
+#include "QF/ruamoko.h"
 #include "QF/va.h"
 #include "QF/zone.h"
 
@@ -300,7 +300,7 @@ static builtin_t builtins[] = {
 };
 
 void
-QFile_Progs_Init (progs_t *pr, int secure)
+RUA_QFile_Init (progs_t *pr, int secure)
 {
 	qfile_resources_t *res = calloc (sizeof (qfile_resources_t), 1);
 

libs/ruamoko/rua_qfs.c

@@ -39,9 +39,9 @@ static __attribute__ ((unused)) const char rcsid[] =
 # include <strings.h>
 #endif
 
-#include "QF/csqc.h"
 #include "QF/progs.h"
 #include "QF/quakefs.h"
+#include "QF/ruamoko.h"
 #include "QF/va.h"
 #include "QF/zone.h"
 
@@ -125,7 +125,7 @@ static builtin_t builtins[] = {
 };
 
 void
-QFS_Progs_Init (progs_t *pr)
+RUA_QFS_Init (progs_t *pr)
 {
 	PR_RegisterBuiltins (pr, builtins);
 }

libs/ruamoko/rua_string.c

@@ -42,9 +42,9 @@ static __attribute__ ((unused)) const char rcsid[] =
 #endif
 #include <stdlib.h>
 
-#include "QF/csqc.h"
 #include "QF/dstring.h"
 #include "QF/progs.h"
+#include "QF/ruamoko.h"
 
 static void
 bi_str_new (progs_t *pr)
@@ -86,7 +86,7 @@ static builtin_t builtins[] = {
 };
 
 void
-String_Progs_Init (progs_t *pr)
+RUA_String_Init (progs_t *pr)
 {
 	PR_RegisterBuiltins (pr, builtins);
 }

nq/source/Makefile.am

@@ -57,8 +57,7 @@ common_ldflags= -export-dynamic
 
 cl_plugin_LIBS= \
 		$(SERVER_PLUGIN_STATIC_LIBS) \
-		$(CLIENT_PLUGIN_STATIC_LIBS) \
-		$(top_builddir)/libs/gamecode/builtins/libQFcsqc.la
+		$(CLIENT_PLUGIN_STATIC_LIBS)
 
 client_LIBFILES= \
 		$(top_builddir)/libs/video/targets/libQFjs.la \
@@ -74,9 +73,10 @@ common_LIBFILES= \
 		$(top_builddir)/libs/net/libnet_main.la \
 		$(top_builddir)/libs/console/libQFconsole.la \
 		$(top_builddir)/libs/gamecode/builtins/libQFgamecode_builtins.la \
-		$(top_builddir)/libs/gamecode/engine/libQFgamecode.la \
 		$(top_builddir)/libs/image/libQFimage.la \
 		$(top_builddir)/libs/gib/libQFgib.la \
+		$(top_builddir)/libs/ruamoko/libQFruamoko.la \
+		$(top_builddir)/libs/gamecode/engine/libQFgamecode.la \
 		$(top_builddir)/libs/util/libQFutil.la
 
 client_LIBS=	$(client_LIBFILES) $(common_LIBFILES)

nq/source/host.c

@@ -36,7 +36,6 @@ static __attribute__ ((unused)) const char rcsid[] =
 #include "QF/cdaudio.h"
 #include "QF/cmd.h"
 #include "QF/console.h"
-#include "QF/csqc.h"
 #include "QF/cvar.h"
 #include "QF/draw.h"
 #include "QF/input.h"
@@ -45,6 +44,7 @@ static __attribute__ ((unused)) const char rcsid[] =
 #include "QF/plugin.h"
 #include "QF/progs.h"
 #include "QF/qargs.h"
+#include "QF/ruamoko.h"
 #include "QF/screen.h"
 #include "QF/sys.h"
 #include "QF/va.h"
@@ -917,7 +917,7 @@ Host_Init (void)
 	V_Init_Cvars ();
 
 	PR_Init ();
-	BI_Init ();
+	RUA_Init ();
 
 	V_Init ();
 	Game_Init ();

nq/source/sv_ded.c

@@ -317,8 +317,3 @@ console_client_PluginInfo (void)
 {
 	return 0;
 }   
-
-void
-BI_Init (void)
-{
-}

qw/source/Makefile.am

@@ -76,7 +76,7 @@ libqw_server_a_SOURCES= \
 qf_server_LIBS= \
 		$(SERVER_PLUGIN_STATIC_LIBS) \
 		$(top_builddir)/libs/net/libnet_chan.la \
-		$(top_builddir)/libs/gamecode/builtins/libQFcsqc.la \
+		$(top_builddir)/libs/ruamoko/libQFruamoko.la \
 		$(top_builddir)/libs/models/libQFmodels.la \
 		$(top_builddir)/libs/gamecode/builtins/libQFgamecode_builtins.la \
 		$(top_builddir)/libs/gamecode/engine/libQFgamecode.la \
@@ -96,7 +96,7 @@ qw_master_LDFLAGS=	$(common_ldflags)
 
 cl_plugin_LIBS= \
 		$(CLIENT_PLUGIN_STATIC_LIBS) \
-		$(top_builddir)/libs/gamecode/builtins/libQFcsqc.la
+		$(top_builddir)/libs/ruamoko/libQFruamoko.la
 
 qf_client_LIBS= \
 		$(top_builddir)/libs/net/libnet_chan.la \

qw/source/cl_main.c

@@ -65,7 +65,6 @@ static __attribute__ ((unused)) const char rcsid[] =
 #include "QF/cdaudio.h"
 #include "QF/cmd.h"
 #include "QF/console.h"
-#include "QF/csqc.h"
 #include "QF/cvar.h"
 #include "QF/draw.h"
 #include "QF/input.h"
@@ -77,6 +76,7 @@ static __attribute__ ((unused)) const char rcsid[] =
 #include "QF/qargs.h"
 #include "QF/qendian.h"
 #include "QF/quakefs.h"
+#include "QF/ruamoko.h"
 #include "QF/screen.h"
 #include "QF/sound.h"
 #include "QF/sys.h"
@@ -1685,7 +1685,7 @@ Host_Init (void)
 	VID_Init_Cvars ();
 
 	PR_Init ();
-	BI_Init ();
+	RUA_Init ();
 
 	CL_Chat_Init ();
 

qw/source/sv_progs.c

@@ -36,9 +36,9 @@
 
 #include "QF/cbuf.h"
 #include "QF/cmd.h"
-#include "QF/csqc.h"		//FIXME d'oh, dumb name after all
 #include "QF/cvar.h"
 #include "QF/quakefs.h"
+#include "QF/ruamoko.h"
 #include "QF/sys.h"
 
 #include "compat.h"
@@ -395,8 +395,8 @@ SV_Progs_Init (void)
 	PR_Resources_Init (&sv_pr_state);
 	SV_PR_Cmds_Init ();
 	SV_PR_QWE_Init (&sv_pr_state);
-	Cmd_Progs_Init (&sv_pr_state);
-	Hash_Progs_Init (&sv_pr_state);
+	RUA_Cmd_Init (&sv_pr_state);
+	RUA_Hash_Init (&sv_pr_state);
 
 	Cmd_AddCommand ("edict", ED_PrintEdict_f, "Report information on a given "
 					"edict in the game. (edict (edict number))");