mirror of
https://github.com/tbamud/tbamud.git
synced 2026-04-30 04:41:51 +02:00
Compare commits
13 Commits
copilot/fi
...
2e0668d4f8
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2e0668d4f8 | ||
|
|
13c6f6291c | ||
|
|
73bda79fe6 | ||
|
|
d810782392 | ||
|
|
063bd86a69 | ||
|
|
2ef139a7d4 | ||
|
|
04a99b3ebf | ||
|
|
b77f4ad3ca | ||
|
|
9343e38860 | ||
|
|
48030f3c2f | ||
|
|
83d109e7ae | ||
|
|
6566ad5164 | ||
|
|
fff58ccab3 |
2
.github/workflows/build.yml
vendored
2
.github/workflows/build.yml
vendored
@@ -3,7 +3,7 @@ name: C/C++ CI
|
||||
on:
|
||||
push:
|
||||
branches: [ "master" ]
|
||||
pull_request_target:
|
||||
pull_request:
|
||||
branches: [ "master" ]
|
||||
|
||||
permissions:
|
||||
|
||||
@@ -1024,27 +1024,17 @@ ACMD(do_mdoor)
|
||||
}
|
||||
|
||||
if ((rm = get_room(target)) == NULL) {
|
||||
mob_log(ch, "mdoor: invalid target (arg == %s)", target);
|
||||
mob_log(ch, "mdoor: invalid target");
|
||||
return;
|
||||
}
|
||||
|
||||
if ((dir = search_block(direction, dirs, FALSE)) == -1) {
|
||||
char dirs_str[256];
|
||||
int di, doff = 0;
|
||||
dirs_str[0] = '\0';
|
||||
for (di = 0; *dirs[di] != '\n'; di++)
|
||||
doff += snprintf(dirs_str + doff, sizeof(dirs_str) - doff, "%s%s", doff ? " " : "", dirs[di]);
|
||||
mob_log(ch, "mdoor: invalid direction (arg == %s) not found in: [ %s ]", direction, dirs_str);
|
||||
mob_log(ch, "mdoor: invalid direction");
|
||||
return;
|
||||
}
|
||||
|
||||
if ((fd = search_block(field, door_field, FALSE)) == -1) {
|
||||
char fields_str[256];
|
||||
int fi, foff = 0;
|
||||
fields_str[0] = '\0';
|
||||
for (fi = 0; *door_field[fi] != '\n'; fi++)
|
||||
foff += snprintf(fields_str + foff, sizeof(fields_str) - foff, "%s%s", foff ? " " : "", door_field[fi]);
|
||||
mob_log(ch, "mdoor: invalid field (arg == %s) not found in: [ %s ]", field, fields_str);
|
||||
mob_log(ch, "odoor: invalid field");
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -1091,10 +1081,8 @@ ACMD(do_mdoor)
|
||||
case 5: /* room */
|
||||
if ((to_room = real_room(atoi(value))) != NOWHERE)
|
||||
newexit->to_room = to_room;
|
||||
else {
|
||||
newexit->to_room = NOWHERE;
|
||||
mob_log(ch, "mdoor: invalid door target (arg == %s)", value);
|
||||
}
|
||||
else
|
||||
mob_log(ch, "mdoor: invalid door target");
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -625,27 +625,17 @@ static OCMD(do_odoor)
|
||||
}
|
||||
|
||||
if ((rm = get_room(target)) == NULL) {
|
||||
obj_log(obj, "odoor: invalid target (arg == %s)", target);
|
||||
obj_log(obj, "odoor: invalid target");
|
||||
return;
|
||||
}
|
||||
|
||||
if ((dir = search_block(direction, dirs, FALSE)) == -1) {
|
||||
char dirs_str[256];
|
||||
int di, doff = 0;
|
||||
dirs_str[0] = '\0';
|
||||
for (di = 0; *dirs[di] != '\n'; di++)
|
||||
doff += snprintf(dirs_str + doff, sizeof(dirs_str) - doff, "%s%s", doff ? " " : "", dirs[di]);
|
||||
obj_log(obj, "odoor: invalid direction (arg == %s) not found in: [ %s ]", direction, dirs_str);
|
||||
obj_log(obj, "odoor: invalid direction");
|
||||
return;
|
||||
}
|
||||
|
||||
if ((fd = search_block(field, door_field, FALSE)) == -1) {
|
||||
char fields_str[256];
|
||||
int fi, foff = 0;
|
||||
fields_str[0] = '\0';
|
||||
for (fi = 0; *door_field[fi] != '\n'; fi++)
|
||||
foff += snprintf(fields_str + foff, sizeof(fields_str) - foff, "%s%s", foff ? " " : "", door_field[fi]);
|
||||
obj_log(obj, "odoor: invalid field (arg == %s) not found in: [ %s ]", field, fields_str);
|
||||
obj_log(obj, "odoor: invalid field");
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -692,10 +682,8 @@ static OCMD(do_odoor)
|
||||
case 5: /* room */
|
||||
if ((to_room = real_room(atoi(value))) != NOWHERE)
|
||||
newexit->to_room = to_room;
|
||||
else {
|
||||
newexit->to_room = NOWHERE;
|
||||
obj_log(obj, "odoor: invalid door target (arg == %s)", value);
|
||||
}
|
||||
else
|
||||
obj_log(obj, "odoor: invalid door target");
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1636,13 +1636,6 @@ void var_subst(void *go, struct script_data *sc, trig_data *trig,
|
||||
int paren_count = 0;
|
||||
int dots = 0;
|
||||
|
||||
/* reject lines that would overflow our fixed-size buffers */
|
||||
if (strnlen(line, MAX_INPUT_LENGTH) >= MAX_INPUT_LENGTH) {
|
||||
script_log("Trigger VNum %d: variable substitution line too long, ignoring.", GET_TRIG_VNUM(trig));
|
||||
*buf = '\0';
|
||||
return;
|
||||
}
|
||||
|
||||
/* skip out if no %'s */
|
||||
if (!strchr(line, '%')) {
|
||||
strcpy(buf, line);
|
||||
|
||||
@@ -224,27 +224,17 @@ WCMD(do_wdoor)
|
||||
}
|
||||
|
||||
if ((rm = get_room(target)) == NULL) {
|
||||
wld_log(room, "wdoor: invalid target (arg == %s)", target);
|
||||
wld_log(room, "wdoor: invalid target");
|
||||
return;
|
||||
}
|
||||
|
||||
if ((dir = search_block(direction, dirs, FALSE)) == -1) {
|
||||
char dirs_str[256];
|
||||
int di, doff = 0;
|
||||
dirs_str[0] = '\0';
|
||||
for (di = 0; *dirs[di] != '\n'; di++)
|
||||
doff += snprintf(dirs_str + doff, sizeof(dirs_str) - doff, "%s%s", doff ? " " : "", dirs[di]);
|
||||
wld_log(room, "wdoor: invalid direction (arg == %s) not found in: [ %s ]", direction, dirs_str);
|
||||
wld_log(room, "wdoor: invalid direction");
|
||||
return;
|
||||
}
|
||||
|
||||
if ((fd = search_block(field, door_field, FALSE)) == -1) {
|
||||
char fields_str[256];
|
||||
int fi, foff = 0;
|
||||
fields_str[0] = '\0';
|
||||
for (fi = 0; *door_field[fi] != '\n'; fi++)
|
||||
foff += snprintf(fields_str + foff, sizeof(fields_str) - foff, "%s%s", foff ? " " : "", door_field[fi]);
|
||||
wld_log(room, "wdoor: invalid field (arg == %s) not found in: [ %s ]", field, fields_str);
|
||||
wld_log(room, "wdoor: invalid field");
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -291,10 +281,8 @@ WCMD(do_wdoor)
|
||||
case 5: /* room */
|
||||
if ((to_room = real_room(atoi(value))) != NOWHERE)
|
||||
newexit->to_room = to_room;
|
||||
else {
|
||||
newexit->to_room = NOWHERE;
|
||||
wld_log(room, "wdoor: invalid door target (arg == %s)", value);
|
||||
}
|
||||
else
|
||||
wld_log(room, "wdoor: invalid door target");
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user