* 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://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14680 54d463be-8e91-2dee-dedb-b68131a5f0ec

7 files changed, 13 insertions, 13 deletions

diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 94dbc25f5..8de8c8e88 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -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
diff --git a/doc/sample/basejob_baseclass_upper.txt b/doc/sample/basejob_baseclass_upper.txt
index d3e185894..8463a5d6e 100644
--- a/doc/sample/basejob_baseclass_upper.txt
+++ b/doc/sample/basejob_baseclass_upper.txt
@@ -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;
 }
\ No newline at end of file
diff --git a/src/common/socket.h b/src/common/socket.h
index f7309f6d3..93a5dd796 100644
--- a/src/common/socket.h
+++ b/src/common/socket.h
@@ -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);
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index 5d8062235..9d069e0c2 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -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 )
diff --git a/src/map/clif.h b/src/map/clif.h
index ded8ece30..8e9f2be7a 100644
--- a/src/map/clif.h
+++ b/src/map/clif.h
@@ -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);
diff --git a/src/map/itemdb.h b/src/map/itemdb.h
index 3fb14b2d4..b5bcb84ea 100644
--- a/src/map/itemdb.h
+++ b/src/map/itemdb.h
@@ -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);
diff --git a/src/map/party.c b/src/map/party.c
index 407221cde..9c55a05f2 100644
--- a/src/map/party.c
+++ b/src/map/party.c
@@ -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));