Bläddra i källkod

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://svn.code.sf.net/p/rathena/svn/trunk@15828 54d463be-8e91-2dee-dedb-b68131a5f0ec

protimus 13 år sedan
förälder
incheckning
d0f2568d8f
4 ändrade filer med 23 tillägg och 411 borttagningar
  1. 0 7
      src/char/char.c
  2. 2 20
      src/common/mmo.h
  3. 21 377
      src/map/clif.c
  4. 0 7
      src/map/pc.c

+ 0 - 7
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;

+ 2 - 20
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

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 21 - 377
src/map/clif.c


+ 0 - 7
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);

Vissa filer visades inte eftersom för många filer har ändrats