Removed all whitespace (tabs and spaces) from EOL's. How did we get so many? --Rumble

This commit is contained in:
Rumble 2007-01-23 03:07:23 +00:00
parent 49c469967a
commit a2031d64e2
79 changed files with 2851 additions and 2852 deletions

View file

@ -89,8 +89,8 @@ void mob_log(char_data *mob, const char *format, ...)
{
va_list args;
char output[MAX_STRING_LENGTH];
snprintf(output, sizeof(output), "Mob (%s, VNum %d):: %s",
snprintf(output, sizeof(output), "Mob (%s, VNum %d):: %s",
GET_SHORT(mob), GET_MOB_VNUM(mob), format);
va_start(args, format);
@ -111,7 +111,7 @@ ACMD(do_masound)
{
room_rnum was_in_room;
int door;
if (!MOB_OR_IMPL(ch))
{
send_to_char(ch, "Huh?!?\r\n");
@ -120,7 +120,7 @@ ACMD(do_masound)
if (AFF_FLAGGED(ch, AFF_CHARM))
return;
if (!*argument)
{
mob_log(ch, "masound called with no argument");
@ -128,12 +128,12 @@ ACMD(do_masound)
}
skip_spaces(&argument);
was_in_room = IN_ROOM(ch);
for (door = 0; door < NUM_OF_DIRS; door++)
{
struct room_direction_data *newexit;
if (((newexit = world[was_in_room].dir_option[door]) != NULL) &&
newexit->to_room != NOWHERE && newexit->to_room != was_in_room)
{
@ -141,7 +141,7 @@ ACMD(do_masound)
sub_write(argument, ch, TRUE, TO_ROOM);
}
}
IN_ROOM(ch) = was_in_room;
}
@ -151,7 +151,7 @@ ACMD(do_mkill)
{
char arg[MAX_INPUT_LENGTH];
char_data *victim;
if (!MOB_OR_IMPL(ch)) {
send_to_char(ch, "Huh?!?\r\n");
return;
@ -159,9 +159,9 @@ ACMD(do_mkill)
if (AFF_FLAGGED(ch, AFF_CHARM))
return;
one_argument(argument, arg);
if (!*arg) {
mob_log(ch, "mkill called with no argument");
return;
@ -191,7 +191,7 @@ ACMD(do_mkill)
mob_log(ch, "mkill: already fighting");
return;
}
hit(ch, victim, TYPE_UNDEFINED);
return;
}
@ -199,7 +199,7 @@ ACMD(do_mkill)
/*
* lets the mobile destroy an object in its inventory
* it can also destroy a worn object and it can destroy
* it can also destroy a worn object and it can destroy
* items using all.xxxxx or just plain all of them
*/
ACMD(do_mjunk)
@ -208,17 +208,17 @@ ACMD(do_mjunk)
int pos, junk_all = 0;
obj_data *obj;
obj_data *obj_next;
if (!MOB_OR_IMPL(ch)) {
send_to_char(ch, "Huh?!?\r\n");
return;
}
if (AFF_FLAGGED(ch, AFF_CHARM))
return;
one_argument(argument, arg);
if (!*arg) {
mob_log(ch, "mjunk called with no argument");
return;
@ -226,7 +226,7 @@ ACMD(do_mjunk)
if (!str_cmp(arg, "all")) junk_all = 1;
if ((find_all_dots(arg) != FIND_INDIV) && !junk_all) {
if ((find_all_dots(arg) != FIND_INDIV) && !junk_all) {
/* Thanks to Carlos Myers for fixing the line below */
if ((pos = get_obj_pos_in_equip_vis(ch, arg, NULL, ch->equipment)) >= 0) {
extract_obj(unequip_char(ch, pos));
@ -261,18 +261,18 @@ ACMD(do_mechoaround)
send_to_char(ch, "Huh?!?\r\n");
return;
}
if (AFF_FLAGGED(ch, AFF_CHARM))
return;
p = one_argument(argument, arg);
skip_spaces(&p);
if (!*arg) {
mob_log(ch, "mechoaround called with no argument");
return;
}
if (*arg == UID_CHAR) {
if (!(victim = get_char(arg))) {
mob_log(ch, "mechoaround: victim (%s) does not exist",arg);
@ -301,10 +301,10 @@ ACMD(do_msend)
if (AFF_FLAGGED(ch, AFF_CHARM))
return;
p = one_argument(argument, arg);
skip_spaces(&p);
if (!*arg) {
mob_log(ch, "msend called with no argument");
return;
@ -319,7 +319,7 @@ ACMD(do_msend)
mob_log(ch, "msend: victim (%s) does not exist",arg);
return;
}
sub_write(p, victim, TRUE, TO_CHAR);
}
@ -328,22 +328,22 @@ ACMD(do_msend)
ACMD(do_mecho)
{
char *p;
if (!MOB_OR_IMPL(ch)) {
send_to_char(ch, "Huh?!?\r\n");
return;
}
if (AFF_FLAGGED(ch, AFF_CHARM))
return;
if (!*argument) {
mob_log(ch, "mecho called with no arguments");
return;
}
p = argument;
skip_spaces(&p);
sub_write(p, ch, TRUE, TO_ROOM);
}
@ -351,7 +351,7 @@ ACMD(do_mzoneecho)
{
int zone;
char room_number[MAX_INPUT_LENGTH], buf[MAX_INPUT_LENGTH], *msg;
msg = any_one_arg(argument, room_number);
skip_spaces(&msg);
@ -361,7 +361,7 @@ ACMD(do_mzoneecho)
else if ((zone = real_zone_by_thing(atoi(room_number))) == NOWHERE)
mob_log(ch, "mzoneecho called for nonexistant zone");
else {
else {
sprintf(buf, "%s\r\n", msg);
send_to_zone(buf, zone);
}
@ -369,7 +369,7 @@ ACMD(do_mzoneecho)
/*
* lets the mobile load an item or mobile. All items
* are loaded into inventory, unless it is NO-TAKE.
* are loaded into inventory, unless it is NO-TAKE.
*/
ACMD(do_mload)
{
@ -381,7 +381,7 @@ ACMD(do_mload)
char_data *tch;
obj_data *cnt;
int pos;
if (!MOB_OR_IMPL(ch)) {
send_to_char(ch, "Huh?!?\r\n");
return;
@ -392,9 +392,9 @@ ACMD(do_mload)
if( ch->desc && GET_LEVEL(ch->desc->original) < LVL_IMPL)
return;
target = two_arguments(argument, arg1, arg2);
if (!*arg1 || !*arg2 || !is_number(arg2) || ((number = atoi(arg2)) < 0)) {
mob_log(ch, "mload: bad syntax");
return;
@ -415,7 +415,7 @@ ACMD(do_mload)
if ((mob = read_mobile(number, VIRTUAL)) == NULL) {
mob_log(ch, "mload: bad mob vnum");
return;
}
}
char_to_room(mob, rnum);
if (SCRIPT(ch)) { // it _should_ have, but it might be detached.
char buf[MAX_INPUT_LENGTH];
@ -467,7 +467,7 @@ ACMD(do_mload)
return;
}
/* neither char nor container found - just dump it in room */
obj_to_room(object, IN_ROOM(ch));
obj_to_room(object, IN_ROOM(ch));
load_otrigger(object);
return;
}
@ -487,25 +487,25 @@ ACMD(do_mpurge)
char arg[MAX_INPUT_LENGTH];
char_data *victim;
obj_data *obj;
if (!MOB_OR_IMPL(ch)) {
send_to_char(ch, "Huh?!?\r\n");
return;
}
if (AFF_FLAGGED(ch, AFF_CHARM))
return;
if (ch->desc && (GET_LEVEL(ch->desc->original) < LVL_IMPL))
return;
one_argument(argument, arg);
if (!*arg) {
/* 'purge' */
char_data *vnext;
obj_data *obj_next;
for (victim = world[IN_ROOM(ch)].people; victim; victim = vnext) {
vnext = victim->next_in_room;
if (IS_NPC(victim) && victim != ch)
@ -527,25 +527,25 @@ ACMD(do_mpurge)
if (victim == NULL) {
if (*arg == UID_CHAR)
obj = get_obj(arg);
else
else
obj = get_obj_vis(ch, arg, NULL);
if (obj) {
extract_obj(obj);
obj = NULL;
} else
} else
mob_log(ch, "mpurge: bad argument");
return;
}
if (!IS_NPC(victim)) {
mob_log(ch, "mpurge: purging a PC");
return;
}
if (victim==ch) dg_owner_purged = 1;
extract_char(victim);
}
@ -555,7 +555,7 @@ ACMD(do_mgoto)
{
char arg[MAX_INPUT_LENGTH];
room_rnum location;
if (!MOB_OR_IMPL(ch)) {
send_to_char(ch, "Huh?!?\r\n");
return;
@ -563,22 +563,22 @@ ACMD(do_mgoto)
if (AFF_FLAGGED(ch, AFF_CHARM))
return;
one_argument(argument, arg);
if (!*arg) {
mob_log(ch, "mgoto called with no argument");
return;
}
if ((location = find_target_room(ch, arg)) == NOWHERE) {
mob_log(ch, "mgoto: invalid location");
return;
}
if (FIGHTING(ch))
stop_fighting(ch);
char_from_room(ch);
char_to_room(ch, location);
enter_wtrigger(&world[IN_ROOM(ch)], ch, -1);
@ -590,32 +590,32 @@ ACMD(do_mat)
{
char arg[MAX_INPUT_LENGTH];
room_rnum location, original;
if (!MOB_OR_IMPL(ch)) {
send_to_char(ch, "Huh?!?\r\n");
return;
}
if (AFF_FLAGGED(ch, AFF_CHARM))
return;
argument = one_argument( argument, arg );
if (!*arg || !*argument) {
mob_log(ch, "mat: bad argument");
return;
}
if ((location = find_target_room(ch, arg)) == NOWHERE) {
mob_log(ch, "mat: invalid location");
return;
}
original = IN_ROOM(ch);
char_from_room(ch);
char_to_room(ch, location);
command_interpreter(ch, argument);
/*
* See if 'ch' still exists before continuing!
* Handles 'at XXXX quit' case.
@ -641,12 +641,12 @@ ACMD(do_mteleport)
send_to_char(ch, "Huh?!?\r\n");
return;
}
if (AFF_FLAGGED(ch, AFF_CHARM))
return;
argument = two_arguments(argument, arg1, arg2);
if (!*arg1 || !*arg2) {
mob_log(ch, "mteleport: bad syntax");
return;
@ -658,7 +658,7 @@ ACMD(do_mteleport)
mob_log(ch, "mteleport target is an invalid room");
return;
}
if (!str_cmp(arg1, "all")) {
if (target == IN_ROOM(ch)) {
mob_log(ch, "mteleport all target is itself");
@ -703,7 +703,7 @@ ACMD(do_mdamage) {
send_to_char(ch, "Huh?!?\r\n");
return;
}
if (AFF_FLAGGED(ch, AFF_CHARM))
return;
@ -740,24 +740,24 @@ ACMD(do_mforce)
send_to_char(ch, "Huh?!?\r\n");
return;
}
if (AFF_FLAGGED(ch, AFF_CHARM))
return;
if (ch->desc && (GET_LEVEL(ch->desc->original) < LVL_IMPL))
return;
argument = one_argument(argument, arg);
if (!*arg || !*argument) {
mob_log(ch, "mforce: bad syntax");
return;
}
if (!str_cmp(arg, "all")) {
struct descriptor_data *i;
char_data *vch;
for (i = descriptor_list; i ; i = i->next) {
if ((i->character != ch) && !i->connected &&
(IN_ROOM(i->character) == IN_ROOM(ch))) {
@ -770,7 +770,7 @@ ACMD(do_mforce)
}
} else {
char_data *victim;
if (*arg == UID_CHAR) {
if (!(victim = get_char(arg))) {
mob_log(ch, "mforce: victim (%s) does not exist",arg);
@ -780,12 +780,12 @@ ACMD(do_mforce)
mob_log(ch, "mforce: no such victim");
return;
}
if (victim == ch) {
mob_log(ch, "mforce: forcing self");
return;
}
if (valid_dg_target(victim, 0))
command_interpreter(victim, argument);
}
@ -801,20 +801,20 @@ ACMD(do_mhunt)
send_to_char(ch, "Huh?!?\r\n");
return;
}
if (AFF_FLAGGED(ch, AFF_CHARM))
return;
if (ch->desc && (GET_LEVEL(ch->desc->original) < LVL_IMPL))
return;
one_argument(argument, arg);
if (!*arg) {
mob_log(ch, "mhunt called with no argument");
return;
}
if (FIGHTING(ch)) return;
@ -828,7 +828,7 @@ ACMD(do_mhunt)
return;
}
HUNTING(ch) = victim;
}
@ -844,15 +844,15 @@ ACMD(do_mremember)
send_to_char(ch, "Huh?!?\r\n");
return;
}
if (AFF_FLAGGED(ch, AFF_CHARM))
return;
if (ch->desc && (GET_LEVEL(ch->desc->original) < LVL_IMPL))
return;
argument = one_argument(argument, arg);
if (!*arg) {
mob_log(ch, "mremember: bad syntax");
return;
@ -896,15 +896,15 @@ ACMD(do_mforget)
send_to_char(ch, "Huh?!?\r\n");
return;
}
if (AFF_FLAGGED(ch, AFF_CHARM))
return;
if (ch->desc && (GET_LEVEL(ch->desc->original) < LVL_IMPL))
return;
one_argument(argument, arg);
if (!*arg) {
mob_log(ch, "mforget: bad syntax");
return;
@ -956,15 +956,15 @@ ACMD(do_mtransform)
send_to_char(ch, "Huh?!?\r\n");
return;
}
if (AFF_FLAGGED(ch, AFF_CHARM))
return;
if (ch->desc) {
send_to_char(ch, "You've got no VNUM to return to, dummy! try 'switch'\r\n");
return;
}
one_argument(argument, arg);
if (!*arg)
@ -1071,10 +1071,10 @@ ACMD(do_mdoor)
send_to_char(ch, "Huh?!?\r\n");
return;
}
if (AFF_FLAGGED(ch, AFF_CHARM))
return;
argument = two_arguments(argument, target, direction);
value = one_argument(argument, field);
skip_spaces(&value);
@ -1083,12 +1083,12 @@ ACMD(do_mdoor)
mob_log(ch, "mdoor called with too few args");
return;
}
if ((rm = get_room(target)) == NULL) {
mob_log(ch, "mdoor: invalid target");
return;
}
if ((dir = search_block(direction, dirs, FALSE)) == -1) {
mob_log(ch, "mdoor: invalid direction");
return;
@ -1116,9 +1116,9 @@ ACMD(do_mdoor)
else {
if (!newexit) {
CREATE(newexit, struct room_direction_data, 1);
rm->dir_option[dir] = newexit;
rm->dir_option[dir] = newexit;
}
switch (fd) {
case 1: /* description */
if (newexit->general_description)
@ -1159,7 +1159,7 @@ ACMD(do_mfollow)
send_to_char(ch, "Huh?!?\r\n");
return;
}
if (AFF_FLAGGED(ch, AFF_CHARM))
return;
@ -1169,7 +1169,7 @@ ACMD(do_mfollow)
mob_log(ch, "mfollow: bad syntax");
return;
}
if (*buf == UID_CHAR) {
if (!(leader = get_char(buf))) {
mob_log(ch, "mfollow: victim (%s) does not exist", buf);
@ -1185,7 +1185,7 @@ ACMD(do_mfollow)
if (AFF_FLAGGED(ch, AFF_CHARM) && (ch->master)) /* can't override charm */
return;
/* stop following someone else first */
if (ch->master) {
@ -1195,17 +1195,17 @@ ACMD(do_mfollow)
free(k);
} else { /* locate follower who is not head of list */
for (k = ch->master->followers; k->next->follower != ch; k = k->next);
j = k->next;
k->next = j->next;
free(j);
}
ch->master = NULL;
}
if (ch == leader)
if (ch == leader)
return;
if (circle_follow(ch, leader)) {
mob_log(ch, "mfollow: Following in circles.");
return;
@ -1236,6 +1236,6 @@ ACMD(do_mrecho)
if (!*msg || !*start || !*finish || !is_number(start) || !is_number(finish))
mob_log(ch, "mrecho called with too few args");
else
else
send_to_range(atoi(start), atoi(finish), "%s\r\n", msg);
}