* Some cleaning here and there.

- Fixed a typo in basejob_baseclass_upper sample script (since r3893).
- Fixed (for sake of consistency) usage of 'sd' before corresponding nullpo check in party_invite (bugreport:2752).
- Fixed atcommand config reading would not cap level for charcommands, when using atcommand level as fallback (bugreport:2961, since r13409).
- Removed orphaned clif_mob_hp declaration from clif.h (bugreport:2788, since r2092).
- Removed unnecessary look-up in itemdb_available macro, as dummy_item is considered unavailable.
- Removed leftover shortlist linked-list struct (followup to r10507).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14680 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
ai4rei 2011-01-23 18:07:00 +00:00
parent 2d495bd0f2
commit dd4a090c69
7 changed files with 13 additions and 13 deletions

View File

@ -1,5 +1,13 @@
Date Added
2011/01/23
* Some cleaning here and there. [Ai4rei]
- Fixed a typo in basejob_baseclass_upper sample script (since r3893).
- Fixed (for sake of consistency) usage of 'sd' before corresponding nullpo check in party_invite (bugreport:2752).
- Fixed atcommand config reading would not cap level for charcommands, when using atcommand level as fallback (bugreport:2961, since r13409).
- Removed orphaned clif_mob_hp declaration from clif.h (bugreport:2788, since r2092).
- Removed unnecessary look-up in itemdb_available macro, as dummy_item is considered unavailable.
- Removed leftover shortlist linked-list struct (followup to r10507).
2011/01/19
* Fixed solo dance/star gladiator warm AoE no longer following the owner and cloaking wall rules no longer working (bugreport:4720, since r14671). [Ai4rei]
2011/01/16

View File

@ -3,6 +3,6 @@ prontera,155,177,1 script Tell Me 725,{
mes "Class: " + Class;
mes "BaseClass: " + BaseClass;
mes "BaseJob: " + BaseJob;
mes "Upper: " + Uppser;
mes "Upper: " + Upper;
close;
}

View File

@ -152,12 +152,6 @@ void set_eof(int fd);
#define SEND_SHORTLIST
#ifdef SEND_SHORTLIST
struct send_shortlist_node {
struct send_shortlist_node *next; // Next node in the linked list
struct send_shortlist_node *prev; // Previous node in the linked list
int fd; // FD that needs sending.
};
// Add a fd to the shortlist so that it'll be recognized as a fd that needs
// sending done on it.
void send_shortlist_add_fd(int fd);

View File

@ -9117,8 +9117,8 @@ int atcommand_config_read(const char* cfgName)
}
else {
p->level2 = atoi(w3);
p->level2 = cap_value(p->level2, 0, 100);
}
p->level2 = cap_value(p->level2, 0, 100);
}
else
if( strcmpi(w1, "import") == 0 )

View File

@ -461,8 +461,6 @@ int clif_friendslist_toggle_sub(struct map_session_data *sd,va_list ap);
void clif_friendslist_send(struct map_session_data *sd);
void clif_friendslist_reqack(struct map_session_data *sd, struct map_session_data *f_sd, int type);
// [Valaris]
int clif_mob_hp(struct mob_data *md);
void clif_weather(int m); // [Valaris]
int clif_specialeffect(struct block_list* bl, int type, enum send_target target); // special effects [Valaris]
void clif_specialeffect_single(struct block_list* bl, int type, int fd);

View File

@ -103,7 +103,7 @@ struct item_data* itemdb_exists(int nameid);
#define itemdb_wlv(n) itemdb_search(n)->wlv
#define itemdb_range(n) itemdb_search(n)->range
#define itemdb_slot(n) itemdb_search(n)->slot
#define itemdb_available(n) (itemdb_exists(n) && itemdb_search(n)->flag.available)
#define itemdb_available(n) (itemdb_search(n)->flag.available)
#define itemdb_viewid(n) (itemdb_search(n)->view_id)
#define itemdb_autoequip(n) (itemdb_search(n)->flag.autoequip)
const char* itemdb_typename(int type);

View File

@ -298,11 +298,11 @@ int party_recv_info(struct party *sp)
int party_invite(struct map_session_data *sd,struct map_session_data *tsd)
{
struct party_data *p=party_search(sd->status.party_id);
struct party_data *p;
int i,flag=0;
nullpo_ret(sd);
if( p == NULL )
if( ( p = party_search(sd->status.party_id) ) == NULL )
return 0;
if( tsd == NULL) { //TODO: Find the correct reply packet.
clif_displaymessage(sd->fd, msg_txt(3));