diff options
| -rw-r--r-- | src/cgame/cg_draw.c | 47 | ||||
| -rw-r--r-- | src/cgame/cg_local.h | 23 | ||||
| -rw-r--r-- | src/cgame/cg_main.c | 4 | ||||
| -rw-r--r-- | src/cgame/cg_servercmds.c | 83 | ||||
| -rw-r--r-- | src/client/cl_main.c | 3 | ||||
| -rw-r--r-- | src/game/bg_misc.c | 51 | ||||
| -rw-r--r-- | src/game/bg_public.h | 2 | ||||
| -rw-r--r-- | src/game/g_combat.c | 12 | ||||
| -rw-r--r-- | src/game/tremulous.h | 26 | ||||
| -rw-r--r-- | ui/menudef.h | 3 |
10 files changed, 85 insertions, 169 deletions
diff --git a/src/cgame/cg_draw.c b/src/cgame/cg_draw.c index 43f5e0fc..3cb74ab0 100644 --- a/src/cgame/cg_draw.c +++ b/src/cgame/cg_draw.c @@ -36,9 +36,6 @@ int drawTeamOverlayModificationCount = -1; int sortedTeamPlayers[ TEAM_MAXOVERLAY ]; int numSortedTeamPlayers; -char systemChat[ 256 ]; -char teamChat1[ 256 ]; -char teamChat2[ 256 ]; //TA UI int CG_Text_Width( const char *text, float scale, int limit ) @@ -523,26 +520,6 @@ static void CG_DrawProgressBar( rectDef_t *rect, vec4_t color, float scale, //=============== TA: was cg_newdraw.c -void CG_InitTeamChat( void ) -{ - memset( teamChat1, 0, sizeof( teamChat1 ) ); - memset( teamChat2, 0, sizeof( teamChat2 ) ); - memset( systemChat, 0, sizeof( systemChat ) ); -} - -void CG_SetPrintString( int type, const char *p ) -{ - if( type == SYSTEM_PRINT ) - { - strcpy( systemChat, p ); - } - else - { - strcpy( teamChat2, teamChat1 ); - strcpy( teamChat1, p ); - } -} - #define NO_CREDITS_TIME 2000 static void CG_DrawPlayerCreditsValue( rectDef_t *rect, vec4_t color, qboolean padding ) @@ -1477,21 +1454,6 @@ float CG_GetValue( int ownerDraw ) return -1; } -static void CG_DrawAreaSystemChat( rectDef_t *rect, float scale, vec4_t color, qhandle_t shader ) -{ - CG_Text_Paint( rect->x, rect->y + rect->h, scale, color, systemChat, 0, 0, 0 ); -} - -static void CG_DrawAreaTeamChat( rectDef_t *rect, float scale, vec4_t color, qhandle_t shader ) -{ - CG_Text_Paint( rect->x, rect->y + rect->h, scale, color,teamChat1, 0, 0, 0 ); -} - -static void CG_DrawAreaChat(rectDef_t *rect, float scale, vec4_t color, qhandle_t shader) -{ - CG_Text_Paint(rect->x, rect->y + rect->h, scale, color, teamChat2, 0, 0, 0); -} - const char *CG_GetKillerText( ) { const char *s = ""; @@ -2712,15 +2674,6 @@ void CG_OwnerDraw( float x, float y, float w, float h, float text_x, case CG_PLAYER_USABLE_BUILDABLE: CG_DrawUsableBuildable( &rect, shader, color ); break; - case CG_AREA_SYSTEMCHAT: - CG_DrawAreaSystemChat( &rect, scale, color, shader ); - break; - case CG_AREA_TEAMCHAT: - CG_DrawAreaTeamChat( &rect, scale, color, shader ); - break; - case CG_AREA_CHAT: - CG_DrawAreaChat( &rect, scale, color, shader ); - break; case CG_KILLER: CG_DrawKiller( &rect, scale, color, shader, textStyle ); break; diff --git a/src/cgame/cg_local.h b/src/cgame/cg_local.h index 613dc98a..80581e8d 100644 --- a/src/cgame/cg_local.h +++ b/src/cgame/cg_local.h @@ -70,9 +70,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define CHAR_HEIGHT 48 #define TEXT_ICON_SPACE 4 -#define TEAMCHAT_WIDTH 80 -#define TEAMCHAT_HEIGHT 8 - // very large characters #define GIANT_WIDTH 32 #define GIANT_HEIGHT 48 @@ -1347,12 +1344,6 @@ typedef struct //TA: corpse info clientInfo_t corpseinfo[ MAX_CLIENTS ]; - // teamchat width is *3 because of embedded color codes - char teamChatMsgs[ TEAMCHAT_HEIGHT ][ TEAMCHAT_WIDTH * 3 + 1 ]; - int teamChatMsgTimes[ TEAMCHAT_HEIGHT ]; - int teamChatPos; - int teamLastChatPos; - int cursorX; int cursorY; qboolean eventHandling; @@ -1443,8 +1434,6 @@ extern vmCvar_t cg_stereoSeparation; extern vmCvar_t cg_lagometer; extern vmCvar_t cg_drawAttacker; extern vmCvar_t cg_synchronousClients; -extern vmCvar_t cg_teamChatTime; -extern vmCvar_t cg_teamChatHeight; extern vmCvar_t cg_stats; extern vmCvar_t cg_forceModel; extern vmCvar_t cg_buildScript; @@ -1583,9 +1572,6 @@ qboolean CG_WorldToScreen( vec3_t point, float *x, float *y ); // extern int sortedTeamPlayers[ TEAM_MAXOVERLAY ]; extern int numSortedTeamPlayers; -extern char systemChat[ 256 ]; -extern char teamChat1[ 256 ]; -extern char teamChat2[ 256 ]; void CG_AddLagometerFrameInfo( void ); void CG_AddLagometerSnapshotInfo( snapshot_t *snap ); @@ -1600,7 +1586,6 @@ int CG_Text_Height( const char *text, float scale, int limit ); float CG_GetValue(int ownerDraw); void CG_RunMenuScript(char **args); void CG_SetPrintString( int type, const char *p ); -void CG_InitTeamChat( void ); void CG_GetTeamColor( vec4_t *color ); const char *CG_GetKillerText( void ); void CG_Text_PaintChar( float x, float y, float width, float height, float scale, @@ -2027,14 +2012,6 @@ void trap_Key_KeynumToStringBuf( int keynum, char *buf, int buflen ); void trap_Key_GetBindingBuf( int keynum, char *buf, int buflen ); void trap_Key_SetBinding( int keynum, const char *binding ); -typedef enum -{ - SYSTEM_PRINT, - CHAT_PRINT, - TEAMCHAT_PRINT -} q3print_t; - - int trap_CIN_PlayCinematic( const char *arg0, int xpos, int ypos, int width, int height, int bits ); e_status trap_CIN_StopCinematic( int handle ); e_status trap_CIN_RunCinematic( int handle ); diff --git a/src/cgame/cg_main.c b/src/cgame/cg_main.c index db4134c0..7c868b56 100644 --- a/src/cgame/cg_main.c +++ b/src/cgame/cg_main.c @@ -167,8 +167,6 @@ vmCvar_t cg_stereoSeparation; vmCvar_t cg_lagometer; vmCvar_t cg_drawAttacker; vmCvar_t cg_synchronousClients; -vmCvar_t cg_teamChatTime; -vmCvar_t cg_teamChatHeight; vmCvar_t cg_stats; vmCvar_t cg_buildScript; vmCvar_t cg_forceModel; @@ -309,8 +307,6 @@ static cvarTable_t cvarTable[ ] = { &cg_thirdPersonRange, "cg_thirdPersonRange", "40", CVAR_CHEAT }, { &cg_thirdPersonAngle, "cg_thirdPersonAngle", "0", CVAR_CHEAT }, { &cg_thirdPerson, "cg_thirdPerson", "0", CVAR_CHEAT }, - { &cg_teamChatTime, "cg_teamChatTime", "3000", CVAR_ARCHIVE }, - { &cg_teamChatHeight, "cg_teamChatHeight", "0", CVAR_ARCHIVE }, { &cg_forceModel, "cg_forceModel", "0", CVAR_ARCHIVE }, { &cg_predictItems, "cg_predictItems", "1", CVAR_ARCHIVE }, { &cg_deferPlayers, "cg_deferPlayers", "1", CVAR_ARCHIVE }, diff --git a/src/cgame/cg_servercmds.c b/src/cgame/cg_servercmds.c index b30cae4d..60d6deba 100644 --- a/src/cgame/cg_servercmds.c +++ b/src/cgame/cg_servercmds.c @@ -385,88 +385,6 @@ static void CG_ConfigStringModified( void ) /* -======================= -CG_AddToTeamChat - -======================= -*/ -static void CG_AddToTeamChat( const char *str ) -{ - int len; - char *p, *ls; - int lastcolor; - int chatHeight; - - if( cg_teamChatHeight.integer < TEAMCHAT_HEIGHT ) - chatHeight = cg_teamChatHeight.integer; - else - chatHeight = TEAMCHAT_HEIGHT; - - if( chatHeight <= 0 || cg_teamChatTime.integer <= 0 ) - { - // team chat disabled, dump into normal chat - cgs.teamChatPos = cgs.teamLastChatPos = 0; - return; - } - - len = 0; - - p = cgs.teamChatMsgs[cgs.teamChatPos % chatHeight]; - *p = 0; - - lastcolor = '7'; - - ls = NULL; - while( *str ) - { - if( len > TEAMCHAT_WIDTH - 1 ) - { - if( ls ) - { - str -= ( p - ls ); - str++; - p -= ( p - ls ); - } - - *p = 0; - - cgs.teamChatMsgTimes[ cgs.teamChatPos % chatHeight ] = cg.time; - - cgs.teamChatPos++; - p = cgs.teamChatMsgs[ cgs.teamChatPos % chatHeight ]; - *p = 0; - *p++ = Q_COLOR_ESCAPE; - *p++ = lastcolor; - len = 0; - ls = NULL; - } - - if( Q_IsColorString( str ) ) - { - *p++ = *str++; - lastcolor = *str; - *p++ = *str++; - continue; - } - - if( *str == ' ' ) - ls = p; - - *p++ = *str++; - len++; - } - *p = 0; - - cgs.teamChatMsgTimes[ cgs.teamChatPos % chatHeight ] = cg.time; - cgs.teamChatPos++; - - if( cgs.teamChatPos - cgs.teamLastChatPos > chatHeight ) - cgs.teamLastChatPos = cgs.teamChatPos - chatHeight; -} - - - -/* =============== CG_MapRestart @@ -905,7 +823,6 @@ static void CG_ServerCommand( void ) Q_strncpyz( text, CG_Argv( 1 ), MAX_SAY_TEXT ); CG_RemoveChatEscapeChar( text ); - CG_AddToTeamChat( text ); CG_Printf( "%s\n", text ); return; } diff --git a/src/client/cl_main.c b/src/client/cl_main.c index f68a44a5..6c7dd032 100644 --- a/src/client/cl_main.c +++ b/src/client/cl_main.c @@ -1388,6 +1388,9 @@ void CL_BeginDownload( const char *localName, const char *remoteName ) { clc.downloadBlock = 0; // Starting new file clc.downloadCount = 0; + // Stop any errant looping sounds that may be playing + S_ClearLoopingSounds( qtrue ); + CL_AddReliableCommand( va("download %s", remoteName) ); } diff --git a/src/game/bg_misc.c b/src/game/bg_misc.c index 01f7e046..a8f10300 100644 --- a/src/game/bg_misc.c +++ b/src/game/bg_misc.c @@ -2968,6 +2968,7 @@ weaponAttributes_t bg_weapons[ ] = 0, //int repeatRate2; 0, //int repeatRate3; 0, //int reloadTime; + BLASTER_K_SCALE, //float knockbackScale; qfalse, //qboolean hasAltMode; qfalse, //qboolean hasThirdMode; qfalse, //qboolean canZoom; @@ -2991,6 +2992,7 @@ weaponAttributes_t bg_weapons[ ] = 0, //int repeatRate2; 0, //int repeatRate3; RIFLE_RELOAD, //int reloadTime; + RIFLE_K_SCALE, //float knockbackScale; qfalse, //qboolean hasAltMode; qfalse, //qboolean hasThirdMode; qfalse, //qboolean canZoom; @@ -3014,6 +3016,7 @@ weaponAttributes_t bg_weapons[ ] = 0, //int repeatRate2; 0, //int repeatRate3; SHOTGUN_RELOAD, //int reloadTime; + SHOTGUN_K_SCALE, //float knockbackScale; qfalse, //qboolean hasAltMode; qfalse, //qboolean hasThirdMode; qfalse, //qboolean canZoom; @@ -3037,6 +3040,7 @@ weaponAttributes_t bg_weapons[ ] = 0, //int repeatRate2; 0, //int repeatRate3; 0, //int reloadTime; + FLAMER_K_SCALE, //float knockbackScale; qfalse, //qboolean hasAltMode; qfalse, //qboolean hasThirdMode; qfalse, //qboolean canZoom; @@ -3060,6 +3064,7 @@ weaponAttributes_t bg_weapons[ ] = 0, //int repeatRate2; 0, //int repeatRate3; 0, //int reloadTime; + CHAINGUN_K_SCALE, //float knockbackScale; qfalse, //qboolean hasAltMode; qfalse, //qboolean hasThirdMode; qfalse, //qboolean canZoom; @@ -3083,6 +3088,7 @@ weaponAttributes_t bg_weapons[ ] = 0, //int repeatRate2; 0, //int repeatRate3; MDRIVER_RELOAD, //int reloadTime; + MDRIVER_K_SCALE, //float knockbackScale; qfalse, //qboolean hasAltMode; qfalse, //qboolean hasThirdMode; qtrue, //qboolean canZoom; @@ -3106,6 +3112,7 @@ weaponAttributes_t bg_weapons[ ] = 0, //int repeatRate2; 0, //int repeatRate3; PRIFLE_RELOAD, //int reloadTime; + PRIFLE_K_SCALE, //float knockbackScale; qfalse, //qboolean hasAltMode; qfalse, //qboolean hasThirdMode; qfalse, //qboolean canZoom; @@ -3129,6 +3136,7 @@ weaponAttributes_t bg_weapons[ ] = LCANNON_CHARGEREPEAT, //int repeatRate2; 0, //int repeatRate3; LCANNON_RELOAD, //int reloadTime; + LCANNON_K_SCALE, //float knockbackScale; qtrue, //qboolean hasAltMode; qfalse, //qboolean hasThirdMode; qfalse, //qboolean canZoom; @@ -3152,6 +3160,7 @@ weaponAttributes_t bg_weapons[ ] = 0, //int repeatRate2; 0, //int repeatRate3; LASGUN_RELOAD, //int reloadTime; + LASGUN_K_SCALE, //float knockbackScale; qfalse, //qboolean hasAltMode; qfalse, //qboolean hasThirdMode; qfalse, //qboolean canZoom; @@ -3175,6 +3184,7 @@ weaponAttributes_t bg_weapons[ ] = 0, //int repeatRate2; 0, //int repeatRate3; 0, //int reloadTime; + PAINSAW_K_SCALE, //float knockbackScale; qfalse, //qboolean hasAltMode; qfalse, //qboolean hasThirdMode; qfalse, //qboolean canZoom; @@ -3198,6 +3208,7 @@ weaponAttributes_t bg_weapons[ ] = 0, //int repeatRate2; 0, //int repeatRate3; 0, //int reloadTime; + GRENADE_K_SCALE, //float knockbackScale; qfalse, //qboolean hasAltMode; qfalse, //qboolean hasThirdMode; qfalse, //qboolean canZoom; @@ -3221,6 +3232,7 @@ weaponAttributes_t bg_weapons[ ] = HBUILD_REPEAT, //int repeatRate2; 0, //int repeatRate3; 0, //int reloadTime; + 0.0f, //float knockbackScale; qtrue, //qboolean hasAltMode; qfalse, //qboolean hasThirdMode; qfalse, //qboolean canZoom; @@ -3244,6 +3256,7 @@ weaponAttributes_t bg_weapons[ ] = HBUILD2_REPEAT, //int repeatRate2; 0, //int repeatRate3; 0, //int reloadTime; + 0.0f, //float knockbackScale; qtrue, //qboolean hasAltMode; qfalse, //qboolean hasThirdMode; qfalse, //qboolean canZoom; @@ -3267,6 +3280,7 @@ weaponAttributes_t bg_weapons[ ] = ABUILDER_BUILD_REPEAT,//int repeatRate2; 0, //int repeatRate3; 0, //int reloadTime; + 0.0f, //float knockbackScale; qtrue, //qboolean hasAltMode; qfalse, //qboolean hasThirdMode; qfalse, //qboolean canZoom; @@ -3290,6 +3304,7 @@ weaponAttributes_t bg_weapons[ ] = ABUILDER_CLAW_REPEAT, //int repeatRate2; ABUILDER_BLOB_REPEAT, //int repeatRate3; 0, //int reloadTime; + ABUILDER_CLAW_K_SCALE,//float knockbackScale; qtrue, //qboolean hasAltMode; qtrue, //qboolean hasThirdMode; qfalse, //qboolean canZoom; @@ -3309,10 +3324,11 @@ weaponAttributes_t bg_weapons[ ] = 0, //int maxClips; qtrue, //int infiniteAmmo; qfalse, //int usesEnergy; - LEVEL0_BITE_REPEAT, //int repeatRate1; + LEVEL0_BITE_REPEAT, //int repeatRate1; 0, //int repeatRate2; 0, //int repeatRate3; 0, //int reloadTime; + LEVEL0_BITE_K_SCALE, //float knockbackScale; qfalse, //qboolean hasAltMode; qfalse, //qboolean hasThirdMode; qfalse, //qboolean canZoom; @@ -3336,6 +3352,7 @@ weaponAttributes_t bg_weapons[ ] = 0, //int repeatRate2; 0, //int repeatRate3; 0, //int reloadTime; + LEVEL1_CLAW_K_SCALE, //float knockbackScale; qfalse, //qboolean hasAltMode; qfalse, //qboolean hasThirdMode; qfalse, //qboolean canZoom; @@ -3359,6 +3376,7 @@ weaponAttributes_t bg_weapons[ ] = LEVEL1_PCLOUD_REPEAT, //int repeatRate2; 0, //int repeatRate3; 0, //int reloadTime; + LEVEL1_CLAW_U_K_SCALE,//float knockbackScale; qtrue, //qboolean hasAltMode; qfalse, //qboolean hasThirdMode; qfalse, //qboolean canZoom; @@ -3382,6 +3400,7 @@ weaponAttributes_t bg_weapons[ ] = 0, //int repeatRate2; 0, //int repeatRate3; 0, //int reloadTime; + LEVEL2_CLAW_K_SCALE, //float knockbackScale; qfalse, //qboolean hasAltMode; qfalse, //qboolean hasThirdMode; qfalse, //qboolean canZoom; @@ -3405,6 +3424,7 @@ weaponAttributes_t bg_weapons[ ] = LEVEL2_AREAZAP_REPEAT,//int repeatRate2; 0, //int repeatRate3; 0, //int reloadTime; + LEVEL2_CLAW_U_K_SCALE,//float knockbackScale; qtrue, //qboolean hasAltMode; qfalse, //qboolean hasThirdMode; qfalse, //qboolean canZoom; @@ -3428,6 +3448,7 @@ weaponAttributes_t bg_weapons[ ] = 0, //int repeatRate2; 0, //int repeatRate3; 0, //int reloadTime; + LEVEL3_CLAW_K_SCALE, //float knockbackScale; qfalse, //qboolean hasAltMode; qfalse, //qboolean hasThirdMode; qfalse, //qboolean canZoom; @@ -3451,6 +3472,7 @@ weaponAttributes_t bg_weapons[ ] = 0, //int repeatRate2; LEVEL3_BOUNCEBALL_REPEAT,//int repeatRate3; 0, //int reloadTime; + LEVEL3_CLAW_U_K_SCALE,//float knockbackScale; qfalse, //qboolean hasAltMode; qtrue, //qboolean hasThirdMode; qfalse, //qboolean canZoom; @@ -3470,10 +3492,11 @@ weaponAttributes_t bg_weapons[ ] = 0, //int maxClips; qtrue, //int infiniteAmmo; qfalse, //int usesEnergy; - LEVEL4_CLAW_REPEAT, //int repeatRate1; + LEVEL4_CLAW_REPEAT, //int repeatRate1; 0, //int repeatRate2; 0, //int repeatRate3; 0, //int reloadTime; + LEVEL4_CLAW_K_SCALE, //float knockbackScale; qfalse, //qboolean hasAltMode; qfalse, //qboolean hasThirdMode; qfalse, //qboolean canZoom; @@ -3497,6 +3520,7 @@ weaponAttributes_t bg_weapons[ ] = 500, //int repeatRate2; 500, //int repeatRate3; 0, //int reloadTime; + LOCKBLOB_K_SCALE, //float knockbackScale; qfalse, //qboolean hasAltMode; qfalse, //qboolean hasThirdMode; qfalse, //qboolean canZoom; @@ -3520,6 +3544,7 @@ weaponAttributes_t bg_weapons[ ] = 500, //int repeatRate2; 500, //int repeatRate3; 0, //int reloadTime; + HIVE_K_SCALE, //float knockbackScale; qfalse, //qboolean hasAltMode; qfalse, //qboolean hasThirdMode; qfalse, //qboolean canZoom; @@ -3543,6 +3568,7 @@ weaponAttributes_t bg_weapons[ ] = 0, //int repeatRate2; 0, //int repeatRate3; 0, //int reloadTime; + MGTURRET_K_SCALE, //float knockbackScale; qfalse, //qboolean hasAltMode; qfalse, //qboolean hasThirdMode; qfalse, //qboolean canZoom; @@ -3566,6 +3592,7 @@ weaponAttributes_t bg_weapons[ ] = 500, //int repeatRate2; 500, //int repeatRate3; 0, //int reloadTime; + TESLAGEN_K_SCALE, //float knockbackScale; qfalse, //qboolean hasAltMode; qfalse, //qboolean hasThirdMode; qfalse, //qboolean canZoom; @@ -3838,6 +3865,26 @@ int BG_FindReloadTimeForWeapon( int weapon ) /* ============== +BG_FindKnockbackScaleForWeapon +============== +*/ +float BG_FindKnockbackScaleForWeapon( int weapon ) +{ + int i; + + for( i = 0; i < bg_numWeapons; i++ ) + { + if( bg_weapons[ i ].weaponNum == weapon ) + { + return bg_weapons[ i ].knockbackScale; + } + } + + return 1.0f; +} + +/* +============== BG_WeaponHasAltMode ============== */ diff --git a/src/game/bg_public.h b/src/game/bg_public.h index 272603c2..90e5eb9d 100644 --- a/src/game/bg_public.h +++ b/src/game/bg_public.h @@ -1052,6 +1052,7 @@ typedef struct int repeatRate2; int repeatRate3; int reloadTime; + float knockbackScale; qboolean hasAltMode; qboolean hasThirdMode; @@ -1196,6 +1197,7 @@ int BG_FindRepeatRate1ForWeapon( int weapon ); int BG_FindRepeatRate2ForWeapon( int weapon ); int BG_FindRepeatRate3ForWeapon( int weapon ); int BG_FindReloadTimeForWeapon( int weapon ); +float BG_FindKnockbackScaleForWeapon( int weapon ); qboolean BG_WeaponHasAltMode( int weapon ); qboolean BG_WeaponHasThirdMode( int weapon ); qboolean BG_WeaponCanZoom( int weapon ); diff --git a/src/game/g_combat.c b/src/game/g_combat.c index 7fc5a02a..99cee2dc 100644 --- a/src/game/g_combat.c +++ b/src/game/g_combat.c @@ -966,13 +966,11 @@ void G_Damage( gentity_t *targ, gentity_t *inflictor, gentity_t *attacker, knockback = damage; - // silly hack to give norf his knockbacking teslas - if( !strcmp( inflictor->classname, "team_human_tesla" ) ) - knockback *= 4; - - // ...and for goon pouncing - if( mod == MOD_LEVEL3_POUNCE ) - knockback *= 3; + if( inflictor->s.weapon != WP_NONE ) + { + knockback = (int)( (float)knockback * + BG_FindKnockbackScaleForWeapon( inflictor->s.weapon ) ); + } if( targ->client ) { diff --git a/src/game/tremulous.h b/src/game/tremulous.h index ee05ee70..9edfbbb9 100644 --- a/src/game/tremulous.h +++ b/src/game/tremulous.h @@ -40,6 +40,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define ABUILDER_CLAW_RANGE 64.0f #define ABUILDER_CLAW_WIDTH 4.0f #define ABUILDER_CLAW_REPEAT 1000 +#define ABUILDER_CLAW_K_SCALE 1.0f #define ABUILDER_BASE_DELAY 17000 #define ABUILDER_ADV_DELAY 12000 #define ABUILDER_BLOB_DMG ADM(4) @@ -52,12 +53,15 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define LEVEL0_BITE_RANGE 64.0f #define LEVEL0_BITE_WIDTH 6.0f #define LEVEL0_BITE_REPEAT 500 +#define LEVEL0_BITE_K_SCALE 1.0f #define LEVEL1_CLAW_DMG ADM(32) #define LEVEL1_CLAW_RANGE 96.0f #define LEVEL1_CLAW_WIDTH 10.0f #define LEVEL1_CLAW_REPEAT 600 #define LEVEL1_CLAW_U_REPEAT 500 +#define LEVEL1_CLAW_K_SCALE 1.0f +#define LEVEL1_CLAW_U_K_SCALE 1.0f #define LEVEL1_GRAB_RANGE 64.0f #define LEVEL1_GRAB_TIME 300 #define LEVEL1_GRAB_U_TIME 450 @@ -70,7 +74,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define LEVEL2_CLAW_RANGE 96.0f #define LEVEL2_CLAW_WIDTH 12.0f #define LEVEL2_CLAW_REPEAT 500 +#define LEVEL2_CLAW_K_SCALE 1.0f #define LEVEL2_CLAW_U_REPEAT 400 +#define LEVEL2_CLAW_U_K_SCALE 1.0f #define LEVEL2_AREAZAP_DMG ADM(80) #define LEVEL2_AREAZAP_RANGE 200.0f #define LEVEL2_AREAZAP_WIDTH 15.0f @@ -83,7 +89,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define LEVEL3_CLAW_RANGE 96.0f #define LEVEL3_CLAW_WIDTH 16.0f #define LEVEL3_CLAW_REPEAT 700 +#define LEVEL3_CLAW_K_SCALE 1.0f #define LEVEL3_CLAW_U_REPEAT 600 +#define LEVEL3_CLAW_U_K_SCALE 1.0f #define LEVEL3_POUNCE_DMG ADM(100) #define LEVEL3_POUNCE_RANGE 72.0f #define LEVEL3_POUNCE_WIDTH 16.0f @@ -100,6 +108,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define LEVEL4_CLAW_RANGE 128.0f #define LEVEL4_CLAW_WIDTH 20.0f #define LEVEL4_CLAW_REPEAT 750 +#define LEVEL4_CLAW_K_SCALE 1.0f #define LEVEL4_REGEN_RANGE 200.0f #define LEVEL4_REGEN_MOD 2.0f #define LEVEL4_CHARGE_SPEED 2.0f @@ -250,6 +259,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define ACIDTUBE_CREEPSIZE 120 #define ACIDTUBE_RANGE 300.0f #define ACIDTUBE_REPEAT 3000 +#define ACIDTUBE_K_SCALE 1.0f #define HIVE_BP 12 #define HIVE_BT 20000 @@ -260,6 +270,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define HIVE_CREEPSIZE 120 #define HIVE_RANGE 400.0f #define HIVE_REPEAT 5000 +#define HIVE_K_SCALE 1.0f #define HIVE_DMG 50 #define HIVE_SPEED 240.0f #define HIVE_DIR_CHANGE_PERIOD 500 @@ -273,8 +284,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define TRAPPER_CREEPSIZE 30 #define TRAPPER_RANGE 400 #define TRAPPER_REPEAT 1000 +#define TRAPPER_K_SCALE 1.0f #define LOCKBLOB_SPEED 650.0f #define LOCKBLOB_DOT 0.85f // max angle = acos( LOCKBLOB_DOT ) +#define LOCKBLOB_K_SCALE 1.0f #define OVERMIND_BP 0 #define OVERMIND_BT 30000 @@ -329,6 +342,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define HDM(d) ((int)((float)d*HUMAN_WDMG_MODIFIER)) #define BLASTER_REPEAT 600 +#define BLASTER_K_SCALE 1.0f #define BLASTER_SPREAD 200 #define BLASTER_SPEED 1400 #define BLASTER_DMG HDM(9) @@ -336,6 +350,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define RIFLE_CLIPSIZE 30 #define RIFLE_MAXCLIPS 6 #define RIFLE_REPEAT 90 +#define RIFLE_K_SCALE 1.0f #define RIFLE_RELOAD 2000 #define RIFLE_PRICE 0 #define RIFLE_SPREAD 200 @@ -343,11 +358,13 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define PAINSAW_PRICE 100 #define PAINSAW_REPEAT 75 +#define PAINSAW_K_SCALE 1.0f #define PAINSAW_DAMAGE HDM(15) #define PAINSAW_RANGE 40.0f #define GRENADE_PRICE 200 #define GRENADE_REPEAT 0 +#define GRENADE_K_SCALE 1.0f #define GRENADE_DAMAGE HDM(310) #define GRENADE_RANGE 192.0f #define GRENADE_SPEED 400.0f @@ -357,6 +374,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define SHOTGUN_PELLETS 8 //used to sync server and client side #define SHOTGUN_MAXCLIPS 3 #define SHOTGUN_REPEAT 1000 +#define SHOTGUN_K_SCALE 1.0f #define SHOTGUN_RELOAD 2000 #define SHOTGUN_SPREAD 900 #define SHOTGUN_DMG HDM(7) @@ -364,6 +382,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define LASGUN_PRICE 250 #define LASGUN_AMMO 200 #define LASGUN_REPEAT 200 +#define LASGUN_K_SCALE 1.0f #define LASGUN_RELOAD 2000 #define LASGUN_DAMAGE HDM(9) @@ -372,11 +391,13 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define MDRIVER_MAXCLIPS 4 #define MDRIVER_DMG HDM(38) #define MDRIVER_REPEAT 1000 +#define MDRIVER_K_SCALE 1.0f #define MDRIVER_RELOAD 2000 #define CHAINGUN_PRICE 400 #define CHAINGUN_BULLETS 300 #define CHAINGUN_REPEAT 80 +#define CHAINGUN_K_SCALE 1.0f #define CHAINGUN_SPREAD 1000 #define CHAINGUN_DMG HDM(6) @@ -384,6 +405,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define PRIFLE_CLIPS 50 #define PRIFLE_MAXCLIPS 4 #define PRIFLE_REPEAT 100 +#define PRIFLE_K_SCALE 1.0f #define PRIFLE_RELOAD 2000 #define PRIFLE_DMG HDM(9) #define PRIFLE_SPEED 1000 @@ -391,6 +413,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define FLAMER_PRICE 450 #define FLAMER_GAS 150 #define FLAMER_REPEAT 200 +#define FLAMER_K_SCALE 1.0f #define FLAMER_DMG HDM(20) #define FLAMER_RADIUS 50 #define FLAMER_LIFETIME 800.0f @@ -400,6 +423,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define LCANNON_PRICE 600 #define LCANNON_AMMO 90 #define LCANNON_REPEAT 500 +#define LCANNON_K_SCALE 1.0f #define LCANNON_CHARGEREPEAT 1000 #define LCANNON_RELOAD 2000 #define LCANNON_DAMAGE HDM(265) @@ -498,6 +522,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define MGTURRET_ACCURACYTOLERANCE MGTURRET_ANGULARSPEED / 1.5f //angular difference for turret to fire #define MGTURRET_VERTICALCAP 30 // +/- maximum pitch #define MGTURRET_REPEAT 100 +#define MGTURRET_K_SCALE 1.0f #define MGTURRET_RANGE 300.0f #define MGTURRET_SPREAD 200 #define MGTURRET_DMG HDM(4) @@ -512,6 +537,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define TESLAGEN_SPLASHDAMAGE 50 #define TESLAGEN_SPLASHRADIUS 100 #define TESLAGEN_REPEAT 250 +#define TESLAGEN_K_SCALE 4.0f #define TESLAGEN_RANGE 250 #define TESLAGEN_DMG HDM(9) diff --git a/ui/menudef.h b/ui/menudef.h index 0463e1aa..11f13382 100644 --- a/ui/menudef.h +++ b/ui/menudef.h @@ -206,9 +206,6 @@ #define CG_FRAGGED_MSG 43 // painted with old system #define CG_PROXMINED_MSG 44 // painted with old system #define CG_AREA_FPSINFO 45 // painted with old system -#define CG_AREA_SYSTEMCHAT 46 // painted with old system -#define CG_AREA_TEAMCHAT 47 // painted with old system -#define CG_AREA_CHAT 48 // painted with old system #define CG_GAME_STATUS 49 #define CG_KILLER 50 #define CG_PLAYER_ARMOR_ICON2D 51 |