diff options
| author | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-10-07 21:35:12 +0000 |
|---|---|---|
| committer | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-10-07 21:35:12 +0000 |
| commit | 033373a5a75599f8607107cb28b97cc6a653b0b5 (patch) | |
| tree | c520e925018ac7de37d05f690d357fcf55b56ec4 /src/map/pc.h | |
| parent | 692dd1e5737b01ef26ba889f60d013cb992c3cec (diff) | |
| download | hercules-033373a5a75599f8607107cb28b97cc6a653b0b5.tar.gz hercules-033373a5a75599f8607107cb28b97cc6a653b0b5.tar.bz2 hercules-033373a5a75599f8607107cb28b97cc6a653b0b5.tar.xz hercules-033373a5a75599f8607107cb28b97cc6a653b0b5.zip | |
* Merged changes from trunk [14895:14966/trunk].
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/renewal@14967 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/pc.h')
| -rw-r--r-- | src/map/pc.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/map/pc.h b/src/map/pc.h index 46e96ff85..a49c4628e 100644 --- a/src/map/pc.h +++ b/src/map/pc.h @@ -10,7 +10,6 @@ #include "buyingstore.h" // struct s_buyingstore #include "itemdb.h" // MAX_ITEMGROUP #include "map.h" // RC_MAX -#include "pc.h" // struct map_session_data #include "script.h" // struct script_reg, struct script_regstr #include "searchstore.h" // struct s_search_store_info #include "status.h" // OPTION_*, struct weapon_atk @@ -102,7 +101,6 @@ struct map_session_data { unsigned int lr_flag : 2; unsigned int connect_new : 1; unsigned int arrow_atk : 1; - unsigned int combo : 2; // 1:Asura, 2:Kick [Inkfish] unsigned int gangsterparadise : 1; unsigned int rest : 1; unsigned int storage_flag : 2; //0: closed, 1: Normal Storage open, 2: guild storage open [Skotlex] |