q3rally-team/q3rally
0
0
Fork 0
mirror of https://github.com/Q3Rally-Team/q3rally.git synced 2024-11-21 11:31:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Something from me

Browse source 
— Removed haze.ogg. It was temporary music for q3r_babel.
— Added a vignette with noise on the map loading screen.
— Added support for multiple music tracks in the main menu.
— Fixed strncpy error in ui_menu.c appearing during build compie.
— Version update. Looks like version 0.5 will slowly be done without P3rle. I miss him so much.

Ah yes, I'm not a coder.
This commit is contained in:
insellium 2023-12-16 12:44:58 +05:00
parent 47893b81f9
commit 6a9e2fdb0b
8 changed files with 25 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
baseq3r/music/Rockabuddy.ogg
View file

Binary file not shown.

BIN
baseq3r/music/haze.ogg
View file

Binary file not shown.

0
baseq3r/music/q3r_menumusic.ogg → baseq3r/music/menumusic01.ogg
View file

4
baseq3r/scripts/gfx.shader
View file

@ -96,7 +96,7 @@ menuback
nomipmaps
{
map textures/sfx/logo512.tga
map textures/sfx/menucar01.tga
}
@ -127,7 +127,7 @@ menubackRagePro // blends turn to shit on rage pro, so skip it
nopicmip
nomipmaps
{
map textures/sfx/logo512.tga
map textures/sfx/menucar01.tga
}
}

BIN
baseq3r/textures/sfx/detail.tga Normal file
View file

Binary file not shown.

2
engine/code/cgame/cg_info.c
View file

@ -177,7 +177,7 @@ void CG_DrawInformation( void ) {
// blend a detail texture over it
detail = trap_R_RegisterShader( "levelShotDetail" );
trap_R_DrawStretchPic( 0, 0, cgs.glconfig.vidWidth, cgs.glconfig.vidHeight, 0, 0, 2.5, 2, detail );
trap_R_DrawStretchPic( 0, 0, cgs.glconfig.vidWidth, cgs.glconfig.vidHeight, 0, 0, 1, 1, detail );
// draw the icons of things as they are loaded
CG_DrawLoadingIcons();

35
engine/code/q3_ui/ui_menu.c
View file

@ -145,13 +145,13 @@ static void MainMenu_BuildList( void )
// choose one from list randomly
if (numItems){
car = (int)(UI_Random() * numItems);
strncpy(carName, cars[car], sizeof(carName));
strncpy(carName, cars[car], sizeof(carName) - 1);
carName[sizeof(carName) - 1] = '\0';
}
else {
strncpy(carName, DEFAULT_MODEL, sizeof(carName) - 1);
carName[sizeof(carName) - 1] = '\0';
}
else
strncpy(carName, DEFAULT_MODEL, sizeof(carName));
// Com_Printf("car: %d, numItems %d\n", car, numItems);
// Com_Printf("carName: %s\n", carName);
// get skins for the choosen car
numItems = UI_BuildFileList( va("models/players/%s", carName), "skin", "", qtrue, qfalse, qfalse, 0, cars);
@ -159,13 +159,13 @@ static void MainMenu_BuildList( void )
// choose a skin from the list randomly
if (numItems){
skin = UI_Random() * numItems;
strncpy(skinName, cars[skin], sizeof(skinName));
strncpy(skinName, cars[skin], sizeof(skinName) - 1);
skinName[sizeof(skinName) - 1] = '\0';
}
else {
strncpy(skinName, DEFAULT_SKIN, sizeof(skinName) - 1);
skinName[sizeof(skinName) - 1] = '\0';
}
else
strncpy(skinName, DEFAULT_SKIN, sizeof(skinName));
// Com_Printf("skin: %d, numItems %d\n", skin, numItems);
// Com_Printf("skinName: %s\n", skinName);
// FIXME: choose rim randomly?
Com_sprintf(s_main.modelskin, sizeof(s_main.modelskin), "%s/%s", carName, skinName);
@ -493,7 +493,14 @@ void UI_MainMenu( void ) {
// int style = UI_CENTER | UI_DROPSHADOW;
int style = UI_RIGHT | UI_DROPSHADOW;
trap_Cmd_ExecuteText( EXEC_APPEND, "music music/q3r_menumusic\n" );
int numMusicFiles, selectedMusic;
char musicFiles[256][MAX_QPATH];
char musicCommand[MAX_QPATH];
numMusicFiles = UI_BuildFileList("music", "ogg", "menumusic", qtrue, qfalse, qfalse, 0, musicFiles);
selectedMusic = (int)(UI_Random() * numMusicFiles);
Com_sprintf(musicCommand, sizeof(musicCommand), "music music/menumusic%s\n", musicFiles[selectedMusic]);
trap_Cmd_ExecuteText(EXEC_APPEND, musicCommand);
// END
trap_Cvar_Set( "sv_killserver", "1" );
@ -522,7 +529,7 @@ void UI_MainMenu( void ) {
s_main.banner.generic.flags = QMF_INACTIVE;
s_main.banner.generic.x = 320;
s_main.banner.generic.y = 17;
s_main.banner.string = "Q 3 R A L L Y";
s_main.banner.string = "Q3RALLY STANDALONE";
s_main.banner.color = text_color_normal;
s_main.banner.style = UI_CENTER|UI_DROPSHADOW;

2
engine/code/qcommon/q_shared.h
View file

@ -70,7 +70,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#define BASETA "missionpack"
#ifndef PRODUCT_VERSION
#define PRODUCT_VERSION "v0.4_r520"
#define PRODUCT_VERSION "v0.5_r581"
#endif