mirror of
https://github.com/ReactionQuake3/reaction.git
synced 2024-11-10 23:32:06 +00:00
grenade replacement fix. Version bumped to 3.1
This commit is contained in:
parent
d2f12294f3
commit
b27ca7ff32
4 changed files with 20 additions and 8 deletions
|
@ -5,6 +5,9 @@
|
|||
//-----------------------------------------------------------------------------
|
||||
//
|
||||
// $Log$
|
||||
// Revision 1.117 2003/04/26 15:23:57 jbravo
|
||||
// grenade replacement fix. Version bumped to 3.1
|
||||
//
|
||||
// Revision 1.116 2003/04/13 21:58:00 slicer
|
||||
// Added a Zoom Sensitivity Lock during fire sequence of ssg; removed unnecessary code
|
||||
//
|
||||
|
@ -1024,8 +1027,11 @@ void CG_RegisterWeapon(int weaponNum)
|
|||
break;
|
||||
|
||||
case WP_GRENADE:
|
||||
trap_Cvar_VariableStringBuffer("cg_RQ3_grenade", str, sizeof(str));
|
||||
model = modelFromStr(str);
|
||||
skin = skinFromStr(str);
|
||||
//Use the projectile model
|
||||
weaponInfo->missileModel = trap_R_RegisterModel("models/weapons2/grenade/gren_projectile.md3");
|
||||
weaponInfo->missileModel = trap_R_RegisterModel(va("models/weapons2/%s/gren_projectile.md3", model));
|
||||
weaponInfo->wiTrailTime = 700;
|
||||
weaponInfo->trailRadius = 32;
|
||||
MAKERGB(weaponInfo->flashDlightColor, 1, 0.70f, 0);
|
||||
|
@ -1033,9 +1039,6 @@ void CG_RegisterWeapon(int weaponNum)
|
|||
//cgs.media.grenadeExplosionShader = trap_R_RegisterShader( "grenadeExplosion" );
|
||||
// JBravo: skin replacements
|
||||
// Makro - no longer using skin cvars
|
||||
trap_Cvar_VariableStringBuffer("cg_RQ3_grenade", str, sizeof(str));
|
||||
model = modelFromStr(str);
|
||||
skin = skinFromStr(str);
|
||||
if (strcmp(skin, "default")) {
|
||||
weaponInfo->customSkin = trap_R_RegisterSkin (va("models/weapons2/%s/%s.skin", model, skin));
|
||||
if (!weaponInfo->customSkin) {
|
||||
|
|
|
@ -5,6 +5,9 @@
|
|||
//-----------------------------------------------------------------------------
|
||||
//
|
||||
// $Log$
|
||||
// Revision 1.106 2003/04/26 15:23:57 jbravo
|
||||
// grenade replacement fix. Version bumped to 3.1
|
||||
//
|
||||
// Revision 1.105 2003/04/06 18:29:36 makro
|
||||
// SSG crosshairs
|
||||
//
|
||||
|
@ -1533,7 +1536,7 @@ qboolean BG_PlayerTouchesItem(playerState_t * ps, entityState_t * item, int atTi
|
|||
//Makro - moved from the UI/cgame header files
|
||||
#define NUM_CROSSHAIRS 10
|
||||
//Makro - for the SSG crosshair preview
|
||||
#define NUM_SSGCROSSHAIRS 12
|
||||
#define NUM_SSGCROSSHAIRS 17
|
||||
|
||||
int GetMaterialFromFlag(int flag);
|
||||
qboolean IsMetalMat(int Material);
|
||||
|
|
|
@ -5,6 +5,9 @@
|
|||
//-----------------------------------------------------------------------------
|
||||
//
|
||||
// $Log$
|
||||
// Revision 1.146 2003/04/26 15:23:57 jbravo
|
||||
// grenade replacement fix. Version bumped to 3.1
|
||||
//
|
||||
// Revision 1.145 2003/04/26 02:03:51 jbravo
|
||||
// Helmet fixes
|
||||
//
|
||||
|
@ -704,7 +707,7 @@ static cvarTable_t gameCvarTable[] = {
|
|||
{&g_RQ3_NextMapID, "g_RQ3_NextMapID", "-1", CVAR_SYSTEMINFO, 0, qfalse},
|
||||
{&g_RQ3_NextMap, "g_RQ3_NextMap", "", CVAR_SYSTEMINFO, 0, qfalse},
|
||||
//Makro - for server browsers
|
||||
{&g_RQ3_version, "g_RQ3_version", "3.0", CVAR_SERVERINFO | CVAR_SYSTEMINFO | CVAR_ROM, 0, qfalse},
|
||||
{&g_RQ3_version, "g_RQ3_version", "3.1", CVAR_SERVERINFO | CVAR_SYSTEMINFO | CVAR_ROM, 0, qfalse},
|
||||
//Makro - max votes per client
|
||||
{&g_RQ3_maxClientVotes, "g_RQ3_maxClientVotes", "3", CVAR_ARCHIVE, 0, qfalse}
|
||||
};
|
||||
|
@ -1246,7 +1249,7 @@ void G_InitGame(int levelTime, int randomSeed, int restart)
|
|||
// need smashing :)
|
||||
if (trap_Cvar_VariableIntegerValue("sv_floodprotect") != 0) {
|
||||
trap_Cvar_Set("sv_floodprotect", "0");
|
||||
G_Printf("sv_floodprotect shut off for RQ3 Release 1.\n");
|
||||
// G_Printf("sv_floodprotect shut off for RQ3 Release 1.\n");
|
||||
}
|
||||
|
||||
SaveRegisteredItems();
|
||||
|
|
|
@ -5,6 +5,9 @@
|
|||
//-----------------------------------------------------------------------------
|
||||
//
|
||||
// $Log$
|
||||
// Revision 1.77 2003/04/26 15:23:57 jbravo
|
||||
// grenade replacement fix. Version bumped to 3.1
|
||||
//
|
||||
// Revision 1.76 2003/04/26 10:37:02 slicer
|
||||
// Small fix from "radio imhit" to "radio im_hit"
|
||||
//
|
||||
|
@ -5709,7 +5712,7 @@ static void UI_BuildServerDisplayList(qboolean force)
|
|||
if (len == 0) {
|
||||
//Makro - changing from Team Arena to RQ3 beta2
|
||||
//strcpy(uiInfo.serverStatus.motd, "Welcome to Team Arena!");
|
||||
strcpy(uiInfo.serverStatus.motd, " *** Welcome to Reaction Quake 3 v3.0 *** ");
|
||||
strcpy(uiInfo.serverStatus.motd, " *** Welcome to Reaction Quake 3 v3.1 *** ");
|
||||
len = strlen(uiInfo.serverStatus.motd);
|
||||
}
|
||||
if (len != uiInfo.serverStatus.motdLen) {
|
||||
|
|
Loading…
Reference in a new issue