solid.solid -> solid.ptr

diff --git a/src/game/level/boxes.c b/src/game/level/boxes.c
index 21473c360858e316c93cd418bc3c105a9c09bb5c..5f62e9c1f270dcc8dfa0245c929a32fdda7d56ba 100644 (file)
--- a/src/game/level/boxes.c
+++ b/src/game/level/boxes.c
@@ -65,7 +65,7 @@ solid_ref_t boxes_as_solid(boxes_t *boxes)
 {
     solid_ref_t ref = {
         .tag = SOLID_BOXES,
 {
     solid_ref_t ref = {
         .tag = SOLID_BOXES,

-        .solid = (void*) boxes
+        .ptr = (void*) boxes

     };
 
     return ref;
     };
 
     return ref;

diff --git a/src/game/level/platforms.c b/src/game/level/platforms.c
index a3470d60df5158c06b06ca5d3736f92e92682c20..7c5d834514f182319e3c3b72ef8c8e003155f9aa 100644 (file)
--- a/src/game/level/platforms.c
+++ b/src/game/level/platforms.c
@@ -126,7 +126,7 @@ solid_ref_t platforms_as_solid(platforms_t *platforms)
 {
     solid_ref_t ref = {
         .tag = SOLID_PLATFORMS,
 {
     solid_ref_t ref = {
         .tag = SOLID_PLATFORMS,

-        .solid = (void*)platforms
+        .ptr = (void*)platforms

     };
 
     return ref;
     };
 
     return ref;

diff --git a/src/game/level/solid.c b/src/game/level/solid.c
index 2129873ec5f62a09edfe24eeb31f7c6a4c45e5c8..1c23bd3252ddc88485e22d2d1ae12ce552077748 100644 (file)
--- a/src/game/level/solid.c
+++ b/src/game/level/solid.c
@@ -8,11 +8,11 @@ void solid_rect_object_collide(solid_ref_t solid,
 {
     switch (solid.tag) {
     case SOLID_PLATFORMS:
 {
     switch (solid.tag) {
     case SOLID_PLATFORMS:

-        platforms_rect_object_collide((platforms_t *) solid.solid, object, sides);
+        platforms_rect_object_collide((platforms_t *) solid.ptr, object, sides);

         break;
 
     case SOLID_BOXES:
         break;
 
     case SOLID_BOXES:

-        boxes_rect_object_collide((boxes_t *) solid.solid, object, sides);
+        boxes_rect_object_collide((boxes_t *) solid.ptr, object, sides);

         break;
 
     default: {}
         break;
 
     default: {}

diff --git a/src/game/level/solid.h b/src/game/level/solid.h
index 7b2992771806cc8b9f2d9d87792e4b1d0a2c94da..b239f3f618fbc71ea9dcfefff0c1b953588052a1 100644 (file)
--- a/src/game/level/solid.h
+++ b/src/game/level/solid.h
@@ -10,7 +10,7 @@ typedef enum solid_tag_t {
 
 typedef struct solid_ref_t {
     solid_tag_t tag;
 
 typedef struct solid_ref_t {
     solid_tag_t tag;

-    void *solid;
+    void *ptr;

 } solid_ref_t;
 
 void solid_rect_object_collide(solid_ref_t solid,
 } solid_ref_t;
 
 void solid_rect_object_collide(solid_ref_t solid,