diff options
| author | amber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2005-03-29 16:46:19 +0000 |
|---|---|---|
| committer | amber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2005-03-29 16:46:19 +0000 |
| commit | ec35f4b8bce178430219c484566a8dceea015221 (patch) | |
| tree | 8ce50b81edebc57c308a00bccecbe066aa0fdcb0 /src/map/skill.c | |
| parent | 51079611e59264b02fdbb4beb0d3675cc64618e6 (diff) | |
| download | hercules-ec35f4b8bce178430219c484566a8dceea015221.tar.gz hercules-ec35f4b8bce178430219c484566a8dceea015221.tar.bz2 hercules-ec35f4b8bce178430219c484566a8dceea015221.tar.xz hercules-ec35f4b8bce178430219c484566a8dceea015221.zip | |
More C/C++ Conformance fixes
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@1334 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/skill.c')
| -rw-r--r-- | src/map/skill.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index 31b46820b..8420f0ac5 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -5261,7 +5261,7 @@ struct skill_unit_group *skill_unitsetting( struct block_list *src, int skillid, group->interval=interval; if(skillid==HT_TALKIEBOX || skillid==RG_GRAFFITI){ - group->valstr=aCallocA(80, 1); + group->valstr=(char *) aCallocA(80, 1); if(group->valstr==NULL){ printf("skill_castend_map: out of memory !\n"); exit(1); @@ -5878,7 +5878,7 @@ int skill_unit_onlimit(struct skill_unit *src,unsigned int tick) src->bl.x,src->bl.y,1); if(group == NULL) return 0; - group->valstr=aCallocA(24, 1); + group->valstr=(char *) aCallocA(24, 1); if(group->valstr==NULL){ printf("skill_unit_onlimit: out of memory !\n"); exit(1); @@ -8563,7 +8563,7 @@ int skill_unit_move_unit_group( struct skill_unit_group *group, int m,int dx,int group->skill_id!=HT_CLAYMORETRAP && group->skill_id!=HT_BLASTMINE) return 0; - m_flag = malloc(sizeof(int)*group->unit_count); + m_flag = (int *) aMalloc(sizeof(int)*group->unit_count); memset(m_flag,0,sizeof(int)*group->unit_count);// 移動フラグ // 先にフラグを全部決める // m_flag @@ -9524,7 +9524,7 @@ static int skill_read_skillspamount(void) struct skill_db *skill = NULL; int s, idx, new_flag=1, level=1, sp=0; - buf=grfio_reads("data\\leveluseskillspamount.txt",&s); + buf=(char *) grfio_reads("data\\leveluseskillspamount.txt",&s); if(buf==NULL) return -1; |