From b7459851edb30566a9514988041d8cdda0efc3fb Mon Sep 17 00:00:00 2001
From: jgabaut <109908086+jgabaut@users.noreply.github.com>
Date: Sat, 2 Sep 2023 15:26:32 +0200
Subject: [PATCH] feat: 1.1.3 bump Koliseo to 0.1.18 (#17)
---
README.md | 16 +++++++++++-----
bin/stego.lock | 3 ++-
bin/v1.1.3/.gitignore | 5 +++++
bin/v1.1.3/static | 1 +
configure.ac | 4 ++--
docs/helapordo.doxyfile | 2 +-
kazoj/bone/const.c | 2 +-
koliseo | 2 +-
src/game_core.h | 8 ++++----
src/helapordo.c | 8 ++++----
10 files changed, 32 insertions(+), 19 deletions(-)
create mode 100644 bin/v1.1.3/.gitignore
create mode 120000 bin/v1.1.3/static
diff --git a/README.md b/README.md
index 09931261..ddc3759e 100644
--- a/README.md
+++ b/README.md
@@ -28,9 +28,9 @@
### Dependencies
- `autoconf` and `automake` are needed to generate the Makefile used to compile the game.
- `ncurses-dev` is needed as a library dependecy.
- `python` is needed to generate `./src/palette.c` and `./src/palette.h`.
+ - `autoconf` and `automake` are needed to generate the Makefile used to compile the game.
+ - `ncurses-dev` is needed as a library dependecy.
+ - `python` is needed to generate `./src/palette.c` and `./src/palette.h`.
I included termios.h to have some of the messages be consistent in ignoring user input, so at the moment the code can't build on Windows.
@@ -38,7 +38,8 @@
### Initialising submodules
You can initialise the submodules by running:
- ### `git submodule update --init`
+
+ `git submodule update --init`
### Autoreconf and ./configure
@@ -56,6 +57,11 @@
`./configure --enable-debug=no`
+ If you're compiling without using `autotools`, you may want to define the compiler macros:
+
+ - `-DHELAPORDO_DEBUG_LOG` (Enables debug logging)
+ - `-DHELAPORDO_DEBUG_ACCESS` (Enables the -d flag to turn on debug mode)
+
### Compiling and running
Once you have the `Makefile`, you can compile the project by running, in its directory:
@@ -107,5 +113,5 @@
- `apple-arm64`
- 📦 v1.1.1 01/09/2023
+ 📦 v1.1.3 02/09/2023
https://github.com/jgabaut/helapordo/releases
diff --git a/bin/stego.lock b/bin/stego.lock
index c477947b..49fb6309 100644
--- a/bin/stego.lock
+++ b/bin/stego.lock
@@ -23,4 +23,5 @@ kazoj# tests folder name
1.0.11# Add saveslot selection
1.1.0# Animations and lores are compiled
1.1.1# Palette is compiled
-1.1.2# Define HLP_Region_Type, bump Koliseo to 0.1.17
+1.1.2# Define HLP_Region_Type, bump Koliseo to 0.1.17 - Deprecated
+1.1.3# Fix enum conversion warn, bump Koliseo to 0.1.18
diff --git a/bin/v1.1.3/.gitignore b/bin/v1.1.3/.gitignore
new file mode 100644
index 00000000..9cd91fcd
--- /dev/null
+++ b/bin/v1.1.3/.gitignore
@@ -0,0 +1,5 @@
+#amboso compliant version folder, will ignore everything inside BUT the gitignore, to keep the clean dir
+#we also keep specific dependencies...
+*
+!.gitignore
+!static
diff --git a/bin/v1.1.3/static b/bin/v1.1.3/static
new file mode 120000
index 00000000..382349a7
--- /dev/null
+++ b/bin/v1.1.3/static
@@ -0,0 +1 @@
+../../static/
\ No newline at end of file
diff --git a/configure.ac b/configure.ac
index 33999848..bc734ab2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
# Define the package name and version
-AC_INIT([helapordo], [1.1.2], [jgabaut@github.com])
+AC_INIT([helapordo], [1.1.3], [jgabaut@github.com])
# Verify automake version and enable foreign option
AM_INIT_AUTOMAKE([foreign -Wall])
@@ -32,7 +32,7 @@ fi
# Set a default version number if not specified externally
AC_ARG_VAR([VERSION], [Version number])
if test -z "$VERSION"; then
- VERSION="1.1.2"
+ VERSION="1.1.3"
fi
# Output variables to the config.h header
diff --git a/docs/helapordo.doxyfile b/docs/helapordo.doxyfile
index 965dbb07..813cf0c2 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.1.2"
+PROJECT_NUMBER = "1.1.3"
# 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/kazoj/bone/const.c b/kazoj/bone/const.c
index 2587fa1f..8cae94e7 100644
--- a/kazoj/bone/const.c
+++ b/kazoj/bone/const.c
@@ -8,7 +8,7 @@ void fail(char* msg, int ex, int val) {
int main(void) {
int check = -1;
- if ( ! (( check = strcmp(VERSION, "1.1.2") ) == 0)) {
+ if ( ! (( check = strcmp(VERSION, "1.1.3") ) == 0)) {
fail("VERSION",0,check);
};
if ( ! (TURNOP_MAX == 15) ) {
diff --git a/koliseo b/koliseo
index d1e15dee..9a950ef3 160000
--- a/koliseo
+++ b/koliseo
@@ -1 +1 @@
-Subproject commit d1e15dee60e496a06e21df93be8aa43f65781998
+Subproject commit 9a950ef3aa27e013338deffe81a3cdecfd9fd0e2
diff --git a/src/game_core.h b/src/game_core.h
index f164414b..39568f26 100644
--- a/src/game_core.h
+++ b/src/game_core.h
@@ -7,7 +7,7 @@
* Defines indexes for all types that are allocated with Koliseo.
*/
typedef enum HLP_Region_Type {
- HR_Path=KLS_Header+100, //Start counting from last index of Koliseo's own Region_Type values
+ HR_Path=KLS_REGIONTYPE_MAX+100, //Start counting from last index of Koliseo's own Region_Type values
HR_Wincon,
HR_Room,
HR_Floor,
@@ -37,7 +37,7 @@ typedef enum HLP_Region_Type {
/**
* Defines max index for an HLP_Region_Type value.
*/
-#define HLP_MAX_INDEX (HR_loadInfo-100+KLS_Header)
+#define HLP_MAX_INDEX (HR_loadInfo-100+KLS_REGIONTYPE_MAX)
/**
* Array with the name strings for HLP_Region_Type values.
@@ -112,12 +112,12 @@ extern int GS_AUTOSAVE_ON;
/**
* Current patch release.
*/
-#define HELAPORDO_PATCH_VERSION 2
+#define HELAPORDO_PATCH_VERSION 3
/**
* Current version string identifier, with MAJOR.MINOR.PATCH format.
*/
-#define VERSION "1.1.2"
+#define VERSION "1.1.3"
/**
* Default savepath.
diff --git a/src/helapordo.c b/src/helapordo.c
index 0d2543b6..15029ffd 100644
--- a/src/helapordo.c
+++ b/src/helapordo.c
@@ -8511,7 +8511,7 @@ void debug_generic(Fighter* player, Path* p, int roomIndex, Koliseo* kls, Kolise
fprintf(kls_file,"--BEGIN debug of temporary_kls--\n");
for (int i = HR_Path; i < HLP_MAX_INDEX+100; i++) {
ptrdiff_t usage = kls_type_usage(i,temporary_kls);
- fprintf(kls_file,"Usage for HR_Region_Type { %s } [Index: %i] {Size: %li }\n", stringFrom_HLP_Region_Type(i-100+KLS_Header), i, usage);
+ fprintf(kls_file,"Usage for HLP_Region_Type { %s } [Index: %i] {Size: %li }\n", stringFrom_HLP_Region_Type(i-100+KLS_REGIONTYPE_MAX), i, usage);
}
fprintf(kls_file,"--END debug of temporary_kls--\n\n");
@@ -8582,7 +8582,7 @@ void debug_generic(Fighter* player, Path* p, int roomIndex, Koliseo* kls, Kolise
fprintf(kls_file,"--BEGIN debug of passed kls--\n");
for (int i = HR_Path; i < HLP_MAX_INDEX+100; i++) {
ptrdiff_t usage = kls_type_usage(i,kls);
- fprintf(kls_file,"Usage for HR_Region_Type { %s } [Index: %i] {Size: %li }\n", stringFrom_HLP_Region_Type(i-100+KLS_Header), i, usage);
+ fprintf(kls_file,"Usage for HLP_Region_Type { %s } [Index: %i] {Size: %li }\n", stringFrom_HLP_Region_Type(i-100+KLS_REGIONTYPE_MAX), i, usage);
}
fprintf(kls_file,"--END debug of passed kls--\n\n");
@@ -9111,7 +9111,7 @@ void debug_enemies_room(Room* room, Fighter* player, Enemy* e, Path* p, int room
fprintf(kls_file,"--BEGIN debug of temporary_kls--\n");
for (int i = HR_Path; i < HLP_MAX_INDEX+100; i++) {
ptrdiff_t usage = kls_type_usage(i,temporary_kls);
- fprintf(kls_file,"Usage for HR_Region_Type { %s } [Index: %i] {Size: %li }\n", stringFrom_HLP_Region_Type(i-100+KLS_Header), i, usage);
+ fprintf(kls_file,"Usage for HLP_Region_Type { %s } [Index: %i] {Size: %li }\n", stringFrom_HLP_Region_Type(i-100+KLS_REGIONTYPE_MAX), i, usage);
}
fprintf(kls_file,"--END debug of temporary_kls--\n\n");
@@ -9182,7 +9182,7 @@ void debug_enemies_room(Room* room, Fighter* player, Enemy* e, Path* p, int room
fprintf(kls_file,"--BEGIN debug of passed kls--\n");
for (int i = HR_Path; i < HLP_MAX_INDEX+100; i++) {
ptrdiff_t usage = kls_type_usage(i,kls);
- fprintf(kls_file,"Usage for HR_Region_Type { %s } [Index: %i] {Size: %li }\n", stringFrom_HLP_Region_Type(i-100+KLS_Header), i, usage);
+ fprintf(kls_file,"Usage for HLP_Region_Type { %s } [Index: %i] {Size: %li }\n", stringFrom_HLP_Region_Type(i-100+KLS_REGIONTYPE_MAX), i, usage);
}
fprintf(kls_file,"--END debug of passed kls--\n\n");