diff options
| author | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-01-30 00:25:44 +0000 |
|---|---|---|
| committer | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-01-30 00:25:44 +0000 |
| commit | 741230435bd23aa692f552649664b67a43a358c0 (patch) | |
| tree | 2f659f9ff3ed0c2b3df3119315047b6f756ef135 /npc/other | |
| parent | d21f2f8479c618c15958ae1f9ac5811b9b035921 (diff) | |
| download | hercules-741230435bd23aa692f552649664b67a43a358c0.tar.gz hercules-741230435bd23aa692f552649664b67a43a358c0.tar.bz2 hercules-741230435bd23aa692f552649664b67a43a358c0.tar.xz hercules-741230435bd23aa692f552649664b67a43a358c0.zip | |
* Merged changes from trunk [14636:14686/trunk].
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/renewal@14687 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/other')
| -rw-r--r-- | npc/other/Global_Functions.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/npc/other/Global_Functions.txt b/npc/other/Global_Functions.txt index eea78ef5a..b93049e83 100644 --- a/npc/other/Global_Functions.txt +++ b/npc/other/Global_Functions.txt @@ -340,9 +340,9 @@ function script Time2Str { set .@Time$, .@Time$ + .@Minutes + " minute, "; if( .@Time_Left > 1 || .@Time_Left == 0 ) - set .@Time$, .@Time$ + .@Time_Left + " seconds."; + set .@Time$, .@Time$ + .@Time_Left + " seconds"; else if( .@Time_Left == 1 ) - set .@Time$, .@Time$ + .@Time_Left + " second."; + set .@Time$, .@Time$ + .@Time_Left + " second"; return .@Time$; } |