fix cata string consts and add additional comment

CleverRaven · Apr 2, 2020 · 93b09ee · 93b09ee
1 parent 77ada21
commit 93b09ee
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/src/player_activity.cpp b/src/player_activity.cpp
@@ -4,7 +4,6 @@
 
 #include "activity_handlers.h"
 #include "activity_type.h"
-#include "cata_string_consts.h"
 #include "construction.h"
 #include "map.h"
 #include "game.h"
@@ -14,6 +13,17 @@
 #include "itype.h"
 #include "skill.h"
 
+static const activity_id ACT_FIRSTAID( "ACT_FIRSTAID" );
+static const activity_id ACT_GAME( "ACT_GAME" );
+static const activity_id ACT_PICKAXE( "ACT_PICKAXE" );
+static const activity_id ACT_START_FIRE( "ACT_START_FIRE" );
+static const activity_id ACT_HAND_CRANK( "ACT_HAND_CRANK" );
+static const activity_id ACT_VIBE( "ACT_VIBE" );
+static const activity_id ACT_OXYTORCH( "ACT_OXYTORCH" );
+static const activity_id ACT_FISH( "ACT_FISH" );
+static const activity_id ACT_ATM( "ACT_ATM" );
+static const activity_id ACT_GUNMOD_ADD( "ACT_GUNMOD_ADD" );
+
 player_activity::player_activity() : type( activity_id::NULL_ID() ) { }
 
 player_activity::player_activity( activity_id t, int turns, int Index, int pos,

diff --git a/src/player_activity.h b/src/player_activity.h
@@ -106,6 +106,7 @@ class player_activity
         void serialize( JsonOut &json ) const;
         void deserialize( JsonIn &jsin );
         // used to migrate the item indices to item_location
+        // obsolete after 0.F stable
         void migrate_item_position( Character &guy );
         /** Convert from the old enumeration to the new string_id */
         void deserialize_legacy_type( int legacy_type, activity_id &dest );