From 16ef4f83133ac1dcd5e528220a60ac70df7c13ce Mon Sep 17 00:00:00 2001
From: Tachytaenius <henryfthomson@gmail.com>
Date: Wed, 9 Nov 2022 21:42:18 +0000
Subject: [PATCH] Rename action_type_group to unit_timer_action_type_group

---
 library/include/modules/Units.h | 8 ++++----
 library/modules/Units.cpp       | 8 ++++----
 plugins/fastdwarf.cpp           | 4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/library/include/modules/Units.h b/library/include/modules/Units.h
index ba71215f5..ea0d109f5 100644
--- a/library/include/modules/Units.h
+++ b/library/include/modules/Units.h
@@ -39,7 +39,7 @@ distribution.
 #include "df/physical_attribute_type.h"
 #include "df/unit.h"
 #include "df/unit_action.h"
-#include "df/action_type_group.h"
+#include "df/unit_action_timer_type_group.h"
 
 namespace df
 {
@@ -227,11 +227,11 @@ DFHACK_EXPORT int getStressCategory(df::unit *unit);
 DFHACK_EXPORT int getStressCategoryRaw(int32_t stress_level);
 
 DFHACK_EXPORT void subtractActionTimer(df::unit *unit, int amount, df::unit_action_type affectedActionType);
-DFHACK_EXPORT void subtractActionTimerCategory(df::unit *unit, int amount, df::action_type_group affectedActionTypes);
+DFHACK_EXPORT void subtractActionTimerCategory(df::unit *unit, int amount, df::unit_action_timer_type_group affectedActionTypes);
 DFHACK_EXPORT void multiplyActionTimer(df::unit *unit, float amount, df::unit_action_type affectedActionType);
-DFHACK_EXPORT void multiplyActionTimerCategory(df::unit *unit, float amount, df::action_type_group affectedActionTypes);
+DFHACK_EXPORT void multiplyActionTimerCategory(df::unit *unit, float amount, df::unit_action_timer_type_group affectedActionTypes);
 DFHACK_EXPORT void setActionTimer(df::unit *unit, int amount, df::unit_action_type affectedActionType);
-DFHACK_EXPORT void setActionTimerCategory(df::unit *unit, int amount, df::action_type_group affectedActionTypes);
+DFHACK_EXPORT void setActionTimerCategory(df::unit *unit, int amount, df::unit_action_timer_type_group affectedActionTypes);
 
 }
 }
diff --git a/library/modules/Units.cpp b/library/modules/Units.cpp
index 58d70d01f..d4bb800af 100644
--- a/library/modules/Units.cpp
+++ b/library/modules/Units.cpp
@@ -81,7 +81,7 @@ using namespace std;
 #include "df/unit_wound.h"
 #include "df/world.h"
 #include "df/unit_action.h"
-#include "df/action_type_group.h"
+#include "df/unit_action_timer_type_group.h"
 
 using namespace DFHack;
 using namespace df::enums;
@@ -2017,7 +2017,7 @@ void Units::subtractActionTimer(df::unit *unit, int amount, df::unit_action_type
     }
 }
 
-void Units::subtractActionTimerCategory(df::unit *unit, int amount, df::action_type_group affectedActionTypes)
+void Units::subtractActionTimerCategory(df::unit *unit, int amount, df::unit_action_timer_type_group affectedActionTypes)
 {
     CHECK_NULL_POINTER(unit);
     for (auto action : unit->actions) {
@@ -2046,7 +2046,7 @@ void Units::multiplyActionTimer(df::unit *unit, float amount, df::unit_action_ty
     }
 }
 
-void Units::multiplyActionTimerCategory(df::unit *unit, float amount, df::action_type_group affectedActionTypes)
+void Units::multiplyActionTimerCategory(df::unit *unit, float amount, df::unit_action_timer_type_group affectedActionTypes)
 {
     CHECK_NULL_POINTER(unit);
     for (auto action : unit->actions) {
@@ -2075,7 +2075,7 @@ void Units::setActionTimer(df::unit *unit, int amount, df::unit_action_type affe
     }
 }
 
-void Units::setActionTimerCategory(df::unit *unit, int amount, df::action_type_group affectedActionTypes)
+void Units::setActionTimerCategory(df::unit *unit, int amount, df::unit_action_timer_type_group affectedActionTypes)
 {
     CHECK_NULL_POINTER(unit);
     for (auto action : unit->actions) {
diff --git a/plugins/fastdwarf.cpp b/plugins/fastdwarf.cpp
index ad4d6069d..073e8758f 100644
--- a/plugins/fastdwarf.cpp
+++ b/plugins/fastdwarf.cpp
@@ -12,7 +12,7 @@
 #include "df/unit_relationship_type.h"
 #include "df/units_other_id.h"
 #include "df/world.h"
-#include "df/action_type_group.h"
+#include "df/unit_action_timer_type_group.h"
 
 using std::string;
 using std::vector;
@@ -83,7 +83,7 @@ DFhackCExport command_result plugin_onupdate ( color_ostream &out )
 
         if (enable_fastdwarf)
         {
-            Units::setActionTimerCategory(unit, 1, df::action_type_group::All);
+            Units::setActionTimerCategory(unit, 1, df::unit_action_timer_type_group::All);
         }
     }
     return CR_OK;