diff --git a/reaction/cgame/cg_main.c b/reaction/cgame/cg_main.c index 56bc0ffa..5666a956 100644 --- a/reaction/cgame/cg_main.c +++ b/reaction/cgame/cg_main.c @@ -5,6 +5,9 @@ //----------------------------------------------------------------------------- // // $Log$ +// Revision 1.121 2003/02/25 22:41:14 jbravo +// Fixed a bug in item replacements. Removed "Beta" from the version. +// // Revision 1.120 2003/02/16 21:39:09 makro // Fixed "timelimit is read only" on local servers error // @@ -2336,7 +2339,7 @@ void CG_ReplaceModels(void) Com_sprintf(RQ3_grenade_icon, MAX_MODEL_LEN, "icons/iconw_%s", cg_RQ3_grenade.string); if (JB_FileExists(RQ3_grenade_model) && (strlen(RQ3_grenade_model) < MAX_MODEL_LEN)) { bg_itemlist[item - bg_itemlist].world_model[0] = (char *)&RQ3_grenade_model; - bg_itemlist[item - bg_itemlist].world_model[0] = (char *)&RQ3_grenade_icon; + bg_itemlist[item - bg_itemlist].icon = (char *)&RQ3_grenade_icon; } else { CG_Printf("^1Error loading grenade replacement model %s\n", cg_RQ3_grenade.string); } @@ -2346,7 +2349,7 @@ void CG_ReplaceModels(void) Com_sprintf(RQ3_kevlar_icon, MAX_MODEL_LEN, "icons/iconi_%s", cg_RQ3_kevlar.string); if (JB_FileExists(RQ3_kevlar_model) && (strlen(RQ3_kevlar_model) < MAX_MODEL_LEN)) { bg_itemlist[item - bg_itemlist].world_model[0] = (char *)&RQ3_kevlar_model; - bg_itemlist[item - bg_itemlist].world_model[0] = (char *)&RQ3_kevlar_icon; + bg_itemlist[item - bg_itemlist].icon = (char *)&RQ3_kevlar_icon; } else { CG_Printf("^1Error loading kevlar replacement model %s\n", cg_RQ3_kevlar.string); } @@ -2356,7 +2359,7 @@ void CG_ReplaceModels(void) Com_sprintf(RQ3_silencer_icon, MAX_MODEL_LEN, "icons/iconi_%s", cg_RQ3_silencer.string); if (JB_FileExists(RQ3_silencer_model) && (strlen(RQ3_silencer_model) < MAX_MODEL_LEN)) { bg_itemlist[item - bg_itemlist].world_model[0] = (char *)&RQ3_silencer_model; - bg_itemlist[item - bg_itemlist].world_model[0] = (char *)&RQ3_silencer_icon; + bg_itemlist[item - bg_itemlist].icon = (char *)&RQ3_silencer_icon; } else { CG_Printf("^1Error loading silencer replacement model %s\n", cg_RQ3_silencer.string); } @@ -2366,7 +2369,7 @@ void CG_ReplaceModels(void) Com_sprintf(RQ3_laser_icon, MAX_MODEL_LEN, "icons/iconi_%s", cg_RQ3_laser.string); if (JB_FileExists(RQ3_laser_model) && (strlen(RQ3_laser_model) < MAX_MODEL_LEN)) { bg_itemlist[item - bg_itemlist].world_model[0] = (char *)&RQ3_laser_model; - bg_itemlist[item - bg_itemlist].world_model[0] = (char *)&RQ3_laser_icon; + bg_itemlist[item - bg_itemlist].icon = (char *)&RQ3_laser_icon; } else { CG_Printf("^1Error loading laser replacement model %s\n", cg_RQ3_laser.string); } @@ -2376,7 +2379,7 @@ void CG_ReplaceModels(void) Com_sprintf(RQ3_bandolier_icon, MAX_MODEL_LEN, "icons/iconi_%s", cg_RQ3_bandolier.string); if (JB_FileExists(RQ3_bandolier_model) && (strlen(RQ3_bandolier_model) < MAX_MODEL_LEN)) { bg_itemlist[item - bg_itemlist].world_model[0] = (char *)&RQ3_bandolier_model; - bg_itemlist[item - bg_itemlist].world_model[0] = (char *)&RQ3_bandolier_icon; + bg_itemlist[item - bg_itemlist].icon = (char *)&RQ3_bandolier_icon; } else { CG_Printf("^1Error loading bandolier replacement model %s\n", cg_RQ3_bandolier.string); } @@ -2386,7 +2389,7 @@ void CG_ReplaceModels(void) Com_sprintf(RQ3_slippers_icon, MAX_MODEL_LEN, "icons/iconi_%s", cg_RQ3_slippers.string); if (JB_FileExists(RQ3_slippers_model) && (strlen(RQ3_slippers_model) < MAX_MODEL_LEN)) { bg_itemlist[item - bg_itemlist].world_model[0] = (char *)&RQ3_slippers_model; - bg_itemlist[item - bg_itemlist].world_model[0] = (char *)&RQ3_slippers_icon; + bg_itemlist[item - bg_itemlist].icon = (char *)&RQ3_slippers_icon; } else { CG_Printf("^1Error loading slippers replacement model %s\n", cg_RQ3_slippers.string); } @@ -2396,7 +2399,7 @@ void CG_ReplaceModels(void) Com_sprintf(RQ3_helmet_icon, MAX_MODEL_LEN, "icons/iconi_%s", cg_RQ3_helmet.string); if (JB_FileExists(RQ3_helmet_model) && (strlen(RQ3_helmet_model) < MAX_MODEL_LEN)) { bg_itemlist[item - bg_itemlist].world_model[0] = (char *)&RQ3_helmet_model; - bg_itemlist[item - bg_itemlist].world_model[0] = (char *)&RQ3_helmet_icon; + bg_itemlist[item - bg_itemlist].icon = (char *)&RQ3_helmet_icon; } else { CG_Printf("^1Error loading helmet replacement model %s\n", cg_RQ3_helmet.string); } diff --git a/reaction/game/g_main.c b/reaction/game/g_main.c index d259fb32..4b5eb164 100644 --- a/reaction/game/g_main.c +++ b/reaction/game/g_main.c @@ -5,6 +5,9 @@ //----------------------------------------------------------------------------- // // $Log$ +// Revision 1.131 2003/02/25 22:41:14 jbravo +// Fixed a bug in item replacements. Removed "Beta" from the version. +// // Revision 1.130 2003/02/05 04:31:20 niceass // allow "illegal models" (no rq3models.cfg) in devmap. damn modellers never include them. // @@ -644,7 +647,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", "Beta 2.3", CVAR_SERVERINFO | CVAR_SYSTEMINFO | CVAR_ROM, 0, qfalse}, + {&g_RQ3_version, "g_RQ3_version", "2.3", CVAR_SERVERINFO | CVAR_SYSTEMINFO | CVAR_ROM, 0, qfalse}, //Makro - max votes per client {&g_RQ3_maxClientVotes, "g_RQ3_maxClientVotes", "3", CVAR_ARCHIVE, 0, qfalse} }; diff --git a/reaction/ta_ui/ui_main.c b/reaction/ta_ui/ui_main.c index 8df1a0d3..7b570e4b 100644 --- a/reaction/ta_ui/ui_main.c +++ b/reaction/ta_ui/ui_main.c @@ -5,6 +5,9 @@ //----------------------------------------------------------------------------- // // $Log$ +// Revision 1.61 2003/02/25 22:41:14 jbravo +// Fixed a bug in item replacements. Removed "Beta" from the version. +// // Revision 1.60 2003/02/16 21:39:10 makro // Fixed "timelimit is read only" on local servers error // @@ -4981,7 +4984,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 Beta 2.3 *** "); + strcpy(uiInfo.serverStatus.motd, " *** Welcome to Reaction Quake 3 v2.3 *** "); len = strlen(uiInfo.serverStatus.motd); } if (len != uiInfo.serverStatus.motdLen) { diff --git a/reaction/uifiles/credit.menu b/reaction/uifiles/credit.menu index aeed3376..ad356e88 100644 --- a/reaction/uifiles/credit.menu +++ b/reaction/uifiles/credit.menu @@ -132,7 +132,7 @@ textscale .45 textalignx 220 textaligny 100 - text "REACTION QUAKE 3 BETA 2.3" + text "REACTION QUAKE 3 v2.3" autowrapped visible 1 decoration diff --git a/reaction/uifiles/main.menu b/reaction/uifiles/main.menu index 726871f0..4587b948 100644 --- a/reaction/uifiles/main.menu +++ b/reaction/uifiles/main.menu @@ -148,7 +148,7 @@ itemDef { name copyright autowrapped - text "Reaction Quake 3 Beta 2.3\n" + text "Reaction Quake 3 v2.3\n" "Copyright (c) 2000 - 2003 Reaction Quake 3 Team\n" "Quake III Arena (c) 1999 - 2000 id Software Inc." style 0