summaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
Diffstat (limited to 'src/common')
-rw-r--r--src/common/db.h4
-rw-r--r--src/common/mmo.h3
2 files changed, 4 insertions, 3 deletions
diff --git a/src/common/db.h b/src/common/db.h
index 9d7bdda10..c00489b93 100644
--- a/src/common/db.h
+++ b/src/common/db.h
@@ -928,8 +928,8 @@ struct linkdb_node {
typedef void (*LinkDBFunc)(void* key, void* data, va_list args);
-void linkdb_insert (struct linkdb_node** head, void *key, void* data); // 重複を考慮しない
-void linkdb_replace (struct linkdb_node** head, void *key, void* data); // 重複を考慮する
+void linkdb_insert (struct linkdb_node** head, void *key, void* data); // Doesn't take into account duplicate keys
+void linkdb_replace (struct linkdb_node** head, void *key, void* data); // Takes into account duplicate keys
void* linkdb_search (struct linkdb_node** head, void *key);
void* linkdb_erase (struct linkdb_node** head, void *key);
void linkdb_final (struct linkdb_node** head);
diff --git a/src/common/mmo.h b/src/common/mmo.h
index 594d1cb26..cb1e52311 100644
--- a/src/common/mmo.h
+++ b/src/common/mmo.h
@@ -536,6 +536,7 @@ struct guild_skill {
int id,lv;
};
+struct hChSysCh;
struct guild {
int guild_id;
short guild_lv, connect_member, max_member, average_lv;
@@ -558,7 +559,7 @@ struct guild {
short *instance;
unsigned short instances;
- void *channel;
+ struct hChSysCh *channel;
};
struct guild_castle {