ubergames/rpgxef
0
0
Fork 0
mirror of https://github.com/UberGames/rpgxEF.git synced 2025-02-24 04:51:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Some fixes and Tweaks

Browse source 
Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
This commit is contained in:
Harry Young 2013-08-14 00:02:45 +02:00
parent fc2706750b
commit 387b55198c
4 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
code/cgame/cg_players.c
View file

@ -2131,6 +2131,7 @@ void CG_NewDecoyInfo( int decoyNum ) {
//First thing's first. We need to isolate these into three strings: model, char, skin //First thing's first. We need to isolate these into three strings: model, char, skin
{ {
int len;
//step 1, take the first bit of the string and put it in the charName var. //step 1, take the first bit of the string and put it in the charName var.
if ( ( temp = strchr( v, '/') ) == NULL ) { //if there's no slash if ( ( temp = strchr( v, '/') ) == NULL ) { //if there's no slash
Q_strncpyz( ci->charName, v, sizeof( ci->charName ) ); //just set it Q_strncpyz( ci->charName, v, sizeof( ci->charName ) ); //just set it
@ -2154,7 +2155,7 @@ void CG_NewDecoyInfo( int decoyNum ) {
} }
} else { } else {
temp++; //bypass the slash temp++; //bypass the slash
int len = strlen(temp); len = strlen(temp);
temp2 = strchr( temp, '/' ); temp2 = strchr( temp, '/' );
//if there was a model defined, but no skin //if there was a model defined, but no skin

1
code/cgame/cg_playerstate.c
View file

@ -77,7 +77,6 @@ CG_DamageFeedback
============== ==============
*/ */
void CG_DamageFeedback( int yawByte, int pitchByte, int damage, int shielddamage ) { void CG_DamageFeedback( int yawByte, int pitchByte, int damage, int shielddamage ) {
float left, front, up;
float kick; float kick;
int health; int health;
float scale; float scale;

6
code/cgame/cg_scoreboard.c
View file

@ -373,12 +373,6 @@ static void CG_DrawClientScore( int y, score_t *score, float *color, float fade,
//char /**worstEnemy,*/*faveWeapon=0; //char /**worstEnemy,*/*faveWeapon=0;
//float hcolor[4]; //float hcolor[4];
//gitem_t * item; //gitem_t * item;
int inIntermission/*,length*/;
inIntermission = (
(cg.snap->ps.pm_type==PM_INTERMISSION)
|| (cg.intermissionStarted)
|| (cg.predictedPlayerState.pm_type==PM_INTERMISSION) );
if ( score->client < 0 || score->client >= cgs.maxclients ) if ( score->client < 0 || score->client >= cgs.maxclients )

2
code/cgame/cg_view.c
View file

@ -1172,8 +1172,6 @@ Fixed fov at intermissions, otherwise account for fov variable and zooms.
static int CG_CalcFov( void ) { static int CG_CalcFov( void ) {
float x; float x;
float phase;
float v;
int contents; int contents;
float fov_x, fov_y; float fov_x, fov_y;
int inwater; int inwater;