Skip to content

Commit

Permalink
feat: 1.1.3 bump Koliseo to 0.1.18 (#17)
Browse files Browse the repository at this point in the history
  • Loading branch information
jgabaut authored Sep 2, 2023
1 parent 2706297 commit b745985
Show file tree
Hide file tree
Showing 10 changed files with 32 additions and 19 deletions.
16 changes: 11 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,18 @@

### Dependencies <a name = "dependencies"></a>

`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.

### Initialising submodules <a name = "init_submodules"></a>

You can initialise the submodules by running:
### `git submodule update --init`

`git submodule update --init`

### Autoreconf and ./configure <a name = "autotools"></a>

Expand All @@ -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 <a name = "compiling"></a>

Once you have the `Makefile`, you can compile the project by running, in its directory:
Expand Down Expand Up @@ -107,5 +113,5 @@

- `apple-arm64`

📦 v1.1.1 01/09/2023
📦 v1.1.3 02/09/2023
https://github.com/jgabaut/helapordo/releases
3 changes: 2 additions & 1 deletion bin/stego.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 5 additions & 0 deletions bin/v1.1.3/.gitignore
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions bin/v1.1.3/static
4 changes: 2 additions & 2 deletions configure.ac
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Define the package name and version
AC_INIT([helapordo], [1.1.2], [[email protected]])
AC_INIT([helapordo], [1.1.3], [[email protected]])

# Verify automake version and enable foreign option
AM_INIT_AUTOMAKE([foreign -Wall])
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/helapordo.doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion kazoj/bone/const.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) ) {
Expand Down
2 changes: 1 addition & 1 deletion koliseo
8 changes: 4 additions & 4 deletions src/game_core.h
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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.
Expand Down
8 changes: 4 additions & 4 deletions src/helapordo.c
Original file line number Diff line number Diff line change
Expand Up @@ -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");

Expand Down Expand Up @@ -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");

Expand Down Expand Up @@ -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");

Expand Down Expand Up @@ -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");

Expand Down

0 comments on commit b745985

Please sign in to comment.