mmo-ref/og-openarena-gamecode
1
0
Fork 0
mirror of https://github.com/OpenArena/gamecode synced 2026-08-20 18:23:03 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Toggleable missionpack checks. Disables team models and relevant checks interfering with testing. Some comments were also modified in order to work with SciTE."

Browse source 
This reverts commit fe4c340e35.
This commit is contained in:
Neon_Knight 2018-11-28 21:26:34 -03:00
parent fe4c340e35
commit b9a61dbe45
3 changed files with 41 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

36
code/cgame/cg_main.c
View file

@ -298,10 +298,6 @@ vmCvar_t cg_weaponBarStyle;
vmCvar_t cg_chatBeep;
vmCvar_t cg_teamChatBeep;
/* Neon_Knight: Missionpack checks toggle. Just because. */
vmCvar_t cg_missionpackChecks;
/* /Neon_Knight */
typedef struct {
vmCvar_t *vmCvar;
char *cvarName;
@ -514,9 +510,6 @@ static cvarTable_t cvarTable[] = {// bk001129
{&cg_chatBeep, "cg_chatBeep", "1", CVAR_ARCHIVE},
{&cg_teamChatBeep, "cg_teamChatBeep", "1", CVAR_ARCHIVE},
{ &cg_muzzleflashStyle, "cg_muzzleflashStyle", "1", CVAR_ARCHIVE}
/* Neon_Knight: Enables MP checks. */
{ &cg_missionpackChecks, "cg_missionpackChecks", "1", CVAR_ARCHIVE}
/* /Neon_Knight */
};
static int cvarTableSize = sizeof ( cvarTable) / sizeof ( cvarTable[0]);
@ -544,11 +537,8 @@ void CG_RegisterCvars(void) {
trap_Cvar_Register(NULL, "model", DEFAULT_MODEL, CVAR_USERINFO | CVAR_ARCHIVE);
trap_Cvar_Register(NULL, "headmodel", DEFAULT_MODEL, CVAR_USERINFO | CVAR_ARCHIVE);
if(cg_missionpackChecks.integer != 0)
{
trap_Cvar_Register(NULL, "team_model", DEFAULT_TEAM_MODEL, CVAR_USERINFO | CVAR_ARCHIVE);
trap_Cvar_Register(NULL, "team_headmodel", DEFAULT_TEAM_HEAD, CVAR_USERINFO | CVAR_ARCHIVE);
}
trap_Cvar_Register(NULL, "team_model", DEFAULT_TEAM_MODEL, CVAR_USERINFO | CVAR_ARCHIVE);
trap_Cvar_Register(NULL, "team_headmodel", DEFAULT_TEAM_HEAD, CVAR_USERINFO | CVAR_ARCHIVE);
}
/*
@ -1884,15 +1874,15 @@ void CG_ParseMenu(const char *menuFile) {
break;
}
/* if ( !Q_strequal( token, "{" ) ) {
Com_Printf( "Missing { in menu file\n" );
break;
} */
//if ( !Q_strequal( token, "{" ) ) {
// Com_Printf( "Missing { in menu file\n" );
// break;
//}
/* if ( menuCount == MAX_MENUS ) {
Com_Printf( "Too many menus!\n" );
break;
} */
//if ( menuCount == MAX_MENUS ) {
// Com_Printf( "Too many menus!\n" );
// break;
//}
if (token.string[0] == '}') {
break;
@ -2315,9 +2305,9 @@ void CG_LoadHudMenu(void) {
}
void CG_AssetCache(void) {
/* if (Assets.textFont == NULL) {
trap_R_RegisterFont("fonts/arial.ttf", 72, &Assets.textFont);
} */
//if (Assets.textFont == NULL) {
// trap_R_RegisterFont("fonts/arial.ttf", 72, &Assets.textFont);
//}
//Assets.background = trap_R_RegisterShaderNoMip( ASSET_BACKGROUND );
//Com_Printf("Menu Size: %i bytes\n", sizeof(Menus));
/*

24
code/cgame/cg_players.c
View file

@ -875,18 +875,16 @@ static void CG_LoadClientInfo(int clientNum, clientInfo_t *ci) {
}
// fall back to default team name
if (cgs.gametype != GT_FFA && cgs.gametype != GT_TOURNAMENT && cgs.gametype != GT_LMS && cgs.gametype != GT_POSSESSION) {
if (cgs.gametype >= GT_TEAM && cgs.ffa_gt != 1) {
// keep skin name
if (ci->team == TEAM_BLUE) {
Q_strncpyz(teamname, DEFAULT_BLUETEAM_NAME, sizeof (teamname));
} else {
Q_strncpyz(teamname, DEFAULT_REDTEAM_NAME, sizeof (teamname));
}
/* Neon_Knight: Toggleable cg_missionpackChecks */
if (!CG_RegisterClientModelname(ci, DEFAULT_TEAM_MODEL, ci->skinName, DEFAULT_TEAM_HEAD, ci->skinName, teamname) && cg_missionpackChecks.integer != 0) {
if (!CG_RegisterClientModelname(ci, DEFAULT_TEAM_MODEL, ci->skinName, DEFAULT_TEAM_HEAD, ci->skinName, teamname)) {
CG_Error("DEFAULT_TEAM_MODEL / skin (%s/%s) failed to register", DEFAULT_TEAM_MODEL, ci->skinName);
}
/* /Neon_Knight */
} else {
if (!CG_RegisterClientModelname(ci, DEFAULT_MODEL, "default", DEFAULT_MODEL, "default", teamname)) {
CG_Error("DEFAULT_MODEL (%s) failed to register", DEFAULT_MODEL);
@ -906,11 +904,7 @@ static void CG_LoadClientInfo(int clientNum, clientInfo_t *ci) {
// sounds
dir = ci->modelName;
/* Neon_Knight: Toggleable cg_missionpackChecks */
fallback = (cgs.gametype != GT_FFA && cgs.gametype != GT_TOURNAMENT &&
cgs.gametype != GT_LMS && cgs.gametype != GT_POSSESSION &&
cg_missionpackChecks.integer != 0) ? DEFAULT_TEAM_MODEL : DEFAULT_MODEL;
/* /Neon_Knight */
fallback = (cgs.gametype >= GT_TEAM && cgs.ffa_gt != 1) ? DEFAULT_TEAM_MODEL : DEFAULT_MODEL;
for (i = 0; i < MAX_CUSTOM_SOUNDS; i++) {
s = cg_customSoundNames[i];
@ -922,11 +916,9 @@ static void CG_LoadClientInfo(int clientNum, clientInfo_t *ci) {
if (modelloaded) {
ci->sounds[i] = trap_S_RegisterSound(va("sound/player/%s/%s", dir, s + 1), qfalse);
}
/* Neon_Knight: Toggleable cg_missionpackChecks */
if (!ci->sounds[i] && cg_missionpackChecks.integer != 0) {
if (!ci->sounds[i]) {
ci->sounds[i] = trap_S_RegisterSound(va("sound/player/%s/%s", fallback, s + 1), qfalse);
}
/* /Neon_Knight */
}
ci->deferred = qfalse;
@ -1151,9 +1143,7 @@ void CG_NewClientInfo(int clientNum) {
char modelStr[MAX_QPATH];
char *skin;
/* Neon_Knight: Toggleable cg_missionpackChecks */
if (cgs.gametype != GT_FFA && cgs.gametype != GT_TOURNAMENT && cgs.gametype != GT_LMS && cgs.gametype != GT_POSSESSION && cg_missionpackChecks.integer != 0) {
/* / Neon_Knight */
if (cgs.gametype >= GT_TEAM && cgs.ffa_gt != 1) {
Q_strncpyz(newInfo.modelName, DEFAULT_TEAM_MODEL, sizeof ( newInfo.modelName));
Q_strncpyz(newInfo.skinName, "default", sizeof ( newInfo.skinName));
} else {
@ -1197,9 +1187,7 @@ void CG_NewClientInfo(int clientNum) {
char modelStr[MAX_QPATH];
char *skin;
/* Neon_Knight: Toggleable cg_missionpackChecks */
if (cgs.gametype != GT_TEAM && cgs.gametype != GT_TOURNAMENT && cgs.gametype != GT_LMS && cgs.gametype != GT_POSSESSION && cg_missionpackChecks.integer != 0) {
/* /Neon_Knight */
if (cgs.gametype >= GT_TEAM && cgs.ffa_gt != 1) {
Q_strncpyz(newInfo.headModelName, DEFAULT_TEAM_MODEL, sizeof ( newInfo.headModelName));
Q_strncpyz(newInfo.headSkinName, "default", sizeof ( newInfo.headSkinName));
} else {

57
code/ui/ui_main.c
View file

@ -3830,29 +3830,18 @@ static void UI_StartSkirmish(qboolean next, char *name)
}
else {
temp = uiInfo.mapList[ui_currentMap.integer].teamMembers * 2;
/* Neon_Knight: Toggleable cg_missionpackChecks */
if(cg_missionpackChecks.integer != 0) {
trap_Cvar_Set("sv_maxClients", va("%i", temp));
for (i =0; i < uiInfo.mapList[ui_currentMap.integer].teamMembers; i++) {
Com_sprintf( buff, sizeof(buff), "addbot %s %f %s %i %s\n", UI_AIFromName(uiInfo.teamList[k].teamMembers[i]), skill, (g == GT_FFA) ? "" : "Blue", delay, uiInfo.teamList[k].teamMembers[i]);
trap_Cmd_ExecuteText( EXEC_APPEND, buff );
delay += 500;
}
k = UI_TeamIndexFromName(UI_Cvar_VariableString("ui_teamName"));
for (i =0; i < uiInfo.mapList[ui_currentMap.integer].teamMembers-1; i++) {
Com_sprintf( buff, sizeof(buff), "addbot %s %f %s %i %s\n", UI_AIFromName(uiInfo.teamList[k].teamMembers[i]), skill, (g == GT_FFA) ? "" : "Red", delay, uiInfo.teamList[k].teamMembers[i]);
trap_Cmd_ExecuteText( EXEC_APPEND, buff );
delay += 500;
}
}
else {
trap_Cvar_Set("sv_maxClients", va("%i", temp+2));
trap_Cvar_Set("bot_minplayers", va("%i", temp));
trap_Cvar_Set("skill", va("%f", skill));
Com_sprintf( buff, sizeof(buff), "wait ;\n");
trap_Cvar_Set("sv_maxClients", va("%d", temp));
for (i =0; i < uiInfo.mapList[ui_currentMap.integer].teamMembers; i++) {
Com_sprintf( buff, sizeof(buff), "addbot %s %f %s %i %s\n", UI_AIFromName(uiInfo.teamList[k].teamMembers[i]), skill, (g == GT_FFA) ? "" : "Blue", delay, uiInfo.teamList[k].teamMembers[i]);
trap_Cmd_ExecuteText( EXEC_APPEND, buff );
delay += 500;
}
k = UI_TeamIndexFromName(UI_Cvar_VariableString("ui_teamName"));
for (i =0; i < uiInfo.mapList[ui_currentMap.integer].teamMembers-1; i++) {
Com_sprintf( buff, sizeof(buff), "addbot %s %f %s %i %s\n", UI_AIFromName(uiInfo.teamList[k].teamMembers[i]), skill, (g == GT_FFA) ? "" : "Red", delay, uiInfo.teamList[k].teamMembers[i]);
trap_Cmd_ExecuteText( EXEC_APPEND, buff );
delay += 500;
}
/* /Neon_Knight */
}
if (g >= GT_TEAM ) {
trap_Cmd_ExecuteText( EXEC_APPEND, "wait 5; team Red\n" );
@ -4402,9 +4391,7 @@ static void UI_RunMenuScript(char **args)
}
}
else if (Q_strequal(name, "addBot") ) {
/* Neon_Knight: Toggleable cg_missionpackChecks */
if ((trap_Cvar_VariableValue("g_gametype") == GT_FFA || trap_Cvar_VariableValue("g_gametype") == GT_TOURNAMENT || trap_Cvar_VariableValue("g_gametype") == GT_LMS || trap_Cvar_VariableValue("g_gametype") == GT_POSSESSION) && cg_missionpackChecks.integer == 0) {
/* /Neon_Knight */
if (trap_Cvar_VariableValue("g_gametype") >= GT_TEAM || GT_LMS || GT_POSSESSION ) {
trap_Cmd_ExecuteText( EXEC_APPEND, va("addbot %s %i %s\n", uiInfo.characterList[uiInfo.botIndex].name, uiInfo.skillIndex+1, (uiInfo.redBlue == 0) ? "Red" : "Blue") );
}
else {
@ -5989,15 +5976,15 @@ static qboolean MapList_Parse(char **p)
}
}
/* mapList[mapCount].imageName = String_Alloc(va("levelshots/%s", mapList[mapCount].mapLoadName));
if (uiInfo.mapCount == 0) {
only load the first cinematic, selection loads the others
uiInfo.mapList[uiInfo.mapCount].cinematic = trap_CIN_PlayCinematic(va("%s.roq",uiInfo.mapList[uiInfo.mapCount].mapLoadName), qfalse, qfalse, qtrue, 0, 0, 0, 0);
} */
//mapList[mapCount].imageName = String_Alloc(va("levelshots/%s", mapList[mapCount].mapLoadName));
//if (uiInfo.mapCount == 0) {
// only load the first cinematic, selection loads the others
// uiInfo.mapList[uiInfo.mapCount].cinematic = trap_CIN_PlayCinematic(va("%s.roq",uiInfo.mapList[uiInfo.mapCount].mapLoadName), qfalse, qfalse, qtrue, 0, 0, 0, 0);
//}
uiInfo.mapList[uiInfo.mapCount].cinematic = -1;
/* uiInfo.mapList[uiInfo.mapCount].levelShot = trap_R_RegisterShaderNoMip(va("levelshots/%s_small", uiInfo.mapList[uiInfo.mapCount].mapLoadName)); */
/* leilei - We don't have _small levelshots, memory reasons */
/* if (!uiInfo.mapList[uiInfo.mapCount].levelShot) */
//uiInfo.mapList[uiInfo.mapCount].levelShot = trap_R_RegisterShaderNoMip(va("levelshots/%s_small", uiInfo.mapList[uiInfo.mapCount].mapLoadName));
// leilei - We don't have _small levelshots, memory reasons
//if (!uiInfo.mapList[uiInfo.mapCount].levelShot)
uiInfo.mapList[uiInfo.mapCount].levelShot = trap_R_RegisterShaderNoMip(va("levelshots/%s", uiInfo.mapList[uiInfo.mapCount].mapLoadName));
if (uiInfo.mapCount < MAX_MAPS) {
@ -6473,9 +6460,9 @@ void _UI_KeyEvent( int key, qboolean down )
}
}
/* if ((s > 0) && (s != menu_null_sound)) {
trap_S_StartLocalSound( s, CHAN_LOCAL_SOUND );
} */
//if ((s > 0) && (s != menu_null_sound)) {
// trap_S_StartLocalSound( s, CHAN_LOCAL_SOUND );
//}
}
/*