code: cpp casting/type fixes

zpl-c · Apr 20, 2021 · a62979c · a62979c
1 parent 072d48a
commit a62979c
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/code/header/general.h b/code/header/general.h
@@ -38,15 +38,15 @@ LIBRG_API int8_t librg_config_chunkoffset_get(librg_world *world, int16_t *x, in
 // !
 // =======================================================================//
 
-LIBRG_API int8_t            librg_event_set(librg_world *world, librg_event_type, librg_event_fn);
-LIBRG_API int8_t            librg_event_remove(librg_world *world, librg_event_type);
-
-LIBRG_API librg_event_type  librg_event_type_get(librg_world *world, librg_event *event);
-LIBRG_API int64_t           librg_event_owner_get(librg_world *world, librg_event *event);
-LIBRG_API int64_t           librg_event_entity_get(librg_world *world, librg_event *event);
-LIBRG_API char *            librg_event_buffer_get(librg_world *world, librg_event *event);
-LIBRG_API int32_t           librg_event_size_get(librg_world *world, librg_event *event);
-LIBRG_API void *            librg_event_userdata_get(librg_world *world, librg_event *event);
+LIBRG_API int8_t  librg_event_set(librg_world *world, librg_event_type, librg_event_fn);
+LIBRG_API int8_t  librg_event_remove(librg_world *world, librg_event_type);
+
+LIBRG_API int8_t  librg_event_type_get(librg_world *world, librg_event *event);
+LIBRG_API int64_t librg_event_owner_get(librg_world *world, librg_event *event);
+LIBRG_API int64_t librg_event_entity_get(librg_world *world, librg_event *event);
+LIBRG_API char *  librg_event_buffer_get(librg_world *world, librg_event *event);
+LIBRG_API int32_t librg_event_size_get(librg_world *world, librg_event *event);
+LIBRG_API void *  librg_event_userdata_get(librg_world *world, librg_event *event);
 
 // =======================================================================//
 // !

diff --git a/code/source/general.c b/code/source/general.c
@@ -50,7 +50,7 @@ uint32_t librg_version() {
 }
 
 librg_world *librg_world_create() {
-    librg_world_t *wld = LIBRG_MEM_ALLOC(sizeof(librg_world_t));
+    librg_world_t *wld = (librg_world_t *)LIBRG_MEM_ALLOC(sizeof(librg_world_t));
     zpl_memset(wld, 0, sizeof(librg_world_t));
 
     /* setup initials */
@@ -211,11 +211,11 @@ int8_t librg_event_remove(librg_world *world, librg_event_type id) {
     return LIBRG_OK;
 }
 
-librg_event_type librg_event_type_get(librg_world *world, librg_event *event) {
+int8_t librg_event_type_get(librg_world *world, librg_event *event) {
     LIBRG_ASSERT(event); if (!event) return LIBRG_EVENT_INVALID;
     zpl_unused(world);
     librg_event_t *e = (librg_event_t*)event;
-    return e->type;
+    return (int8_t)e->type;
 }
 
 int64_t librg_event_owner_get(librg_world *world, librg_event *event) {

diff --git a/code/source/packing.c b/code/source/packing.c
@@ -52,7 +52,7 @@ int32_t librg_world_write(librg_world *world, int64_t owner_id, char *buffer, si
     librg_table_i64 next_snapshot = {0};
     librg_table_i64_init(&next_snapshot, wld->allocator);
 
-    int64_t *results = LIBRG_MEM_ALLOC(LIBRG_WORLDWRITE_MAXQUERY * sizeof(int64_t));
+    int64_t *results = (int64_t *)LIBRG_MEM_ALLOC(LIBRG_WORLDWRITE_MAXQUERY * sizeof(int64_t));
     size_t total_amount = LIBRG_WORLDWRITE_MAXQUERY;
     librg_world_query(world, owner_id, results, &total_amount);
 

diff --git a/docs/defs/events.md b/docs/defs/events.md
@@ -91,15 +91,15 @@ Usually this method is called within the event callback itself.
 
 ##### Signature
 ```c
-librg_event_type librg_event_type_get(
+int8_t librg_event_type_get(
     librg_world *world,
     librg_event *event
 )
 ```
 
 ##### Returns
 
-* In case of success: current event type
+* In case of success: positive integer representing current event type (from `librg_event_type`enum)
 * In case of invalid event: `LIBRG_EVENT_INVALID`
 
 -------------------------------