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 fd95b79cae
commit e19a1238de
5 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG.txt
View file

@ -1,5 +1,9 @@
D2X-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
--------
main/gr.c: Give render_frame call both arguments (compiler error)

5
arch/sdl/digi_mixer.c
View file

@ -147,7 +147,10 @@ int digi_mixer_start_sound(short soundnum, fix volume, int pan, int looping, int
channel = Mix_PlayChannel(-1, &(SoundChunks[soundnum]), mix_loop);
Mix_SetPanning(channel, 255-mix_pan, mix_pan);
Mix_SetDistance(channel, 255-mix_vol);
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

@ -1429,8 +1429,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;

3
main/morph.h
View file

@ -1,4 +1,3 @@
/* $Id: morph.h,v 1.1.1.1 2006/03/17 19:55:54 zicodxx Exp $ */
/*
THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO
@ -24,7 +23,7 @@ COPYRIGHT 1993-1999 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