From 9b503fc848570a27f635d05703f19e0b0a9b8fad Mon Sep 17 00:00:00 2001
From: ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Thu, 12 Feb 2009 12:27:59 +0000
Subject: Applied patch to getitem2/delitem2 to handle charid embedding
 correctly (bugreport:2735). Added missing codepage option for ipban module in
 login_athena.conf. Converted dbghelpplug project in vs9 directory to vs9
 format. Updated effects list doc with new data from 2009/01/21a sakexe.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13523 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 src/map/script.c | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'src')

diff --git a/src/map/script.c b/src/map/script.c
index 5ce0c3409..6a008c20f 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -2110,7 +2110,7 @@ struct script_code* parse_script(const char *src,const char *file,int line,int o
 			default:
 				ShowMessage("unknown");
 			}
-			ShowMessage("\n");
+			ShowMessage(CL_CLL "\n");
 		}
 	}
 #endif
@@ -5208,10 +5208,10 @@ BUILDIN_FUNC(getitem2)
 	iden=script_getnum(st,4);
 	ref=script_getnum(st,5);
 	attr=script_getnum(st,6);
-	c1=script_getnum(st,7);
-	c2=script_getnum(st,8);
-	c3=script_getnum(st,9);
-	c4=script_getnum(st,10);
+	c1=(short)script_getnum(st,7);
+	c2=(short)script_getnum(st,8);
+	c3=(short)script_getnum(st,9);
+	c4=(short)script_getnum(st,10);
 
 	if(nameid<0) { // ƒ‰ƒ“ƒ_ƒ€
 		nameid=itemdb_searchrandomid(-nameid);
@@ -5242,10 +5242,10 @@ BUILDIN_FUNC(getitem2)
 			item_tmp.identify=0;
 		item_tmp.refine=ref;
 		item_tmp.attribute=attr;
-		item_tmp.card[0]=c1;
-		item_tmp.card[1]=c2;
-		item_tmp.card[2]=c3;
-		item_tmp.card[3]=c4;
+		item_tmp.card[0]=(short)c1;
+		item_tmp.card[1]=(short)c2;
+		item_tmp.card[2]=(short)c3;
+		item_tmp.card[3]=(short)c4;
 
 		//Check if it's stackable.
 		if (!itemdb_isstackable(nameid))
@@ -5666,10 +5666,10 @@ BUILDIN_FUNC(delitem2)
 	iden=script_getnum(st,4);
 	ref=script_getnum(st,5);
 	attr=script_getnum(st,6);
-	c1=script_getnum(st,7);
-	c2=script_getnum(st,8);
-	c3=script_getnum(st,9);
-	c4=script_getnum(st,10);
+	c1=(short)script_getnum(st,7);
+	c2=(short)script_getnum(st,8);
+	c3=(short)script_getnum(st,9);
+	c4=(short)script_getnum(st,10);
 
 	if( amount <= 0 )
 		return 0;// nothing to do
@@ -5709,7 +5709,7 @@ BUILDIN_FUNC(delitem2)
 		}
 	}
 
-	ShowError("script:delitem: failed to delete %d items (AID=%d item_id=%d).\n", amount, sd->status.account_id, nameid);
+	ShowError("script:delitem2: failed to delete %d items (AID=%d item_id=%d).\n", amount, sd->status.account_id, nameid);
 	st->state = END;
 	return 1;
 }
-- 
cgit v1.2.3-70-g09d2