mirror of
https://github.com/tbamud/tbamud.git
synced 2025-12-23 02:30:13 +01:00
Cleaned up numerous warnings found by adding -Wextra -Wcast-qual -Wshadow -Wno-unused flags. --Rumble
This commit is contained in:
parent
e8c87e82e4
commit
4f1403558a
28 changed files with 186 additions and 187 deletions
|
|
@ -378,12 +378,10 @@ ACMD(do_mload)
|
|||
return;
|
||||
}
|
||||
two_arguments(target, arg1, arg2); /* recycling ... */
|
||||
tch = (arg1 && *arg1 == UID_CHAR) ? get_char(arg1) : get_char_room_vis(ch, arg1, NULL);
|
||||
tch = (arg1 != NULL && *arg1 == UID_CHAR) ? get_char(arg1) : get_char_room_vis(ch, arg1, NULL);
|
||||
if (tch) {
|
||||
if (arg2 && *arg2 &&
|
||||
(pos = find_eq_pos_script(arg2)) >= 0 &&
|
||||
!GET_EQ(tch, pos) &&
|
||||
can_wear_on_pos(object, pos)) {
|
||||
if (arg2 != NULL && *arg2 && (pos = find_eq_pos_script(arg2)) >= 0 &&
|
||||
!GET_EQ(tch, pos) && can_wear_on_pos(object, pos)) {
|
||||
equip_char(tch, object, pos);
|
||||
load_otrigger(object);
|
||||
return;
|
||||
|
|
@ -392,7 +390,7 @@ ACMD(do_mload)
|
|||
load_otrigger(object);
|
||||
return;
|
||||
}
|
||||
cnt = (arg1 && *arg1 == UID_CHAR) ? get_obj(arg1) : get_obj_vis(ch, arg1, NULL);
|
||||
cnt = (arg1 != NULL && *arg1 == UID_CHAR) ? get_obj(arg1) : get_obj_vis(ch, arg1, NULL);
|
||||
if (cnt && GET_OBJ_TYPE(cnt) == ITEM_CONTAINER) {
|
||||
obj_to_obj(object, cnt);
|
||||
load_otrigger(object);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue