Browse Source

Removed RFIFOHEAD macro (#8829)

Lemongrass3110 6 months ago
parent
commit
3340cb8beb

+ 0 - 1
src/char/int_clan.cpp

@@ -184,7 +184,6 @@ static void mapif_parse_clan_member_joined( int32 fd ){
 //	1 : ok
 //	1 : ok
 //  0 : error
 //  0 : error
 int32 inter_clan_parse_frommap( int32 fd ){
 int32 inter_clan_parse_frommap( int32 fd ){
-	RFIFOHEAD(fd);
 	switch(RFIFOW(fd,0)) {
 	switch(RFIFOW(fd,0)) {
 		case 0x30A0:
 		case 0x30A0:
 			mapif_parse_clan_request( fd );
 			mapif_parse_clan_request( fd );

+ 0 - 1
src/char/int_guild.cpp

@@ -1927,7 +1927,6 @@ int32 mapif_parse_GuildEmblemVersion(int32 fd, int32 guild_id, int32 version)
 //  0 : error
 //  0 : error
 int32 inter_guild_parse_frommap(int32 fd)
 int32 inter_guild_parse_frommap(int32 fd)
 {
 {
-	RFIFOHEAD(fd);
 	switch(RFIFOW(fd,0)) {
 	switch(RFIFOW(fd,0)) {
 	case 0x3030: mapif_parse_CreateGuild(fd,RFIFOL(fd,4),RFIFOCP(fd,8),(struct guild_member *)RFIFOP(fd,32)); break;
 	case 0x3030: mapif_parse_CreateGuild(fd,RFIFOL(fd,4),RFIFOCP(fd,8),(struct guild_member *)RFIFOP(fd,32)); break;
 	case 0x3031: mapif_parse_GuildInfo(fd,RFIFOL(fd,2)); break;
 	case 0x3031: mapif_parse_GuildInfo(fd,RFIFOL(fd,2)); break;

+ 0 - 1
src/char/int_party.cpp

@@ -810,7 +810,6 @@ int32 mapif_parse_PartyShareLevel(int32 fd,uint32 share_lvl)
 //	1 : ok
 //	1 : ok
 int32 inter_party_parse_frommap(int32 fd)
 int32 inter_party_parse_frommap(int32 fd)
 {
 {
-	RFIFOHEAD(fd);
 	switch(RFIFOW(fd,0)) {
 	switch(RFIFOW(fd,0)) {
 	case 0x3020: mapif_parse_CreateParty(fd, RFIFOCP(fd,4), RFIFOB(fd,28), RFIFOB(fd,29), (struct party_member*)RFIFOP(fd,30)); break;
 	case 0x3020: mapif_parse_CreateParty(fd, RFIFOCP(fd,4), RFIFOB(fd,28), RFIFOB(fd,29), (struct party_member*)RFIFOP(fd,30)); break;
 	case 0x3021: mapif_parse_PartyInfo(fd, RFIFOL(fd,2), RFIFOL(fd,6)); break;
 	case 0x3021: mapif_parse_PartyInfo(fd, RFIFOL(fd,2), RFIFOL(fd,6)); break;

+ 0 - 6
src/char/int_pet.cpp

@@ -250,7 +250,6 @@ int32 mapif_load_pet(int32 fd, uint32 account_id, uint32 char_id, int32 pet_id){
 int32 mapif_save_pet(int32 fd, uint32 account_id, struct s_pet *data) {
 int32 mapif_save_pet(int32 fd, uint32 account_id, struct s_pet *data) {
 	//here process pet save request.
 	//here process pet save request.
 	int32 len;
 	int32 len;
-	RFIFOHEAD(fd);
 	len=RFIFOW(fd, 2);
 	len=RFIFOW(fd, 2);
 	if(sizeof(struct s_pet)!=len-8) {
 	if(sizeof(struct s_pet)!=len-8) {
 		ShowError("inter pet: data size error %" PRIuPTR " %d\n", sizeof(struct s_pet), len-8);
 		ShowError("inter pet: data size error %" PRIuPTR " %d\n", sizeof(struct s_pet), len-8);
@@ -279,32 +278,27 @@ int32 mapif_delete_pet(int32 fd, int32 pet_id){
 }
 }
 
 
 int32 mapif_parse_CreatePet(int32 fd){
 int32 mapif_parse_CreatePet(int32 fd){
-	RFIFOHEAD(fd);
 	mapif_create_pet(fd, RFIFOL(fd, 2), RFIFOL(fd, 6), RFIFOW(fd, 10), RFIFOW(fd, 12), RFIFOL(fd, 14), RFIFOL(fd, 18), RFIFOW(fd, 22),
 	mapif_create_pet(fd, RFIFOL(fd, 2), RFIFOL(fd, 6), RFIFOW(fd, 10), RFIFOW(fd, 12), RFIFOL(fd, 14), RFIFOL(fd, 18), RFIFOW(fd, 22),
 		RFIFOW(fd, 24), RFIFOB(fd, 26), RFIFOB(fd, 27), RFIFOCP(fd, 28));
 		RFIFOW(fd, 24), RFIFOB(fd, 26), RFIFOB(fd, 27), RFIFOCP(fd, 28));
 	return 0;
 	return 0;
 }
 }
 
 
 int32 mapif_parse_LoadPet(int32 fd){
 int32 mapif_parse_LoadPet(int32 fd){
-	RFIFOHEAD(fd);
 	mapif_load_pet(fd, RFIFOL(fd, 2), RFIFOL(fd, 6), RFIFOL(fd, 10));
 	mapif_load_pet(fd, RFIFOL(fd, 2), RFIFOL(fd, 6), RFIFOL(fd, 10));
 	return 0;
 	return 0;
 }
 }
 
 
 int32 mapif_parse_SavePet(int32 fd){
 int32 mapif_parse_SavePet(int32 fd){
-	RFIFOHEAD(fd);
 	mapif_save_pet(fd, RFIFOL(fd, 4), (struct s_pet *) RFIFOP(fd, 8));
 	mapif_save_pet(fd, RFIFOL(fd, 4), (struct s_pet *) RFIFOP(fd, 8));
 	return 0;
 	return 0;
 }
 }
 
 
 int32 mapif_parse_DeletePet(int32 fd){
 int32 mapif_parse_DeletePet(int32 fd){
-	RFIFOHEAD(fd);
 	mapif_delete_pet(fd, RFIFOL(fd, 2));
 	mapif_delete_pet(fd, RFIFOL(fd, 2));
 	return 0;
 	return 0;
 }
 }
 
 
 int32 inter_pet_parse_frommap(int32 fd){
 int32 inter_pet_parse_frommap(int32 fd){
-	RFIFOHEAD(fd);
 	switch(RFIFOW(fd, 0)){
 	switch(RFIFOW(fd, 0)){
 	case 0x3080: mapif_parse_CreatePet(fd); break;
 	case 0x3080: mapif_parse_CreatePet(fd); break;
 	case 0x3081: mapif_parse_LoadPet(fd); break;
 	case 0x3081: mapif_parse_LoadPet(fd); break;

+ 0 - 4
src/char/int_storage.cpp

@@ -235,7 +235,6 @@ void mapif_save_guild_storage_ack(int32 fd,uint32 account_id,int32 guild_id,int3
 
 
 void mapif_parse_LoadGuildStorage(int32 fd)
 void mapif_parse_LoadGuildStorage(int32 fd)
 {
 {
-	RFIFOHEAD(fd);
 	mapif_load_guild_storage(fd,RFIFOL(fd,2),RFIFOL(fd,6),1);
 	mapif_load_guild_storage(fd,RFIFOL(fd,2),RFIFOL(fd,6),1);
 }
 }
 
 
@@ -249,7 +248,6 @@ bool mapif_parse_SaveGuildStorage(int32 fd)
 	int32 guild_id;
 	int32 guild_id;
 	int32 len;
 	int32 len;
 
 
-	RFIFOHEAD(fd);
 	guild_id = RFIFOL(fd,8);
 	guild_id = RFIFOL(fd,8);
 	len = RFIFOW(fd,2);
 	len = RFIFOW(fd,2);
 
 
@@ -555,7 +553,6 @@ bool mapif_parse_StorageSave(int32 fd) {
 	int32 aid, cid, type;
 	int32 aid, cid, type;
 	struct s_storage stor;
 	struct s_storage stor;
 
 
-	RFIFOHEAD(fd);
 	type = RFIFOB(fd, 4);
 	type = RFIFOB(fd, 4);
 	aid = RFIFOL(fd, 5);
 	aid = RFIFOL(fd, 5);
 	cid = RFIFOL(fd, 9);
 	cid = RFIFOL(fd, 9);
@@ -587,7 +584,6 @@ bool mapif_parse_StorageSave(int32 fd) {
  *------------------------------------------*/
  *------------------------------------------*/
 bool inter_storage_parse_frommap(int32 fd)
 bool inter_storage_parse_frommap(int32 fd)
 {
 {
-	RFIFOHEAD(fd);
 	switch(RFIFOW(fd,0)){
 	switch(RFIFOW(fd,0)){
 		case 0x3018: mapif_parse_LoadGuildStorage(fd); break;
 		case 0x3018: mapif_parse_LoadGuildStorage(fd); break;
 		case 0x3019: mapif_parse_SaveGuildStorage(fd); break;
 		case 0x3019: mapif_parse_SaveGuildStorage(fd); break;

+ 0 - 1
src/common/socket.hpp

@@ -28,7 +28,6 @@
 #define FIFOSIZE_SERVERLINK 256*1024
 #define FIFOSIZE_SERVERLINK 256*1024
 
 
 // socket I/O macros
 // socket I/O macros
-#define RFIFOHEAD(fd)
 #define WFIFOHEAD( fd, size ) \
 #define WFIFOHEAD( fd, size ) \
 	do{ \
 	do{ \
 		if( ( fd ) && session[( fd )]->wdata_size + ( size ) > session[( fd )]->max_wdata ){ \
 		if( ( fd ) && session[( fd )]->wdata_size + ( size ) > session[( fd )]->max_wdata ){ \