From 66cce842a1afc193327c007a8879926c0f84eb91 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Wed, 5 Jul 2017 06:08:18 +0200 Subject: Rename "messages" class to "Messages" Fixes #19 --- src/game.hpp | 2 +- src/messages.cc | 10 +++++----- src/messages.hpp | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/game.hpp b/src/game.hpp index 6aaa5d47..4421d85d 100644 --- a/src/game.hpp +++ b/src/game.hpp @@ -65,7 +65,7 @@ struct Game { /** * Message buffer. */ - messages messages { 2048 }; + Messages messages { 2048 }; /** * Game edit data diff --git a/src/messages.cc b/src/messages.cc index ea80451b..071dc66e 100644 --- a/src/messages.cc +++ b/src/messages.cc @@ -5,12 +5,12 @@ #include #include -s16b messages::size() const +s16b Messages::size() const { return buffer.size(); } -message const &messages::at(int age) const +message const &Messages::at(int age) const { assert(age >= 0); assert(age < size()); @@ -22,13 +22,13 @@ message const &messages::at(int age) const return buffer.at(i); } -void messages::add(cptr msg, byte color) +void Messages::add(cptr msg, byte color) { assert(msg != nullptr); add(std::string(msg), color); } -void messages::add(std::string const &msg, byte color) +void Messages::add(std::string const &msg, byte color) { // If the message is the same as the last message, // we just increment the counter instead of adding @@ -47,7 +47,7 @@ void messages::add(std::string const &msg, byte color) buffer.push_back(message); } -void messages::add(message const &m) +void Messages::add(message const &m) { buffer.push_back(m); } diff --git a/src/messages.hpp b/src/messages.hpp index 4c6fb2d3..0443a6c8 100644 --- a/src/messages.hpp +++ b/src/messages.hpp @@ -8,7 +8,7 @@ /** * Game message buffer */ -struct messages final { +class Messages final { private: boost::circular_buffer buffer; @@ -19,7 +19,7 @@ public: * Create message buffer with space for given * number of messages. */ - explicit messages(std::size_t n) + explicit Messages(std::size_t n) : buffer(n) { } -- cgit v1.2.3