From 66681c94bce73c3b04d515704a4365b3c88288de Mon Sep 17 00:00:00 2001 From: Steve Date: Thu, 12 Apr 2018 16:05:41 +0100 Subject: [PATCH] Report too many keys and items separately. --- src/defs.h | 3 ++- src/entities/items/item.c | 4 ++-- src/system/strings.c | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/defs.h b/src/defs.h index 14c3121..71547ff 100644 --- a/src/defs.h +++ b/src/defs.h @@ -395,7 +395,8 @@ enum ST_PICKED_UP, ST_REMOVED, ST_REQUIRED, - ST_CANNOT_CARRY, + ST_CANNOT_CARRY_KEYS, + ST_CANNOT_CARRY_ITEMS, ST_RESCUED, ST_JETPACK_POWER, ST_AQUALUNG_POWER, diff --git a/src/entities/items/item.c b/src/entities/items/item.c index 00c25ff..555d8ac 100644 --- a/src/entities/items/item.c +++ b/src/entities/items/item.c @@ -145,7 +145,7 @@ static void bobPickupItem(void) } else { - setGameplayMessage(MSG_GAMEPLAY, app.strings[ST_CANNOT_CARRY]); + setGameplayMessage(MSG_GAMEPLAY, app.strings[ST_CANNOT_CARRY_KEYS]); } } } @@ -165,7 +165,7 @@ static void bobPickupItem(void) } else { - setGameplayMessage(MSG_GAMEPLAY, app.strings[ST_CANNOT_CARRY]); + setGameplayMessage(MSG_GAMEPLAY, app.strings[ST_CANNOT_CARRY_ITEMS]); } } else diff --git a/src/system/strings.c b/src/system/strings.c index 2043f62..80da0a9 100644 --- a/src/system/strings.c +++ b/src/system/strings.c @@ -51,7 +51,8 @@ void initStrings(void) app.strings[ST_PICKED_UP] = _("Picked up a %s"); app.strings[ST_REMOVED] = _("%s removed"); app.strings[ST_REQUIRED] = _("%s required"); - app.strings[ST_CANNOT_CARRY] = _("Can't carry any more keys"); + app.strings[ST_CANNOT_CARRY_KEYS] = _("Can't carry any more keys"); + app.strings[ST_CANNOT_CARRY_ITEMS] = _("Can't carry any more items"); app.strings[ST_RESCUED] = _("Rescued %s"); app.strings[ST_JETPACK_POWER] = _("Not enough power for jetpack");