summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorzephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-03-17 15:03:03 +0000
committerzephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-03-17 15:03:03 +0000
commit372b71e5d7099373a20b14459182f9a3a05dbbba (patch)
treea53255abc00fe17d0b870d368cb0a7bed5aa2aa2 /src/map
parenta0d17427e9b773d175aca334f20fcffd56edf5d9 (diff)
downloadhercules-372b71e5d7099373a20b14459182f9a3a05dbbba.tar.gz
hercules-372b71e5d7099373a20b14459182f9a3a05dbbba.tar.bz2
hercules-372b71e5d7099373a20b14459182f9a3a05dbbba.tar.xz
hercules-372b71e5d7099373a20b14459182f9a3a05dbbba.zip
- Clean up of calc_times function.
- Moved to timer.c/h because it's used in both map and char servers. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12382 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
-rw-r--r--src/map/clif.c2
-rw-r--r--src/map/mail.c6
-rw-r--r--src/map/mail.h2
3 files changed, 1 insertions, 9 deletions
diff --git a/src/map/clif.c b/src/map/clif.c
index cbcada2b1..3f6cf94f6 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -11714,7 +11714,7 @@ void clif_parse_Mail_send(int fd, struct map_session_data *sd)
else
memset(msg.body, 0x00, MAIL_BODY_LENGTH);
- msg.timestamp = (int)mail_calctimes();
+ msg.timestamp = calc_times();
if( !intif_Mail_send(sd->status.account_id, &msg) )
mail_deliveryfail(sd, &msg);
diff --git a/src/map/mail.c b/src/map/mail.c
index d6fc875a3..733fce646 100644
--- a/src/map/mail.c
+++ b/src/map/mail.c
@@ -16,12 +16,6 @@
#include <time.h>
#include <string.h>
-time_t mail_calctimes(void)
-{
- time_t temp = time(NULL);
- return mktime(localtime(&temp));
-}
-
void mail_clear(struct map_session_data *sd)
{
sd->mail.nameid = 0;
diff --git a/src/map/mail.h b/src/map/mail.h
index 9a867daa5..cab582e55 100644
--- a/src/map/mail.h
+++ b/src/map/mail.h
@@ -6,8 +6,6 @@
#include "../common/mmo.h"
-time_t mail_calctimes(void);
-
void mail_clear(struct map_session_data *sd);
int mail_removeitem(struct map_session_data *sd, short flag);
int mail_removezeny(struct map_session_data *sd, short flag);