defs: Added new actor def

diff --git a/src/defs.s b/src/defs.s
index 65c37811154c36306473b4be4e2738fb01752396..4f43bbd1dda59caed64311df19189ea4e928106f 100644 (file)
--- a/src/defs.s
+++ b/src/defs.s
@@ -59,22 +59,38 @@
 .de st_next, 2
 .de st_size, 0
 
+
+  ; stats struct
+.se 0
+.de stat_cur, 1
+.de stat_max, 1
+.de stat_size, 0
+
+  ; actor type enum
+.se 0
+.de ACT_T_CURSOR, 1
+
   ; actor struct 
   ; actor structs are basically just states
 .se 0
   ; copy of current state
 .de act_state, st_size
+.de act_type, 1
+  ; stats
+.de act_hp, stat_size
+.de act_atk, stat_size
+.de act_shield, stat_size
+.de act_moves, stat_size ; moves for each turn
+.de act_init, 1 ; initiative value
+
+.de act_melee, 2 ; melee weapon routine
+.de act_ranged, 2 ; ranged weapon routine
+
   ; custom parameter
 .de act_p0, 1
 .de act_size, 0
-
-  ; building selection
-.se 0
-.de BT_ROAD, 1
-.de BT_WAREHOUSE, 1
-.de BT_FARM, 1
-.de BT_LUMBER, 1
-
+  
+  ; max bge queue size
 #define BGE_MAX 64
 
   ; max bg updates per frame

diff --git a/src/macros.inc b/src/macros.inc
index b618c749deedc902d99a58359fec9d71d199968b..caa533a8bf699d3dfc7fc515b34e61f390426464 100644 (file)
--- a/src/macros.inc
+++ b/src/macros.inc
@@ -134,16 +134,6 @@
   dw $3
 #endmacro
 
-  ; defines a new cell template
-  ; inputs:
-  ;   $1: c_time
-  ;   $2: c_st_routine
-  ;   $3: c_flags
-#macro c_def
-  .db $1
-  dw $2
-  .db $3
-#endmacro
 
   ; loads NULL into a 16 bit register
   ; inputs: