diff options
| -rw-r--r-- | Changelog-Trunk.txt | 1 | ||||
| -rw-r--r-- | src/common/core.c | 3 | ||||
| -rw-r--r-- | src/common/showmsg.c | 2 | ||||
| -rw-r--r-- | src/common/timer.c | 2 | ||||
| -rw-r--r-- | src/login/login.c | 6 | ||||
| -rw-r--r-- | src/map/mercenary.c | 6 |
6 files changed, 12 insertions, 8 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index ee8500375..d2650015d 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -4,6 +4,7 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2006/09/12
+ * Homunculus intimacy will go back to 500 on evolution. [Skotlex]
* Baphomet splash damage will now hit nearby enemies regardless of flee
(but the initial attack still has to connect for the splash to trigger)
[Skotlex]
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"
// タイマー間隔の最小値。モンスターの大量召還時、多数のクライアント接続時に
diff --git a/src/login/login.c b/src/login/login.c index f76bd44cf..8d9afa5db 100644 --- a/src/login/login.c +++ b/src/login/login.c @@ -3057,7 +3057,6 @@ int parse_login(int fd) { unsigned char *p = (unsigned char *) &session[fd]->client_addr.sin_addr;
char ip[16];
long subnet_char_ip;
- int packet_len;
RFIFOHEAD(fd);
@@ -3098,7 +3097,8 @@ int parse_login(int fd) { case 0x277: // New login packet
case 0x64: // request client login
case 0x01dd: // request client login with encrypt
- packet_len = RFIFOREST(fd);
+ {
+ int packet_len = RFIFOREST(fd);
switch(RFIFOW(fd, 0)){
case 0x64:
@@ -3231,7 +3231,7 @@ int parse_login(int fd) { }
RFIFOSKIP(fd,packet_len);
break;
-
+ }
case 0x01db: // Sending request of the coding key
case 0x791a: // Sending request of the coding key (administration packet)
{
diff --git a/src/map/mercenary.c b/src/map/mercenary.c index f868ddc2a..24ced263b 100644 --- a/src/map/mercenary.c +++ b/src/map/mercenary.c @@ -288,9 +288,11 @@ int merc_hom_evolution(struct homun_data *hd) merc_hom_vaporize(sd, 0);
- if (!merc_hom_change_class(hd, hd->homunculusDB->evo_class))
+ if (!merc_hom_change_class(hd, hd->homunculusDB->evo_class)) {
ShowError("merc_hom_evolution: Can't evoluate homunc from %d to %d", hd->master->homunculus.class_, hd->homunculusDB->evo_class);
-
+ return 0;
+ }
+ sd->homunculus.intimacy = 500;
merc_call_homunculus(sd, hd->bl.x, hd->bl.y);
clif_emotion(&sd->bl, 21); //no1
clif_misceffect2(&hd->bl,568);
|