summaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-09-12 14:21:02 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-09-12 14:21:02 +0000
commitbe57ed26ac11ed0bb696acb031df527e3edf3130 (patch)
tree7235600c074836b212efa36e875b16334fe76110 /src/common
parente4d1b04f83674a0c0d766b12f906c66473a3e69c (diff)
downloadhercules-be57ed26ac11ed0bb696acb031df527e3edf3130.tar.gz
hercules-be57ed26ac11ed0bb696acb031df527e3edf3130.tar.bz2
hercules-be57ed26ac11ed0bb696acb031df527e3edf3130.tar.xz
hercules-be57ed26ac11ed0bb696acb031df527e3edf3130.zip
- Moved the packet_len variable in login.c to the login parse case, since it's used nowhere else.
- timestamp check speed-up in showmsg.c - Swapped the blank ShowMessage on server startup to a printf - Homunculus intimacy will go back to 500 on evolution. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8719 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/common')
-rw-r--r--src/common/core.c3
-rw-r--r--src/common/showmsg.c2
-rw-r--r--src/common/timer.c2
3 files changed, 4 insertions, 3 deletions
diff --git a/src/common/core.c b/src/common/core.c
index 6f9bb4548..75335b597 100644
--- a/src/common/core.c
+++ b/src/common/core.c
@@ -183,7 +183,8 @@ static void display_title(void)
{
//The clearscreeen is usually more of an annoyance than anything else... [Skotlex]
// ClearScreen(); // clear screen and go up/left (0, 0 position in text)
- ShowMessage("\n");
+ //ShowMessage("\n"); //A blank message??
+ printf("\n");
ShowMessage(""CL_WTBL" (=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=)"CL_CLL""CL_NORMAL"\n"); // white writing (37) on blue background (44), \033[K clean until end of file
ShowMessage(""CL_XXBL" ("CL_BT_YELLOW" (c)2005 eAthena Development Team presents "CL_XXBL")"CL_CLL""CL_NORMAL"\n"); // yellow writing (33)
ShowMessage(""CL_XXBL" ("CL_BOLD" ______ __ __ "CL_XXBL")"CL_CLL""CL_NORMAL"\n"); // 1: bold char, 0: normal char
diff --git a/src/common/showmsg.c b/src/common/showmsg.c
index 03dcb7e8a..594234b8d 100644
--- a/src/common/showmsg.c
+++ b/src/common/showmsg.c
@@ -52,7 +52,7 @@ int _vShowMessage(enum msg_type flag, const char *string, va_list ap)
return 1;
}
- if (strlen(timestamp_format) > 0)
+ if (timestamp_format[0])
{ //Display time format. [Skotlex]
time_t t = time(NULL);
strftime(prefix, 80, timestamp_format, localtime(&t));
diff --git a/src/common/timer.c b/src/common/timer.c
index d8f863059..a848266ac 100644
--- a/src/common/timer.c
+++ b/src/common/timer.c
@@ -20,7 +20,7 @@
#include <time.h>
#include "timer.h"
-#include "../common/malloc.h"
+#include "malloc.h"
#include "showmsg.h"
// タイマー間隔の最小値。モンスターの大量召還時、多数のクライアント接続時に