Skip to content

Feature: Timer in practicemode #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kalhartt wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Feature: Timer in practicemode #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fed6428
Typo fix
kalhartt Feb 2, 2014
9076b72
Use chrono for timing in practicemode
kalhartt Feb 2, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion racesow/progs/gametypes/racesow/commands.as
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -885,7 +885,7 @@ class Command_Practicemode : Racesow_Command
leave = true;
else
leave = false;
if ( leave ^^ player.practicing )
if ( leave && player.practicing )
return true;
}

Expand All @@ -897,6 +897,7 @@ class Command_Practicemode : Racesow_Command
}
else
{
player.chronoStartTime = levelTime;
player.practicing = true;
player.inNoclip = false;
player.sendAward( S_COLOR_GREEN + "You have entered practice mode" );
Expand Down
4 changes: 2 additions & 2 deletions racesow/progs/gametypes/racesow/main.as
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -640,8 +640,8 @@ void GT_ThinkRules()
client.setHUDStat( STAT_MESSAGE_ALPHA, 0 );
client.setHUDStat( STAT_MESSAGE_BETA, 0 );

if( player.isUsingChrono )
client.setHUDStat( STAT_TIME_ALPHA, (levelTime - player.chronoTime()) / 100 );
if( player.isUsingChrono || player.practicing )
client.setHUDStat( STAT_TIME_SELF, (levelTime - player.chronoTime()) / 100 );
}

racesowGametype.ThinkRules();
Expand Down
3 changes: 3 additions & 0 deletions racesow/progs/gametypes/racesow/player.as
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -826,6 +826,9 @@ class Racesow_Player
if( this.client.getEnt().team == TEAM_SPECTATOR )
this.inNoclip = false;

if ( this.practicing )
this.chronoStartTime = levelTime;

if ( this.practicing && this.positionSaved )
{
this.teleport( this.positionOrigin, this.positionAngles, false, false, false );
Expand Down