summaryrefslogtreecommitdiff
path: root/src/char
diff options
context:
space:
mode:
Diffstat (limited to 'src/char')
-rw-r--r--src/char/char.cpp3
-rw-r--r--src/char/int_party.cpp3
-rw-r--r--src/char/int_storage.cpp14
-rw-r--r--src/char/int_storage.hpp1
-rw-r--r--src/char/inter.cpp19
-rw-r--r--src/char/inter.hpp3
6 files changed, 4 insertions, 39 deletions
diff --git a/src/char/char.cpp b/src/char/char.cpp
index 899461a..67268f4 100644
--- a/src/char/char.cpp
+++ b/src/char/char.cpp
@@ -222,7 +222,7 @@ int mmo_char_tostr(char *str, struct mmo_charstatus *p)
}
str_p += sprintf(str_p, "%d\t%d,%d\t%s\t%d,%d,%d\t%d,%d,%d\t%d,%d,%d,%d\t%d,%d,%d,%d,%d,%d\t%d,%d" "\t%d,%d,%d\t%d,%d,%d\t%d,%d,%d\t%d,%d,%d,%d,%d" "\t%s,%d,%d\t%s,%d,%d,%d\t", p->char_id, p->account_id, p->char_num, p->name, //
- p->pc_class, p->base_level, p->job_level, p->base_exp, p->job_exp, p->zeny, p->hp, p->max_hp, p->sp, p->max_sp, p->str, p->agi, p->vit, p->int_, p->dex, p->luk, p->status_point, p->skill_point, p->option, p->karma, p->manner, //
+ p->pc_class, p->base_level, p->job_level, p->base_exp, p->job_exp, p->zeny, p->hp, p->max_hp, p->sp, p->max_sp, p->str, p->agi, p->vit, p->int_, p->dex, p->luk, p->status_point, p->skill_point, uint16_t(p->option), p->karma, p->manner, //
p->party_id, 0/*guild_id*/, 0, p->hair, p->hair_color, p->clothes_color, p->weapon, p->shield, p->head_top, p->head_mid, p->head_bottom, p->last_point.map, p->last_point.x, p->last_point.y, //
p->save_point.map, p->save_point.x, p->save_point.y,
p->partner_id);
@@ -2226,7 +2226,6 @@ void parse_tologin(int fd)
return;
}
}
- RFIFOFLUSH(fd);
}
//--------------------------------
diff --git a/src/char/int_party.cpp b/src/char/int_party.cpp
index 4967676..f33febd 100644
--- a/src/char/int_party.cpp
+++ b/src/char/int_party.cpp
@@ -19,8 +19,11 @@ struct dbt *party_db;
static
int party_newid = 100;
+static
int mapif_party_broken(int party_id, int flag);
+static
int party_check_empty(struct party *p);
+static
int mapif_parse_PartyLeave(int fd, int party_id, int account_id);
// パーティデータの文字列への変換
diff --git a/src/char/int_storage.cpp b/src/char/int_storage.cpp
index cdc8d69..b0bc300 100644
--- a/src/char/int_storage.cpp
+++ b/src/char/int_storage.cpp
@@ -172,20 +172,6 @@ int inter_storage_init(void)
}
static
-void storage_db_final(db_key_t, db_val_t data)
-{
- struct storage *p = (struct storage *) data;
- if (p)
- free(p);
-}
-
-void inter_storage_final(void)
-{
- numdb_final(storage_db, storage_db_final);
- return;
-}
-
-static
void inter_storage_save_sub(db_key_t, db_val_t data, FILE *fp)
{
char line[65536];
diff --git a/src/char/int_storage.hpp b/src/char/int_storage.hpp
index a5e9e0b..286c5a6 100644
--- a/src/char/int_storage.hpp
+++ b/src/char/int_storage.hpp
@@ -2,7 +2,6 @@
#define INT_STORAGE_HPP
int inter_storage_init(void);
-void inter_storage_final(void);
int inter_storage_save(void);
int inter_storage_delete(int account_id);
struct storage *account2storage(int account_id);
diff --git a/src/char/inter.cpp b/src/char/inter.cpp
index 98ea03c..631f804 100644
--- a/src/char/inter.cpp
+++ b/src/char/inter.cpp
@@ -1,6 +1,5 @@
#include "inter.hpp"
-#include <cstdarg> // exception to "no va_list" rule
#include <cstdlib>
#include <cstring>
@@ -239,24 +238,6 @@ int inter_config_read(const char *cfgName)
return 0;
}
-// ログ書き出し
-int inter_log(const char *fmt, ...)
-{
- FILE *logfp;
- va_list ap;
-
- va_start(ap, fmt);
- logfp = fopen_(inter_log_filename, "a");
- if (logfp)
- {
- vfprintf(logfp, fmt, ap);
- fclose_(logfp);
- }
- va_end(ap);
-
- return 0;
-}
-
// セーブ
int inter_save(void)
{
diff --git a/src/char/inter.hpp b/src/char/inter.hpp
index f8cb3da..0adbf03 100644
--- a/src/char/inter.hpp
+++ b/src/char/inter.hpp
@@ -7,9 +7,6 @@ int inter_parse_frommap(int fd);
int inter_check_length(int fd, int length);
-__attribute__((format(printf, 1, 2)))
-int inter_log(const char *fmt, ...);
-
#define inter_cfgName "conf/inter_athena.conf"
extern int party_share_level;