Mercurial > molko
changeset 60:7266c750b649
core: simplify message
| author | David Demelier <markand@malikania.fr> |
|---|---|
| date | Wed, 22 Jan 2020 12:12:11 +0100 |
| parents | 52792b863ff7 |
| children | 8d34a12484db |
| files | src/core/message.c src/core/message.h |
| diffstat | 2 files changed, 6 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/src/core/message.c Tue Jan 21 12:42:33 2020 +0100 +++ b/src/core/message.c Wed Jan 22 12:12:11 2020 +0100 @@ -36,7 +36,7 @@ msg->state = MESSAGE_OPENING; } -void +bool message_update(struct message *msg, unsigned int ticks) { assert(msg); @@ -57,6 +57,8 @@ default: break; } + + return msg->state == MESSAGE_HIDING && msg->elapsed >= MESSAGE_SPEED; } void @@ -64,6 +66,7 @@ { assert(msg); + /* TODO: draw states! */ /* TODO: more constant variables. */ struct texture *lines[3]; int x = 160; @@ -91,11 +94,3 @@ msg->elapsed = 0; } - -bool -message_is_complete(struct message *msg) -{ - assert(msg); - - return msg->state == MESSAGE_HIDING && msg->elapsed >= MESSAGE_SPEED; -}
--- a/src/core/message.h Tue Jan 21 12:42:33 2020 +0100 +++ b/src/core/message.h Wed Jan 22 12:12:11 2020 +0100 @@ -74,8 +74,9 @@ * \pre msg != NULL * \param msg the message * \param ticks the elapsed delay since last frame + * \return true if it has finished */ -void +bool message_update(struct message *msg, unsigned int ticks); /** @@ -98,13 +99,4 @@ void message_hide(struct message *msg); -/** - * Tells if the message is complete. - * - * \pre msg != NULL - * \param msg the message - */ -bool -message_is_complete(struct message *msg); - #endif /* !MOLKO_MESSAGE_H */