summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorbrianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-05-02 20:23:30 +0000
committerbrianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-05-02 20:23:30 +0000
commit055a8778bc0b8cd87709af7517c5955bcc8f898c (patch)
tree32d143836edcbd986560c681f7762156dc22dbd8 /src
parent355f81a410eeb48e29d21574896f2fac02fc8a95 (diff)
downloadhercules-055a8778bc0b8cd87709af7517c5955bcc8f898c.tar.gz
hercules-055a8778bc0b8cd87709af7517c5955bcc8f898c.tar.bz2
hercules-055a8778bc0b8cd87709af7517c5955bcc8f898c.tar.xz
hercules-055a8778bc0b8cd87709af7517c5955bcc8f898c.zip
- Fixed some typos in the script command documentation. (bugreport:2547)
- Fixed a misleading message in the custom Job Changer. (bugreport:682) - Updated some NPC's facing directions. (bugreport:3030) - Added missing newline in some ShowWarning(). (bugreport:2940) - Fixed SC_BOSSMAPINFO time being off by 1 minutes (bugreport:3035) Now, the seconds are rounded up to the next whole minute. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13713 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
-rw-r--r--src/common/ers.c4
-rw-r--r--src/common/mapindex.c4
-rw-r--r--src/map/clif.c2
-rw-r--r--src/map/npc_chat.c2
-rw-r--r--src/map/script.c4
5 files changed, 8 insertions, 8 deletions
diff --git a/src/common/ers.c b/src/common/ers.c
index 06bad92a4..db7cb149d 100644
--- a/src/common/ers.c
+++ b/src/common/ers.c
@@ -311,14 +311,14 @@ static void ers_obj_destroy(ERS self)
}
}
if (count) { // missing entries
- ShowWarning("ers::destroy : %u entries missing (possible double free), continuing destruction (entry size=%u).",
+ ShowWarning("ers::destroy : %u entries missing (possible double free), continuing destruction (entry size=%u).\n",
count, obj->size);
} else if (reuse) { // extra entries
while (reuse && count != UINT32_MAX) {
count++;
reuse = reuse->next;
}
- ShowWarning("ers::destroy : %u extra entries found, continuing destruction (entry size=%u).",
+ ShowWarning("ers::destroy : %u extra entries found, continuing destruction (entry size=%u).\n",
count, obj->size);
}
// destroy the entry manager
diff --git a/src/common/mapindex.c b/src/common/mapindex.c
index 4aef69574..72db1af6d 100644
--- a/src/common/mapindex.c
+++ b/src/common/mapindex.c
@@ -30,7 +30,7 @@ const char* mapindex_getmapname(const char* string, char* output)
size_t len = strnlen(string, MAP_NAME_LENGTH_EXT);
if (len == MAP_NAME_LENGTH_EXT) {
- ShowWarning("(mapindex_normalize_name) Map name '%*s' is too long!", 2*MAP_NAME_LENGTH_EXT, string);
+ ShowWarning("(mapindex_normalize_name) Map name '%*s' is too long!\n", 2*MAP_NAME_LENGTH_EXT, string);
len--;
}
if (len >= 4 && stricmp(&string[len-4], ".gat") == 0)
@@ -52,7 +52,7 @@ const char* mapindex_getmapname_ext(const char* string, char* output)
size_t len = safestrnlen(string, MAP_NAME_LENGTH);
if (len == MAP_NAME_LENGTH) {
- ShowWarning("(mapindex_normalize_name) Map name '%*s' is too long!", 2*MAP_NAME_LENGTH, string);
+ ShowWarning("(mapindex_normalize_name) Map name '%*s' is too long!\n", 2*MAP_NAME_LENGTH, string);
len--;
}
diff --git a/src/map/clif.c b/src/map/clif.c
index 3baba439e..7ced02555 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -12496,7 +12496,7 @@ void clif_bossmapinfo(int fd, struct mob_data *md, short flag)
unsigned int seconds;
int hours, minutes;
- seconds = DIFF_TICK(timer_data->tick, gettick()) / 1000;
+ seconds = DIFF_TICK(timer_data->tick, gettick()) / 1000 + 60;
hours = seconds / (60 * 60);
seconds = seconds - (60 * 60 * hours);
minutes = seconds / 60;
diff --git a/src/map/npc_chat.c b/src/map/npc_chat.c
index 4278c33f5..99fa40a20 100644
--- a/src/map/npc_chat.c
+++ b/src/map/npc_chat.c
@@ -389,7 +389,7 @@ int npc_chat_sub(struct block_list* bl, va_list ap)
lst = nd->u.scr.label_list;
ARR_FIND(0, nd->u.scr.label_list_num, i, strncmp(lst[i].name, e->label, sizeof(lst[i].name)) == 0);
if (i == nd->u.scr.label_list_num) {
- ShowWarning("Unable to find label: %s", e->label);
+ ShowWarning("Unable to find label: %s\n", e->label);
return 0;
}
diff --git a/src/map/script.c b/src/map/script.c
index cfb909370..0aa92003a 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -6040,7 +6040,7 @@ BUILDIN_FUNC(strcharinfo)
script_pushconststr(st,"");
break;
default:
- ShowWarning("buildin_strcharinfo: unknown parameter.");
+ ShowWarning("buildin_strcharinfo: unknown parameter.\n");
script_pushconststr(st,"");
break;
}
@@ -10851,7 +10851,7 @@ BUILDIN_FUNC(charcommand)
}
if (*cmd != charcommand_symbol) {
- ShowWarning("script: buildin_charcommand: No '#' symbol!");
+ ShowWarning("script: buildin_charcommand: No '#' symbol!\n");
script_reportsrc(st);
return 1;
}