mirror of
https://github.com/Shpoike/Quakespasm.git
synced 2024-11-10 07:21:58 +00:00
Set SDL_CDROM environment variable when using -cddev. Some doco updates.
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@282 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
Steven
parent
d8779f7d0d
commit
38b8119eb7
5 changed files with 76 additions and 26 deletions
|
|
@ -221,7 +221,7 @@ debug:
|
|||
$(error Use "make DEBUG=1")
|
||||
|
||||
install: quakespasm
|
||||
mv quakespasm /usr/local/games/quake
|
||||
cp quakespasm /usr/local/games/quake
|
||||
|
||||
clean:
|
||||
rm -f $(shell find . \( -name '*~' -o -name '#*#' -o -name '*.o' -o -name '*.res' -o -name $(DEFAULT_TARGET) \) -print)
|
||||
|
|
|
|||
|
|
@ -27,6 +27,7 @@
|
|||
|
||||
|
||||
#include "SDL.h"
|
||||
#include "SDL_getenv.h"
|
||||
|
||||
#ifndef SDL_INIT_CDROM
|
||||
|
||||
|
|
@ -393,10 +394,17 @@ void CDAudio_Update(void)
|
|||
int CDAudio_Init(void)
|
||||
{
|
||||
int i, x, sdl_num_drives;
|
||||
char sdl_env_dev[] = "SDL_CDROM=";
|
||||
|
||||
if (COM_CheckParm("-nocdaudio"))
|
||||
return -1;
|
||||
|
||||
if ((i = COM_CheckParm("-cddev")) != 0 && i < com_argc - 1)
|
||||
{
|
||||
strcat(sdl_env_dev, com_argv[i+1]);
|
||||
putenv(sdl_env_dev);
|
||||
}
|
||||
|
||||
if (SDL_InitSubSystem(SDL_INIT_CDROM) == -1)
|
||||
{
|
||||
Con_Printf("Couldn't init SDL cdrom: %s\n", SDL_GetError());
|
||||
|
|
|
|||
10
README.html
10
README.html
|
|
@ -74,6 +74,10 @@ It includes 64bit CPU cupport, a new sound driver, several networking fixes, and
|
|||
</LI>
|
||||
<LI>Quakespasm allows loading new games (mods) on the fly with "<B>game</B> <EM>GAMENAME</EM>"
|
||||
</LI>
|
||||
<LI>There is currently no music volume support. cd_sdl.c needs replacing with cd_linux.c, cd_bsd.c etc..
|
||||
</LI>
|
||||
<LI>In windows, alternative CD drives are accessible by "<B>quakespasm -cddev F:\</B>" (for example)
|
||||
</LI>
|
||||
</UL>
|
||||
</P>
|
||||
<P><EM> Visit the
|
||||
|
|
@ -122,7 +126,8 @@ The process is not for the faint hearted.</P>
|
|||
<LI> Add a "prev weapon" menu item (from Sander)</LI>
|
||||
<LI> Small fix to Sound Block/Unblock on win32</LI>
|
||||
<LI> Lots of code fixes (some from uhexen2)</LI>
|
||||
<LI> Sys_Error calls Host_Shutdown
|
||||
<LI> Sys_Error calls Host_Shutdown</LI>
|
||||
<LI> Added MS Visual Studio support
|
||||
</LI>
|
||||
</UL>
|
||||
</P>
|
||||
|
|
@ -176,6 +181,8 @@ The process is not for the faint hearted.</P>
|
|||
<P>
|
||||
<UL>
|
||||
<LI>Ogg/Mp3 music file support</LI>
|
||||
<LI>Native CD audio support .... cd_sdl.c doesn't have proper volume controls</LI>
|
||||
<LI>Test usb keyboards. Do the keypads work ?</LI>
|
||||
<LI>Tested HOME directory support</LI>
|
||||
<LI>Fix Centerview (V_StartPitchDrift)</LI>
|
||||
<LI>Fix compiler warnings</LI>
|
||||
|
|
@ -192,6 +199,7 @@ The process is not for the faint hearted.</P>
|
|||
<A HREF="http://www.celephais.net/fitzquake">FitzQuake Homepage</A><BR>
|
||||
<A HREF="http://www.kristianduske.com/fitzquake">Sleepwalkr's Original SDL Port</A><BR>
|
||||
<A HREF="http://quakeone.com/proquake/src_other/fitzquake_sdl_20090510_src_beta_1.zip">Baker's 0.85 Source Code</A><BR>
|
||||
<A HREF="http://www.celephais.net/board/view_thread.php?id=60452">Func Quakespasm forum</A><BR>
|
||||
<A HREF="http://www.celephais.net/board/view_thread.php?id=60172">Func SDL Fitzquake forum</A><BR>
|
||||
<A HREF="mailto:gmail - dot - com - username - sezeroz">Ozkan's email</A><BR>
|
||||
<A HREF="mailto:yahoo - dot - com - username - stevenaaus">Stevenaaus email</A><BR>
|
||||
|
|
|
|||
|
|
@ -37,6 +37,10 @@ It includes 64bit CPU cupport, a new sound driver, several networking fixes, and
|
|||
|
||||
<item>Quakespasm allows loading new games (mods) on the fly with "<bf>game</bf> <em>GAMENAME</em>"
|
||||
|
||||
<item>There is currently no music volume support. cd_sdl.c needs replacing with cd_linux.c, cd_bsd.c etc..
|
||||
|
||||
<item>In windows, alternative CD drives are accessible by "<bf>quakespasm -cddev F:\</bf>" (for example)
|
||||
|
||||
</itemize>
|
||||
|
||||
<em> Visit the <url url="http://www.celephais.net/fitzquake" name="FitzQuake Homepage"> for a full run-down of this engine's features.</em>
|
||||
|
|
@ -79,6 +83,7 @@ The process is not for the faint hearted.
|
|||
<item> Small fix to Sound Block/Unblock on win32
|
||||
<item> Lots of code fixes (some from uhexen2)
|
||||
<item> Sys_Error calls Host_Shutdown
|
||||
<item> Added MS Visual Studio support
|
||||
|
||||
</itemize>
|
||||
|
||||
|
|
@ -121,6 +126,8 @@ The process is not for the faint hearted.
|
|||
<sect> Todo <p>
|
||||
<itemize>
|
||||
<item>Ogg/Mp3 music file support
|
||||
<item>Native CD audio support .... cd_sdl.c doesn't have proper volume controls
|
||||
<item>Test usb keyboards. Do the keypads work ?
|
||||
<item>Tested HOME directory support
|
||||
<item>Fix Centerview (V_StartPitchDrift)
|
||||
<item>Fix compiler warnings
|
||||
|
|
@ -139,6 +146,8 @@ The process is not for the faint hearted.
|
|||
<newline>
|
||||
<url name="Baker's 0.85 Source Code" url="http://quakeone.com/proquake/src_other/fitzquake_sdl_20090510_src_beta_1.zip">
|
||||
<newline>
|
||||
<url url="http://www.celephais.net/board/view_thread.php?id=60452" name="Func Quakespasm forum">
|
||||
<newline>
|
||||
<url url="http://www.celephais.net/board/view_thread.php?id=60172" name="Func SDL Fitzquake forum">
|
||||
<newline>
|
||||
<url url="mailto:gmail - dot - com - username - sezeroz" name="Ozkan's email">
|
||||
|
|
|
|||
73
README.txt
73
README.txt
|
|
@ -6,8 +6,8 @@
|
|||
|
||||
|
||||
1. About
|
||||
2. Hints
|
||||
3. Downloads
|
||||
2. Downloads
|
||||
3. Hints
|
||||
4. Compiling
|
||||
5. Changes
|
||||
5.1 0.85.3
|
||||
|
|
@ -34,7 +34,18 @@
|
|||
<http://quakespasm.sourceforge.net>
|
||||
|
||||
|
||||
2. Hints
|
||||
2. Downloads
|
||||
|
||||
|
||||
Source
|
||||
<http://prdownloads.sourceforge.net/quakespasm/quakespasm-0.85.3.tgz/download>
|
||||
Linux binary
|
||||
<http://prdownloads.sourceforge.net/quakespasm/quakespasm-0.85.3_linux.tgz/download>
|
||||
Windows
|
||||
<http://prdownloads.sourceforge.net/quakespasm/quakespasm-0.85.3_windows.zip/download>
|
||||
|
||||
|
||||
3. Hints
|
||||
|
||||
|
||||
o To disable some changes, use "quakespasm -fitz"
|
||||
|
|
@ -49,17 +60,16 @@
|
|||
|
||||
o Quakespasm allows loading new games (mods) on the fly with "game
|
||||
GAMENAME"
|
||||
o There is currently no music volume support. cd_sdl.c needs
|
||||
replacing with cd_linux.c, cd_bsd.c etc..
|
||||
|
||||
o In windows, alternative CD drives are accessible by "quakespasm
|
||||
-cddev F:\" (for example)
|
||||
|
||||
Visit the FitzQuake Homepage <http://www.celephais.net/fitzquake> for
|
||||
a full run-down of this engine's features.
|
||||
|
||||
|
||||
3. Downloads
|
||||
|
||||
|
||||
Source
|
||||
<http://prdownloads.sourceforge.net/quakespasm/quakespasm-0.85.3.tgz/download>
|
||||
Linux binary
|
||||
<http://prdownloads.sourceforge.net/quakespasm/quakespasm-0.85.3_linux.tgz/download>
|
||||
Windows
|
||||
<http://prdownloads.sourceforge.net/quakespasm/quakespasm-0.85.3_windows.zip/download>
|
||||
4. Compiling
|
||||
|
||||
Just extract the source tarball, then
|
||||
|
|
@ -71,13 +81,21 @@
|
|||
______________________________________________________________________
|
||||
|
||||
|
||||
Use make DEBUG=1 for debugging.
|
||||
Optionally, HOME directory support can be enabled via the Misc/home-
|
||||
dir_0.patch diff.
|
||||
If for any reason this doesn't work, the project can also be built
|
||||
with Codeblocks. This is a large, free, integrated development envi-
|
||||
ronment that requires wxWidgets and cmake to install. The process is
|
||||
not for the faint hearted.
|
||||
Compile time options include
|
||||
|
||||
o make DEBUG=1 for debugging
|
||||
|
||||
o make SDLNET=1 to enable SDL_net (Otherwise the socket api will be
|
||||
used directly)
|
||||
|
||||
o make SDL_CONFIG=/PATH/TO/SDL-CONFIG for unusual SDL installs
|
||||
|
||||
o HOME directory support can be enabled via the Misc/homedir_0.patch
|
||||
diff
|
||||
If for any reason this doesn't work, the project can also be built
|
||||
with Codeblocks. This is a large, free, integrated development
|
||||
environment that requires wxWidgets and cmake to install. The
|
||||
process is not for the faint hearted.
|
||||
|
||||
|
||||
5. Changes
|
||||
|
|
@ -94,9 +112,9 @@
|
|||
o Add a persistent history feature (thanks Baker)
|
||||
|
||||
o Add a slider for scr_sbaralpha, which now defaults to 0.95
|
||||
(slightly transparent, allowing for nicer status bar)
|
||||
(slightly transparent, allowing for a nicer status bar)
|
||||
|
||||
o Allow for player messages longer than 32 chars
|
||||
o Allow player messages longer than 32 chars
|
||||
|
||||
o Sockaddr fix for FreeBSD/OSX/etc networking
|
||||
|
||||
|
|
@ -107,16 +125,17 @@
|
|||
|
||||
o Enumerate options menus
|
||||
|
||||
|
||||
o Add a "prev weapon" menu item (from Sander)
|
||||
|
||||
o Small fix to Sound Block/Unblock on win32
|
||||
|
||||
o Lots of code fixes (some from uhexen2)
|
||||
|
||||
o Shift+Escape opens console
|
||||
|
||||
o Sys_Error calls Host_Shutdown
|
||||
|
||||
o Added MS Visual Studio support
|
||||
|
||||
|
||||
5.2. 0.85.2
|
||||
|
||||
|
|
@ -125,7 +144,6 @@
|
|||
|
||||
o Don't constantly open and close condebug log
|
||||
|
||||
|
||||
o Heap of C clean-ups
|
||||
|
||||
o Fix mapname sorting
|
||||
|
|
@ -191,6 +209,11 @@
|
|||
|
||||
o Ogg/Mp3 music file support
|
||||
|
||||
o Native CD audio support .... cd_sdl.c doesn't have proper volume
|
||||
controls
|
||||
|
||||
o Test usb keyboards. Do the keypads work ?
|
||||
|
||||
o Tested HOME directory support
|
||||
|
||||
o Fix Centerview (V_StartPitchDrift)
|
||||
|
|
@ -210,6 +233,8 @@
|
|||
<http://www.kristianduske.com/fitzquake>
|
||||
Baker's 0.85 Source Code
|
||||
<http://quakeone.com/proquake/src_other/fitzquake_sdl_20090510_src_beta_1.zip>
|
||||
Func Quakespasm forum
|
||||
<http://www.celephais.net/board/view_thread.php?id=60452>
|
||||
Func SDL Fitzquake forum
|
||||
<http://www.celephais.net/board/view_thread.php?id=60172>
|
||||
Ozkan's email <mailto:gmail - dot - com - username - sezeroz>
|
||||
|
|
|
|||
Loading…
Reference in a new issue