summaryrefslogtreecommitdiff
path: root/src/map/map.h
diff options
context:
space:
mode:
authorai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-05-14 12:07:33 +0000
committerai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-05-14 12:07:33 +0000
commit0f68ad394abe13e2374f84f02ac1b04e62fe406e (patch)
tree83361e37d4268ccbb1164d54636a2fde6aa61a51 /src/map/map.h
parent1a89ef9c1411199ebdfdf87837613a35b72914f1 (diff)
downloadhercules-0f68ad394abe13e2374f84f02ac1b04e62fe406e.tar.gz
hercules-0f68ad394abe13e2374f84f02ac1b04e62fe406e.tar.bz2
hercules-0f68ad394abe13e2374f84f02ac1b04e62fe406e.tar.xz
hercules-0f68ad394abe13e2374f84f02ac1b04e62fe406e.zip
* Moved bitfield 'boss' inside 'spawn_data' and 'mob_data' into the respective state struct (from r13813, follow up to r14795).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14818 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/map.h')
-rw-r--r--src/map/map.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/map/map.h b/src/map/map.h
index 3241efea1..f1e7e49b3 100644
--- a/src/map/map.h
+++ b/src/map/map.h
@@ -259,16 +259,16 @@ struct block_list {
// Expanded to specify all mob-related spawn data by [Skotlex]
struct spawn_data {
short class_; //Class, used because a mob can change it's class
- unsigned boss : 1;
unsigned short m,x,y; //Spawn information (map, point, spawn-area around point)
signed short xs,ys;
unsigned short num; //Number of mobs using this structure
unsigned short active; //Number of mobs that are already spawned (for mob_remove_damaged: no)
unsigned int delay1,delay2; //Min delay before respawning after spawn/death
struct {
- unsigned size :2; //Holds if mob has to be tiny/large
- unsigned ai :2; //Holds if mob is special ai.
- unsigned dynamic :1; //Whether this data is indexed by a map's dynamic mob list
+ unsigned int size :2; //Holds if mob has to be tiny/large
+ unsigned int ai :2; //Holds if mob is special ai.
+ unsigned int dynamic :1; //Whether this data is indexed by a map's dynamic mob list
+ unsigned int boss : 1;
} state;
char name[NAME_LENGTH],eventname[EVENT_NAME_LENGTH]; //Name/event
};