./configure --help and select options.
To build and install only the quakeworld server:
+\verbatim
./bootstrap
./configure --without-clients --without-tools --with-servers=qw
make install
+\endverbatim
To build documentation (doxygen, graphviz and mscgen are required), in an
already configured source tree:
+\verbatim
cd doc
make doc
+\endverbatim
-Then either point your webbrowser to doxygen/html/index.html, or copy/move
-doxygen/html to a webserver and point your browser to that. The
-documentation is currently grossly inadequate, but hopefully it is of some
-help.
+Then either point your webbrowser to doxygen/html/index.html, or
+copy/move doxygen/html to a webserver and point your browser
+to that. The documentation is currently grossly inadequate, but hopefully
+it is of some help.
+*/
diff --git a/NEWS b/NEWS
index 0efabf97f..18c8d93f5 100644
--- a/NEWS
+++ b/NEWS
@@ -2,64 +2,123 @@ NEWS for the QuakeForge project
-------------------------------
Changes from 0.5.5
- o General enhancements
- * protocol 666 support from fitzquake (nq)
- * large map support from fitzquake
- * fullscreen mode is now compliant with modern window managers
- * wide screens supported. Use the vid_aspect cvar to specify the
- screen's aspect ratio (eg, 4:3, 16:9, 800:480 etc).
- * lighting tweaks
- * don't lose sound when switching workplaces in X
- * correct resampling of sound effects for 48kHz sound output (or any
- other rate, for that matter).
- * support up to 7.1 channel sound files. However, output is still
- limited to two channels.
- * "lagged dlights" in mvds fixed
- * flac sound file support
- * support multiple directories in fs_sharepath
- * new savegame format (property list)
- * map entities can use property lists
- * JACK audio output
- * http download support
- * CPQW support
- * gold-key/radiation-symbol bug in rock2 fixed
- * support for very big maps (eg marcher.bsp)
- * beams (lightning etc) can be any length
- * unlimited beams
- * unlimited loaded models
- * unlimited efrags
- * support for Japanese keyboards
- * particle improvements
- * nq can now release the CPU when it is not needed (cl_usleep 1)
- o Ruamoko (QuakeC)
- * plist access
- * entity parsing support
- * quake script parsing support
- * dynamic strings
- * mutable strings
- * progs can provide their own entity parsing function. A sample
- implementation is available.
- o qfcc
- * man page documentation
- * function overloading
- * allow entity.vector.x (etc) instead of entity.vector_x
- * many ObjectiveQuakeC fixes
- * optional constant-vector parameter space optimisation (slows down
- the code, though): can compile the version of frogbot that has
- waypoints for almost 300 maps.
- * rcall support
- * static local vars
- * more pointer support
- * better compatibility with qcc
- * preprocess progs.src
- * one-pass compilation of progs.src based code when using cpp
- * qccx escape codes supported. As there are conflicts with qfcc's
- escape codes, --qccx-escapes can be used to select qccx instead of
- qfcc.
- o Tools
- * filter for displaying item information from a map (itemslist.py)
- * wad tool improvements
- * qfbsp can extract the entities data from bsp files.
+ o General enhancements
+ * many limits removed
+ o unlimited nails (client side)
+ o unlimited visible entities
+ o unlimited static entities
+ o for BSP files, only limits dictated by the format remain
+ * linux joystick improvements:
+ o default device is /dev/input/js0
+ o up to 18 buttons
+ * developer cvar is now a bit field
+ o 1 everything
+ o 2 warnings
+ o 4 video
+ o 8 file system: not found
+ o 16 file system: found
+ o 32 file system: general
+ o 64 networking
+ o 128 ruamoko: objects
+ o 256 ruamoko: messages
+ o 512 sound
+ o 1024 GL textures
+ * ALSA sound support now works with PulseAudio by default
+ * NQ now works on multi-homed hosts
+ * OpenBSD networking fixes
+ * loss of contact with the jack server is now detected. no more
+ hanging on shutdown after jack flakes out.
+ * fishey rendering fixed
+ * crash gracefully when a map has too many entities (rather than
+ silently dropping them: coag3 wasn't fun with missing ents)
+ * players can jump off pretty much anything (controllable via
+ sv_jump_any)
+ * funny size sound buffers no longer a problem
+ * RLE encoding for PCX output
+ * plugins moved to ${libdir}/quakeforge/plugins
+ * IPv6 support now working
+ * rotating bsp model support
+ * alsa 0.9 support dropped
+ * transparent map entities
+ * support map specified skyboxes
+ * NQ's maximum velocity is now spherical rather than cubical
+ * truncate long level names in NQ's HUD
+ * protocol 666 support from fitzquake (nq)
+ * large map support from fitzquake
+ * fullscreen mode is now compliant with modern window managers
+ * wide screens supported. Use the vid_aspect cvar to specify the
+ screen's aspect ratio (eg, 4:3, 16:9, 800:480 etc).
+ * lighting tweaks
+ * don't lose sound when switching workplaces in X
+ * correct resampling of sound effects for 48kHz sound output (or any
+ other rate, for that matter).
+ * support up to 7.1 channel sound files. However, output is still
+ limited to two channels.
+ * "lagged dlights" in mvds fixed
+ * flac sound file support
+ * support multiple directories in fs_sharepath
+ * new savegame format (property list)
+ * map entities can use property lists
+ * JACK audio output
+ * http download support
+ * CPQW support
+ * gold-key/radiation-symbol bug in rock2 fixed
+ * support for very big maps (eg marcher.bsp)
+ * beams (lightning etc) can be any length
+ * unlimited beams
+ * unlimited loaded models
+ * unlimited efrags
+ * support for Japanese keyboards
+ * particle improvements
+ * nq can now release the CPU when it is not needed (cl_usleep 1)
+ o Ruamoko (QuakeC)
+ * installed headers/libs now in ${prefix}/lib/qfcc
+ * plist access
+ * entity parsing support
+ * quake script parsing support
+ * dynamic strings
+ * mutable strings
+ * progs can provide their own entity parsing function. A sample
+ implementation is available.
+ o qfcc
+ * major rewrite of parser and code generation
+ o C style declarations fully supported (bit fields ignored)
+ o dead code elimination
+ o better constant folding
+ o Objective-QC runtime data moved into far data to avoid taking
+ precious near data defs.
+ o missing return statements in non-void functions now detected
+ with a suitable warning
+ o pointers and arrays now use C syntax
+ o "integer" now "int"
+ * field aliasing: .SEL thinkMethod = think;
+ * diagnostic variables
+ __PRETTY_FUNCTION__ __FUNCTION__ __LINE__ and __FILE__
+ * NIL renamed to nil
+ * man page documentation
+ * function overloading
+ * allow entity.vector.x (etc) instead of entity.vector_x
+ * many ObjectiveQuakeC fixes
+ * optional constant-vector parameter space optimisation (slows down
+ the code, though): can compile the version of frogbot that has
+ waypoints for almost 300 maps.
+ * rcall support
+ * static local vars
+ * more pointer support
+ * better compatibility with qcc
+ * preprocess progs.src
+ * one-pass compilation of progs.src based code when using cpp
+ * qccx escape codes supported. As there are conflicts with qfcc's
+ escape codes, --qccx-escapes can be used to select qccx instead of
+ qfcc.
+ * explicit references to classes and categories via
+ "@reference ClassName;" or "@reference ClassName(CategoryName);"
+ o Tools
+ * filter for displaying item information from a map (itemslist.py)
+ * wad tool improvements
+ * qfbsp can extract the entities data from bsp files.
+ * qflmp: converts between lmp and pcx
+ * io_mesh_qfmdl: blender mdl import/export script
Changes from 0.5.4
o General enhancements
@@ -145,8 +204,8 @@ Changes from 0.5.4
* new cvar from Grievre to control "fake" filtering and change the fake
kick default
* fix bug where certain looped sounds would cause a hang
- * 64 bit compile fixes
- * alias models are no longer black on maps with no lighting info
+ * 64 bit compile fixes
+ * alias models are no longer black on maps with no lighting info
o qfcc enhancements.
* conforms better to Objective-C sematics
* "struct" support closer to that of C (ie, separate namespace)
diff --git a/RPM/quakeforge.spec.in b/RPM/quakeforge.spec.in
index 7a4792f89..abee45b13 100644
--- a/RPM/quakeforge.spec.in
+++ b/RPM/quakeforge.spec.in
@@ -308,6 +308,7 @@ rm $RPM_BUILD_ROOT/usr/bin/nq-fbdev
rm $RPM_BUILD_ROOT/usr/bin/nq-sdl32
rm $RPM_BUILD_ROOT/usr/bin/qw-client-fbdev
rm $RPM_BUILD_ROOT/usr/bin/qw-client-sdl32
+rm $RPM_BUILD_ROOT/usr/bin/qfpc
find $RPM_BUILD_ROOT/usr/lib -name 'libQFrenderer_sw32.*' -exec rm {} \;
#FIXME until I feel like making packages
rm $RPM_BUILD_ROOT/usr/bin/qtv
@@ -327,7 +328,6 @@ rm -rf $RPM_BUILD_ROOT
%attr(-,root,root) %{_prefix}/lib/libQFcd.so.*
%attr(-,root,root) %{_prefix}/lib/libQFconsole.so.*
%attr(-,root,root) %{_prefix}/lib/libQFgamecode.so.*
-%attr(-,root,root) %{_prefix}/lib/libQFgamecode_builtins.so.*
%attr(-,root,root) %{_prefix}/lib/libQFgib.so.*
%attr(-,root,root) %{_prefix}/lib/libQFimage.so.*
%attr(-,root,root) %{_prefix}/lib/libQFjs.so.*
@@ -335,11 +335,11 @@ rm -rf $RPM_BUILD_ROOT
%attr(-,root,root) %{_prefix}/lib/libQFruamoko.so.*
%attr(-,root,root) %{_prefix}/lib/libQFsound.so.*
%attr(-,root,root) %{_prefix}/lib/libQFutil.so.*
-%attr(-,root,root) %{_prefix}/lib/quakeforge/cd_file.so*
-%attr(-,root,root) %{_prefix}/lib/quakeforge/cd_linux.so*
-%attr(-,root,root) %{_prefix}/lib/quakeforge/console_client.so*
-%attr(-,root,root) %{_prefix}/lib/quakeforge/snd_output_disk.so*
-%attr(-,root,root) %{_prefix}/lib/quakeforge/snd_render_default.so*
+%attr(-,root,root) %{_prefix}/lib/quakeforge/plugins/cd_file.so*
+%attr(-,root,root) %{_prefix}/lib/quakeforge/plugins/cd_linux.so*
+%attr(-,root,root) %{_prefix}/lib/quakeforge/plugins/console_client.so*
+%attr(-,root,root) %{_prefix}/lib/quakeforge/plugins/snd_output_disk.so*
+%attr(-,root,root) %{_prefix}/lib/quakeforge/plugins/snd_render_default.so*
%attr(-,root,root) %{fs_sharepath}/QF/menu.*
%files devel
@@ -349,8 +349,6 @@ rm -rf $RPM_BUILD_ROOT
%attr(-,root,root) %{_prefix}/lib/libQFconsole.so
%attr(-,root,root) %{_prefix}/lib/libQFgamecode.*a
%attr(-,root,root) %{_prefix}/lib/libQFgamecode.so
-%attr(-,root,root) %{_prefix}/lib/libQFgamecode_builtins.*a
-%attr(-,root,root) %{_prefix}/lib/libQFgamecode_builtins.so
%attr(-,root,root) %{_prefix}/lib/libQFgib.*a
%attr(-,root,root) %{_prefix}/lib/libQFgib.so
%attr(-,root,root) %{_prefix}/lib/libQFimage.*a
@@ -395,7 +393,7 @@ rm -rf $RPM_BUILD_ROOT
%attr(-,root,root) %{_prefix}/bin/nq-server
%attr(-,root,root) %{_prefix}/bin/qw-master
#%attr(-,root,root) %{_prefix}/bin/hw-master
-%attr(-,root,root) %{_prefix}/lib/quakeforge/console_server.so*
+%attr(-,root,root) %{_prefix}/lib/quakeforge/plugins/console_server.so*
%if "%{HAVE_X11}"=="'yes'"
%files glx
@@ -405,8 +403,8 @@ rm -rf $RPM_BUILD_ROOT
%if "%{HAVE_SDL}"=="'yes'"
%files sdl-common
-%attr(-,root,root) %{_prefix}/lib/quakeforge/cd_sdl.so*
-%attr(-,root,root) %{_prefix}/lib/quakeforge/snd_output_sdl.so*
+%attr(-,root,root) %{_prefix}/lib/quakeforge/plugins/cd_sdl.so*
+%attr(-,root,root) %{_prefix}/lib/quakeforge/plugins/snd_output_sdl.so*
%files sdl
%attr(-,root,root) %{_prefix}/bin/qw-client-sdl
@@ -431,17 +429,17 @@ rm -rf $RPM_BUILD_ROOT
%if "%{HAVE_XMMS}"=="'yes'"
%files xmms
-%attr(-,root,root) %{_prefix}/lib/quakeforge/cd_xmms.so
+%attr(-,root,root) %{_prefix}/lib/quakeforge/plugins/cd_xmms.so
%endif
%if "%{HAVE_ALSA}"=="'yes'"
%files alsa
-%attr(-,root,root) %{_prefix}/lib/quakeforge/snd_output_alsa.so*
+%attr(-,root,root) %{_prefix}/lib/quakeforge/plugins/snd_output_alsa.so*
%endif
%if "%{HAVE_OSS}"=="'yes'"
%files oss
-%attr(-,root,root) %{_prefix}/lib/quakeforge/snd_output_oss.so*
+%attr(-,root,root) %{_prefix}/lib/quakeforge/plugins/snd_output_oss.so*
%endif
%files -n qfcc
@@ -466,6 +464,7 @@ rm -rf $RPM_BUILD_ROOT
%attr(-,root,root) %{_prefix}/bin/bsp2img
%attr(-,root,root) %{_prefix}/bin/qfbsp
%attr(-,root,root) %{_prefix}/bin/qflight
+%attr(-,root,root) %{_prefix}/bin/qflmp
%attr(-,root,root) %{_prefix}/bin/qfmodelgen
%attr(-,root,root) %{_prefix}/bin/qfvis
%attr(-,root,root) %{_prefix}/bin/wad
diff --git a/TODO b/TODO
index 8cced4db9..11797f1f9 100644
--- a/TODO
+++ b/TODO
@@ -14,28 +14,30 @@ X ~/.quakeforgerc should support all commands, not just set and setrom
X software PCXs don't work in X11 at least if you're using 16/24/32 color
X ogg support
X server-side demos
+X Scitech MGL used in win32 is screwed - dump it and use SDL
+X kill MAX_STATIC_ENTITIES
+X stateful console (eg, rcon mode, chat mode, normal command mode...)
M it seems possible to crash a QF server still - need to fix this!
M merge nq and qw code bases
M mingw cross compiling
-X Scitech MGL used in win32 is screwed - dump it and use SDL
M software targets should mix color at 16/16 or 24/32 color
I GL is still way too slow
I Client side QuakeC.
I menu rewrite
I clean up TODO ;)
-o kill MAX_STATIC_ENTITIES
o doublesize modes (eg, render in 320x240 but display in 640x480)
o allow qf clients to download .lit files from qf servers.
o better server control of certain cvars
o triggers (f_respawn, f_death, f_took; cl_triggers)
-X stateful console (eg, rcon mode, chat mode, normal command mode...)
o scripted hud
o add a U_PHYSICAL field to entities. it should include a solid bit,
a rotated bbox bit, and mins/maxs for the bbos
o gui for serverlist
-o add favorates serverlist manipulation
+o add favorites serverlist manipulation
o redo serverlist filtering for better flexability and/or easier use
o add individual server ping/info request from console
+? dynamically allocate missing fields, particularly ones not needed by the
+ progs.
? more direct intra-team comms (eg, talk to offense or defense directly)
? Draw_Pic and friends need a cleanup in GL at least
? Draw_Pic and other tex draw functions should use local palettes
diff --git a/config.d/ac_config_files.m4 b/config.d/ac_config_files.m4
index 960aa4f64..7ce3af258 100644
--- a/config.d/ac_config_files.m4
+++ b/config.d/ac_config_files.m4
@@ -89,7 +89,7 @@
pkg-config/quakeforge.pc
doc/Makefile
- doc/quakeforge.dox
+ doc/quakeforge.dox.conf
doc/man/Makefile
debian/Makefile
diff --git a/config.d/build_control.m4 b/config.d/build_control.m4
index 52e6c1d86..8105ba438 100644
--- a/config.d/build_control.m4
+++ b/config.d/build_control.m4
@@ -298,6 +298,7 @@ SND_OUTPUT_DEFAULT=""
if test -n "$CL_TARGETS"; then
CD_TARGETS="libQFcd.la"
SND_TARGETS="libQFsound.la"
+ AUDIO_TARGETS="testsound\$(EXEEXT)"
JOY_TARGETS="libQFjs.la"
if test "`echo $SOUND_TYPES | grep ALSA`"; then
SND_PLUGIN_TARGETS="$SND_PLUGIN_TARGETS snd_output_alsa.la"
@@ -364,6 +365,7 @@ else
SND_PLUGIN_TARGETS=""
SND_REND_TARGETS=""
SND_TARGETS=""
+ AUDIO_TARGETS=""
unset SOUND_TYPES
fi
AC_DEFINE_UNQUOTED(SND_OUTPUT_DEFAULT, "$SND_OUTPUT_DEFAULT", [Define this to the default sound output driver.])
@@ -510,6 +512,7 @@ AC_SUBST(SND_REND_STATIC)
AC_SUBST(SND_REND_STATIC_LIBS)
AC_SUBST(SND_REND_TARGETS)
AC_SUBST(SND_TARGETS)
+AC_SUBST(AUDIO_TARGETS)
AC_SUBST(VID_MODEL_TARGETS)
AC_SUBST(VID_REND_TARGETS)
AC_SUBST(VID_REND_NOINST_TARGETS)
@@ -524,7 +527,7 @@ QF_DEPS(BSP2IMG,
)
QF_DEPS(QFBSP,
[-I$(top_srcdir)/tools/qfbsp/include],
- [$(top_builddir)/libs/util/libQFutil.la],
+ [$(top_builddir)/libs/util/libQFutil.la $(top_builddir)/libs/models/libQFmodels.la],
[$(WIN32_LIBS)],
)
QF_DEPS(QFCC,
diff --git a/config.d/compression.m4 b/config.d/compression.m4
index 8c4fcd210..b13574f64 100644
--- a/config.d/compression.m4
+++ b/config.d/compression.m4
@@ -4,7 +4,7 @@ AC_ARG_ENABLE(flac,
HAVE_FLAC=no
if test "x$enable_flac" != "xno"; then
if test "x$PKG_CONFIG" != "x"; then
- PKG_CHECK_MODULES([LIBFLAC], [flac], HAVE_FLAC=yes, HAVE_FLAC=no)
+ PKG_CHECK_MODULES([FLAC], [flac], HAVE_FLAC=yes, HAVE_FLAC=no)
else
AM_PATH_LIBFLAC(HAVE_FLAC=yes, HAVE_FLAC=no)
fi
@@ -61,12 +61,12 @@ if test "x$enable_zlib" != "xno"; then
AC_CHECK_HEADER(zlib.h, HAVE_ZLIB=yes, HAVE_ZLIB=no)
if test "x$HAVE_ZLIB" = "xyes"; then
Z_LIBS="-lz"
+ AC_DEFINE(HAVE_ZLIB, 1, [Define if you have zlib])
fi
fi
fi
fi
AC_SUBST(Z_LIBS)
-AC_DEFINE(HAVE_ZLIB, 1, [Define if you have zlib])
AM_CONDITIONAL(HAVE_ZLIB, test "$HAVE_ZLIB" = "yes")
AC_ARG_ENABLE(png,
@@ -80,12 +80,11 @@ if test "x$enable_png" != "xno"; then
else
AC_CHECK_LIB(png, png_set_read_fn, HAVE_PNG=yes, HAVE_PNG=no, [$LIBS])
if test "x$HAVE_PNG" = "xyes"; then
- AC_CHECK_HEADER(png.h, HAVE_PNG=yes, HAVE_PNG=no)
+ AC_CHECK_HEADER(png.h, HAVE_PNG=yes PNG_LIBS="-lpng", HAVE_PNG=no)
fi
fi
fi
AC_SUBST(PNG_LIBS)
if test "x$HAVE_PNG" = "xyes"; then
- PNG_LIBS="-lpng"
AC_DEFINE(HAVE_PNG, 1, [Define if you have libpng])
fi
diff --git a/config.d/header_files.m4 b/config.d/header_files.m4
index a9cd4da1f..2f8bd6861 100644
--- a/config.d/header_files.m4
+++ b/config.d/header_files.m4
@@ -10,10 +10,10 @@ AC_CHECK_HEADERS(
alloca.h arpa/inet.h asm/io.h assert.h conio.h \
ctype.h ddraw.h dinput.h direct.h dirent.h dlfcn.h dmedia/audio.h \
dmedia/cdaudio.h dpmi.h dsound.h errno.h execinfo.h fcntl.h io.h \
- libc.h limits.h linux/cdrom.h linux/joystick.h linux/soundcard.h \
- machine/soundcard.h malloc.h math.h mgraph.h _mingw.h netdb.h \
- netinet/in.h process.h pthread.h pwd.h rpc/types.h setjmp.h signal.h \
- stdarg.h stdio.h stdlib.h string.h strings.h sys/asoundlib.h \
+ ifaddrs.h libc.h limits.h linux/cdrom.h linux/joystick.h \
+ linux/soundcard.h machine/soundcard.h malloc.h math.h mgraph.h _mingw.h \
+ netdb.h netinet/in.h process.h pthread.h pwd.h rpc/types.h setjmp.h \
+ signal.h stdarg.h stdio.h stdlib.h string.h strings.h sys/asoundlib.h \
sys/audioio.h sys/filio.h sys/ioctl.h sys/io.h sys/ipc.h sys/mman.h \
sys/param.h sys/poll.h sys/shm.h sys/signal.h sys/socket.h \
sys/soundcard.h sys/stat.h sys/time.h sys/types.h sys/uio.h termios.h \
diff --git a/config.d/networking.m4 b/config.d/networking.m4
index 09a15f69a..815bce859 100644
--- a/config.d/networking.m4
+++ b/config.d/networking.m4
@@ -5,8 +5,10 @@ dnl ==================================================================
LIBCURL_CHECK_CONFIG([], [], [CURL=yes], [])
AC_ARG_WITH(ipv6,
-[ --with-ipv6=DIR enable IPv6 support. Optional argument specifies
- location of inet6 libraries.],
+ AS_HELP_STRING([--with-ipv6=DIR],
+ [Eenable IPv6 support.]
+ [Optional argument specifies location of inet6 libraries.]),
+ [
if test "x$withval" = xno ; then
NETTYPE_IPV6=no
else
@@ -16,8 +18,8 @@ AC_ARG_WITH(ipv6,
LIBS="$LIBS -L${withval}"
fi
fi
- ,
- NETTYPE_IPV6=no
+ ],
+ [NETTYPE_IPV6=no]
)
AM_CONDITIONAL(NETTYPE_IPV6, test "x$NETTYPE_IPV6" = "xyes")
@@ -77,3 +79,16 @@ connect (0, NULL, 42);
LIBS="$SAVELIBS"
fi
AC_SUBST(NET_LIBS)
+
+AC_MSG_CHECKING([for getifaddrs])
+SAVELIBS="$LIBS"
+LIBS="$LIBS $NET_LIBS"
+AC_TRY_LINK([],
+ [
+getifaddrs (0);
+ ],
+ AC_DEFINE(HAVE_GETIFADDRS, 1, [Define this if you have getifaddrs()])
+ AC_MSG_RESULT(yes),
+ AC_MSG_RESULT(no)
+)
+LIBS="$SAVELIBS"
diff --git a/config.d/sound.m4 b/config.d/sound.m4
index d1bc0057f..ec4850c3d 100644
--- a/config.d/sound.m4
+++ b/config.d/sound.m4
@@ -113,7 +113,9 @@ fi
AC_SUBST(SAMPLERATE_LIBS)
dnl AM_CONDITIONAL(HAVE_SAMPLERATE, test "$HAVE_SAMPLERATE" = "yes")
if test "x$HAVE_SAMPLERATE" = "xno"; then
- AC_MSG_ERROR(libsamplerate is required but was not found)
+ AC_MSG_WARN([libsamplerate is required but was not found.]
+ [Sound will be disabled.])
+ enable_sound=no
fi
SOUND_TYPES="$SOUND_TYPES DISK"
diff --git a/debian/changelog b/debian/changelog
index 7649dacf0..93ec5a9f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+quakeforge (0.6.0~git20110804-0) frozen unstable; urgency=low
+
+ * Small debian bugfixes and GIT snapshot
+
+ -- sergio usage: setrom \
+\ will be displayed instead.
+\verbatim
+nq-glx +setrom m_pitch -0.022
+\endverbatim
+
+The following command line will successfully set m_pitch to \c -0.022
+because \QF will see the \c " before the \c - and thus \c -0.022 will be
+part of the console command.
+\verbatim
+nq-glx +setrom m_pitch \"-0.022\"
+\endverbatim
+\note The above works in bash. Other shells may vary.
+
+*/
+
+/**
+\page cvars Configuration variables
+
+The core of \QF's configurabitly is the cvar.
+
+\section cvar_value Cvar values.
+Depending on the engine's use of the cvar, the value will be treated as a
+string, a floating point value, an integer value or even a vector value.
+
+If a space is needed in the value, the value must be "quoted".
+
+\section cvar_type Cvar types.
+From the user's perspective, there are three types of cvar:
+\li plain cvar: the value can be displayed or set, but will not be
+automatically saved.
+\li archive cvar: like a plain cvar, the value can be displayed or set, but
+the cvar will be automatically saved to \c config.cfg by the engine on
+shutdown or gamedir change (quakeworld).
+\li read-only cvar: the value can be displayed but not changed in any way
+(value or flags). If the cvar also happens to be an archive cvar (the
+archive flag was set before the read-only flag), then the cvar will be
+saved to \c config.cfg.
+
+\section cvar_cmds Cvar related commands.
+\ [value] set \ \ seta \ \ setrom \ \ toggle \cvarlist [foo]cycle \ \ inc \ [amount] inc \ -1 ), this can be used as a \c dec command.
+
+reset \resetallnq-glx +set snd_rate 48000)
+\li the global configuration file specified by the \c fs_globalcfg cvar.
+\li the user configuration file specified by the \c fs_usercfg cvar.
+
+\c fs_globalcfg defaults to \c /etc/quakeforge.conf on Linux and other
+UNIX like systems, and ~/quakeforge.conf on Windows (\QF will
+expand ~ to the value of the HOME environment variable if it
+is set, or WINDOWS if not).
+
+\c fs_usercfg defaults to either ~/.quakeforgerc or
+~/.config/quakeforge/quakeforge.conf on Linux and other UNIX
+like systems, and \c ~/quakeforgerc on Windows.
+
+The global and user configuration files are normal quake scripts, but only
+\c set, \c seta, and \c setrom commands are executed.
+
+It might seem strange to have the global and user configuration files
+specified by cvars, but \QF's startup sequence is quite intense:
+\li Execute any \c set commands given on the \ref cmdline. This way, \c
+fs_globalcfg can be set.
+\li Execute any \c set commands in the global configuration file. This way,
+\c fs_usercfg can be set.
+\li Re-execute any \c set commands given on the command line. Thus it is
+possible to override \c fs_usercfg if it is set by the global configuration
+file (unless \c setrom is used: BOFH).
+\li Execute any \c set commands in the user configuration file. Any cvars
+set in the user configuration file override those set in the global
+configuration file.
+\li Once again, re-execute any \c set commands given on the command line.
+Thus cvars set on the command line override those set in either the user
+configuration file or the global configuration file (or both).
+
+During the above process, the only cvars created by the engine are \c
+fs_globalcfg (just before reading the global configuration file) and \c
+fs_usercfg (just before reading the user configuration file). Thus, it is
+possible to set any cvar in \QF.
+
+The above means that:
+\li The \ref cmdline can be used to set any cvar in \QF.
+\li The global config file can be used to set any cvar but \c
+fs_globalcfg.
+\li The user config file can be used to set any cvar but \c fs_globalcfg
+or \c fs_usercfg.
+\li The user config file can be used to override settings made in the
+global config file, unless those settings have been made read-only by the
+global config file (by using \c setrom instead of \c set).
+\li The command line can be used to override settings made in either the
+user config file or the global config file. If \c setrom is used on the
+command line, even \c setrom in the config files can be overridden.
+
+*/
diff --git a/doc/config/gib/qfadmin.gib b/doc/config/gib/qfadmin.gib
index 94334f1d8..66b4bb9e3 100644
--- a/doc/config/gib/qfadmin.gib
+++ b/doc/config/gib/qfadmin.gib
@@ -73,7 +73,8 @@
domain qfadmin
global uservote cmds mapvote config
-global cvsheader = "$Id$"
+//global cvsheader = "$Id$"
+global qfadminversion = "1.17"
// QFAdmin console interface
function qfadmin {
@@ -238,19 +239,20 @@ function qfadmin::doVersion {
// Return the current version
function qfadmin::getVersion {
- local tmp tmp2
+// local tmp tmp2
- tmp = $(split $cvsheader)
+// tmp = $(split $cvsheader)
- if $(equal $tmp[6] "Exp") {
- tmp2 = "Beta"
- } else if $(equal $tmp[6] "Stab") {
- tmp2 = "Stable"
- } else if $(equal $tmp[6] "Rel") {
- tmp2 = "Release"
- }
+// if $(equal $tmp[6] "Exp") {
+// tmp2 = "Beta"
+// } else if $(equal $tmp[6] "Stab") {
+// tmp2 = "Stable"
+// } else if $(equal $tmp[6] "Rel") {
+// tmp2 = "Release"
+// }
- return "QFAdmin v", $tmp[2], " (", $tmp[3], " ", $tmp2, ") by Harry Roberts"
+// return "QFAdmin v", $tmp[2], " (", $tmp[3], " ", $tmp2, ") by Harry Roberts"
+ return "QFAdmin v", $qfadminversion, " by Harry Roberts"
}
// Clear uservore & mapvote vars
diff --git a/doc/connect.txt b/doc/connect.dox
similarity index 98%
rename from doc/connect.txt
rename to doc/connect.dox
index 44f7fcd27..44d83586a 100644
--- a/doc/connect.txt
+++ b/doc/connect.dox
@@ -1,4 +1,5 @@
//unfortunately, have to wrap the docs in a C comment for doxygen
+// vim:tw=74:formatoptions-=l
/**
\page connection_sequence QW Connection Sequence
\msc
diff --git a/doc/cshifts.txt b/doc/cshifts.dox
similarity index 96%
rename from doc/cshifts.txt
rename to doc/cshifts.dox
index 3514906a9..623419a8b 100644
--- a/doc/cshifts.txt
+++ b/doc/cshifts.dox
@@ -1,4 +1,5 @@
//unfortunately, have to wrap the docs in a C comment for doxygen
+// vim:tw=74:formatoptions-=l
/**
\page cshift_cvars cshift control
diff --git a/doc/dirconf.txt b/doc/dirconf.dox
similarity index 87%
rename from doc/dirconf.txt
rename to doc/dirconf.dox
index 08ee4d7d4..fe614c2a5 100644
--- a/doc/dirconf.txt
+++ b/doc/dirconf.dox
@@ -1,4 +1,5 @@
-//unfortunatly, have to wrap the docs in a C comment for doxygen
+//unfortunately, have to wrap the docs in a C comment for doxygen
+// vim:tw=74:formatoptions-=l
/**
\page dirconf Directory Configuration
@@ -15,12 +16,24 @@ Quake = {
Inherit = QF;
Path = "id1";
GameCode = "progs.dat";
+ HudType = "id";
};
QuakeWorld = {
Inherit = (Quake);
Path = "qw";
SkinPath = "${path}/skins";
GameCode = "qwprogs.dat";
+ HudType = "id";
+};
+"Hipnotic" = {
+ Inherit = (Quake);
+ Path = "hipnotic";
+ HudType = "hipnotic";
+};
+"Rogue" = {
+ Inherit = (Quake);
+ Path = "rogue";
+ HudType = "rogue";
};
"qw:qw" = {
Inherit = (QuakeWorld);
@@ -33,20 +46,12 @@ QuakeWorld = {
Inherit = (Quake);
Path = "$gamedir";
};
-"hipnotic" = {
- Inherit = (Quake);
- Path = "hipnotic";
-};
"hipnotic:*" = {
- Inherit = (hipnotic);
+ Inherit = (Hipnotic);
Path = "$gamedir";
};
-"rogue" = {
- Inherit = (Quake);
- Path = "rogue";
-};
"rogue:*" = {
- Inherit = (rogue);
+ Inherit = (Rogue);
Path = "$gamedir";
};
"abyss" = {
@@ -71,6 +76,9 @@ Supported attributes are:
GameCodeHudTypeSkinPathfilelinuxsdlwinxmms/* and
+end with */, and may span multiple lines, or be
+contained entirely within a single line, possibly with non-comment text
+following the comment.
+
+\section pl-dictionaries Dictionaries.
+A dictionary is a list of values, each associated with a key. The order of
+key/value pairs in a dictionary is not preserved.
+
+\code
+{
+ key1 = value1;
+ key2 = value2;
+ // ...
+}
+\endcode
+
+A dictionary may be empty or have any number of
+key = value pairs separated by \c ;. The final \c ;
+before the closing \c } is optional.
+
+The key must be a string, but the value may be of any type, including
+dictionary or array.
+
+\section Arrays
+An array is an ordered list of values. The order of the values in an array
+is preserved.
+
+\code
+(
+ value1,
+ value2,
+ // ...
+)
+\endcode
+
+An array may be empty or have any number of values. Each value may be of
+any type, including dictionary or array.
+
+\section pl-strings Strings
+\QF's property lists support three types of strings: unquoted, quoted and
+"long".
+
+An unquoted string may contain most printable characters. This includes the
+digits \c 0 to \c 9, the letters \c a to \c z and \c A to \c Z, and the
+symbols \c !, \c #, \c $, \c %, \c &, \c *, \c +, \c -, \c ., \c /, \c :,
+\c ?, \c @, \c |, \c ~, \c _ and \c ^.
+\verbatim
+0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ
+abcdefghijklmnopqrstuvwxyz!#$%&*+-./:?@|~_^
+\endverbatim
+
+Quoted strings may contain whitespace, C escape sequences, and any
+printable character. The quote character is \c \".
+
+Long strings use triple quotes (\c \"\"\") instead of \c \" as the quote
+character. This allows the use of unquoted \c \" characters in the string.
+And yes, these long strings were inspired by Python's long strings.
+
+\section pl-binary Binary Data
+
+Binary data is hex-encoded and contained within angle brackets (\c \< \c
+\>). There must be an even number of hex-digits. That is, while \c \| System | ALSA | OSS | DirectX | +Win32 | SUN | SGI | MME | SDL | +
| Driver | alsa | oss | dx | +win | sun | sgi | mme | sdl | +
| System | Default | JACK | +
| Render | default | jack | +
.wav, .ogg (Ogg Vorbis),
+.mid or .midi (MIDI), or .flac
+files. MP3 is not supported, and is not likely to ever be
+supported.
+*/
diff --git a/hw/source/master.c b/hw/source/master.c
index a895b779c..6cdcf4e4c 100644
--- a/hw/source/master.c
+++ b/hw/source/master.c
@@ -525,12 +525,7 @@ main (int argc, const char **argv)
Sys_RegisterShutdown (SV_Shutdown);
- Cvar_Init_Hash ();
- Cmd_Init_Hash ();
- Cvar_Init ();
- Sys_Init_Cvars ();
Sys_Init ();
- Cmd_Init ();
Cmd_AddCommand ("quit", MST_Quit_f, "Shut down the master server");
Cmd_AddCommand ("clear", SVL_Clear, "Clear the server list");
diff --git a/include/Makefile.am b/include/Makefile.am
index 11a240922..7d6f0a41e 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -2,16 +2,16 @@
AUTOMAKE_OPTIONS= foreign
SUBDIRS = QF
EXTRA_DIST = asm_i386.h alsa_funcs_list.h adivtab.h anorm_dots.h anorms.h \
- asm_draw.h block16.h block8.h buildnum.h compat.h context_sdl.h \
+ asm_draw.h block16.h block8.h buildnum.h clview.h compat.h context_sdl.h \
context_x11.h d_iface.h d_ifacea.h d_local.h dga_check.h exp.h fbset.h \
- garbage.h getopt.h gib_buffer.h gib_builtin.h gib_classes.h gib_execute.h gib_function.h \
- gib_handle.h gib_object.h gib_parse.h gib_process.h gib_regex.h gib_semantics.h \
- gib_thread.h gib_tree.h gib_vars.h gl_draw.h gl_warp_sin.h in_win.h \
- logos.h net_dgrm.h net_loop.h net_udp.h net_vcr.h net_wins.h netchan.h \
- netmain.h old_keys.h ops.h qstring.h quakeasm.h regex.h r_cvar.h \
- r_dynamic.h r_local.h r_screen.h r_shared.h rua_internal.h sbar.h \
- skin_stencil.h snd_render.h sv_console.h varrays.h vgamodes.h view.h \
- vregset.h winquake.h world.h \
+ garbage.h getopt.h gib_buffer.h gib_builtin.h gib_classes.h gib_execute.h \
+ gib_function.h gib_handle.h gib_object.h gib_parse.h gib_process.h \
+ gib_regex.h gib_semantics.h gib_thread.h gib_tree.h gib_vars.h gl_draw.h \
+ gl_warp_sin.h in_win.h logos.h net_dgrm.h net_loop.h net_udp.h net_vcr.h \
+ net_wins.h netchan.h netmain.h old_keys.h ops.h qstring.h quakeasm.h \
+ regex.h r_cvar.h r_dynamic.h r_local.h r_screen.h r_shared.h \
+ rua_internal.h sbar.h skin_stencil.h snd_internal.h sv_console.h \
+ varrays.h vgamodes.h vregset.h winquake.h world.h \
\
qw/bothdefs.h qw/msg_backbuf.h qw/msg_ucmd.h qw/pmove.h qw/protocol.h \
\
diff --git a/include/QF/Makefile.am b/include/QF/Makefile.am
index 8998e8a4d..451faf023 100644
--- a/include/QF/Makefile.am
+++ b/include/QF/Makefile.am
@@ -9,7 +9,7 @@ nobase_pkginclude_HEADERS = \
qargs.h qdefs.h qendian.h qfplist.h qtypes.h quakefs.h quakeio.h render.h \
riff.h ruamoko.h screen.h script.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 \
+ wadfile.h winding.h zone.h \
\
GL/ati.h GL/defines.h GL/extensions.h GL/funcs.h GL/qf_explosions.h \
GL/qf_funcs_list.h GL/qf_lightmap.h GL/qf_noisetextures.h \
diff --git a/include/QF/cvar.h b/include/QF/cvar.h
index 63070feef..7d664764f 100644
--- a/include/QF/cvar.h
+++ b/include/QF/cvar.h
@@ -38,42 +38,55 @@
#include "QF/quakeio.h"
typedef struct cvar_s {
- const char *name;
- const char *string;
- const char *default_string;
- int flags;
+ const char *name; ///< The name of the cvar.
+ const char *string; ///< The current cvar value as a string.
+ const char *default_string; ///< The default value of the cvar.
+ int flags; ///< Cvar flags
+ /** Callback for when the cvar value changes.
+
+ This allows for more flexibility in what happens when a cvar is
+ nodifed than can be achieved with flags alone. While a similar could
+ be done using commands, a cvar with a callback and CVAR_ARCHIVE set
+ allows the setting to be saved automatically.
+
+ \param var This cvar.
+ */
void (*callback)(struct cvar_s *var);
- const char *description; // for "help" command
- float value;
- int int_val;
- vec3_t vec;
- struct cvar_s *next;
+ const char *description; ///< for "help" command
+ float value; ///< The current cvar value as a float
+ int int_val; ///< The current cvar value as an integer
+ vec3_t vec; ///< The current cvar value as a vector
+ struct cvar_s *next; ///< \internal Linked list of cvars.
} cvar_t;
typedef struct cvar_alias_s {
- char *name;
- cvar_t *cvar;
- struct cvar_alias_s *next;
+ char *name; ///< The name of the alias.
+ cvar_t *cvar; ///< The cvar to which this alias refers
+ struct cvar_alias_s *next; ///< \internal LInked list of aliases.
} cvar_alias_t;
-#define CVAR_NONE 0
-#define CVAR_ARCHIVE 1 // set to cause it to be saved to vars.rc
- // used for system variables, not for player
- // specific configurations
-#define CVAR_USERINFO 2 // sent to server on connect or change
-#define CVAR_SERVERINFO 4 // sent in response to front end requests
-#define CVAR_NOTIFY 32 // Will notify players when changed.
-#define CVAR_ROM 64 // display only, cannot be set by user at all
-#define CVAR_USER_CREATED 128 // created by a set command
-#define CVAR_LATCH 2048 // will change only when C code next does
- // a Cvar_Get(), so it can't be changed
-
-// Zoid| A good CVAR_ROM example is userpath. The code should read "cvar_t
-// *fs_userpath = CvarGet("fs_userpath", ".", CVAR_ROM); The user can
-// override that with +set fs_userpath _. Quoted strings may contain
- whitespace, C escape sequences, and so on. The quote character is
- \". Optionally, Python style long strings
- (\"\"\"...\"\"\") may be used, allowing for unquoted
- " quotes in the string.
-
-
- QFBinary data is hex-encoded and contained within angle brackets, \c \<
- \c \>. The length of the encoded data must be an even number, so while
- \c \| Packet Header | |
| Bits | Meaning |
| 31 | sequence |
| 1 | this message contains a reliable payload |
| 31 | acknowledge sequence |
| 1 | acknowledge receipt of even/odd message |
| 16 | qport |
sqrt (\a x*\a x + \a y*\a y).
*/
-@extern float log (float x);
-
-/**
- Returns the base-10 log of \a x.
-*/
-@extern float log10 (float x);
-
-/**
- Returns \a x to the \a y power
-*/
-@extern float pow (float x, float y);
-
-@extern float sinh (float x);
-@extern float cosh (float x);
-@extern float tanh (float x);
-@extern float asinh (float x);
-@extern float acosh (float x);
-@extern float atanh (float x);
-
+@extern float hypot (float x, float y);
//\}
+///\name Hyperbolic functions
+//\{
+/**
+ Returns the hyperbolic sine of \a x
+*/
+@extern float sinh (float x);
+
+/**
+ Returns the hyperbolic cosine of \a x
+*/
+@extern float cosh (float x);
+
+/**
+ Returns the hyperbolic tangent of \a x
+*/
+@extern float tanh (float x);
+
+/**
+ Returns the area hyperbolic sine of \a x
+*/
+@extern float asinh (float x);
+
+/**
+ Returns the area hyperbolic cosine of \a x
+*/
+@extern float acosh (float x);
+
+/**
+ Returns the area hyperbolic tangent of \a x
+*/
+@extern float atanh (float x);
+//\}
+
+///\name Vector Functions
+//\{
+/**
+ Transform vector \a v into a unit vector (a vector with a length of 1).
+ The direction is not changed, except for (possible) rounding errors.
+*/
+@extern vector normalize (vector v);
+
+/**
+ Return the length of vector \a v
+*/
+@extern float vlen (vector v);
+
+/**
+ Returns the yaw angle ("bearing"), in degrees, associated with vector \a v.
+*/
+@extern float vectoyaw (vector v);
+
+/**
+ Returns a vector 'pitch yaw 0' corresponding to vector \a v.
+*/
+@extern vector vectoangles (vector v);
+//\}
+
+/**
+ \name Constants
+ Constants for speeding up math calculations.
+ These constants are defined to replace some common math functions. Since
+ these are the same values that would be returned by any math functions or
+ floating-point calculations, these allow you to get the results without
+ actually calling them.
+ \note There does not appear to be a portable way to translate C's HUGE_VAL
+ value, the basis for positive and negative infinities, to Ruamoko.
+ \{
+*/
+# define M_E 2.7182818284590452354 ///< Euler's number \em e, the irrational base of the natural logarithm and a really neat thing
+# define M_LOG2E 1.4426950408889634074 ///< The log, base 2, of \em e: log2 (\ref M_E)
+# define M_LOG10E 0.43429448190325182765 ///< The log, base 10, of \em e: log10 (\ref M_E)
+# define M_LN2 0.69314718055994530942 ///< The natural log evaluated at 2: log (2)
+# define M_LN10 2.30258509299404568402 ///< The natural log evaluated at 10: log (10)
+# define M_PI 3.14159265358979323846 ///< The most famous irrational number, and the sixteenth letter of the Greek alphabet
+# define M_PI_2 1.57079632679489661923 ///< Half of pi, (\ref M_PI/2)
+# define M_PI_4 0.78539816339744830962 ///< One quarter of pi, (\ref M_PI/4)
+# define M_PI_6 0.52359877559829887308 ///< One sixth of pi, (\ref M_PI/6)
+# define M_1_PI 0.31830988618379067154 ///< The reciprocal of pi, (1/\ref M_PI)
+# define M_2_PI 0.63661977236758134308 ///< Twice the reciprocal of pi, (2/\ref M_PI)
+# define M_2_SQRTPI 1.12837916709551257390 ///< Twice the reciprocal of the square root of pi, 2/\ref sqrt(\ref M_PI)
+# define M_SQRT2 1.41421356237309504880 ///< The square root of 2
+# define M_SQRT1_2 0.70710678118654752440 ///< 1/sqrt(2)
+# define M_SQRT3 1.73205080756887729353 ///< The square root of 3
+# define M_SQRT1_3 0.57735026918962576451 ///< 1/sqrt(3)
+/**
+ \} Constants
+ \} Math Definitions
+*/
#endif //__ruamoko_math_h
diff --git a/ruamoko/lib/Makefile.am b/ruamoko/lib/Makefile.am
index 5e441769e..92ede7a79 100644
--- a/ruamoko/lib/Makefile.am
+++ b/ruamoko/lib/Makefile.am
@@ -23,10 +23,10 @@ endif
pkglib_LIBRARIES= $(libs)
EXTRA_LIBRARIES= $(ruamoko_libs)
-%.qfo: %.r
+SUFFIXES= .o .r .qc
+.r.o:
$(QFCC) $(QCFLAGS) $(QCPPFLAGS) -c -o $@ $<
-
-%.o: %.r
+.qc.o:
$(QFCC) $(QCFLAGS) $(QCPPFLAGS) -c -o $@ $<
libr_a_SOURCES=\
diff --git a/ruamoko/lib/math.r b/ruamoko/lib/math.r
index 59a76bbc2..8d0c51342 100644
--- a/ruamoko/lib/math.r
+++ b/ruamoko/lib/math.r
@@ -22,6 +22,7 @@ float (float x) acos = #0;
float (float x) atan = #0;
float (float y, float x) atan2 = #0;
float (float x) log = #0;
+float (float x) log2 = #0;
float (float x) log10 = #0;
float (float x, float y) pow = #0;
float (float x) sinh = #0;
@@ -30,3 +31,6 @@ float (float x) tanh = #0;
float (float x) asinh = #0;
float (float x) acosh = #0;
float (float x) atanh = #0;
+float (float x) sqrt = #0;
+float (float x) cbrt = #0;
+float (float x, float y) hypot = #0;
diff --git a/ruamoko/scheme/Makefile.am b/ruamoko/scheme/Makefile.am
index c0648d836..ad9f40894 100644
--- a/ruamoko/scheme/Makefile.am
+++ b/ruamoko/scheme/Makefile.am
@@ -13,7 +13,9 @@ GZ=.gz
else
GZ=
endif
-STRIP=$(shell echo `echo -n $(srcdir)/ | sed -e 's/[^/]//g' | wc -c`)
+# BSD make can't handle $(shell foo) directives, and GNU make can't handle |=
+# so we have to bite the bullet and pass this to the shell every time.
+STRIP=`echo -n $(srcdir)/ | sed -e 's/[^/]//g' | wc -c`
RANLIB=touch
@@ -39,15 +41,13 @@ EXTRA_DIST = \
SchemeObject.h SchemeString.h Scope.h Symbol.h Void.h builtins.h \
debug.h defs.h state.h \
\
- main.qc defs.qc
+ main.r defs.r
-%.qfo: %.r
- $(QFCC) $(QCFLAGS) $(QCPPFLAGS) -c -o $@ $<
-
-%.o: %.r
- $(QFCC) $(QCFLAGS) $(QCPPFLAGS) -c -o $@ $<
-%.o: %.qc
- $(QFCC) $(QCFLAGS) $(QCPPFLAGS) -c -o $@ $<
+SUFFIXES=.qc .qfo .r
+.r.qfo:
+ $(QFCC) $(QCFLAGS) $(QCPPFLAGS) -p $(STRIP) -c -o $@ $<
+.r.o:
+ $(QFCC) $(QCFLAGS) $(QCPPFLAGS) -p $(STRIP) -c -o $@ $<
libscheme_a_SOURCES=\
SchemeObject.r Cons.r Number.r SchemeString.r Symbol.r Lexer.r Parser.r \
@@ -60,9 +60,9 @@ scheme_data=\
main.dat$(GZ)
scheme_src=\
- main.qc defs.qc
+ main.r defs.r
-scheme_obj=$(addsuffix .o,$(basename $(scheme_src)))
+scheme_obj=$(scheme_src:.qc=.o)
main.dat$(GZ): $(scheme_obj) $(QFCC_DEP) ../lib/libcsqc.a ../lib/libr.a libscheme.a
$(QFCC) $(QCFLAGS) -p $(STRIP) -o main.dat $(scheme_obj) libscheme.a ../lib/libcsqc.a ../lib/libr.a
diff --git a/ruamoko/scheme/defs.qc b/ruamoko/scheme/defs.r
similarity index 100%
rename from ruamoko/scheme/defs.qc
rename to ruamoko/scheme/defs.r
diff --git a/ruamoko/scheme/main.qc b/ruamoko/scheme/main.r
similarity index 100%
rename from ruamoko/scheme/main.qc
rename to ruamoko/scheme/main.r
diff --git a/tools/bsp2img/bsp2img.c b/tools/bsp2img/bsp2img.c
index 2d5fe6701..eade1f831 100644
--- a/tools/bsp2img/bsp2img.c
+++ b/tools/bsp2img/bsp2img.c
@@ -922,11 +922,7 @@ write_pcx (image_t *image)
palette[i * 3 + 2] = i;
}
- Cvar_Init_Hash ();
- Cmd_Init_Hash ();
- Cvar_Init ();
- Sys_Init_Cvars ();
- Cmd_Init ();
+ Sys_Init ();
Memory_Init (malloc (MEMSIZE), MEMSIZE);
pcx = EncodePCX (image->image, image->width, image->height,
diff --git a/tools/build_scripts/qf-release b/tools/build_scripts/qf-release
index 58766cf6d..df517874f 100755
--- a/tools/build_scripts/qf-release
+++ b/tools/build_scripts/qf-release
@@ -61,13 +61,17 @@ git_url=${git_url:-git://git.quakeforge.net/gitroot/quake/quakeforge}
mkdir -p $RELEASE
cd $RELEASE
if test $no_rm -ne 1; then
- rm -rf NEWS quakeforge-* quakeforge_* qfcc_*
+ rm -rf NEWS quakeforge-* qfcc-* quakeforge_* qfcc_*
fi
git clone $git_url || true
mv quakeforge quakeforge-$ver
cd quakeforge-$ver
git checkout $tag_name
cp NEWS $RELEASE
+if test "$tag_name" != master; then
+ sed -e "s/git-master/$tag_name/" configure.ac > configure.ac-
+ mv configure.ac- configure.ac
+fi
mkdir -p linux.o qf-win32.o
./bootstrap
#begin linux
@@ -113,7 +117,7 @@ if test $do_win32 -eq 1; then
../tools/cross/cross-make.sh $QFSMP \
prefix=${qf_win32_dir} \
exec_prefix=${qf_win32_dir} \
- pkgdatadir=${qf_win32_dir} \
+ pkgdatadir=${qf_win32_dir}/QF \
man1dir=${qf_win32_dir} \
install
$MINGW/bin/strip --strip-unneeded "$qf_win32"/bin/*.exe
diff --git a/tools/build_scripts/qf-win32.py b/tools/build_scripts/qf-win32.py
index 0edef3153..fa160b9e8 100755
--- a/tools/build_scripts/qf-win32.py
+++ b/tools/build_scripts/qf-win32.py
@@ -31,8 +31,9 @@ client_wgl = [
dir + "bin",
dir + "bin/nq-wgl.exe",
dir + "bin/qw-client-wgl.exe",
- dir + "menu.dat.gz",
- dir + "menu.plist",
+ dir + "QF",
+ dir + "QF/menu.dat.gz",
+ dir + "QF/menu.plist",
]
client_sgl = [
@@ -40,8 +41,9 @@ client_sgl = [
dir + "bin",
dir + "bin/nq-sgl.exe",
dir + "bin/qw-client-sgl.exe",
- dir + "menu.dat.gz",
- dir + "menu.plist",
+ dir + "QF",
+ dir + "QF/menu.dat.gz",
+ dir + "QF/menu.plist",
]
client_sdl = [
@@ -49,8 +51,9 @@ client_sdl = [
dir + "bin",
dir + "bin/nq-sdl.exe",
dir + "bin/qw-client-sdl.exe",
- dir + "menu.dat.gz",
- dir + "menu.plist",
+ dir + "QF",
+ dir + "QF/menu.dat.gz",
+ dir + "QF/menu.plist",
]
client_sdl32 = [
@@ -58,8 +61,9 @@ client_sdl32 = [
dir + "bin",
dir + "bin/nq-sdl32.exe",
dir + "bin/qw-client-sdl32.exe",
- dir + "menu.dat.gz",
- dir + "menu.plist",
+ dir + "QF",
+ dir + "QF/menu.dat.gz",
+ dir + "QF/menu.plist",
]
tools = [
diff --git a/tools/carne/main.c b/tools/carne/main.c
index 8eb0244b5..3079b8196 100644
--- a/tools/carne/main.c
+++ b/tools/carne/main.c
@@ -111,10 +111,7 @@ main (int argc, char **argv)
int result, i;
// Initialize required QF subsystems
- Cvar_Init_Hash ();
- Cmd_Init_Hash ();
- Cmd_Init ();
- Cvar_Init ();
+ Sys_Init ();
GIB_Init (false); // No sandbox
GIB_Builtin_Add ("exit", Carne_GIB_Exit_f);
diff --git a/tools/io_mesh_qfmdl/__init__.py b/tools/io_mesh_qfmdl/__init__.py
new file mode 100644
index 000000000..6d100de1f
--- /dev/null
+++ b/tools/io_mesh_qfmdl/__init__.py
@@ -0,0 +1,107 @@
+# vim:ts=4:et
+# ##### BEGIN GPL LICENSE BLOCK #####
+#
+# 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 the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# ##### END GPL LICENSE BLOCK #####
+
+# copied from io_scene_obj
+
+#