summaryrefslogtreecommitdiff
path: root/src/char_sql/int_mail.c
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/char_sql/int_mail.c
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/char_sql/int_mail.c')
-rw-r--r--src/char_sql/int_mail.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/src/char_sql/int_mail.c b/src/char_sql/int_mail.c
index 9ae4e1ccd..86a076b0d 100644
--- a/src/char_sql/int_mail.c
+++ b/src/char_sql/int_mail.c
@@ -7,6 +7,7 @@
#include "../common/socket.h"
#include "../common/strlib.h"
#include "../common/sql.h"
+#include "../common/timer.h"
#include "char.h"
#include "inter.h"
@@ -14,13 +15,6 @@
#include <string.h>
#include <stdlib.h>
-static time_t calc_times(void)
-{
- time_t temp = time(NULL);
- return mktime(localtime(&temp));
-}
-
-
static int mail_fromsql(int char_id, struct mail_data* md)
{
int i, j;
@@ -359,7 +353,7 @@ static void mapif_Mail_return(int fd, int char_id, int mail_id)
safestrncpy(msg.title, temp_, MAIL_TITLE_LENGTH);
msg.status = MAIL_NEW;
- msg.timestamp = (unsigned int)calc_times();
+ msg.timestamp = calc_times();
new_mail = mail_savemessage(&msg);
mapif_Mail_new(&msg);
@@ -444,7 +438,7 @@ void mail_sendmail(int send_id, const char* send_name, int dest_id, const char*
if( item != NULL )
memcpy(&msg.item, item, sizeof(struct item));
- msg.timestamp = (int)calc_times();
+ msg.timestamp = calc_times();
mail_savemessage(&msg);
mapif_Mail_new(&msg);