summaryrefslogtreecommitdiff
path: root/src/map/map.h
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2013-03-30 23:08:08 -0300
committershennetsind <ind@henn.et>2013-03-30 23:08:08 -0300
commit7ec1e8fdff6adad1979d750774f9003f223bf3ef (patch)
tree65553e83135c5f5f983c106914d0a35ea2f62588 /src/map/map.h
parent87373047cd4aaf8b0c2425133b9b907e3ea4d122 (diff)
downloadhercules-7ec1e8fdff6adad1979d750774f9003f223bf3ef.tar.gz
hercules-7ec1e8fdff6adad1979d750774f9003f223bf3ef.tar.bz2
hercules-7ec1e8fdff6adad1979d750774f9003f223bf3ef.tar.xz
hercules-7ec1e8fdff6adad1979d750774f9003f223bf3ef.zip
Hercules Renewal: clif.c complete
Added the last missing functions into the interface, all functions in clif.c are now wired to the interface. http://hercules.ws/board/topic/237-hercules-renewal/ Also shortened clif->displaymessage to clif->message, removed the old clif->message and merged its functionality with clif->disp_overhead (both use the same packet and do the same thing :P) - and a gazillion other stuff: http://hercules.ws/board/topic/316-introducing-hercules-channel-system/ Signed-off-by: shennetsind <ind@henn.et>
Diffstat (limited to 'src/map/map.h')
-rw-r--r--src/map/map.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/map/map.h b/src/map/map.h
index cd5983686..7892cbfdc 100644
--- a/src/map/map.h
+++ b/src/map/map.h
@@ -17,6 +17,7 @@
struct npc_data;
struct item_data;
+struct hChSysCh;
enum E_MAPSERVER_ST {
MAPSERVER_ST_RUNNING = CORE_ST_LAST,
@@ -585,6 +586,7 @@ struct map_data {
unsigned guildlock :1;
unsigned src4instance : 1; // To flag this map when it's used as a src map for instances
unsigned reset :1; // [Daegaladh]
+ unsigned chsysnolocalaj : 1;
} flag;
struct point save;
struct npc_data *npc[MAX_NPC_PER_MAP];
@@ -619,6 +621,9 @@ struct map_data {
/* Hercules nocast db overhaul */
struct map_zone_data *zone;
+
+ /* Hercules Local Chat */
+ struct hChSysCh *channel;
};
/// Stores information about a remote map (for multi-mapserver setups).
@@ -796,8 +801,6 @@ typedef struct elemental_data TBL_ELEM;
( ((bl) == (struct block_list*)NULL || (bl)->type != (type_)) ? (T ## type_ *)NULL : (T ## type_ *)(bl) )
-extern char main_chat_nick[16];
-
#ifdef BETA_THREAD_TEST
extern char default_codepage[32];