rq3/reaction
0
0
Fork 0
mirror of https://github.com/ReactionQuake3/reaction.git synced 2024-11-11 15:52:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

Stuff

Browse source
This commit is contained in:
Andrei Drexler 2002-04-14 21:50:55 +00:00
parent 9cf60e4a0b
commit 96feac4b25
3 changed files with 50 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
reaction/game/ai_dmnet.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.15 2002/04/14 21:49:52 makro
// Stuff
//
// Revision 1.14 2002/04/06 21:42:19 makro
// Changes to bot code. New surfaceparm system.
//
@ -1586,7 +1589,7 @@ int AINode_Seek_ActivateEntity(bot_state_t *bs) {
//bs->activatestack->time = 0;
Cmd_OpenDoor( &g_entities[bs->entitynum] );
BotMoveTowardsEnt(bs, entinfo.origin, -64);
return qtrue;
return qfalse;
}
}

24
reaction/ta_ui/ui_main.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.16 2002/04/14 21:50:55 makro
// Stuff
//
// Revision 1.15 2002/04/07 17:51:49 makro
// Abbey
//
@ -3202,7 +3205,8 @@ static void UI_LoadDemos() {
if (!Q_stricmp(demoname + len - strlen(demoExt), demoExt)) {
demoname[len-strlen(demoExt)] = '\0';
}
Q_strupr(demoname);
//Makro - bad for linux users
//Q_strupr(demoname);
uiInfo.demoList[i] = String_Alloc(demoname);
demoname += len + 1;
}
@ -3449,6 +3453,10 @@ static void UI_RunMenuScript(char **args) {
trap_Cvar_SetValue( "g_gametype", Com_Clamp( 0, 8, uiInfo.gameTypes[ui_netGameType.integer].gtEnum ) );
trap_Cvar_Set("g_redTeam", UI_Cvar_VariableString("ui_teamName"));
trap_Cvar_Set("g_blueTeam", UI_Cvar_VariableString("ui_opponentName"));
//Makro - client password
if ( (int) trap_Cvar_VariableValue("dedicated") == 0 ) {
trap_Cvar_Set("password", UI_Cvar_VariableString("g_password"));
}
trap_Cmd_ExecuteText( EXEC_APPEND, va( "wait ; wait ; map %s\n", uiInfo.mapList[ui_currentNetMap.integer].mapLoadName ) );
skill = trap_Cvar_VariableValue( "g_spSkill" );
// set max clients based on spots
@ -3481,7 +3489,7 @@ static void UI_RunMenuScript(char **args) {
//if (ui_actualNetGameType.integer >= GT_TEAM) {
// Com_sprintf( buff, sizeof(buff), "addbot %s %f %s\n", uiInfo.characterList[bot-2].name, skill, "Blue");
//} else {
Com_sprintf( buff, sizeof(buff), "addbot %s %f \n", UI_GetBotNameByNumber(bot-2), skill);
Com_sprintf( buff, sizeof(buff), "wait; addbot %s %f \n", UI_GetBotNameByNumber(bot-2), skill);
//}
trap_Cmd_ExecuteText( EXEC_APPEND, buff );
}
@ -3491,7 +3499,7 @@ static void UI_RunMenuScript(char **args) {
//if (ui_actualNetGameType.integer >= GT_TEAM) {
// Com_sprintf( buff, sizeof(buff), "addbot %s %f %s\n", uiInfo.characterList[bot-2].name, skill, "Red");
//} else {
Com_sprintf( buff, sizeof(buff), "addbot %s %f \n", UI_GetBotNameByNumber(bot-2), skill);
Com_sprintf( buff, sizeof(buff), "wait; addbot %s %f \n", UI_GetBotNameByNumber(bot-2), skill);
//}
trap_Cmd_ExecuteText( EXEC_APPEND, buff );
}
@ -3589,7 +3597,10 @@ static void UI_RunMenuScript(char **args) {
trap_Cvar_Set( "fs_game", uiInfo.modList[uiInfo.modIndex].modName);
trap_Cmd_ExecuteText( EXEC_APPEND, "vid_restart;" );
} else if (Q_stricmp(name, "RunDemo") == 0) {
trap_Cmd_ExecuteText( EXEC_APPEND, va("demo %s\n", uiInfo.demoList[uiInfo.demoIndex]));
//Makro - missing check
if (uiInfo.demoIndex >= 0 && uiInfo.demoIndex < uiInfo.demoCount) {
trap_Cmd_ExecuteText( EXEC_APPEND, va("demo %s\n", uiInfo.demoList[uiInfo.demoIndex]));
}
} else if (Q_stricmp(name, "Quake3") == 0) {
trap_Cvar_Set( "fs_game", "");
trap_Cmd_ExecuteText( EXEC_APPEND, "vid_restart;" );
@ -3702,6 +3713,11 @@ static void UI_RunMenuScript(char **args) {
//Makro - don't add the bot instantly
trap_Cmd_ExecuteText( EXEC_APPEND, va("wait; addbot %s %i %s\n", UI_GetBotNameByNumber(uiInfo.botIndex), uiInfo.skillIndex+1, (uiInfo.redBlue == 0) ? "Red" : "Blue") );
//}
//Makro - add random bot
} else if (Q_stricmp(name, "addRandomBot") == 0) {
int index = (int) (random() * (float) (UI_GetNumBots() - 1));
//Makro - don't add the bot instantly
trap_Cmd_ExecuteText( EXEC_APPEND, va("wait; addbot %s %i %s\n", UI_GetBotNameByNumber(index), uiInfo.skillIndex+1, (uiInfo.redBlue == 0) ? "Red" : "Blue") );
} else if (Q_stricmp(name, "addFavorite") == 0) {
if (ui_netSource.integer != AS_FAVORITES) {
char name[MAX_NAME_LENGTH];

30
reaction/ta_ui/ui_shared.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.13 2002/04/14 21:50:55 makro
// Stuff
//
// Revision 1.12 2002/04/11 20:57:19 makro
// Tweaked onShow script handling; added onFirstShow script
//
@ -1461,6 +1464,11 @@ void Script_playLooped(itemDef_t *item, char **args) {
}
}
//Makro - stop background track
void Script_stopMusic(itemDef_t *item, char **args) {
DC->stopBackgroundTrack();
}
//Makro - timer scripts
void Script_StartTimer(itemDef_t *item, char **args) {
menuDef_t *menu = (menuDef_t*) item->parent;
@ -1514,6 +1522,8 @@ commandDef_t commandList[] =
{"exec", &Script_Exec}, // group/name
{"play", &Script_Play}, // group/name
{"playlooped", &Script_playLooped}, // group/name
//Makro - stop background track
{"stopMusic", &Script_stopMusic},
{"orbit", &Script_Orbit} // group/name
};
@ -2282,7 +2292,7 @@ qboolean Item_Multi_HandleKey(itemDef_t *item, int key) {
ok = qtrue;
}
} else {
if (key == K_ENTER || key == K_LEFTARROW || key == K_RIGHTARROW) {
if (key == K_ENTER || key == K_LEFTARROW || key == K_RIGHTARROW || key == K_HOME || key == K_END) {
ok = qtrue;
}
}
@ -2290,11 +2300,23 @@ qboolean Item_Multi_HandleKey(itemDef_t *item, int key) {
}
if (ok) {
int current = Item_Multi_FindCvarByValue(item) + 1;
int current;
int max = Item_Multi_CountSettings(item);
if (key == K_LEFTARROW) {
current -= 2;
switch (key) {
case K_LEFTARROW:
case K_MOUSE2:
current = Item_Multi_FindCvarByValue(item) - 1;
break;
case K_HOME:
current = 0;
break;
case K_END:
current = max-1;
break;
default:
current = Item_Multi_FindCvarByValue(item) + 1;
break;
}
if ( current < 0 ) {