aboutsummaryrefslogtreecommitdiff
path: root/src/unit/inc
diff options
context:
space:
mode:
authorXavier Del Campo Romero <xavi.dcr@tutanota.com>2024-01-27 15:58:53 +0100
committerXavier Del Campo Romero <xavi.dcr@tutanota.com>2024-01-27 17:38:11 +0100
commit0aef4f319caa2572d459b18e4e994122d53abcbe (patch)
treec27f3cee65e565db4bf5f457d03190f227cccdf4 /src/unit/inc
parent39ecbd690b2327db4328123f3f9a50c8492794ad (diff)
downloadjancity-0aef4f319caa2572d459b18e4e994122d53abcbe.tar.gz
Remove resource, tech and old game resources
Diffstat (limited to 'src/unit/inc')
-rw-r--r--src/unit/inc/unit.h27
1 files changed, 2 insertions, 25 deletions
diff --git a/src/unit/inc/unit.h b/src/unit/inc/unit.h
index 5af0c3f..a200c63 100644
--- a/src/unit/inc/unit.h
+++ b/src/unit/inc/unit.h
@@ -5,8 +5,6 @@
#include <gfx.h>
#include <sfx.h>
#include <instance.h>
-#include <resource_type.h>
-#include <tech.h>
#include <unit_type.h>
#include <util.h>
#include <fixmath.h>
@@ -18,19 +16,9 @@ extern "C"
{
#endif
-struct unit_tech
-{
- enum tech_level carry;
-};
-
enum unit_state
{
- UNIT_STATE_IDLE_MOVING,
- UNIT_STATE_SHELTERED,
- UNIT_STATE_HARVESTING_WOOD,
- UNIT_STATE_HARVESTING_GOLD,
- UNIT_STATE_CARRYING,
- UNIT_STATE_ATTACKING
+ UNIT_STATE_IDLE_MOVING
};
struct unit_target
@@ -67,18 +55,7 @@ struct unit
unsigned char t, i;
} frame;
- union
- {
- struct unit_harvester
- {
- enum resource_type type;
- unsigned char carry, t;
- struct unit_target prev_target;
- } harvester;
- } us;
-
fix16_t rx, ry, tx, ty;
-
struct unit_target target;
};
@@ -97,7 +74,7 @@ bool unit_target_valid(const struct unit *u, const struct unit_target *t);
void unit_set_target(struct unit *u, const struct unit_target *t);
void unit_move_to(struct unit *u, unsigned long x, unsigned long y);
bool unit_attacked(struct instance *, instance_hp ap);
-void unit_update(const struct unit_tech *t, struct unit *u);
+void unit_update(struct unit *u);
instance_hp unit_maxhp(const struct unit *u);
const char *unit_str(const struct unit *u);