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

Abbey

Browse source
This commit is contained in:
Andrei Drexler 2002-04-07 17:51:49 +00:00
parent fa9dbe5e75
commit 23f02bf740
3 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
reaction/game/g_client.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.64 2002/04/07 17:50:54 makro
// Abbey
//
// Revision 1.63 2002/04/07 12:49:10 slicer
// Added 'teamname' command for MM, and tweaked the cvar system.
//
@ -943,8 +946,9 @@ void ClientUserinfoChanged( int clientNum ) {
skin2 = "default";
}
if ( Q_stricmpn(model2, "grunt", sizeof(model2) ) ) {
trap_SendServerCommand( ent-g_entities, va("print \"Illegal player model. Forcing change on server.\n\""));
// Makro - adding abbey
if ( Q_stricmpn(model2, "grunt", sizeof(model2)) && Q_stricmpn(model2, "abbey", sizeof(model2))) {
trap_SendServerCommand( ent-g_entities, va("print \"Illegal player model (%s). Forcing change on server.\n\"", model2));
Q_strncpyz(model, "grunt/resdog", sizeof("grunt/resdog"));
Q_strncpyz(headModel, "grunt/resdog", sizeof("grunt/resdog"));
}

6
reaction/ta_ui/ui_atoms.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.9 2002/04/07 17:51:49 makro
// Abbey
//
// Revision 1.8 2002/03/31 13:23:26 makro
// Cleaned things up a little
//
@ -495,7 +498,8 @@ qboolean UI_ConsoleCommand( int realTime ) {
memset(text, 0, sizeof(text));
if (trap_Argc() == 1) {
Q_strcat(text, sizeof(text), "INFO: Testing error menu. Type 'error [msg]' in the console with developer set to 1 to see this screen");
//Q_strcat(text, sizeof(text), "INFO: Testing error menu. Type 'error [msg]' in the console with developer set to 1 to see this screen");
Q_strcat(text, sizeof(text), "Could not download \"maps/reactionmall.pk3\" because autodownloading is disabled on the server\n\nThe server you are connecting to is not a pure server, set autodownload to No in your settings and you might be able to join the game anyway.\n");
} else {
Q_strncpyz(text, UI_Argv(1), sizeof(text));
}

6
reaction/ta_ui/ui_main.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.15 2002/04/07 17:51:49 makro
// Abbey
//
// Revision 1.14 2002/04/06 21:40:59 makro
// Delayed in-game bot adds. Fixed a small bug in the key
// handling code for bot names.
@ -5291,7 +5294,8 @@ static void UI_BuildQ3Model_List( void )
continue;
// NiceAss:
if (strcmp(dirptr,"grunt"))
// Makro - added abbey
if (strcmp(dirptr,"grunt") && strcmp(dirptr, "abbey"))
continue;
// iterate all skin files in directory