summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbrianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-04-30 00:22:22 +0000
committerbrianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-04-30 00:22:22 +0000
commitc87c4839de9893ce3c55e5018fea9021eb14b5e3 (patch)
tree57a1a9d3324e45f68d3f0f98e452b0bf34ff5d17
parent75176f384099d90c1624df3c7878192ffd070663 (diff)
downloadhercules-c87c4839de9893ce3c55e5018fea9021eb14b5e3.tar.gz
hercules-c87c4839de9893ce3c55e5018fea9021eb14b5e3.tar.bz2
hercules-c87c4839de9893ce3c55e5018fea9021eb14b5e3.tar.xz
hercules-c87c4839de9893ce3c55e5018fea9021eb14b5e3.zip
- Fixed a typo in guildrelay.txt (bugreport:4213)
- Forced acc.lastlogin to use MySQL DATETIME format. (bugreport:4193) - Fixed the range of getiteminfo and setiteminfo. (bugreport:4190) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14292 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--db/skill_nocast_db.txt2
-rw-r--r--npc/quests/guildrelay.txt2
-rw-r--r--src/login/login.c2
-rw-r--r--src/map/script.c4
4 files changed, 5 insertions, 5 deletions
diff --git a/db/skill_nocast_db.txt b/db/skill_nocast_db.txt
index 49022b5b4..82dbdaffa 100644
--- a/db/skill_nocast_db.txt
+++ b/db/skill_nocast_db.txt
@@ -57,7 +57,7 @@
438,8 //SG_SUN_BLESS
439,8 //SG_MOON_BLESS
440,8 //SG_STAR_BLESS
-691,8; //CASH_ASSUMPITO
+691,8 //CASH_ASSUMPITO
//mixed
488,3 //CG_HERMODE
diff --git a/npc/quests/guildrelay.txt b/npc/quests/guildrelay.txt
index 71587522d..66c8bce3b 100644
--- a/npc/quests/guildrelay.txt
+++ b/npc/quests/guildrelay.txt
@@ -1058,7 +1058,7 @@
mes "him to tell you again.";
close;
}
- else if (BaseJob == Job_Preist) {
+ else if (BaseJob == Job_Priest) {
mes "[" + .@name$ + "]";
mes "Ah, " + strcharinfo(0) + ",";
mes "please take good care of";
diff --git a/src/login/login.c b/src/login/login.c
index 7cb00c888..59a110348 100644
--- a/src/login/login.c
+++ b/src/login/login.c
@@ -1018,7 +1018,7 @@ int mmo_auth(struct login_session_data* sd)
sd->level = acc.level;
// update account data
- timestamp2string(acc.lastlogin, sizeof(acc.lastlogin), time(NULL), login_config.date_format);
+ timestamp2string(acc.lastlogin, sizeof(acc.lastlogin), time(NULL), "%Y-%m-%d %H:%M:%S");
safestrncpy(acc.last_ip, ip, sizeof(acc.last_ip));
acc.unban_time = 0;
acc.logincount++;
diff --git a/src/map/script.c b/src/map/script.c
index bdd6a5897..19fb01cc3 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -10331,7 +10331,7 @@ BUILDIN_FUNC(getiteminfo)
n = script_getnum(st,3);
i_data = itemdb_exists(item_id);
- if (i_data && n>=0 && n<14) {
+ if (i_data && n>=0 && n<=14) {
item_arr = (int*)&i_data->value_buy;
script_pushint(st,item_arr[n]);
} else
@@ -10373,7 +10373,7 @@ BUILDIN_FUNC(setiteminfo)
value = script_getnum(st,4);
i_data = itemdb_exists(item_id);
- if (i_data && n>=0 && n<14) {
+ if (i_data && n>=0 && n<=14) {
item_arr = (int*)&i_data->value_buy;
item_arr[n] = value;
script_pushint(st,value);