Addressing Pharap code review's comments.

renato-grottesi · Sep 7, 2019 · f03c74c · f03c74c
1 parent fd53b9d
commit f03c74c
Show file tree

Hide file tree

Showing 5 changed files with 1,203 additions and 1,202 deletions.
diff --git a/lagunita/buildings.cpp b/lagunita/buildings.cpp
@@ -21,8 +21,8 @@ const Building buildings[(uint8_t)Building::IDs::count] PROGMEM = {
     // clang-format on
 };
 
-void Building::strncpyName(char dest[8]) const {
-  strncpy_P(dest, name, 8);
+__FlashStringHelper* Building::name() const {
+  return (__FlashStringHelper*)(_name);
 }
 
 const uint8_t Building::jobs() const {
@@ -53,34 +53,34 @@ const uint8_t* Building::bitmap() const {
   return pgm_read_ptr(&_bitmap);
 }
 
-void Building::strncpyName(char dest[8], const uint8_t id) {
-  buildings[(uint8_t)id].strncpyName(dest);
+__FlashStringHelper* Building::name(const uint8_t id) {
+  return buildings[id].name();
 }
 
 const uint8_t Building::jobs(const uint8_t id) {
-  return buildings[(uint8_t)id].jobs();
+  return buildings[id].jobs();
 }
 
 const uint8_t Building::cost(const uint8_t id) {
-  return buildings[(uint8_t)id].cost();
+  return buildings[id].cost();
 }
 
 const uint8_t Building::width(const uint8_t id) {
-  return buildings[(uint8_t)id].width();
+  return buildings[id].width();
 }
 
 const uint8_t Building::height(const uint8_t id) {
-  return buildings[(uint8_t)id].height();
+  return buildings[id].height();
 }
 
 const uint8_t Building::maintenance(const uint8_t id) {
-  return buildings[(uint8_t)id].maintenance();
+  return buildings[id].maintenance();
 }
 
 const uint8_t Building::profit(const uint8_t id) {
-  return buildings[(uint8_t)id].profit();
+  return buildings[id].profit();
 }
 
 const uint8_t* Building::bitmap(const uint8_t id) {
-  return buildings[(uint8_t)id].bitmap();
+  return buildings[id].bitmap();
 }
diff --git a/lagunita/buildings.hpp b/lagunita/buildings.hpp
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <avr/pgmspace.h>
 #include <stdint.h>
 #include "utility.hpp"
 
@@ -30,7 +31,7 @@ class Building {
   };
 
   /* Convenience functions for reading from PROGMEM */
-  void strncpyName(char dest[8]) const;
+  __FlashStringHelper* name() const;
   const uint8_t jobs() const;
   const uint8_t cost() const;
   const uint8_t width() const;
@@ -40,10 +41,8 @@ class Building {
   const uint8_t* bitmap() const;
 
   /* Copies the building's name from PROGMEM to the destination string. */
-  static void strncpyName(char dest[8], const uint8_t id);
-  static void strncpyName(char dest[8], IDs id) {
-    return strncpyName(dest, (uint8_t)id);
-  };
+  static __FlashStringHelper* name(const uint8_t id);
+  static __FlashStringHelper* name(IDs id) { return name((uint8_t)id); };
   /* How many jobs the building offer. */
   static const uint8_t jobs(const uint8_t id);
   static const uint8_t jobs(IDs id) { return jobs((uint8_t)id); };
@@ -68,7 +67,7 @@ class Building {
 
   static const uint8_t count() { return (uint8_t)IDs::count; }
 
-  const char name[8];
+  const char _name[8];
   const uint8_t* const _bitmap;
   const uint8_t _jobs;
   const uint8_t _cost;