Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Undid the memset->malloc_set replacement

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9626 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
ultramage 2007-01-07 16:49:03 +00:00
parent 9f164c312b
commit fbe23f27a2
35 changed files with 409 additions and 469 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog-Trunk.txt
View File

@ -4,6 +4,8 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2007/01/07 2007/01/07
* Undid the memset->malloc_set replacement
(let's be compatible and leave such optimizations to system devs, ok?)
* Small reformatting of conf-tmpl * Small reformatting of conf-tmpl
* Renamed atcommand_sub to is_atcommand_sub (charcommand too) * Renamed atcommand_sub to is_atcommand_sub (charcommand too)
* Re-added the duplicit nj/gs name messages in msg_athena [ultramage] * Re-added the duplicit nj/gs name messages in msg_athena [ultramage]

2
src/char_sql/itemdb.c
View File

@ -99,7 +99,7 @@ static int itemdb_readdb(void)
lines++; lines++;
if(line[0]=='/' && line[1]=='/') if(line[0]=='/' && line[1]=='/')
continue; continue;
malloc_tsetdword(str,0,sizeof(str)); memset(str,0,sizeof(str));
for(j=0,np=p=line;j<4 && p;j++){ for(j=0,np=p=line;j<4 && p;j++){
str[j]=p; str[j]=p;
p=strchr(p,','); p=strchr(p,',');

2
src/common/graph.c
View File

@ -71,7 +71,7 @@ void graph_pallet(struct graph* g, int index,unsigned long c) {
if(g == NULL || c >= 256) return; if(g == NULL || c >= 256) return;
if(g->pallet_count <= index) { if(g->pallet_count <= index) {
malloc_set(g->png_data + 0x29 + 3 * g->pallet_count,0,(index - g->pallet_count) * 3); memset(g->png_data + 0x29 + 3 * g->pallet_count,0,(index - g->pallet_count) * 3);
g->pallet_count = index + 1; g->pallet_count = index + 1;
} }
g->png_data[0x29 + index * 3 ] = (unsigned char)((c >> 16) & 0xFF); // R g->png_data[0x29 + index * 3 ] = (unsigned char)((c >> 16) & 0xFF); // R

8
src/common/grfio.c
View File

@ -169,7 +169,7 @@ static void BitConvert(BYTE *Src,char *BitSwapTable)
int lop,prm; int lop,prm;
BYTE tmp[8]; BYTE tmp[8];
// *(DWORD*)tmp=*(DWORD*)(tmp+4)=0; // *(DWORD*)tmp=*(DWORD*)(tmp+4)=0;
malloc_tsetdword(tmp,0,8); memset(tmp,0,8);
for(lop=0;lop!=64;lop++) { for(lop=0;lop!=64;lop++) {
prm = BitSwapTable[lop]-1; prm = BitSwapTable[lop]-1;
if (Src[(prm >> 3) & 7] & BitMaskTable[prm & 7]) { if (Src[(prm >> 3) & 7] & BitMaskTable[prm & 7]) {
@ -299,7 +299,7 @@ int decode_zip(unsigned char *dest, unsigned long* destLen, const unsigned char*
int encode_zip(unsigned char *dest, unsigned long* destLen, const unsigned char* source, unsigned long sourceLen) { int encode_zip(unsigned char *dest, unsigned long* destLen, const unsigned char* source, unsigned long sourceLen) {
z_stream stream; z_stream stream;
int err; int err;
malloc_tsetdword(&stream, 0, sizeof(stream)); memset(&stream, 0, sizeof(stream));
stream.next_in = (Bytef*)source; stream.next_in = (Bytef*)source;
stream.avail_in = (uInt)sourceLen; stream.avail_in = (uInt)sourceLen;
/* Check for source > 64K on 16-bit machine: */ /* Check for source > 64K on 16-bit machine: */
@ -479,7 +479,7 @@ static FILELIST* filelist_add(FILELIST *entry)
if (filelist_entrys >= filelist_maxentry) { if (filelist_entrys >= filelist_maxentry) {
filelist = (FILELIST *)aRealloc(filelist, (filelist_maxentry + FILELIST_ADDS) * sizeof(FILELIST)); filelist = (FILELIST *)aRealloc(filelist, (filelist_maxentry + FILELIST_ADDS) * sizeof(FILELIST));
malloc_tsetdword(filelist + filelist_maxentry, '\0', FILELIST_ADDS * sizeof(FILELIST)); memset(filelist + filelist_maxentry, '\0', FILELIST_ADDS * sizeof(FILELIST));
filelist_maxentry += FILELIST_ADDS; filelist_maxentry += FILELIST_ADDS;
} }
@ -949,7 +949,7 @@ char *grfio_alloc_ptr(char *fname)
if (gentry_entrys >= gentry_maxentry) { if (gentry_entrys >= gentry_maxentry) {
gentry_maxentry += GENTRY_ADDS; gentry_maxentry += GENTRY_ADDS;
gentry_table = (char**)aRealloc(gentry_table, gentry_maxentry * sizeof(char*)); gentry_table = (char**)aRealloc(gentry_table, gentry_maxentry * sizeof(char*));
malloc_tsetdword(gentry_table + (gentry_maxentry - GENTRY_ADDS), 0, sizeof(char*) * GENTRY_ADDS); memset(gentry_table + (gentry_maxentry - GENTRY_ADDS), 0, sizeof(char*) * GENTRY_ADDS);
} }
len = strlen( fname ); len = strlen( fname );
buf = (char*)aMallocA(len + 1); buf = (char*)aMallocA(len + 1);

57
src/common/malloc.c
View File

@ -88,15 +88,13 @@ void aFree_(void *p, const char *file, int line, const char *func)
void* _bcallocA(size_t size, size_t cnt) void* _bcallocA(size_t size, size_t cnt)
{ {
void *ret = MALLOCA(size * cnt); void *ret = MALLOCA(size * cnt);
if (ret) //malloc_set(ret, 0, size * cnt); if (ret) memset(ret, 0, size * cnt);
malloc_set(ret, 0, size*cnt);
return ret; return ret;
} }
void* _bcalloc(size_t size, size_t cnt) void* _bcalloc(size_t size, size_t cnt)
{ {
void *ret = MALLOC(size * cnt); void *ret = MALLOC(size * cnt);
if (ret) //malloc_set(ret, 0, size * cnt); if (ret) memset(ret, 0, size * cnt);
malloc_set(ret, 0, size*cnt);
return ret; return ret;
} }
char* _bstrdup(const char *chr) char* _bstrdup(const char *chr)
@ -295,8 +293,7 @@ void* _mmalloc(size_t size, const char *file, int line, const char *func ) {
void* _mcalloc(size_t num, size_t size, const char *file, int line, const char *func ) { void* _mcalloc(size_t num, size_t size, const char *file, int line, const char *func ) {
void *p = _mmalloc(num * size,file,line,func); void *p = _mmalloc(num * size,file,line,func);
//malloc_set(p,0,num * size); memset(p,0,num * size);
malloc_set(p,0,num*size);
return p; return p;
} }
@ -654,54 +651,6 @@ static void memmgr_init (void)
} }
#endif #endif
#if defined(MEMSET_TURBO) && defined(_WIN32)
void malloc_set(void *dest, int value, int count){
_asm
{
mov eax, value
mov ecx, count
mov ebx, ecx
mov edi, dest
shr ecx, 2
test ecx, ecx
jz ByteOp
shl ecx, 2
sub ebx, ecx
shr ecx, 2
rep stosd
test ebx, ebx
jz Done
ByteOp:
mov ecx, ebx
rep stosb
Done:
}
}
// Sets 32-bit aligned memory.
void malloc_tsetdword(void *dest, int value, int count){
_asm
{
mov edi, dest
mov ecx, count
shr ecx, 2
mov eax, value
rep stosd
}
}
// Sets 16-bit aligned memory.
void malloc_tsetword(void *dest, short value, int count){
_asm
{
mov edi, dest
mov ecx, count
shr ecx, 1
mov ax, value
rep stosw
}
}
#endif
/*====================================== /*======================================
* Initialise * Initialise
*-------------------------------------- *--------------------------------------

11
src/common/malloc.h
View File

@ -10,8 +10,6 @@
// and I have doubts our implementation works. // and I have doubts our implementation works.
// -> They should NOT be used, period. // -> They should NOT be used, period.
#define MEMSET_TURBO
#ifndef __NETBSD__ #ifndef __NETBSD__
#if __STDC_VERSION__ < 199901L #if __STDC_VERSION__ < 199901L
# if __GNUC__ >= 2 # if __GNUC__ >= 2
@ -163,15 +161,6 @@ unsigned int malloc_usage (void);
#define INLINE inline #define INLINE inline
#endif #endif
#endif #endif
#if defined(MEMSET_TURBO) && defined(_WIN32)
INLINE void malloc_set(void *, int, int);
INLINE void malloc_tsetdword(void *, int, int);
INLINE void malloc_tsetword(void *, short, int);
#else
#define malloc_set(x,y,z) memset(x,y,z)
#define malloc_tsetdword(x,y,z) memset(x,y,z)
#define malloc_tsetword(x,y,z) memset(x,y,z)
#endif
void malloc_init (void); void malloc_init (void);
void malloc_final (void); void malloc_final (void);

2
src/common/mapindex.c
View File

@ -106,7 +106,7 @@ void mapindex_init(void) {
int index; int index;
char map_name[1024]; char map_name[1024];
malloc_tsetdword (&indexes, 0, sizeof (indexes)); memset (&indexes, 0, sizeof (indexes));
fp=fopen(mapindex_cfgfile,"r"); fp=fopen(mapindex_cfgfile,"r");
if(fp==NULL){ if(fp==NULL){
ShowFatalError("Unable to read mapindex config file %s!\n", mapindex_cfgfile); ShowFatalError("Unable to read mapindex config file %s!\n", mapindex_cfgfile);

2
src/common/plugins.c
View File

@ -133,7 +133,7 @@ int export_symbol (void *var, int offset)
plugin_call_table = (void**)aRealloc(plugin_call_table, max_call_table*sizeof(void*)); plugin_call_table = (void**)aRealloc(plugin_call_table, max_call_table*sizeof(void*));
// clear the new alloced block // clear the new alloced block
malloc_tsetdword(plugin_call_table + call_table_size, 0, (max_call_table-call_table_size)*sizeof(void*)); memset(plugin_call_table + call_table_size, 0, (max_call_table-call_table_size)*sizeof(void*));
} }
// the new table size is delimited by the new element at the end // the new table size is delimited by the new element at the end

4
src/common/socket.c
View File

@ -434,7 +434,7 @@ int start_console(void) {
if (!session[0]) { // dummy socket already uses fd 0 if (!session[0]) { // dummy socket already uses fd 0
CREATE(session[0], struct socket_data, 1); CREATE(session[0], struct socket_data, 1);
} }
malloc_set(session[0],0,sizeof(*session[0])); memset(session[0],0,sizeof(*session[0]));
session[0]->func_recv = console_recieve; session[0]->func_recv = console_recieve;
session[0]->func_console = default_console_parse; session[0]->func_console = default_console_parse;
@ -1233,7 +1233,7 @@ void socket_init(void)
session[0]->max_rdata = 2*rfifo_size; session[0]->max_rdata = 2*rfifo_size;
session[0]->max_wdata = 2*wfifo_size; session[0]->max_wdata = 2*wfifo_size;
malloc_set(func_parse_table, 0, sizeof(func_parse_table)); memset(func_parse_table, 0, sizeof(func_parse_table));
func_parse_table[SESSION_RAW].check = default_func_check; func_parse_table[SESSION_RAW].check = default_func_check;
func_parse_table[SESSION_RAW].func = default_func_parse; func_parse_table[SESSION_RAW].func = default_func_parse;

2
src/common/strlib.c
View File

@ -123,7 +123,7 @@ char *trim(char *str, const char *delim)
char *strp = strtok(str,delim); char *strp = strtok(str,delim);
char buf[1024]; char buf[1024];
char *bufp = buf; char *bufp = buf;
malloc_tsetdword(buf,0,sizeof buf); memset(buf,0,sizeof buf);
while(strp) { while(strp) {
strcpy(bufp, strp); strcpy(bufp, strp);

6
src/common/timer.c
View File

@ -153,7 +153,7 @@ static void push_timer_heap(int tid)
} else { } else {
timer_heap_max += 256; timer_heap_max += 256;
RECREATE(timer_heap, int, timer_heap_max); RECREATE(timer_heap, int, timer_heap_max);
malloc_tsetdword(timer_heap + (timer_heap_max - 256), 0, sizeof(int) * 256); memset(timer_heap + (timer_heap_max - 256), 0, sizeof(int) * 256);
} }
} }
@ -223,7 +223,7 @@ static int acquire_timer(void)
{// add more timers {// add more timers
timer_data_max += 256; timer_data_max += 256;
RECREATE(timer_data, struct TimerData, timer_data_max); RECREATE(timer_data, struct TimerData, timer_data_max);
malloc_tsetdword(timer_data + (timer_data_max - 256), 0, sizeof(struct TimerData) * 256); memset(timer_data + (timer_data_max - 256), 0, sizeof(struct TimerData) * 256);
} }
} }
@ -412,7 +412,7 @@ int do_timer(unsigned int tick)
if (free_timer_list_pos >= free_timer_list_max) { if (free_timer_list_pos >= free_timer_list_max) {
free_timer_list_max += 256; free_timer_list_max += 256;
RECREATE(free_timer_list,int,free_timer_list_max); RECREATE(free_timer_list,int,free_timer_list_max);
malloc_tsetdword(free_timer_list + (free_timer_list_max - 256), 0, 256 * sizeof(int)); memset(free_timer_list + (free_timer_list_max - 256), 0, 256 * sizeof(int));
} }
free_timer_list[free_timer_list_pos++] = i; free_timer_list[free_timer_list_pos++] = i;
break; break;

258
src/map/atcommand.c
View File

@ -782,7 +782,7 @@ is_atcommand_sub(const int fd, struct map_session_data* sd, const char* str, int
AtCommandInfo info; AtCommandInfo info;
AtCommandType type; AtCommandType type;
malloc_set(&info, 0, sizeof(info)); memset(&info, 0, sizeof(info));
type = atcommand(sd, gmlvl, str, &info); type = atcommand(sd, gmlvl, str, &info);
if (type != AtCommand_None) { if (type != AtCommand_None) {
@ -797,8 +797,8 @@ is_atcommand_sub(const int fd, struct map_session_data* sd, const char* str, int
return AtCommand_None; return AtCommand_None;
} }
malloc_tsetdword(command, '\0', sizeof(command)); memset(command, '\0', sizeof(command));
malloc_tsetdword(atcmd_output, '\0', sizeof(atcmd_output)); memset(atcmd_output, '\0', sizeof(atcmd_output));
while (*p && !isspace(*p)) while (*p && !isspace(*p))
p++; p++;
if (p - str >= sizeof(command)) // too long if (p - str >= sizeof(command)) // too long
@ -877,7 +877,7 @@ AtCommandType atcommand(struct map_session_data* sd, const int level, const char
if (*p == atcommand_symbol) { // check first char, try to skip |00 (or something else) [Lance] if (*p == atcommand_symbol) { // check first char, try to skip |00 (or something else) [Lance]
char command[101]; char command[101];
int i = 0; int i = 0;
malloc_set(info, 0, sizeof(AtCommandInfo)); memset(info, 0, sizeof(AtCommandInfo));
sscanf(p, "%100s", command); sscanf(p, "%100s", command);
command[sizeof(command)-1] = '\0'; command[sizeof(command)-1] = '\0';
@ -922,7 +922,7 @@ int msg_config_read(const char *cfgName) {
} }
if ((--called) == 0) if ((--called) == 0)
malloc_tsetdword(msg_table, 0, sizeof(msg_table[0]) * MAX_MSG); memset(msg_table, 0, sizeof(msg_table[0]) * MAX_MSG);
while(fgets(line, sizeof(line)-1, fp)) { while(fgets(line, sizeof(line)-1, fp)) {
if (line[0] == '/' && line[1] == '/') if (line[0] == '/' && line[1] == '/')
continue; continue;
@ -1034,7 +1034,7 @@ int atcommand_commands(
int i_cur_cmd,gm_lvl = pc_isGM(sd), count = 0; int i_cur_cmd,gm_lvl = pc_isGM(sd), count = 0;
malloc_tsetdword(cz_line_buff,' ',MESSAGE_SIZE); memset(cz_line_buff,' ',MESSAGE_SIZE);
cz_line_buff[MESSAGE_SIZE] = 0; cz_line_buff[MESSAGE_SIZE] = 0;
clif_displaymessage(fd, msg_txt(273)); clif_displaymessage(fd, msg_txt(273));
@ -1052,7 +1052,7 @@ int atcommand_commands(
{ {
clif_displaymessage(fd,(char*)cz_line_buff); clif_displaymessage(fd,(char*)cz_line_buff);
lpcz_cur = cz_line_buff; lpcz_cur = cz_line_buff;
malloc_tsetdword(cz_line_buff,' ',MESSAGE_SIZE); memset(cz_line_buff,' ',MESSAGE_SIZE);
cz_line_buff[MESSAGE_SIZE] = 0; cz_line_buff[MESSAGE_SIZE] = 0;
} }
@ -1320,7 +1320,7 @@ int atcommand_rura(
nullpo_retr(-1, sd); nullpo_retr(-1, sd);
malloc_tsetdword(map_name, '\0', sizeof(map_name)); memset(map_name, '\0', sizeof(map_name));
if (!message || !*message || if (!message || !*message ||
(sscanf(message, "%15s %d %d", map_name, &x, &y) < 3 && (sscanf(message, "%15s %d %d", map_name, &x, &y) < 3 &&
@ -1376,7 +1376,7 @@ int atcommand_where(
int GM_level, pl_GM_level; int GM_level, pl_GM_level;
nullpo_retr(-1, sd); nullpo_retr(-1, sd);
malloc_tsetdword(atcmd_player_name, '\0', sizeof atcmd_player_name); memset(atcmd_player_name, '\0', sizeof atcmd_player_name);
if (!message || !*message || sscanf(message, "%23[^\n]", atcmd_player_name) < 1) { if (!message || !*message || sscanf(message, "%23[^\n]", atcmd_player_name) < 1) {
clif_displaymessage(fd, "Please, enter a player name (usage: @where <char name>)."); clif_displaymessage(fd, "Please, enter a player name (usage: @where <char name>).");
@ -1425,7 +1425,7 @@ int atcommand_jumpto(
return -1; return -1;
} }
malloc_tsetdword(atcmd_player_name, '\0', sizeof atcmd_player_name); memset(atcmd_player_name, '\0', sizeof atcmd_player_name);
if (sscanf(message, "%23[^\n]", atcmd_player_name) < 1) if (sscanf(message, "%23[^\n]", atcmd_player_name) < 1)
return -1; return -1;
if(strncmp(sd->status.name,atcmd_player_name,NAME_LENGTH)==0) //Yourself mate? Tsk tsk tsk. if(strncmp(sd->status.name,atcmd_player_name,NAME_LENGTH)==0) //Yourself mate? Tsk tsk tsk.
@ -1463,7 +1463,7 @@ int atcommand_jump(
nullpo_retr(-1, sd); nullpo_retr(-1, sd);
malloc_tsetdword(atcmd_output, '\0', sizeof(atcmd_output)); memset(atcmd_output, '\0', sizeof(atcmd_output));
sscanf(message, "%d %d", &x, &y); sscanf(message, "%d %d", &x, &y);
@ -1498,9 +1498,9 @@ int atcommand_who3(
nullpo_retr(-1, sd); nullpo_retr(-1, sd);
malloc_tsetdword(atcmd_output, '\0', sizeof(atcmd_output)); memset(atcmd_output, '\0', sizeof(atcmd_output));
malloc_tsetdword(match_text, '\0', sizeof(match_text)); memset(match_text, '\0', sizeof(match_text));
malloc_tsetdword(player_name, '\0', sizeof(player_name)); memset(player_name, '\0', sizeof(player_name));
if (sscanf(message, "%99[^\n]", match_text) < 1) if (sscanf(message, "%99[^\n]", match_text) < 1)
strcpy(match_text, ""); strcpy(match_text, "");
@ -1573,9 +1573,9 @@ int atcommand_who2(
nullpo_retr(-1, sd); nullpo_retr(-1, sd);
malloc_tsetdword(atcmd_output, '\0', sizeof(atcmd_output)); memset(atcmd_output, '\0', sizeof(atcmd_output));
malloc_tsetdword(match_text, '\0', sizeof(match_text)); memset(match_text, '\0', sizeof(match_text));
malloc_tsetdword(player_name, '\0', sizeof(player_name)); memset(player_name, '\0', sizeof(player_name));
if (sscanf(message, "%99[^\n]", match_text) < 1) if (sscanf(message, "%99[^\n]", match_text) < 1)
strcpy(match_text, ""); strcpy(match_text, "");
@ -1645,10 +1645,10 @@ int atcommand_who(
nullpo_retr(-1, sd); nullpo_retr(-1, sd);
malloc_tsetdword(temp0, '\0', sizeof(temp0)); memset(temp0, '\0', sizeof(temp0));
malloc_tsetdword(atcmd_output, '\0', sizeof(atcmd_output)); memset(atcmd_output, '\0', sizeof(atcmd_output));
malloc_tsetdword(match_text, '\0', sizeof(match_text)); memset(match_text, '\0', sizeof(match_text));
malloc_tsetdword(player_name, '\0', sizeof(player_name)); memset(player_name, '\0', sizeof(player_name));
if (sscanf(message, "%99[^\n]", match_text) < 1) if (sscanf(message, "%99[^\n]", match_text) < 1)
strcpy(match_text, ""); strcpy(match_text, "");
@ -1722,8 +1722,8 @@ int atcommand_whomap3(
int map_id; int map_id;
char map_name[MAP_NAME_LENGTH]; char map_name[MAP_NAME_LENGTH];
malloc_tsetdword(atcmd_output, '\0', sizeof(atcmd_output)); memset(atcmd_output, '\0', sizeof(atcmd_output));
malloc_tsetdword(map_name, '\0', sizeof(map_name)); memset(map_name, '\0', sizeof(map_name));
if (!message || !*message) if (!message || !*message)
map_id = sd->bl.m; map_id = sd->bl.m;
@ -1782,8 +1782,8 @@ int atcommand_whomap2(
nullpo_retr(-1, sd); nullpo_retr(-1, sd);
malloc_tsetdword(atcmd_output, '\0', sizeof(atcmd_output)); memset(atcmd_output, '\0', sizeof(atcmd_output));
malloc_tsetdword(map_name, '\0', sizeof(map_name)); memset(map_name, '\0', sizeof(map_name));
if (!message || !*message) if (!message || !*message)
map_id = sd->bl.m; map_id = sd->bl.m;
@ -1846,10 +1846,10 @@ int atcommand_whomap(
nullpo_retr(-1, sd); nullpo_retr(-1, sd);
malloc_tsetdword(temp0, '\0', sizeof(temp0)); memset(temp0, '\0', sizeof(temp0));
malloc_tsetdword(temp1, '\0', sizeof(temp1)); memset(temp1, '\0', sizeof(temp1));
malloc_tsetdword(atcmd_output, '\0', sizeof(atcmd_output)); memset(atcmd_output, '\0', sizeof(atcmd_output));
malloc_tsetdword(map_name, '\0', sizeof(map_name)); memset(map_name, '\0', sizeof(map_name));
if (!message || !*message) if (!message || !*message)
map_id = sd->bl.m; map_id = sd->bl.m;
@ -1923,11 +1923,11 @@ int atcommand_whogm(
nullpo_retr(-1, sd); nullpo_retr(-1, sd);
malloc_tsetdword(temp0, '\0', sizeof(temp0)); memset(temp0, '\0', sizeof(temp0));
malloc_tsetdword(temp1, '\0', sizeof(temp1)); memset(temp1, '\0', sizeof(temp1));
malloc_tsetdword(atcmd_output, '\0', sizeof(atcmd_output)); memset(atcmd_output, '\0', sizeof(atcmd_output));
malloc_tsetdword(match_text, '\0', sizeof(match_text)); memset(match_text, '\0', sizeof(match_text));
malloc_tsetdword(player_name, '\0', sizeof(player_name)); memset(player_name, '\0', sizeof(player_name));
if (sscanf(message, "%99[^\n]", match_text) < 1) if (sscanf(message, "%99[^\n]", match_text) < 1)
strcpy(match_text, ""); strcpy(match_text, "");
@ -1994,9 +1994,9 @@ int atcommand_whozeny(
nullpo_retr(-1, sd); nullpo_retr(-1, sd);
malloc_tsetdword(atcmd_output, '\0', sizeof(atcmd_output)); memset(atcmd_output, '\0', sizeof(atcmd_output));
malloc_tsetdword(match_text, '\0', sizeof(match_text)); memset(match_text, '\0', sizeof(match_text));
malloc_tsetdword(player_name, '\0', sizeof(player_name)); memset(player_name, '\0', sizeof(player_name));
if (sscanf(message, "%99[^\n]", match_text) < 1) if (sscanf(message, "%99[^\n]", match_text) < 1)
strcpy(match_text, ""); strcpy(match_text, "");
@ -2144,7 +2144,7 @@ int atcommand_speed(
nullpo_retr(-1, sd); nullpo_retr(-1, sd);
malloc_tsetdword(atcmd_output, '\0', sizeof(atcmd_output)); memset(atcmd_output, '\0', sizeof(atcmd_output));
if (!message || !*message) { if (!message || !*message) {
sprintf(atcmd_output, "Please, enter a speed value (usage: @speed <%d-%d>).", MIN_WALK_SPEED, MAX_WALK_SPEED); sprintf(atcmd_output, "Please, enter a speed value (usage: @speed <%d-%d>).", MIN_WALK_SPEED, MAX_WALK_SPEED);
@ -2179,8 +2179,8 @@ int atcommand_charspeed(
nullpo_retr(-1, sd); nullpo_retr(-1, sd);
malloc_tsetdword(atcmd_output, '\0', sizeof(atcmd_output)); memset(atcmd_output, '\0', sizeof(atcmd_output));
malloc_tsetdword(atcmd_player_name, '\0', sizeof(atcmd_player_name)); memset(atcmd_player_name, '\0', sizeof(atcmd_player_name));
if (!message || !*message || sscanf(message, "%d %23[^\n]", &speed, atcmd_player_name) < 2) { if (!message || !*message || sscanf(message, "%d %23[^\n]", &speed, atcmd_player_name) < 2) {
sprintf(atcmd_output, "Please, enter a speed and a player name (usage: @charspeed <speed <%d-%d>> <char name>).", MIN_WALK_SPEED, MAX_WALK_SPEED); sprintf(atcmd_output, "Please, enter a speed and a player name (usage: @charspeed <speed <%d-%d>> <char name>).", MIN_WALK_SPEED, MAX_WALK_SPEED);
@ -2474,7 +2474,7 @@ int atcommand_kill(
struct map_session_data *pl_sd; struct map_session_data *pl_sd;
nullpo_retr(-1, sd); nullpo_retr(-1, sd);
malloc_tsetdword(atcmd_player_name, '\0', sizeof(atcmd_player_name)); memset(atcmd_player_name, '\0', sizeof(atcmd_player_name));
if (!message || !*message || sscanf(message, "%23[^\n]", atcmd_player_name) < 1) { if (!message || !*message || sscanf(message, "%23[^\n]", atcmd_player_name) < 1) {
clif_displaymessage(fd, "Please, enter a player name (usage: @kill <char name>)."); clif_displaymessage(fd, "Please, enter a player name (usage: @kill <char name>).");
@ -2525,7 +2525,7 @@ int atcommand_kami(
unsigned long color=0; unsigned long color=0;
nullpo_retr(-1, sd); nullpo_retr(-1, sd);
malloc_tsetdword(atcmd_output, '\0', sizeof(atcmd_output)); memset(atcmd_output, '\0', sizeof(atcmd_output));
if(*(command + 5) != 'c' && *(command + 5) != 'C') { if(*(command + 5) != 'c' && *(command + 5) != 'C') {
@ -2626,7 +2626,7 @@ int atcommand_item(
int get_count, i; int get_count, i;
nullpo_retr(-1, sd); nullpo_retr(-1, sd);
malloc_tsetdword(item_name, '\0', sizeof(item_name)); memset(item_name, '\0', sizeof(item_name));
if (!message || !*message || sscanf(message, "%99s %d", item_name, &number) < 1) { if (!message || !*message || sscanf(message, "%99s %d", item_name, &number) < 1) {
clif_displaymessage(fd, "Please, enter an item name/id (usage: @item <item name or ID> [quantity])."); clif_displaymessage(fd, "Please, enter an item name/id (usage: @item <item name or ID> [quantity]).");
@ -2652,7 +2652,7 @@ int atcommand_item(
for (i = 0; i < number; i += get_count) { for (i = 0; i < number; i += get_count) {
// if not pet egg // if not pet egg
if (!pet_create_egg(sd, item_id)) { if (!pet_create_egg(sd, item_id)) {
malloc_set(&item_tmp, 0, sizeof(item_tmp)); memset(&item_tmp, 0, sizeof(item_tmp));
item_tmp.nameid = item_id; item_tmp.nameid = item_id;
item_tmp.identify = 1; item_tmp.identify = 1;
@ -2687,7 +2687,7 @@ int atcommand_item2(
int loop, get_count, i; int loop, get_count, i;
nullpo_retr(-1, sd); nullpo_retr(-1, sd);
malloc_tsetdword(item_name, '\0', sizeof(item_name)); memset(item_name, '\0', sizeof(item_name));
if (!message || !*message || sscanf(message, "%99s %d %d %d %d %d %d %d %d", item_name, &number, &identify, &refine, &attr, &c1, &c2, &c3, &c4) < 9) { if (!message || !*message || sscanf(message, "%99s %d %d %d %d %d %d %d %d", item_name, &number, &identify, &refine, &attr, &c1, &c2, &c3, &c4) < 9) {
clif_displaymessage(fd, "Please, enter all informations (usage: @item2 <item name or ID> <quantity>"); clif_displaymessage(fd, "Please, enter all informations (usage: @item2 <item name or ID> <quantity>");
@ -2723,7 +2723,7 @@ int atcommand_item2(
refine = attr = 0; refine = attr = 0;
} }
for (i = 0; i < loop; i++) { for (i = 0; i < loop; i++) {
malloc_set(&item_tmp, 0, sizeof(item_tmp)); memset(&item_tmp, 0, sizeof(item_tmp));
item_tmp.nameid = item_id; item_tmp.nameid = item_id;
item_tmp.identify = identify; item_tmp.identify = identify;
item_tmp.refine = refine; item_tmp.refine = refine;
@ -2916,7 +2916,7 @@ int atcommand_help(
FILE* fp; FILE* fp;
nullpo_retr(-1, sd); nullpo_retr(-1, sd);
malloc_tsetdword(buf, '\0', sizeof(buf)); memset(buf, '\0', sizeof(buf));
if ((fp = fopen(help_txt, "r")) != NULL) { if ((fp = fopen(help_txt, "r")) != NULL) {
clif_displaymessage(fd, msg_txt(26)); /* Help commands: */ clif_displaymessage(fd, msg_txt(26)); /* Help commands: */
@ -2957,7 +2957,7 @@ int atcommand_help2(
FILE* fp; FILE* fp;
nullpo_retr(-1, sd); nullpo_retr(-1, sd);
malloc_tsetdword(buf, '\0', sizeof(buf)); memset(buf, '\0', sizeof(buf));
if ((fp = fopen(help2_txt, "r")) != NULL) { if ((fp = fopen(help2_txt, "r")) != NULL) {
clif_displaymessage(fd, msg_txt(26)); /* Help commands: */ clif_displaymessage(fd, msg_txt(26)); /* Help commands: */
@ -2997,7 +2997,7 @@ int atcommand_gm(
char password[100]; char password[100];
nullpo_retr(-1, sd); nullpo_retr(-1, sd);
malloc_tsetdword(password, '\0', sizeof(password)); memset(password, '\0', sizeof(password));
if (!message || !*message || sscanf(message, "%99[^\n]", password) < 1) { if (!message || !*message || sscanf(message, "%99[^\n]", password) < 1) {
clif_displaymessage(fd, "Please, enter a password (usage: @gm <password>)."); clif_displaymessage(fd, "Please, enter a password (usage: @gm <password>).");
@ -3143,7 +3143,7 @@ int atcommand_model(
int hair_style = 0, hair_color = 0, cloth_color = 0; int hair_style = 0, hair_color = 0, cloth_color = 0;
nullpo_retr(-1, sd); nullpo_retr(-1, sd);
malloc_tsetdword(atcmd_output, '\0', sizeof(atcmd_output)); memset(atcmd_output, '\0', sizeof(atcmd_output));
if (!message || !*message || sscanf(message, "%d %d %d", &hair_style, &hair_color, &cloth_color) < 1) { if (!message || !*message || sscanf(message, "%d %d %d", &hair_style, &hair_color, &cloth_color) < 1) {
sprintf(atcmd_output, "Please, enter at least a value (usage: @model <hair ID: %d-%d> <hair color: %d-%d> <clothes color: %d-%d>).", sprintf(atcmd_output, "Please, enter at least a value (usage: @model <hair ID: %d-%d> <hair color: %d-%d> <clothes color: %d-%d>).",
@ -3186,7 +3186,7 @@ int atcommand_dye(const int fd, struct map_session_data* sd, const char* command
int cloth_color = 0; int cloth_color = 0;
nullpo_retr(-1, sd); nullpo_retr(-1, sd);
malloc_tsetdword(atcmd_output, '\0', sizeof(atcmd_output)); memset(atcmd_output, '\0', sizeof(atcmd_output));
if (!message || !*message || sscanf(message, "%d", &cloth_color) < 1) { if (!message || !*message || sscanf(message, "%d", &cloth_color) < 1) {
sprintf(atcmd_output, "Please, enter a clothes color (usage: @dye/@ccolor <clothes color: %d-%d>).", MIN_CLOTH_COLOR, MAX_CLOTH_COLOR); sprintf(atcmd_output, "Please, enter a clothes color (usage: @dye/@ccolor <clothes color: %d-%d>).", MIN_CLOTH_COLOR, MAX_CLOTH_COLOR);
@ -3214,7 +3214,7 @@ int atcommand_hair_style(const int fd, struct map_session_data* sd, const char*
int hair_style = 0; int hair_style = 0;
nullpo_retr(-1, sd); nullpo_retr(-1, sd);
malloc_tsetdword(atcmd_output, '\0', sizeof(atcmd_output)); memset(atcmd_output, '\0', sizeof(atcmd_output));
if (!message || !*message || sscanf(message, "%d", &hair_style) < 1) { if (!message || !*message || sscanf(message, "%d", &hair_style) < 1) {
sprintf(atcmd_output, "Please, enter a hair style (usage: @hairstyle/@hstyle <hair ID: %d-%d>).", MIN_HAIR_STYLE, MAX_HAIR_STYLE); sprintf(atcmd_output, "Please, enter a hair style (usage: @hairstyle/@hstyle <hair ID: %d-%d>).", MIN_HAIR_STYLE, MAX_HAIR_STYLE);
@ -3261,7 +3261,7 @@ int atcommand_hair_color(const int fd, struct map_session_data* sd, const char*
int hair_color = 0; int hair_color = 0;
nullpo_retr(-1, sd); nullpo_retr(-1, sd);
malloc_tsetdword(atcmd_output, '\0', sizeof(atcmd_output)); memset(atcmd_output, '\0', sizeof(atcmd_output));
if (!message || !*message || sscanf(message, "%d", &hair_color) < 1) { if (!message || !*message || sscanf(message, "%d", &hair_color) < 1) {
sprintf(atcmd_output, "Please, enter a hair color (usage: @haircolor/@hcolor <hair color: %d-%d>).", MIN_HAIR_COLOR, MAX_HAIR_COLOR); sprintf(atcmd_output, "Please, enter a hair color (usage: @haircolor/@hcolor <hair color: %d-%d>).", MIN_HAIR_COLOR, MAX_HAIR_COLOR);
@ -3335,8 +3335,8 @@ int atcommand_go(
return 0; return 0;
} }
malloc_tsetdword(map_name, '\0', sizeof(map_name)); memset(map_name, '\0', sizeof(map_name));
malloc_tsetdword(atcmd_output, '\0', sizeof(atcmd_output)); memset(atcmd_output, '\0', sizeof(atcmd_output));
// get the number // get the number
town = atoi(message); town = atoi(message);
@ -3494,9 +3494,9 @@ int atcommand_monster(
short mx, my; short mx, my;
nullpo_retr(-1, sd); nullpo_retr(-1, sd);
malloc_tsetdword(name, '\0', sizeof(name)); memset(name, '\0', sizeof(name));
malloc_tsetdword(monster, '\0', sizeof(monster)); memset(monster, '\0', sizeof(monster));
malloc_tsetdword(atcmd_output, '\0', sizeof(atcmd_output)); memset(atcmd_output, '\0', sizeof(atcmd_output));
if (!message || !*message) { if (!message || !*message) {
clif_displaymessage(fd, msg_txt(80)); // Give a display name and monster name/id please. clif_displaymessage(fd, msg_txt(80)); // Give a display name and monster name/id please.
@ -3753,7 +3753,7 @@ void atcommand_killmonster_sub(
if (!sd) return; if (!sd) return;
malloc_tsetdword(map_name, '\0', sizeof(map_name)); memset(map_name, '\0', sizeof(map_name));
if (!message || !*message || sscanf(message, "%15s", map_name) < 1) if (!message || !*message || sscanf(message, "%15s", map_name) < 1)
map_id = sd->bl.m; map_id = sd->bl.m;
@ -3811,7 +3811,7 @@ int atcommand_refine(
int count; int count;
nullpo_retr(-1, sd); nullpo_retr(-1, sd);
malloc_tsetdword(atcmd_output, '\0', sizeof(atcmd_output)); memset(atcmd_output, '\0', sizeof(atcmd_output));
if (!message || !*message || sscanf(message, "%d %d", &position, &refine) < 2) { if (!message || !*message || sscanf(message, "%d %d", &position, &refine) < 2) {
clif_displaymessage(fd, "Please, enter a position and a amount (usage: @refine <equip position> <+/- amount>)."); clif_displaymessage(fd, "Please, enter a position and a amount (usage: @refine <equip position> <+/- amount>).");
@ -3884,8 +3884,8 @@ int atcommand_produce(
struct item tmp_item; struct item tmp_item;
nullpo_retr(-1, sd); nullpo_retr(-1, sd);
malloc_tsetdword(atcmd_output, '\0', sizeof(atcmd_output)); memset(atcmd_output, '\0', sizeof(atcmd_output));
malloc_tsetdword(item_name, '\0', sizeof(item_name)); memset(item_name, '\0', sizeof(item_name));
if (!message || !*message || sscanf(message, "%99s %d %d", item_name, &attribute, &star) < 1) { if (!message || !*message || sscanf(message, "%99s %d %d", item_name, &attribute, &star) < 1) {
clif_displaymessage(fd, "Please, enter at least an item name/id (usage: @produce <equip name or equip ID> <element> <# of very's>)."); clif_displaymessage(fd, "Please, enter at least an item name/id (usage: @produce <equip name or equip ID> <element> <# of very's>).");
@ -3906,7 +3906,7 @@ int atcommand_produce(
attribute = ATTRIBUTE_NORMAL; attribute = ATTRIBUTE_NORMAL;
if (star < MIN_STAR || star > MAX_STAR) if (star < MIN_STAR || star > MAX_STAR)
star = 0; star = 0;
malloc_set(&tmp_item, 0, sizeof tmp_item); memset(&tmp_item, 0, sizeof tmp_item);
tmp_item.nameid = item_id; tmp_item.nameid = item_id;
tmp_item.amount = 1; tmp_item.amount = 1;
tmp_item.identify = 1; tmp_item.identify = 1;
@ -3942,7 +3942,7 @@ void atcommand_memo_sub(struct map_session_data* sd) {
if (!sd) return; if (!sd) return;
malloc_tsetdword(atcmd_output, '\0', sizeof(atcmd_output)); memset(atcmd_output, '\0', sizeof(atcmd_output));
clif_displaymessage(sd->fd, "Your actual memo positions are (except respawn point):"); clif_displaymessage(sd->fd, "Your actual memo positions are (except respawn point):");
for (i = MIN_PORTAL_MEMO; i <= MAX_PORTAL_MEMO; i++) { for (i = MIN_PORTAL_MEMO; i <= MAX_PORTAL_MEMO; i++) {
@ -3967,7 +3967,7 @@ int atcommand_memo(
int position = 0; int position = 0;
nullpo_retr(-1, sd); nullpo_retr(-1, sd);
malloc_tsetdword(atcmd_output, '\0', sizeof(atcmd_output)); memset(atcmd_output, '\0', sizeof(atcmd_output));
if (!message || !*message || sscanf(message, "%d", &position) < 1) if (!message || !*message || sscanf(message, "%d", &position) < 1)
atcommand_memo_sub(sd); atcommand_memo_sub(sd);
@ -4010,7 +4010,7 @@ int atcommand_gat(
int y; int y;
nullpo_retr(-1, sd); nullpo_retr(-1, sd);
malloc_tsetdword(atcmd_output, '\0', sizeof(atcmd_output)); memset(atcmd_output, '\0', sizeof(atcmd_output));
for (y = 2; y >= -2; y--) { for (y = 2; y >= -2; y--) {
sprintf(atcmd_output, "%s (x= %d, y= %d) %02X %02X %02X %02X %02X", sprintf(atcmd_output, "%s (x= %d, y= %d) %02X %02X %02X %02X %02X",
@ -4240,7 +4240,7 @@ int atcommand_param(
status[4] = &sd->status.dex; status[4] = &sd->status.dex;
status[5] = &sd->status.luk; status[5] = &sd->status.luk;
malloc_tsetdword(atcmd_output, '\0', sizeof(atcmd_output)); memset(atcmd_output, '\0', sizeof(atcmd_output));
if (!message || !*message || sscanf(message, "%d", &value) < 1 || value == 0) { if (!message || !*message || sscanf(message, "%d", &value) < 1 || value == 0) {
sprintf(atcmd_output, "Please, enter a valid value (usage: @str,@agi,@vit,@int,@dex,@luk <+/-adjustement>)."); sprintf(atcmd_output, "Please, enter a valid value (usage: @str,@agi,@vit,@int,@dex,@luk <+/-adjustement>).");
@ -4568,7 +4568,7 @@ atcommand_recall(
return -1; return -1;
} }
malloc_tsetdword(atcmd_player_name, '\0', sizeof atcmd_player_name); memset(atcmd_player_name, '\0', sizeof atcmd_player_name);
if(sscanf(message, "%23[^\n]", atcmd_player_name) < 1) if(sscanf(message, "%23[^\n]", atcmd_player_name) < 1)
return -1; return -1;
if(strncmp(sd->status.name,atcmd_player_name,NAME_LENGTH)==0) if(strncmp(sd->status.name,atcmd_player_name,NAME_LENGTH)==0)
@ -4610,7 +4610,7 @@ int atcommand_revive(
struct map_session_data *pl_sd; struct map_session_data *pl_sd;
nullpo_retr(-1, sd); nullpo_retr(-1, sd);
malloc_tsetdword(atcmd_player_name, '\0', sizeof(atcmd_player_name)); memset(atcmd_player_name, '\0', sizeof(atcmd_player_name));
if (!message || !*message || sscanf(message, "%23[^\n]", atcmd_player_name) < 1) { if (!message || !*message || sscanf(message, "%23[^\n]", atcmd_player_name) < 1) {
clif_displaymessage(fd, "Please, enter a player name (usage: @revive <char name>)."); clif_displaymessage(fd, "Please, enter a player name (usage: @revive <char name>).");
@ -4643,7 +4643,7 @@ int atcommand_char_block(
{ {
nullpo_retr(-1, sd); nullpo_retr(-1, sd);
malloc_tsetdword(atcmd_player_name, '\0', sizeof(atcmd_player_name)); memset(atcmd_player_name, '\0', sizeof(atcmd_player_name));
if (!message || !*message || sscanf(message, "%99[^\n]", atcmd_player_name) < 1) { if (!message || !*message || sscanf(message, "%99[^\n]", atcmd_player_name) < 1) {
clif_displaymessage(fd, "Please, enter a player name (usage: @charblock/@block <name>)."); clif_displaymessage(fd, "Please, enter a player name (usage: @charblock/@block <name>).");
@ -4689,8 +4689,8 @@ int atcommand_char_ban(
int year, month, day, hour, minute, second, value; int year, month, day, hour, minute, second, value;
nullpo_retr(-1, sd); nullpo_retr(-1, sd);
malloc_tsetdword(atcmd_output, '\0', sizeof(atcmd_output)); memset(atcmd_output, '\0', sizeof(atcmd_output));
malloc_tsetdword(atcmd_player_name, '\0', sizeof(atcmd_player_name)); memset(atcmd_player_name, '\0', sizeof(atcmd_player_name));
if (!message || !*message || sscanf(message, "%s %99[^\n]", atcmd_output, atcmd_player_name) < 2) { if (!message || !*message || sscanf(message, "%s %99[^\n]", atcmd_output, atcmd_player_name) < 2) {
clif_displaymessage(fd, "Please, enter ban time and a player name (usage: @charban/@ban/@banish/@charbanish <time> <name>)."); clif_displaymessage(fd, "Please, enter ban time and a player name (usage: @charban/@ban/@banish/@charbanish <time> <name>).");
@ -4763,7 +4763,7 @@ int atcommand_char_unblock(
{ {
nullpo_retr(-1, sd); nullpo_retr(-1, sd);
malloc_tsetdword(atcmd_player_name, '\0', sizeof(atcmd_player_name)); memset(atcmd_player_name, '\0', sizeof(atcmd_player_name));
if (!message || !*message || sscanf(message, "%99[^\n]", atcmd_player_name) < 1) { if (!message || !*message || sscanf(message, "%99[^\n]", atcmd_player_name) < 1) {
clif_displaymessage(fd, "Please, enter a player name (usage: @charunblock <player_name>)."); clif_displaymessage(fd, "Please, enter a player name (usage: @charunblock <player_name>).");
@ -4796,7 +4796,7 @@ int atcommand_char_unban(
{ {
nullpo_retr(-1, sd); nullpo_retr(-1, sd);
malloc_tsetdword(atcmd_player_name, '\0', sizeof(atcmd_player_name)); memset(atcmd_player_name, '\0', sizeof(atcmd_player_name));
if (!message || !*message || sscanf(message, "%99[^\n]", atcmd_player_name) < 1) { if (!message || !*message || sscanf(message, "%99[^\n]", atcmd_player_name) < 1) {
clif_displaymessage(fd, "Please, enter a player name (usage: @charunban <player_name>)."); clif_displaymessage(fd, "Please, enter a player name (usage: @charunban <player_name>).");
@ -4983,7 +4983,7 @@ int atcommand_kick(
struct map_session_data *pl_sd; struct map_session_data *pl_sd;
nullpo_retr(-1, sd); nullpo_retr(-1, sd);
malloc_tsetdword(atcmd_player_name, '\0', sizeof(atcmd_player_name)); memset(atcmd_player_name, '\0', sizeof(atcmd_player_name));
if (!message || !*message || sscanf(message, "%23[^\n]", atcmd_player_name) < 1) { if (!message || !*message || sscanf(message, "%23[^\n]", atcmd_player_name) < 1) {
clif_displaymessage(fd, "Please, enter a player name (usage: @kick <charname>)."); clif_displaymessage(fd, "Please, enter a player name (usage: @kick <charname>).");
@ -5176,7 +5176,7 @@ int atcommand_party(
char party[NAME_LENGTH]; char party[NAME_LENGTH];
nullpo_retr(-1, sd); nullpo_retr(-1, sd);
malloc_tsetdword(party, '\0', sizeof(party)); memset(party, '\0', sizeof(party));
if (!message || !*message || sscanf(message, "%23[^\n]", party) < 1) { if (!message || !*message || sscanf(message, "%23[^\n]", party) < 1) {
clif_displaymessage(fd, "Please, enter a party name (usage: @party <party_name>)."); clif_displaymessage(fd, "Please, enter a party name (usage: @party <party_name>).");
@ -5200,7 +5200,7 @@ int atcommand_guild(
int prev; int prev;
nullpo_retr(-1, sd); nullpo_retr(-1, sd);
malloc_tsetdword(guild, '\0', sizeof(guild)); memset(guild, '\0', sizeof(guild));
if (!message || !*message || sscanf(message, "%23[^\n]", guild) < 1) { if (!message || !*message || sscanf(message, "%23[^\n]", guild) < 1) {
clif_displaymessage(fd, "Please, enter a guild name (usage: @guild <guild_name>)."); clif_displaymessage(fd, "Please, enter a guild name (usage: @guild <guild_name>).");
@ -5296,8 +5296,8 @@ int atcommand_idsearch(
struct item_data *item_array[MAX_SEARCH]; struct item_data *item_array[MAX_SEARCH];
nullpo_retr(-1, sd); nullpo_retr(-1, sd);
malloc_tsetdword(item_name, '\0', sizeof(item_name)); memset(item_name, '\0', sizeof(item_name));
malloc_tsetdword(atcmd_output, '\0', sizeof(atcmd_output)); memset(atcmd_output, '\0', sizeof(atcmd_output));
if (!message || !*message || sscanf(message, "%99s", item_name) < 0) { if (!message || !*message || sscanf(message, "%99s", item_name) < 0) {
clif_displaymessage(fd, "Please, enter a part of item name (usage: @idsearch <part_of_item_name>)."); clif_displaymessage(fd, "Please, enter a part of item name (usage: @idsearch <part_of_item_name>).");
@ -5335,7 +5335,7 @@ int atcommand_recallall(
int count, users; int count, users;
nullpo_retr(-1, sd); nullpo_retr(-1, sd);
malloc_tsetdword(atcmd_output, '\0', sizeof(atcmd_output)); memset(atcmd_output, '\0', sizeof(atcmd_output));
if (sd->bl.m >= 0 && map[sd->bl.m].flag.nowarpto && battle_config.any_warp_GM_min_level > pc_isGM(sd)) { if (sd->bl.m >= 0 && map[sd->bl.m].flag.nowarpto && battle_config.any_warp_GM_min_level > pc_isGM(sd)) {
clif_displaymessage(fd, "You are not authorised to warp somenone to your actual map."); clif_displaymessage(fd, "You are not authorised to warp somenone to your actual map.");
@ -5382,8 +5382,8 @@ int atcommand_guildrecall(
struct guild *g; struct guild *g;
nullpo_retr(-1, sd); nullpo_retr(-1, sd);
malloc_tsetdword(guild_name, '\0', sizeof(guild_name)); memset(guild_name, '\0', sizeof(guild_name));
malloc_tsetdword(atcmd_output, '\0', sizeof(atcmd_output)); memset(atcmd_output, '\0', sizeof(atcmd_output));
if (!message || !*message || sscanf(message, "%23[^\n]", guild_name) < 1) { if (!message || !*message || sscanf(message, "%23[^\n]", guild_name) < 1) {
clif_displaymessage(fd, "Please, enter a guild name/id (usage: @guildrecall <guild_name/id>)."); clif_displaymessage(fd, "Please, enter a guild name/id (usage: @guildrecall <guild_name/id>).");
@ -5439,8 +5439,8 @@ int atcommand_partyrecall(
int count, users; int count, users;
nullpo_retr(-1, sd); nullpo_retr(-1, sd);
malloc_tsetdword(party_name, '\0', sizeof(party_name)); memset(party_name, '\0', sizeof(party_name));
malloc_tsetdword(atcmd_output, '\0', sizeof(atcmd_output)); memset(atcmd_output, '\0', sizeof(atcmd_output));
if (!message || !*message || sscanf(message, "%23[^\n]", party_name) < 1) { if (!message || !*message || sscanf(message, "%23[^\n]", party_name) < 1) {
clif_displaymessage(fd, "Please, enter a party name/id (usage: @partyrecall <party_name/id>)."); clif_displaymessage(fd, "Please, enter a party name/id (usage: @partyrecall <party_name/id>).");
@ -5708,9 +5708,9 @@ int atcommand_mapinfo(
unsigned short m_index; unsigned short m_index;
nullpo_retr(-1, sd); nullpo_retr(-1, sd);
malloc_tsetdword(atcmd_output, '\0', sizeof(atcmd_output)); memset(atcmd_output, '\0', sizeof(atcmd_output));
malloc_tsetdword(atcmd_player_name, '\0', sizeof(atcmd_player_name)); memset(atcmd_player_name, '\0', sizeof(atcmd_player_name));
malloc_tsetdword(direction, '\0', sizeof(direction)); memset(direction, '\0', sizeof(direction));
sscanf(message, "%d %23[^\n]", &list, atcmd_player_name); sscanf(message, "%d %23[^\n]", &list, atcmd_player_name);
@ -5955,7 +5955,7 @@ int atcommand_char_mount_peco(
struct map_session_data *pl_sd; struct map_session_data *pl_sd;
nullpo_retr(-1, sd); nullpo_retr(-1, sd);
malloc_tsetdword(atcmd_player_name, '\0', sizeof(atcmd_player_name)); memset(atcmd_player_name, '\0', sizeof(atcmd_player_name));
if (!message || !*message || sscanf(message, "%23[^\n]", atcmd_player_name) < 1) { if (!message || !*message || sscanf(message, "%23[^\n]", atcmd_player_name) < 1) {
clif_displaymessage(fd, "Please, enter a player name (usage: @charmountpeco <char_name>)."); clif_displaymessage(fd, "Please, enter a player name (usage: @charmountpeco <char_name>).");
@ -5996,8 +5996,8 @@ int atcommand_guildspy(
struct guild *g; struct guild *g;
nullpo_retr(-1, sd); nullpo_retr(-1, sd);
malloc_tsetdword(guild_name, '\0', sizeof(guild_name)); memset(guild_name, '\0', sizeof(guild_name));
malloc_tsetdword(atcmd_output, '\0', sizeof(atcmd_output)); memset(atcmd_output, '\0', sizeof(atcmd_output));
if (!enable_spy) if (!enable_spy)
{ {
@ -6040,8 +6040,8 @@ int atcommand_partyspy(
struct party_data *p; struct party_data *p;
nullpo_retr(-1, sd); nullpo_retr(-1, sd);
malloc_tsetdword(party_name, '\0', sizeof(party_name)); memset(party_name, '\0', sizeof(party_name));
malloc_tsetdword(atcmd_output, '\0', sizeof(atcmd_output)); memset(atcmd_output, '\0', sizeof(atcmd_output));
if (!enable_spy) if (!enable_spy)
{ {
@ -6113,7 +6113,7 @@ int atcommand_nuke(
struct map_session_data *pl_sd; struct map_session_data *pl_sd;
nullpo_retr(-1, sd); nullpo_retr(-1, sd);
malloc_tsetdword(atcmd_player_name, '\0', sizeof(atcmd_player_name)); memset(atcmd_player_name, '\0', sizeof(atcmd_player_name));
if (!message || !*message || sscanf(message, "%23[^\n]", atcmd_player_name) < 1) { if (!message || !*message || sscanf(message, "%23[^\n]", atcmd_player_name) < 1) {
clif_displaymessage(fd, "Please, enter a player name (usage: @nuke <char name>)."); clif_displaymessage(fd, "Please, enter a player name (usage: @nuke <char name>).");
@ -6149,7 +6149,7 @@ int atcommand_tonpc(const int fd, struct map_session_data* sd,
nullpo_retr(-1, sd); nullpo_retr(-1, sd);
malloc_tsetdword(npcname, 0, sizeof(npcname)); memset(npcname, 0, sizeof(npcname));
if (!message || !*message || sscanf(message, "%23[^\n]", npcname) < 1) { if (!message || !*message || sscanf(message, "%23[^\n]", npcname) < 1) {
clif_displaymessage(fd, "Please, enter a NPC name (usage: @tonpc <NPC_name>)."); clif_displaymessage(fd, "Please, enter a NPC name (usage: @tonpc <NPC_name>).");
@ -6179,7 +6179,7 @@ int atcommand_shownpc(const int fd, struct map_session_data* sd,
char NPCname[NAME_LENGTH]; char NPCname[NAME_LENGTH];
nullpo_retr(-1, sd); nullpo_retr(-1, sd);
malloc_tsetdword(NPCname, '\0', sizeof(NPCname)); memset(NPCname, '\0', sizeof(NPCname));
if (!message || !*message || sscanf(message, "%23[^\n]", NPCname) < 1) { if (!message || !*message || sscanf(message, "%23[^\n]", NPCname) < 1) {
clif_displaymessage(fd, "Please, enter a NPC name (usage: @enablenpc <NPC_name>)."); clif_displaymessage(fd, "Please, enter a NPC name (usage: @enablenpc <NPC_name>).");
@ -6207,7 +6207,7 @@ int atcommand_hidenpc(const int fd, struct map_session_data* sd,
char NPCname[NAME_LENGTH]; char NPCname[NAME_LENGTH];
nullpo_retr(-1, sd); nullpo_retr(-1, sd);
malloc_tsetdword(NPCname, '\0', sizeof(NPCname)); memset(NPCname, '\0', sizeof(NPCname));
if (!message || !*message || sscanf(message, "%23[^\n]", NPCname) < 1) { if (!message || !*message || sscanf(message, "%23[^\n]", NPCname) < 1) {
clif_displaymessage(fd, "Please, enter a NPC name (usage: @hidenpc <NPC_name>)."); clif_displaymessage(fd, "Please, enter a NPC name (usage: @hidenpc <NPC_name>).");
@ -6258,7 +6258,7 @@ int atcommand_unloadnpc(const int fd, struct map_session_data* sd,
char NPCname[NAME_LENGTH]; char NPCname[NAME_LENGTH];
nullpo_retr(-1, sd); nullpo_retr(-1, sd);
malloc_tsetdword(NPCname, '\0', sizeof(NPCname)); memset(NPCname, '\0', sizeof(NPCname));
if (!message || !*message || sscanf(message, "%23[^\n]", NPCname) < 1) { if (!message || !*message || sscanf(message, "%23[^\n]", NPCname) < 1) {
clif_displaymessage(fd, "Please, enter a NPC name (usage: @npcoff <NPC_name>)."); clif_displaymessage(fd, "Please, enter a NPC name (usage: @npcoff <NPC_name>).");
@ -6286,8 +6286,8 @@ char * txt_time(unsigned int duration) {
char temp[256]; char temp[256];
static char temp1[256]; static char temp1[256];
malloc_tsetdword(temp, '\0', sizeof(temp)); memset(temp, '\0', sizeof(temp));
malloc_tsetdword(temp1, '\0', sizeof(temp1)); memset(temp1, '\0', sizeof(temp1));
days = duration / (60 * 60 * 24); days = duration / (60 * 60 * 24);
duration = duration - (60 * 60 * 24 * days); duration = duration - (60 * 60 * 24 * days);
@ -6331,7 +6331,7 @@ int atcommand_servertime(const int fd, struct map_session_data* sd,
char temp[256]; char temp[256];
nullpo_retr(-1, sd); nullpo_retr(-1, sd);
malloc_tsetdword(temp, '\0', sizeof(temp)); memset(temp, '\0', sizeof(temp));
time(&time_server); // get time in seconds since 1/1/1970 time(&time_server); // get time in seconds since 1/1/1970
datetime = localtime(&time_server); // convert seconds in structure datetime = localtime(&time_server); // convert seconds in structure
@ -6407,9 +6407,9 @@ int atcommand_chardelitem(const int fd, struct map_session_data* sd,
struct item_data *item_data; struct item_data *item_data;
nullpo_retr(-1, sd); nullpo_retr(-1, sd);
malloc_tsetdword(atcmd_player_name, '\0', sizeof(atcmd_player_name)); memset(atcmd_player_name, '\0', sizeof(atcmd_player_name));
malloc_tsetdword(item_name, '\0', sizeof(item_name)); memset(item_name, '\0', sizeof(item_name));
malloc_tsetdword(atcmd_output, '\0', sizeof(atcmd_output)); memset(atcmd_output, '\0', sizeof(atcmd_output));
if (!message || !*message || sscanf(message, "%s %d %99[^\n]", item_name, &number, atcmd_player_name) < 3 || number < 1) { if (!message || !*message || sscanf(message, "%s %d %99[^\n]", item_name, &number, atcmd_player_name) < 3 || number < 1) {
clif_displaymessage(fd, "Please, enter an item name/id, a quantity and a player name (usage: @chardelitem <item_name_or_ID> <quantity> <player>)."); clif_displaymessage(fd, "Please, enter an item name/id, a quantity and a player name (usage: @chardelitem <item_name_or_ID> <quantity> <player>).");
@ -6505,7 +6505,7 @@ int atcommand_jail(
unsigned short m_index; unsigned short m_index;
nullpo_retr(-1, sd); nullpo_retr(-1, sd);
malloc_tsetdword(atcmd_player_name, '\0', sizeof(atcmd_player_name)); memset(atcmd_player_name, '\0', sizeof(atcmd_player_name));
if (!message || !*message || sscanf(message, "%23[^\n]", atcmd_player_name) < 1) { if (!message || !*message || sscanf(message, "%23[^\n]", atcmd_player_name) < 1) {
clif_displaymessage(fd, "Please, enter a player name (usage: @jail <char_name>)."); clif_displaymessage(fd, "Please, enter a player name (usage: @jail <char_name>).");
@ -6565,7 +6565,7 @@ int atcommand_unjail(
unsigned short m_index; unsigned short m_index;
int x=0, y=0; int x=0, y=0;
malloc_tsetdword(atcmd_player_name, '\0', sizeof(atcmd_player_name)); memset(atcmd_player_name, '\0', sizeof(atcmd_player_name));
if (!message || !*message || sscanf(message, "%23[^\n]", atcmd_player_name) < 1) { if (!message || !*message || sscanf(message, "%23[^\n]", atcmd_player_name) < 1) {
clif_displaymessage(fd, "Please, enter a player name (usage: @unjail/@discharge <char_name>)."); clif_displaymessage(fd, "Please, enter a player name (usage: @unjail/@discharge <char_name>).");
@ -6918,7 +6918,7 @@ int atcommand_exp(
char output[200]; char output[200];
double nextb, nextj; double nextb, nextj;
nullpo_retr(-1, sd); nullpo_retr(-1, sd);
malloc_tsetdword(output, '\0', sizeof(output)); memset(output, '\0', sizeof(output));
nextb = pc_nextbaseexp(sd); nextb = pc_nextbaseexp(sd);
if (nextb) if (nextb)
@ -6944,7 +6944,7 @@ int atcommand_broadcast(
{ {
nullpo_retr(-1, sd); nullpo_retr(-1, sd);
malloc_tsetdword(atcmd_output, '\0', sizeof(atcmd_output)); memset(atcmd_output, '\0', sizeof(atcmd_output));
if (!message || !*message) { if (!message || !*message) {
clif_displaymessage(fd, "Please, enter a message (usage: @broadcast <message>)."); clif_displaymessage(fd, "Please, enter a message (usage: @broadcast <message>).");
@ -6967,7 +6967,7 @@ int atcommand_localbroadcast(
{ {
nullpo_retr(-1, sd); nullpo_retr(-1, sd);
malloc_tsetdword(atcmd_output, '\0', sizeof(atcmd_output)); memset(atcmd_output, '\0', sizeof(atcmd_output));
if (!message || !*message) { if (!message || !*message) {
clif_displaymessage(fd, "Please, enter a message (usage: @localbroadcast <message>)."); clif_displaymessage(fd, "Please, enter a message (usage: @localbroadcast <message>).");
@ -6994,8 +6994,8 @@ int atcommand_chardisguise(
struct map_session_data* pl_sd; struct map_session_data* pl_sd;
nullpo_retr(-1, sd); nullpo_retr(-1, sd);
malloc_tsetdword(atcmd_player_name, '\0', sizeof(atcmd_player_name)); memset(atcmd_player_name, '\0', sizeof(atcmd_player_name));
malloc_tsetdword(mob_name, '\0', sizeof(mob_name)); memset(mob_name, '\0', sizeof(mob_name));
if (!message || !*message || sscanf(message, "%s %23[^\n]", mob_name, atcmd_player_name) < 2) { if (!message || !*message || sscanf(message, "%s %23[^\n]", mob_name, atcmd_player_name) < 2) {
clif_displaymessage(fd, "Please, enter a Monster/NPC name/id and a player name (usage: @chardisguise <monster_name_or_monster_ID> <char name>)."); clif_displaymessage(fd, "Please, enter a Monster/NPC name/id and a player name (usage: @chardisguise <monster_name_or_monster_ID> <char name>).");
@ -7048,7 +7048,7 @@ int atcommand_charundisguise(
struct map_session_data* pl_sd; struct map_session_data* pl_sd;
nullpo_retr(-1, sd); nullpo_retr(-1, sd);
malloc_tsetdword(atcmd_player_name, '\0', sizeof(atcmd_player_name)); memset(atcmd_player_name, '\0', sizeof(atcmd_player_name));
if (!message || !*message || sscanf(message, "%23[^\n]", atcmd_player_name) < 1) { if (!message || !*message || sscanf(message, "%23[^\n]", atcmd_player_name) < 1) {
clif_displaymessage(fd, "Please, enter a player name (usage: @charundisguise <char name>)."); clif_displaymessage(fd, "Please, enter a player name (usage: @charundisguise <char name>).");
@ -7087,8 +7087,8 @@ int atcommand_email(
char new_email[100]; char new_email[100];
nullpo_retr(-1, sd); nullpo_retr(-1, sd);
malloc_tsetdword(actual_email, '\0', sizeof(actual_email)); memset(actual_email, '\0', sizeof(actual_email));
malloc_tsetdword(new_email, '\0', sizeof(new_email)); memset(new_email, '\0', sizeof(new_email));
if (!message || !*message || sscanf(message, "%99s %99s", actual_email, new_email) < 2) { if (!message || !*message || sscanf(message, "%99s %99s", actual_email, new_email) < 2) {
clif_displaymessage(fd, "Please enter 2 emails (usage: @email <actual@email> <new@email>)."); clif_displaymessage(fd, "Please enter 2 emails (usage: @email <actual@email> <new@email>).");
@ -7152,9 +7152,9 @@ atcommand_character_cart_list(
int i, j, count, counter, counter2; int i, j, count, counter, counter2;
nullpo_retr(-1, sd); nullpo_retr(-1, sd);
malloc_tsetdword(atcmd_player_name, '\0', sizeof(atcmd_player_name)); memset(atcmd_player_name, '\0', sizeof(atcmd_player_name));
malloc_tsetdword(atcmd_output, '\0', sizeof(atcmd_output)); memset(atcmd_output, '\0', sizeof(atcmd_output));
malloc_tsetdword(outputtmp, '\0', sizeof(outputtmp)); memset(outputtmp, '\0', sizeof(outputtmp));
if (!message || !*message || sscanf(message, "%23[^\n]", atcmd_player_name) < 1) { if (!message || !*message || sscanf(message, "%23[^\n]", atcmd_player_name) < 1) {
clif_displaymessage(fd, "Please, enter a player name (usage: @charitemlist <char name>)."); clif_displaymessage(fd, "Please, enter a player name (usage: @charitemlist <char name>).");
@ -7178,7 +7178,7 @@ atcommand_character_cart_list(
else else
sprintf(atcmd_output, "%d %s (%s, id: %d)", pl_sd->status.cart[i].amount, item_data->name, item_data->jname, pl_sd->status.cart[i].nameid); sprintf(atcmd_output, "%d %s (%s, id: %d)", pl_sd->status.cart[i].amount, item_data->name, item_data->jname, pl_sd->status.cart[i].nameid);
clif_displaymessage(fd, atcmd_output); clif_displaymessage(fd, atcmd_output);
malloc_tsetdword(atcmd_output, '\0', sizeof(atcmd_output)); memset(atcmd_output, '\0', sizeof(atcmd_output));
counter2 = 0; counter2 = 0;
for (j = 0; j < item_data->slot; j++) { for (j = 0; j < item_data->slot; j++) {
if (pl_sd->status.cart[i].card[j]) { if (pl_sd->status.cart[i].card[j]) {
@ -7338,7 +7338,7 @@ atcommand_npcmove(const int fd, struct map_session_data* sd,
if (!message || !*message) if (!message || !*message)
return -1; return -1;
malloc_tsetdword(atcmd_player_name, '\0', sizeof atcmd_player_name); memset(atcmd_player_name, '\0', sizeof atcmd_player_name);
if (sscanf(message, "%d %d %23[^\n]", &x, &y, atcmd_player_name) < 3) { if (sscanf(message, "%d %d %23[^\n]", &x, &y, atcmd_player_name) < 3) {
clif_displaymessage(fd, "Usage: @npcmove <X> <Y> <npc_name>"); clif_displaymessage(fd, "Usage: @npcmove <X> <Y> <npc_name>");
@ -7727,7 +7727,7 @@ void getring (struct map_session_data *sd)
else else
item_id = 2634; item_id = 2634;
malloc_set(&item_tmp,0,sizeof(item_tmp)); memset(&item_tmp,0,sizeof(item_tmp));
item_tmp.nameid=item_id; item_tmp.nameid=item_id;
item_tmp.identify=1; item_tmp.identify=1;
item_tmp.card[0]=255; item_tmp.card[0]=255;
@ -8365,7 +8365,7 @@ atcommand_sound(
return -1; return -1;
} }
malloc_tsetdword(sound_file, '\0', sizeof(sound_file)); memset(sound_file, '\0', sizeof(sound_file));
if(sscanf(message, "%99[^\n]", sound_file) < 1) if(sscanf(message, "%99[^\n]", sound_file) < 1)
return -1; return -1;
@ -8989,7 +8989,7 @@ int atcommand_jumptoid(
int cid=0; int cid=0;
struct map_session_data *pl_sd; struct map_session_data *pl_sd;
malloc_tsetdword(atcmd_output, '\0', sizeof(atcmd_output)); memset(atcmd_output, '\0', sizeof(atcmd_output));
if (!message || (cid = atoi(message)) == 0) { if (!message || (cid = atoi(message)) == 0) {
clif_displaymessage(fd, "Please, enter a player CID (usage: @jumptoid/@warptoid/@gotoid <char id>)."); clif_displaymessage(fd, "Please, enter a player CID (usage: @jumptoid/@warptoid/@gotoid <char id>).");
@ -9034,7 +9034,7 @@ int atcommand_jumptoid2(
int aid=0; int aid=0;
struct map_session_data *pl_sd; struct map_session_data *pl_sd;
malloc_tsetdword(atcmd_output, '\0', sizeof(atcmd_output)); memset(atcmd_output, '\0', sizeof(atcmd_output));
if (!message || (aid = atoi(message)) == 0) { if (!message || (aid = atoi(message)) == 0) {
clif_displaymessage(fd, "Please, enter a player AID (usage: @jumptoid/@warptoid/@gotoid <account id>)."); clif_displaymessage(fd, "Please, enter a player AID (usage: @jumptoid/@warptoid/@gotoid <account id>).");
@ -9078,7 +9078,7 @@ int atcommand_recallid(
int cid=0; int cid=0;
struct map_session_data *pl_sd; struct map_session_data *pl_sd;
malloc_tsetdword(atcmd_output, '\0', sizeof(atcmd_output)); memset(atcmd_output, '\0', sizeof(atcmd_output));
if (!message || (cid = atoi(message)) == 0) { if (!message || (cid = atoi(message)) == 0) {
clif_displaymessage(fd, "Please, enter a player CID (usage: @recallid <char id>)."); clif_displaymessage(fd, "Please, enter a player CID (usage: @recallid <char id>).");
@ -9129,7 +9129,7 @@ int atcommand_recallid2(
int aid=0; int aid=0;
struct map_session_data *pl_sd; struct map_session_data *pl_sd;
malloc_tsetdword(atcmd_output, '\0', sizeof(atcmd_output)); memset(atcmd_output, '\0', sizeof(atcmd_output));
if (!message || (aid = atoi(message)) == 0) { if (!message || (aid = atoi(message)) == 0) {
clif_displaymessage(fd, "Please, enter a player AID (usage: @recallid2 <account id>)."); clif_displaymessage(fd, "Please, enter a player AID (usage: @recallid2 <account id>).");
@ -9567,8 +9567,8 @@ int atcommand_mobinfo(
int count; int count;
int i, j, k; int i, j, k;
malloc_tsetdword(atcmd_output, '\0', sizeof(atcmd_output)); memset(atcmd_output, '\0', sizeof(atcmd_output));
malloc_tsetdword(atcmd_output2, '\0', sizeof(atcmd_output2)); memset(atcmd_output2, '\0', sizeof(atcmd_output2));
if (!message || !*message) { if (!message || !*message) {
clif_displaymessage(fd, "Please, enter a Monster/ID (usage: @mobinfo <monster_name_or_monster_ID>)."); clif_displaymessage(fd, "Please, enter a Monster/ID (usage: @mobinfo <monster_name_or_monster_ID>).");
@ -10237,8 +10237,8 @@ int atcommand_me(
char tempmes[200]; char tempmes[200];
nullpo_retr(-1, sd); nullpo_retr(-1, sd);
malloc_tsetdword(tempmes, '\0', sizeof(tempmes)); memset(tempmes, '\0', sizeof(tempmes));
malloc_tsetdword(atcmd_output, '\0', sizeof(atcmd_output)); memset(atcmd_output, '\0', sizeof(atcmd_output));
if (sd->sc.count && //no "chatting" while muted. if (sd->sc.count && //no "chatting" while muted.
(sd->sc.data[SC_BERSERK].timer!=-1 || (sd->sc.data[SC_BERSERK].timer!=-1 ||
@ -10773,7 +10773,7 @@ int atcommand_request(
void do_init_atcommand() { void do_init_atcommand() {
users_db = db_alloc(__FILE__,__LINE__,DB_UINT,DB_OPT_BASE,sizeof(int)); users_db = db_alloc(__FILE__,__LINE__,DB_UINT,DB_OPT_BASE,sizeof(int));
duel_count = 0; duel_count = 0;
malloc_tsetdword(&duel_list[0], 0, sizeof(duel_list)); memset(&duel_list[0], 0, sizeof(duel_list));
add_timer_func_list(atshowmobs_timer, "atshowmobs_timer"); add_timer_func_list(atshowmobs_timer, "atshowmobs_timer");
return; return;
} }

16
src/map/battle.c
View File

@ -81,7 +81,7 @@ struct block_list* battle_gettargeted(struct block_list *target)
int c = 0; int c = 0;
nullpo_retr(NULL, target); nullpo_retr(NULL, target);
malloc_tsetdword(bl_list, 0, sizeof(bl_list)); memset(bl_list, 0, sizeof(bl_list));
map_foreachinrange(battle_gettargeted_sub, target, AREA_SIZE, BL_CHAR, bl_list, &c, target->id); map_foreachinrange(battle_gettargeted_sub, target, AREA_SIZE, BL_CHAR, bl_list, &c, target->id);
if (c == 0 || c > 24) if (c == 0 || c > 24)
return NULL; return NULL;
@ -826,8 +826,8 @@ static struct Damage battle_calc_weapon_attack(
unsigned cardfix : 1; unsigned cardfix : 1;
} flag; } flag;
malloc_tsetdword(&wd,0,sizeof(wd)); memset(&wd,0,sizeof(wd));
malloc_tsetdword(&flag,0,sizeof(flag)); memset(&flag,0,sizeof(flag));
if(src==NULL || target==NULL) if(src==NULL || target==NULL)
{ {
@ -2157,8 +2157,8 @@ struct Damage battle_calc_magic_attack(
unsigned cardfix : 1; unsigned cardfix : 1;
} flag; } flag;
malloc_tsetdword(&ad,0,sizeof(ad)); memset(&ad,0,sizeof(ad));
malloc_tsetdword(&flag,0,sizeof(flag)); memset(&flag,0,sizeof(flag));
if(src==NULL || target==NULL) if(src==NULL || target==NULL)
{ {
@ -2518,8 +2518,8 @@ struct Damage battle_calc_misc_attack(
unsigned cardfix : 1; unsigned cardfix : 1;
} flag; } flag;
malloc_tsetdword(&md,0,sizeof(md)); memset(&md,0,sizeof(md));
malloc_tsetdword(&flag,0,sizeof(flag)); memset(&flag,0,sizeof(flag));
if( src == NULL || target == NULL ){ if( src == NULL || target == NULL ){
nullpo_info(NLP_MARK); nullpo_info(NLP_MARK);
@ -2777,7 +2777,7 @@ struct Damage battle_calc_attack( int attack_type,
default: default:
if (battle_config.error_log) if (battle_config.error_log)
ShowError("battle_calc_attack: unknown attack type! %d\n",attack_type); ShowError("battle_calc_attack: unknown attack type! %d\n",attack_type);
malloc_tsetdword(&d,0,sizeof(d)); memset(&d,0,sizeof(d));
break; break;
} }
if (d.damage + d.damage2 < 1) if (d.damage + d.damage2 < 1)

74
src/map/charcommand.c
View File

@ -127,7 +127,7 @@ is_charcommand_sub(const int fd, struct map_session_data* sd, const char* str, i
CharCommandInfo info; CharCommandInfo info;
CharCommandType type; CharCommandType type;
malloc_set(&info, 0, sizeof(info)); memset(&info, 0, sizeof(info));
type = charcommand(sd, gmlvl, str, &info); type = charcommand(sd, gmlvl, str, &info);
if (type != CharCommand_None) { if (type != CharCommand_None) {
@ -143,8 +143,8 @@ is_charcommand_sub(const int fd, struct map_session_data* sd, const char* str, i
return AtCommand_None; return AtCommand_None;
} }
malloc_tsetdword(command, '\0', sizeof(command)); memset(command, '\0', sizeof(command));
malloc_tsetdword(output, '\0', sizeof(output)); memset(output, '\0', sizeof(output));
while (*p && !isspace(*p)) while (*p && !isspace(*p))
p++; p++;
if (p - str >= sizeof(command)) // too long if (p - str >= sizeof(command)) // too long
@ -219,7 +219,7 @@ CharCommandType charcommand(struct map_session_data* sd, const int level, const
if (*p == charcommand_symbol) { // check first char, try to skip |00 (or something else) [Lance] if (*p == charcommand_symbol) { // check first char, try to skip |00 (or something else) [Lance]
char command[101]; char command[101];
int i = 0; int i = 0;
malloc_set(info, 0, sizeof(CharCommandInfo)); memset(info, 0, sizeof(CharCommandInfo));
sscanf(p, "%100s", command); sscanf(p, "%100s", command);
command[sizeof(command)-1] = '\0'; command[sizeof(command)-1] = '\0';
@ -318,7 +318,7 @@ int charcommand_jobchange(
struct map_session_data* pl_sd; struct map_session_data* pl_sd;
int job = 0, upper = -1; int job = 0, upper = -1;
malloc_tsetdword(character, '\0', sizeof(character)); memset(character, '\0', sizeof(character));
if (!message || !*message) { if (!message || !*message) {
clif_displaymessage(fd, "Please, enter a job and a player name (usage: #job/#jobchange <job ID> <char name>)."); clif_displaymessage(fd, "Please, enter a job and a player name (usage: #job/#jobchange <job ID> <char name>).");
@ -375,7 +375,7 @@ int charcommand_petrename(
struct map_session_data *pl_sd; struct map_session_data *pl_sd;
struct pet_data *pd; struct pet_data *pd;
malloc_tsetdword(character, '\0', sizeof(character)); memset(character, '\0', sizeof(character));
if (!message || !*message || sscanf(message, "%23[^\n]", character) < 1) { if (!message || !*message || sscanf(message, "%23[^\n]", character) < 1) {
clif_displaymessage(fd, "Please, enter a player name (usage: #petrename <char name>)."); clif_displaymessage(fd, "Please, enter a player name (usage: #petrename <char name>).");
@ -419,7 +419,7 @@ int charcommand_petfriendly(
struct map_session_data *pl_sd; struct map_session_data *pl_sd;
struct pet_data *pd; struct pet_data *pd;
malloc_tsetdword(character, '\0', sizeof(character)); memset(character, '\0', sizeof(character));
if (!message || !*message || sscanf(message,"%d %23s",&friendly,character) < 2) { if (!message || !*message || sscanf(message,"%d %23s",&friendly,character) < 2) {
clif_displaymessage(fd, "Please, enter a valid value (usage: " clif_displaymessage(fd, "Please, enter a valid value (usage: "
"#petfriendly <0-1000> <player>)."); "#petfriendly <0-1000> <player>).");
@ -470,9 +470,9 @@ int charcommand_stats(
struct map_session_data *pl_sd; struct map_session_data *pl_sd;
int i; int i;
malloc_tsetdword(character, '\0', sizeof(character)); memset(character, '\0', sizeof(character));
malloc_tsetdword(job_jobname, '\0', sizeof(job_jobname)); memset(job_jobname, '\0', sizeof(job_jobname));
malloc_tsetdword(output, '\0', sizeof(output)); memset(output, '\0', sizeof(output));
if (!message || !*message || sscanf(message, "%23[^\n]", character) < 1) { if (!message || !*message || sscanf(message, "%23[^\n]", character) < 1) {
clif_displaymessage(fd, "Please, enter a player name (usage: #stats <char name>)."); clif_displaymessage(fd, "Please, enter a player name (usage: #stats <char name>).");
@ -541,8 +541,8 @@ int charcommand_reset(
char output[200]; char output[200];
struct map_session_data *pl_sd; struct map_session_data *pl_sd;
malloc_tsetdword(character, '\0', sizeof(character)); memset(character, '\0', sizeof(character));
malloc_tsetdword(output, '\0', sizeof(output)); memset(output, '\0', sizeof(output));
if (!message || !*message || sscanf(message, "%23[^\n]", character) < 1) { if (!message || !*message || sscanf(message, "%23[^\n]", character) < 1) {
clif_displaymessage(fd, "Please, enter a player name (usage: #reset <charname>)."); clif_displaymessage(fd, "Please, enter a player name (usage: #reset <charname>).");
@ -579,7 +579,7 @@ int charcommand_option(
int opt1 = 0, opt2 = 0, opt3 = 0; int opt1 = 0, opt2 = 0, opt3 = 0;
struct map_session_data* pl_sd; struct map_session_data* pl_sd;
malloc_tsetdword(character, '\0', sizeof(character)); memset(character, '\0', sizeof(character));
if (!message || !*message || if (!message || !*message ||
sscanf(message, "%d %d %d %23[^\n]", &opt1, &opt2, &opt3, character) < 4 || sscanf(message, "%d %d %d %23[^\n]", &opt1, &opt2, &opt3, character) < 4 ||
@ -620,8 +620,8 @@ int charcommand_save(
int x = 0, y = 0; int x = 0, y = 0;
int m; int m;
malloc_tsetdword(map_name, '\0', sizeof(map_name)); memset(map_name, '\0', sizeof(map_name));
malloc_tsetdword(character, '\0', sizeof(character)); memset(character, '\0', sizeof(character));
if (!message || !*message || sscanf(message, "%15s %d %d %23[^\n]", map_name, &x, &y, character) < 4 || x < 0 || y < 0) { if (!message || !*message || sscanf(message, "%15s %d %d %23[^\n]", map_name, &x, &y, character) < 4 || x < 0 || y < 0) {
clif_displaymessage(fd, "Please, enter a valid save point and a player name (usage: #save <map> <x> <y> <charname>)."); clif_displaymessage(fd, "Please, enter a valid save point and a player name (usage: #save <map> <x> <y> <charname>).");
@ -673,8 +673,8 @@ int charcommand_stats_all(const int fd, struct map_session_data* sd, const char*
int count, users; int count, users;
struct map_session_data *pl_sd, **pl_allsd; struct map_session_data *pl_sd, **pl_allsd;
malloc_tsetdword(output, '\0', sizeof(output)); memset(output, '\0', sizeof(output));
malloc_tsetdword(gmlevel, '\0', sizeof(gmlevel)); memset(gmlevel, '\0', sizeof(gmlevel));
count = 0; count = 0;
pl_allsd = map_getallusers(&users); pl_allsd = map_getallusers(&users);
@ -717,7 +717,7 @@ int charcommand_spiritball(const int fd, struct map_session_data* sd,const char*
char character[NAME_LENGTH]; char character[NAME_LENGTH];
int spirit = 0; int spirit = 0;
malloc_tsetdword(character, '\0', sizeof(character)); memset(character, '\0', sizeof(character));
if(!message || !*message || sscanf(message, "%d %23[^\n]", &spirit, character) < 2 || spirit < 0 || spirit > 1000) { if(!message || !*message || sscanf(message, "%d %23[^\n]", &spirit, character) < 2 || spirit < 0 || spirit > 1000) {
clif_displaymessage(fd, "Usage: @spiritball <number: 0-1000>) <CHARACTER_NAME>."); clif_displaymessage(fd, "Usage: @spiritball <number: 0-1000>) <CHARACTER_NAME>.");
@ -765,10 +765,10 @@ charcommand_itemlist(
struct item *i_item; //Current inventory item. struct item *i_item; //Current inventory item.
nullpo_retr(-1, sd); nullpo_retr(-1, sd);
malloc_tsetdword(character, '\0', sizeof(character)); memset(character, '\0', sizeof(character));
malloc_tsetdword(output, '\0', sizeof(output)); memset(output, '\0', sizeof(output));
malloc_tsetdword(equipstr, '\0', sizeof(equipstr)); memset(equipstr, '\0', sizeof(equipstr));
malloc_tsetdword(outputtmp, '\0', sizeof(outputtmp)); memset(outputtmp, '\0', sizeof(outputtmp));
if (!message || !*message || sscanf(message, "%23[^\n]", character) < 1) { if (!message || !*message || sscanf(message, "%23[^\n]", character) < 1) {
clif_displaymessage(fd, "Please, enter a player name (usage: #itemlist <char name>)."); clif_displaymessage(fd, "Please, enter a player name (usage: #itemlist <char name>).");
@ -821,13 +821,13 @@ charcommand_itemlist(
// remove final ', ' // remove final ', '
equipstr[strlen(equipstr) - 2] = '\0'; equipstr[strlen(equipstr) - 2] = '\0';
} else } else
malloc_tsetdword(equipstr, '\0', sizeof(equipstr)); memset(equipstr, '\0', sizeof(equipstr));
if (i_item->refine) if (i_item->refine)
sprintf(output, "%d %s %+d (%s %+d, id: %d) %s", i_item->amount, item_data->name, i_item->refine, item_data->jname, i_item->refine, i_item->nameid, equipstr); sprintf(output, "%d %s %+d (%s %+d, id: %d) %s", i_item->amount, item_data->name, i_item->refine, item_data->jname, i_item->refine, i_item->nameid, equipstr);
else else
sprintf(output, "%d %s (%s, id: %d) %s", i_item->amount, item_data->name, item_data->jname, i_item->nameid, equipstr); sprintf(output, "%d %s (%s, id: %d) %s", i_item->amount, item_data->name, item_data->jname, i_item->nameid, equipstr);
clif_displaymessage(fd, output); clif_displaymessage(fd, output);
malloc_tsetdword(output, '\0', sizeof(output)); memset(output, '\0', sizeof(output));
counter2 = 0; counter2 = 0;
if(i_item->card[0]==CARD0_PET) { //pet eggs if(i_item->card[0]==CARD0_PET) { //pet eggs
@ -925,9 +925,9 @@ charcommand_storagelist(
char character[NAME_LENGTH], output[200], outputtmp[200]; char character[NAME_LENGTH], output[200], outputtmp[200];
nullpo_retr(-1, sd); nullpo_retr(-1, sd);
malloc_tsetdword(character, '\0', sizeof(character)); memset(character, '\0', sizeof(character));
malloc_tsetdword(output, '\0', sizeof(output)); memset(output, '\0', sizeof(output));
malloc_tsetdword(outputtmp, '\0', sizeof(outputtmp)); memset(outputtmp, '\0', sizeof(outputtmp));
if (!message || !*message || sscanf(message, "%23[^\n]", character) < 1) { if (!message || !*message || sscanf(message, "%23[^\n]", character) < 1) {
clif_displaymessage(fd, "Please, enter a player name (usage: #itemlist <char name>)."); clif_displaymessage(fd, "Please, enter a player name (usage: #itemlist <char name>).");
@ -952,7 +952,7 @@ charcommand_storagelist(
else else
sprintf(output, "%d %s (%s, id: %d)", stor->storage_[i].amount, item_data->name, item_data->jname, stor->storage_[i].nameid); sprintf(output, "%d %s (%s, id: %d)", stor->storage_[i].amount, item_data->name, item_data->jname, stor->storage_[i].nameid);
clif_displaymessage(fd, output); clif_displaymessage(fd, output);
malloc_tsetdword(output, '\0', sizeof(output)); memset(output, '\0', sizeof(output));
counter2 = 0; counter2 = 0;
for (j = 0; j < item_data->slot; j++) { for (j = 0; j < item_data->slot; j++) {
if (stor->storage_[i].card[j]) { if (stor->storage_[i].card[j]) {
@ -1008,7 +1008,7 @@ charcommand_giveitem_sub(struct map_session_data *sd,struct item_data *item_data
get_count = 1; get_count = 1;
} }
for (i = 0; i < loop; i++) { for (i = 0; i < loop; i++) {
malloc_set(&item_tmp, 0, sizeof(item_tmp)); memset(&item_tmp, 0, sizeof(item_tmp));
item_tmp.nameid = item_data->nameid; item_tmp.nameid = item_data->nameid;
item_tmp.identify = 1; item_tmp.identify = 1;
@ -1041,7 +1041,7 @@ int charcommand_item(
char tmp_cmdoutput[1024]; char tmp_cmdoutput[1024];
nullpo_retr(-1, sd); nullpo_retr(-1, sd);
malloc_tsetdword(item_name, '\0', sizeof(item_name)); memset(item_name, '\0', sizeof(item_name));
if (!message || !*message || sscanf(message, "%99s %d %23[^\n]", item_name, &number, character) < 3) { if (!message || !*message || sscanf(message, "%99s %d %23[^\n]", item_name, &number, character) < 3) {
clif_displaymessage(fd, "Please, enter an item name/id (usage: #item <item name or ID> <quantity> <char name>)."); clif_displaymessage(fd, "Please, enter an item name/id (usage: #item <item name or ID> <quantity> <char name>).");
@ -1076,7 +1076,7 @@ int charcommand_item(
100, 0, 1, pet_db[pet_id].jname); 100, 0, 1, pet_db[pet_id].jname);
// if not pet egg // if not pet egg
} else { } else {
malloc_set(&item_tmp, 0, sizeof(item_tmp)); memset(&item_tmp, 0, sizeof(item_tmp));
item_tmp.nameid = item_id; item_tmp.nameid = item_id;
item_tmp.identify = 1; item_tmp.identify = 1;
@ -1135,8 +1135,8 @@ int charcommand_warp(
nullpo_retr(-1, sd); nullpo_retr(-1, sd);
malloc_tsetdword(map_name, '\0', sizeof(map_name)); memset(map_name, '\0', sizeof(map_name));
malloc_tsetdword(character, '\0', sizeof(character)); memset(character, '\0', sizeof(character));
if (!message || !*message || sscanf(message, "%15s %d %d %23[^\n]", map_name, &x, &y, character) < 4) { if (!message || !*message || sscanf(message, "%15s %d %d %23[^\n]", map_name, &x, &y, character) < 4) {
clif_displaymessage(fd, "Usage: #warp/#rura/#rura+ <mapname> <x> <y> <char name>"); clif_displaymessage(fd, "Usage: #warp/#rura/#rura+ <mapname> <x> <y> <char name>");
@ -1193,7 +1193,7 @@ int charcommand_zeny(
int zeny = 0, new_zeny; int zeny = 0, new_zeny;
nullpo_retr(-1, sd); nullpo_retr(-1, sd);
malloc_tsetdword(character, '\0', sizeof(character)); memset(character, '\0', sizeof(character));
if (!message || !*message || sscanf(message, "%d %23[^\n]", &zeny, character) < 2 || zeny == 0) { if (!message || !*message || sscanf(message, "%d %23[^\n]", &zeny, character) < 2 || zeny == 0) {
clif_displaymessage(fd, "Please, enter a number and a player name (usage: #zeny <zeny> <name>)."); clif_displaymessage(fd, "Please, enter a number and a player name (usage: #zeny <zeny> <name>).");
@ -1779,8 +1779,8 @@ int charcommand_feelreset(
char output[200]; char output[200];
struct map_session_data *pl_sd; struct map_session_data *pl_sd;
malloc_tsetdword(character, '\0', sizeof(character)); memset(character, '\0', sizeof(character));
malloc_tsetdword(output, '\0', sizeof(output)); memset(output, '\0', sizeof(output));
if (!message || !*message || sscanf(message, "%23[^\n]", character) < 1) { if (!message || !*message || sscanf(message, "%23[^\n]", character) < 1) {
clif_displaymessage(fd, "Please, enter a player name (usage: #feelreset <charname>)."); clif_displaymessage(fd, "Please, enter a player name (usage: #feelreset <charname>).");
@ -1817,7 +1817,7 @@ int charcommand_help(
FILE* fp; FILE* fp;
nullpo_retr(-1, sd); nullpo_retr(-1, sd);
malloc_tsetdword(buf, '\0', sizeof(buf)); memset(buf, '\0', sizeof(buf));
if ((fp = fopen(charhelp_txt, "r")) != NULL) { if ((fp = fopen(charhelp_txt, "r")) != NULL) {
clif_displaymessage(fd, msg_table[26]); /* Help commands: */ clif_displaymessage(fd, msg_table[26]); /* Help commands: */

8
src/map/chrif.c
View File

@ -1168,9 +1168,9 @@ int chrif_recvfamelist(int fd)
int total = 0, len = 8; int total = 0, len = 8;
RFIFOHEAD(fd); RFIFOHEAD(fd);
malloc_tsetdword (smith_fame_list, 0, sizeof(smith_fame_list)); memset (smith_fame_list, 0, sizeof(smith_fame_list));
malloc_tsetdword (chemist_fame_list, 0, sizeof(chemist_fame_list)); memset (chemist_fame_list, 0, sizeof(chemist_fame_list));
malloc_tsetdword (taekwon_fame_list, 0, sizeof(taekwon_fame_list)); memset (taekwon_fame_list, 0, sizeof(taekwon_fame_list));
size = RFIFOW(fd, 6); //Blacksmith block size size = RFIFOW(fd, 6); //Blacksmith block size
for (num = 0; len < size && num < MAX_FAME_LIST; num++) { for (num = 0; len < size && num < MAX_FAME_LIST; num++) {
@ -1317,7 +1317,7 @@ int chrif_load_scdata(int fd)
} }
fclose(fp); fclose(fp);
} else { } else {
malloc_tsetdword(buf, 0, sizeof(buf)); //No data found, send empty packets? memset(buf, 0, sizeof(buf)); //No data found, send empty packets?
WFIFOW(char_fd,8) = sizeof(buf) + 10; WFIFOW(char_fd,8) = sizeof(buf) + 10;
memcpy(WFIFOP(char_fd,10), buf, sizeof(buf)); memcpy(WFIFOP(char_fd,10), buf, sizeof(buf));
} }

82
src/map/clif.c
View File

@ -873,7 +873,7 @@ static int clif_set0078(struct block_list *bl, struct view_data *vd, unsigned ch
lv = status_get_lv(bl); lv = status_get_lv(bl);
if(pcdb_checkid(vd->class_)) { if(pcdb_checkid(vd->class_)) {
#if PACKETVER > 6 #if PACKETVER > 6
malloc_set(buf,0,packet_len(0x22a)); memset(buf,0,packet_len(0x22a));
WBUFW(buf,0)=0x22a; WBUFW(buf,0)=0x22a;
WBUFL(buf,2)=bl->id; WBUFL(buf,2)=bl->id;
@ -908,7 +908,7 @@ static int clif_set0078(struct block_list *bl, struct view_data *vd, unsigned ch
WBUFW(buf,56)=clif_setlevel(lv); WBUFW(buf,56)=clif_setlevel(lv);
return packet_len(0x22a); return packet_len(0x22a);
#elif PACKETVER > 3 #elif PACKETVER > 3
malloc_set(buf,0,packet_len(0x1d8)); memset(buf,0,packet_len(0x1d8));
WBUFW(buf,0)=0x1d8; WBUFW(buf,0)=0x1d8;
WBUFL(buf,2)=bl->id; WBUFL(buf,2)=bl->id;
@ -943,7 +943,7 @@ static int clif_set0078(struct block_list *bl, struct view_data *vd, unsigned ch
WBUFW(buf,52)=clif_setlevel(lv); WBUFW(buf,52)=clif_setlevel(lv);
return packet_len(0x1d8); return packet_len(0x1d8);
#else #else
malloc_set(buf,0,packet_len(0x78)); memset(buf,0,packet_len(0x78));
WBUFW(buf,0)=0x78; WBUFW(buf,0)=0x78;
WBUFL(buf,2)=bl->id; WBUFL(buf,2)=bl->id;
@ -978,7 +978,7 @@ static int clif_set0078(struct block_list *bl, struct view_data *vd, unsigned ch
#endif #endif
} }
//Non-player sprites need just a few fields filled. //Non-player sprites need just a few fields filled.
malloc_set(buf,0,packet_len(0x78)); memset(buf,0,packet_len(0x78));
WBUFW(buf,0)=0x78; WBUFW(buf,0)=0x78;
WBUFL(buf,2)=bl->id; WBUFL(buf,2)=bl->id;
@ -1026,7 +1026,7 @@ static int clif_set007b(struct block_list *bl, struct view_data *vd, struct unit
if(pcdb_checkid(vd->class_)) { if(pcdb_checkid(vd->class_)) {
#if PACKETVER > 6 #if PACKETVER > 6
malloc_set(buf,0,packet_len(0x22c)); memset(buf,0,packet_len(0x22c));
WBUFW(buf,0)=0x22c; WBUFW(buf,0)=0x22c;
WBUFL(buf,2)=bl->id; WBUFL(buf,2)=bl->id;
@ -1062,7 +1062,7 @@ static int clif_set007b(struct block_list *bl, struct view_data *vd, struct unit
return packet_len(0x22c); return packet_len(0x22c);
#elif PACKETVER > 3 #elif PACKETVER > 3
malloc_set(buf,0,packet_len(0x1da)); memset(buf,0,packet_len(0x1da));
WBUFW(buf,0)=0x1da; WBUFW(buf,0)=0x1da;
WBUFL(buf,2)=bl->id; WBUFL(buf,2)=bl->id;
@ -1098,7 +1098,7 @@ static int clif_set007b(struct block_list *bl, struct view_data *vd, struct unit
return packet_len(0x1da); return packet_len(0x1da);
#else #else
malloc_set(buf,0,packet_len(0x7b)); memset(buf,0,packet_len(0x7b));
WBUFW(buf,0)=0x7b; WBUFW(buf,0)=0x7b;
WBUFL(buf,2)=bl->id; WBUFL(buf,2)=bl->id;
@ -1135,7 +1135,7 @@ static int clif_set007b(struct block_list *bl, struct view_data *vd, struct unit
} }
//Non-player sprites only require a few fields. //Non-player sprites only require a few fields.
#if PACKETVER > 6 #if PACKETVER > 6
malloc_set(buf,0,packet_len(0x22c)); memset(buf,0,packet_len(0x22c));
WBUFW(buf,0)=0x22c; WBUFW(buf,0)=0x22c;
WBUFL(buf,2)=bl->id; WBUFL(buf,2)=bl->id;
@ -1159,7 +1159,7 @@ static int clif_set007b(struct block_list *bl, struct view_data *vd, struct unit
WBUFW(buf,62)=clif_setlevel(lv); WBUFW(buf,62)=clif_setlevel(lv);
return packet_len(0x22c); return packet_len(0x22c);
#else #else
malloc_set(buf,0,packet_len(0x7b)); memset(buf,0,packet_len(0x7b));
WBUFW(buf,0)=0x7b; WBUFW(buf,0)=0x7b;
WBUFL(buf,2)=bl->id; WBUFL(buf,2)=bl->id;
@ -1369,7 +1369,7 @@ int clif_spawn(struct block_list *bl)
} }
} else { //Mob spawn packet. } else { //Mob spawn packet.
struct status_change *sc = status_get_sc(bl); struct status_change *sc = status_get_sc(bl);
malloc_tsetdword(buf,0,sizeof(buf)); memset(buf,0,sizeof(buf));
WBUFW(buf,0)=0x7c; WBUFW(buf,0)=0x7c;
WBUFL(buf,2)=bl->id; WBUFL(buf,2)=bl->id;
WBUFW(buf,6)=status_get_speed(bl); WBUFW(buf,6)=status_get_speed(bl);
@ -1428,7 +1428,7 @@ int clif_hominfo(struct map_session_data *sd, struct homun_data *hd, int flag)
nullpo_retr(0, hd); nullpo_retr(0, hd);
status = &hd->battle_status; status = &hd->battle_status;
malloc_set(buf,0,packet_len(0x22e)); memset(buf,0,packet_len(0x22e));
WBUFW(buf,0)=0x22e; WBUFW(buf,0)=0x22e;
memcpy(WBUFP(buf,2),hd->homunculus.name,NAME_LENGTH); memcpy(WBUFP(buf,2),hd->homunculus.name,NAME_LENGTH);
// Bit field, bit 0 : rename_flag (1 = already renamed), bit 1 : homunc vaporized (1 = true), bit 2 : homunc dead (1 = true) // Bit field, bit 0 : rename_flag (1 = already renamed), bit 1 : homunc vaporized (1 = true), bit 2 : homunc dead (1 = true)
@ -1654,7 +1654,7 @@ int clif_movepc(struct map_session_data *sd) {
|| map[sd->bl.m].flag.rain || map[sd->bl.m].flag.rain
|| map[sd->bl.m].flag.clouds2 || map[sd->bl.m].flag.clouds2
) { ) {
malloc_set(buf,0,packet_len(0x7b)); memset(buf,0,packet_len(0x7b));
WBUFW(buf,0)=0x7b; WBUFW(buf,0)=0x7b;
WBUFL(buf,2)=-10; WBUFL(buf,2)=-10;
WBUFW(buf,6)=sd->battle_status.speed; WBUFW(buf,6)=sd->battle_status.speed;
@ -2001,7 +2001,7 @@ void clif_sendfakenpc(struct map_session_data *sd, int npcid) {
int fd = sd->fd; int fd = sd->fd;
WFIFOHEAD(fd, packet_len(0x78)); WFIFOHEAD(fd, packet_len(0x78));
sd->state.using_fake_npc = 1; sd->state.using_fake_npc = 1;
malloc_set(WFIFOP(fd,0), 0, packet_len(0x78)); memset(WFIFOP(fd,0), 0, packet_len(0x78));
WFIFOW(fd,0)=0x78; WFIFOW(fd,0)=0x78;
WFIFOL(fd,2)=npcid; WFIFOL(fd,2)=npcid;
WFIFOW(fd,14)=111; WFIFOW(fd,14)=111;
@ -3186,7 +3186,7 @@ int clif_misceffect2(struct block_list *bl, int type) {
nullpo_retr(0, bl); nullpo_retr(0, bl);
malloc_set(buf, 0, packet_len(0x1f3)); memset(buf, 0, packet_len(0x1f3));
WBUFW(buf,0) = 0x1f3; WBUFW(buf,0) = 0x1f3;
WBUFL(buf,2) = bl->id; WBUFL(buf,2) = bl->id;
@ -4063,7 +4063,7 @@ int clif_getareachar_skillunit(struct map_session_data *sd,struct skill_unit *un
#if PACKETVER >= 3 #if PACKETVER >= 3
if(unit->group->unit_id==UNT_GRAFFITI) { // Graffiti [Valaris] if(unit->group->unit_id==UNT_GRAFFITI) { // Graffiti [Valaris]
WFIFOHEAD(fd,packet_len(0x1c9)); WFIFOHEAD(fd,packet_len(0x1c9));
malloc_set(WFIFOP(fd,0),0,packet_len(0x1c9)); memset(WFIFOP(fd,0),0,packet_len(0x1c9));
WFIFOW(fd, 0)=0x1c9; WFIFOW(fd, 0)=0x1c9;
WFIFOL(fd, 2)=unit->bl.id; WFIFOL(fd, 2)=unit->bl.id;
WFIFOL(fd, 6)=unit->group->src_id; WFIFOL(fd, 6)=unit->group->src_id;
@ -4078,7 +4078,7 @@ int clif_getareachar_skillunit(struct map_session_data *sd,struct skill_unit *un
} }
#endif #endif
WFIFOHEAD(fd,packet_len(0x11f)); WFIFOHEAD(fd,packet_len(0x11f));
malloc_set(WFIFOP(fd,0),0,packet_len(0x11f)); memset(WFIFOP(fd,0),0,packet_len(0x11f));
WFIFOW(fd, 0)=0x11f; WFIFOW(fd, 0)=0x11f;
WFIFOL(fd, 2)=unit->bl.id; WFIFOL(fd, 2)=unit->bl.id;
WFIFOL(fd, 6)=unit->group->src_id; WFIFOL(fd, 6)=unit->group->src_id;
@ -4097,7 +4097,7 @@ int clif_getareachar_skillunit(struct map_session_data *sd,struct skill_unit *un
return 0; return 0;
/* Previous implementation guess of packet 0x1c9, who can understand what all those fields are for? [Skotlex] /* Previous implementation guess of packet 0x1c9, who can understand what all those fields are for? [Skotlex]
WFIFOHEAD(fd,packet_len(0x1c9)); WFIFOHEAD(fd,packet_len(0x1c9));
malloc_set(WFIFOP(fd,0),0,packet_len(0x1c9)); memset(WFIFOP(fd,0),0,packet_len(0x1c9));
WFIFOW(fd, 0)=0x1c9; WFIFOW(fd, 0)=0x1c9;
WFIFOL(fd, 2)=unit->bl.id; WFIFOL(fd, 2)=unit->bl.id;
WFIFOL(fd, 6)=unit->group->src_id; WFIFOL(fd, 6)=unit->group->src_id;
@ -4730,7 +4730,7 @@ int clif_skill_setunit(struct skill_unit *unit)
#if PACKETVER >= 3 #if PACKETVER >= 3
if(unit->group->unit_id==UNT_GRAFFITI) { // Graffiti [Valaris] if(unit->group->unit_id==UNT_GRAFFITI) { // Graffiti [Valaris]
malloc_set(WBUFP(buf, 0),0,packet_len(0x1c9)); memset(WBUFP(buf, 0),0,packet_len(0x1c9));
WBUFW(buf, 0)=0x1c9; WBUFW(buf, 0)=0x1c9;
WBUFL(buf, 2)=unit->bl.id; WBUFL(buf, 2)=unit->bl.id;
WBUFL(buf, 6)=unit->group->src_id; WBUFL(buf, 6)=unit->group->src_id;
@ -4748,7 +4748,7 @@ int clif_skill_setunit(struct skill_unit *unit)
return 0; return 0;
} }
#endif #endif
malloc_set(WBUFP(buf, 0),0,packet_len(0x11f)); memset(WBUFP(buf, 0),0,packet_len(0x11f));
WBUFW(buf, 0)=0x11f; WBUFW(buf, 0)=0x11f;
WBUFL(buf, 2)=unit->bl.id; WBUFL(buf, 2)=unit->bl.id;
WBUFL(buf, 6)=unit->group->src_id; WBUFL(buf, 6)=unit->group->src_id;
@ -4764,7 +4764,7 @@ int clif_skill_setunit(struct skill_unit *unit)
return 0; return 0;
/* Previous mysterious implementation noone really understands. [Skotlex] /* Previous mysterious implementation noone really understands. [Skotlex]
malloc_set(WBUFP(buf, 0),0,packet_len(0x1c9)); memset(WBUFP(buf, 0),0,packet_len(0x1c9));
WBUFW(buf, 0)=0x1c9; WBUFW(buf, 0)=0x1c9;
WBUFL(buf, 2)=unit->bl.id; WBUFL(buf, 2)=unit->bl.id;
WBUFL(buf, 6)=unit->group->src_id; WBUFL(buf, 6)=unit->group->src_id;
@ -6361,7 +6361,7 @@ int clif_pet_emotion(struct pet_data *pd,int param)
nullpo_retr(0, pd); nullpo_retr(0, pd);
malloc_set(buf,0,packet_len(0x1aa)); memset(buf,0,packet_len(0x1aa));
WBUFW(buf,0)=0x1aa; WBUFW(buf,0)=0x1aa;
WBUFL(buf,2)=pd->bl.id; WBUFL(buf,2)=pd->bl.id;
@ -6386,7 +6386,7 @@ int clif_pet_performance(struct block_list *bl,int param)
nullpo_retr(0, bl); nullpo_retr(0, bl);
malloc_set(buf,0,packet_len(0x1a4)); memset(buf,0,packet_len(0x1a4));
WBUFW(buf,0)=0x1a4; WBUFW(buf,0)=0x1a4;
WBUFB(buf,2)=4; WBUFB(buf,2)=4;
@ -6404,7 +6404,7 @@ int clif_pet_equip(struct pet_data *pd)
nullpo_retr(0, pd); nullpo_retr(0, pd);
malloc_set(buf,0,packet_len(0x1a4)); memset(buf,0,packet_len(0x1a4));
WBUFW(buf,0)=0x1a4; WBUFW(buf,0)=0x1a4;
WBUFB(buf,2)=3; WBUFB(buf,2)=3;
@ -6695,7 +6695,7 @@ int clif_guild_belonginfo(struct map_session_data *sd,struct guild *g)
ps=guild_getposition(sd,g); ps=guild_getposition(sd,g);
WFIFOHEAD(fd,packet_len(0x16c)); WFIFOHEAD(fd,packet_len(0x16c));
malloc_set(WFIFOP(fd,0),0,packet_len(0x16c)); memset(WFIFOP(fd,0),0,packet_len(0x16c));
WFIFOW(fd,0)=0x16c; WFIFOW(fd,0)=0x16c;
WFIFOL(fd,2)=g->guild_id; WFIFOL(fd,2)=g->guild_id;
WFIFOL(fd,6)=g->emblem_id; WFIFOL(fd,6)=g->emblem_id;
@ -6899,7 +6899,7 @@ int clif_guild_memberlist(struct map_session_data *sd)
WFIFOL(fd,c*104+22)=m->exp; WFIFOL(fd,c*104+22)=m->exp;
WFIFOL(fd,c*104+26)=m->online; WFIFOL(fd,c*104+26)=m->online;
WFIFOL(fd,c*104+30)=m->position; WFIFOL(fd,c*104+30)=m->position;
malloc_tsetword(WFIFOP(fd,c*104+34),0,50); // ƒ<>ƒ‚<C692>H memset(WFIFOP(fd,c*104+34),0,50); // ƒ<>ƒ‚<C692>H
memcpy(WFIFOP(fd,c*104+84),m->name,NAME_LENGTH); memcpy(WFIFOP(fd,c*104+84),m->name,NAME_LENGTH);
c++; c++;
} }
@ -7677,7 +7677,7 @@ void clif_soundeffect(struct map_session_data *sd,struct block_list *bl,char *na
int clif_soundeffectall(struct block_list *bl, char *name, int type, int coverage) int clif_soundeffectall(struct block_list *bl, char *name, int type, int coverage)
{ {
unsigned char buf[40]; unsigned char buf[40];
malloc_set(buf, 0, packet_len(0x1d3)); memset(buf, 0, packet_len(0x1d3));
if(coverage < 0 || coverage > 22){ if(coverage < 0 || coverage > 22){
ShowError("clif_soundeffectall: undefined coverage.\n"); ShowError("clif_soundeffectall: undefined coverage.\n");
@ -7703,7 +7703,7 @@ int clif_specialeffect(struct block_list *bl, int type, int flag)
nullpo_retr(0, bl); nullpo_retr(0, bl);
malloc_set(buf, 0, packet_len(0x1f3)); memset(buf, 0, packet_len(0x1f3));
WBUFW(buf,0) = 0x1f3; WBUFW(buf,0) = 0x1f3;
WBUFL(buf,2) = bl->id; WBUFL(buf,2) = bl->id;
@ -8045,7 +8045,7 @@ void clif_hate_info(struct map_session_data *sd, unsigned char hate_level,int cl
else if (mobdb_checkid(class_)) else if (mobdb_checkid(class_))
strncpy(WFIFOP(fd,2),mob_db(class_)->jname, NAME_LENGTH); strncpy(WFIFOP(fd,2),mob_db(class_)->jname, NAME_LENGTH);
else //Really shouldn't happen... else //Really shouldn't happen...
malloc_tsetdword(WFIFOP(fd,2), 0, NAME_LENGTH); memset(WFIFOP(fd,2), 0, NAME_LENGTH);
WFIFOL(fd,26)=sd->bl.id; WFIFOL(fd,26)=sd->bl.id;
WFIFOB(fd,30)=hate_level; WFIFOB(fd,30)=hate_level;
WFIFOB(fd,31)=type?10:11; //Register/Info WFIFOB(fd,31)=type?10:11; //Register/Info
@ -8077,7 +8077,7 @@ void clif_feel_hate_reset(struct map_session_data *sd)
int fd=sd->fd; int fd=sd->fd;
WFIFOHEAD(fd,packet_len(0x20e)); WFIFOHEAD(fd,packet_len(0x20e));
WFIFOW(fd,0)=0x20e; WFIFOW(fd,0)=0x20e;
malloc_tsetdword(WFIFOP(fd,2), 0, NAME_LENGTH); //Blank name as all was reset. memset(WFIFOP(fd,2), 0, NAME_LENGTH); //Blank name as all was reset.
WFIFOL(fd,26)=sd->bl.id; WFIFOL(fd,26)=sd->bl.id;
WFIFOB(fd,30)=0; //Feel/hate level: irrelevant WFIFOB(fd,30)=0; //Feel/hate level: irrelevant
WFIFOB(fd,31)=30; WFIFOB(fd,31)=30;
@ -8606,7 +8606,7 @@ void check_fake_id(int fd, struct map_session_data *sd, int target_id) {
} }
intif_wis_message_to_gm(wisp_server_name, battle_config.hack_info_GM_level, message_to_gm); intif_wis_message_to_gm(wisp_server_name, battle_config.hack_info_GM_level, message_to_gm);
// send this info cause the bot ask until get an answer, damn spam // send this info cause the bot ask until get an answer, damn spam
malloc_tsetdword(WPACKETP(0), 0, packet_len(0x95)); memset(WPACKETP(0), 0, packet_len(0x95));
WPACKETW(0) = 0x95; WPACKETW(0) = 0x95;
WPACKETL(2) = server_char_id; WPACKETL(2) = server_char_id;
strncpy(WPACKETP(6), sd->status.name, 24); strncpy(WPACKETP(6), sd->status.name, 24);
@ -8647,7 +8647,7 @@ void check_fake_id(int fd, struct map_session_data *sd, int target_id) {
} }
intif_wis_message_to_gm(wisp_server_name, battle_config.hack_info_GM_level, message_to_gm); intif_wis_message_to_gm(wisp_server_name, battle_config.hack_info_GM_level, message_to_gm);
// send this info cause the bot ask until get an answer, damn spam // send this info cause the bot ask until get an answer, damn spam
malloc_tsetdword(WPACKETP(0), 0, packet_len(0x95)); memset(WPACKETP(0), 0, packet_len(0x95));
WPACKETW(0) = 0x95; WPACKETW(0) = 0x95;
WPACKETL(2) = server_fake_mob_id; WPACKETL(2) = server_fake_mob_id;
fake_mob = fake_mob_list[(sd->bl.m + sd->fd + sd->status.char_id) % (sizeof(fake_mob_list) / sizeof(fake_mob_list[0]))]; // never same mob fake_mob = fake_mob_list[(sd->bl.m + sd->fd + sd->status.char_id) % (sizeof(fake_mob_list) / sizeof(fake_mob_list[0]))]; // never same mob
@ -10949,7 +10949,7 @@ void clif_parse_Shift(int fd, struct map_session_data *sd) { // Rewriten by [Yor
char player_name[NAME_LENGTH]; char player_name[NAME_LENGTH];
char message[MESSAGE_SIZE]; char message[MESSAGE_SIZE];
malloc_tsetdword(player_name, '\0', sizeof(player_name)); memset(player_name, '\0', sizeof(player_name));
if ((battle_config.atc_gmonly == 0 || pc_isGM(sd)) && if ((battle_config.atc_gmonly == 0 || pc_isGM(sd)) &&
(pc_isGM(sd) >= get_atcommand_level(AtCommand_JumpTo))) { (pc_isGM(sd) >= get_atcommand_level(AtCommand_JumpTo))) {
@ -10973,7 +10973,7 @@ void clif_parse_Recall(int fd, struct map_session_data *sd) { // Added by RoVeRT
char player_name[NAME_LENGTH]; char player_name[NAME_LENGTH];
char message[MESSAGE_SIZE]; char message[MESSAGE_SIZE];
malloc_tsetdword(player_name, '\0', sizeof(player_name)); memset(player_name, '\0', sizeof(player_name));
if ((battle_config.atc_gmonly == 0 || pc_isGM(sd)) && if ((battle_config.atc_gmonly == 0 || pc_isGM(sd)) &&
(pc_isGM(sd) >= get_atcommand_level(AtCommand_Recall))) { (pc_isGM(sd) >= get_atcommand_level(AtCommand_Recall))) {
@ -10997,7 +10997,7 @@ void clif_parse_GM_Monster_Item(int fd, struct map_session_data *sd) {
char monster_item_name[NAME_LENGTH+10]; //Additional space is for logging, eg: "@monster Poring" char monster_item_name[NAME_LENGTH+10]; //Additional space is for logging, eg: "@monster Poring"
int level; int level;
malloc_tsetdword(monster_item_name, '\0', sizeof(monster_item_name)); memset(monster_item_name, '\0', sizeof(monster_item_name));
if (battle_config.atc_gmonly == 0 || pc_isGM(sd)) { if (battle_config.atc_gmonly == 0 || pc_isGM(sd)) {
RFIFOHEAD(fd); RFIFOHEAD(fd);
@ -11133,7 +11133,7 @@ void clif_parse_PMIgnore(int fd, struct map_session_data *sd) { // Rewritten by
WFIFOHEAD(fd,packet_len(0xd1)); WFIFOHEAD(fd,packet_len(0xd1));
RFIFOHEAD(fd); RFIFOHEAD(fd);
malloc_tsetdword(output, '\0', sizeof(output)); memset(output, '\0', sizeof(output));
nick = (char*)RFIFOP(fd,2); // speed up nick = (char*)RFIFOP(fd,2); // speed up
nick[NAME_LENGTH-1] = '\0'; // to be sure that the player name have at maximum 23 characters nick[NAME_LENGTH-1] = '\0'; // to be sure that the player name have at maximum 23 characters
@ -11199,7 +11199,7 @@ void clif_parse_PMIgnore(int fd, struct map_session_data *sd) { // Rewritten by
//Move everything one place down to overwrite removed entry. //Move everything one place down to overwrite removed entry.
memmove(sd->ignore[i].name, sd->ignore[i+1].name, memmove(sd->ignore[i].name, sd->ignore[i+1].name,
(MAX_IGNORE_LIST-i-1)*sizeof(sd->ignore[0].name)); (MAX_IGNORE_LIST-i-1)*sizeof(sd->ignore[0].name));
malloc_tsetdword(sd->ignore[MAX_IGNORE_LIST-1].name, 0, sizeof(sd->ignore[0].name)); memset(sd->ignore[MAX_IGNORE_LIST-1].name, 0, sizeof(sd->ignore[0].name));
// success // success
WFIFOB(fd,3) = 0; WFIFOB(fd,3) = 0;
WFIFOSET(fd, packet_len(0x0d1)); WFIFOSET(fd, packet_len(0x0d1));
@ -11516,7 +11516,7 @@ void clif_parse_FriendsListRemove(int fd, struct map_session_data *sd) {
for(j = i + 1; j < MAX_FRIENDS; j++) for(j = i + 1; j < MAX_FRIENDS; j++)
memcpy(&sd->status.friends[j-1], &sd->status.friends[j], sizeof(sd->status.friends[0])); memcpy(&sd->status.friends[j-1], &sd->status.friends[j], sizeof(sd->status.friends[0]));
malloc_set(&sd->status.friends[MAX_FRIENDS-1], 0, sizeof(sd->status.friends[MAX_FRIENDS-1])); memset(&sd->status.friends[MAX_FRIENDS-1], 0, sizeof(sd->status.friends[MAX_FRIENDS-1]));
clif_displaymessage(fd, "Friend removed"); clif_displaymessage(fd, "Friend removed");
WFIFOHEAD(fd,packet_len(0x20a)); WFIFOHEAD(fd,packet_len(0x20a));
@ -12286,7 +12286,7 @@ static int packetdb_readdb(void)
if( skip_ver != 0 ) if( skip_ver != 0 )
continue; // Skipping current packet version continue; // Skipping current packet version
malloc_tsetdword(str,0,sizeof(str)); memset(str,0,sizeof(str));
for(j=0,p=line;j<4 && p;j++){ for(j=0,p=line;j<4 && p;j++){
str[j]=p; str[j]=p;
p=strchr(p,','); p=strchr(p,',');
@ -12320,7 +12320,7 @@ static int packetdb_readdb(void)
for(i=0;i<MAX_PACKET_DB;i++){ for(i=0;i<MAX_PACKET_DB;i++){
if (packet_db[packet_ver][i].func == clif_parse_func[j].func) if (packet_db[packet_ver][i].func == clif_parse_func[j].func)
{ {
malloc_tsetword(&packet_db[packet_ver][i], 0, sizeof(struct packet_db)); memset(&packet_db[packet_ver][i], 0, sizeof(struct packet_db));
break; break;
} }
} }
@ -12373,9 +12373,9 @@ static int packetdb_readdb(void)
int do_init_clif(void) { int do_init_clif(void) {
clif_config.packet_db_ver = -1; // the main packet version of the DB clif_config.packet_db_ver = -1; // the main packet version of the DB
malloc_tsetdword(clif_config.connect_cmd, 0, sizeof(clif_config.connect_cmd)); //The default connect command will be determined after reading the packet_db [Skotlex] memset(clif_config.connect_cmd, 0, sizeof(clif_config.connect_cmd)); //The default connect command will be determined after reading the packet_db [Skotlex]
malloc_tsetword(packet_db,0,sizeof(packet_db)); memset(packet_db,0,sizeof(packet_db));
//Using the packet_db file is the only way to set up packets now [Skotlex] //Using the packet_db file is the only way to set up packets now [Skotlex]
packetdb_readdb(); packetdb_readdb();

8
src/map/guild.c
View File

@ -93,7 +93,7 @@ int guild_read_guildskill_tree_db(void)
FILE *fp; FILE *fp;
char line[1024],*p; char line[1024],*p;
malloc_set(guild_skill_tree,0,sizeof(guild_skill_tree)); memset(guild_skill_tree,0,sizeof(guild_skill_tree));
sprintf(line, "%s/guild_skill_tree.txt", db_path); sprintf(line, "%s/guild_skill_tree.txt", db_path);
if( (fp=fopen(line,"r"))==NULL){ if( (fp=fopen(line,"r"))==NULL){
ShowError("can't read %s\n", line); ShowError("can't read %s\n", line);
@ -169,7 +169,7 @@ static int guild_read_castledb(void)
while(fgets(line,1020,fp)){ while(fgets(line,1020,fp)){
if(line[0]=='/' && line[1]=='/') if(line[0]=='/' && line[1]=='/')
continue; continue;
malloc_tsetdword(str,0,sizeof(str)); memset(str,0,sizeof(str));
for(j=0,p=line;j<6 && p;j++){ for(j=0,p=line;j<6 && p;j++){
str[j]=p; str[j]=p;
p=strchr(p,','); p=strchr(p,',');
@ -321,7 +321,7 @@ void guild_makemember(struct guild_member *m,struct map_session_data *sd)
{ {
nullpo_retv(sd); nullpo_retv(sd);
malloc_set(m,0,sizeof(struct guild_member)); memset(m,0,sizeof(struct guild_member));
m->account_id =sd->status.account_id; m->account_id =sd->status.account_id;
m->char_id =sd->status.char_id; m->char_id =sd->status.char_id;
m->hair =sd->status.hair; m->hair =sd->status.hair;
@ -840,7 +840,7 @@ int guild_member_leaved(int guild_id,int account_id,int char_id,int flag,
else else
clif_guild_expulsion(online_member_sd, name, mes, account_id); clif_guild_expulsion(online_member_sd, name, mes, account_id);
malloc_set(&g->member[i],0,sizeof(struct guild_member)); memset(&g->member[i],0,sizeof(struct guild_member));
clif_guild_memberlist(online_member_sd); clif_guild_memberlist(online_member_sd);
if(sd != NULL && sd->status.guild_id == guild_id) { if(sd != NULL && sd->status.guild_id == guild_id) {

54
src/map/irc.c
View File

@ -63,7 +63,7 @@ int irc_connect_timer(int tid, unsigned int tick, int id, int data)
void irc_announce(char *buf) void irc_announce(char *buf)
{ {
char send_string[256]; char send_string[256];
// malloc_tsetdword(send_string,'\0',256); // NOT REQUIRED // memset(send_string,'\0',256); // NOT REQUIRED
sprintf(send_string,"PRIVMSG %s :",irc_channel); sprintf(send_string,"PRIVMSG %s :",irc_channel);
strcat(send_string, buf); strcat(send_string, buf);
@ -75,7 +75,7 @@ void irc_announce_jobchange(struct map_session_data *sd)
char send_string[256]; char send_string[256];
nullpo_retv(sd); nullpo_retv(sd);
malloc_tsetdword(send_string,'\0',256); memset(send_string,'\0',256);
sprintf(send_string,"PRIVMSG %s :%s has changed into a %s.",irc_channel,sd->status.name,job_name(sd->status.class_)); sprintf(send_string,"PRIVMSG %s :%s has changed into a %s.",irc_channel,sd->status.name,job_name(sd->status.class_));
irc_send(send_string); irc_send(send_string);
@ -88,8 +88,8 @@ void irc_announce_shop(struct map_session_data *sd, int flag)
int maplen = 0; int maplen = 0;
nullpo_retv(sd); nullpo_retv(sd);
malloc_tsetdword(send_string,'\0',256); memset(send_string,'\0',256);
malloc_tsetdword(mapname,'\0',16); memset(mapname,'\0',16);
if(flag){ if(flag){
strcpy(mapname, map[sd->bl.m].name); strcpy(mapname, map[sd->bl.m].name);
@ -113,8 +113,8 @@ void irc_announce_mvp(struct map_session_data *sd, struct mob_data *md)
nullpo_retv(sd); nullpo_retv(sd);
nullpo_retv(md); nullpo_retv(md);
malloc_tsetdword(send_string,'\0',256); memset(send_string,'\0',256);
malloc_tsetdword(mapname,'\0',16); memset(mapname,'\0',16);
mapname[15]='\0'; // 15 is the final index, not 16 [Lance] mapname[15]='\0'; // 15 is the final index, not 16 [Lance]
strcpy(mapname, map[md->bl.m].name); strcpy(mapname, map[md->bl.m].name);
maplen = strcspn(mapname,"."); maplen = strcspn(mapname,".");
@ -156,7 +156,7 @@ int irc_parse(int fd)
int irc_keepalive_timer(int tid, unsigned int tick, int id, int data) int irc_keepalive_timer(int tid, unsigned int tick, int id, int data)
{ {
char send_string[128]; char send_string[128];
malloc_tsetdword(send_string,'\0',128); memset(send_string,'\0',128);
sprintf(send_string,"PRIVMSG %s : ", irc_nick); sprintf(send_string,"PRIVMSG %s : ", irc_nick);
irc_send(send_string); irc_send(send_string);
@ -179,7 +179,7 @@ void irc_send(char *buf)
if(!irc_si || !session[irc_si->fd]) if(!irc_si || !session[irc_si->fd])
return; return;
malloc_tsetdword(transmit,'\0',4096); memset(transmit,'\0',4096);
sprintf(transmit,buf); sprintf(transmit,buf);
irc_send_sub(irc_si->fd,transmit); irc_send_sub(irc_si->fd,transmit);
@ -207,16 +207,16 @@ void irc_parse_sub(int fd, char *incoming_string)
struct map_session_data **allsd; struct map_session_data **allsd;
malloc_tsetdword(source,'\0',256); memset(source,'\0',256);
malloc_tsetdword(command,'\0',256); memset(command,'\0',256);
malloc_tsetdword(target,'\0',256); memset(target,'\0',256);
malloc_tsetdword(message,'\0',8192); memset(message,'\0',8192);
malloc_tsetdword(send_string,'\0',8192); memset(send_string,'\0',8192);
malloc_tsetdword(cmd1,'\0',256); memset(cmd1,'\0',256);
malloc_tsetdword(cmd2,'\0',256); memset(cmd2,'\0',256);
malloc_tsetdword(cmdname,'\0',256); memset(cmdname,'\0',256);
malloc_tsetdword(cmdargs,'\0',256); memset(cmdargs,'\0',256);
sscanf(incoming_string, ":%255s %255s %255s :%4095[^\r\n]", source, command, target, message); sscanf(incoming_string, ":%255s %255s %255s :%4095[^\r\n]", source, command, target, message);
if (source != NULL) { if (source != NULL) {
@ -371,11 +371,11 @@ int parse_names_packet(char *str) {
char channel[256]; char channel[256];
char names[1024]; char names[1024];
malloc_tsetdword(source,'\0',256); memset(source,'\0',256);
malloc_tsetword(numeric,'\0',10); memset(numeric,'\0',10);
malloc_tsetdword(target,'\0',256); memset(target,'\0',256);
malloc_tsetdword(channel,'\0',256); memset(channel,'\0',256);
malloc_tsetdword(names,'\0',1024); memset(names,'\0',1024);
tok=strtok(str,"\r\n"); tok=strtok(str,"\r\n");
sscanf(tok,":%255s %10s %255s %*1[=@] %255s :%1023[^\r\n]",source,numeric,target,channel,names); sscanf(tok,":%255s %10s %255s %*1[=@] %255s :%1023[^\r\n]",source,numeric,target,channel,names);
@ -478,7 +478,7 @@ int irc_rmnames() {
int i=0; int i=0;
for(i=0;i<=MAX_CHANNEL_USERS;i++) { for(i=0;i<=MAX_CHANNEL_USERS;i++) {
//malloc_tsetdword(cd.user[i].name,'\0',256); //memset(cd.user[i].name,'\0',256);
cd.user[i].level=0; cd.user[i].level=0;
} }
@ -495,10 +495,10 @@ int irc_read_conf(char *file) {
char path[256]; char path[256];
char row[1024]; char row[1024];
malloc_tsetdword(w1,'\0',256); memset(w1,'\0',256);
malloc_tsetdword(w2,'\0',256); memset(w2,'\0',256);
malloc_tsetdword(path,'\0',256); memset(path,'\0',256);
malloc_tsetdword(row,'\0',256); memset(row,'\0',256);
sprintf(path,"conf/%s",file); sprintf(path,"conf/%s",file);

14
src/map/itemdb.c
View File

@ -212,7 +212,7 @@ static void itemdb_jobid2mapid(unsigned int *bclass, unsigned int jobmask)
} }
static void create_dummy_data(void) { static void create_dummy_data(void) {
malloc_set(&dummy_item, 0, sizeof(struct item_data)); memset(&dummy_item, 0, sizeof(struct item_data));
dummy_item.nameid=500; dummy_item.nameid=500;
dummy_item.weight=1; dummy_item.weight=1;
dummy_item.value_sell = 1; dummy_item.value_sell = 1;
@ -431,7 +431,7 @@ static int itemdb_read_itemavail (void)
while (fgets(line, sizeof(line) - 1, fp)) { while (fgets(line, sizeof(line) - 1, fp)) {
if (line[0] == '/' && line[1] == '/') if (line[0] == '/' && line[1] == '/')
continue; continue;
malloc_tsetdword(str, 0, sizeof(str)); memset(str, 0, sizeof(str));
for (j = 0, p = line; j < 2 && p; j++) { for (j = 0, p = line; j < 2 && p; j++) {
str[j] = p; str[j] = p;
p = strchr(p, ','); p = strchr(p, ',');
@ -485,7 +485,7 @@ static void itemdb_read_itemgroup_sub(const char* filename)
continue; continue;
} }
} }
malloc_tsetdword(str,0,sizeof(str)); memset(str,0,sizeof(str));
for(j=0,p=line;j<3 && p;j++){ for(j=0,p=line;j<3 && p;j++){
str[j]=p; str[j]=p;
p=strchr(p,','); p=strchr(p,',');
@ -561,7 +561,7 @@ static void itemdb_read_itemgroup(void)
"Gift Box China", "Gift Box China",
"Lotto Box", "Lotto Box",
}; };
malloc_tsetdword(&itemgroup_db, 0, sizeof(itemgroup_db)); memset(&itemgroup_db, 0, sizeof(itemgroup_db));
snprintf(path, 255, "%s/item_group_db.txt", db_path); snprintf(path, 255, "%s/item_group_db.txt", db_path);
itemdb_read_itemgroup_sub(path); itemdb_read_itemgroup_sub(path);
ShowStatus("Done reading '"CL_WHITE"%s"CL_RESET"'.\n","item_group_db.txt"); ShowStatus("Done reading '"CL_WHITE"%s"CL_RESET"'.\n","item_group_db.txt");
@ -739,7 +739,7 @@ static int itemdb_read_noequip(void)
while(fgets(line,1020,fp)){ while(fgets(line,1020,fp)){
if(line[0]=='/' && line[1]=='/') if(line[0]=='/' && line[1]=='/')
continue; continue;
malloc_tsetdword(str,0,sizeof(str)); memset(str,0,sizeof(str));
for(j=0,p=line;j<2 && p;j++){ for(j=0,p=line;j<2 && p;j++){
str[j]=p; str[j]=p;
p=strchr(p,','); p=strchr(p,',');
@ -784,7 +784,7 @@ static int itemdb_read_itemtrade(void)
while (fgets(line, sizeof(line) - 1, fp)) { while (fgets(line, sizeof(line) - 1, fp)) {
if (line[0] == '/' && line[1] == '/') if (line[0] == '/' && line[1] == '/')
continue; continue;
malloc_tsetdword(str, 0, sizeof(str)); memset(str, 0, sizeof(str));
for (j = 0, p = line; j < 3 && p; j++) { for (j = 0, p = line; j < 3 && p; j++) {
str[j] = p; str[j] = p;
p = strchr(p, ','); p = strchr(p, ',');
@ -1039,7 +1039,7 @@ static int itemdb_readdb(void)
lines++; lines++;
if(line[0]=='/' && line[1]=='/') if(line[0]=='/' && line[1]=='/')
continue; continue;
malloc_tsetdword(str,0,sizeof(str)); memset(str,0,sizeof(str));
for(j=0,np=p=line;j<19 && p;j++){ for(j=0,np=p=line;j<19 && p;j++){
str[j]=p; str[j]=p;
p=strchr(p,','); p=strchr(p,',');

2
src/map/log.c
View File

@ -393,7 +393,7 @@ int log_chat(char *type, int type_id, int src_charid, int src_accid, char *map,
void log_set_defaults(void) void log_set_defaults(void)
{ {
malloc_set(&log_config, 0, sizeof(log_config)); memset(&log_config, 0, sizeof(log_config));
//LOG FILTER Default values //LOG FILTER Default values
log_config.refine_items_log = 5; //log refined items, with refine >= +7 log_config.refine_items_log = 5; //log refined items, with refine >= +7

6
src/map/map.c
View File

@ -2570,7 +2570,7 @@ static int map_cache_open(char *fn)
// 読み甲ﾝに失敗したので新規に作成する // 読み甲ﾝに失敗したので新規に作成する
map_cache.fp = fopen(fn,"wb"); map_cache.fp = fopen(fn,"wb");
if(map_cache.fp) { if(map_cache.fp) {
malloc_set(&map_cache.head,0,sizeof(struct map_cache_head)); memset(&map_cache.head,0,sizeof(struct map_cache_head));
map_cache.map = (struct map_cache_info *) aCalloc(sizeof(struct map_cache_info),MAX_MAP_CACHE); map_cache.map = (struct map_cache_info *) aCalloc(sizeof(struct map_cache_info),MAX_MAP_CACHE);
map_cache.head.nmaps = MAX_MAP_CACHE; map_cache.head.nmaps = MAX_MAP_CACHE;
map_cache.head.sizeof_header = sizeof(struct map_cache_head); map_cache.head.sizeof_header = sizeof(struct map_cache_head);
@ -3135,7 +3135,7 @@ int map_readallmaps (void)
// pre-init some data // pre-init some data
map[i].alias = NULL; map[i].alias = NULL;
map[i].m = i; map[i].m = i;
malloc_set (map[i].moblist, 0, sizeof(map[i].moblist)); //Initialize moblist [Skotlex] memset (map[i].moblist, 0, sizeof(map[i].moblist)); //Initialize moblist [Skotlex]
map[i].mob_delete_timer = -1; //Initialize timer [Skotlex] map[i].mob_delete_timer = -1; //Initialize timer [Skotlex]
if (battle_config.pk_mode) if (battle_config.pk_mode)
map[i].flag.pvp = 1; // make all maps pvp for pk_mode [Valaris] map[i].flag.pvp = 1; // make all maps pvp for pk_mode [Valaris]
@ -3253,7 +3253,7 @@ int parse_console(char *buf) {
int m, n; int m, n;
struct map_session_data sd; struct map_session_data sd;
malloc_set(&sd, 0, sizeof(struct map_session_data)); memset(&sd, 0, sizeof(struct map_session_data));
strcpy( sd.status.name , "console"); strcpy( sd.status.name , "console");
if ( ( n = sscanf(buf, "%[^:]:%[^:]:%99s %d %d[^\n]", type , command , map , &x , &y )) < 5 ) if ( ( n = sscanf(buf, "%[^:]:%[^:]:%99s %d %d[^\n]", type , command , map , &x , &y )) < 5 )

2
src/map/map.h
View File

@ -432,7 +432,7 @@ struct vending {
struct weapon_data { struct weapon_data {
int atkmods[3]; int atkmods[3];
// all the variables except atkmods get zero'ed in each call of status_calc_pc // all the variables except atkmods get zero'ed in each call of status_calc_pc
// NOTE: if you want to add a non-zeroed variable, you need to update the malloc_set call // NOTE: if you want to add a non-zeroed variable, you need to update the memset call
// in status_calc_pc as well! All the following are automatically zero'ed. [Skotlex] // in status_calc_pc as well! All the following are automatically zero'ed. [Skotlex]
int overrefine; int overrefine;
int star; int star;

6
src/map/mercenary.c
View File

@ -752,7 +752,7 @@ int read_homunculusdb(void)
char *filename[]={"homunculus_db.txt","homunculus_db2.txt"}; char *filename[]={"homunculus_db.txt","homunculus_db2.txt"};
char *str[36]; char *str[36];
malloc_set(homunculus_db,0,sizeof(homunculus_db)); memset(homunculus_db,0,sizeof(homunculus_db));
for(i = 0; i<2; i++) for(i = 0; i<2; i++)
{ {
sprintf(line, "%s/%s", db_path, filename[i]); sprintf(line, "%s/%s", db_path, filename[i]);
@ -839,7 +839,7 @@ int read_homunculus_skilldb(void)
int j = 0; int j = 0;
char *split[15]; char *split[15];
malloc_tsetdword(hskill_tree,0,sizeof(hskill_tree)); memset(hskill_tree,0,sizeof(hskill_tree));
sprintf(line, "%s/homun_skill_tree.txt", db_path); sprintf(line, "%s/homun_skill_tree.txt", db_path);
fp=fopen(line,"r"); fp=fopen(line,"r");
if(fp==NULL){ if(fp==NULL){
@ -906,7 +906,7 @@ void read_homunculus_expdb(void)
int i, j=0; int i, j=0;
char *filename[]={"exp_homun.txt","exp_homun2.txt"}; char *filename[]={"exp_homun.txt","exp_homun2.txt"};
malloc_tsetdword(hexptbl,0,sizeof(hexptbl)); memset(hexptbl,0,sizeof(hexptbl));
for(i=0; i<2; i++){ for(i=0; i<2; i++){
sprintf(line, "%s/%s", db_path, filename[i]); sprintf(line, "%s/%s", db_path, filename[i]);
fp=fopen(line,"r"); fp=fopen(line,"r");

42
src/map/mob.c
View File

@ -274,7 +274,7 @@ struct mob_data *mob_once_spawn_sub(struct block_list *bl, int m,
{ {
struct spawn_data data; struct spawn_data data;
malloc_set(&data, 0, sizeof(struct spawn_data)); memset(&data, 0, sizeof(struct spawn_data));
data.m = m; data.m = m;
data.num = 1; data.num = 1;
data.class_ = class_; data.class_ = class_;
@ -463,7 +463,7 @@ int mob_spawn_guardian(struct map_session_data *sd,char *mapname,
struct guild *g=NULL; struct guild *g=NULL;
struct guild_castle *gc; struct guild_castle *gc;
int m, count; int m, count;
malloc_set(&data, 0, sizeof(struct spawn_data)); memset(&data, 0, sizeof(struct spawn_data));
data.num = 1; data.num = 1;
if( sd && strcmp(mapname,"this")==0) if( sd && strcmp(mapname,"this")==0)
@ -679,7 +679,7 @@ int mob_spawn (struct mob_data *md)
return 1; return 1;
} }
} }
malloc_set(&md->state, 0, sizeof(md->state)); memset(&md->state, 0, sizeof(md->state));
status_calc_mob(md, 1); status_calc_mob(md, 1);
md->attacked_id = 0; md->attacked_id = 0;
md->target_id = 0; md->target_id = 0;
@ -696,10 +696,10 @@ int mob_spawn (struct mob_data *md)
for (i = 0, c = tick-1000*3600*10; i < MAX_MOBSKILL; i++) for (i = 0, c = tick-1000*3600*10; i < MAX_MOBSKILL; i++)
md->skilldelay[i] = c; md->skilldelay[i] = c;
malloc_set(md->dmglog, 0, sizeof(md->dmglog)); memset(md->dmglog, 0, sizeof(md->dmglog));
md->tdmg = 0; md->tdmg = 0;
if (md->lootitem) if (md->lootitem)
malloc_set(md->lootitem, 0, sizeof(md->lootitem)); memset(md->lootitem, 0, sizeof(md->lootitem));
md->lootitem_count = 0; md->lootitem_count = 0;
if(md->db->option) if(md->db->option)
@ -1419,7 +1419,7 @@ static int mob_ai_hard(int tid,unsigned int tick,int id,int data)
static struct item_drop* mob_setdropitem(int nameid, int qty) static struct item_drop* mob_setdropitem(int nameid, int qty)
{ {
struct item_drop *drop = ers_alloc(item_drop_ers, struct item_drop); struct item_drop *drop = ers_alloc(item_drop_ers, struct item_drop);
malloc_set(&drop->item_data, 0, sizeof(struct item)); memset(&drop->item_data, 0, sizeof(struct item));
drop->item_data.nameid = nameid; drop->item_data.nameid = nameid;
drop->item_data.amount = qty; drop->item_data.amount = qty;
drop->item_data.identify = itemdb_isidentified(nameid); drop->item_data.identify = itemdb_isidentified(nameid);
@ -1728,8 +1728,8 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type)
map_freeblock_lock(); map_freeblock_lock();
malloc_tsetdword(tmpsd,0,sizeof(tmpsd)); memset(tmpsd,0,sizeof(tmpsd));
malloc_set(pt,0,sizeof(pt)); memset(pt,0,sizeof(pt));
if(src && src->type == BL_MOB) if(src && src->type == BL_MOB)
mob_unlocktarget((struct mob_data *)src,tick); mob_unlocktarget((struct mob_data *)src,tick);
@ -2088,7 +2088,7 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type)
if(temp <= rand()%10000+1) //if ==0, then it doesn't drop if(temp <= rand()%10000+1) //if ==0, then it doesn't drop
continue; continue;
malloc_set(&item,0,sizeof(item)); memset(&item,0,sizeof(item));
item.nameid=md->db->mvpitem[i].nameid; item.nameid=md->db->mvpitem[i].nameid;
item.identify= itemdb_isidentified(item.nameid); item.identify= itemdb_isidentified(item.nameid);
clif_mvp_item(mvp_sd,item.nameid); clif_mvp_item(mvp_sd,item.nameid);
@ -2330,7 +2330,7 @@ int mob_class_change (struct mob_data *md, int class_)
status_calc_mob(md, 3); status_calc_mob(md, 3);
if (battle_config.monster_class_change_full_recover) { if (battle_config.monster_class_change_full_recover) {
malloc_set(md->dmglog, 0, sizeof(md->dmglog)); memset(md->dmglog, 0, sizeof(md->dmglog));
md->tdmg = 0; md->tdmg = 0;
} else { } else {
md->status.hp = md->status.max_hp*hp_rate/100; md->status.hp = md->status.max_hp*hp_rate/100;
@ -2437,7 +2437,7 @@ int mob_summonslave(struct mob_data *md2,int *value,int amount,int skill_id)
nullpo_retr(0, md2); nullpo_retr(0, md2);
nullpo_retr(0, value); nullpo_retr(0, value);
malloc_set(&data, 0, sizeof(struct spawn_data)); memset(&data, 0, sizeof(struct spawn_data));
data.m = md2->bl.m; data.m = md2->bl.m;
data.x = md2->bl.x; data.x = md2->bl.x;
data.y = md2->bl.y; data.y = md2->bl.y;
@ -2950,7 +2950,7 @@ int mob_clone_spawn(struct map_session_data *sd, int m, int x, int y, const char
skill_get_unit_flag(skill_id)&(UF_NOMOB|UF_NOPC)) skill_get_unit_flag(skill_id)&(UF_NOMOB|UF_NOPC))
continue; continue;
malloc_set (&ms[i], 0, sizeof(struct mob_skill)); memset (&ms[i], 0, sizeof(struct mob_skill));
ms[i].skill_id = skill_id; ms[i].skill_id = skill_id;
ms[i].skill_lv = sd->status.skill[skill_id].lv; ms[i].skill_lv = sd->status.skill[skill_id].lv;
ms[i].state = MSS_ANY; ms[i].state = MSS_ANY;
@ -3482,7 +3482,7 @@ static int mob_readdb_mobavail(void)
while(fgets(line,1020,fp)){ while(fgets(line,1020,fp)){
if(line[0]=='/' && line[1]=='/') if(line[0]=='/' && line[1]=='/')
continue; continue;
malloc_tsetdword(str,0,sizeof(str)); memset(str,0,sizeof(str));
for(j=0,p=line;j<12;j++){ for(j=0,p=line;j<12;j++){
if((np=strchr(p,','))!=NULL){ if((np=strchr(p,','))!=NULL){
@ -3507,7 +3507,7 @@ static int mob_readdb_mobavail(void)
if(k < 0) if(k < 0)
continue; continue;
malloc_set(&mob_db_data[class_]->vd, 0, sizeof(struct view_data)); memset(&mob_db_data[class_]->vd, 0, sizeof(struct view_data));
mob_db_data[class_]->vd.class_=k; mob_db_data[class_]->vd.class_=k;
//Player sprites //Player sprites
@ -3561,7 +3561,7 @@ static int mob_read_randommonster(void)
int class_,per; int class_,per;
if(line[0] == '/' && line[1] == '/') if(line[0] == '/' && line[1] == '/')
continue; continue;
malloc_tsetdword(str,0,sizeof(str)); memset(str,0,sizeof(str));
for(j=0,p=line;j<3 && p;j++){ for(j=0,p=line;j<3 && p;j++){
str[j]=p; str[j]=p;
p=strchr(p,','); p=strchr(p,',');
@ -3686,7 +3686,7 @@ static int mob_readskilldb(void)
if(line[0] == '/' && line[1] == '/') if(line[0] == '/' && line[1] == '/')
continue; continue;
malloc_tsetdword(sp,0,sizeof(sp)); memset(sp,0,sizeof(sp));
for(i=0,p=line;i<18 && p;i++){ for(i=0,p=line;i<18 && p;i++){
sp[i]=p; sp[i]=p;
if((p=strchr(p,','))!=NULL) if((p=strchr(p,','))!=NULL)
@ -3709,14 +3709,14 @@ static int mob_readskilldb(void)
if( strcmp(sp[1],"clear")==0 ){ if( strcmp(sp[1],"clear")==0 ){
if (mob_id < 0) if (mob_id < 0)
continue; continue;
malloc_set(mob_db_data[mob_id]->skill,0,sizeof(struct mob_skill)); memset(mob_db_data[mob_id]->skill,0,sizeof(struct mob_skill));
mob_db_data[mob_id]->maxskill=0; mob_db_data[mob_id]->maxskill=0;
continue; continue;
} }
if (mob_id < 0) if (mob_id < 0)
{ //Prepare global skill. [Skotlex] { //Prepare global skill. [Skotlex]
malloc_set(&gms, 0, sizeof (struct mob_skill)); memset(&gms, 0, sizeof (struct mob_skill));
ms = &gms; ms = &gms;
} else { } else {
for(i=0;i<MAX_MOBSKILL;i++) for(i=0;i<MAX_MOBSKILL;i++)
@ -3867,7 +3867,7 @@ static int mob_readdb_race(void)
while(fgets(line,1020,fp)){ while(fgets(line,1020,fp)){
if(line[0]=='/' && line[1]=='/') if(line[0]=='/' && line[1]=='/')
continue; continue;
malloc_tsetdword(str,0,sizeof(str)); memset(str,0,sizeof(str));
for(j=0,p=line;j<12;j++){ for(j=0,p=line;j<12;j++){
if((np=strchr(p,','))!=NULL){ if((np=strchr(p,','))!=NULL){
@ -4183,7 +4183,7 @@ void mob_reload(void)
for (i = 0; i < MAX_MOB_DB; i++) for (i = 0; i < MAX_MOB_DB; i++)
if (mob_db_data[i]) if (mob_db_data[i])
{ {
malloc_set(&mob_db_data[i]->skill,0,sizeof(mob_db_data[i]->skill)); memset(&mob_db_data[i]->skill,0,sizeof(mob_db_data[i]->skill));
mob_db_data[i]->maxskill=0; mob_db_data[i]->maxskill=0;
} }
mob_readskilldb(); mob_readskilldb();
@ -4196,7 +4196,7 @@ void mob_reload(void)
*/ */
int do_init_mob(void) int do_init_mob(void)
{ //Initialize the mob database { //Initialize the mob database
malloc_set(mob_db_data,0,sizeof(mob_db_data)); //Clear the array memset(mob_db_data,0,sizeof(mob_db_data)); //Clear the array
mob_db_data[0] = aCalloc(1, sizeof (struct mob_data)); //This mob is used for random spawns mob_db_data[0] = aCalloc(1, sizeof (struct mob_data)); //This mob is used for random spawns
mob_makedummymobdb(0); //The first time this is invoked, it creates the dummy mob mob_makedummymobdb(0); //The first time this is invoked, it creates the dummy mob
item_drop_ers = ers_new(sizeof(struct item_drop)); item_drop_ers = ers_new(sizeof(struct item_drop));

18
src/map/npc.c
View File

@ -1252,7 +1252,7 @@ int npc_buylist(struct map_session_data *sd,int n,unsigned short *item_list)
for(i=0;i<n;i++) { for(i=0;i<n;i++) {
struct item item_tmp; struct item item_tmp;
malloc_set(&item_tmp,0,sizeof(item_tmp)); memset(&item_tmp,0,sizeof(item_tmp));
item_tmp.nameid = item_list[i*2+1]; item_tmp.nameid = item_list[i*2+1];
item_tmp.identify = 1; // npc販売アイテムは鑑定済み item_tmp.identify = 1; // npc販売アイテムは鑑定済み
@ -1845,7 +1845,7 @@ static int npc_skip_script (char *w1,char *w2,char *w3,char *w4,char *first_line
if (strlen((char *)srcbuf) + strlen((char *)line) + 1 >= (size_t)srcsize) { if (strlen((char *)srcbuf) + strlen((char *)line) + 1 >= (size_t)srcsize) {
srcsize += 65536; srcsize += 65536;
srcbuf = (unsigned char *)aRealloc(srcbuf, srcsize); srcbuf = (unsigned char *)aRealloc(srcbuf, srcsize);
malloc_tsetdword(srcbuf + srcsize - 65536, '\0', 65536); memset(srcbuf + srcsize - 65536, '\0', 65536);
} }
if (srcbuf[0] != '{') { if (srcbuf[0] != '{') {
if (strchr((char *) line,'{')) { if (strchr((char *) line,'{')) {
@ -1909,7 +1909,7 @@ static int npc_parse_script(char *w1,char *w2,char *w3,char *w4,char *first_line
if (strlen((char *)srcbuf) + strlen((char *)line) + 1 >= (size_t)srcsize) { if (strlen((char *)srcbuf) + strlen((char *)line) + 1 >= (size_t)srcsize) {
srcsize += 65536; srcsize += 65536;
srcbuf = (unsigned char *)aRealloc(srcbuf, srcsize); srcbuf = (unsigned char *)aRealloc(srcbuf, srcsize);
malloc_tsetdword(srcbuf + srcsize - 65536, '\0', 65536); memset(srcbuf + srcsize - 65536, '\0', 65536);
} }
if (srcbuf[0] != '{') { if (srcbuf[0] != '{') {
if (strchr((char *) line,'{')) { if (strchr((char *) line,'{')) {
@ -2147,7 +2147,7 @@ static int npc_parse_function (char *w1, char *w2, char *w3, char *w4, char *fir
if (strlen(srcbuf)+strlen(line)+1 >= (unsigned int)srcsize) { if (strlen(srcbuf)+strlen(line)+1 >= (unsigned int)srcsize) {
srcsize += 65536; srcsize += 65536;
srcbuf = (char *)aRealloc(srcbuf, srcsize); srcbuf = (char *)aRealloc(srcbuf, srcsize);
malloc_tsetdword(srcbuf + srcsize - 65536, '\0', 65536); memset(srcbuf + srcsize - 65536, '\0', 65536);
} }
if (srcbuf[0]!='{') { if (srcbuf[0]!='{') {
if (strchr(line,'{')) { if (strchr(line,'{')) {
@ -2224,7 +2224,7 @@ int npc_parse_mob (char *w1, char *w2, char *w3, char *w4)
char mobname[NAME_LENGTH]; char mobname[NAME_LENGTH];
struct spawn_data mob, *data; struct spawn_data mob, *data;
malloc_set(&mob, 0, sizeof(struct spawn_data)); memset(&mob, 0, sizeof(struct spawn_data));
// 引数の個数チェック // 引数の個数チェック
if (sscanf(w1, "%15[^,],%d,%d,%d,%d", mapname, &x, &y, &xs, &ys) < 3 || if (sscanf(w1, "%15[^,],%d,%d,%d,%d", mapname, &x, &y, &xs, &ys) < 3 ||
@ -2876,7 +2876,7 @@ int npc_reload (void)
if(battle_config.dynamic_mobs) { //dynamic check by [random] if(battle_config.dynamic_mobs) { //dynamic check by [random]
for (i = 0; i < MAX_MOB_LIST_PER_MAP; i++) for (i = 0; i < MAX_MOB_LIST_PER_MAP; i++)
if (map[m].moblist[i]) aFree(map[m].moblist[i]); if (map[m].moblist[i]) aFree(map[m].moblist[i]);
malloc_set (map[m].moblist, 0, sizeof(map[m].moblist)); memset (map[m].moblist, 0, sizeof(map[m].moblist));
} }
if (map[m].npc_num > 0 && battle_config.error_log) if (map[m].npc_num > 0 && battle_config.error_log)
ShowWarning("npc_reload: %d npcs weren't removed at map %s!\n", map[m].npc_num, map[m].name); ShowWarning("npc_reload: %d npcs weren't removed at map %s!\n", map[m].npc_num, map[m].name);
@ -3008,7 +3008,7 @@ int do_init_npc(void)
char c = '-'; char c = '-';
//Stock view data for normal npcs. //Stock view data for normal npcs.
malloc_set(&npc_viewdb, 0, sizeof(npc_viewdb)); memset(&npc_viewdb, 0, sizeof(npc_viewdb));
npc_viewdb[0].class_ = INVISIBLE_CLASS; //Invisible class is stored here. npc_viewdb[0].class_ = INVISIBLE_CLASS; //Invisible class is stored here.
for (busy = 1; busy < MAX_NPC_CLASS; busy++) for (busy = 1; busy < MAX_NPC_CLASS; busy++)
npc_viewdb[busy].class_ = busy; npc_viewdb[busy].class_ = busy;
@ -3022,7 +3022,7 @@ int do_init_npc(void)
ev_db = db_alloc(__FILE__,__LINE__,DB_STRING,DB_OPT_DUP_KEY|DB_OPT_RELEASE_DATA,51); ev_db = db_alloc(__FILE__,__LINE__,DB_STRING,DB_OPT_DUP_KEY|DB_OPT_RELEASE_DATA,51);
npcname_db = db_alloc(__FILE__,__LINE__,DB_STRING,DB_OPT_BASE,NAME_LENGTH); npcname_db = db_alloc(__FILE__,__LINE__,DB_STRING,DB_OPT_BASE,NAME_LENGTH);
malloc_set(&ev_tm_b, -1, sizeof(ev_tm_b)); memset(&ev_tm_b, -1, sizeof(ev_tm_b));
timer_event_ers = ers_new(sizeof(struct timer_event_data)); timer_event_ers = ers_new(sizeof(struct timer_event_data));
for (nsl = npc_src_first; nsl; nsl = nsl->next) { for (nsl = npc_src_first; nsl; nsl = nsl->next) {
@ -3056,7 +3056,7 @@ int do_init_npc(void)
CL_WHITE"%d"CL_RESET"' Mobs Not Cached\n", CL_WHITE"%d"CL_RESET"' Mobs Not Cached\n",
npc_id - START_NPC_NUM, "", npc_warp, npc_shop, npc_script, npc_mob, npc_cache_mob, npc_delay_mob); npc_id - START_NPC_NUM, "", npc_warp, npc_shop, npc_script, npc_mob, npc_cache_mob, npc_delay_mob);
malloc_set(script_event, 0, sizeof(script_event)); memset(script_event, 0, sizeof(script_event));
npc_read_event_script(); npc_read_event_script();
//Debug function to locate all endless loop warps. //Debug function to locate all endless loop warps.
if (battle_config.warp_point_debug) if (battle_config.warp_point_debug)

12
src/map/party.c
View File

@ -190,7 +190,7 @@ static void* create_party(DBKey key, va_list args) {
static void party_check_state(struct party_data *p) static void party_check_state(struct party_data *p)
{ {
int i; int i;
malloc_set(&p->state, 0, sizeof(p->state)); memset(&p->state, 0, sizeof(p->state));
for (i = 0; i < MAX_PARTY; i ++) for (i = 0; i < MAX_PARTY; i ++)
{ {
if (!p->party.member[i].online) continue; //Those not online shouldn't aport to skill usage and all that. if (!p->party.member[i].online) continue; //Those not online shouldn't aport to skill usage and all that.
@ -226,8 +226,8 @@ int party_recv_info(struct party *sp)
if (!p->party.party_id) //party just received. if (!p->party.party_id) //party just received.
party_check_member(sp); party_check_member(sp);
memcpy(&p->party,sp,sizeof(struct party)); memcpy(&p->party,sp,sizeof(struct party));
malloc_set(&p->state, 0, sizeof(p->state)); memset(&p->state, 0, sizeof(p->state));
malloc_set(&p->data, 0, sizeof(p->data)); memset(&p->data, 0, sizeof(p->data));
for(i=0;i<MAX_PARTY;i++){ for(i=0;i<MAX_PARTY;i++){
if (!p->party.member[i].account_id) if (!p->party.member[i].account_id)
continue; continue;
@ -415,8 +415,8 @@ int party_member_leaved(int party_id,int account_id,int char_id)
if(p->party.member[i].account_id==account_id && if(p->party.member[i].account_id==account_id &&
p->party.member[i].char_id==char_id){ p->party.member[i].char_id==char_id){
clif_party_leaved(p,sd,account_id,p->party.member[i].name,0x00); clif_party_leaved(p,sd,account_id,p->party.member[i].name,0x00);
malloc_set(&p->party.member[i], 0, sizeof(p->party.member[0])); memset(&p->party.member[i], 0, sizeof(p->party.member[0]));
malloc_set(&p->data[i], 0, sizeof(p->data[0])); memset(&p->data[i], 0, sizeof(p->data[0]));
p->party.count--; p->party.count--;
party_check_state(p); party_check_state(p);
break; break;
@ -563,7 +563,7 @@ int party_send_logout(struct map_session_data *sd)
for(i=0;i<MAX_PARTY && p->data[i].sd != sd;i++); for(i=0;i<MAX_PARTY && p->data[i].sd != sd;i++);
if (i < MAX_PARTY) if (i < MAX_PARTY)
malloc_set(&p->data[i], 0, sizeof(p->data[0])); memset(&p->data[i], 0, sizeof(p->data[0]));
return 1; return 1;
} }

2
src/map/path.c
View File

@ -377,7 +377,7 @@ int path_search_real(struct walkpath_data *wpd,int m,int x0,int y0,int x1,int y1
if(flag&1) if(flag&1)
return -1; return -1;
malloc_set(tp,0,sizeof(tp)); memset(tp,0,sizeof(tp));
i=calc_index(x0,y0); i=calc_index(x0,y0);
tp[i].x=x0; tp[i].x=x0;

40
src/map/pc.c
View File

@ -1175,7 +1175,7 @@ static int pc_bonus_autospell_del(struct s_autospell *spell, int max, short id,
rate-= spell[i].rate; rate-= spell[i].rate;
spell[i].rate = 0; spell[i].rate = 0;
memmove(&spell[i], &spell[j], sizeof(struct s_autospell)); memmove(&spell[i], &spell[j], sizeof(struct s_autospell));
malloc_set(&spell[j], 0, sizeof(struct s_autospell)); memset(&spell[j], 0, sizeof(struct s_autospell));
j--; j--;
} else { } else {
spell[i].rate -= rate; spell[i].rate -= rate;
@ -2734,7 +2734,7 @@ int pc_delitem(struct map_session_data *sd,int n,int amount,int type)
if(sd->status.inventory[n].amount<=0){ if(sd->status.inventory[n].amount<=0){
if(sd->status.inventory[n].equip) if(sd->status.inventory[n].equip)
pc_unequipitem(sd,n,3); pc_unequipitem(sd,n,3);
malloc_set(&sd->status.inventory[n],0,sizeof(sd->status.inventory[0])); memset(&sd->status.inventory[n],0,sizeof(sd->status.inventory[0]));
sd->inventory_data[n] = NULL; sd->inventory_data[n] = NULL;
} }
if(!(type&1)) if(!(type&1))
@ -3077,7 +3077,7 @@ int pc_cart_delitem(struct map_session_data *sd,int n,int amount,int type)
sd->status.cart[n].amount -= amount; sd->status.cart[n].amount -= amount;
sd->cart_weight -= itemdb_weight(sd->status.cart[n].nameid)*amount ; sd->cart_weight -= itemdb_weight(sd->status.cart[n].nameid)*amount ;
if(sd->status.cart[n].amount <= 0){ if(sd->status.cart[n].amount <= 0){
malloc_set(&sd->status.cart[n],0,sizeof(sd->status.cart[0])); memset(&sd->status.cart[n],0,sizeof(sd->status.cart[0]));
sd->cart_num--; sd->cart_num--;
} }
if(!type) { if(!type) {
@ -3225,7 +3225,7 @@ int pc_steal_item(struct map_session_data *sd,struct block_list *bl, int lv)
return 0; return 0;
itemid = md->db->dropitem[i].nameid; itemid = md->db->dropitem[i].nameid;
malloc_set(&tmp_item,0,sizeof(tmp_item)); memset(&tmp_item,0,sizeof(tmp_item));
tmp_item.nameid = itemid; tmp_item.nameid = itemid;
tmp_item.amount = 1; tmp_item.amount = 1;
tmp_item.identify = itemdb_isidentified(itemid); tmp_item.identify = itemdb_isidentified(itemid);
@ -4938,7 +4938,7 @@ int pc_dead(struct map_session_data *sd,struct block_list *src)
/* /*
if(sd->status.karma > 0) { if(sd->status.karma > 0) {
int eq_num=0,eq_n[MAX_INVENTORY]; int eq_num=0,eq_n[MAX_INVENTORY];
malloc_set(eq_n,0,sizeof(eq_n)); memset(eq_n,0,sizeof(eq_n));
for(i=0;i<MAX_INVENTORY;i++){ for(i=0;i<MAX_INVENTORY;i++){
int k; int k;
for(k=0;k<MAX_INVENTORY;k++){ for(k=0;k<MAX_INVENTORY;k++){
@ -4964,7 +4964,7 @@ int pc_dead(struct map_session_data *sd,struct block_list *src)
|| (battle_config.bone_drop==1 && map[sd->bl.m].flag.pvp)) || (battle_config.bone_drop==1 && map[sd->bl.m].flag.pvp))
{ {
struct item item_tmp; struct item item_tmp;
malloc_set(&item_tmp,0,sizeof(item_tmp)); memset(&item_tmp,0,sizeof(item_tmp));
item_tmp.nameid=7420; //PVP Skull item ID item_tmp.nameid=7420; //PVP Skull item ID
item_tmp.identify=1; item_tmp.identify=1;
item_tmp.card[0]=CARD0_CREATE; item_tmp.card[0]=CARD0_CREATE;
@ -5046,7 +5046,7 @@ int pc_dead(struct map_session_data *sd,struct block_list *src)
continue; continue;
if(id == -1){ if(id == -1){
int eq_num=0,eq_n[MAX_INVENTORY]; int eq_num=0,eq_n[MAX_INVENTORY];
malloc_tsetdword(eq_n,0,sizeof(eq_n)); memset(eq_n,0,sizeof(eq_n));
for(i=0;i<MAX_INVENTORY;i++){ for(i=0;i<MAX_INVENTORY;i++){
int k; int k;
if( (type == 1 && !sd->status.inventory[i].equip) if( (type == 1 && !sd->status.inventory[i].equip)
@ -5857,7 +5857,7 @@ int pc_setreg(struct map_session_data *sd,int reg,int val)
} }
sd->reg_num++; sd->reg_num++;
sd->reg = (struct script_reg *) aRealloc(sd->reg, sizeof(*(sd->reg)) * sd->reg_num); sd->reg = (struct script_reg *) aRealloc(sd->reg, sizeof(*(sd->reg)) * sd->reg_num);
malloc_set(sd->reg + (sd->reg_num - 1), 0, sizeof(struct script_reg)); memset(sd->reg + (sd->reg_num - 1), 0, sizeof(struct script_reg));
sd->reg[i].index = reg; sd->reg[i].index = reg;
sd->reg[i].data = val; sd->reg[i].data = val;
@ -5907,7 +5907,7 @@ int pc_setregstr(struct map_session_data *sd,int reg,char *str)
ShowFatalError("out of memory : pc_setreg\n"); ShowFatalError("out of memory : pc_setreg\n");
exit(1); exit(1);
} }
malloc_set(sd->regstr + (sd->regstr_num - 1), 0, sizeof(struct script_regstr)); memset(sd->regstr + (sd->regstr_num - 1), 0, sizeof(struct script_regstr));
sd->regstr[i].index = reg; sd->regstr[i].index = reg;
strcpy(sd->regstr[i].data, str); strcpy(sd->regstr[i].data, str);
@ -6035,7 +6035,7 @@ int pc_setregistry(struct map_session_data *sd,const char *reg,int val,int type)
if (strcmp(sd_reg[i].str, reg) == 0) { if (strcmp(sd_reg[i].str, reg) == 0) {
if (i != *max - 1) if (i != *max - 1)
memcpy(&sd_reg[i], &sd_reg[*max - 1], sizeof(struct global_reg)); memcpy(&sd_reg[i], &sd_reg[*max - 1], sizeof(struct global_reg));
malloc_tsetdword(&sd_reg[*max - 1], 0, sizeof(struct global_reg)); memset(&sd_reg[*max - 1], 0, sizeof(struct global_reg));
(*max)--; (*max)--;
sd->state.reg_dirty |= 1<<(type-1); //Mark this registry as "need to be saved" sd->state.reg_dirty |= 1<<(type-1); //Mark this registry as "need to be saved"
break; break;
@ -6054,7 +6054,7 @@ int pc_setregistry(struct map_session_data *sd,const char *reg,int val,int type)
// add value if not found // add value if not found
if (i < regmax) { if (i < regmax) {
malloc_tsetdword(&sd_reg[i], 0, sizeof(struct global_reg)); memset(&sd_reg[i], 0, sizeof(struct global_reg));
strncpy(sd_reg[i].str, reg, 32); strncpy(sd_reg[i].str, reg, 32);
sprintf(sd_reg[i].value, "%d", val); sprintf(sd_reg[i].value, "%d", val);
(*max)++; (*max)++;
@ -6110,7 +6110,7 @@ int pc_setregistry_str(struct map_session_data *sd,char *reg,char *val,int type)
if (strcmp(sd_reg[i].str, reg) == 0) { if (strcmp(sd_reg[i].str, reg) == 0) {
if (i != *max - 1) if (i != *max - 1)
memcpy(&sd_reg[i], &sd_reg[*max - 1], sizeof(struct global_reg)); memcpy(&sd_reg[i], &sd_reg[*max - 1], sizeof(struct global_reg));
malloc_tsetdword(&sd_reg[*max - 1], 0, sizeof(struct global_reg)); memset(&sd_reg[*max - 1], 0, sizeof(struct global_reg));
(*max)--; (*max)--;
sd->state.reg_dirty |= 1<<(type-1); //Mark this registry as "need to be saved" sd->state.reg_dirty |= 1<<(type-1); //Mark this registry as "need to be saved"
if (type!=3) intif_saveregistry(sd,type); if (type!=3) intif_saveregistry(sd,type);
@ -6131,7 +6131,7 @@ int pc_setregistry_str(struct map_session_data *sd,char *reg,char *val,int type)
// add value if not found // add value if not found
if (i < regmax) { if (i < regmax) {
malloc_tsetdword(&sd_reg[i], 0, sizeof(struct global_reg)); memset(&sd_reg[i], 0, sizeof(struct global_reg));
strncpy(sd_reg[i].str, reg, 32); strncpy(sd_reg[i].str, reg, 32);
strncpy(sd_reg[i].value, val, 256); strncpy(sd_reg[i].value, val, 256);
(*max)++; (*max)++;
@ -6558,7 +6558,7 @@ int pc_checkitem(struct map_session_data *sd)
j++; j++;
} }
if(j < MAX_INVENTORY) if(j < MAX_INVENTORY)
malloc_set(&sd->status.inventory[j],0,sizeof(struct item)*(MAX_INVENTORY-j)); memset(&sd->status.inventory[j],0,sizeof(struct item)*(MAX_INVENTORY-j));
for(k=j;k<MAX_INVENTORY;k++) for(k=j;k<MAX_INVENTORY;k++)
sd->inventory_data[k] = NULL; sd->inventory_data[k] = NULL;
@ -6578,7 +6578,7 @@ int pc_checkitem(struct map_session_data *sd)
j++; j++;
} }
if(j < MAX_CART) if(j < MAX_CART)
malloc_set(&sd->status.cart[j],0,sizeof(struct item)*(MAX_CART-j)); memset(&sd->status.cart[j],0,sizeof(struct item)*(MAX_CART-j));
// ? 備位置チェック // ? 備位置チェック
@ -7274,8 +7274,8 @@ int pc_readdb(void)
char line[24000],*p; char line[24000],*p;
// 必要??値?み?み // 必要??値?み?み
malloc_tsetword(exp_table,0,sizeof(exp_table)); memset(exp_table,0,sizeof(exp_table));
malloc_tsetword(max_level,0,sizeof(max_level)); memset(max_level,0,sizeof(max_level));
sprintf(line, "%s/exp.txt", db_path); sprintf(line, "%s/exp.txt", db_path);
fp=fopen(line, "r"); fp=fopen(line, "r");
if(fp==NULL){ if(fp==NULL){
@ -7352,7 +7352,7 @@ int pc_readdb(void)
ShowStatus("Done reading '"CL_WHITE"%s"CL_RESET"'.\n","exp.txt"); ShowStatus("Done reading '"CL_WHITE"%s"CL_RESET"'.\n","exp.txt");
// スキルツリ? // スキルツリ?
malloc_set(skill_tree,0,sizeof(skill_tree)); memset(skill_tree,0,sizeof(skill_tree));
sprintf(line, "%s/skill_tree.txt", db_path); sprintf(line, "%s/skill_tree.txt", db_path);
fp=fopen(line,"r"); fp=fopen(line,"r");
if(fp==NULL){ if(fp==NULL){
@ -7446,7 +7446,7 @@ int pc_readdb(void)
ShowStatus("Done reading '"CL_WHITE"%s"CL_RESET"'.\n","attr_fix.txt"); ShowStatus("Done reading '"CL_WHITE"%s"CL_RESET"'.\n","attr_fix.txt");
// スキルツリ? // スキルツリ?
malloc_set(statp,0,sizeof(statp)); memset(statp,0,sizeof(statp));
i=1; i=1;
j=45; // base points j=45; // base points
sprintf(line, "%s/statpoint.txt", db_path); sprintf(line, "%s/statpoint.txt", db_path);
@ -7482,7 +7482,7 @@ int pc_read_motd(void) {
FILE *fp; FILE *fp;
int ln=0,i=0; int ln=0,i=0;
malloc_set(motd_text,0,sizeof(motd_text)); memset(motd_text,0,sizeof(motd_text));
if ((fp = fopen(motd_txt, "r")) != NULL) { if ((fp = fopen(motd_txt, "r")) != NULL) {
while ((ln < MOTD_LINE_SIZE) && fgets(motd_text[ln], sizeof(motd_text[ln])-1, fp) != NULL) { while ((ln < MOTD_LINE_SIZE) && fgets(motd_text[ln], sizeof(motd_text[ln])-1, fp) != NULL) {
if(motd_text[ln][0] == '/' && motd_text[ln][1] == '/') if(motd_text[ln][0] == '/' && motd_text[ln][1] == '/')

12
src/map/pet.c
View File

@ -343,7 +343,7 @@ static int pet_return_egg(struct map_session_data *sd, struct pet_data *pd)
int flag; int flag;
pet_lootitem_drop(pd,sd); pet_lootitem_drop(pd,sd);
malloc_set(&tmp_item,0,sizeof(tmp_item)); memset(&tmp_item,0,sizeof(tmp_item));
tmp_item.nameid = pd->petDB->EggID; tmp_item.nameid = pd->petDB->EggID;
tmp_item.identify = 1; tmp_item.identify = 1;
tmp_item.card[0] = CARD0_PET; tmp_item.card[0] = CARD0_PET;
@ -634,7 +634,7 @@ int pet_get_egg(int account_id,int pet_id,int flag)
return 0; return 0;
} }
malloc_set(&tmp_item,0,sizeof(tmp_item)); memset(&tmp_item,0,sizeof(tmp_item));
tmp_item.nameid = pet_db[i].EggID; tmp_item.nameid = pet_db[i].EggID;
tmp_item.identify = 1; tmp_item.identify = 1;
tmp_item.card[0] = CARD0_PET; tmp_item.card[0] = CARD0_PET;
@ -762,7 +762,7 @@ static int pet_unequipitem(struct map_session_data *sd, struct pet_data *pd)
pd->pet.equip = 0; pd->pet.equip = 0;
status_set_viewdata(&pd->bl, pd->pet.class_); status_set_viewdata(&pd->bl, pd->pet.class_);
clif_pet_equip(pd); clif_pet_equip(pd);
malloc_set(&tmp_item,0,sizeof(tmp_item)); memset(&tmp_item,0,sizeof(tmp_item));
tmp_item.nameid = nameid; tmp_item.nameid = nameid;
tmp_item.identify = 1; tmp_item.identify = 1;
if((flag = pc_additem(sd,&tmp_item,1))) { if((flag = pc_additem(sd,&tmp_item,1))) {
@ -1089,7 +1089,7 @@ int pet_lootitem_drop(struct pet_data *pd,struct map_session_data *sd)
} }
} }
//The smart thing to do is use pd->loot->max (thanks for pointing it out, Shinomori) //The smart thing to do is use pd->loot->max (thanks for pointing it out, Shinomori)
malloc_set(pd->loot->item,0,pd->loot->max * sizeof(struct item)); memset(pd->loot->item,0,pd->loot->max * sizeof(struct item));
pd->loot->count = 0; pd->loot->count = 0;
pd->loot->weight = 0; pd->loot->weight = 0;
pd->ud.canact_tick = gettick()+10000; // 10*1000ms‚ÌŠÔ<C5A0>E‚í‚È‚¢ pd->ud.canact_tick = gettick()+10000; // 10*1000ms‚ÌŠÔ<C5A0>E‚í‚È‚¢
@ -1288,7 +1288,7 @@ int read_petdb()
pet_db[j].script = NULL; pet_db[j].script = NULL;
} }
j = 0; j = 0;
malloc_set(pet_db,0,sizeof(pet_db)); memset(pet_db,0,sizeof(pet_db));
for(i=0;i<2;i++){ for(i=0;i<2;i++){
sprintf(line, "%s/%s", db_path, filename[i]); sprintf(line, "%s/%s", db_path, filename[i]);
fp=fopen(line,"r"); fp=fopen(line,"r");
@ -1368,7 +1368,7 @@ int read_petdb()
*/ */
int do_init_pet(void) int do_init_pet(void)
{ {
malloc_set(pet_db,0,sizeof(pet_db)); memset(pet_db,0,sizeof(pet_db));
read_petdb(); read_petdb();
item_drop_ers = ers_new(sizeof(struct item_drop)); item_drop_ers = ers_new(sizeof(struct item_drop));

30
src/map/script.c
View File

@ -382,13 +382,13 @@ int add_str(const char* p)
if(str_num>=str_data_size){ if(str_num>=str_data_size){
str_data_size+=128; str_data_size+=128;
RECREATE(str_data,struct str_data_struct,str_data_size); RECREATE(str_data,struct str_data_struct,str_data_size);
malloc_tsetdword(str_data + (str_data_size - 128), '\0', 128); memset(str_data + (str_data_size - 128), '\0', 128);
} }
len=(int)strlen(p); len=(int)strlen(p);
while(str_pos+len+1>=str_size){ while(str_pos+len+1>=str_size){
str_size+=256; str_size+=256;
RECREATE(str_buf,char,str_size); RECREATE(str_buf,char,str_size);
malloc_tsetdword(str_buf + (str_size - 256), '\0', 256); memset(str_buf + (str_size - 256), '\0', 256);
} }
memcpy(str_buf+str_pos,p,len+1); memcpy(str_buf+str_pos,p,len+1);
str_data[str_num].type=C_NOP; str_data[str_num].type=C_NOP;
@ -1662,7 +1662,7 @@ struct script_code* parse_script(const char *src,const char *file,int line,int o
struct script_code *code; struct script_code *code;
static int first=1; static int first=1;
malloc_set(&syntax,0,sizeof(syntax)); memset(&syntax,0,sizeof(syntax));
if(first){ if(first){
add_buildin_func(); add_buildin_func();
read_constdb(); read_constdb();
@ -2097,7 +2097,7 @@ void push_val(struct script_stack *stack,int type,int val)
stack->sp_max += 64; stack->sp_max += 64;
stack->stack_data = (struct script_data *)aRealloc(stack->stack_data, stack->stack_data = (struct script_data *)aRealloc(stack->stack_data,
sizeof(stack->stack_data[0]) * stack->sp_max); sizeof(stack->stack_data[0]) * stack->sp_max);
malloc_tsetdword(stack->stack_data + (stack->sp_max - 64), 0, memset(stack->stack_data + (stack->sp_max - 64), 0,
64 * sizeof(*(stack->stack_data))); 64 * sizeof(*(stack->stack_data)));
} }
// if(battle_config.etc_log) // if(battle_config.etc_log)
@ -2128,7 +2128,7 @@ void push_str(struct script_stack *stack,int type,char *str)
stack->sp_max += 64; stack->sp_max += 64;
stack->stack_data = (struct script_data *)aRealloc(stack->stack_data, stack->stack_data = (struct script_data *)aRealloc(stack->stack_data,
sizeof(stack->stack_data[0]) * stack->sp_max); sizeof(stack->stack_data[0]) * stack->sp_max);
malloc_tsetdword(stack->stack_data + (stack->sp_max - 64), '\0', memset(stack->stack_data + (stack->sp_max - 64), '\0',
64 * sizeof(*(stack->stack_data))); 64 * sizeof(*(stack->stack_data)));
} }
// if(battle_config.etc_log) // if(battle_config.etc_log)
@ -3297,7 +3297,7 @@ int script_config_read_sub(char *cfgName)
int script_config_read(char *cfgName) int script_config_read(char *cfgName)
{ //Script related variables should be initialized once! [Skotlex] { //Script related variables should be initialized once! [Skotlex]
malloc_set (&script_config, 0, sizeof(script_config)); memset (&script_config, 0, sizeof(script_config));
script_config.verbose_mode = 0; script_config.verbose_mode = 0;
script_config.warn_func_mismatch_paramnum = 1; script_config.warn_func_mismatch_paramnum = 1;
script_config.check_cmdcount = 65535; script_config.check_cmdcount = 65535;
@ -5356,7 +5356,7 @@ int buildin_getitem(struct script_state *st)
if( (amount=conv_num(st, script_getdata(st,3))) <= 0) if( (amount=conv_num(st, script_getdata(st,3))) <= 0)
return 0; //return if amount <=0, skip the useles iteration return 0; //return if amount <=0, skip the useles iteration
malloc_set(&it,0,sizeof(it)); memset(&it,0,sizeof(it));
it.nameid=nameid; it.nameid=nameid;
if(!flag) if(!flag)
it.identify=1; it.identify=1;
@ -5431,7 +5431,7 @@ int buildin_getitem2(struct script_state *st)
} }
if(nameid > 0) { if(nameid > 0) {
malloc_set(&item_tmp,0,sizeof(item_tmp)); memset(&item_tmp,0,sizeof(item_tmp));
item_data=itemdb_exists(nameid); item_data=itemdb_exists(nameid);
if (item_data == NULL) if (item_data == NULL)
return -1; return -1;
@ -5525,7 +5525,7 @@ int buildin_getnameditem(struct script_state *st)
return 0; return 0;
} }
malloc_set(&item_tmp,0,sizeof(item_tmp)); memset(&item_tmp,0,sizeof(item_tmp));
item_tmp.nameid=nameid; item_tmp.nameid=nameid;
item_tmp.amount=1; item_tmp.amount=1;
item_tmp.identify=1; item_tmp.identify=1;
@ -5602,7 +5602,7 @@ int buildin_makeitem(struct script_state *st)
} }
if(nameid > 0) { if(nameid > 0) {
malloc_set(&item_tmp,0,sizeof(item_tmp)); memset(&item_tmp,0,sizeof(item_tmp));
item_tmp.nameid=nameid; item_tmp.nameid=nameid;
if(!flag) if(!flag)
item_tmp.identify=1; item_tmp.identify=1;
@ -10348,7 +10348,7 @@ int buildin_atcommand(struct script_state *st)
} else { //Use a dummy character. } else { //Use a dummy character.
struct map_session_data dummy_sd; struct map_session_data dummy_sd;
struct block_list *bl = NULL; struct block_list *bl = NULL;
malloc_set(&dummy_sd, 0, sizeof(struct map_session_data)); memset(&dummy_sd, 0, sizeof(struct map_session_data));
if (st->oid) bl = map_id2bl(st->oid); if (st->oid) bl = map_id2bl(st->oid);
if (bl) { if (bl) {
memcpy(&dummy_sd.bl, bl, sizeof(struct block_list)); memcpy(&dummy_sd.bl, bl, sizeof(struct block_list));
@ -10386,7 +10386,7 @@ int buildin_charcommand(struct script_state *st)
} else { //Use a dummy character. } else { //Use a dummy character.
struct map_session_data dummy_sd; struct map_session_data dummy_sd;
struct block_list *bl = NULL; struct block_list *bl = NULL;
malloc_set(&dummy_sd, 0, sizeof(struct map_session_data)); memset(&dummy_sd, 0, sizeof(struct map_session_data));
if (st->oid) bl = map_id2bl(st->oid); if (st->oid) bl = map_id2bl(st->oid);
if (bl) { if (bl) {
memcpy(&dummy_sd.bl, bl, sizeof(struct block_list)); memcpy(&dummy_sd.bl, bl, sizeof(struct block_list));
@ -10927,7 +10927,7 @@ int buildin_getmapxy(struct script_state *st){
int x,y,type; int x,y,type;
char mapname[MAP_NAME_LENGTH+1]; char mapname[MAP_NAME_LENGTH+1];
malloc_set(mapname, 0, sizeof(mapname)); memset(mapname, 0, sizeof(mapname));
if( st->stack->stack_data[st->start+2].type!=C_NAME ){ if( st->stack->stack_data[st->start+2].type!=C_NAME ){
ShowWarning("script: buildin_getmapxy: not mapname variable\n"); ShowWarning("script: buildin_getmapxy: not mapname variable\n");
@ -11656,7 +11656,7 @@ int buildin_query_sql(struct script_state *st) {
return 1; return 1;
} }
malloc_set(row, 0, sizeof(row)); memset(row, 0, sizeof(row));
// Verify argument types // Verify argument types
for(j=0; j < nb_rows; j++) for(j=0; j < nb_rows; j++)
{ {
@ -11835,7 +11835,7 @@ int buildin_npcshopitem(struct script_state *st)
sizeof(nd->u.shop_item[0]) * amount); sizeof(nd->u.shop_item[0]) * amount);
// Reset sell list. // Reset sell list.
malloc_set(nd->u.shop_item, 0, sizeof(nd->u.shop_item[0]) * amount); memset(nd->u.shop_item, 0, sizeof(nd->u.shop_item[0]) * amount);
n = 0; n = 0;

40
src/map/skill.c
View File

@ -4440,8 +4440,8 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
struct item item_tmp; struct item item_tmp;
struct block_list tbl; struct block_list tbl;
clif_skill_nodamage(src,bl,skillid,skilllv,1); clif_skill_nodamage(src,bl,skillid,skilllv,1);
malloc_set(&item_tmp,0,sizeof(item_tmp)); memset(&item_tmp,0,sizeof(item_tmp));
malloc_set(&tbl,0,sizeof(tbl)); // [MouseJstr] memset(&tbl,0,sizeof(tbl)); // [MouseJstr]
item_tmp.nameid = 7049; item_tmp.nameid = 7049;
item_tmp.identify = 1; item_tmp.identify = 1;
tbl.id = 0; tbl.id = 0;
@ -5004,7 +5004,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
if(battle_config.skill_removetrap_type){ if(battle_config.skill_removetrap_type){
for(i=0;i<10;i++) { for(i=0;i<10;i++) {
if(skill_db[su->group->skill_id].itemid[i] > 0){ if(skill_db[su->group->skill_id].itemid[i] > 0){
malloc_set(&item_tmp,0,sizeof(item_tmp)); memset(&item_tmp,0,sizeof(item_tmp));
item_tmp.nameid = skill_db[su->group->skill_id].itemid[i]; item_tmp.nameid = skill_db[su->group->skill_id].itemid[i];
item_tmp.identify = 1; item_tmp.identify = 1;
if(item_tmp.nameid && (flag=pc_additem(sd,&item_tmp,skill_db[su->group->skill_id].amount[i]))){ if(item_tmp.nameid && (flag=pc_additem(sd,&item_tmp,skill_db[su->group->skill_id].amount[i]))){
@ -5014,7 +5014,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
} }
} }
}else{ }else{
malloc_set(&item_tmp,0,sizeof(item_tmp)); memset(&item_tmp,0,sizeof(item_tmp));
item_tmp.nameid = 1065; item_tmp.nameid = 1065;
item_tmp.identify = 1; item_tmp.identify = 1;
if(item_tmp.nameid && (flag=pc_additem(sd,&item_tmp,1))){ if(item_tmp.nameid && (flag=pc_additem(sd,&item_tmp,1))){
@ -7765,7 +7765,7 @@ int skill_check_pc_partner (struct map_session_data *sd, int skill_id, int* skil
} }
//Else: new search for partners. //Else: new search for partners.
c = 0; c = 0;
malloc_tsetdword (p_sd, 0, sizeof(p_sd)); memset (p_sd, 0, sizeof(p_sd));
i = map_foreachinrange(skill_check_condition_char_sub, &sd->bl, i = map_foreachinrange(skill_check_condition_char_sub, &sd->bl,
range, BL_PC, &sd->bl, &c, &p_sd, skill_id); range, BL_PC, &sd->bl, &c, &p_sd, skill_id);
@ -10044,7 +10044,7 @@ int skill_unit_timer_sub (struct block_list *bl, va_list ap)
if(src && src->type==BL_PC && !group->state.into_abyss) if(src && src->type==BL_PC && !group->state.into_abyss)
{ //Avoid generating trap items when it did not cost to create them. [Skotlex] { //Avoid generating trap items when it did not cost to create them. [Skotlex]
struct item item_tmp; struct item item_tmp;
malloc_set(&item_tmp,0,sizeof(item_tmp)); memset(&item_tmp,0,sizeof(item_tmp));
item_tmp.nameid=1065; item_tmp.nameid=1065;
item_tmp.identify=1; item_tmp.identify=1;
map_addflooritem(&item_tmp,1,bl->m,bl->x,bl->y,NULL,NULL,NULL,0); map_addflooritem(&item_tmp,1,bl->m,bl->x,bl->y,NULL,NULL,NULL,0);
@ -10211,7 +10211,7 @@ int skill_unit_move (struct block_list *bl, unsigned int tick, int flag)
if (flag&2 && !(flag&1)) if (flag&2 && !(flag&1))
{ //Onout, clear data { //Onout, clear data
malloc_tsetdword (&skill_unit_temp,0,sizeof(skill_unit_temp)); memset (&skill_unit_temp,0,sizeof(skill_unit_temp));
skill_unit_index=0; skill_unit_index=0;
} }
@ -10578,7 +10578,7 @@ int skill_produce_mix (struct map_session_data *sd, int skill_id, int nameid, in
if(rand()%10000 < make_per || qty > 1){ //Success, or crafting multiple items. if(rand()%10000 < make_per || qty > 1){ //Success, or crafting multiple items.
struct item tmp_item; struct item tmp_item;
malloc_set(&tmp_item,0,sizeof(tmp_item)); memset(&tmp_item,0,sizeof(tmp_item));
tmp_item.nameid=nameid; tmp_item.nameid=nameid;
tmp_item.amount=1; tmp_item.amount=1;
tmp_item.identify=1; tmp_item.identify=1;
@ -10746,7 +10746,7 @@ int skill_arrow_create (struct map_session_data *sd, int nameid)
pc_delitem(sd,j,1,0); pc_delitem(sd,j,1,0);
for(i=0;i<5;i++) { for(i=0;i<5;i++) {
malloc_set(&tmp_item,0,sizeof(tmp_item)); memset(&tmp_item,0,sizeof(tmp_item));
tmp_item.identify = 1; tmp_item.identify = 1;
tmp_item.nameid = skill_arrow_db[index].cre_id[i]; tmp_item.nameid = skill_arrow_db[index].cre_id[i];
tmp_item.amount = skill_arrow_db[index].cre_amount[i]; tmp_item.amount = skill_arrow_db[index].cre_amount[i];
@ -10904,7 +10904,7 @@ void skill_init_unit_layout (void)
{ {
int i,j,size,pos = 0; int i,j,size,pos = 0;
malloc_set(skill_unit_layout,0,sizeof(skill_unit_layout)); memset(skill_unit_layout,0,sizeof(skill_unit_layout));
for (i=0; i<=MAX_SQUARE_LAYOUT; i++) { for (i=0; i<=MAX_SQUARE_LAYOUT; i++) {
size = i*2+1; size = i*2+1;
skill_unit_layout[i].count = size*size; skill_unit_layout[i].count = size*size;
@ -11140,7 +11140,7 @@ int skill_readdb (void)
char line[1024],path[1024],*p; char line[1024],path[1024],*p;
char *filename[]={"produce_db.txt","produce_db2.txt"}; char *filename[]={"produce_db.txt","produce_db2.txt"};
malloc_set(skill_db,0,sizeof(skill_db)); memset(skill_db,0,sizeof(skill_db));
sprintf(path, "%s/skill_db.txt", db_path); sprintf(path, "%s/skill_db.txt", db_path);
fp=fopen(path,"r"); fp=fopen(path,"r");
if(fp==NULL){ if(fp==NULL){
@ -11299,7 +11299,7 @@ int skill_readdb (void)
while(fgets(line,1020,fp)){ while(fgets(line,1020,fp)){
char *split[50]; char *split[50];
l++; l++;
malloc_tsetdword(split,0,sizeof(split)); // [Valaris] thanks to fov memset(split,0,sizeof(split)); // [Valaris] thanks to fov
if(line[0]=='/' && line[1]=='/') if(line[0]=='/' && line[1]=='/')
continue; continue;
j = skill_split_str(line,split,6); j = skill_split_str(line,split,6);
@ -11384,7 +11384,7 @@ int skill_readdb (void)
ShowStatus("Done reading '"CL_WHITE"%s"CL_RESET"'.\n",path); ShowStatus("Done reading '"CL_WHITE"%s"CL_RESET"'.\n",path);
skill_init_unit_layout(); skill_init_unit_layout();
malloc_set(skill_produce_db,0,sizeof(skill_produce_db)); memset(skill_produce_db,0,sizeof(skill_produce_db));
for(m=0;m<2;m++){ for(m=0;m<2;m++){
sprintf(path, "%s/%s", db_path, filename[m]); sprintf(path, "%s/%s", db_path, filename[m]);
fp=fopen(path,"r"); fp=fopen(path,"r");
@ -11400,7 +11400,7 @@ int skill_readdb (void)
int x,y; int x,y;
if(line[0]=='/' && line[1]=='/') if(line[0]=='/' && line[1]=='/')
continue; continue;
malloc_tsetdword(split,0,sizeof(split)); memset(split,0,sizeof(split));
j = skill_split_str(line,split,(4 + MAX_PRODUCE_RESOURCE * 2)); j = skill_split_str(line,split,(4 + MAX_PRODUCE_RESOURCE * 2));
if(split[0]==0) //fixed by Lupus if(split[0]==0) //fixed by Lupus
continue; continue;
@ -11424,7 +11424,7 @@ int skill_readdb (void)
ShowStatus("Done reading '"CL_WHITE"%d"CL_RESET"' entries in '"CL_WHITE"%s"CL_RESET"'.\n",k,path); ShowStatus("Done reading '"CL_WHITE"%d"CL_RESET"' entries in '"CL_WHITE"%s"CL_RESET"'.\n",k,path);
} }
malloc_set(skill_arrow_db,0,sizeof(skill_arrow_db)); memset(skill_arrow_db,0,sizeof(skill_arrow_db));
sprintf(path, "%s/create_arrow_db.txt", db_path); sprintf(path, "%s/create_arrow_db.txt", db_path);
fp=fopen(path,"r"); fp=fopen(path,"r");
@ -11438,7 +11438,7 @@ int skill_readdb (void)
int x,y; int x,y;
if(line[0]=='/' && line[1]=='/') if(line[0]=='/' && line[1]=='/')
continue; continue;
malloc_tsetdword(split,0,sizeof(split)); memset(split,0,sizeof(split));
j = skill_split_str(line,split,13); j = skill_split_str(line,split,13);
if(split[0]==0) //fixed by Lupus if(split[0]==0) //fixed by Lupus
continue; continue;
@ -11459,7 +11459,7 @@ int skill_readdb (void)
fclose(fp); fclose(fp);
ShowStatus("Done reading '"CL_WHITE"%d"CL_RESET"' entries in '"CL_WHITE"%s"CL_RESET"'.\n",k,path); ShowStatus("Done reading '"CL_WHITE"%d"CL_RESET"' entries in '"CL_WHITE"%s"CL_RESET"'.\n",k,path);
malloc_set(skill_abra_db,0,sizeof(skill_abra_db)); memset(skill_abra_db,0,sizeof(skill_abra_db));
sprintf(path, "%s/abra_db.txt", db_path); sprintf(path, "%s/abra_db.txt", db_path);
fp=fopen(path,"r"); fp=fopen(path,"r");
if(fp==NULL){ if(fp==NULL){
@ -11471,7 +11471,7 @@ int skill_readdb (void)
char *split[16]; char *split[16];
if(line[0]=='/' && line[1]=='/') if(line[0]=='/' && line[1]=='/')
continue; continue;
malloc_tsetdword(split,0,sizeof(split)); memset(split,0,sizeof(split));
j = skill_split_str(line,split,13); j = skill_split_str(line,split,13);
if(split[0]==0) //fixed by Lupus if(split[0]==0) //fixed by Lupus
continue; continue;
@ -11499,7 +11499,7 @@ int skill_readdb (void)
char *split[50]; char *split[50];
if(line[0]=='/' && line[1]=='/') if(line[0]=='/' && line[1]=='/')
continue; continue;
malloc_tsetdword(split,0,sizeof(split)); memset(split,0,sizeof(split));
j = skill_split_str(line,split,3); j = skill_split_str(line,split,3);
if(split[0]==0) //fixed by Lupus if(split[0]==0) //fixed by Lupus
continue; continue;
@ -11528,7 +11528,7 @@ int skill_readdb (void)
char *split[16]; char *split[16];
if(line[0]=='/' && line[1]=='/') if(line[0]=='/' && line[1]=='/')
continue; continue;
malloc_tsetdword(split,0,sizeof(split)); memset(split,0,sizeof(split));
j = skill_split_str(line,split,2); j = skill_split_str(line,split,2);
if(split[0]==0) //fixed by Lupus if(split[0]==0) //fixed by Lupus
continue; continue;

42
src/map/status.c
View File

@ -95,8 +95,8 @@ void initChangeTables(void) {
StatusIconChangeTable[i] = SI_BLANK; StatusIconChangeTable[i] = SI_BLANK;
for (i = 0; i < MAX_SKILL; i++) for (i = 0; i < MAX_SKILL; i++)
SkillStatusChangeTableArray[i] = -1; SkillStatusChangeTableArray[i] = -1;
malloc_set(StatusSkillChangeTable, 0, sizeof(StatusSkillChangeTable)); memset(StatusSkillChangeTable, 0, sizeof(StatusSkillChangeTable));
malloc_set(StatusChangeFlagTable, 0, sizeof(StatusChangeFlagTable)); memset(StatusChangeFlagTable, 0, sizeof(StatusChangeFlagTable));
//First we define the skill for common ailments. These are used in //First we define the skill for common ailments. These are used in
//skill_additional_effect through sc cards. [Skotlex] //skill_additional_effect through sc cards. [Skotlex]
@ -474,7 +474,7 @@ int SkillStatusChangeTable(int skill)
} }
int StatusIconChangeTable[SC_MAX]; //Stores the icon that should be associated to this status change. int StatusIconChangeTable[SC_MAX]; //Stores the icon that should be associated to this status change.
static void initDummyData(void) { static void initDummyData(void) {
malloc_set(&dummy_status, 0, sizeof(dummy_status)); memset(&dummy_status, 0, sizeof(dummy_status));
dummy_status.hp = dummy_status.hp =
dummy_status.max_hp = dummy_status.max_hp =
dummy_status.max_sp = dummy_status.max_sp =
@ -715,11 +715,11 @@ int status_damage(struct block_list *src,struct block_list *target,int hp, int s
{ //Reset regen ticks. { //Reset regen ticks.
struct regen_data *regen = status_get_regen_data(target); struct regen_data *regen = status_get_regen_data(target);
if (regen) { if (regen) {
malloc_set(&regen->tick, 0, sizeof(regen->tick)); memset(&regen->tick, 0, sizeof(regen->tick));
if (regen->sregen) if (regen->sregen)
malloc_set(&regen->sregen->tick, 0, sizeof(regen->sregen->tick)); memset(&regen->sregen->tick, 0, sizeof(regen->sregen->tick));
if (regen->ssregen) if (regen->ssregen)
malloc_set(&regen->ssregen->tick, 0, sizeof(regen->ssregen->tick)); memset(&regen->ssregen->tick, 0, sizeof(regen->ssregen->tick));
} }
} }
if(flag&4) //Delete from memory. (also invokes map removal code) if(flag&4) //Delete from memory. (also invokes map removal code)
@ -1580,7 +1580,7 @@ int status_calc_pc(struct map_session_data* sd,int first)
// zeroed arays, order follows the order in map.h. // zeroed arays, order follows the order in map.h.
// add new arrays to the end of zeroed area in map.h (see comments) and size here. [zzo] // add new arrays to the end of zeroed area in map.h (see comments) and size here. [zzo]
malloc_set (sd->param_bonus, 0, sizeof(sd->param_bonus) memset (sd->param_bonus, 0, sizeof(sd->param_bonus)
+ sizeof(sd->param_equip) + sizeof(sd->param_equip)
+ sizeof(sd->subele) + sizeof(sd->subele)
+ sizeof(sd->subrace) + sizeof(sd->subrace)
@ -1603,14 +1603,14 @@ int status_calc_pc(struct map_session_data* sd,int first)
+ sizeof(sd->sp_gain_race) + sizeof(sd->sp_gain_race)
); );
malloc_set (&sd->right_weapon.overrefine, 0, sizeof(sd->right_weapon) - sizeof(sd->right_weapon.atkmods)); memset (&sd->right_weapon.overrefine, 0, sizeof(sd->right_weapon) - sizeof(sd->right_weapon.atkmods));
malloc_set (&sd->left_weapon.overrefine, 0, sizeof(sd->left_weapon) - sizeof(sd->left_weapon.atkmods)); memset (&sd->left_weapon.overrefine, 0, sizeof(sd->left_weapon) - sizeof(sd->left_weapon.atkmods));
malloc_set(&sd->special_state,0,sizeof(sd->special_state)); memset(&sd->special_state,0,sizeof(sd->special_state));
malloc_set(&status->max_hp, 0, sizeof(struct status_data)-(sizeof(status->hp)+sizeof(status->sp)+sizeof(status->lhw))); memset(&status->max_hp, 0, sizeof(struct status_data)-(sizeof(status->hp)+sizeof(status->sp)+sizeof(status->lhw)));
malloc_set(status->lhw, 0, sizeof(struct weapon_atk)); memset(status->lhw, 0, sizeof(struct weapon_atk));
//FIXME: Most of these stuff should be calculated once, but how do I fix the malloc_set above to do that? [Skotlex] //FIXME: Most of these stuff should be calculated once, but how do I fix the memset above to do that? [Skotlex]
status->speed = DEFAULT_WALK_SPEED; status->speed = DEFAULT_WALK_SPEED;
//Give them all modes except these (useful for clones) //Give them all modes except these (useful for clones)
status->mode = MD_MASK&~(MD_BOSS|MD_PLANT|MD_DETECTOR|MD_ANGRY); status->mode = MD_MASK&~(MD_BOSS|MD_PLANT|MD_DETECTOR|MD_ANGRY);
@ -1629,7 +1629,7 @@ int status_calc_pc(struct map_session_data* sd,int first)
status->race = RC_DEMIHUMAN; status->race = RC_DEMIHUMAN;
//zero up structures... //zero up structures...
malloc_set(&sd->autospell,0,sizeof(sd->autospell) memset(&sd->autospell,0,sizeof(sd->autospell)
+ sizeof(sd->autospell2) + sizeof(sd->autospell2)
+ sizeof(sd->addeff) + sizeof(sd->addeff)
+ sizeof(sd->addeff2) + sizeof(sd->addeff2)
@ -1644,7 +1644,7 @@ int status_calc_pc(struct map_session_data* sd,int first)
); );
// vars zeroing. ints, shorts, chars. in that order. // vars zeroing. ints, shorts, chars. in that order.
malloc_set (&sd->arrow_atk, 0,sizeof(sd->arrow_atk) memset (&sd->arrow_atk, 0,sizeof(sd->arrow_atk)
+ sizeof(sd->arrow_ele) + sizeof(sd->arrow_ele)
+ sizeof(sd->arrow_cri) + sizeof(sd->arrow_cri)
+ sizeof(sd->arrow_hit) + sizeof(sd->arrow_hit)
@ -1789,7 +1789,7 @@ int status_calc_pc(struct map_session_data* sd,int first)
//Store equipment script bonuses //Store equipment script bonuses
memcpy(sd->param_equip,sd->param_bonus,sizeof(sd->param_equip)); memcpy(sd->param_equip,sd->param_bonus,sizeof(sd->param_equip));
malloc_set(sd->param_bonus, 0, sizeof(sd->param_bonus)); memset(sd->param_bonus, 0, sizeof(sd->param_bonus));
status->def += (refinedef+50)/100; status->def += (refinedef+50)/100;
@ -4337,7 +4337,7 @@ void status_change_init(struct block_list *bl)
struct status_change *sc = status_get_sc(bl); struct status_change *sc = status_get_sc(bl);
int i; int i;
nullpo_retv(sc); nullpo_retv(sc);
malloc_set(sc, 0, sizeof (struct status_change)); memset(sc, 0, sizeof (struct status_change));
for (i=0; i< SC_MAX; i++) for (i=0; i< SC_MAX; i++)
sc->data[i].timer = -1; sc->data[i].timer = -1;
} }
@ -7211,7 +7211,7 @@ static int status_calc_sigma(void)
unsigned int k; unsigned int k;
for(i=0;i<MAX_PC_CLASS;i++) { for(i=0;i<MAX_PC_CLASS;i++) {
malloc_tsetdword(hp_sigma_val[i],0,sizeof(hp_sigma_val[i])); memset(hp_sigma_val[i],0,sizeof(hp_sigma_val[i]));
for(k=0,j=2;j<=MAX_LEVEL;j++) { for(k=0,j=2;j<=MAX_LEVEL;j++) {
k += hp_coefficient[i]*j + 50; k += hp_coefficient[i]*j + 50;
k -= k%100; k -= k%100;
@ -7265,7 +7265,7 @@ int status_readdb(void) {
fclose(fp); fclose(fp);
ShowStatus("Done reading '"CL_WHITE"%s"CL_RESET"'.\n",path); ShowStatus("Done reading '"CL_WHITE"%s"CL_RESET"'.\n",path);
malloc_tsetdword(job_bonus,0,sizeof(job_bonus)); // Job-specific stats bonus memset(job_bonus,0,sizeof(job_bonus)); // Job-specific stats bonus
sprintf(path, "%s/job_db2.txt", db_path); sprintf(path, "%s/job_db2.txt", db_path);
fp=fopen(path,"r"); fp=fopen(path,"r");
if(fp==NULL){ if(fp==NULL){
@ -7306,7 +7306,7 @@ int status_readdb(void) {
continue; continue;
if(atoi(line)<=0) if(atoi(line)<=0)
continue; continue;
malloc_tsetdword(split,0,sizeof(split)); memset(split,0,sizeof(split));
for(j=0,p=line;j<MAX_WEAPON_TYPE && p;j++){ for(j=0,p=line;j<MAX_WEAPON_TYPE && p;j++){
split[j]=p; split[j]=p;
p=strchr(p,','); p=strchr(p,',');
@ -7341,7 +7341,7 @@ int status_readdb(void) {
continue; continue;
if(atoi(line)<=0) if(atoi(line)<=0)
continue; continue;
malloc_tsetdword(split,0,sizeof(split)); memset(split,0,sizeof(split));
for(j=0,p=line;j<MAX_REFINE+4 && p;j++){ for(j=0,p=line;j<MAX_REFINE+4 && p;j++){
split[j]=p; split[j]=p;
p=strchr(p,','); p=strchr(p,',');

4
src/map/storage.c
View File

@ -218,7 +218,7 @@ static int storage_delitem(struct map_session_data *sd,struct storage *stor,int
stor->storage_[n].amount-=amount; stor->storage_[n].amount-=amount;
if(stor->storage_[n].amount==0){ if(stor->storage_[n].amount==0){
malloc_set(&stor->storage_[n],0,sizeof(stor->storage_[0])); memset(&stor->storage_[n],0,sizeof(stor->storage_[0]));
stor->storage_amount--; stor->storage_amount--;
clif_updatestorageamount(sd,stor); clif_updatestorageamount(sd,stor);
} }
@ -566,7 +566,7 @@ int guild_storage_delitem(struct map_session_data *sd,struct guild_storage *stor
stor->storage_[n].amount-=amount; stor->storage_[n].amount-=amount;
if(stor->storage_[n].amount==0){ if(stor->storage_[n].amount==0){
malloc_set(&stor->storage_[n],0,sizeof(stor->storage_[0])); memset(&stor->storage_[n],0,sizeof(stor->storage_[0]));
stor->storage_amount--; stor->storage_amount--;
clif_updateguildstorageamount(sd,stor); clif_updateguildstorageamount(sd,stor);
} }

6
src/map/trade.c
View File

@ -140,8 +140,8 @@ void trade_tradeack(struct map_session_data *sd, int type) {
//Initiate trade //Initiate trade
sd->state.trading = 1; sd->state.trading = 1;
tsd->state.trading = 1; tsd->state.trading = 1;
malloc_set(&sd->deal, 0, sizeof(sd->deal)); memset(&sd->deal, 0, sizeof(sd->deal));
malloc_set(&tsd->deal, 0, sizeof(tsd->deal)); memset(&tsd->deal, 0, sizeof(tsd->deal));
clif_tradestart(tsd, type); clif_tradestart(tsd, type);
clif_tradestart(sd, type); clif_tradestart(sd, type);
} }
@ -173,7 +173,7 @@ int impossible_trade_check(struct map_session_data *sd) {
// remove equiped items (they can not be trade) // remove equiped items (they can not be trade)
for (i = 0; i < MAX_INVENTORY; i++) for (i = 0; i < MAX_INVENTORY; i++)
if (inventory[i].nameid > 0 && inventory[i].equip && !(inventory[i].equip & EQP_AMMO)) if (inventory[i].nameid > 0 && inventory[i].equip && !(inventory[i].equip & EQP_AMMO))
malloc_set(&inventory[i], 0, sizeof(struct item)); memset(&inventory[i], 0, sizeof(struct item));
// check items in player inventory // check items in player inventory
for(i = 0; i < 10; i++) { for(i = 0; i < 10; i++) {

2
src/map/unit.c
View File

@ -1473,7 +1473,7 @@ void unit_dataset(struct block_list *bl) {
struct unit_data *ud; struct unit_data *ud;
nullpo_retv(ud = unit_bl2ud(bl)); nullpo_retv(ud = unit_bl2ud(bl));
malloc_set( ud, 0, sizeof( struct unit_data) ); memset( ud, 0, sizeof( struct unit_data) );
ud->bl = bl; ud->bl = bl;
ud->walktimer = -1; ud->walktimer = -1;
ud->skilltimer = -1; ud->skilltimer = -1;