diff --git a/.gitmodules b/.gitmodules index 02f49b01..b2bc4128 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,9 +13,6 @@ [submodule "s4c-scripts"] path = s4c-scripts url = git@github.com:jgabaut/s4c-scripts.git -[submodule "s4c-gui"] - path = s4c-gui - url = git@github.com:jgabaut/s4c-gui.git [submodule "ringabuf"] path = ringabuf url = git@github.com:jgabaut/ringabuf.git diff --git a/Makefile.am b/Makefile.am index fabd2490..81f88dde 100644 --- a/Makefile.am +++ b/Makefile.am @@ -60,7 +60,7 @@ else helapordo_SOURCES = endif -helapordo_SOURCES += src/core/game_core.c src/utils/game_utils.c src/core/game_animations.c src/utils/game_init.c src/utils/game_fight.c src/utils/game_debug.c src/core/equips.c src/ser/ser_core.c src/utils/saves.c src/utils/turn_op.c src/utils/rooms.c src/utils/artifacts.c src/utils/specials.c src/main.c src/core/sprites.c src/utils/floors.c koliseo/src/koliseo.c sprites4curses/s4c-animate/animate.c src/animations/mummy_shuffle.c src/animations/ghost_spell.c src/animations/boar_scream.c src/animations/troll_club.c src/animations/goblin_shoot.c src/animations/zombie_walk.c src/animations/imp_fireball.c src/animations/werewolf_transform.c src/animations/knight_tapis.c src/animations/mage_spark.c src/animations/archer_drop.c src/animations/assassin_poof.c src/animations/crawlingdude_crawl.c src/animations/srwarthog_square.c src/animations/headlessninja_throw.c src/animations/bluetroll_wonder.c src/animations/enter_door.c src/animations/alt_chest_opening.c src/core/game_lore.c src/core/game_lore_alt.c src/palette.c src/bsp/bsp.c src/release_data/release_data.c +helapordo_SOURCES += src/core/game_core.c src/utils/game_utils.c src/core/game_animations.c src/utils/game_init.c src/utils/game_fight.c src/utils/game_debug.c src/core/equips.c src/ser/ser_core.c src/utils/saves.c src/utils/turn_op.c src/utils/rooms.c src/utils/artifacts.c src/utils/specials.c src/main.c src/core/sprites.c src/utils/floors.c koliseo/src/koliseo.c sprites4curses/src/s4c.c src/animations/mummy_shuffle.c src/animations/ghost_spell.c src/animations/boar_scream.c src/animations/troll_club.c src/animations/goblin_shoot.c src/animations/zombie_walk.c src/animations/imp_fireball.c src/animations/werewolf_transform.c src/animations/knight_tapis.c src/animations/mage_spark.c src/animations/archer_drop.c src/animations/assassin_poof.c src/animations/crawlingdude_crawl.c src/animations/srwarthog_square.c src/animations/headlessninja_throw.c src/animations/bluetroll_wonder.c src/animations/enter_door.c src/animations/alt_chest_opening.c src/core/game_lore.c src/core/game_lore_alt.c src/palette.c src/bsp/bsp.c src/release_data/release_data.c if HL_RAYLIB_BUILD @@ -68,7 +68,7 @@ AM_CFLAGS += -DHELAPORDO_RAYLIB_BUILD helapordo_SOURCES += src/build-rl/helapordo_raylib.c src/build-rl/game_rl.c else AM_CFLAGS += -DHELAPORDO_CURSES_BUILD -helapordo_SOURCES += src/build-nc/game_curses.c s4c-gui/src/s4c_gui.c +helapordo_SOURCES += src/build-nc/game_curses.c endif if WINDOWS_BUILD @@ -87,12 +87,10 @@ else hlpd_save2l_SOURCES = endif -hlpd_save2l_SOURCES += src/core/game_core.c src/core/sprites.c src/utils/game_utils.c scripts/save2l/save2l.c src/ser/ser_core.c koliseo/src/koliseo.c sprites4curses/s4c-animate/animate.c src/palette.c +hlpd_save2l_SOURCES += src/core/game_core.c src/core/sprites.c src/utils/game_utils.c scripts/save2l/save2l.c src/ser/ser_core.c koliseo/src/koliseo.c sprites4curses/src/s4c.c src/palette.c if HL_RAYLIB_BUILD hlpd_save2l_SOURCES += src/utils/floors.c src/utils/game_init.c src/utils/specials.c src/utils/rooms.c src/bsp/bsp.c src/animations/mummy_shuffle.c src/animations/ghost_spell.c src/animations/boar_scream.c src/animations/troll_club.c src/animations/goblin_shoot.c src/animations/zombie_walk.c src/animations/imp_fireball.c src/animations/werewolf_transform.c src/animations/knight_tapis.c src/animations/mage_spark.c src/animations/archer_drop.c src/animations/assassin_poof.c src/animations/crawlingdude_crawl.c src/animations/srwarthog_square.c src/animations/headlessninja_throw.c src/animations/bluetroll_wonder.c src/animations/enter_door.c src/animations/alt_chest_opening.c src/build-rl/game_rl.c -else -hlpd_save2l_SOURCES += s4c-gui/src/s4c_gui.c endif ./anvil: @@ -105,16 +103,10 @@ endif -./anvil -qXG ./src $(VERSION) @echo -e "\033[1;33mDone.\e[0m" -./sprites4curses/s4c-animate/animate.o: - @echo -e " \033[1;35mAM_CFLAGS\e[0m: [ \"\033[1;34m$(AM_CFLAGS)\e[0m\" ]" - @echo -en "\033[1;34m[Makefile]\e[0m Building [\033[1;35m./sprites4curses/s4c-animate/animate.o\e[0m]: " - $(CCOMP) -c ./sprites4curses/s4c-animate/animate.c $(AM_CFLAGS) -o ./sprites4curses/s4c-animate/animate.o - @echo -e "\033[1;33mDone.\e[0m" - -./s4c-gui/src/s4c_gui.o: +./sprites4curses/src/s4c.o: @echo -e " \033[1;35mAM_CFLAGS\e[0m: [ \"\033[1;34m$(AM_CFLAGS)\e[0m\" ]" - @echo -en "\033[1;34m[Makefile]\e[0m Building [\033[1;35m./s4c-gui/src/s4c_gui.o\e[0m]: " - $(CCOMP) -c ./s4c-gui/src/s4c_gui.c $(AM_CFLAGS) -o ./s4c-gui/src/s4c_gui.o + @echo -en "\033[1;34m[Makefile]\e[0m Building [\033[1;35m./sprites4curses/src/s4c.o\e[0m]: " + $(CCOMP) -c ./sprites4curses/src/s4c.c $(AM_CFLAGS) -o ./sprites4curses/src/s4c.o @echo -e "\033[1;33mDone.\e[0m" ./koliseo/src/koliseo.o: @@ -219,8 +211,6 @@ pack: versioncheck [[ -d ~/helapordo-local/share/$(PACK_NAME)/amboso ]] || mkdir ~/helapordo-local/share/$(PACK_NAME)/amboso [[ -d ~/helapordo-local/share/$(PACK_NAME)/koliseo ]] || mkdir ~/helapordo-local/share/$(PACK_NAME)/koliseo [[ -d ~/helapordo-local/share/$(PACK_NAME)/koliseo/src ]] || mkdir ~/helapordo-local/share/$(PACK_NAME)/koliseo/src - [[ -d ~/helapordo-local/share/$(PACK_NAME)/s4c-gui ]] || mkdir ~/helapordo-local/share/$(PACK_NAME)/s4c-gui - [[ -d ~/helapordo-local/share/$(PACK_NAME)/s4c-gui/src ]] || mkdir ~/helapordo-local/share/$(PACK_NAME)/s4c-gui/src [[ -d ~/helapordo-local/share/$(PACK_NAME)/ringabuf ]] || mkdir ~/helapordo-local/share/$(PACK_NAME)/ringabuf [[ -d ~/helapordo-local/share/$(PACK_NAME)/ringabuf/src ]] || mkdir ~/helapordo-local/share/$(PACK_NAME)/ringabuf/src @@ -246,9 +236,6 @@ pack: versioncheck install ./koliseo/src/*.{c,h} ~/helapordo-local/share/$(PACK_NAME)/koliseo/src/ install ./koliseo/LICENSE ~/helapordo-local/share/$(PACK_NAME)/koliseo/ install ./koliseo/README.md ~/helapordo-local/share/$(PACK_NAME)/koliseo/ - install ./s4c-gui/src/*.{c,h} ~/helapordo-local/share/$(PACK_NAME)/s4c-gui/src/ - install ./s4c-gui/LICENSE ~/helapordo-local/share/$(PACK_NAME)/s4c-gui/ - install ./s4c-gui/README.md ~/helapordo-local/share/$(PACK_NAME)/s4c-gui/ install ./ringabuf/src/*.h ~/helapordo-local/share/$(PACK_NAME)/ringabuf/src/ install ./ringabuf/LICENSE ~/helapordo-local/share/$(PACK_NAME)/ringabuf/ install ./ringabuf/README.md ~/helapordo-local/share/$(PACK_NAME)/ringabuf/ @@ -296,7 +283,7 @@ clean: @echo -en "Cleaning build artifacts: " -rm $(TARGET) -rm sprites4curses/s4c-animate/*.o - -rm s4c-gui/src/*.o + -rm sprites4curses/src/*.o -rm src/*.o -rm src/build-*/*.o -rm src/core/*.o @@ -317,7 +304,7 @@ clean: cleanob: @echo -en "Cleaning object build artifacts: " -rm sprites4curses/s4c-animate/*.o - -rm s4c-gui/src/*.o + -rm sprites4curses/src/*.o -rm koliseo/src/*.o -rm src/*.o -rm src/build-*/*.o @@ -330,7 +317,7 @@ cleanob: @echo -e "\033[1;33mDone.\e[0m" # Default target (builds everything) -all: ./src/palette.c ./koliseo/src/koliseo.o ./sprites4curses/s4c-animate/animate.o ./s4c-gui/src/s4c_gui.o $(TARGET) ./hlpd-save2l +all: ./src/palette.c ./koliseo/src/koliseo.o ./sprites4curses/src/s4c.o $(TARGET) ./hlpd-save2l # Target to clean and rebuild rebuild: clean all diff --git a/README.md b/README.md index 44a65f56..94ce89a7 100644 --- a/README.md +++ b/README.md @@ -27,6 +27,8 @@ ## Latest Release + [![GitHub commits since tagged version](https://img.shields.io/github/commits-since/jgabaut/helapordo/1.4.0)](https://github.com/jgabaut/helapordo/commits/master) + 📦 v1.4.11 10/08/2024 I try to upload precompiled binaries for the `ncurses` build: @@ -34,7 +36,7 @@ - `aarch64-Linux` (from [Termux](https://f-droid.org/packages/com.termux/) on Android). - `x86_64-w64-mingw32` (*JUST A DEMO.* Any help with debugging the full game is welcome.) : [download latest](https://github.com/jgabaut/helapordo/releases/download/1.4.8/helapordo.exe-nc-1.4.8-w64-mingw32-x86_64.zip) (Available = `1.4.8`) - - `darwin-arm64` : [download latest](https://github.com/jgabaut/helapordo/releases/download/1.4.10/helapordo-nc-1.4.10-darwin-arm64.zip) (Available = `1.4.10`) + - `darwin-arm64` : [download latest](https://github.com/jgabaut/helapordo/releases/download/1.4.11/helapordo-nc-1.4.11-darwin-arm64.zip) (Available = `1.4.11`) - You should always check if the releases page has a newer build for you than the one linked here. https://github.com/jgabaut/helapordo/releases diff --git a/amboso b/amboso index b71d2fc6..a8899ea8 160000 --- a/amboso +++ b/amboso @@ -1 +1 @@ -Subproject commit b71d2fc676ce1177b24f2b84c849b65ea92f8913 +Subproject commit a8899ea81528d4c5ea753c6e2e012bc3b999ff17 diff --git a/configure.ac b/configure.ac index a7081c7f..b364ddb1 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ # Define the package name and version -AC_INIT([helapordo], [1.4.11], [jgabaut@github.com]) +AC_INIT([helapordo], [1.4.12], [jgabaut@github.com]) # Verify automake version and enable foreign option AM_INIT_AUTOMAKE([foreign -Wall]) @@ -37,7 +37,7 @@ AC_ARG_ENABLE([raylib], AC_ARG_ENABLE([anvil], [AS_HELP_STRING([--enable-anvil], [Enable anvil-backed build])], [enable_anvil=$enableval], - [enable_anvil=yes]) + [enable_anvil=no]) AC_ARG_ENABLE([emoji], [AS_HELP_STRING([--enable-emoji], [Enable emoji icons of equips])], @@ -64,7 +64,7 @@ case "${host_os}" in if test "$enable_raylib" = "yes"; then echo "CONF Building with raylib" build_raylib=yes - AC_SUBST([HELAPORDO_CFLAGS], ["-I/usr/x86_64-w64-mingw32/include -fstack-protector -DWINDOWS_BUILD -DS4C_RAYLIB_EXTENSION -DS4C_RL_QUIETER"]) + AC_SUBST([HELAPORDO_CFLAGS], ["-I/usr/x86_64-w64-mingw32/include -fstack-protector -DWINDOWS_BUILD -DS4C_HAS_ANIMATE -DS4C_RAYLIB_EXTENSION -DS4C_RL_QUIETER"]) AC_SUBST([HELAPORDO_LDFLAGS], ["-L/usr/x86_64-w64-mingw32/lib -lraylib -lm -lgdi32 -lwinmm -static"]) AC_SUBST([CCOMP], ["/usr/bin/x86_64-w64-mingw32-gcc"]) AC_SUBST([OS], ["w64-mingw32"]) @@ -81,7 +81,7 @@ case "${host_os}" in echo "CONF Building with ncurses" #build_raylib=no #build_curses=yes - AC_SUBST([HELAPORDO_CFLAGS], ["-I/usr/x86_64-w64-mingw32/include -fstack-protector -DWINDOWS_BUILD -DKOLISEO_HAS_CURSES -DNCURSES_NO_PADDING -DNCURSES_STATIC -DS4C_UNCHECKED"]) + AC_SUBST([HELAPORDO_CFLAGS], ["-I/usr/x86_64-w64-mingw32/include -fstack-protector -DWINDOWS_BUILD -DNCURSES_NO_PADDING -DNCURSES_STATIC -DS4C_HAS_ANIMATE -DS4C_HAS_GUI -DS4C_UNCHECKED"]) AC_SUBST([HELAPORDO_LDFLAGS], ["-L/usr/x86_64-w64-mingw32/lib -lpanelw -lmenuw -lncursesw -static"]) AC_SUBST([CCOMP], ["/usr/bin/x86_64-w64-mingw32-gcc"]) AC_SUBST([OS], ["w64-mingw32"]) @@ -104,7 +104,7 @@ case "${host_os}" in echo "CONF Building with raylib" build_raylib=yes build_curses=no - AC_SUBST([HELAPORDO_CFLAGS], ["-I/opt/homebrew/opt/raylib/include -DS4C_RAYLIB_EXTENSION -DS4C_RL_QUIETER"]) + AC_SUBST([HELAPORDO_CFLAGS], ["-I/opt/homebrew/opt/raylib/include -DS4C_HAS_ANIMATE -DS4C_RAYLIB_EXTENSION -DS4C_RL_QUIETER"]) AC_SUBST([HELAPORDO_LDFLAGS], ["-L/opt/homebrew/opt/raylib/lib -lraylib"]) AC_SUBST([OS], ["darwin"]) AC_SUBST([TARGET], ["helapordo"]) @@ -120,7 +120,7 @@ case "${host_os}" in echo "CONF Building with ncurses" #build_raylib=no #build_curses=yes - AC_SUBST([HELAPORDO_CFLAGS], ["-I/opt/homebrew/opt/ncurses/include -DKOLISEO_HAS_CURSES -DNCURSES_NO_PADDING -DS4C_UNCHECKED"]) + AC_SUBST([HELAPORDO_CFLAGS], ["-I/opt/homebrew/opt/ncurses/include -DNCURSES_NO_PADDING -DS4C_HAS_ANIMATE -DS4C_HAS_GUI -DS4C_UNCHECKED"]) AC_SUBST([HELAPORDO_LDFLAGS], ["-L/opt/homebrew/opt/ncurses/lib -lmenu -lpanel -lncurses"]) AC_SUBST([OS], ["darwin"]) AC_SUBST([TARGET], ["helapordo"]) @@ -142,7 +142,7 @@ case "${host_os}" in echo "CONF Building with raylib" build_raylib=yes build_curses=no - AC_SUBST([HELAPORDO_CFLAGS], ["-DS4C_RAYLIB_EXTENSION -DS4C_RL_QUIETER"]) + AC_SUBST([HELAPORDO_CFLAGS], ["-DS4C_HAS_ANIMATE -DS4C_RAYLIB_EXTENSION -DS4C_RL_QUIETER"]) AC_SUBST([HELAPORDO_LDFLAGS], ["-lraylib"]) AC_SUBST([OS], ["Linux"]) AC_SUBST([CCOMP], ["gcc"]) #Yes @@ -160,7 +160,7 @@ case "${host_os}" in echo "CONF Building with ncurses" #build_raylib=no #build_curses=yes - AC_SUBST([HELAPORDO_CFLAGS], ["-DKOLISEO_HAS_CURSES -DNCURSES_NO_PADDING -DS4C_UNCHECKED"]) + AC_SUBST([HELAPORDO_CFLAGS], ["-DNCURSES_NO_PADDING -DS4C_HAS_ANIMATE -DS4C_HAS_GUI -DS4C_UNCHECKED"]) AC_SUBST([HELAPORDO_LDFLAGS], ["-lmenu -lpanel -lncurses"]) AC_SUBST([OS], ["Linux"]) AC_SUBST([CCOMP], ["gcc"]) #Yes @@ -193,7 +193,7 @@ AM_CONDITIONAL([USE_DEFAULT_BACKGROUND], [test "$enable_default_background" = "y # Set a default version number if not specified externally AC_ARG_VAR([VERSION], [Version number]) if test -z "$VERSION"; then - VERSION="1.4.11" + VERSION="1.4.12" fi # Output variables to the config.h header diff --git a/docs/helapordo.doxyfile b/docs/helapordo.doxyfile index 1357ecac..75dd1209 100644 --- a/docs/helapordo.doxyfile +++ b/docs/helapordo.doxyfile @@ -48,7 +48,7 @@ PROJECT_NAME = helapordo # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 1.4.11 +PROJECT_NUMBER = 1.4.12 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a diff --git a/invil b/invil index 172e6cbc..ec9b8fe6 160000 --- a/invil +++ b/invil @@ -1 +1 @@ -Subproject commit 172e6cbc870a7dc2ec117342fe87a1eaa5f6b076 +Subproject commit ec9b8fe682b7c320c78b4f38801d3b2e1be61960 diff --git a/kazoj/bone/const.c b/kazoj/bone/const.c index 5fd1e04e..6b67e327 100644 --- a/kazoj/bone/const.c +++ b/kazoj/bone/const.c @@ -1,6 +1,7 @@ #include #include #define HELAPORDO_CURSES_BUILD +#define S4C_HAS_ANIMATE #include "../../src/core/game_core.h" #include "../../src/ser/ser_core.h" @@ -10,7 +11,7 @@ void fail(char* msg, int ex, int val) { int main(void) { int check = -1; - if ( ! (( check = strcmp(VERSION, "1.4.11") ) == 0)) { + if ( ! (( check = strcmp(VERSION, "1.4.12") ) == 0)) { fail("VERSION",0,check); }; if ( ! (HLP_MAX_INDEX == 35) ) { @@ -112,8 +113,8 @@ int main(void) { if ( ! SAVEHEADER_BUFSIZE == 15 ) { fail("SAVEHEADER_BUFSIZE", 15, SAVEHEADER_BUFSIZE); }; - if ( ! (sizeof(SerGamestate) == 7828) ) { - fail("sizeof(SerGamestate", 7828, sizeof(SerGamestate)); + if ( ! (sizeof(SerGamestate) == 7831) ) { + fail("sizeof(SerGamestate", 7831, sizeof(SerGamestate)); }; if ( ! (sizeof(SerSaveHeader) == 68) ) { fail("sizeof(SerSaveHeader", 68, sizeof(SerSaveHeader)); diff --git a/kazoj/bone/const_rl.c b/kazoj/bone/const_rl.c index 722fd0ab..2d29ca56 100644 --- a/kazoj/bone/const_rl.c +++ b/kazoj/bone/const_rl.c @@ -1,6 +1,7 @@ #include #include #define HELAPORDO_RAYLIB_BUILD +#define S4C_HAS_ANIMATE #include "../../src/core/game_core.h" #include "../../src/ser/ser_core.h" #include @@ -11,7 +12,7 @@ void fail(char* msg, int ex, int val) { int main(void) { int check = -1; - if ( ! (( check = strcmp(VERSION, "1.4.11") ) == 0)) { + if ( ! (( check = strcmp(VERSION, "1.4.12") ) == 0)) { fail("VERSION",0,check); }; if ( ! (HLP_MAX_INDEX == 35) ) { @@ -98,8 +99,8 @@ int main(void) { if ( ! (PERKSMAX == 8) ) { fail("PERKSMAX",8,PERKSMAX); }; - if ( ! (sizeof(SerGamestate) == 7828) ) { - fail("sizeof(SerGamestate", 7828, sizeof(SerGamestate)); + if ( ! (sizeof(SerGamestate) == 7831) ) { + fail("sizeof(SerGamestate", 7831, sizeof(SerGamestate)); }; if ( ! (sizeof(SerSaveHeader) == 68) ) { fail("sizeof(SerSaveHeader", 68, sizeof(SerSaveHeader)); diff --git a/koliseo b/koliseo index f9baf147..ec00edac 160000 --- a/koliseo +++ b/koliseo @@ -1 +1 @@ -Subproject commit f9baf14738db1bf4c1c28a4dec52020353bc4692 +Subproject commit ec00edacd24789c95bd0f57f763b74a141f2d752 diff --git a/s4c-gui b/s4c-gui deleted file mode 160000 index 50da8f9d..00000000 --- a/s4c-gui +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 50da8f9d02fc692e936630b1f94491e6c87b1cda diff --git a/s4c-scripts b/s4c-scripts index df4a2209..84b51da1 160000 --- a/s4c-scripts +++ b/s4c-scripts @@ -1 +1 @@ -Subproject commit df4a220931318a327e91ed515b51a50c830675b7 +Subproject commit 84b51da1b1e8e459f0e5378cb24088e3c0d809be diff --git a/scripts/save2l/save2l.c b/scripts/save2l/save2l.c index 01fa37bf..023a50c2 100644 --- a/scripts/save2l/save2l.c +++ b/scripts/save2l/save2l.c @@ -49,7 +49,7 @@ int main(int argc, char** argv) const char* dir_arg = argv[1]; bool res = read_savedir(dir_arg); if (!res) { - fprintf(stderr, "%s(): Failed read_savedir().", __func__); + fprintf(stderr, "%s(): Failed read_savedir().\n", __func__); } } return 0; diff --git a/sprites4curses b/sprites4curses index abd382af..5a8161d8 160000 --- a/sprites4curses +++ b/sprites4curses @@ -1 +1 @@ -Subproject commit abd382af2a7428421821069b72ba6b167eb42a0b +Subproject commit 5a8161d8dc8507a061d8d6340dc3cdeea3e739d8 diff --git a/src/animations/alt_chest_opening.h b/src/animations/alt_chest_opening.h index a8574660..e665af0b 100644 --- a/src/animations/alt_chest_opening.h +++ b/src/animations/alt_chest_opening.h @@ -18,7 +18,7 @@ #ifndef CHEST_OPEN_S4C_H_ #define CHEST_OPEN_S4C_H_ #define CHEST_OPEN_S4C_H_VERSION "0.2.2" -#include "../../sprites4curses/s4c-animate/animate.h" +#include "../../sprites4curses/src/s4c.h" /** * Declares animation matrix vector for chest_open. diff --git a/src/animations/archer_drop.h b/src/animations/archer_drop.h index 3c8d9669..d5ba5347 100644 --- a/src/animations/archer_drop.h +++ b/src/animations/archer_drop.h @@ -18,7 +18,7 @@ #ifndef ARCHER_DROP_S4C_H_ #define ARCHER_DROP_S4C_H_ #define ARCHER_DROP_S4C_H_VERSION "0.2.2" -#include "../../sprites4curses/s4c-animate/animate.h" +#include "../../sprites4curses/src/s4c.h" /** * Declares animation matrix vector for archer_drop. diff --git a/src/animations/assassin_poof.h b/src/animations/assassin_poof.h index 869e9bee..2e2ea594 100644 --- a/src/animations/assassin_poof.h +++ b/src/animations/assassin_poof.h @@ -18,7 +18,7 @@ #ifndef ASSASSIN_POOF_S4C_H_ #define ASSASSIN_POOF_S4C_H_ #define ASSASSIN_POOF_S4C_H_VERSION "0.2.2" -#include "../../sprites4curses/s4c-animate/animate.h" +#include "../../sprites4curses/src/s4c.h" /** * Declares animation matrix vector for assassin_poof. diff --git a/src/animations/bluetroll_wonder.h b/src/animations/bluetroll_wonder.h index 6bff2d31..215eaf16 100644 --- a/src/animations/bluetroll_wonder.h +++ b/src/animations/bluetroll_wonder.h @@ -18,7 +18,7 @@ #ifndef BLUETROLL_WONDER_S4C_H_ #define BLUETROLL_WONDER_S4C_H_ #define BLUETROLL_WONDER_S4C_H_VERSION "0.2.2" -#include "../../sprites4curses/s4c-animate/animate.h" +#include "../../sprites4curses/src/s4c.h" /** * Declares animation matrix vector for bluetroll_wonder. diff --git a/src/animations/boar_scream.h b/src/animations/boar_scream.h index 7c328fef..f3a89d31 100644 --- a/src/animations/boar_scream.h +++ b/src/animations/boar_scream.h @@ -18,7 +18,7 @@ #ifndef BOAR_SCREAM_S4C_H_ #define BOAR_SCREAM_S4C_H_ #define BOAR_SCREAM_S4C_H_VERSION "0.2.2" -#include "../../sprites4curses/s4c-animate/animate.h" +#include "../../sprites4curses/src/s4c.h" /** * Declares animation matrix vector for boar_scream. diff --git a/src/animations/crawlingdude_crawl.h b/src/animations/crawlingdude_crawl.h index 8161c3ac..f065f970 100644 --- a/src/animations/crawlingdude_crawl.h +++ b/src/animations/crawlingdude_crawl.h @@ -18,7 +18,7 @@ #ifndef CRAWLINGDUDE_CRAWL_S4C_H_ #define CRAWLINGDUDE_CRAWL_S4C_H_ #define CRAWLINGDUDE_CRAWL_S4C_H_VERSION "0.2.2" -#include "../../sprites4curses/s4c-animate/animate.h" +#include "../../sprites4curses/src/s4c.h" /** * Declares animation matrix vector for crawlingdude_crawl. diff --git a/src/animations/enter_door.h b/src/animations/enter_door.h index 48720b99..6b25db40 100644 --- a/src/animations/enter_door.h +++ b/src/animations/enter_door.h @@ -18,7 +18,7 @@ #ifndef ENTER_DOOR_S4C_H_ #define ENTER_DOOR_S4C_H_ #define ENTER_DOOR_S4C_H_VERSION "0.2.2" -#include "../../sprites4curses/s4c-animate/animate.h" +#include "../../sprites4curses/src/s4c.h" /** * Declares animation matrix vector for enter_door. diff --git a/src/animations/ghost_spell.h b/src/animations/ghost_spell.h index 3c57a2ff..5b859f07 100644 --- a/src/animations/ghost_spell.h +++ b/src/animations/ghost_spell.h @@ -18,7 +18,7 @@ #ifndef GHOST_SPELL_S4C_H_ #define GHOST_SPELL_S4C_H_ #define GHOST_SPELL_S4C_H_VERSION "0.2.2" -#include "../../sprites4curses/s4c-animate/animate.h" +#include "../../sprites4curses/src/s4c.h" /** * Declares animation matrix vector for ghost_spell. diff --git a/src/animations/goblin_shoot.h b/src/animations/goblin_shoot.h index 02ad444c..07fdf0ba 100644 --- a/src/animations/goblin_shoot.h +++ b/src/animations/goblin_shoot.h @@ -18,7 +18,7 @@ #ifndef GOBLIN_SHOOT_S4C_H_ #define GOBLIN_SHOOT_S4C_H_ #define GOBLIN_SHOOT_S4C_H_VERSION "0.2.2" -#include "../../sprites4curses/s4c-animate/animate.h" +#include "../../sprites4curses/src/s4c.h" /** * Declares animation matrix vector for goblin_shoot. diff --git a/src/animations/headlessninja_throw.h b/src/animations/headlessninja_throw.h index d71507cc..9eb9c633 100644 --- a/src/animations/headlessninja_throw.h +++ b/src/animations/headlessninja_throw.h @@ -18,7 +18,7 @@ #ifndef HEADLESSNINJA_THROW_S4C_H_ #define HEADLESSNINJA_THROW_S4C_H_ #define HEADLESSNINJA_THROW_S4C_H_VERSION "0.2.2" -#include "../../sprites4curses/s4c-animate/animate.h" +#include "../../sprites4curses/src/s4c.h" /** * Declares animation matrix vector for headlessninja_throw. diff --git a/src/animations/imp_fireball.h b/src/animations/imp_fireball.h index 7adc6dbb..b9ab4408 100644 --- a/src/animations/imp_fireball.h +++ b/src/animations/imp_fireball.h @@ -18,7 +18,7 @@ #ifndef IMP_FIREBALL_S4C_H_ #define IMP_FIREBALL_S4C_H_ #define IMP_FIREBALL_S4C_H_VERSION "0.2.2" -#include "../../sprites4curses/s4c-animate/animate.h" +#include "../../sprites4curses/src/s4c.h" /** * Declares animation matrix vector for imp_fireball. diff --git a/src/animations/knight_tapis.h b/src/animations/knight_tapis.h index 611059db..3717a209 100644 --- a/src/animations/knight_tapis.h +++ b/src/animations/knight_tapis.h @@ -18,7 +18,7 @@ #ifndef KNIGHT_TAPIS_S4C_H_ #define KNIGHT_TAPIS_S4C_H_ #define KNIGHT_TAPIS_S4C_H_VERSION "0.2.2" -#include "../../sprites4curses/s4c-animate/animate.h" +#include "../../sprites4curses/src/s4c.h" /** * Declares animation matrix vector for knight_tapis. diff --git a/src/animations/mage_spark.h b/src/animations/mage_spark.h index ddba2b3a..941aeb13 100644 --- a/src/animations/mage_spark.h +++ b/src/animations/mage_spark.h @@ -18,7 +18,7 @@ #ifndef MAGE_SPARK_S4C_H_ #define MAGE_SPARK_S4C_H_ #define MAGE_SPARK_S4C_H_VERSION "0.2.2" -#include "../../sprites4curses/s4c-animate/animate.h" +#include "../../sprites4curses/src/s4c.h" /** * Declares animation matrix vector for mage_spark. diff --git a/src/animations/mummy_shuffle.h b/src/animations/mummy_shuffle.h index 3216890c..7f70b5f2 100644 --- a/src/animations/mummy_shuffle.h +++ b/src/animations/mummy_shuffle.h @@ -18,7 +18,7 @@ #ifndef MUMMY_SHUFFLE_S4C_H_ #define MUMMY_SHUFFLE_S4C_H_ #define MUMMY_SHUFFLE_S4C_H_VERSION "0.2.2" -#include "../../sprites4curses/s4c-animate/animate.h" +#include "../../sprites4curses/src/s4c.h" /** * Declares animation matrix vector for mummy_shuffle. diff --git a/src/animations/srwarthog_square.h b/src/animations/srwarthog_square.h index 8cc9cbab..14ad2d0c 100644 --- a/src/animations/srwarthog_square.h +++ b/src/animations/srwarthog_square.h @@ -18,7 +18,7 @@ #ifndef SRWARTHOG_SQUARE_S4C_H_ #define SRWARTHOG_SQUARE_S4C_H_ #define SRWARTHOG_SQUARE_S4C_H_VERSION "0.2.2" -#include "../../sprites4curses/s4c-animate/animate.h" +#include "../../sprites4curses/src/s4c.h" /** * Declares animation matrix vector for srwarthog_square. diff --git a/src/animations/troll_club.h b/src/animations/troll_club.h index a1fa68bb..fa961861 100644 --- a/src/animations/troll_club.h +++ b/src/animations/troll_club.h @@ -18,7 +18,7 @@ #ifndef TROLL_CLUB_S4C_H_ #define TROLL_CLUB_S4C_H_ #define TROLL_CLUB_S4C_H_VERSION "0.2.2" -#include "../../sprites4curses/s4c-animate/animate.h" +#include "../../sprites4curses/src/s4c.h" /** * Declares animation matrix vector for troll_club. diff --git a/src/animations/werewolf_transform.h b/src/animations/werewolf_transform.h index 2236fccf..71cb4152 100644 --- a/src/animations/werewolf_transform.h +++ b/src/animations/werewolf_transform.h @@ -18,7 +18,7 @@ #ifndef WEREWOLF_TRANSFORM_H_ #define WEREWOLF_TRANSFORM_H_ #define WEREWOLF_TRANSFORM_H_VERSION "0.2.2" -#include "../../sprites4curses/s4c-animate/animate.h" +#include "../../sprites4curses/src/s4c.h" /** * Declares animation matrix vector for werewolf_transform. diff --git a/src/animations/zombie_walk.h b/src/animations/zombie_walk.h index a247f60d..889d6dfa 100644 --- a/src/animations/zombie_walk.h +++ b/src/animations/zombie_walk.h @@ -18,7 +18,7 @@ #ifndef ZOMBIE_WALK_S4C_H_ #define ZOMBIE_WALK_S4C_H_ #define ZOMBIE_WALK_S4C_H_VERSION "0.2.2" -#include "../../sprites4curses/s4c-animate/animate.h" +#include "../../sprites4curses/src/s4c.h" /** * Declares animation matrix vector for zombie_walk. diff --git a/src/bsp/bsp.c b/src/bsp/bsp.c index 6f06933e..eec1492e 100644 --- a/src/bsp/bsp.c +++ b/src/bsp/bsp.c @@ -419,7 +419,7 @@ void draw_BSP_Room(WINDOW* win, BSP_Room* bsp_room, int start_y, int start_x, in if (bsp_room->child_left != NULL && bsp_room->child_right != NULL) { draw_BSP_Room(win, bsp_room->child_left, start_y, start_x, (depth+1 == PALETTE_S4C_H_TOTCOLORS ? 0 : depth+1)); - draw_BSP_Room(win, bsp_room->child_right, start_y, start_x, (depth+1 == PALETTE_S4C_H_TOTCOLORS ? 0 : depth+1)); + draw_BSP_Room(win, bsp_room->child_right, start_y, start_x, (depth+1 == PALETTE_S4C_H_TOTCOLORS ? 0 : depth+1)); } else { wattron(win, COLOR_PAIR(depth+9)); for (int i=0; i<4; i++) { diff --git a/src/build-nc/helapordo.c b/src/build-nc/helapordo.c index 77fdf9d1..4a32151e 100644 --- a/src/build-nc/helapordo.c +++ b/src/build-nc/helapordo.c @@ -81,7 +81,7 @@ void gameloop(int argc, char **argv) 1, //kls_verbose_lvl 1, // block_on_has_temp NULL, //kls_log_fp - path_to_kls_debug_file //.kls_log_filepath + path_to_kls_debug_file //kls_log_filepath ); KLS_Conf temporary_kls_conf = kls_conf_init( 1, //kls_autoset_regions @@ -92,7 +92,7 @@ void gameloop(int argc, char **argv) 0, //kls_verbose_lvl 1, // block_on_has_temp stderr, //kls_log_fp - NULL + NULL //kls_log_filepath ); char seed[PATH_SEED_BUFSIZE+1] = {0}; diff --git a/src/build-rl/game_rl.c b/src/build-rl/game_rl.c index afd8839c..6dccad16 100644 --- a/src/build-rl/game_rl.c +++ b/src/build-rl/game_rl.c @@ -1243,7 +1243,7 @@ void draw_GameScreen_Texture(RenderTexture2D target_txtr, Gui_State gui_state, i char txt[30] = {0}; char txt_b[30] = {0}; - char txt_s4c[30] = {0}; + char txt_s4c[50] = {0}; int txt_StartX = gui_state.gameScreenWidth * 0.4f; int txt_StartY = gui_state.gameScreenHeight * 0.85f; DrawRectangle(txt_StartX, txt_StartY, gui_state.gameScreenWidth - txt_StartX, gui_state.gameScreenHeight - txt_StartY, YELLOW); diff --git a/src/core/game_core.h b/src/core/game_core.h index 1e89356f..a22809ef 100644 --- a/src/core/game_core.h +++ b/src/core/game_core.h @@ -96,7 +96,7 @@ typedef enum GameScreen { LOGO = 0, TITLE, SAVES_VIEW, NAMEPICK_VIEW, CLASSPICK_ #undef far #endif -#include "../palette.h" /**< Defines the color palette used for the s4c functions, includes animate.h.*/ +#include "../palette.h" /**< Defines the color palette used for the s4c functions, includes s4c.h.*/ extern const char* helapordo_title_string; /**< Defines a formatted string for title output to FILE.*/ @@ -364,14 +364,14 @@ extern char *G_SEEDED_RUN_ARG; /** * Current patch release. */ -#define HELAPORDO_PATCH_VERSION 11 +#define HELAPORDO_PATCH_VERSION 12 /** * Current version string identifier, with MAJOR.MINOR.PATCH format. */ -#define VERSION "1.4.11" +#define VERSION "1.4.12" -#define HELAPORDO_BINSAVEFILE_VERSION "0.0.5" +#define HELAPORDO_BINSAVEFILE_VERSION "0.0.6" /** * Defines current API version number from HELAPORDO_MAJOR_VERSION, HELAPORDO_MINOR_VERSION and HELAPORDO_PATCH_VERSION. diff --git a/src/ser/ser_core.h b/src/ser/ser_core.h index 8727b8e7..d3b4efba 100644 --- a/src/ser/ser_core.h +++ b/src/ser/ser_core.h @@ -511,7 +511,7 @@ typedef struct SerFighter { SerCountstats stats; /**< SerCountstats instance*/ - int8_t balance; /**< Amount of currency owned*/ + int32_t balance; /**< Amount of currency owned*/ int8_t keys_balance; /**< Amount of keys owned*/ int8_t floor_x; /**< Current x position in floor.*/ @@ -523,7 +523,7 @@ typedef struct SerFighter { #pragma pack(pop) #endif -#define SerFighter_Fmt "SerFighter {\n Name: %s,\n Class: %s,\n Hp: %" PRId8 ",\n Atk: %" PRId8 ",\n Def: %" PRId8 ",\n Vel: %" PRId8 ",\n Level: %" PRId8 ",\n Luck: %" PRId8 ",\n Total xp: %" PRId8 ",\n Current lvl xp: %" PRId8 ",\n Total lvl xp: %" PRId8 ",\n Total hp: %" PRId8 ",\n Status: %s,\n Energy: %" PRId8 ",\n Total energy: %" PRId8 ",\n Stamina: %" PRId8 ",\n Total Stamina: %" PRId8 ",\n Turnboost_Atk: %" PRId8 ",\n Turnboost_Def: %" PRId8 ",\n Turnboost_Vel: %" PRId8 ",\n Turnboost_Enr: %" PRId8 ",\n PerksCount: %" PRId8 ",\n EquipsBagOccupiedSlots: %" PRId8 ",\n EarliestBagSlot: %" PRId8 ",\n Permboost_Atk: %" PRId8 ",\n Permboost_Def: %" PRId8 ",\n Permboost_Vel: %" PRId8 ",\n Permboost_Enr: %" PRId8 ",\n Equipboost_Atk: %" PRId8 ",\n Equipboost_Def: %" PRId8 ",\n Equipboost_Vel: %" PRId8 ",\n Equipboost_Enr: %" PRId8 ",\n Balance: %" PRId8 ",\n Keys Balance: %" PRId8 ",\n Floor_x: %" PRId8 ",\n Floor_y: %" PRId8 "\n }" +#define SerFighter_Fmt "SerFighter {\n Name: %s,\n Class: %s,\n Hp: %" PRId8 ",\n Atk: %" PRId8 ",\n Def: %" PRId8 ",\n Vel: %" PRId8 ",\n Level: %" PRId8 ",\n Luck: %" PRId8 ",\n Total xp: %" PRId8 ",\n Current lvl xp: %" PRId8 ",\n Total lvl xp: %" PRId8 ",\n Total hp: %" PRId8 ",\n Status: %s,\n Energy: %" PRId8 ",\n Total energy: %" PRId8 ",\n Stamina: %" PRId8 ",\n Total Stamina: %" PRId8 ",\n Turnboost_Atk: %" PRId8 ",\n Turnboost_Def: %" PRId8 ",\n Turnboost_Vel: %" PRId8 ",\n Turnboost_Enr: %" PRId8 ",\n PerksCount: %" PRId8 ",\n EquipsBagOccupiedSlots: %" PRId8 ",\n EarliestBagSlot: %" PRId8 ",\n Permboost_Atk: %" PRId8 ",\n Permboost_Def: %" PRId8 ",\n Permboost_Vel: %" PRId8 ",\n Permboost_Enr: %" PRId8 ",\n Equipboost_Atk: %" PRId8 ",\n Equipboost_Def: %" PRId8 ",\n Equipboost_Vel: %" PRId8 ",\n Equipboost_Enr: %" PRId8 ",\n Balance: %" PRId32 ",\n Keys Balance: %" PRId8 ",\n Floor_x: %" PRId8 ",\n Floor_y: %" PRId8 "\n }" #define SerFighter_Arg(sf) (sf.name), (stringFromClass(sf.class)), (sf.hp), (sf.atk), (sf.def), (sf.vel), (sf.level), (sf.luck), (sf.totalxp), (sf.currentlevelxp), (sf.totallevelxp), (sf.totalhp), (stringFromStatus(sf.status)), (sf.energy), (sf.totalenergy), (sf.stamina), (sf.totalstamina), (sf.turnboost_atk), (sf.turnboost_def), (sf.turnboost_vel), (sf.turnboost_enr), (sf.perksCount), (sf.equipsBagOccupiedSlots), (sf.earliestBagSlot), (sf.permboost_atk), (sf.permboost_def), (sf.permboost_vel), (sf.permboost_enr), (sf.equipboost_atk), (sf.equipboost_def), (sf.equipboost_vel), (sf.equipboost_enr), (sf.balance), (sf.keys_balance), (sf.floor_x), (sf.floor_y) diff --git a/src/utils/game_debug.c b/src/utils/game_debug.c index 8f1b528b..9fc7eb53 100644 --- a/src/utils/game_debug.c +++ b/src/utils/game_debug.c @@ -344,21 +344,6 @@ void debug_generic(Gamestate *gmst, Fighter *player, Path *p, int roomIndex, kls_showList_toFile(temporary_kls->regs, kls_file); kls_usageReport_toFile(temporary_kls, kls_file); fprintf(kls_file, "--END debug of temporary_kls--\n\n"); - WINDOW *win = NULL; - /* Initialize curses */ - clear(); - refresh(); - start_color(); - cbreak(); - noecho(); - keypad(stdscr, TRUE); - win = newwin(20, 50, 1, 2); - keypad(win, TRUE); - wclear(win); - wrefresh(win); - kls_showList_toWin(temporary_kls, win); - delwin(win); - endwin(); fclose(kls_file); } @@ -431,21 +416,6 @@ void debug_generic(Gamestate *gmst, Fighter *player, Path *p, int roomIndex, kls_showList_toFile(kls->regs, kls_file); kls_usageReport_toFile(kls, kls_file); fprintf(kls_file, "--END debug of passed kls--\n\n"); - WINDOW *win = NULL; - /* Initialize curses */ - clear(); - refresh(); - start_color(); - cbreak(); - noecho(); - keypad(stdscr, TRUE); - win = newwin(20, 50, 1, 2); - keypad(win, TRUE); - wclear(win); - wrefresh(win); - kls_showList_toWin(kls, win); - delwin(win); - endwin(); fclose(kls_file); } @@ -1014,21 +984,6 @@ void debug_enemies_room(Gamestate *gmst, Room *room, Fighter *player, Enemy *e, kls_showList_toFile(temporary_kls->regs, kls_file); kls_usageReport_toFile(temporary_kls, kls_file); fprintf(kls_file, "--END debug of temporary_kls--\n\n"); - WINDOW *win = NULL; - /* Initialize curses */ - clear(); - refresh(); - start_color(); - cbreak(); - noecho(); - keypad(stdscr, TRUE); - win = newwin(20, 50, 1, 2); - keypad(win, TRUE); - wclear(win); - wrefresh(win); - kls_showList_toWin(temporary_kls, win); - delwin(win); - endwin(); fclose(kls_file); } @@ -1101,21 +1056,6 @@ void debug_enemies_room(Gamestate *gmst, Room *room, Fighter *player, Enemy *e, kls_showList_toFile(kls->regs, kls_file); kls_usageReport_toFile(kls, kls_file); fprintf(kls_file, "--END debug of passed kls--\n\n"); - WINDOW *win = NULL; - /* Initialize curses */ - clear(); - refresh(); - start_color(); - cbreak(); - noecho(); - keypad(stdscr, TRUE); - win = newwin(20, 50, 1, 2); - keypad(win, TRUE); - wclear(win); - wrefresh(win); - kls_showList_toWin(kls, win); - delwin(win); - endwin(); fclose(kls_file); } break; diff --git a/src/utils/game_utils.c b/src/utils/game_utils.c index d3404ec9..7a0a6519 100644 --- a/src/utils/game_utils.c +++ b/src/utils/game_utils.c @@ -4398,7 +4398,7 @@ int retry(char* seed) *ptr = tolower(*ptr); } - if ( (c[0] == '\0') || (strcmp(c, "no") == 0) || (strcmp(c, "n") == 0) ) { + if ((c[0] == '\0') || (strcmp(c, "no") == 0) || (strcmp(c, "n") == 0) ) { log_tag("debug_log.txt", "[DEBUG]", "%s(): input was no.", __func__); return 0; diff --git a/src/utils/game_utils.h b/src/utils/game_utils.h index d671bc19..f15faf99 100644 --- a/src/utils/game_utils.h +++ b/src/utils/game_utils.h @@ -59,7 +59,6 @@ #include #include "../core/game_core.h" #ifdef HELAPORDO_CURSES_BUILD -#include "../../s4c-gui/src/s4c_gui.h" #endif // HELAPORDO_CURSES_BUILD #ifdef ANVIL_BUILD #include "../anvil__helapordo.h" diff --git a/stego.lock b/stego.lock index 174455e2..5e1dbb83 100644 --- a/stego.lock +++ b/stego.lock @@ -70,3 +70,4 @@ errortestsdir = "kulpo" "1.4.9" = "Add build config option for supporting default background feature, use binary files without -X, drop textfile save/load code, refactor notification logic to allow per-frame updates, add ringabuf at 0.0.4" "1.4.10" = "Fix broken raylib build, add raymath usage for texture rendering" "1.4.11" = "Juicy refactor for raylib build, almost ready to play. Bump koliseo to 0.4.5, s4c to 0.4.7, invil to 0.2.16" +"1.4.12" = "Drop s4c-gui, switch default anvil usage to off, update gif in README. Bump koliseo to 0.4.6, s4c to 0.4.8, invil to 0.2.18, amboso to 2.0.8"