mirror of
https://github.com/tbamud/tbamud.git
synced 2025-12-23 02:30:13 +01:00
Just a grammar fix to the rent message
This commit is contained in:
parent
46f52f3373
commit
c0c1b00235
3 changed files with 13 additions and 3 deletions
|
|
@ -347,6 +347,11 @@ ACMD(do_rescue)
|
||||||
for (tmp_ch = world[IN_ROOM(ch)].people; tmp_ch &&
|
for (tmp_ch = world[IN_ROOM(ch)].people; tmp_ch &&
|
||||||
(FIGHTING(tmp_ch) != vict); tmp_ch = tmp_ch->next_in_room);
|
(FIGHTING(tmp_ch) != vict); tmp_ch = tmp_ch->next_in_room);
|
||||||
|
|
||||||
|
if ((FIGHTING(ch) == FIGHTING(vict)) && (FIGHTING(tmp_ch) == ch)) {
|
||||||
|
send_to_char(ch, "You have already rescued %s from %s.\r\n", GET_NAME(vict), GET_NAME(FIGHTING(ch)));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (!tmp_ch) {
|
if (!tmp_ch) {
|
||||||
act("But nobody is fighting $M!", FALSE, ch, 0, vict, TO_CHAR);
|
act("But nobody is fighting $M!", FALSE, ch, 0, vict, TO_CHAR);
|
||||||
return;
|
return;
|
||||||
|
|
|
||||||
|
|
@ -16,13 +16,14 @@
|
||||||
#include "genmob.h"
|
#include "genmob.h"
|
||||||
#include "genzon.h"
|
#include "genzon.h"
|
||||||
#include "dg_olc.h"
|
#include "dg_olc.h"
|
||||||
|
#include "quest.h"
|
||||||
|
|
||||||
/* local functions */
|
/* local functions */
|
||||||
static void extract_mobile_all(mob_vnum vnum);
|
static void extract_mobile_all(mob_vnum vnum);
|
||||||
|
|
||||||
int add_mobile(struct char_data *mob, mob_vnum vnum)
|
int add_mobile(struct char_data *mob, mob_vnum vnum)
|
||||||
{
|
{
|
||||||
int rnum, i, found = FALSE, shop, cmd_no;
|
int rnum, i, found = FALSE, shop, cmd_no, qnum;
|
||||||
zone_rnum zone;
|
zone_rnum zone;
|
||||||
struct char_data *live_mob;
|
struct char_data *live_mob;
|
||||||
|
|
||||||
|
|
@ -85,6 +86,10 @@ int add_mobile(struct char_data *mob, mob_vnum vnum)
|
||||||
for (shop = 0; shop <= top_shop; shop++)
|
for (shop = 0; shop <= top_shop; shop++)
|
||||||
SHOP_KEEPER(shop) += (SHOP_KEEPER(shop) != NOTHING && SHOP_KEEPER(shop) >= found);
|
SHOP_KEEPER(shop) += (SHOP_KEEPER(shop) != NOTHING && SHOP_KEEPER(shop) >= found);
|
||||||
|
|
||||||
|
/* Update quest masters */
|
||||||
|
for (qnum = 0; qnum < total_quests; qnum++)
|
||||||
|
QST_MASTER(qnum) += (real_mobile(QST_MASTER(qnum)) >= found);
|
||||||
|
|
||||||
add_to_save_list(zone_table[real_zone_by_thing(vnum)].number, SL_MOB);
|
add_to_save_list(zone_table[real_zone_by_thing(vnum)].number, SL_MOB);
|
||||||
return found;
|
return found;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1245,8 +1245,8 @@ static int Crash_load_objs(struct char_data *ch) {
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Little hoarding check. -gg 3/1/98 */
|
/* Little hoarding check. -gg 3/1/98 */
|
||||||
mudlog(NRM, MAX(LVL_GOD, GET_INVIS_LEV(ch)), TRUE, "%s (level %d) has %d objects (max %d).",
|
mudlog(NRM, MAX(LVL_GOD, GET_INVIS_LEV(ch)), TRUE, "%s (level %d) has %d %s (max %d).",
|
||||||
GET_NAME(ch), GET_LEVEL(ch), num_objs, CONFIG_MAX_OBJ_SAVE);
|
GET_NAME(ch), GET_LEVEL(ch), num_objs, num_objs > 1 ? "objects" : "object", CONFIG_MAX_OBJ_SAVE);
|
||||||
|
|
||||||
fclose(fl);
|
fclose(fl);
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue