From: rexim <reximkut@gmail.com>
Date: Tue, 22 May 2018 05:51:00 +0000 (+0700)
Subject: solid.solid -> solid.ptr
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;ds=sidebyside;h=0679334346f20395c1bea180995c0b6c5ee3108a;p=nothing.git

solid.solid -> solid.ptr
---

diff --git a/src/game/level/boxes.c b/src/game/level/boxes.c
index 21473c36..5f62e9c1 100644
--- 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 = (void*) boxes
+        .ptr = (void*) boxes
     };
 
     return ref;
diff --git a/src/game/level/platforms.c b/src/game/level/platforms.c
index a3470d60..7c5d8345 100644
--- 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 = (void*)platforms
+        .ptr = (void*)platforms
     };
 
     return ref;
diff --git a/src/game/level/solid.c b/src/game/level/solid.c
index 2129873e..1c23bd32 100644
--- 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:
-        platforms_rect_object_collide((platforms_t *) solid.solid, object, sides);
+        platforms_rect_object_collide((platforms_t *) solid.ptr, object, sides);
         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: {}
diff --git a/src/game/level/solid.h b/src/game/level/solid.h
index 7b299277..b239f3f6 100644
--- 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;
-    void *solid;
+    void *ptr;
 } solid_ref_t;
 
 void solid_rect_object_collide(solid_ref_t solid,