summaryrefslogtreecommitdiff
path: root/src/map/map.c
diff options
context:
space:
mode:
authorMadCamel <madcamel@gmail.com>2009-09-30 13:53:33 -0400
committerMadCamel <madcamel@gmail.com>2009-09-30 13:53:33 -0400
commit3fc3d83aa0be31e6d51afac54ff76b447f99f711 (patch)
tree2deac15b3e34382f11a27090e3f1a8ef3049618b /src/map/map.c
parent5967577d8bf92a9912cd153b20597f0d13a19456 (diff)
parent48d96bc41a4791b6cb0bc2cf514a6cc1f06c4dd8 (diff)
downloadtmwa-3fc3d83aa0be31e6d51afac54ff76b447f99f711.tar.gz
tmwa-3fc3d83aa0be31e6d51afac54ff76b447f99f711.tar.bz2
tmwa-3fc3d83aa0be31e6d51afac54ff76b447f99f711.tar.xz
tmwa-3fc3d83aa0be31e6d51afac54ff76b447f99f711.zip
Merge branch 'master' of git://gitorious.org/tmw-eathena/mainline
Diffstat (limited to 'src/map/map.c')
-rw-r--r--src/map/map.c13
1 files changed, 2 insertions, 11 deletions
diff --git a/src/map/map.c b/src/map/map.c
index 31f269d..f5d6d33 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -965,8 +965,6 @@ void map_addnickdb(struct map_session_data *sd) {
*------------------------------------------
*/
int map_quit(struct map_session_data *sd) {
- int i;
-
nullpo_retr(0, sd);
if(sd->chatID) // チャットから出る
@@ -1012,13 +1010,6 @@ int map_quit(struct map_session_data *sd) {
pc_setrestartvalue(sd,2);
pc_makesavestatus(sd);
//クローンスキルで覚えたスキルは消す
- for(i=0;i<MAX_SKILL;i++){
- if(sd->status.skill[i].flag == 13){
- sd->status.skill[i].id=0;
- sd->status.skill[i].lv=0;
- sd->status.skill[i].flag=0;
- }
- }
//The storage closing routines will save the char if needed. [Skotlex]
if (!sd->state.storage_flag)
@@ -1668,7 +1659,7 @@ map_close_logfile()
{
if (map_logfile) {
char *filenameop_buf = malloc(strlen(map_logfile_name) + 50);
- sprintf(filenameop_buf, "gzip %s.%ld", map_logfile_name, map_logfile_index);
+ sprintf(filenameop_buf, "gzip -f %s.%ld", map_logfile_name, map_logfile_index);
fclose(map_logfile);
@@ -1704,7 +1695,7 @@ map_set_logfile(char *filename)
map_start_logfile(tv.tv_sec);
atexit(map_close_logfile);
- MAP_LOG("log-start v2");
+ MAP_LOG("log-start v3");
}