eukara/ngunix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

minor fixes, when music track isn't found it stops all tracks (some mods need this apparently)

Browse source
This commit is contained in:
eukos 2015-08-25 22:08:39 +02:00
parent e3c44a49d4
commit 239724a938
5 changed files with 15 additions and 92 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
audio/snd_dma.c
View file

@ -219,14 +219,7 @@ void S_Init_Cvars (void)
S_Init
================
*/
#ifdef DUMB
void register_dumbfile_system(DUMBFILE_SYSTEM *dfs);
#endif
#ifdef DUMB
DUH *duh;
DUH_SIGRENDERER *sr;
extern loadedfile_t *thesong;
#endif
void S_Init (void)
{

6
engine/cl_main.c
View file

@ -1195,7 +1195,7 @@ CL_Init_Cvars
*/
void CL_Init_Cvars (void)
{
cl_name = Cvar_Get ("_cl_name", "player", CVAR_ARCHIVE|CVAR_ORIGINAL);
cl_name = Cvar_Get ("_cl_name", "Unnamed", CVAR_ARCHIVE|CVAR_ORIGINAL);
cl_color = Cvar_Get ("_cl_color", "0", CVAR_ARCHIVE|CVAR_ORIGINAL);
cl_upspeed = Cvar_Get ("cl_upspeed", "200", CVAR_ORIGINAL);
@ -1221,7 +1221,7 @@ void CL_Init_Cvars (void)
m_forward = Cvar_Get ("m_forward", "1", CVAR_ARCHIVE|CVAR_ORIGINAL);
m_side = Cvar_Get ("m_side", "0.8", CVAR_ARCHIVE|CVAR_ORIGINAL);
// 2001-12-16 M_LOOK cvar by Heffo/Maddes start
m_look = Cvar_Get ("m_look", "0", CVAR_ARCHIVE);
m_look = Cvar_Get ("m_look", "1", CVAR_ARCHIVE);
Cvar_SetRangecheck (m_look, Cvar_RangecheckBool, 0, 1);
Cvar_SetCallback (m_look, Callback_M_Look);
Cvar_Set(m_look, m_look->string); // do rangecheck
@ -1254,8 +1254,6 @@ void CL_Init_Cvars (void)
Cvar_Set(cl_entities_min_temp, cl_entities_min_temp->string); // do rangecheck
// 2001-09-20 Configurable entity limits by Maddes end
cl_hudswap = Cvar_Get ("cl_hudswap", "0", CVAR_ARCHIVE | CVAR_ORIGINAL);
cl_sbar = Cvar_Get ("cl_sbar", "1", CVAR_ARCHIVE | CVAR_ORIGINAL);
}
// 2001-09-18 New cvar system by Maddes (Init) end

69
engine/cl_parse.c
View file

@ -21,9 +21,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "globaldef.h"
#ifdef DUMB
#include <dumb.h>
#endif
#ifdef ASS_MIDI
#ifdef _WIN32
@ -1192,72 +1189,6 @@ void MIDIHIJACK(int i, qboolean loop)
#endif
}
#ifdef DUMB
// All our dumb stuff will happen in this function.
// this just 'ooh a cd track'. then plays the mod file accordioning to number.
// .......
loadedfile_t *thesong;
void DUMBHIJACK(int i, qboolean loop)
{
char trackname[512];
loadedfile_t *fileinfo;
// sprintf(trackname, "sound/cdtracks/track%03i.mod", i);
sprintf(trackname, "sound/cdtracks/isotoxin.s3m", i);
thesong = COM_LoadHunkFile(trackname);
if (!thesong){
Con_SafePrintf ("The song %s can not be loaded. \ngod freak in dam it hell and bush\n", trackname);
return;}
Con_SafePrintf (trackname); // haha @ quakec habits
Con_SafePrintf (" has loaded as hunk\n");
// dumb_load_mod_quick(trackname);
//dumbfile_open(trackname);
//DUMBFILE f = dumbfile_open_ex(fileinfo->data, duhfile);
// duhsong = dumb_read_mod_quick(*duhfile);
// duh_start_sigrenderer(duhsong, 0, 2, 0);
// Con_SafePrintf ("damn..\n");
// you don't have testeng so this will crash. get your own damn mod files
//duh = dumb_load_mod("testeng/sound/cdtracks/track004.mod");
if(thesong)
// duh = thesong->path;
//duh = dumb_load_mod("val/sound/cdtracks/phantom.it");
duh = dumb_load_s3m("val/sound/cdtracks/isotoxin.s3m");
if (!duh) {
Con_Printf("DUH OUCH! CAN NOT LOAD THE DUMB MOD!\n");
}
else
Con_Printf("YES..... I CAN\n");
sr = duh_start_sigrenderer(duh, 0, 2, 0);
if (!sr) {
unload_duh(duh);
Con_Printf("DUH OUCH! can't play into the dumb buffer! goh dumb it!\n");
}
else
Con_Printf("THE SIGRENDERER'S STARTED.\n");
//register_dumbfile_system(&duhfile);
}
#else
void DUMBHIJACK(int i, qboolean loop)
{
// no dumb, full intelligence.
return;
}
#endif
void Host_Autosavegame_f(void);
extern cvar_t *autosaver;
/*

22
renderer/r_main.c
View file

@ -281,10 +281,10 @@ void R_Init_Cvars (void)
r_virtualmode = Cvar_Get ("r_virtualmode", "0", CVAR_ARCHIVE |CVAR_ORIGINAL);
r_filter = Cvar_Get ("r_filter", "0", CVAR_ARCHIVE|CVAR_ORIGINAL);
r_shading = Cvar_Get ("r_shading", "1", CVAR_ARCHIVE |CVAR_ORIGINAL);
r_shading = Cvar_Get ("r_shading", "2", CVAR_ARCHIVE |CVAR_ORIGINAL);
r_lowworld = Cvar_Get ("r_lowworld", "0", CVAR_ARCHIVE |CVAR_ORIGINAL);
r_lowmodels = Cvar_Get ("r_lowmodels", "0", CVAR_ARCHIVE |CVAR_ORIGINAL);
r_coloredlights = Cvar_Get ("r_coloredlights", "0", CVAR_ARCHIVE |CVAR_ORIGINAL);
r_coloredlights = Cvar_Get ("r_coloredlights", "3", CVAR_ARCHIVE |CVAR_ORIGINAL);
r_coloredlightmethod = Cvar_Get ("r_coloredlightmethod", "0", CVAR_ARCHIVE |CVAR_ORIGINAL);
r_shiftlights = Cvar_Get ("r_shiftlights", "0", CVAR_ARCHIVE |CVAR_ORIGINAL);
r_particlesort = Cvar_Get ("r_particlesort", "1", CVAR_ARCHIVE |CVAR_ORIGINAL);
@ -298,28 +298,28 @@ void R_Init_Cvars (void)
r_coloreddyns = Cvar_Get ("r_coloreddyns", "0", CVAR_ARCHIVE |CVAR_ORIGINAL);
r_shift1 = Cvar_Get ("sh1", "1", CVAR_ORIGINAL); // debugging
r_shift2 = Cvar_Get ("sh2", "2", CVAR_ORIGINAL);
r_waterblend = Cvar_Get ("r_waterblend", "0", CVAR_ARCHIVE |CVAR_ORIGINAL);
r_tranquality = Cvar_Get ("r_tranquality", "0", CVAR_ARCHIVE |CVAR_ORIGINAL);
r_waterblend = Cvar_Get ("r_waterblend", "2", CVAR_ARCHIVE |CVAR_ORIGINAL);
r_tranquality = Cvar_Get ("r_tranquality", "1", CVAR_ARCHIVE |CVAR_ORIGINAL);
r_lightquality = Cvar_Get ("r_lightquality", "1", CVAR_ARCHIVE |CVAR_ORIGINAL);
r_shadequality = Cvar_Get ("r_shadequality", "0", CVAR_ARCHIVE |CVAR_ORIGINAL);
r_shadedither = Cvar_Get ("r_shadedither", "0", CVAR_ARCHIVE |CVAR_ORIGINAL);
r_shadedither = Cvar_Get ("r_shadedither", "1", CVAR_ARCHIVE |CVAR_ORIGINAL);
r_shinygrays = Cvar_Get ("r_shinygrays", "0", CVAR_ARCHIVE |CVAR_ORIGINAL);
r_dither = Cvar_Get ("r_dither", "0", CVAR_ARCHIVE |CVAR_ORIGINAL);
r_menucolor = Cvar_Get ("r_menucolor", "1",CVAR_ARCHIVE | CVAR_ORIGINAL);
r_alphashift = Cvar_Get ("r_alphashift", "0", CVAR_ORIGINAL);
r_lowworld = Cvar_Get ("r_lowworld", "0", CVAR_ARCHIVE |CVAR_ORIGINAL);
r_shadowhack = Cvar_Get ("r_shadowhack", "0", CVAR_ARCHIVE |CVAR_ORIGINAL);
r_shadowhack = Cvar_Get ("r_shadowhack", "1", CVAR_ARCHIVE |CVAR_ORIGINAL);
r_overbrightmdl = Cvar_Get ("r_overbrightmdl", "0", CVAR_ARCHIVE |CVAR_ORIGINAL);
r_particlespray = Cvar_Get ("r_particlespray", "0", CVAR_ARCHIVE |CVAR_ORIGINAL);
r_particleblood = Cvar_Get ("r_particleblood", "0", CVAR_ARCHIVE |CVAR_ORIGINAL);
r_particleblood = Cvar_Get ("r_particleblood", "2", CVAR_ARCHIVE |CVAR_ORIGINAL);
r_particlegunshot = Cvar_Get ("r_particlegunshot", "0", CVAR_ARCHIVE |CVAR_ORIGINAL);
r_particlesparks = Cvar_Get ("r_particlesparks", "0", CVAR_ARCHIVE |CVAR_ORIGINAL);
r_particletrails = Cvar_Get ("r_particletrails", "0", CVAR_ARCHIVE |CVAR_ORIGINAL);
r_particlebloodfade = Cvar_Get ("r_particlebloodfade", "0.5", CVAR_ARCHIVE |CVAR_ORIGINAL);
r_particletrans = Cvar_Get ("r_particletrans", "0", CVAR_ARCHIVE |CVAR_ORIGINAL);
r_particleset = Cvar_Get ("r_particleset", "0", CVAR_ARCHIVE |CVAR_ORIGINAL);
r_flares = Cvar_Get ("r_flares", "1", CVAR_ARCHIVE |CVAR_ORIGINAL);
r_flamehack = Cvar_Get ("r_flamehack", "0", CVAR_ARCHIVE |CVAR_ORIGINAL);
r_particletrans = Cvar_Get ("r_particletrans", "1", CVAR_ARCHIVE |CVAR_ORIGINAL);
r_particleset = Cvar_Get ("r_particleset", "2", CVAR_ARCHIVE |CVAR_ORIGINAL);
r_flares = Cvar_Get ("r_flares", "2", CVAR_ARCHIVE |CVAR_ORIGINAL);
r_flamehack = Cvar_Get ("r_flamehack", "2", CVAR_ARCHIVE |CVAR_ORIGINAL);
r_particlesprite = Cvar_Get ("r_particlesprite", "1", CVAR_ARCHIVE |CVAR_ORIGINAL);
r_muzzlehack = Cvar_Get ("r_muzzlehack", "0", CVAR_ARCHIVE |CVAR_ORIGINAL);
r_dynamic = Cvar_Get ("r_dynamic", "1", CVAR_ARCHIVE |CVAR_ORIGINAL);

1
tracker/tracker_fmodex.c
View file

@ -53,6 +53,7 @@ void FmodEx_Play(byte track, qboolean looping)
if (fmod_result != FMOD_OK)
{
Con_Printf("FmodEx: Can't load %s!\n", fmod_file);
FmodEx_Stop();
return;
}
}