Index: pc.h
===================================================================
--- pc.h	(revision 17084)
+++ pc.h	(working copy)
@@ -207,17 +207,20 @@
 	int menuskill_id, menuskill_val, menuskill_val2;
 
 	int invincible_timer;
-	unsigned int canlog_tick;
-	unsigned int canuseitem_tick;	// [Skotlex]
-	unsigned int canusecashfood_tick;
-	unsigned int canequip_tick;	// [Inkfish]
-	unsigned int cantalk_tick;
-	unsigned int canskill_tick; // used to prevent abuse from no-delay ACT files
-	unsigned int cansendmail_tick; // [Mail System Flood Protection]
-	unsigned int ks_floodprotect_tick; // [Kill Steal Protection]
-    unsigned int bloodylust_tick; // bloodylust player timer [out/in re full-heal protection]
 
 	struct {
+		unsigned int logout;
+		unsigned int item; // [Skotlex]
+		unsigned int cashfood;
+		unsigned int equip; // [Inkfish]
+		unsigned int talk;
+		unsigned int skill; // used to prevent abuse from no-delay ACT files
+		unsigned int mail; // [Mail System Flood Protection]
+		unsigned int ks_floodprotect; // [Kill Steal Protection]
+		unsigned int bloodylust; // bloodylust player timer [out/in re full-heal protection]
+	} tick;
+
+	struct {
 		short nameid;
 		unsigned int tick;
 	} item_delay[MAX_ITEMDELAYS]; // [Paradox924X]
@@ -359,28 +362,40 @@
 		int zeny, weight;
 	} deal;
 
-	bool party_creating; // whether the char is requesting party creation
-	bool party_joining; // whether the char is accepting party invitation
-	int party_invite, party_invite_account; // for handling party invitation (holds party id and account id)
+	struct {
+		bool creating; // whether the char is requesting party creation
+		bool joining; // whether the char is accepting party invitation
+		int invite, invite_account; // for handling party invitation (holds party id and account id)
+	} party;
+
 	int adopt_invite; // Adoption
 
-	int guild_invite,guild_invite_account;
-	int guild_emblem_id,guild_alliance,guild_alliance_account;
-	short guild_x,guild_y; // For guildmate position display. [Skotlex] should be short [zzo]
+	struct {
+		int invite;
+		int invite_account;
+		int emblem_id;
+		int alliance;
+		int alliance_account;
+		short x,y; // For guildmate position display. [Skotlex] should be short [zzo]
+	} guild;
+
 	int guildspy; // [Syrus22]
 	int partyspy; // [Syrus22]
 
-	int vended_id;
-	int vender_id;
-	int vend_num;
-	char message[MESSAGE_SIZE];
-	struct s_vending vending[MAX_VENDING];
+	struct {
+		int vended_id;
+		int vender_id;
+		int vend_num;
+		char message[MESSAGE_SIZE];
+		struct s_vending vending[MAX_VENDING];
+	} vend;
 
-	unsigned int buyer_id;  // uid of open buying store
-	struct s_buyingstore buyingstore;
+	struct {
+		unsigned int id;  // uid of open buying store
+		struct s_buyingstore buying;
+		struct s_search_store_info search;
+	} buyingstore;
 
-	struct s_search_store_info searchstore;
-
 	struct pet_data *pd;
 	struct homun_data *hd;	// [blackhole89]
 	struct mercenary_data *md;
@@ -392,14 +407,20 @@
 	}feel_map[3];// 0 - Sun; 1 - Moon; 2 - Stars
 	short hate_mob[3];
 
-	int pvp_timer;
-	short pvp_point;
-	unsigned short pvp_rank, pvp_lastusers;
-	unsigned short pvp_won, pvp_lost;
+	struct {
+		int timer;
+		short point;
+		unsigned short rank;
+		unsigned short lastusers;
+		unsigned short won;
+		unsigned short lost;
+	} pvp;
 
-	char eventqueue[MAX_EVENTQUEUE][EVENT_NAME_LENGTH];
-	int eventtimer[MAX_EVENTTIMER];
-	unsigned short eventcount; // [celest]
+	struct {
+		char queue[MAX_EVENTQUEUE][EVENT_NAME_LENGTH];
+		int timer[MAX_EVENTTIMER];
+		unsigned short count; // [celest]
+	} event;
 
 	unsigned char change_level_2nd; // job level when changing from 1st to 2nd class [jobchange_level in global_reg_value]
 	unsigned char change_level_3rd; // job level when changing from 2nd to 3rd class [jobchange_level_3rd in global_reg_value]
@@ -428,11 +449,13 @@
 	} mail;
 
 	//Quest log system [Kevin] [Inkfish]
-	int num_quests;
-	int avail_quests;
-	int quest_index[MAX_QUEST_DB];
-	struct quest quest_log[MAX_QUEST_DB];
-	bool save_quest;
+	struct {
+		int num;
+		int avail;
+		int index[MAX_QUEST_DB];
+		struct quest log[MAX_QUEST_DB];
+		bool save;
+	} quest;
 
 	// temporary debug [flaviojs]
 	const char* debug_file;