Everything is now actually working and cleaner

Author: Ayidana-Aboraah

_main

@@ -51,14 +51,14 @@ int main(int argc, char *argv[])
     SDL_SetRenderDrawColor(renderer, 0, 0, 0, 255);
     SDL_RenderClear(renderer);
 
-    handleInput(&event, &running, player_inputs); //TODO: fix crashing bug here
+    handleInput(&event, player, &running, player_inputs); //TODO: fix crashing bug here
 
     if (!game_state)
     {
       UpdateTimers();
 
       handlePlayerMovement(&player[0].sprite, player_inputs); // TODO: Handle all players instead of just one
-      handleCombat(&player[0], player_inputs); // TODO: Handle all players instead of one
+      // handleCombat(&player[0], player_inputs); // TODO: Handle all players instead of one
       handleEnemies();
 
       render_game(renderer, player);

_main.c

@@ -23,17 +23,17 @@ int world_test(){
         // printf("Entity %d, indicator: %d, id: %d, sprite: %p, src: %p\n", i, arr->elements[i].indicator, arr->elements[i].id, arr->elements[i].sprite, arr->elements[i].src);
 
         // Verify that the elements in the structs match
-        assert(arr->elements[i].indicator == entity_buffer[3].indicator);
+        // assert(arr->elements[i].indicator == entity_buffer[3].indicator);
 
         assert(arr->elements[i].id == entity_buffer[3].id);
 
-        assert(arr->elements[i].sprite->w == entity_buffer[3].sprite->w);
+        assert(arr->elements[i].sprite.w == entity_buffer[3].sprite.w);
 
-        assert(arr->elements[i].sprite->h == entity_buffer[3].sprite->h);
+        assert(arr->elements[i].sprite.h == entity_buffer[3].sprite.h);
 
-        assert(arr->elements[i].sprite->x == 3.0);
+        assert(arr->elements[i].sprite.x == 3.0);
 
-        assert(arr->elements[i].sprite->y == 3.0);
+        assert(arr->elements[i].sprite.y == 3.0);
 
         assert(arr->elements[i].components != NULL);
 

tests/world_tests.h

@@ -7,11 +7,8 @@
 #define BitClear(v,n) (v & ~(1 << n))
 #define BitSet(v,n) (v | (1 << n))
 
-#define Item 0x1 // Move this to a place where we're likely to actuall place and check for this attribute
-                 // Or Move the other checks here
-
 typedef struct entity{
-    // unsigned int indicator : 4;
+    unsigned int indicator : 4;
     unsigned int id : 8;
     SDL_FRect sprite;
     SDL_Rect *src;

tools/ECS.h

@@ -24,24 +24,80 @@ void UpdateTimers() {
     }
 }
 
-void handleInput(SDL_Event *event, int *game_active, int *keyInput) {
+void handlePlayerMovement(SDL_FRect *p_sprite, int *directional_inputs) {
+  int speed = 7;
+
+  if (directional_inputs[Dash] > 0 && BitCheck(cooldowns, 0) == 0) {
+    speed = 100;
+    cooldowns = BitSet(cooldowns, 0);
+  }
+
+  p_sprite->x +=
+      (-directional_inputs[Left] + directional_inputs[Right]) * speed;
+  p_sprite->y += (-directional_inputs[Up] + directional_inputs[Down]) * speed;
+
+  // Collision
+  if (p_sprite->x < 0)
+    p_sprite->x = 0;
+  if (p_sprite->x > 948 - p_sprite->w)
+    p_sprite->x = 948 - p_sprite->w; // Screen width
+
+  if (p_sprite->y < 0)
+    p_sprite->y = 0;
+  if (p_sprite->y > 680 - p_sprite->h)
+    p_sprite->y = 680 - p_sprite->h; // Screen width
+}
+
+void handleCombat(entity *plr, unsigned char isAtk) {
+  int pPoint;
+  if (isAtk) {
+    // if (inventory[1] > 1){
+    int x, y;
+    SDL_GetMouseState(&x, &y);
+    pPoint = x + y;
+
+    inventory[1]--;
+    // printf("Inventory Seeds: %i\n", inventory[0]);
+    // }
+  } else {
+    pPoint = plr->sprite.x + plr->sprite.y + ((plr->sprite.w + plr->sprite.h) / 2);
+    cooldowns = BitSet(cooldowns, 2);
+  }
+
+  for (int i = 0; i < world.size; i++) {
+    hitbox(world.elements + i, i, plr->components[1], pPoint, atk_range);
+  }
+    printf("HP: %d\n", (int) plr->components[0]);
+}
+
+#define range 30
+void handleItems(entity *plr) {
+  
+  int pPoint = plr->sprite.x + plr->sprite.y + ((plr->sprite.w + plr->sprite.h) / 2);
+  for (int i = ITEM_BUFFER_LEN; i > -1 ; i -= 2) {
+    int iPoint = item_buffer[i].sprite.x + item_buffer[i].sprite.y + ((item_buffer[i].sprite.w + item_buffer[i].sprite.h) / 2);
+    if (abs(pPoint - iPoint) <= range){
+      add_item(inventory, Inventory_Slots, item_buffer[i].id, item_buffer[i].amount);
+      item_buffer[i] = item_buffer[item_buff_size--]; // TODO: check if this works as expectedt
+    }
+  }
+}
+
+void handleInput(SDL_Event *event, entity * plr, int *game_active, int *keyInput) {
   while (SDL_PollEvent(event))
     if (event->type == SDL_QUIT)
       *game_active = 0;
 
     else if (event->button.button == SDL_BUTTON_LEFT) {
-      if (event->type == SDL_MOUSEBUTTONDOWN && !BitCheck(cooldowns, 1))
-        handle
-        // keyInput[Atk] = 1;
-      else if (event->type == SDL_MOUSEBUTTONUP)
-        // keyInput[Atk] = 0;
+      if (event->type == SDL_MOUSEBUTTONDOWN && !BitCheck(cooldowns, 1)){
+            handleCombat(plr, 1);
+            handleItems(plr); 
+        }
     }
 
     else if (event->button.button == SDL_BUTTON_RIGHT) {
       if (event->type == SDL_MOUSEBUTTONDOWN && BitCheck(cooldowns, 2) == 0)
-        keyInput[Side] = 1;
-      else if (event->type == SDL_MOUSEBUTTONUP)
-        keyInput[Side] = 0;
+        handleCombat(plr, 0);
     }
 
     else if (event->type == SDL_KEYDOWN)
@@ -122,60 +178,3 @@ void handleInput(SDL_Event *event, int *game_active, int *keyInput) {
   // keyInput[2], keyInput[3]);
 }
 
-void handlePlayerMovement(SDL_FRect *p_sprite, int *directional_inputs) {
-  int speed = 7;
-
-  if (directional_inputs[Dash] > 0 && BitCheck(cooldowns, 0) == 0) {
-    speed = 100;
-    cooldowns = BitSet(cooldowns, 0);
-  }
-
-  p_sprite->x +=
-      (-directional_inputs[Left] + directional_inputs[Right]) * speed;
-  p_sprite->y += (-directional_inputs[Up] + directional_inputs[Down]) * speed;
-
-  // Collision
-  if (p_sprite->x < 0)
-    p_sprite->x = 0;
-  if (p_sprite->x > 948 - p_sprite->w)
-    p_sprite->x = 948 - p_sprite->w; // Screen width
-
-  if (p_sprite->y < 0)
-    p_sprite->y = 0;
-  if (p_sprite->y > 680 - p_sprite->h)
-    p_sprite->y = 680 - p_sprite->h; // Screen width
-}
-
-void handleCombat(entity *plr, unsigned char isAtk) {
-  int pPoint;
-  if (isAtk) {
-    // if (inventory[1] > 1){
-    int x, y;
-    SDL_GetMouseState(&x, &y);
-    pPoint = x + y;
-
-    inventory[1]--;
-    printf("Inventory Seeds: %i\n", inventory[0]);
-    // }
-  } else {
-    pPoint = plr->sprite.x + plr->sprite.y + ((plr->sprite.w + plr->sprite.h) / 2);
-    cooldowns = BitSet(cooldowns, 2);
-  }
-
-  for (int i = 0; i < world.size; i++) {
-    hitbox(world.elements + i, i, plr->components[1], pPoint, atk_range);
-  }
-}
-
-#define range 30
-void handleItems(entity *plr) {
-  
-  int pPoint = plr->sprite.x + plr->sprite.y + ((plr->sprite.w + plr->sprite.h) / 2);
-  for (int i = ITEM_BUFFER_LEN; i > -1 ; i -= 2) {
-    int iPoint = item_buffer[i]->sprite.x + item_buffer[i]->sprite.y + ((item_buffer[i]->sprite.w + item_buffer[i]->sprite.h) / 2);
-    if (abs(pPoint - iPoint) <= range){
-      add_item(inventory, Inventory_Slots, item_buffer[i].id, item_buffer[i].amount);
-      item_buffer[i] = item_buffer[item_buff_size--]; // TODO: check if this works as expectedt
-    }
-  }
-}

tools/Player_Systems.h

@@ -41,8 +41,11 @@ void render_game(SDL_Renderer *renderer, entity plrs[3]){
         SDL_RenderCopyF(renderer, entity_texture_atlas, world.elements[i].src, &world.elements[i].sprite);
     // SDL_RenderCopyExF(renderer, entity_atlas, world.elements[i].src, world.elements[i].sprite, 0, NULL, SDL_FLIP_NONE); // Fill in the angle(0) with a value
 
-    //TODO: Render Items
-
+    // TODO: re-enable when you add items
+    /*
+    for (int i = 0; i < item_buff_size; i++)
+        SDL_RenderCopyF(renderer, entity_texture_atlas, world.elements[i].src, &item_buffer[i].sprite);
+    */
 
     for (int i = 0; i < 1; i++) // NOTE: Change 1 -> 3
         SDL_RenderCopyF(renderer, entity_texture_atlas, plrs[i].src, &plrs[i].sprite);

tools/Rendering.h

@@ -1,3 +1,4 @@
+#pragma once
 #include <stdlib.h>
 #include <stdio.h>
 
@@ -13,7 +14,7 @@ typedef struct item{
    unsigned char id;
    unsigned char amount;
    SDL_Rect *src;
-   SDL_Frect spirte; 
+   SDL_FRect sprite; 
 }item;
 
 
@@ -54,4 +55,4 @@ void Load_Game(){
         inventory[i] = (unsigned char) fgetc(fd);
 
     fclose(fd);
-}
+}

tools/Storage_System.h

@@ -1,6 +1,6 @@
 #pragma once
 #include "ECS.h"
-#include "Systems.h"
+#include "Storage_System.h"
 
 #define Hub 0
 #define Garden 1
@@ -11,10 +11,9 @@
 unsigned char game_state = 0;
 unsigned char game_location = 0;
 
-
 entity background[50] = {};
 item item_buffer[ITEM_BUFFER_LEN] = {};
-int item_buff_size = 1;
+int item_buff_size = 0;
 
 world_array world;