summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-08-22 14:54:29 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-08-22 14:54:29 +0000
commitf43789777a8348f61f6802ed3edca8333e20eea3 (patch)
tree0c3671fa9cdc160bf79d7bd0aae28e5419af5855 /src/map
parent7740a68642e66bb59368042d109262332d849298 (diff)
downloadhercules-f43789777a8348f61f6802ed3edca8333e20eea3.tar.gz
hercules-f43789777a8348f61f6802ed3edca8333e20eea3.tar.bz2
hercules-f43789777a8348f61f6802ed3edca8333e20eea3.tar.xz
hercules-f43789777a8348f61f6802ed3edca8333e20eea3.zip
- updated (more or less) the sql-files/item_db2.sql file.
- Some insignificant cleanups. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8429 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
-rw-r--r--src/map/atcommand.c4
-rw-r--r--src/map/script.c2
2 files changed, 1 insertions, 5 deletions
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index 4e372d633..28b096a0f 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -9505,9 +9505,7 @@ atcommand_charkillableid(
clif_displaymessage(fd, msg_txt(290));
}
else
- {
clif_displaymessage(fd,msg_txt(3));
- }
//printf("Session_id = %d, cid = %d\n",session_id,cid);
return 0;
}
@@ -9546,9 +9544,7 @@ atcommand_charkillableid2(
clif_displaymessage(fd, msg_txt(290));
}
else
- {
clif_displaymessage(fd,msg_txt(3));
- }
//printf("Session_id = %d, aid = %d\n",session_id,aid);
return 0;
}
diff --git a/src/map/script.c b/src/map/script.c
index 79cdb517a..8408e8546 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -5299,7 +5299,7 @@ int buildin_getnameditem(struct script_state *st)
item_tmp.nameid=nameid;
item_tmp.amount=1;
item_tmp.identify=1;
- item_tmp.card[0]=254; //we don't use 255! because for example SIGNED WEAPON shouldn't get TOP10 BS Fame bonus [Lupus]
+ item_tmp.card[0]=CARD0_CREATE; //we don't use 255! because for example SIGNED WEAPON shouldn't get TOP10 BS Fame bonus [Lupus]
item_tmp.card[2]=tsd->status.char_id;
item_tmp.card[3]=tsd->status.char_id >> 16;
if(pc_additem(sd,&item_tmp,1)) {