Compare commits

..

No commits in common. "ac796e911d9a1bc89241bf6aa3e001bc2bd30b85" and "3060f2910c3a54d2b3ffb9429943eeb37bd30f27" have entirely different histories.

6 changed files with 5 additions and 8 deletions

3
.ccls
View File

@ -3,7 +3,6 @@ gcc
-Isrc/headers -Isrc/headers
-Isrc/ecs/headers -Isrc/ecs/headers
-Isrc/ecs/components/headers -Isrc/ecs/components/headers
-ISDL_Core/src/headers -Icore/src/headers
-INCurses_Core/src/headers
-Iassets/asset_builder/src/headers -Iassets/asset_builder/src/headers
-DASSET_FILE_NAME="$(make print-ASSET_OUTPUT)" -DASSET_FILE_NAME="$(make print-ASSET_OUTPUT)"

1
.gitignore vendored
View File

@ -1,2 +1,3 @@
.ccls-cache .ccls-cache
build build
core

View File

@ -28,7 +28,7 @@ all: build_core build_src build_assets
# Sub Makefiles # Sub Makefiles
SOURCE_DIR = src SOURCE_DIR = src
CORE_DIR = SDL_Core/src CORE_DIR = core/src
ASSETS_DIR = assets ASSETS_DIR = assets
include $(CORE_DIR)/Makefile include $(CORE_DIR)/Makefile

@ -1 +0,0 @@
Subproject commit 0ef33e0b09c5834dbca891f86e2b4f89a55d3ffb

@ -1 +0,0 @@
Subproject commit c1a3dea5609002d1be55a3e5a2c11ebc0fa7e57e

View File

@ -106,9 +106,8 @@ void animation_system_create_frames_clips(animation_system_data_t *system_data)
inline void animation_system_change_animation(animation_system_data_t *system_data, const char *name, size_t nb_frames) inline void animation_system_change_animation(animation_system_data_t *system_data, const char *name, size_t nb_frames)
{ {
sprite_component_set_texture(system_data->sprite_component_data, name);
system_data->sprite_component_data->src_rect = *(rect_t *)system_data->actual_frame->data;
system_data->nb_frames = nb_frames; system_data->nb_frames = nb_frames;
sprite_component_set_texture(system_data->sprite_component_data, name);
animation_system_create_frames_clips(system_data); animation_system_create_frames_clips(system_data);
system_data->sprite_component_data->src_rect = *(rect_t *)system_data->actual_frame->data;
} }