summaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
authorj-tkay <joseph.tk.ea@gmail.com>2013-06-28 20:11:19 +0800
committerj-tkay <joseph.tk.ea@gmail.com>2013-06-28 20:11:19 +0800
commit8489dbf3b58d3bff70b27ea42884a14d5229430a (patch)
tree89e0f9be6b3bc7c3ebc135fc311d9f6d6ebbfeec /src/common
parentde7919f0f59f47473e6de709b5d5287a4a55e18d (diff)
parent2154c0fa9cee582a36f9a8d7923a646a6d47adf0 (diff)
downloadhercules-8489dbf3b58d3bff70b27ea42884a14d5229430a.tar.gz
hercules-8489dbf3b58d3bff70b27ea42884a14d5229430a.tar.bz2
hercules-8489dbf3b58d3bff70b27ea42884a14d5229430a.tar.xz
hercules-8489dbf3b58d3bff70b27ea42884a14d5229430a.zip
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'src/common')
-rw-r--r--src/common/mmo.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/mmo.h b/src/common/mmo.h
index 8643d2b54..6e5dae099 100644
--- a/src/common/mmo.h
+++ b/src/common/mmo.h
@@ -534,7 +534,7 @@ struct guild {
/* TODO: still used for something?|: */
unsigned short save_flag; // for TXT saving
- unsigned short *instance;
+ short *instance;
unsigned short instances;
void *channel;