Skip to content

Commit 4ed9c8e

Browse files
author
Marek Kulik
committed
Improve disconnect time duration text
1 parent 9be3568 commit 4ed9c8e

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

Client/mods/deathmatch/logic/CPacketHandler.cpp

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -581,13 +581,17 @@ void CPacketHandler::Packet_ServerDisconnected ( NetBitStreamInterface& bitStrea
581581
int iHours = static_cast < int > ( Duration / 3600 );
582582
Duration = Duration % 3600;
583583
int iMins = static_cast < int > ( Duration / 60 );
584+
Duration = Duration % 60;
585+
int iSeconds = static_cast < int > ( Duration );
584586

585587
if ( iDays )
586-
strReason += SString(_tn( "%d day", "%d days", iDays ),iDays) += iHours ? " " : "";
588+
strReason += SString( _tn( "%d day", "%d days", iDays ), iDays ) += (iHours || iMins) ? " " : "";
587589
if ( iHours )
588-
strReason += SString(_tn( "%d hour", "%d hours", iHours ),iHours) += iMins ? " " : "";
590+
strReason += SString( _tn( "%d hour", "%d hours", iHours ), iHours ) += iMins ? " " : "";
589591
if ( iMins )
590-
strReason += SString(_tn( "%d minute", "%d minutes", iMins ),iMins);
592+
strReason += SString( _tn( "%d minute", "%d minutes", iMins ), iMins ) += iSeconds? " " : "";
593+
if ( !iDays && !iHours && iSeconds )
594+
strReason += SString( _tn( "%d second", "%d seconds", iSeconds ), iSeconds );
591595
}
592596

593597
// Display the error

0 commit comments

Comments
 (0)