Skip to content

Commit 945597d

Browse files
authored
Merge pull request #754 from wyld-sw/master
Allows {type} and {istype} to work on any object.
2 parents 052f854 + 5cb52b5 commit 945597d

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

src/mfuns2.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2282,7 +2282,7 @@ mfn_awake(MFUNARGS)
22822282
const char *
22832283
mfn_type(MFUNARGS)
22842284
{
2285-
dbref obj = mesg_dbref_local(descr, player, what, perms, argv[0], mesgtyp);
2285+
dbref obj = mesg_dbref_raw(descr, player, what, argv[0]);
22862286

22872287
/*
22882288
* TODO: This seems like its duplicated in a number of places.
@@ -2346,7 +2346,7 @@ const char *
23462346
mfn_istype(MFUNARGS)
23472347
{
23482348
dbref obj;
2349-
obj = mesg_dbref_local(descr, player, what, perms, argv[0], mesgtyp);
2349+
obj = mesg_dbref_raw(descr, player, what, argv[0]);
23502350

23512351
if (obj == NOTHING || obj == AMBIGUOUS || obj == UNKNOWN)
23522352
return (strcasecmp(argv[1], "Bad") ? "0" : "1");

win32/win32.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#define CURRENTLY_UNAVAILABLE "If you see this message, visit us at https://github.com/fuzzball-muck/fuzzball and open an issue. We'd be happy to fix it, but we would like more detail on how it is being used."
1010

1111
#define pid_t int
12+
#define sa_family_t ADDRESS_FAMILY
1213
#define socklen_t int
1314
#define ssize_t long
1415

0 commit comments

Comments
 (0)