Skip to content

Commit

Permalink
feat(zscript): special layer for non-overhead ffc draws
Browse files Browse the repository at this point in the history
  • Loading branch information
EmilyV99 committed Aug 6, 2023
1 parent b6e7680 commit d8d123b
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 1 deletion.
3 changes: 2 additions & 1 deletion resources/include/std_zh/std_constants.zh
Expand Up @@ -3913,7 +3913,8 @@ enum
SPLAYER_OVERHEAD_CMB, //Overhead combos
SPLAYER_OVERHEAD_FFC, //Overhead ffcs
SPLAYER_DARKROOM_UNDER, //Under dark room darkness
SPLAYER_DARKROOM_OVER //Over dark room darkness
SPLAYER_DARKROOM_OVER, //Over dark room darkness
SPLAYER_FFC_DRAW //Non-Overhead ffcs
};

enum //for Hero->LiftFlags[]
Expand Down
1 change: 1 addition & 0 deletions src/base/zdefs.h
Expand Up @@ -3247,6 +3247,7 @@ enum //Special hardcoded draw layers
SPLAYER_OVERHEAD_FFC, //Overhead ffcs
SPLAYER_DARKROOM_UNDER, //Under dark room darkness
SPLAYER_DARKROOM_OVER, //Over dark room darkness
SPLAYER_FFC_DRAW, //Non-Overhead ffcs
};

//
Expand Down
1 change: 1 addition & 0 deletions src/zc/maps.cpp
Expand Up @@ -3935,6 +3935,7 @@ void draw_screen(mapscr* this_screen, bool showhero, bool runGeneric)
draw_msgstr(1, true);

do_layer(scrollbuf, -3, 0, this_screen, 0, 0, 2); // freeform combos!
do_primitives(temp_buf, SPLAYER_FFC_DRAW, this_screen, 0, playing_field_offset);

if(!XOR(this_screen->flags7&fLAYER2BG, DMaps[currdmap].flags&dmfLAYER2BG))
{
Expand Down

0 comments on commit d8d123b

Please sign in to comment.