diff --git a/NEWS b/NEWS index b3a2e44..8745d59 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,12 @@ NEWS for quake2 =============== +0.2.2 (25/02/04) +----- + +* ALSA and libao sound drivers added -- configurable at compile time. +* Updates to fix compile errors with gcc 3.3. + 0.2.1 (06/02/03) ----- diff --git a/TODO b/TODO index 85a3ecd..6425511 100644 --- a/TODO +++ b/TODO @@ -8,10 +8,6 @@ - the video refresher loader code in src/vid_menu.c needs cleaning up, it's utter bollocks at the moment. all the structs are very fragile, depending on specific ordering of each element. -- do va_list audit -- check that argptr isn't used twice (as per -http://gozer.quakeforge.net/list-archives/quakeforge-cvs/2002-April/000151.html - Everything seems to be fine, someone with a PPC machine will probably want - to double check this. - investigate the possibility of savegames not being tied to a particular build - split out assembler per arch/os (we currently have gas i386 and win i386) - make sure that we give back the mouse and keyboard if the game crashes @@ -41,7 +37,7 @@ X Stencil buffered shadows - Adding true color TGA loading for MD2 Models - Better dynamic light falloff - Controlable water waves -- Adding a FPS counter +X Adding a FPS counter X Quake2 MP3 Playback X Adding a skybox size variable X Adding new video resolutions diff --git a/configure.in b/configure.in index f111c3e..2da94bb 100644 --- a/configure.in +++ b/configure.in @@ -4,7 +4,7 @@ dnl stick the revision info into the resulting configure script AC_REVISION($Revision$) dnl AC_PREREQ(2.50) -AC_INIT(quake2, 0.2.1, quake2-devel@lists.quakeforge.net) +AC_INIT(quake2, 0.2.2, quake2-devel@lists.quakeforge.net) AC_CONFIG_AUX_DIR(.) AC_CONFIG_SRCDIR(src/main.c) AM_CONFIG_HEADER(config.h) @@ -12,7 +12,7 @@ AM_CONFIG_HEADER(config.h) dnl get the build and target hosts AC_CANONICAL_SYSTEM -AM_INIT_AUTOMAKE([1.6 foreign]) +AM_INIT_AUTOMAKE([foreign]) dnl configure --enable-maintainer-mode gets some extra targets AM_MAINTAINER_MODE @@ -548,9 +548,11 @@ AC_ARG_ENABLE(joystick, HAVE_JOYSTICK=yes ) if test "x$HAVE_JOYSTICK" = "xyes";then - AC_CHECK_HEADER(linux/joystick.h, HAVE_JOYSTICK=yes - AC_DEFINE(HAVE_JOYSTICK, 1, [Define this if you want joystick support to be built]) - , HAVE_JOYSTICK=no) + AC_CHECK_HEADER(linux/joystick.h, + HAVE_JOYSTICK=yes + AC_DEFINE(HAVE_JOYSTICK, 1, [Define this if you want joystick support to be built]), + HAVE_JOYSTICK=no + ) fi dnl ------------------------- diff --git a/data/baseq2/config.cfg b/data/baseq2/config.cfg index a571c0e..11b8999 100644 --- a/data/baseq2/config.cfg +++ b/data/baseq2/config.cfg @@ -74,30 +74,9 @@ bind MOUSE1 "+attack" bind MOUSE2 "+strafe" bind MOUSE3 "+mlook" bind PAUSE "pause" -set gl_3dlabs_broken "1" -set gl_swapinterval "1" -set gl_ext_compiled_vertex_array "1" -set gl_ext_pointparameters "1" -set gl_ext_multitexture "1" -set gl_ext_palettedtexture "1" -set gl_ext_swapinterval "1" -set gl_vertex_arrays "0" -set gl_texturesolidmode "default" -set gl_texturealphamode "default" -set gl_texturemode "GL_LINEAR_MIPMAP_NEAREST" -set gl_driver "opengl32" -set gl_finish "0" -set gl_shadows "0" -set gl_stencilshadow "0" -set gl_mode "3" -set gl_modulate "1" -set gl_particle_att_c "0.01" -set gl_particle_att_b "0.0" -set gl_particle_att_a "0.01" -set gl_particle_size "40" -set gl_particle_max_size "40" -set gl_particle_min_size "2" set g_select_empty "0" +set sw_mode "3" +set sw_allow_modex "1" set in_joystick "0" set in_mouse "1" set cl_vwep "1" @@ -106,7 +85,7 @@ set gender "male" set fov "90" set msg "1" set rate "25000" -set freelook "0" +set freelook "1" set cl_stereo_separation "0.4" set adr8 "" set adr7 "" @@ -120,32 +99,37 @@ set adr0 "" set cd_nocd "0" set s_primary "0" set s_mixahead "0.2" -set s_loadas8bit "1" -set s_khz "11" +set s_loadas8bit "0" +set s_khz "22" set s_volume "0.7" -set sw_mode "0" set sw_stipplealpha "0" -set sw_allow_modex "1" -set vid_gamma "1" -set vid_ypos "32" -set vid_xpos "115" -set vid_ref "gl" +set vid_gamma "0.500000" +set vid_ypos "279" +set vid_xpos "231" set sv_reconnect_limit "3" set allow_download_maps "1" set allow_download_sounds "1" set allow_download_models "1" -set allow_download_players "0" -set allow_download "0" +set allow_download_players "1" +set allow_download "1" set hostname "noname" -set skin "male/grunt" -set name "hook" +set sndbits "16" +set sndspeed "0" +set sndchannels "2" +set snddevice "/dev/dsp" +set cd_volume "1" +set cd_dev "/dev/cdrom" +set cl_drawfps "1" +set in_dgamouse "1" +set vid_ref "softx" +set skin "male/scout" +set name "jaq" set lookstrafe "0" set lookspring "1" set m_pitch "-0.022000" -set hand "2" -set cl_run "0" -set crosshair "1" +set hand "0" +set cl_run "1" +set crosshair "3" set sensitivity "9.000000" -set win_noalttab "0" set vid_fullscreen "0" set viewsize "100" diff --git a/src/rogue/Makefile.am b/src/rogue/Makefile.am index bb677ca..6394b10 100644 --- a/src/rogue/Makefile.am +++ b/src/rogue/Makefile.am @@ -1,34 +1,32 @@ -# $Id$ - pkglibdir=$(libdir)/@PACKAGE@/rogue if DO_ROGUE -pkglib_LTLIBRARIES = game.la -game_la_SOURCES = dm_ball.c dm_tag.c \ - g_ai.c g_chase.c g_cmds.c g_combat.c g_func.c \ - g_items.c g_main.c g_misc.c g_monster.c g_newai.c \ - g_newdm.c g_newfnc.c g_newtarg.c g_newtrig.c \ - g_newweap.c g_phys.c g_save.c g_spawn.c g_sphere.c \ - g_svcmds.c g_target.c g_trigger.c g_turret.c \ - g_utils.c g_weapon.c \ - m_actor.c m_berserk.c m_boss2.c m_boss3.c \ - m_boss31.c m_boss32.c m_brain.c m_carrier.c \ - m_chick.c m_flash.c m_flipper.c m_float.c m_flyer.c \ - m_gladiator.c m_gunner.c m_hover.c m_infantry.c \ - m_insane.c m_medic.c m_move.c m_mutant.c \ - m_parasite.c m_soldier.c m_stalker.c m_supertank.c \ - m_tank.c m_turret.c m_widow.c m_widow2.c \ - p_client.c p_hud.c p_trail.c p_view.c p_weapon.c \ - q_shared.c - -noinst_HEADERS = g_local.h m_actor.h m_berserk.h m_boss2.h m_boss31.h \ - m_boss32.h m_brain.h m_carrier.h m_chick.h m_flipper.h \ - m_float.h m_flyer.h m_gladiator.h m_gunner.h m_hover.h \ - m_infantry.h m_insane.h m_medic.h m_mutant.h m_parasite.h \ - m_player.h m_rider.h m_soldier.h m_stalker.h m_supertank.h \ - m_tank.h m_turret.h m_widow.h m_widow2.h q_shared.h - -#game_la_CFLAGS = -fPIC -Wall -Werror -pipe @OPT_CFLAGS@ -game_la_CFLAGS = -I$(top_srcdir)/src -fPIC -pipe @OPT_CFLAGS@ -game_la_LDFLAGS = -module -avoid-version -rpath $(pkglibdir) +#pkglib_LTLIBRARIES = game.la +#game_la_SOURCES = dm_ball.c dm_tag.c \ +# g_ai.c g_chase.c g_cmds.c g_combat.c g_func.c \ +# g_items.c g_main.c g_misc.c g_monster.c g_newai.c \ +# g_newdm.c g_newfnc.c g_newtarg.c g_newtrig.c \ +# g_newweap.c g_phys.c g_save.c g_spawn.c g_sphere.c \ +# g_svcmds.c g_target.c g_trigger.c g_turret.c \ +# g_utils.c g_weapon.c \ +# m_actor.c m_berserk.c m_boss2.c m_boss3.c \ +# m_boss31.c m_boss32.c m_brain.c m_carrier.c \ +# m_chick.c m_flash.c m_flipper.c m_float.c m_flyer.c \ +# m_gladiator.c m_gunner.c m_hover.c m_infantry.c \ +# m_insane.c m_medic.c m_move.c m_mutant.c \ +# m_parasite.c m_soldier.c m_stalker.c m_supertank.c \ +# m_tank.c m_turret.c m_widow.c m_widow2.c \ +# p_client.c p_hud.c p_trail.c p_view.c p_weapon.c \ +# q_shared.c +# +#noinst_HEADERS = g_local.h m_actor.h m_berserk.h m_boss2.h m_boss31.h \ +# m_boss32.h m_brain.h m_carrier.h m_chick.h m_flipper.h \ +# m_float.h m_flyer.h m_gladiator.h m_gunner.h m_hover.h \ +# m_infantry.h m_insane.h m_medic.h m_mutant.h m_parasite.h \ +# m_player.h m_rider.h m_soldier.h m_stalker.h m_supertank.h \ +# m_tank.h m_turret.h m_widow.h m_widow2.h q_shared.h +# +##game_la_CFLAGS = -fPIC -Wall -Werror -pipe @OPT_CFLAGS@ +#game_la_CFLAGS = -I$(top_srcdir)/src -fPIC -pipe @OPT_CFLAGS@ +#game_la_LDFLAGS = -module -avoid-version -rpath $(pkglibdir) endif # DO_ROGUE diff --git a/src/xatrix/Makefile.am b/src/xatrix/Makefile.am index 752b179..c64d01b 100644 --- a/src/xatrix/Makefile.am +++ b/src/xatrix/Makefile.am @@ -1,31 +1,29 @@ -# $Id$ - pkglibdir=$(libdir)/@PACKAGE@/xatrix if DO_XATRIX -pkglib_LTLIBRARIES = game.la -game_la_SOURCES = g_ai.c g_chase.c g_cmds.c g_combat.c g_func.c \ - g_items.c g_main.c g_misc.c g_monster.c g_phys.c \ - g_save.c g_spawn.c g_svcmds.c g_target.c g_trigger.c \ - g_turret.c g_utils.c g_weapon.c \ - m_actor.c m_berserk.c m_boss2.c m_boss3.c \ - m_boss31.c m_boss32.c m_boss5.c m_brain.c \ - m_chick.c m_fixbot.c m_flash.c m_flipper.c \ - m_float.c m_flyer.c m_gekk.c m_gladb.c \ - m_gladiator.c m_gunner.c m_hover.c m_infantry.c \ - m_insane.c m_medic.c m_move.c m_mutant.c \ - m_parasite.c m_soldier.c m_supertank.c m_tank.c \ - p_client.c p_hud.c p_trail.c p_view.c p_weapon.c \ - q_shared.c +#pkglib_LTLIBRARIES = game.la +#game_la_SOURCES = g_ai.c g_chase.c g_cmds.c g_combat.c g_func.c \ +# g_items.c g_main.c g_misc.c g_monster.c g_phys.c \ +# g_save.c g_spawn.c g_svcmds.c g_target.c g_trigger.c \ +# g_turret.c g_utils.c g_weapon.c \ +# m_actor.c m_berserk.c m_boss2.c m_boss3.c \ +# m_boss31.c m_boss32.c m_boss5.c m_brain.c \ +# m_chick.c m_fixbot.c m_flash.c m_flipper.c \ +# m_float.c m_flyer.c m_gekk.c m_gladb.c \ +# m_gladiator.c m_gunner.c m_hover.c m_infantry.c \ +# m_insane.c m_medic.c m_move.c m_mutant.c \ +# m_parasite.c m_soldier.c m_supertank.c m_tank.c \ +# p_client.c p_hud.c p_trail.c p_view.c p_weapon.c \ +# q_shared.c -noinst_HEADERS = g_local.h m_actor.h m_berserk.h m_boss2.h m_boss31.h \ - m_boss32.h m_brain.h m_chick.h m_fixbot.h m_flipper.h \ - m_float.h m_flyer.h m_gekk.h m_gladiator.h m_gunner.h \ - m_hover.h m_infantry.h m_insane.h m_medic.h m_mutant.h \ - m_parasite.h m_player.h m_rider.h m_soldier.h m_soldierh.h \ - m_supertank.h m_tank.h q_shared.h +#noinst_HEADERS = g_local.h m_actor.h m_berserk.h m_boss2.h m_boss31.h \ +# m_boss32.h m_brain.h m_chick.h m_fixbot.h m_flipper.h \ +# m_float.h m_flyer.h m_gekk.h m_gladiator.h m_gunner.h \ +# m_hover.h m_infantry.h m_insane.h m_medic.h m_mutant.h \ +# m_parasite.h m_player.h m_rider.h m_soldier.h m_soldierh.h \ +# m_supertank.h m_tank.h q_shared.h -#game_la_CFLAGS = -fPIC -Wall -Werror -pipe @OPT_CFLAGS@ -game_la_CFLAGS = -I$(top_srcdir)/src -fPIC -pipe @OPT_CFLAGS@ -game_la_LDFLAGS = -module -avoid-version -rpath $(pkglibdir) +##game_la_CFLAGS = -fPIC -Wall -Werror -pipe @OPT_CFLAGS@ +#game_la_CFLAGS = -I$(top_srcdir)/src -fPIC -pipe @OPT_CFLAGS@ +#game_la_LDFLAGS = -module -avoid-version -rpath $(pkglibdir) endif # DO_XATRIX