v4games
/
eco2d
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

efd/v1
Dominik Madarász 2023-02-01 15:42:25 +01:00
parent 3f5d999d44 b578ceffef
commit 6e0e747756
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/foundation/src/gui/tooltip.c
View File

@ -137,7 +137,7 @@ void tooltip_clear(void) {
main_tooltip = (tooltip_node) {0}; main_tooltip = (tooltip_node) {0};
} }
inline void tooltip_draw_contents(tooltip *desc) { void tooltip_draw_contents(tooltip *desc) {
if (!desc) return; if (!desc) return;
nk_layout_row_dynamic(game_ui, 0, 1); nk_layout_row_dynamic(game_ui, 0, 1);
nk_label_wrap(game_ui, desc->content); nk_label_wrap(game_ui, desc->content);

4
code/foundation/src/systems/modules/system_demo.c
View File

@ -54,7 +54,7 @@ void CreatureSeekFood(ecs_iter_t *it) {
for (int i = 0; i < it->count; i++) { for (int i = 0; i < it->count; i++) {
size_t ents_count; size_t ents_count;
uint64_t *ents = world_chunk_query_entities(it->entities[i], &ents_count, 2); int64_t *ents = world_chunk_query_entities(it->entities[i], &ents_count, 2);
float closest_ent_dist = ZPL_F32_MAX; float closest_ent_dist = ZPL_F32_MAX;
uint64_t closest_ent = 0; uint64_t closest_ent = 0;
@ -110,7 +110,7 @@ void CreatureSeekCompanion(ecs_iter_t *it) {
for (int i = 0; i < it->count; i++) { for (int i = 0; i < it->count; i++) {
size_t ents_count; size_t ents_count;
uint64_t *ents = world_chunk_query_entities(it->entities[i], &ents_count, 2); int64_t *ents = world_chunk_query_entities(it->entities[i], &ents_count, 2);
float closest_ent_dist = ZPL_F32_MAX; float closest_ent_dist = ZPL_F32_MAX;
uint64_t closest_ent = 0; uint64_t closest_ent = 0;