summaryrefslogtreecommitdiff
path: root/src/map/pc.c
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-12-25 23:37:23 +0300
committerAndrei Karas <akaras@inbox.ru>2014-12-31 23:07:45 +0300
commit0cb157c95e3c3af13af1f1f4294bf38c414fc7ab (patch)
treec68b70c8d0e81bc826e1c2c4684d0852335e1f3c /src/map/pc.c
parentf0d5be2db32afc7b4382276ffa3c60a1354bea8e (diff)
downloadhercules-0cb157c95e3c3af13af1f1f4294bf38c414fc7ab.tar.gz
hercules-0cb157c95e3c3af13af1f1f4294bf38c414fc7ab.tar.bz2
hercules-0cb157c95e3c3af13af1f1f4294bf38c414fc7ab.tar.xz
hercules-0cb157c95e3c3af13af1f1f4294bf38c414fc7ab.zip
Remove useless checks.
Diffstat (limited to 'src/map/pc.c')
-rw-r--r--src/map/pc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/pc.c b/src/map/pc.c
index 9468a34f6..b8902d753 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -3566,7 +3566,7 @@ int pc_skill(TBL_PC* sd, int id, int level, int flag) {
uint16 index = 0;
nullpo_ret(sd);
- if( !(index = skill->get_index(id)) || skill->db[index].name == NULL) {
+ if (!(index = skill->get_index(id))) {
ShowError("pc_skill: Skill with id %d does not exist in the skill database\n", id);
return 0;
}
@@ -4859,7 +4859,7 @@ int pc_steal_item(struct map_session_data *sd,struct block_list *bl, uint16 skil
//A Rare Steal Global Announce by Lupus
if(md->db->dropitem[i].p<=battle_config.rare_drop_announce) {
char message[128];
- sprintf (message, msg_txt(542), (sd->status.name != NULL)?sd->status.name :"GM", md->db->jname, data->jname, (float)md->db->dropitem[i].p/100);
+ sprintf (message, msg_txt(542), sd->status.name, md->db->jname, data->jname, (float)md->db->dropitem[i].p / 100);
//MSG: "'%s' stole %s's %s (chance: %0.02f%%)"
intif->broadcast(message, strlen(message)+1, BC_DEFAULT);
}