80486DX2-66/taisei
1
0
Fork 1
Code Issues Activity

Purge some dead code

Browse source
This commit is contained in:
Andrei Alexeyev 2020-04-28 00:13:15 +03:00
parent 9f10dfef21
commit a7eb246664
No known key found for this signature in database
GPG key ID: 363707CD4C7FE8A4
5 changed files with 0 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/player.c
View file

@ -96,11 +96,6 @@ void player_stage_post_init(Player *plr) {
void player_free(Player *plr) {
COEVENT_CANCEL_ARRAY(plr->events);
if(plr->mode->procs.free) {
plr->mode->procs.free(plr);
}
r_texture_destroy(plr->bomb_portrait.tex);
aniplayer_free(&plr->ani);
ent_unregister(&plr->ent);
@ -115,10 +110,6 @@ bool player_set_power(Player *plr, short npow) {
int pow_base = clamp(npow, 0, PLR_MAX_POWER);
int pow_overflow = clamp(npow - PLR_MAX_POWER, 0, PLR_MAX_POWER_OVERFLOW);
if(plr->mode->procs.power) {
plr->mode->procs.power(plr, pow_base);
}
int oldpow = plr->power;
int oldpow_over = plr->power_overflow;
@ -617,15 +608,8 @@ DEFINE_TASK(player_logic) {
fapproach_p(&plr->focus_circle_alpha, !!(plr->inputflags & INFLAG_FOCUS), 1.0f/15.0f);
if(plr->mode->procs.think) {
plr->mode->procs.think(plr);
}
if(player_should_shoot(plr)) {
coevent_signal(&plr->events.shoot);
if(plr->mode->procs.shot) {
plr->mode->procs.shot(plr);
}
}
if(global.frames == plr->deathtime) {
@ -636,9 +620,6 @@ DEFINE_TASK(player_logic) {
}
}
void player_logic(Player* plr) {
}
static bool player_can_bomb(Player *plr) {
return (
!player_is_bomb_active(plr)
@ -651,7 +632,6 @@ static bool player_can_bomb(Player *plr) {
}
static bool player_bomb(Player *plr) {
if(global.boss && global.boss->current && global.boss->current->type == AT_ExtraSpell)
return false;
@ -670,10 +650,6 @@ static bool player_bomb(Player *plr) {
coevent_signal(&plr->events.bomb_used);
if(plr->mode->procs.bomb) {
plr->mode->procs.bomb(plr);
}
plr->bombs--;
if(plr->deathtime >= global.frames) {

1
src/player.h
View file

@ -193,7 +193,6 @@ void player_stage_post_init(Player *plr);
void player_free(Player *plr);
void player_draw_overlay(Player *plr);
void player_logic(Player *plr);
bool player_should_shoot(Player *plr);
bool player_set_power(Player *plr, short npow);

12
src/plrmodes.h
View file

@ -73,11 +73,6 @@ typedef struct PlayerCharacter {
typedef void (*PlayerModeInitProc)(Player *plr);
typedef void (*PlayerModeFreeProc)(Player *plr);
typedef void (*PlayerModeThinkProc)(Player *plr);
typedef void (*PlayerModeShotProc)(Player *plr);
typedef void (*PlayerModeBombProc)(Player *plr);
typedef void (*PlayerModeBombBgProc)(Player *plr);
typedef void (*PlayerModePowerProc)(Player *plr, short npow);
typedef void (*PlayerModePreloadProc)(void);
typedef double (*PlayerModePropertyProc)(Player *plr, PlrProperty prop);
@ -91,13 +86,6 @@ typedef struct PlayerMode {
struct {
PlayerModeInitProc init;
PlayerModeFreeProc free;
PlayerModeThinkProc think;
PlayerModeShotProc shot;
PlayerModeBombProc bomb;
ShaderRule bomb_shader;
PlayerModeBombBgProc bombbg;
PlayerModePowerProc power;
PlayerModePreloadProc preload;
PlayerModePropertyProc property;
} procs;

2
src/stage.c
View file

@ -487,8 +487,6 @@ static bool _stage_should_skip(void) {
}
static void stage_logic(void) {
player_logic(&global.plr);
process_boss(&global.boss);
process_enemies(&global.enemies);
process_projectiles(&global.projs, true);

13
src/stagedraw.c
View file

@ -1015,12 +1015,6 @@ void stage_draw_scene(StageInfo *stage) {
r_state_pop();
coevent_signal(&stagedraw.events.background_drawn);
// draw bomb background
// TODO: remove this; use events
if(global.plr.mode->procs.bombbg /*&& player_is_bomb_active(&global.plr)*/) {
global.plr.mode->procs.bombbg(&global.plr);
}
} else if(!key_nobg) {
r_clear(CLEAR_COLOR, RGBA(0, 0, 0, 1), 1);
}
@ -1038,13 +1032,6 @@ void stage_draw_scene(StageInfo *stage) {
coevent_signal(&stagedraw.events.postprocess_before_overlay);
// bomb effects shader if present and player bombing
// TODO: remove this; use events
if(global.plr.mode->procs.bomb_shader && player_is_bomb_active(&global.plr)) {
ShaderRule rules[] = { global.plr.mode->procs.bomb_shader, NULL };
apply_shader_rules(rules, foreground);
}
// draw overlay: in-viewport text and HUD elements, etc.
// this stuff is not affected by the screen shake effect
stage_draw_overlay();