summaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
authorzephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-08-31 22:56:05 +0000
committerzephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-08-31 22:56:05 +0000
commit08c870656aeb76d839a8ad2fd071818b8618f899 (patch)
tree3ac8cc1544cd0a60f00312cdb6c8c21f62f287a8 /src/common
parent409cb0381295716d654fd2ee5021e1011a45ab80 (diff)
downloadhercules-08c870656aeb76d839a8ad2fd071818b8618f899.tar.gz
hercules-08c870656aeb76d839a8ad2fd071818b8618f899.tar.bz2
hercules-08c870656aeb76d839a8ad2fd071818b8618f899.tar.xz
hercules-08c870656aeb76d839a8ad2fd071818b8618f899.zip
- A proper mercenary lifetime calculation.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13165 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/common')
-rw-r--r--src/common/mmo.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/mmo.h b/src/common/mmo.h
index 6be0fab19..d94796723 100644
--- a/src/common/mmo.h
+++ b/src/common/mmo.h
@@ -240,7 +240,7 @@ struct s_mercenary {
short class_;
int hp, sp;
unsigned int kill_count;
- unsigned int remain_life_time;
+ unsigned int life_time;
};
struct s_friend {