diff options
| author | FlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-05-05 14:50:07 +0000 |
|---|---|---|
| committer | FlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-05-05 14:50:07 +0000 |
| commit | 28eedb41600c4c6617cd38905b3e55c879180754 (patch) | |
| tree | f3309c45f09acdba5144185b51d91f4a51b0b2f9 /src/map/map.h | |
| parent | a79359182bb925d2f64dc82adccbf4333cdcd01d (diff) | |
| download | hercules-28eedb41600c4c6617cd38905b3e55c879180754.tar.gz hercules-28eedb41600c4c6617cd38905b3e55c879180754.tar.bz2 hercules-28eedb41600c4c6617cd38905b3e55c879180754.tar.xz hercules-28eedb41600c4c6617cd38905b3e55c879180754.zip | |
* Removed the dependency on winsock.h for definitions, it's all winsock2.h now.
* Minor documentation/re-coding in chat.c.
* More work on ticket #41.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10471 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/map.h')
| -rw-r--r-- | src/map/map.h | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/map/map.h b/src/map/map.h index 6178b364d..fc7affdf3 100644 --- a/src/map/map.h +++ b/src/map/map.h @@ -4,7 +4,9 @@ #ifndef _MAP_H_ #define _MAP_H_ -#include <stdarg.h> +#ifndef _CBASETYPES_H_ +#include "../common/cbasetypes.h" +#endif #include "../common/mmo.h" #include "../common/mapindex.h" #include "../common/db.h" @@ -12,6 +14,8 @@ #include "itemdb.h" // MAX_ITEMGROUP #include "status.h" // SC_MAX +#include <stdarg.h> + //Uncomment to enable the Cell Stack Limit mod. //It's only config is the battle_config cell_stack_limit. //Only chars affected are those defined in BL_CHAR (mobs and players currently) @@ -387,8 +391,10 @@ struct status_change_entry { struct status_change { struct status_change_entry data[SC_MAX]; short count; - unsigned short opt1,opt2; - unsigned int opt3, option; //Note that older packet versions use short here. + unsigned short opt1;// body state + unsigned short opt2;// health state + unsigned int opt3; + unsigned int option;// effect state }; struct vending { @@ -1394,8 +1400,8 @@ extern char *map_server_dns; #ifndef TXT_ONLY -#ifdef _WIN32 -#include <windows.h> // SOCKET +#ifdef WIN32 +#include <winsock2.h> #endif #include <mysql.h> |