diff options
| author | Tim Angus <tim@ngus.net> | 2004-12-01 22:24:11 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2004-12-01 22:24:11 +0000 |
| commit | 47ad5965f5fc5c0b5190f2d4bd4ec704e337f61c (patch) | |
| tree | 748c48f07b56a21edd12b8d0758eedafa1a4d652 | |
| parent | 47ed06f6013992971220db21196f5d3df8678ce7 (diff) | |
* Bugfix to PTRC system that prevented it working with sv_pure on
* Bugfix to first person animation on WP_BLASTER
| -rw-r--r-- | src/cgame/cg_weapons.c | 2 | ||||
| -rw-r--r-- | src/ui/ui_main.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/cgame/cg_weapons.c b/src/cgame/cg_weapons.c index 2fc0d7f7..02427daa 100644 --- a/src/cgame/cg_weapons.c +++ b/src/cgame/cg_weapons.c @@ -893,7 +893,7 @@ static int CG_MapTorsoToWeaponFrame( clientInfo_t *ci, int frame ) // stand attack 2 if( frame >= ci->animations[ TORSO_ATTACK2 ].firstFrame && frame < ci->animations[ TORSO_ATTACK2 ].firstFrame + 6 ) - return 1 + frame - ci->animations[ TORSO_ATTACK ].firstFrame; + return 1 + frame - ci->animations[ TORSO_ATTACK2 ].firstFrame; return 0; } diff --git a/src/ui/ui_main.c b/src/ui/ui_main.c index 4eca5373..4389074c 100644 --- a/src/ui/ui_main.c +++ b/src/ui/ui_main.c @@ -4216,7 +4216,7 @@ static void UI_RunMenuScript(char **args) { char command[ 32 ]; // load the file - len = trap_FS_FOpenFile( "ptrc.txt", &f, FS_READ ); + len = trap_FS_FOpenFile( "ptrc.cfg", &f, FS_READ ); if( len > 0 && ( len < sizeof( text ) - 1 ) ) { |