Cleanup of conditions for old clients.

- No one use versions as old, besides being advised to keep up to date.
- Informations of packets will be maintained, the cleanup is just for conditions. Please do not remove old packet information, it is useful for future searches.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15828 54d463be-8e91-2dee-dedb-b68131a5f0ec

4 files changed, 33 insertions, 486 deletions

diff --git a/src/char/char.c b/src/char/char.c
index df0a9add5..b3defd7f0 100644
--- a/src/char/char.c
+++ b/src/char/char.c
@@ -1622,15 +1622,10 @@ int mmo_char_tobuf(uint8* buffer, struct mmo_charstatus* p)
 	WBUFL(buf,32) = p->karma;
 	WBUFL(buf,36) = p->manner;
 	WBUFW(buf,40) = min(p->status_point, INT16_MAX);
-#if PACKETVER > 20081217
 	WBUFL(buf,42) = p->hp;
 	WBUFL(buf,46) = p->max_hp;
 	offset+=4;
 	buf = WBUFP(buffer,offset);
-#else
-	WBUFW(buf,42) = min(p->hp, INT16_MAX);
-	WBUFW(buf,44) = min(p->max_hp, INT16_MAX);
-#endif
 	WBUFW(buf,46) = min(p->sp, INT16_MAX);
 	WBUFW(buf,48) = min(p->max_sp, INT16_MAX);
 	WBUFW(buf,50) = DEFAULT_WALK_SPEED; // p->speed;
@@ -1656,10 +1651,8 @@ int mmo_char_tobuf(uint8* buffer, struct mmo_charstatus* p)
 	WBUFB(buf,102) = min(p->dex, UINT8_MAX);
 	WBUFB(buf,103) = min(p->luk, UINT8_MAX);
 	WBUFW(buf,104) = p->slot;
-#if PACKETVER >= 20061023
 	WBUFW(buf,106) = ( p->rename > 0 ) ? 0 : 1;
 	offset += 2;
-#endif
 #if (PACKETVER >= 20100720 && PACKETVER <= 20100727) || PACKETVER >= 20100803
 	mapindex_getmapname_ext(mapindex_id2name(p->last_point.map), (char*)WBUFP(buf,108));
 	offset += MAP_NAME_LENGTH_EXT;
diff --git a/src/common/mmo.h b/src/common/mmo.h
index 2e25eae16..3b049fc6e 100644
--- a/src/common/mmo.h
+++ b/src/common/mmo.h
@@ -50,16 +50,6 @@
 	//#define PACKETVER	20100730
 #endif
 
-// backward compatible PACKETVER 8 and 9
-#if PACKETVER == 8
-#undef PACKETVER
-#define PACKETVER 20070521
-#endif
-#if PACKETVER == 9
-#undef PACKETVER
-#define PACKETVER 20071106
-#endif
-
 //Remove/Comment this line to disable sc_data saving. [Skotlex]
 #define ENABLE_SC_SAVING 
 //Remove/Comment this line to disable server-side hot-key saving support [Skotlex]
@@ -67,16 +57,8 @@
 #define HOTKEY_SAVING
 
 //The number is the max number of hotkeys to save
-#if PACKETVER < 20090603
-	// (27 = 9 skills x 3 bars)               (0x02b9,191)
-	#define MAX_HOTKEYS 27
-#elif PACKETVER < 20090617
-	// (36 = 9 skills x 4 bars)               (0x07d9,254)
-	#define MAX_HOTKEYS 36
-#else
-	// (38 = 9 skills x 4 bars & 2 Quickslots)(0x07d9,268)
-	#define MAX_HOTKEYS 38
-#endif
+// (38 = 9 skills x 4 bars & 2 Quickslots)(0x07d9,268)
+#define MAX_HOTKEYS 38
 
 #define MAX_MAP_PER_SERVER 1500 // Increased to allow creation of Instance Maps
 #define MAX_INVENTORY 100
diff --git a/src/map/clif.c b/src/map/clif.c
index bf32ceac8..bca62eb96 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -261,7 +261,6 @@ uint16 clif_getport(void)
 	return map_port;
 }
 
-#if PACKETVER >= 20071106
 static inline unsigned char clif_bl_type(struct block_list *bl) {
 	switch (bl->type) {
 	case BL_PC:    return disguised(bl)?0x1:0x0; //PC_TYPE
@@ -277,7 +276,6 @@ static inline unsigned char clif_bl_type(struct block_list *bl) {
 	default:       return 0x1; //NPC_TYPE
 	}
 }
-#endif
 
 /*==========================================
  * sub process of clif_send
@@ -638,11 +636,7 @@ int clif_send(const uint8* buf, int len, struct block_list* bl, enum send_target
 /// 02eb <start time>.L <position>.3B <x size>.B <y size>.B <font>.W (ZC_ACCEPT_ENTER2)
 void clif_authok(struct map_session_data *sd)
 {
-#if PACKETVER < 20080102
-	const int cmd = 0x73;
-#else
 	const int cmd = 0x2eb;
-#endif
 	int fd = sd->fd;
 
 	WFIFOHEAD(fd,packet_len(cmd));
@@ -651,9 +645,7 @@ void clif_authok(struct map_session_data *sd)
 	WFIFOPOS(fd, 6, sd->bl.x, sd->bl.y, sd->ud.dir);
 	WFIFOB(fd, 9) = 5; // ignored
 	WFIFOB(fd,10) = 5; // ignored
-#if PACKETVER >= 20080102
 	WFIFOW(fd,11) = sd->user_font;  // FIXME: Font is currently not saved.
-#endif
 	WFIFOSET(fd,packet_len(cmd));
 }
 
@@ -830,8 +822,8 @@ void clif_clearunit_area(struct block_list* bl, clr_type type)
 		WBUFL(buf,2) = -bl->id;
 		clif_send(buf, packet_len(0x80), bl, SELF);
 	}
-}
 
+}
 
 /// Used to make monsters with player-sprites disappear after dying
 /// like normal monsters, because the client does not remove those
@@ -931,31 +923,13 @@ static int clif_set_unit_idle(struct block_list* bl, unsigned char* buffer, bool
 	struct status_change* sc = status_get_sc(bl);
 	struct view_data* vd = status_get_viewdata(bl);
 	unsigned char *buf = WBUFP(buffer,0);
-#if PACKETVER < 20091103
-	bool type = !pcdb_checkid(vd->class_);
-#endif
 #if PACKETVER >= 7
 	unsigned short offset = 0;
 #endif
-#if PACKETVER >= 20091103
 	const char *name;
-#endif
 	sd = BL_CAST(BL_PC, bl);
 
-#if PACKETVER < 20091103
-	if(type)
-		WBUFW(buf,0) = spawn?0x7c:0x78;
-	else
-#endif
-#if PACKETVER < 4
-		WBUFW(buf,0) = spawn?0x79:0x78;
-#elif PACKETVER < 7
-		WBUFW(buf,0) = spawn?0x1d9:0x1d8;
-#elif PACKETVER < 20080102
-		WBUFW(buf,0) = spawn?0x22b:0x22a;
-#elif PACKETVER < 20091103
-		WBUFW(buf,0) = spawn?0x2ed:0x2ee;
-#elif PACKETVER < 20101124
+#if PACKETVER < 20101124
 		WBUFW(buf,0) = spawn?0x7f8:0x7f9;
 #else
 		WBUFW(buf,0) = spawn?0x858:0x857;
@@ -1099,31 +1073,19 @@ static int clif_set_unit_walking(struct block_list* bl, struct unit_data* ud, un
 	struct status_change* sc = status_get_sc(bl);
 	struct view_data* vd = status_get_viewdata(bl);
 	unsigned char* buf = WBUFP(buffer,0);
-#if PACKETVER >= 7
 	unsigned short offset = 0;
-#endif
-#if PACKETVER >= 20091103
 	const char *name;
-#endif
 
 	sd = BL_CAST(BL_PC, bl);
 
-#if PACKETVER < 4
-	WBUFW(buf, 0) = 0x7b;
-#elif PACKETVER < 7
-	WBUFW(buf, 0) = 0x1da;
-#elif PACKETVER < 20080102
-	WBUFW(buf, 0) = 0x22c;
-#elif PACKETVER < 20091103
-	WBUFW(buf, 0) = 0x2ec;
-#elif PACKETVER < 20101124
+#if PACKETVER < 20101124
 	WBUFW(buf, 0) = 0x7f7;
 #else
 	WBUFW(buf, 0) = 0x856;
 #endif
 
-#if PACKETVER >= 20091103
 	name = status_get_name(bl);
+	
 #if PACKETVER < 20110111
 	WBUFW(buf, 2) = 69+strlen(name);
 #else
@@ -1131,35 +1093,22 @@ static int clif_set_unit_walking(struct block_list* bl, struct unit_data* ud, un
 #endif
 	offset+=2;
 	buf = WBUFP(buffer,offset);
-#endif
-#if PACKETVER >= 20071106
 	WBUFB(buf, 2) = clif_bl_type(bl);
 	offset++;
 	buf = WBUFP(buffer,offset);
-#endif
 	WBUFL(buf, 2) = bl->id;
 	WBUFW(buf, 6) = status_get_speed(bl);
 	WBUFW(buf, 8) = (sc)? sc->opt1 : 0;
 	WBUFW(buf,10) = (sc)? sc->opt2 : 0;
-#if PACKETVER < 7
-	WBUFW(buf,12) = (sc)? sc->option : 0;
-#else
 	WBUFL(buf,12) = (sc)? sc->option : 0;
 	offset+=2; //Shift the rest of elements by 2 bytes.
 	buf = WBUFP(buffer,offset);
-#endif
 	WBUFW(buf,14) = vd->class_;
 	WBUFW(buf,16) = vd->hair_style;
 	WBUFW(buf,18) = vd->weapon;
-#if PACKETVER < 4
-	WBUFW(buf,20) = vd->head_bottom;
-	WBUFL(buf,22) = gettick();
-	WBUFW(buf,26) = vd->shield;
-#else
 	WBUFW(buf,20) = vd->shield;
 	WBUFW(buf,22) = vd->head_bottom;
 	WBUFL(buf,24) = gettick();
-#endif
 	WBUFW(buf,28) = vd->head_top;
 	WBUFW(buf,30) = vd->head_mid;
 	WBUFW(buf,32) = vd->hair_color;
@@ -1173,43 +1122,29 @@ static int clif_set_unit_walking(struct block_list* bl, struct unit_data* ud, un
 	WBUFL(buf,38) = status_get_guild_id(bl);
 	WBUFW(buf,42) = status_get_emblem_id(bl);
 	WBUFW(buf,44) = (sd)? sd->status.manner : 0;
-#if PACKETVER < 7
-	WBUFW(buf,46) = (sc)? sc->opt3 : 0;
-#else
 	WBUFL(buf,46) = (sc)? sc->opt3 : 0;
 	offset+=2; //Shift the rest of elements by 2 bytes.
 	buf = WBUFP(buffer,offset);
-#endif
 	WBUFB(buf,48) = (sd)? sd->status.karma : 0;
 	WBUFB(buf,49) = vd->sex;
 	WBUFPOS2(buf,50,bl->x,bl->y,ud->to_x,ud->to_y,8,8);
 	WBUFB(buf,56) = (sd)? 5 : 0;
 	WBUFB(buf,57) = (sd)? 5 : 0;
 	WBUFW(buf,58) = clif_setlevel(bl);
-#if PACKETVER >= 20080102
 	WBUFW(buf,60) = sd?sd->user_font:0;
-#endif
-#if PACKETVER >= 20091103
+
 	memcpy((char*)WBUFP(buf,62), name, NAME_LENGTH);
 	return WBUFW(buffer,2);
-#else
-	return packet_len(WBUFW(buffer,0));
-#endif
 }
 
 //Modifies the buffer for disguise characters and sends it to self.
 //Used for spawn/walk packets, where the ID offset changes for packetver >=9
 static void clif_setdisguise(struct block_list *bl, unsigned char *buf,int len)
 {
-#if PACKETVER >= 20091103
 	WBUFB(buf,4)= pcdb_checkid(status_get_viewdata(bl)->class_) ? 0x0 : 0x5; //PC_TYPE : NPC_MOB_TYPE
 	WBUFL(buf,5)=-bl->id;
-#elif PACKETVER >= 20071106
 	WBUFB(buf,2)= pcdb_checkid(status_get_viewdata(bl)->class_) ? 0x0 : 0x5; //PC_TYPE : NPC_MOB_TYPE
 	WBUFL(buf,3)=-bl->id;
-#else
-	WBUFL(buf,2)=-bl->id;
-#endif
 	clif_send(buf, len, bl, SELF);
 }
 
@@ -1886,10 +1821,8 @@ void clif_sendfakenpc(struct map_session_data *sd, int npcid)
 	buf = WFIFOP(fd,0);
 	memset(WBUFP(buf,0), 0, packet_len(0x78));
 	WBUFW(buf,0)=0x78;
-#if PACKETVER >= 20071106
 	WBUFB(buf,2) = 0; // object type
 	buf = WFIFOP(fd,1);
-#endif
 	WBUFL(buf,2)=npcid;
 	WBUFW(buf,14)=111;
 	WBUFPOS(buf,46,sd->bl.x,sd->bl.y,sd->ud.dir);
@@ -2027,8 +1960,8 @@ void clif_viewpoint(struct map_session_data *sd, int npc_id, int type, int x, in
 	WFIFOB(fd,18)=id;
 	WFIFOL(fd,19)=color;
 	WFIFOSET(fd,packet_len(0x144));
-}
 
+}
 
 /// Displays an illustration image.
 /// 0145 <image name>.16B <type>.B (ZC_SHOW_IMAGE)
@@ -2115,13 +2048,7 @@ static void clif_addcards(unsigned char* buf, struct item* item)
 void clif_additem(struct map_session_data *sd, int n, int amount, int fail)
 {
 	int fd;
-#if PACKETVER < 20061218
-	const int cmd = 0xa0;
-#elif PACKETVER < 20071002
-	const int cmd = 0x29a;
-#else
 	const int cmd = 0x2d4;
-#endif
 	nullpo_retv(sd);
 
 	fd = sd->fd;
@@ -2145,12 +2072,8 @@ void clif_additem(struct map_session_data *sd, int n, int amount, int fail)
 		WFIFOW(fd,19)=0;
 		WFIFOB(fd,21)=0;
 		WFIFOB(fd,22)=fail;
-#if PACKETVER >= 20061218
 		WFIFOL(fd,23)=0;
-#endif
-#if PACKETVER >= 20071002
 		WFIFOW(fd,27)=0;  // unknown
-#endif
 	}
 	else
 	{
@@ -2171,12 +2094,8 @@ void clif_additem(struct map_session_data *sd, int n, int amount, int fail)
 		WFIFOW(fd,19)=pc_equippoint(sd,n);
 		WFIFOB(fd,21)=itemtype(sd->inventory_data[n]->type);
 		WFIFOB(fd,22)=fail;
-#if PACKETVER >= 20061218
 		WFIFOL(fd,23)=sd->status.inventory[n].expire_time;
-#endif
-#if PACKETVER >= 20071002
 		WFIFOW(fd,27)=0;  // unknown
-#endif
 	}
 
 	WFIFOSET(fd,packet_len(cmd));
@@ -2213,9 +2132,6 @@ void clif_dropitem(struct map_session_data *sd,int n,int amount)
 ///     7 = Consumed by Four Spirit Analysis (SO_EL_ANALYSIS) skill
 void clif_delitem(struct map_session_data *sd,int n,int amount, short reason)
 {
-#if PACKETVER < 20091117
-	clif_dropitem(sd,n,amount);
-#else
 	int fd;
 
 	nullpo_retv(sd);
@@ -2228,9 +2144,8 @@ void clif_delitem(struct map_session_data *sd,int n,int amount, short reason)
 	WFIFOW(fd,4)=n+2;
 	WFIFOW(fd,6)=amount;
 	WFIFOSET(fd,packet_len(0x7fa));
-#endif
-}
 
+}
 
 // Simplifies inventory/cart/storage packets by handling the packet section relevant to items. [Skotlex]
 // Equip is >= 0 for equippable items (holds the equip-point, is 0 for pet 
@@ -2264,17 +2179,9 @@ void clif_inventorylist(struct map_session_data *sd)
 	int i,n,ne,arrow=-1;
 	unsigned char *buf;
 	unsigned char *bufe;
-
-#if PACKETVER < 5
-	const int s = 10; //Entry size.
-#elif PACKETVER < 20080102
-	const int s = 18;
-#else
 	const int s = 22;
-#endif
-#if PACKETVER < 20071002
-	const int se = 20;
-#elif PACKETVER < 20100629
+	
+#if PACKETVER < 20100629
 	const int se = 26;
 #else
 	const int se = 28;
@@ -2293,10 +2200,8 @@ void clif_inventorylist(struct map_session_data *sd)
 			WBUFW(bufe,ne*se+4)=i+2;
 			clif_item_sub(bufe, ne*se+6, &sd->status.inventory[i], sd->inventory_data[i], pc_equippoint(sd,i));
 			clif_addcards(WBUFP(bufe, ne*se+16), &sd->status.inventory[i]);
-#if PACKETVER >= 20071002
 			WBUFL(bufe,ne*se+24)=sd->status.inventory[i].expire_time;
 			WBUFW(bufe,ne*se+28)=0; //Unknown
-#endif
 #if PACKETVER >= 20100629
 			if (sd->inventory_data[i]->equip&EQP_VISIBLE)
 				WBUFW(bufe,ne*se+30)= sd->inventory_data[i]->look;
@@ -2311,24 +2216,14 @@ void clif_inventorylist(struct map_session_data *sd)
 			clif_item_sub(buf, n*s+6, &sd->status.inventory[i], sd->inventory_data[i], -2);
 			if( sd->inventory_data[i]->equip == EQP_AMMO && sd->status.inventory[i].equip )
 				arrow=i;
-#if PACKETVER >= 5
-			clif_addcards(WBUFP(buf, n*s+14), &sd->status.inventory[i]);
-#endif
-#if PACKETVER >= 20080102
-			WBUFL(buf,n*s+22)=sd->status.inventory[i].expire_time;
-#endif
-			n++;
+				clif_addcards(WBUFP(buf, n*s+14), &sd->status.inventory[i]);
+				WBUFL(buf,n*s+22)=sd->status.inventory[i].expire_time;
+				n++;
+			}
 		}
-	}
 	if( n )
 	{
-#if PACKETVER < 5
-		WBUFW(buf,0)=0xa3;
-#elif PACKETVER < 20080102
-		WBUFW(buf,0)=0x1ee;
-#else
 		WBUFW(buf,0)=0x2e8;
-#endif
 		WBUFW(buf,2)=4+n*s;
 		clif_send(buf, WBUFW(buf,2), &sd->bl, SELF);
 	}
@@ -2337,11 +2232,7 @@ void clif_inventorylist(struct map_session_data *sd)
 
 	if( ne )
 	{
-#if PACKETVER < 20071002
-		WBUFW(bufe,0)=0xa4;
-#else
 		WBUFW(bufe,0)=0x2d0;
-#endif
 		WBUFW(bufe,2)=4+ne*se;
 		clif_send(bufe, WBUFW(bufe,2), &sd->bl, SELF);
 	}
@@ -2355,9 +2246,7 @@ void clif_equiplist(struct map_session_data *sd)
 {
 	int i,n,fd = sd->fd;
 	unsigned char *buf;
-#if PACKETVER < 20071002
-	const int cmd = 20;
-#elif PACKETVER < 20100629
+#if PACKETVER < 20100629
 	const int cmd = 26;
 #else
 	const int cmd = 28;
@@ -2376,10 +2265,8 @@ void clif_equiplist(struct map_session_data *sd)
 		WBUFW(buf,n*cmd+4)=i+2;
 		clif_item_sub(buf, n*cmd+6, &sd->status.inventory[i], sd->inventory_data[i], pc_equippoint(sd,i));
 		clif_addcards(WBUFP(buf, n*cmd+16), &sd->status.inventory[i]);
-#if PACKETVER >= 20071002
 		WBUFL(buf,n*cmd+24)=sd->status.inventory[i].expire_time;
 		WBUFW(buf,n*cmd+28)=0; //Unknown
-#endif
 #if PACKETVER >= 20100629
 		if (sd->inventory_data[i]->equip&EQP_VISIBLE)
 			WBUFW(buf,n*cmd+30)= sd->inventory_data[i]->look;
@@ -2389,11 +2276,7 @@ void clif_equiplist(struct map_session_data *sd)
 		n++;
 	}
 	if (n) {
-#if PACKETVER < 20071002
-		WBUFW(buf,0)=0xa4;
-#else
 		WBUFW(buf,0)=0x2d0;
-#endif
 		WBUFW(buf,2)=4+n*cmd;
 		WFIFOSET(fd,WFIFOW(fd,2));
 	}
@@ -2405,16 +2288,8 @@ void clif_storagelist(struct map_session_data* sd, struct item* items, int items
 	int i,n,ne;
 	unsigned char *buf;
 	unsigned char *bufe;
-#if PACKETVER < 5
-	const int s = 10; //Entry size.
-#elif PACKETVER < 20080102
-	const int s = 18;
-#else
 	const int s = 22;
-#endif
-#if PACKETVER < 20071002
-	const int cmd = 20;
-#elif PACKETVER < 20100629
+#if PACKETVER < 20100629
 	const int cmd = 26;
 #else
 	const int cmd = 28;
@@ -2433,44 +2308,28 @@ void clif_storagelist(struct map_session_data* sd, struct item* items, int items
 			WBUFW(bufe,ne*cmd+4)=i+1;
 			clif_item_sub(bufe, ne*cmd+6, &items[i], id, id->equip);
 			clif_addcards(WBUFP(bufe, ne*cmd+16), &items[i]);
-#if PACKETVER >= 20071002
 			WBUFL(bufe,ne*cmd+24)=items[i].expire_time;
 			WBUFW(bufe,ne*cmd+28)=0; //Unknown
-#endif
 			ne++;
 		}
 		else
 		{ //Stackable
 			WBUFW(buf,n*s+4)=i+1;
 			clif_item_sub(buf, n*s+6, &items[i], id,-1);
-#if PACKETVER >= 5
 			clif_addcards(WBUFP(buf,n*s+14), &items[i]);
-#endif
-#if PACKETVER >= 20080102
 			WBUFL(buf,n*s+22)=items[i].expire_time;
-#endif
 			n++;
 		}
 	}
 	if( n )
 	{
-#if PACKETVER < 5
-		WBUFW(buf,0)=0xa5;
-#elif PACKETVER < 20080102
-		WBUFW(buf,0)=0x1f0;
-#else
 		WBUFW(buf,0)=0x2ea;
-#endif
 		WBUFW(buf,2)=4+n*s;
 		clif_send(buf, WBUFW(buf,2), &sd->bl, SELF);
 	}
 	if( ne )
 	{
-#if PACKETVER < 20071002
-		WBUFW(bufe,0)=0xa6;
-#else
 		WBUFW(bufe,0)=0x2d1;
-#endif
 		WBUFW(bufe,2)=4+ne*cmd;
 		clif_send(bufe, WBUFW(bufe,2), &sd->bl, SELF);
 	}
@@ -2485,16 +2344,8 @@ void clif_cartlist(struct map_session_data *sd)
 	int i,n,ne;
 	unsigned char *buf;
 	unsigned char *bufe;
-#if PACKETVER < 5
-	const int s = 10; //Entry size.
-#elif PACKETVER < 20080102
-	const int s = 18;
-#else
 	const int s = 22;
-#endif
-#if PACKETVER < 20071002
-	const int cmd = 20;
-#elif PACKETVER < 20100629
+#if PACKETVER < 20100629
 	const int cmd = 26;
 #else
 	const int cmd = 28;
@@ -2513,44 +2364,28 @@ void clif_cartlist(struct map_session_data *sd)
 			WBUFW(bufe,ne*cmd+4)=i+2;
 			clif_item_sub(bufe, ne*cmd+6, &sd->status.cart[i], id, id->equip);
 			clif_addcards(WBUFP(bufe, ne*cmd+16), &sd->status.cart[i]);
-#if PACKETVER >= 20071002
 			WBUFL(bufe,ne*cmd+24)=sd->status.cart[i].expire_time;
 			WBUFW(bufe,ne*cmd+28)=0; //Unknown
-#endif
 			ne++;
 		}
 		else
 		{ //Stackable
 			WBUFW(buf,n*s+4)=i+2;
 			clif_item_sub(buf, n*s+6, &sd->status.cart[i], id,-1);
-#if PACKETVER >= 5
 			clif_addcards(WBUFP(buf,n*s+14), &sd->status.cart[i]);
-#endif
-#if PACKETVER >= 20080102
 			WBUFL(buf,n*s+22)=sd->status.cart[i].expire_time;
-#endif
 			n++;
 		}
 	}
 	if( n )
 	{
-#if PACKETVER < 5
-		WBUFW(buf,0)=0x123;
-#elif PACKETVER < 20080102
-		WBUFW(buf,0)=0x1ef;
-#else
 		WBUFW(buf,0)=0x2e9;
-#endif
 		WBUFW(buf,2)=4+n*s;
 		clif_send(buf, WBUFW(buf,2), &sd->bl, SELF);
 	}
 	if( ne )
 	{
-#if PACKETVER < 20071002
-	WBUFW(bufe,0)=0x122;
-#else
-	WBUFW(bufe,0)=0x2d2;
-#endif
+		WBUFW(bufe,0)=0x2d2;
 		WBUFW(bufe,2)=4+ne*cmd;
 		clif_send(bufe, WBUFW(bufe,2), &sd->bl, SELF);
 	}
@@ -2994,7 +2829,6 @@ void clif_changelook(struct block_list *bl,int type,int val)
 			vd->cloth_color = val;
 		break;
 		case LOOK_SHOES:
-#if PACKETVER > 3
 			if (sd) {
 				int n;
 				if((n = sd->equip_index[2]) >= 0 && sd->inventory_data[n]) {
@@ -3005,7 +2839,6 @@ void clif_changelook(struct block_list *bl,int type,int val)
 					}
 				val = 0;
 			}
-#endif
 			//Shoes? No packet uses this....
 		break;
 		case LOOK_BODY:
@@ -3025,13 +2858,6 @@ void clif_changelook(struct block_list *bl,int type,int val)
 	if( sc && sc->option&OPTION_INVISIBLE )
 		target = SELF;
 
-#if PACKETVER < 4
-	WBUFW(buf,0)=0xc3;
-	WBUFL(buf,2)=bl->id;
-	WBUFB(buf,6)=type;
-	WBUFB(buf,7)=val;
-	clif_send(buf,packet_len(0xc3),bl,target);
-#else
 	WBUFW(buf,0)=0x1d7;
 	WBUFL(buf,2)=bl->id;
 	if(type == LOOK_WEAPON || type == LOOK_SHIELD) {
@@ -3043,47 +2869,31 @@ void clif_changelook(struct block_list *bl,int type,int val)
 		WBUFL(buf,7)=val;
 	}
 	clif_send(buf,packet_len(0x1d7),bl,target);
-#endif
 }
 
 //Sends a change-base-look packet required for traps as they are triggered.
 void clif_changetraplook(struct block_list *bl,int val)
 {
 	unsigned char buf[32];
-#if PACKETVER < 4
-	WBUFW(buf,0)=0xc3;
-	WBUFL(buf,2)=bl->id;
-	WBUFB(buf,6)=LOOK_BASE;
-	WBUFB(buf,7)=val;
-	clif_send(buf,packet_len(0xc3),bl,AREA);
-#else
 	WBUFW(buf,0)=0x1d7;
 	WBUFL(buf,2)=bl->id;
 	WBUFB(buf,6)=LOOK_BASE;
 	WBUFW(buf,7)=val;
 	WBUFW(buf,9)=0;
 	clif_send(buf,packet_len(0x1d7),bl,AREA);
-#endif
 }
 
 //For the stupid cloth-dye bug. Resends the given view data to the area specified by bl.
 void clif_refreshlook(struct block_list *bl,int id,int type,int val,enum send_target target)
 {
 	unsigned char buf[32];
-#if PACKETVER < 4
-	WBUFW(buf,0)=0xc3;
-	WBUFL(buf,2)=id;
-	WBUFB(buf,6)=type;
-	WBUFB(buf,7)=val;
-	clif_send(buf,packet_len(0xc3),bl,target);
-#else
 	WBUFW(buf,0)=0x1d7;
 	WBUFL(buf,2)=id;
 	WBUFB(buf,6)=type;
 	WBUFW(buf,7)=val;
 	WBUFW(buf,9)=0;
 	clif_send(buf,packet_len(0x1d7),bl,target);
-#endif
+	return;
 }
 
 
@@ -3339,7 +3149,6 @@ void clif_changeoption(struct block_list* bl)
 	if (!sc) return; //How can an option change if there's no sc?
 	sd = BL_CAST(BL_PC, bl);
 	
-#if PACKETVER >= 7
 	WBUFW(buf,0) = 0x229;
 	WBUFL(buf,2) = bl->id;
 	WBUFW(buf,6) = sc->opt1;
@@ -3355,23 +3164,6 @@ void clif_changeoption(struct block_list* bl)
 		clif_send(buf,packet_len(0x229),bl,SELF);
 	} else
 		clif_send(buf,packet_len(0x229),bl,AREA);
-#else
-	WBUFW(buf,0) = 0x119;
-	WBUFL(buf,2) = bl->id;
-	WBUFW(buf,6) = sc->opt1;
-	WBUFW(buf,8) = sc->opt2;
-	WBUFW(buf,10) = sc->option;
-	WBUFB(buf,12) = (sd)? sd->status.karma : 0;
-	if(disguised(bl)) {
-		clif_send(buf,packet_len(0x119),bl,AREA_WOS);
-		WBUFL(buf,2) = -bl->id;
-		clif_send(buf,packet_len(0x119),bl,SELF);
-		WBUFL(buf,2) = bl->id;
-		WBUFW(buf,10) = OPTION_INVISIBLE;
-		clif_send(buf,packet_len(0x119),bl,SELF);
-	} else
-		clif_send(buf,packet_len(0x119),bl,AREA);
-#endif
 }
 
 
@@ -3419,15 +3211,7 @@ void clif_useitemack(struct map_session_data *sd,int index,int amount,bool ok)
 		WFIFOSET(fd,packet_len(0xa8));
 	}
 	else {
-#if PACKETVER < 3
-		int fd=sd->fd;
-		WFIFOHEAD(fd,packet_len(0xa8));
-		WFIFOW(fd,0)=0xa8;
-		WFIFOW(fd,2)=index+2;
-		WFIFOW(fd,4)=amount;
-		WFIFOB(fd,6)=ok;
-		WFIFOSET(fd,packet_len(0xa8));
-#else
+
 		unsigned char buf[32];
 
 		WBUFW(buf,0)=0x1c8;
@@ -3440,7 +3224,6 @@ void clif_useitemack(struct map_session_data *sd,int index,int amount,bool ok)
 		WBUFW(buf,10)=amount;
 		WBUFB(buf,12)=ok;
 		clif_send(buf,packet_len(0x1c8),&sd->bl,AREA);
-#endif
 	}
 }
 
@@ -3676,13 +3459,6 @@ void clif_leavechat(struct chat_data* cd, struct map_session_data* sd, bool flag
 void clif_traderequest(struct map_session_data* sd, const char* name)
 {
 	int fd = sd->fd;
-
-#if PACKETVER < 6
-	WFIFOHEAD(fd,packet_len(0xe5));
-	WFIFOW(fd,0) = 0xe5;
-	safestrncpy((char*)WFIFOP(fd,2), name, NAME_LENGTH);
-	WFIFOSET(fd,packet_len(0xe5));
-#else
 	struct map_session_data* tsd = map_id2sd(sd->trade_partner);
 	if( !tsd ) return;
 	
@@ -3692,7 +3468,6 @@ void clif_traderequest(struct map_session_data* sd, const char* name)
 	WFIFOL(fd,26) = tsd->status.char_id;
 	WFIFOW(fd,30) = tsd->status.base_level;
 	WFIFOSET(fd,packet_len(0x1f4));
-#endif
 }
 
 
@@ -3710,7 +3485,7 @@ void clif_tradestart(struct map_session_data* sd, uint8 type)
 {
 	int fd = sd->fd;
 	struct map_session_data* tsd = map_id2sd(sd->trade_partner);
-	if( PACKETVER < 6 || !tsd ) {
+	if (!tsd) {
 		WFIFOHEAD(fd,packet_len(0xe7));
 		WFIFOW(fd,0) = 0xe7;
 		WFIFOB(fd,2) = type;
@@ -3904,18 +3679,6 @@ void clif_storageitemadded(struct map_session_data* sd, struct item* i, int inde
 	fd=sd->fd;
 	view = itemdb_viewid(i->nameid);
 
-#if PACKETVER < 5
-	WFIFOHEAD(fd,packet_len(0xf4));
-	WFIFOW(fd, 0) = 0xf4; // Storage item added
-	WFIFOW(fd, 2) = index+1; // index
-	WFIFOL(fd, 4) = amount; // amount
-	WFIFOW(fd, 8) = ( view > 0 ) ? view : i->nameid; // id
-	WFIFOB(fd,10) = i->identify; //identify flag
-	WFIFOB(fd,11) = i->attribute; // attribute
-	WFIFOB(fd,12) = i->refine; //refine
-	clif_addcards(WFIFOP(fd,13), i);
-	WFIFOSET(fd,packet_len(0xf4));
-#else
 	WFIFOHEAD(fd,packet_len(0x1c4));
 	WFIFOW(fd, 0) = 0x1c4; // Storage item added
 	WFIFOW(fd, 2) = index+1; // index
@@ -3927,7 +3690,6 @@ void clif_storageitemadded(struct map_session_data* sd, struct item* i, int inde
 	WFIFOB(fd,13) = i->refine; //refine
 	clif_addcards(WFIFOP(fd,14), i);
 	WFIFOSET(fd,packet_len(0x1c4));
-#endif
 }
 
 
@@ -4121,11 +3883,7 @@ int clif_damage(struct block_list* src, struct block_list* dst, unsigned int tic
 {
 	unsigned char buf[33];
 	struct status_change *sc;
-#if PACKETVER < 20071113
-	const int cmd = 0x8a;
-#else
 	const int cmd = 0x2e1;
-#endif
 
 	nullpo_ret(src);
 	nullpo_ret(dst);
@@ -4145,17 +3903,7 @@ int clif_damage(struct block_list* src, struct block_list* dst, unsigned int tic
 	WBUFL(buf,10)=tick;
 	WBUFL(buf,14)=sdelay;
 	WBUFL(buf,18)=ddelay;
-#if PACKETVER < 20071113
-	if (battle_config.hide_woe_damage && map_flag_gvg(src->m)) {
-		WBUFW(buf,22)=damage?div:0;
-		WBUFW(buf,27)=damage2?div:0;
-	} else {
-		WBUFW(buf,22)=min(damage, INT16_MAX);
-		WBUFW(buf,27)=damage2;
-	}
-	WBUFW(buf,24)=div;
-	WBUFB(buf,26)=type;
-#else
+
 	if (battle_config.hide_woe_damage && map_flag_gvg(src->m)) {
 		WBUFL(buf,22)=damage?div:0;
 		WBUFL(buf,29)=damage2?div:0;
@@ -4165,7 +3913,6 @@ int clif_damage(struct block_list* src, struct block_list* dst, unsigned int tic
 	}
 	WBUFW(buf,26)=div;
 	WBUFB(buf,28)=type;
-#endif
 	if(disguised(dst)) {
 		clif_send(buf,packet_len(cmd),dst,AREA_WOS);
 		WBUFL(buf,6) = -dst->id;
@@ -4177,13 +3924,8 @@ int clif_damage(struct block_list* src, struct block_list* dst, unsigned int tic
 		WBUFL(buf,2) = -src->id;
 		if (disguised(dst))
 			WBUFL(buf,6) = dst->id;
-#if PACKETVER < 20071113
-		if(damage > 0) WBUFW(buf,22) = -1;
-		if(damage2 > 0) WBUFW(buf,27) = -1;
-#else
 		if(damage > 0) WBUFL(buf,22) = -1;
 		if(damage2 > 0) WBUFL(buf,29) = -1;
-#endif
 		clif_send(buf,packet_len(cmd),src,SELF);
 	}
 	//Return adjusted can't walk delay for further processing.
@@ -4312,7 +4054,6 @@ static void clif_getareachar_skillunit(struct map_session_data *sd, struct skill
 	if( unit->group->state.guildaura )
 		return;
 
-#if PACKETVER >= 3
 	if(unit->group->unit_id==UNT_GRAFFITI)	{ // Graffiti [Valaris]
 		WFIFOHEAD(fd,packet_len(0x1c9));
 		WFIFOW(fd, 0)=0x1c9;
@@ -4327,7 +4068,6 @@ static void clif_getareachar_skillunit(struct map_session_data *sd, struct skill
 		WFIFOSET(fd,packet_len(0x1c9));
 		return;
 	}
-#endif
 	WFIFOHEAD(fd,packet_len(0x11f));
 	WFIFOW(fd, 0)=0x11f;
 	WFIFOL(fd, 2)=unit->bl.id;
@@ -4599,7 +4339,6 @@ void clif_addskill(struct map_session_data *sd, int id)
 /// 0441 <skill id>.W
 void clif_deleteskill(struct map_session_data *sd, int id)
 {
-#if PACKETVER >= 20081217
 	int fd;
 
 	nullpo_retv(sd);
@@ -4610,9 +4349,6 @@ void clif_deleteskill(struct map_session_data *sd, int id)
 	WFIFOW(fd,0) = 0x441;
 	WFIFOW(fd,2) = id;
 	WFIFOSET(fd,packet_len(0x441));
-#else
-	clif_skillinfoblock(sd);
-#endif
 }
 
 
@@ -4674,11 +4410,7 @@ void clif_skillinfo(struct map_session_data *sd,int skill, int inf)
 ///     1 = no text
 void clif_skillcasting(struct block_list* bl, int src_id, int dst_id, int dst_x, int dst_y, int skill_num, int property, int casttime)
 {
-#if PACKETVER < 20091124
-	const int cmd = 0x13e;
-#else
 	const int cmd = 0x7fb;
-#endif
 	unsigned char buf[32];
 
 	WBUFW(buf,0) = cmd;
@@ -4689,9 +4421,7 @@ void clif_skillcasting(struct block_list* bl, int src_id, int dst_id, int dst_x,
 	WBUFW(buf,14) = skill_num;
 	WBUFL(buf,16) = property<0?0:property; //Avoid sending negatives as element [Skotlex]
 	WBUFL(buf,20) = casttime;
-#if PACKETVER >= 20091124
 	WBUFB(buf,24) = 0;  // isDisposable
-#endif
 
 	if (disguised(bl)) {
 		clif_send(buf,packet_len(cmd), bl, AREA_WOS);
@@ -4777,7 +4507,6 @@ void clif_skill_fail(struct map_session_data *sd,int skill_id,enum useskill_fail
 /// 043d <skill ID>.W <tick>.L
 void clif_skill_cooldown(struct map_session_data *sd, int skillid, unsigned int tick)
 {
-#if PACKETVER>=20081112
 	int fd;
 
 	nullpo_retv(sd);
@@ -4788,7 +4517,6 @@ void clif_skill_cooldown(struct map_session_data *sd, int skillid, unsigned int
 	WFIFOW(fd,2) = skillid;
 	WFIFOL(fd,4) = tick;
 	WFIFOSET(fd,packet_len(0x43d));
-#endif
 }
 
 
@@ -4810,38 +4538,6 @@ int clif_skill_damage(struct block_list *src,struct block_list *dst,unsigned int
 			damage = damage*(sc->data[SC_HALLUCINATION]->val2) + rnd()%100;
 	}
 
-#if PACKETVER < 3
-	WBUFW(buf,0)=0x114;
-	WBUFW(buf,2)=skill_id;
-	WBUFL(buf,4)=src->id;
-	WBUFL(buf,8)=dst->id;
-	WBUFL(buf,12)=tick;
-	WBUFL(buf,16)=sdelay;
-	WBUFL(buf,20)=ddelay;
-	if (battle_config.hide_woe_damage && map_flag_gvg(src->m)) {
-		WBUFW(buf,24)=damage?div:0;
-	} else {
-		WBUFW(buf,24)=damage;
-	}
-	WBUFW(buf,26)=skill_lv;
-	WBUFW(buf,28)=div;
-	WBUFB(buf,30)=type;
-	if (disguised(dst)) {
-		clif_send(buf,packet_len(0x114),dst,AREA_WOS);
-		WBUFL(buf,8)=-dst->id;
-		clif_send(buf,packet_len(0x114),dst,SELF);
-	} else
-		clif_send(buf,packet_len(0x114),dst,AREA);
-
-	if(disguised(src)) {
-		WBUFL(buf,4)=-src->id;
-		if (disguised(dst)) 
-			WBUFL(buf,8)=dst->id;
-		if(damage > 0)
-			WBUFW(buf,24)=-1;
-		clif_send(buf,packet_len(0x114),src,SELF);
-	}
-#else
 	WBUFW(buf,0)=0x1de;
 	WBUFW(buf,2)=skill_id;
 	WBUFL(buf,4)=src->id;
@@ -4872,7 +4568,6 @@ int clif_skill_damage(struct block_list *src,struct block_list *dst,unsigned int
 			WBUFL(buf,24)=-1;
 		clif_send(buf,packet_len(0x1de),src,SELF);
 	}
-#endif
 
 	//Because the damage delay must be synced with the client, here is where the can-walk tick must be updated. [Skotlex]
 	return clif_calc_walkdelay(dst,ddelay,type,damage,div);
@@ -5008,7 +4703,6 @@ void clif_skill_setunit(struct skill_unit *unit)
 	if( unit->group->state.guildaura )
 		return;
 
-#if PACKETVER >= 3
 	if(unit->group->unit_id==UNT_GRAFFITI)	{ // Graffiti [Valaris]
 		WBUFW(buf, 0)=0x1c9;
 		WBUFL(buf, 2)=unit->bl.id;
@@ -5022,7 +4716,6 @@ void clif_skill_setunit(struct skill_unit *unit)
 		clif_send(buf,packet_len(0x1c9),&unit->bl,AREA);
 		return;
 	}
-#endif
 	WBUFW(buf, 0)=0x11f;
 	WBUFL(buf, 2)=unit->bl.id;
 	WBUFL(buf, 6)=unit->group->src_id;
@@ -5549,14 +5242,6 @@ void clif_upgrademessage(int fd, int result, int item_id)
 /// 0097 <packet len>.W <nick>.24B <isAdmin>.L <message>.?B (PACKETVER >= 20091104)
 void clif_wis_message(int fd, const char* nick, const char* mes, int mes_len)
 {
-#if PACKETVER < 20091104
-	WFIFOHEAD(fd, mes_len + NAME_LENGTH + 4);
-	WFIFOW(fd,0) = 0x97;
-	WFIFOW(fd,2) = mes_len + NAME_LENGTH + 4;
-	safestrncpy((char*)WFIFOP(fd,4), nick, NAME_LENGTH);
-	safestrncpy((char*)WFIFOP(fd,28), mes, mes_len);
-	WFIFOSET(fd,WFIFOW(fd,2));
-#else
 	WFIFOHEAD(fd, mes_len + NAME_LENGTH + 8);
 	WFIFOW(fd,0) = 0x97;
 	WFIFOW(fd,2) = mes_len + NAME_LENGTH + 8;
@@ -5565,7 +5250,6 @@ void clif_wis_message(int fd, const char* nick, const char* mes, int mes_len)
 	// TODO: WFIFOL(fd,28) = pc_get_group_level(ssd);
 	safestrncpy((char*)WFIFOP(fd,32), mes, mes_len);
 	WFIFOSET(fd,WFIFOW(fd,2));
-#endif
 }
 
 
@@ -5847,22 +5531,6 @@ void clif_cart_additem(struct map_session_data *sd,int n,int amount,int fail)
 	if(n<0 || n>=MAX_CART || sd->status.cart[n].nameid<=0)
 		return;
 
-#if PACKETVER < 5
-	WFIFOHEAD(fd,packet_len(0x124));
-	buf=WFIFOP(fd,0);
-	WBUFW(buf,0)=0x124;
-	WBUFW(buf,2)=n+2;
-	WBUFL(buf,4)=amount;
-	if((view = itemdb_viewid(sd->status.cart[n].nameid)) > 0)
-		WBUFW(buf,8)=view;
-	else
-		WBUFW(buf,8)=sd->status.cart[n].nameid;
-	WBUFB(buf,10)=sd->status.cart[n].identify;
-	WBUFB(buf,11)=sd->status.cart[n].attribute;
-	WBUFB(buf,12)=sd->status.cart[n].refine;
-	clif_addcards(WBUFP(buf,13), &sd->status.cart[n]);
-	WFIFOSET(fd,packet_len(0x124));
-#else
 	WFIFOHEAD(fd,packet_len(0x1c5));
 	buf=WFIFOP(fd,0);
 	WBUFW(buf,0)=0x1c5;
@@ -5878,7 +5546,6 @@ void clif_cart_additem(struct map_session_data *sd,int n,int amount,int fail)
 	WBUFB(buf,13)=sd->status.cart[n].refine;
 	clif_addcards(WBUFP(buf,14), &sd->status.cart[n]);
 	WFIFOSET(fd,packet_len(0x1c5));
-#endif
 }
 
 
@@ -6252,26 +5919,11 @@ void clif_party_inviteack(struct map_session_data* sd, const char* nick, int res
 	nullpo_retv(sd);
 	fd=sd->fd;
 
-#if PACKETVER < 20070904
-	if( result == 7 ) {
-		clif_displaymessage(fd, msg_txt(3));
-		return;
-	}
-#endif
-
-#if PACKETVER < 20070821
-	WFIFOHEAD(fd,packet_len(0xfd));
-	WFIFOW(fd,0) = 0xfd;
-	safestrncpy((char*)WFIFOP(fd,2),nick,NAME_LENGTH);
-	WFIFOB(fd,26) = result;
-	WFIFOSET(fd,packet_len(0xfd));
-#else
 	WFIFOHEAD(fd,packet_len(0x2c5));
 	WFIFOW(fd,0) = 0x2c5;
 	safestrncpy((char*)WFIFOP(fd,2),nick,NAME_LENGTH);
 	WFIFOL(fd,26) = result;
 	WFIFOSET(fd,packet_len(0x2c5));
-#endif
 }
 
 
@@ -6289,11 +5941,7 @@ void clif_party_inviteack(struct map_session_data* sd, const char* nick, int res
 void clif_party_option(struct party_data *p,struct map_session_data *sd,int flag)
 {
 	unsigned char buf[16];
-#if PACKETVER < 20090603
-	const int cmd = 0x101;
-#else
 	const int cmd = 0x7d8;
-#endif
 
 	nullpo_retv(p);
 
@@ -6306,10 +5954,8 @@ void clif_party_option(struct party_data *p,struct map_session_data *sd,int flag
 	if(!sd) return;
 	WBUFW(buf,0)=cmd;
 	WBUFL(buf,2)=((flag&0x01)?2:p->party.exp);
-#if PACKETVER >= 20090603
 	WBUFB(buf,6)=(p->party.item&1)?1:0;
 	WBUFB(buf,7)=(p->party.item&2)?1:0;
-#endif
 	if(flag==0)
 		clif_send(buf,packet_len(cmd),&sd->bl,PARTY);
 	else
@@ -6623,9 +6269,7 @@ void clif_send_petstatus(struct map_session_data *sd)
 	WFIFOW(fd,29)=pet->hungry;
 	WFIFOW(fd,31)=pet->intimate;
 	WFIFOW(fd,33)=pet->equip;
-#if PACKETVER >= 20081126
 	WFIFOW(fd,35)=pet->class_;
-#endif
 	WFIFOSET(fd,packet_len(0x1a2));
 }
 
@@ -8920,18 +8564,13 @@ void clif_parse_WantToConnection(int fd, TBL_PC* sd)
 
 	pc_setnewpc(sd, account_id, char_id, login_id1, client_tick, sex, fd);
 
-#if PACKETVER < 20070521
-	WFIFOHEAD(fd,4);
-	WFIFOL(fd,0) = sd->bl.id;
-	WFIFOSET(fd,4);
-#else
 	WFIFOHEAD(fd,packet_len(0x283));
 	WFIFOW(fd,0) = 0x283;
 	WFIFOL(fd,2) = sd->bl.id;
 	WFIFOSET(fd,packet_len(0x283));
-#endif
 
 	chrif_authreq(sd);
+	return;
 }
 
 
@@ -8959,12 +8598,7 @@ void clif_parse_LoadEndAck(int fd,struct map_session_data *sd)
 	sd->state.warping = 0;
 
 	// look
-#if PACKETVER < 4
-	clif_changelook(&sd->bl,LOOK_WEAPON,sd->status.weapon);
-	clif_changelook(&sd->bl,LOOK_SHIELD,sd->status.shield);
-#else
 	clif_changelook(&sd->bl,LOOK_WEAPON,0);
-#endif
 
 	if(sd->vd.cloth_color)
 		clif_refreshlook(&sd->bl,sd->bl.id,LOOK_CLOTHES_COLOR,sd->vd.cloth_color,SELF);
@@ -9156,10 +8790,8 @@ void clif_parse_LoadEndAck(int fd,struct map_session_data *sd)
 
 	if( sd->state.changemap )
 	{// restore information that gets lost on map-change
-#if PACKETVER >= 20070918
 		clif_partyinvitationstate(sd);
 		clif_equipcheckbox(sd);
-#endif
 		if( (battle_config.bg_flee_penalty != 100 || battle_config.gvg_flee_penalty != 100) &&
 			(map_flag_gvg(sd->state.pmap) || map_flag_gvg(sd->bl.m) || map[sd->state.pmap].flag.battleground || map[sd->bl.m].flag.battleground) )
 			status_calc_bl(&sd->bl, SCB_FLEE); //Refresh flee penalty
@@ -9262,11 +8894,7 @@ void clif_hotkeys_send(struct map_session_data *sd) {
 #ifdef HOTKEY_SAVING
 	const int fd = sd->fd;
 	int i;
-#if PACKETVER < 20090603
-	const int cmd = 0x2b9;
-#else
-	const int cmd = 0x7d9;
-#endif
+	const int cmd = 0x07d9;
 	if (!fd) return;
 	WFIFOHEAD(fd, 2+MAX_HOTKEYS*7);
 	WFIFOW(fd, 0) = cmd;
@@ -12724,11 +12352,7 @@ void clif_parse_FriendsListReply(int fd, struct map_session_data *sd)
 
 	account_id = RFIFOL(fd,2);
 	char_id = RFIFOL(fd,6);
-#if PACKETVER < 6
 	reply = RFIFOB(fd,10);
-#else
-	reply = RFIFOL(fd,10);
-#endif
 
 	if( sd->bl.id == account_id )
 	{// adding oneself as friend
@@ -14033,11 +13657,7 @@ void clif_parse_Auction_buysell(int fd, struct map_session_data* sd)
 void clif_cashshop_show(struct map_session_data *sd, struct npc_data *nd)
 {
 	int fd,i;
-#if PACKETVER < 20070711
-	const int offset = 8;
-#else
 	const int offset = 12;
-#endif
 
 	nullpo_retv(sd);
 	nullpo_retv(nd);
@@ -14048,9 +13668,7 @@ void clif_cashshop_show(struct map_session_data *sd, struct npc_data *nd)
 	WFIFOW(fd,0) = 0x287;
 	WFIFOW(fd,2) = offset+nd->u.shop.count*11;
 	WFIFOL(fd,4) = sd->cashPoints; // Cash Points
-#if PACKETVER >= 20070711
 	WFIFOL(fd,8) = sd->kafraPoints; // Kafra Points
-#endif
 
 	for( i = 0; i < nd->u.shop.count; i++ )
 	{
@@ -14084,12 +13702,8 @@ void clif_cashshop_ack(struct map_session_data* sd, int error)
 	WFIFOHEAD(fd, packet_len(0x289));
 	WFIFOW(fd,0) = 0x289;
 	WFIFOL(fd,2) = sd->cashPoints;
-#if PACKETVER < 20070711
-	WFIFOW(fd,6) = TOW(error);
-#else
 	WFIFOL(fd,6) = sd->kafraPoints;
 	WFIFOW(fd,10) = TOW(error);
-#endif
 	WFIFOSET(fd, packet_len(0x289));
 }
 
@@ -14451,7 +14065,6 @@ void clif_quest_update_status(struct map_session_data * sd, int quest_id, bool a
 ///     3 = purple
 void clif_quest_show_event(struct map_session_data *sd, struct block_list *bl, short state, short color)
 {
-#if PACKETVER >= 20090218
 	int fd = sd->fd;
 
 	WFIFOHEAD(fd, packet_len(0x446));
@@ -14462,7 +14075,6 @@ void clif_quest_show_event(struct map_session_data *sd, struct block_list *bl, s
 	WFIFOW(fd, 10) = state;
 	WFIFOW(fd, 12) = color;
 	WFIFOSET(fd, packet_len(0x446));
-#endif
 }
 
 
@@ -14971,7 +14583,6 @@ void clif_instance_leave(int fd)
 /// 02b8 <account id>.L <name id>.W <identified>.B <damaged>.B <refine>.B <card1>.W <card2>.W <card3>.W <card4>.W <equip location>.W <item type>.B
 void clif_party_show_picker(struct map_session_data * sd, struct item * item_data)
 {
-#if PACKETVER >= 20071002
 	unsigned char buf[22];
 	struct item_data* id = itemdb_search(item_data->nameid);
 
@@ -14985,7 +14596,6 @@ void clif_party_show_picker(struct map_session_data * sd, struct item * item_dat
 	WBUFW(buf,19) = id->equip; // equip location
 	WBUFB(buf,21) = itemtype(id->type); // item type
 	clif_send(buf, packet_len(0x2b8), &sd->bl, PARTY_SAMEMAP_WOS);
-#endif
 }
 
 
@@ -16022,20 +15632,8 @@ static int packetdb_readdb(void)
 	//#0x0040
 	    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
 	    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-#if PACKETVER <= 20081217
-	    0,  0,  0,  0, 55, 17,  3, 37, 46, -1, 23, -1,  3,110,  3,  2,
-#else
 	    0,  0,  0,  0, 55, 17,  3, 37, 46, -1, 23, -1,  3,114,  3,  2,
-#endif
-#if PACKETVER < 2
-	    3, 28, 19, 11,  3, -1,  9,  5, 52, 51, 56, 58, 41,  2,  6,  6,
-#elif PACKETVER < 20071106	// 78-7b 亀島以降 lv99エフェクト用
-	    3, 28, 19, 11,  3, -1,  9,  5, 54, 53, 58, 60, 41,  2,  6,  6,
-#elif PACKETVER <= 20081217 // change in 0x78 and 0x7c
-	    3, 28, 19, 11,  3, -1,  9,  5, 55, 53, 58, 60, 42,  2,  6,  6,
-#else
 	    3, 28, 19, 11,  3, -1,  9,  5, 55, 53, 58, 60, 44,  2,  6,  6,
-#endif
 	//#0x0080
 	    7,  3,  2,  2,  2,  5, 16, 12, 10,  7, 29,  2, -1, -1, -1,  0, // 0x8b changed to 2 (was 23)
 	    7, 22, 28,  2,  6, 30, -1, -1,  3, -1, -1,  5,  9, 17, 17,  6,
@@ -16062,16 +15660,10 @@ static int packetdb_readdb(void)
 	   14, 30, 10,  3, -1,  6,106, -1,  4,  5,  4, -1,  6,  7, -1, -1,
 	//#0x0180
 	    6,  3,106, 10, 10, 34,  0,  6,  8,  4,  4,  4, 29, -1, 10,  6,
-#if PACKETVER < 1
-	   90, 86, 24,  6, 30,102,  8,  4,  8,  4, 14, 10, -1,  6,  2,  6,
-#else	// 196 comodo以降 状態表示アイコン用
+		// 196 comodo以降 状態表示アイコン用
 	   90, 86, 24,  6, 30,102,  9,  4,  8,  4, 14, 10, -1,  6,  2,  6,
-#endif
-#if PACKETVER < 20081126
-	    3,  3, 35,  5, 11, 26, -1,  4,  4,  6, 10, 12,  6, -1,  4,  4,
-#else // 0x1a2 changed (35->37)
+		// 0x1a2 changed (35->37)
 	    3,  3, 37,  5, 11, 26, -1,  4,  4,  6, 10, 12,  6, -1,  4,  4,
-#endif
 	   11,  7, -1, 67, 12, 18,114,  6,  3,  6, 26, 26, 26, 26,  2,  3,
 	//#0x01C0,   Set 0x1d5=-1
 	    2, 14, 10, -1, 22, 22,  4,  2, 13, 97,  3,  9,  9, 30,  6, 28,
@@ -16081,11 +15673,8 @@ static int packetdb_readdb(void)
 	//#0x0200
 	   26, -1, 26, 10, 18, 26, 11, 34, 14, 36, 10,  0,  0, -1, 32, 10, // 0x20c change to 0 (was 19)
 	   22,  0, 26, 26, 42,  6,  6,  2,  2,282,282, 10, 10, -1, -1, 66,
-#if PACKETVER < 20071106
-	   10, -1, -1,  8, 10,  2,282, 18, 18, 15, 58, 57, 64,  5, 71,  5,
-#else // 0x22c changed
+	// 0x22c changed
 	   10, -1, -1,  8, 10,  2,282, 18, 18, 15, 58, 57, 65,  5, 71,  5,
-#endif
 	   12, 26,  9, 11, -1, -1, 10,  2,282, 11,  4, 36,  6, -1,  4,  2,
 	//#0x0240
 	   -1, -1, -1, -1, -1,  3,  4,  8, -1,  3, 70,  4,  8, 12,  4, 10,
@@ -16093,13 +15682,9 @@ static int packetdb_readdb(void)
 	    6,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
 	    0,  0,  0,  0,  8,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
 	//#0x0280
-#if PACKETVER < 20070711
-	    0,  0,  0,  6, 14,  0,  0, -1,  6,  8, 18,  0,  0,  0,  0,  0,
-#else
 	    0,  0,  0,  6, 14,  0,  0, -1, 10, 12, 18,  0,  0,  0,  0,  0, // 0x288, 0x289 increase by 4 (kafra points)
-#endif
-	    0,  4,  0, 70, 10,  0,  0,  0,  8,  6, 27, 80,  0, -1,  0,  0,
-	    0,  0,  8,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+	    0,  4,  0, 70,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+	    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
 	   85, -1, -1,107,  6, -1,  7,  7, 22,191,  0,  0,  0,  0,  0,  0,
 	//#0x02C0
 	    0, -1,  0,  0,  0, 30, 30,  0,  0,  3,  0, 65,  4, 71, 10,  0,
@@ -16203,19 +15788,13 @@ static int packetdb_readdb(void)
 	    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
 	//#0x07C0
 	    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-#if PACKETVER < 20090617
-	    6,  2, -1,  4,  4,  4,  4,  8,  8,254,  6,  8,  6, 54, 30, 54,
-#else // 0x7d9 changed
+	// 0x7d9 changed
 	    6,  2, -1,  4,  4,  4,  4,  8,  8,268,  6,  8,  6, 54, 30, 54,
-#endif
-	    0, 15,  8,  0,  0,  8,  8, 32, -1,  5,  0,  0,  0,  0,  0,  0,
+	    0, 15,  8,  6,  -1,  8,  8, 32, -1,  5,  0,  0,  0,  0,  0,  0,
 	    0,  0,  0,  0,  0,  0, 14, -1, -1, -1,  8, 25,  0,  0, 26,  0,
 	//#0x0800
-#if PACKETVER < 20091229
-	   -1, -1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 14, 20,
-#else // for Party booking ( PACKETVER >= 20091229 )
+	// for Party booking ( PACKETVER >= 20091229 )
 	   -1, -1, 18,  4,  8,  6,  2,  4, 14, 50, 18,  6,  2,  3, 14, 20,
-#endif
 	    3, -1,  8, -1,  86, 2,  6,  6, -1, -1,  4, 10, 10,  0,  0,  0,
 	    0,  0,  0,  0,  6,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
 	    0,  0,  0,  0,  0, -1, -1,  3,  2, 66,  5,  2, 12,  6,  0,  0,
diff --git a/src/map/pc.c b/src/map/pc.c
index 14d12ca5a..5d47f13cf 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -5356,12 +5356,10 @@ int pc_gainexp(struct map_session_data *sd, struct block_list *src, unsigned int
 		clif_updatestatus(sd,SP_JOBEXP);
 	}
 
-#if PACKETVER >= 20091027
 	if(base_exp)
 		clif_displayexp(sd, base_exp, SP_BASEEXP, quest);
 	if(job_exp)
 		clif_displayexp(sd, job_exp,  SP_JOBEXP, quest);
-#endif
 	if(sd->state.showexp) {
 		char output[256];
 		sprintf(output,
@@ -6867,13 +6865,8 @@ int pc_equiplookall(struct map_session_data *sd)
 {
 	nullpo_ret(sd);
 
-#if PACKETVER < 4
-	clif_changelook(&sd->bl,LOOK_WEAPON,sd->status.weapon);
-	clif_changelook(&sd->bl,LOOK_SHIELD,sd->status.shield);
-#else
 	clif_changelook(&sd->bl,LOOK_WEAPON,0);
 	clif_changelook(&sd->bl,LOOK_SHOES,0);
-#endif
 	clif_changelook(&sd->bl,LOOK_HEAD_BOTTOM,sd->status.head_bottom);
 	clif_changelook(&sd->bl,LOOK_HEAD_TOP,sd->status.head_top);
 	clif_changelook(&sd->bl,LOOK_HEAD_MID,sd->status.head_mid);