Harvest season of type 'season_type' instead of 'int'

CleverRaven · Apr 25, 2016 · 7b31689 · 7b31689
1 parent 200f2b5
commit 7b31689
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git a/lua/class_definitions.lua b/lua/class_definitions.lua
@@ -1425,7 +1425,7 @@ classes = {
 
         attributes = {
             close = { type = "ter_str_id", writable = true },
-            harvest_season = { type = "int", writable = true },
+            harvest_season = { type = "season_type", writable = true },
             harvestable = { type = "string", writable = true },
             name = { type = "string",  writable = false },
             open = { type = "ter_str_id", writable = true },

diff --git a/src/mapdata.cpp b/src/mapdata.cpp
@@ -8,7 +8,6 @@
 #include "output.h"
 #include "item.h"
 #include "item_group.h"
-#include "calendar.h"
 
 #include <unordered_map>
 
@@ -937,16 +936,16 @@ void ter_t::load( JsonObject &jo )
     if( jo.has_member("harvest_season") ) {
         const std::string season = jo.get_string( "harvest_season" );
 
-        if ( season == "SPRING" ) {
-            harvest_season = 0;
+        if( season == "SPRING" ) {
+            harvest_season = season_type::SPRING;
         } else if( season == "SUMMER" ) {
-            harvest_season = 1;
+            harvest_season = season_type::SUMMER;
         } else if( season == "AUTUMN" ) {
-            harvest_season = 2;
+            harvest_season = season_type::AUTUMN;
         } else if( season == "WINTER" ) {
-            harvest_season = 3;
+            harvest_season = season_type::WINTER;
         } else {
-            harvest_season = 3;
+            harvest_season = season_type::AUTUMN;
             debugmsg( "Invalid harvest season \"%s\" in \"%s\".", season.c_str(), id.c_str() );
         }
     }

diff --git a/src/mapdata.h b/src/mapdata.h
@@ -2,7 +2,7 @@
 #define MAPDATA_H
 
 #include "game_constants.h"
-#include "color.h"
+#include "calendar.h"
 #include "enums.h"
 #include "iexamine.h"
 #include "int_id.h"
@@ -259,15 +259,15 @@ struct ter_t : map_data_common_t {
 
     trap_id trap; // The id of the trap located at this terrain. Limit one trap per tile currently.
 
-    int harvest_season; // When will this terrain get harvested?
+    season_type harvest_season; // When will this terrain get harvested?
 
     ter_t() :
         open( NULL_ID ),
         close( NULL_ID ),
         transforms_into( NULL_ID ),
         roof( NULL_ID ),
         trap( tr_null ),
-        harvest_season( 0 ) {};
+        harvest_season( season_type::AUTUMN ) {};
 
     static size_t count();