diff options
Diffstat (limited to 'src/char')
| -rw-r--r-- | src/char/char.c | 39 | ||||
| -rw-r--r-- | src/char/int_status.c | 22 | ||||
| -rw-r--r-- | src/char/inter.c | 11 |
3 files changed, 11 insertions, 61 deletions
diff --git a/src/char/char.c b/src/char/char.c index 49ccb7016..adfb40151 100644 --- a/src/char/char.c +++ b/src/char/char.c @@ -412,8 +412,8 @@ void set_all_offline(int id) { /*--------------------------------------------------- Make a data line for friends list --------------------------------------------------*/ - -int mmo_friends_list_data_str(char *str, struct mmo_charstatus *p) { +int mmo_friends_list_data_str(char *str, struct mmo_charstatus *p) +{ int i; char *str_p = str; str_p += sprintf(str_p, "%d", p->char_id); @@ -435,14 +435,6 @@ int mmo_char_tostr(char *str, struct mmo_charstatus *p, struct global_reg *reg, int i,j; char *str_p = str; - /* We shouldn't need this anymore... [Skotlex] - // on multi-map server, sometimes it's posssible that last_point become void. (reason???) We check that to not lost character at restart. - if (!p->last_point.map) { - p->last_point.map = mapindex_name2id(MAP_PRONTERA); - p->last_point.x = 273; - p->last_point.y = 354; - } - */ str_p += sprintf(str_p, "%d\t%d,%d\t%s\t%d,%d,%d\t%u,%u,%d" //Up to Zeny field "\t%d,%d,%d,%d\t%d,%d,%d,%d,%d,%d\t%d,%d" //Up to Skill Point @@ -648,33 +640,6 @@ int mmo_char_fromstr(char *str, struct mmo_charstatus *p, struct global_reg *reg p->account_id = tmp_int[1]; p->char_num = tmp_int[2]; p->class_ = tmp_int[3]; -/* Unneeded unless you are running a real old character database now. - //Temporal fix until all chars are reverted from peco-flying-class to - //normal classes. [Skotlex] - switch (p->class_) { - case JOB_KNIGHT2: //Job_Knight2 - p->class_ = JOB_KNIGHT; - break; - case JOB_CRUSADER2: //Job_Crusader2 - p->class_ = JOB_CRUSADER; - break; - case JOB_LORD_KNIGHT2: //Job_Lord_Knight2 - p->class_ = JOB_LORD_KNIGHT; - break; - case JOB_PALADIN2: //Job_Paladin2 - p->class_ = JOB_PALADIN; - break; - case JOB_BABY_KNIGHT2: //Job_Baby_Knight2 - p->class_ = JOB_BABY_KNIGHT; - break; - case JOB_BABY_CRUSADER2: //Job_Baby_Crusader2 - p->class_ = JOB_BABY_CRUSADER; - break; - case JOB_STAR_GLADIATOR2: //Job_Star_Gladiator2 - p->class_ = JOB_STAR_GLADIATOR; - break; - } -*/ p->base_level = tmp_int[4]; p->job_level = tmp_int[5]; p->base_exp = tmp_uint[0]; diff --git a/src/char/int_status.c b/src/char/int_status.c index 719820f3e..ccab32431 100644 --- a/src/char/int_status.c +++ b/src/char/int_status.c @@ -23,8 +23,7 @@ static void* create_scdata(DBKey key, va_list args) { /*========================================== * Loads status change data of the player given. [Skotlex] - *------------------------------------------ - */ + *------------------------------------------*/ struct scdata* status_search_scdata(int aid, int cid) { struct scdata *data; @@ -35,8 +34,7 @@ struct scdata* status_search_scdata(int aid, int cid) /*========================================== * Deletes status change data of the player given. [Skotlex] * Should be invoked after the data of said player was successfully loaded. - *------------------------------------------ - */ + *------------------------------------------*/ void status_delete_scdata(int aid, int cid) { struct scdata *scdata = idb_remove(scdata_db, cid); @@ -87,8 +85,7 @@ static int inter_scdata_fromstr(char *line, struct scdata *sc_data) } /*========================================== * Loads all scdata from the given filename. - *------------------------------------------ - */ + *------------------------------------------*/ void status_load_scdata(const char* filename) { FILE *fp; @@ -138,8 +135,7 @@ static int inter_status_save_sub(DBKey key, void *data, va_list ap) { /*========================================== * Saves all scdata to the given filename. - *------------------------------------------ - */ + *------------------------------------------*/ void inter_status_save() { FILE *fp; @@ -155,8 +151,7 @@ void inter_status_save() /*========================================== * Initializes db. - *------------------------------------------ - */ + *------------------------------------------*/ void status_init() { scdata_db = db_alloc(__FILE__,__LINE__,DB_INT,DB_OPT_BASE,sizeof(int)); @@ -165,8 +160,7 @@ void status_init() /*========================================== * Frees up memory. - *------------------------------------------ - */ + *------------------------------------------*/ static int scdata_db_final(DBKey k,void *d,va_list ap) { struct scdata *data = (struct scdata*)d; @@ -178,10 +172,10 @@ static int scdata_db_final(DBKey k,void *d,va_list ap) /*========================================== * Final cleanup. - *------------------------------------------ - */ + *------------------------------------------*/ void status_final(void) { scdata_db->destroy(scdata_db, scdata_db_final); } + #endif //ENABLE_SC_SAVING diff --git a/src/char/inter.c b/src/char/inter.c index d500da301..e8051f40c 100644 --- a/src/char/inter.c +++ b/src/char/inter.c @@ -171,8 +171,7 @@ int inter_accreg_save(void) { #endif //TXT_SQL_CONVERT /*========================================== * 設定ファイルを読み込む - *------------------------------------------ - */ + *------------------------------------------*/ static int inter_config_read(const char *cfgName) { char line[1024], w1[1024], w2[1024]; FILE *fp; @@ -533,14 +532,6 @@ int mapif_parse_WisRequest(int fd) { } //Not found. return mapif_wis_fail(fd, RFIFOP(fd, 4)); - -/* Scrapped since now we know where characters are online in. [Skotlex] - wd = mapif_create_whisper(fd, RFIFOP(fd, 4), RFIFOP(fd,28), RFIFOP(fd,52), RFIFOW(fd,2)-52); - if (!wd) return 0; - idb_put(wis_db, wd->id, wd); - mapif_wis_message(wd); - return 0; -*/ } // Wisp/page transmission result |