TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Set sound distance to 0 for HUD sound taunts; Making Jukebox not crash if -nosound is enabled (should stop Jukebox since no digi system enabled); Lowered mouse axis speed a bit again; Increasing MAX_VECS to 5000

Browse source
This commit is contained in:
zicodxx 2008-05-25 08:19:31 +00:00
parent 565ea29e05
commit a9057c7c06
5 changed files with 16 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG.txt
View file

@ -1,5 +1,9 @@
D1X-Rebirth Changelog
20080825
--------
arch/sdl/digi_mixer.c, arch/sdl/jukebox.c, main/kconfig.c, main/morph.h: Set sound distance to 0 for HUD sound taunts; Making Jukebox not crash if -nosound is enabled (should stop Jukebox since no digi system enabled); Lowered mouse axis speed a bit again; Increasing MAX_VECS to 5000
20080524
--------
arch/sdl/jukebox.c, arch/sdl/rbaudio.c, d1x-rebirth.xcodeproj, include/rbaudio.h, main/automap.c, main/config.c, main/config.h, main/credits.c, main/game.c, main/kconfig.c, main/kmatrix.c, main/menu.c, main/network.c, main/newmenu.c, main/scores.c, main/songs.c, main/songs.h, SConstruct: Add audio CD support to D1X, fix associated bugs

9
arch/sdl/digi_mixer.c
View file

@ -143,9 +143,12 @@ int digi_mixer_start_sound(short soundnum, fix volume, int pan, int looping, int
if (MIX_DIGI_DEBUG) con_printf(CON_DEBUG,"digi_start_sound %d, volume %d, pan %d (start=%d, end=%d)\n", soundnum, mix_vol, mix_pan, loop_start, loop_end);
channel = Mix_PlayChannel(-1, &(SoundChunks[soundnum]), mix_loop);
Mix_SetPanning(channel, 255-mix_pan, mix_pan);
Mix_SetDistance(channel, 255-mix_vol);
channel = Mix_PlayChannel(-1, &(SoundChunks[soundnum]), mix_loop);
Mix_SetPanning(channel, 255-mix_pan, mix_pan);
if (volume > F1_0)
Mix_SetDistance(channel, 0);
else
Mix_SetDistance(channel, 255-mix_vol);
return channel;
}

2
arch/sdl/jukebox.c
View file

@ -85,7 +85,7 @@ void jukebox_load() {
jukebox_unload();
}
if (jukebox_loaded)
if (jukebox_loaded || GameArg.SndNoSound)
return;
if (GameCfg.JukeboxOn) {

4
main/kconfig.c
View file

@ -1363,8 +1363,8 @@ void controls_read_all()
if (CONTROL_USING_MOUSE) {
//--------- Read Mouse -----------
mouse_get_delta( &dx, &dy, &dz );
mouse_axis[0] = (dx*FrameTime)/10;
mouse_axis[1] = (dy*FrameTime)/10;
mouse_axis[0] = (dx*FrameTime)/25;
mouse_axis[1] = (dy*FrameTime)/25;
mouse_axis[2] = (dz*FrameTime);
mouse_buttons = mouse_get_btns();
use_mouse=1;

50
main/morph.h
View file

@ -10,55 +10,11 @@ CONTAINED HEREIN FOR REVENUE-BEARING PURPOSES. THE END-USER UNDERSTANDS
AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE.
COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
*/
/*
* $Source: /cvsroot/dxx-rebirth/d1x-rebirth/main/morph.h,v $
* $Revision: 1.1.1.1 $
* $Author: zicodxx $
* $Date: 2006/03/17 19:43:14 $
*
*
* Header for morph.c
*
* $Log: morph.h,v $
* Revision 1.1.1.1 2006/03/17 19:43:14 zicodxx
* initial import
*
* Revision 1.1.1.1 1999/06/14 22:12:37 donut
* Import of d1x 1.37 source.
*
* Revision 2.0 1995/02/27 11:32:19 john
* New version 2.0, which has no anonymous unions, builds with
* Watcom 10.0, and doesn't require parsing BITMAPS.TBL.
*
* Revision 1.9 1995/01/04 12:20:46 john
* Declearations to work better with game state save.
*
*
* Revision 1.8 1995/01/03 20:38:44 john
* Externed MAX_MORPH_OBJECTS
*
* Revision 1.7 1994/09/26 17:28:33 matt
* Made new multiple-object morph code work with the demo system
*
* Revision 1.6 1994/09/26 15:40:17 matt
* Allow multiple simultaneous morphing objects
*
* Revision 1.5 1994/06/28 11:55:19 john
* Made newdemo system record/play directly to/from disk, so
* we don't need the 4 MB buffer anymore.
*
* Revision 1.4 1994/06/16 13:57:40 matt
* Added support for morphing objects in demos
*
* Revision 1.3 1994/06/08 18:22:03 matt
* Made morphing objects light correctly
*
* Revision 1.2 1994/05/30 22:50:25 matt
* Added morph effect for robots
*
* Revision 1.1 1994/05/30 12:04:19 matt
* Initial revision
*
*
*/
@ -68,7 +24,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
#include "object.h"
#define MAX_VECS 200
#define MAX_VECS 5000
typedef struct morph_data {
object *obj; //object which is morphing