missing shift for distance check

src/game.c

@@ -84,7 +84,7 @@ void game(void) {
     enum SPRITE_ROT rot = 0;
     enum ACCELERATION prev_acc = 0xFF; // so we draw the ship on the first frame
     uint8_t ship_hiwater = 0;
-    uint8_t health = HEALTH_MAX;
+    uint16_t health = HEALTH_MAX;
     uint16_t power = POWER_MAX;
 
     obj_init();
@@ -152,7 +152,6 @@ void game(void) {
             }
         }
 
-        // TODO
         uint8_t damage = obj_act(&spd_x, &spd_y);
         if (health > damage) {
             health -= damage;
@@ -219,7 +218,7 @@ void game(void) {
         }
 
         obj_draw(spd_x, spd_y, &hiwater);
-        status(health, power >> POWER_SHIFT, &hiwater);
+        status(health >> HEALTH_SHIFT, power >> POWER_SHIFT, &hiwater);
 
         hide_sprites_range(hiwater, MAX_HARDWARE_SPRITES);
 

src/game.h

@@ -35,7 +35,8 @@
 #define POWER_INC 2
 #define POWER_DEC 4
 
-#define HEALTH_MAX 0xFF
+#define HEALTH_MAX 0x1FF
+#define HEALTH_SHIFT 1
 
 #define SHOT_SPEED 23
 

src/obj.c

@@ -56,6 +56,11 @@
 
 #define MAX_TRAVEL 32
 
+#define GRAVITY_RANGE (32 << POS_SCALE_OBJS)
+#define GRAVITY_SHIFT (POS_SCALE_OBJS + 4)
+#define DAMAGE_RANGE (16 << POS_SCALE_OBJS)
+#define DAMAGE_INC 3
+
 struct obj {
     uint8_t active;
     enum SPRITES sprite;
@@ -117,9 +122,6 @@ enum OBJ_STATE obj_add(enum SPRITES sprite, int16_t off_x, int16_t off_y, int16_
     return OBJ_ADDED;
 }
 
-#define GRAVITY_RANGE (32 << POS_SCALE_OBJS)
-#define GRAVITY_SHIFT (POS_SCALE_OBJS + 4)
-
 uint8_t obj_act(int16_t *spd_off_x, int16_t *spd_off_y) {
     uint8_t damage = 0;
 
@@ -143,8 +145,8 @@ uint8_t obj_act(int16_t *spd_off_x, int16_t *spd_off_y) {
                     }
                 }
 
-                if ((abs(objs[i].off_x) <= 32) && (abs(objs[i].off_y) <= 32)) {
-                    damage += 64;
+                if ((abs(objs[i].off_x) <= DAMAGE_RANGE) && (abs(objs[i].off_y) <= DAMAGE_RANGE)) {
+                    damage += DAMAGE_INC;
                 }
             } break;