sadpmpk
/
HATPC
1
0
Fork 0
Code Issues 11 Pull Requests Projects 4 Releases Wiki Activity

Compare commits

base: sadpmpk:e00e1ff8d241bdf0b82bcece94592ce677bcad60
Branches Tags
sadpmpk:main
sadpmpk:level_select
sadpmpk:scene_man
..
compare: sadpmpk:ef04e4ce428323d91b3d2f9ce47a7814d416ab1e
Branches Tags
sadpmpk:main
sadpmpk:level_select
sadpmpk:scene_man

No commits in common. "e00e1ff8d241bdf0b82bcece94592ce677bcad60" and "ef04e4ce428323d91b3d2f9ce47a7814d416ab1e" have entirely different histories.
e00e1ff8d2 ... ef04e4ce42

3 changed files with 5 additions and 10 deletions
Show Stats Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -10,7 +10,7 @@ set(LIBZSTD_DIR /usr/local/lib CACHE FILEPATH "directory to zstd")
if (EMSCRIPTEN) if (EMSCRIPTEN)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DPLATFORM_WEB") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DPLATFORM_WEB")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -s USE_GLFW=3 -s ASSERTIONS=1 -s WASM=1 -s ASYNCIFY -s MIN_WEBGL_VERSION=2 -s MAX_WEBGL_VERSION=2 -s TOTAL_MEMORY=16777216 -s TOTAL_STACK=1048576 --preload-file ./res ") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -s USE_GLFW=3 -s ASSERTIONS=1 -s WASM=1 -s ASYNCIFY -s TOTAL_MEMORY=16777216 -s TOTAL_STACK=1048576 --preload-file ./res ")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
set(CMAKE_EXECUTABLE_SUFFIX ".html") set(CMAKE_EXECUTABLE_SUFFIX ".html")

10
engine/engine_conf.h
View File

@ -1,13 +1,11 @@
#ifndef _ENGINE_CONF_H #ifndef _ENGINE_CONF_H
#define _ENGINE_CONF_H #define _ENGINE_CONF_H
// Take care tuning these params. Web build doesn't work #define MAX_SCENES_TO_RENDER 16
// if memory used too high
#define MAX_SCENES_TO_RENDER 8
#define MAX_RENDER_LAYERS 4 #define MAX_RENDER_LAYERS 4
#define MAX_ENTITIES 2047 #define MAX_ENTITIES 2047
#define MAX_TEXTURES 16 #define MAX_TEXTURES 16
#define MAX_SPRITES 127 #define MAX_SPRITES 128
#define MAX_SOUNDS 32 #define MAX_SOUNDS 32
#define MAX_FONTS 4 #define MAX_FONTS 4
#define MAX_N_TILES 16384 #define MAX_N_TILES 16384
@ -16,8 +14,8 @@
#define N_SFX 32 #define N_SFX 32
#define MAX_EMITTER_CONF 8 #define MAX_EMITTER_CONF 8
//#define MAX_PARTICLE_EMITTER 8 //#define MAX_PARTICLE_EMITTER 8
#define MAX_ACTIVE_PARTICLE_EMITTER 255 #define MAX_ACTIVE_PARTICLE_EMITTER 512
#define MAX_PARTICLES 32 #define MAX_PARTICLES 64
#define MAX_TILE_TYPES 16 #define MAX_TILE_TYPES 16
#define N_TAGS 10 #define N_TAGS 10

3
scenes/player_ent.c
View File

@ -144,9 +144,6 @@ static unsigned int player_finish_transition_func(Entity_t* ent)
if (p_spr->current_frame == p_spr->sprites[p_spr->current_idx].sprite->frame_count - 1) if (p_spr->current_frame == p_spr->sprites[p_spr->current_idx].sprite->frame_count - 1)
{ {
p_spr->pause = true; p_spr->pause = true;
// This entity has no special init, so it's fine to remove
// at end of animation
remove_entity(ent->manager, ent->m_id);
} }
return p_spr->current_idx; return p_spr->current_idx;
} }