summaryrefslogtreecommitdiff
path: root/src/map/script.c
diff options
context:
space:
mode:
authorultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-05-25 19:37:58 +0000
committerultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-05-25 19:37:58 +0000
commit604aa8ea6b8691e0b886bc55830930c65226e600 (patch)
tree57efd606c1a7727aadaa9938bbccb89dce09f90e /src/map/script.c
parentad50b37beff08ee93979c244d24a60c12c7bc1bf (diff)
downloadhercules-604aa8ea6b8691e0b886bc55830930c65226e600.tar.gz
hercules-604aa8ea6b8691e0b886bc55830930c65226e600.tar.bz2
hercules-604aa8ea6b8691e0b886bc55830930c65226e600.tar.xz
hercules-604aa8ea6b8691e0b886bc55830930c65226e600.zip
Reformatting, warning fixes, unsigned char removal
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10618 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/script.c')
-rw-r--r--src/map/script.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/map/script.c b/src/map/script.c
index 56e8174ae..8dd8cf071 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -363,7 +363,7 @@ static void check_event(struct script_state *st, const char *evt)
* 文字列のハッシュを計算
*------------------------------------------*/
#define calc_hash(x) (calc_hash2(x)%SCRIPT_HASH_SIZE)
-static unsigned int calc_hash2(const unsigned char *p)
+static unsigned int calc_hash2(const char* p)
{
#if defined(SCRIPT_HASH_DJB2)
unsigned int h = 5381;
@@ -2862,7 +2862,7 @@ void run_script_main(struct script_state *st)
push_val(stack,c,0);
break;
case C_STR:
- push_str(stack,C_CONSTSTR,(st->script->script_buf+st->pos));
+ push_str(stack,C_CONSTSTR,(char*)(st->script->script_buf+st->pos));
while(st->script->script_buf[st->pos++]);
break;
case C_FUNC:
@@ -4553,7 +4553,7 @@ BUILDIN_FUNC(callfunc)
struct script_code *scr, *oldscr;
const char *str=script_getstr(st,2);
- if( (scr=strdb_get(userfunc_db,(unsigned char*)str)) ){
+ if( (scr = strdb_get(userfunc_db, str)) ){
int i,j;
struct linkdb_node **oldval = st->stack->var_function;
for(i=st->start+3,j=0;i<st->end;i++,j++)
@@ -10258,7 +10258,7 @@ BUILDIN_FUNC(petloot)
BUILDIN_FUNC(getinventorylist)
{
TBL_PC *sd=script_rid2sd(st);
- unsigned char card_var[NAME_LENGTH];
+ char card_var[NAME_LENGTH];
int i,j=0,k;
if(!sd) return 0;