diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-04-05 20:53:15 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-04-05 20:53:15 +0000 |
| commit | 64f4cc701fb78e585514eaa894dfd98cbbf224bf (patch) | |
| tree | 01c694992c4eb8968c0f6ffcd126a9c7f6633895 /src/map | |
| parent | 01368ed9a40bc98ac870b04380ad1344485962e4 (diff) | |
| download | hercules-64f4cc701fb78e585514eaa894dfd98cbbf224bf.tar.gz hercules-64f4cc701fb78e585514eaa894dfd98cbbf224bf.tar.bz2 hercules-64f4cc701fb78e585514eaa894dfd98cbbf224bf.tar.xz hercules-64f4cc701fb78e585514eaa894dfd98cbbf224bf.zip | |
Fixing several compilation & runtime problems
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10164 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/chrif.h | 8 | ||||
| -rw-r--r-- | src/map/map.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/map/chrif.h b/src/map/chrif.h index adbf0ab2f..5f9b4d868 100644 --- a/src/map/chrif.h +++ b/src/map/chrif.h @@ -23,13 +23,13 @@ int chrif_isconnect(void); extern int chrif_connected; extern int other_mapserver_count; -void chrif_authreq(struct map_session_data *); +void chrif_authreq(struct map_session_data* sd); void chrif_authok(int fd); int chrif_scdata_request(int account_id, int char_id); -int chrif_save(struct map_session_data*, int flag); -int chrif_charselectreq(struct map_session_data*sd, uint32 s_ip); +int chrif_save(struct map_session_data* sd, int flag); +int chrif_charselectreq(struct map_session_data* sd, uint32 s_ip); void check_fake_id(int fd, struct map_session_data *sd, int target_id); -int chrif_changemapserver(struct map_session_data*sd, short map, int x, int y, uint32 ip, uint16 port); +int chrif_changemapserver(struct map_session_data* sd, short map, int x, int y, uint32 ip, uint16 port); int chrif_searchcharid(int char_id); int chrif_changegm(int id,const char *pass,int len); diff --git a/src/map/map.c b/src/map/map.c index 4c38c3754..f9c60d428 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -268,9 +268,9 @@ int map_freeblock_unlock_sub(char *file, int lineno) int i; for (i = 0; i < block_free_count; i++) { -// aFree(block_free[i]); + aFree(block_free[i]); // _mfree(block_free[i], file, lineno, __func__); - _mfree(block_free[i], file, ((block_free[i]?block_free[i]->type:0)*100000)+lineno, __func__); +// _mfree(block_free[i], file, ((block_free[i]?block_free[i]->type:0)*100000)+lineno, __func__); block_free[i] = NULL; } block_free_count = 0; |