Andreas/tbamud
1
0
Fork 0
mirror of https://github.com/tbamud/tbamud.git synced 2026-01-09 02:48:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Major: Backport to rvn 241, with the addition of all previously found bug fixes.

Browse source
This commit is contained in:
Vatiken 2012-02-06 19:13:03 +00:00
parent e4cdc51eb1
commit 479dbb6cbd
86 changed files with 3771 additions and 7913 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/dg_objcmd.c
View file

@ -144,10 +144,10 @@ static OCMD(do_oecho)
else if ((room = obj_room(obj)) != NOWHERE)
{
if (world[room].people) {
sub_write(argument, world[room].people, TRUE, TO_ROOM);
sub_write(argument, world[room].people, TRUE, TO_CHAR);
}
if (world[room].people) {
sub_write(argument, world[room].people, TRUE, TO_ROOM);
sub_write(argument, world[room].people, TRUE, TO_CHAR);
}
}
else
@ -253,7 +253,7 @@ static OCMD(do_osend)
obj_log(obj, "no target found for osend");
}
/* Prints the message to everyone in the range of numbers. Thanks to Jamie
/* Prints the message to everyone in the range of numbers. Thanks to Jamie
* Nelson of 4D for this contribution. */
static OCMD(do_orecho)
{
@ -285,7 +285,7 @@ static OCMD(do_otimer)
GET_OBJ_TIMER(obj) = atoi(arg);
}
/* Transform into a different object. Note: this shouldn't be used with
/* Transform into a different object. Note: this shouldn't be used with
* containers unless both objects are containers! */
static OCMD(do_otransform)
{
@ -582,8 +582,8 @@ static OCMD(do_oasound)
(world[room].dir_option[door])->to_room != NOWHERE &&
(world[room].dir_option[door])->to_room != room &&
world[(world[room].dir_option[door])->to_room].people) {
sub_write(argument, world[(world[room].dir_option[door])->to_room].people, TRUE, TO_ROOM);
sub_write(argument, world[(world[room].dir_option[door])->to_room].people, TRUE, TO_CHAR);
sub_write(argument, world[(world[room].dir_option[door])->to_room].people, TRUE, TO_ROOM);
sub_write(argument, world[(world[room].dir_option[door])->to_room].people, TRUE, TO_CHAR);
}
}
}
@ -735,7 +735,7 @@ static OCMD(do_oat)
}
if (isdigit(*arg)) loc = real_room(atoi(arg));
else if ((ch = get_char_by_obj(obj, arg))) loc = IN_ROOM(ch);
else if ((ch = get_char_by_obj(obj, arg))) loc = IN_ROOM(ch);
if (loc == NOWHERE) {
obj_log(obj, "oat: location not found (%s)", arg);
@ -748,7 +748,7 @@ static OCMD(do_oat)
obj_to_room(object, loc);
obj_command_interpreter(object, command);
if (object->in_room == loc)
if (object->in_room == loc)
extract_obj(object);
}