diff --git a/baseq3r/music/Rockabuddy.ogg b/baseq3r/music/Rockabuddy.ogg index f4c69125..7f5a83d9 100644 Binary files a/baseq3r/music/Rockabuddy.ogg and b/baseq3r/music/Rockabuddy.ogg differ diff --git a/baseq3r/music/haze.ogg b/baseq3r/music/haze.ogg deleted file mode 100644 index 46a8dea4..00000000 Binary files a/baseq3r/music/haze.ogg and /dev/null differ diff --git a/baseq3r/music/q3r_menumusic.ogg b/baseq3r/music/menumusic01.ogg similarity index 100% rename from baseq3r/music/q3r_menumusic.ogg rename to baseq3r/music/menumusic01.ogg diff --git a/baseq3r/scripts/gfx.shader b/baseq3r/scripts/gfx.shader index cfc565bb..ad7d2336 100644 --- a/baseq3r/scripts/gfx.shader +++ b/baseq3r/scripts/gfx.shader @@ -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 } } diff --git a/baseq3r/textures/sfx/detail.tga b/baseq3r/textures/sfx/detail.tga new file mode 100644 index 00000000..11020564 Binary files /dev/null and b/baseq3r/textures/sfx/detail.tga differ diff --git a/engine/code/cgame/cg_info.c b/engine/code/cgame/cg_info.c index f46a35d4..94a8c424 100644 --- a/engine/code/cgame/cg_info.c +++ b/engine/code/cgame/cg_info.c @@ -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(); diff --git a/engine/code/q3_ui/ui_menu.c b/engine/code/q3_ui/ui_menu.c index 3d6053ea..b65b562c 100644 --- a/engine/code/q3_ui/ui_menu.c +++ b/engine/code/q3_ui/ui_menu.c @@ -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; diff --git a/engine/code/qcommon/q_shared.h b/engine/code/qcommon/q_shared.h index 8d41f785..5020ea00 100644 --- a/engine/code/qcommon/q_shared.h +++ b/engine/code/qcommon/q_shared.h @@ -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