summaryrefslogtreecommitdiff
path: root/src/common/mmo.h
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2014-01-12 16:38:58 -0200
committershennetsind <ind@henn.et>2014-01-12 16:38:58 -0200
commite4c21279a33a810ee80c334a74c422affcdab870 (patch)
treea7dab158ca095f82c6814d7c903e222ba90716c6 /src/common/mmo.h
parentd9c1629c753ae756ce32613a76e69b3a03970b8d (diff)
parent253e90c67f7ddbbb3ab2f9f68a0d760d059ed797 (diff)
downloadhercules-e4c21279a33a810ee80c334a74c422affcdab870.tar.gz
hercules-e4c21279a33a810ee80c334a74c422affcdab870.tar.bz2
hercules-e4c21279a33a810ee80c334a74c422affcdab870.tar.xz
hercules-e4c21279a33a810ee80c334a74c422affcdab870.zip
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'src/common/mmo.h')
-rw-r--r--src/common/mmo.h3
1 files changed, 2 insertions, 1 deletions
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 {