diff --git a/CMakeLists.txt b/CMakeLists.txt index b49e388..ec67254 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -176,10 +176,8 @@ if (MINGW) set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DMINGW") endif (MINGW) -if (NOT MSVC AND NOT NINJA) +if (NOT MSVC) set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D__FNAME__='\"$(subst ${CMAKE_SOURCE_DIR}/,,$(abspath $<))\"'") -elseif (NINJA) - set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D__FNAME__='\"$$(subst ${CMAKE_SOURCE_DIR}/,,$$(abspath $$<))\"'") else () set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D__FNAME__=__FILE__") endif () diff --git a/assets/Extras/Skills.png b/assets/Extras/Skills.png index 1402096..379b066 100644 Binary files a/assets/Extras/Skills.png and b/assets/Extras/Skills.png differ diff --git a/src/skill.c b/src/skill.c index d8b4000..f14d5f7 100644 --- a/src/skill.c +++ b/src/skill.c @@ -850,7 +850,7 @@ create_blink(void) Sprite *s = sprite_create(); sprite_set_texture(s, t, 0); s->dim = GAME_DIMENSION; - s->clip = CLIP32(32, 0); + s->clip = CLIP32(64, 64); s->fixed = true; Skill *skill = create_default("Blink", s); skill->levelcap = 3; @@ -900,7 +900,7 @@ create_erupt(void) Sprite *s = sprite_create(); sprite_set_texture(s, t, 0); s->dim = GAME_DIMENSION; - s->clip = CLIP32(32, 0); + s->clip = CLIP32(32, 64); s->fixed = true; Skill *skill = create_default("Erupt", s); skill->levelcap = 3;