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

Compare commits

base: sadpmpk:b70dcc1e98f0d8b514a97f8b0f07e4679cc0e672
Branches Tags
sadpmpk:main
sadpmpk:level_select
sadpmpk:scene_man
..
compare: sadpmpk:b5790ef00bab75b4b37890ad0aa61b3943d848fd
Branches Tags
sadpmpk:main
sadpmpk:level_select
sadpmpk:scene_man

No commits in common. "b70dcc1e98f0d8b514a97f8b0f07e4679cc0e672" and "b5790ef00bab75b4b37890ad0aa61b3943d848fd" have entirely different histories.
b70dcc1e98 ... b5790ef00b

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

4
scenes/editor_scene.c
View File

@ -98,10 +98,10 @@ static void level_scene_render_func(Scene_t* scene)
Color water_colour = ColorAlpha(BLUE, 0.5); Color water_colour = ColorAlpha(BLUE, 0.5);
DrawRectangle(x, y, TILE_SIZE, TILE_SIZE, water_colour); DrawRectangle(x, y, TILE_SIZE, TILE_SIZE, water_colour);
} }
if (!tilemap.tiles[i].moveable) if (tilemap.tiles[i].moveable)
{ {
// Draw water tile // Draw water tile
Color water_colour = ColorAlpha(RED, 0.2); Color water_colour = ColorAlpha(GREEN, 0.2);
DrawRectangle(x, y, TILE_SIZE, TILE_SIZE, water_colour); DrawRectangle(x, y, TILE_SIZE, TILE_SIZE, water_colour);
} }
} }

1
scenes/engine/EC/EC.h
View File

@ -49,7 +49,6 @@ typedef struct _CTransform_t {
int8_t grav_delay; int8_t grav_delay;
int8_t grav_timer; int8_t grav_timer;
MovementMode_t movement_mode; MovementMode_t movement_mode;
bool active;
} CTransform_t; } CTransform_t;
typedef struct _CMovementState_t { typedef struct _CMovementState_t {

12
scenes/game_systems.c
View File

@ -862,7 +862,6 @@ void tile_collision_system(Scene_t* scene)
{ {
Entity_t* p_ent = get_entity(&scene->ent_manager, ent_idx); Entity_t* p_ent = get_entity(&scene->ent_manager, ent_idx);
CTransform_t* p_ctransform = get_component(p_ent, CTRANSFORM_COMP_T); CTransform_t* p_ctransform = get_component(p_ent, CTRANSFORM_COMP_T);
if (!p_ctransform->active) continue;
// Get the occupied tiles // Get the occupied tiles
// For each tile, loop through the entities, check collision and move // For each tile, loop through the entities, check collision and move
// exclude self // exclude self
@ -1314,12 +1313,6 @@ void movement_update_system(Scene_t* scene)
unsigned long ent_idx; unsigned long ent_idx;
sc_map_foreach(&scene->ent_manager.component_map[CTRANSFORM_COMP_T], ent_idx, p_ctransform) sc_map_foreach(&scene->ent_manager.component_map[CTRANSFORM_COMP_T], ent_idx, p_ctransform)
{ {
if (!p_ctransform->active)
{
memset(&p_ctransform->velocity, 0, sizeof(Vector2));
memset(&p_ctransform->accel, 0, sizeof(Vector2));
continue;
}
p_ctransform->prev_velocity = p_ctransform->velocity; p_ctransform->prev_velocity = p_ctransform->velocity;
if (p_ctransform->movement_mode == REGULAR_MOVEMENT) if (p_ctransform->movement_mode == REGULAR_MOVEMENT)
@ -1469,11 +1462,6 @@ void state_transition_update_system(Scene_t* scene)
p_mstate->water_state <<= 1; p_mstate->water_state <<= 1;
p_mstate->water_state |= in_water? 1:0; p_mstate->water_state |= in_water? 1:0;
p_mstate->water_state &= 3; p_mstate->water_state &= 3;
if (p_mstate->ground_state == 0b10)
{
p_ctransform->active = true;
}
} }
} }

1
scenes/items_ent.c
View File

@ -31,7 +31,6 @@ Entity_t* create_boulder(EntityManager_t* ent_manager, Assets_t* assets)
CTransform_t* p_ctransform = add_component(p_boulder, CTRANSFORM_COMP_T); CTransform_t* p_ctransform = add_component(p_boulder, CTRANSFORM_COMP_T);
p_ctransform->grav_delay = 5; p_ctransform->grav_delay = 5;
p_ctransform->active = true;
add_component(p_boulder, CMOVEMENTSTATE_T); add_component(p_boulder, CMOVEMENTSTATE_T);
add_component(p_boulder, CTILECOORD_COMP_T); add_component(p_boulder, CTILECOORD_COMP_T);
CMoveable_t* p_cmove = add_component(p_boulder, CMOVEABLE_T); CMoveable_t* p_cmove = add_component(p_boulder, CMOVEABLE_T);

3
scenes/player_ent.c
View File

@ -59,8 +59,7 @@ Entity_t* create_player(EntityManager_t* ent_manager, Assets_t* assets)
CBBox_t* p_bbox = add_component(p_ent, CBBOX_COMP_T); CBBox_t* p_bbox = add_component(p_ent, CBBOX_COMP_T);
set_bbox(p_bbox, PLAYER_WIDTH, PLAYER_HEIGHT); set_bbox(p_bbox, PLAYER_WIDTH, PLAYER_HEIGHT);
CTransform_t* p_ct = add_component(p_ent, CTRANSFORM_COMP_T); add_component(p_ent, CTRANSFORM_COMP_T);
p_ct->active = true;
CJump_t* p_cjump = add_component(p_ent, CJUMP_COMP_T); CJump_t* p_cjump = add_component(p_ent, CJUMP_COMP_T);
p_cjump->jump_speed = 680; p_cjump->jump_speed = 680;