Skip to content

Add ZDoom "Line Horizon" special #794

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Add ZDoom "Line Horizon" special #794

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bc344de
comment out unsupported line specials
elf-alchemist Nov 4, 2025
e3055a6
restore accidently removed line
elf-alchemist Nov 4, 2025
349086e
add horizon line special support
elf-alchemist Nov 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
91 changes: 46 additions & 45 deletions prboom2/src/dsda/line_special.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@ typedef enum {
zl_door_open = 11,
zl_door_raise = 12,
zl_door_locked_raise = 13,
zl_door_animated = 14,
zl_autosave = 15,
zl_transfer_wall_light = 16,
//zl_door_animated = 14,
//zl_autosave = 15,
//zl_transfer_wall_light = 16,
zl_thing_raise = 17,
zl_start_conversation = 18,
//zl_start_conversation = 18,
zl_thing_stop = 19,
zl_floor_lower_by_value = 20,
zl_floor_lower_to_lowest = 21,
Expand Down Expand Up @@ -77,16 +77,16 @@ typedef enum {
zl_ceiling_crush_raise_and_stay = 45,
zl_floor_crush_stop = 46,
zl_ceiling_move_to_value = 47,
zl_sector_attach_3d_midtex = 48,
zl_glass_break = 49,
zl_extra_floor_light_only = 50,
zl_sector_set_link = 51,
//zl_sector_attach_3d_midtex = 48,
//zl_glass_break = 49,
//zl_extra_floor_light_only = 50,
//zl_sector_set_link = 51,
zl_scroll_wall = 52,
zl_line_set_texture_offset = 53,
zl_sector_change_flags = 54,
zl_line_set_blocking = 55,
zl_line_set_texturescale = 56,
zl_sector_set_portal = 57,
//zl_sector_set_portal = 57,
zl_sector_copy_scroller = 58,
zl_polyobj_or_move_to_spot = 59,
zl_plat_perpetual_raise = 60,
Expand All @@ -108,13 +108,13 @@ typedef enum {
zl_teleport_other = 76,
zl_teleport_group = 77,
zl_teleport_in_sector = 78,
zl_thing_set_conversation = 79,
zl_acs_execute = 80,
zl_acs_suspend = 81,
zl_acs_terminate = 82,
zl_acs_locked_execute = 83,
zl_acs_execute_with_result = 84,
zl_acs_locked_execute_door = 85,
//zl_thing_set_conversation = 79,
//zl_acs_execute = 80,
//zl_acs_suspend = 81,
//zl_acs_terminate = 82,
//zl_acs_locked_execute = 83,
//zl_acs_execute_with_result = 84,
//zl_acs_locked_execute_door = 85,
zl_polyobj_move_to_spot = 86,
zl_polyobj_stop = 87,
zl_polyobj_move_to = 88,
Expand All @@ -127,7 +127,7 @@ typedef enum {
zl_floor_and_ceiling_lower_by_value = 95,
zl_floor_and_ceiling_raise_by_value = 96,
zl_ceiling_lower_and_crush_dist = 97,
zl_sector_set_translucent = 98,
//zl_sector_set_translucent = 98,
zl_floor_raise_and_crushdoom = 99,
zl_scroll_texture_left = 100,
zl_scroll_texture_right = 101,
Expand All @@ -136,9 +136,9 @@ typedef enum {
zl_ceiling_crush_and_raise_silent_dist = 104,
zl_door_wait_raise = 105,
zl_door_wait_close = 106,
zl_line_set_portal_target = 107,
//zl_line_set_portal_target = 107,

zl_light_force_lightning = 109,
//zl_light_force_lightning = 109,
zl_light_raise_by_value = 110,
zl_light_lower_by_value = 111,
zl_light_change_to_value = 112,
Expand All @@ -147,7 +147,7 @@ typedef enum {
zl_light_flicker = 115,
zl_light_strobe = 116,
zl_light_stop = 117,
zl_plane_copy = 118,
//zl_plane_copy = 118,
zl_thing_damage = 119,
zl_radius_quake = 120,
zl_line_set_identification = 121,
Expand All @@ -156,7 +156,7 @@ typedef enum {

zl_thing_set_special = 127,
zl_thrust_thing_z = 128,
zl_use_puzzle_item = 129,
//zl_use_puzzle_item = 129,
zl_thing_activate = 130,
zl_thing_deactivate = 131,
zl_thing_remove = 132,
Expand All @@ -167,41 +167,41 @@ typedef enum {
zl_thing_spawn_no_fog = 137,
zl_floor_waggle = 138,
zl_thing_spawn_facing = 139,
zl_sector_change_sound = 140,
//zl_sector_change_sound = 140,

zl_teleport_no_stop = 154,

zl_line_set_portal = 156,
zl_set_global_fog_parameter = 157,
zl_fs_execute = 158,
zl_sector_set_plane_reflection = 159,
zl_sector_set_3d_floor = 160,
zl_sector_set_contents = 161,
//zl_line_set_portal = 156,
//zl_set_global_fog_parameter = 157,
//zl_fs_execute = 158,
//zl_sector_set_plane_reflection = 159,
//zl_sector_set_3d_floor = 160,
//zl_sector_set_contents = 161,

zl_ceiling_crush_and_raise_dist = 168,
zl_generic_crusher2 = 169,
zl_sector_set_ceiling_scale2 = 170,
zl_sector_set_floor_scale2 = 171,
zl_plat_up_nearest_wait_down_stay = 172,
zl_noise_alert = 173,
zl_send_to_communicator = 174,
//zl_send_to_communicator = 174,
zl_thing_projectile_intercept = 175,
zl_thing_change_tid = 176,
zl_thing_hate = 177,
zl_thing_projectile_aimed = 178,
zl_change_skill = 179,
zl_thing_set_translation = 180,
zl_plane_align = 181,
zl_line_mirror = 182,
zl_line_align_ceiling = 183,
zl_line_align_floor = 184,
//zl_change_skill = 179,
//zl_thing_set_translation = 180,
//zl_plane_align = 181,
//zl_line_mirror = 182,
//zl_line_align_ceiling = 183,
//zl_line_align_floor = 184,
zl_sector_set_rotation = 185,
zl_sector_set_ceiling_panning = 186,
zl_sector_set_floor_panning = 187,
zl_sector_set_ceiling_scale = 188,
zl_sector_set_floor_scale = 189,
zl_static_init = 190,
zl_set_player_property = 191,
//zl_set_player_property = 191,
zl_ceiling_lower_to_highest_floor = 192,
zl_ceiling_lower_instant = 193,
zl_ceiling_raise_instant = 194,
Expand All @@ -222,8 +222,8 @@ typedef enum {
zl_transfer_heights = 209,
zl_transfer_floor_light = 210,
zl_transfer_ceiling_light = 211,
zl_sector_set_color = 212,
zl_sector_set_fade = 213,
//zl_sector_set_color = 212,
//zl_sector_set_fade = 213,
zl_sector_set_damage = 214,
zl_teleport_line = 215,
zl_sector_set_gravity = 216,
Expand All @@ -236,18 +236,18 @@ typedef enum {
zl_scroll_floor = 223,
zl_scroll_ceiling = 224,
zl_scroll_texture_offsets = 225,
zl_acs_execute_always = 226,
//zl_acs_execute_always = 226,
zl_point_push_set_force = 227,
zl_plat_raise_and_stay_tx0 = 228,
zl_thing_set_goal = 229,
//zl_thing_set_goal = 229,
zl_plat_up_by_value_stay_tx = 230,
zl_plat_toggle_ceiling = 231,
zl_light_strobe_doom = 232,
zl_light_min_neighbor = 233,
zl_light_max_neighbor = 234,
zl_floor_transfer_trigger = 235,
zl_floor_transfer_numeric = 236,
zl_change_camera = 237,
//zl_change_camera = 237,
zl_floor_raise_to_lowest_ceiling = 238,
zl_floor_raise_by_value_tx_ty = 239,
zl_floor_raise_by_texture = 240,
Expand Down Expand Up @@ -286,16 +286,17 @@ typedef enum {
zl_stairs_build_down_doom_sync = 272,

zl_stairs_build_up_doom_crush = 273,
zl_door_animated_close = 274,
//zl_door_animated_close = 274,
zl_floor_stop = 275,
zl_ceiling_stop = 276,
zl_sector_set_floor_glow = 277,
zl_sector_set_ceiling_glow = 278,
//zl_sector_set_floor_glow = 277,
//zl_sector_set_ceiling_glow = 278,
zl_floor_move_to_value_and_crush = 279,
zl_ceiling_move_to_value_and_crush = 280,
zl_line_set_automap_flags = 281,
zl_line_set_automap_style = 282,
zl_polyobj_stop_sound = 283,
//zl_polyobj_stop_sound = 283,
//zl_generic_crusher_dist = 284,

zl_map_set_colormap = 2701,
zl_sector_set_colormap = 2702,
Expand Down
4 changes: 4 additions & 0 deletions prboom2/src/p_map.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
#include "dsda/excmd.h"
#include "dsda/map_format.h"
#include "dsda/mapinfo.h"
#include "dsda/line_special.h"

#include "heretic/def.h"

Expand Down Expand Up @@ -2330,6 +2331,9 @@ dboolean PTR_ShootTraverse (intercept_t* in)
if (li->special)
map_format.shoot_special_line(shootthing, li);

if (map_format.zdoom && li->special == zl_line_horizon)
return false;

if (li->flags & ML_TWOSIDED &&
!(li->flags & (ML_BLOCKEVERYTHING | ML_BLOCKHITSCAN)))
{ // crosses a two sided (really 2s) line
Expand Down
9 changes: 9 additions & 0 deletions prboom2/src/p_mobj.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
#include "dsda/excmd.h"
#include "dsda/map_format.h"
#include "dsda/mapinfo.h"
#include "dsda/line_special.h"
#include "dsda/settings.h"
#include "dsda/skill_info.h"
#include "dsda/spawn_number.h"
Expand Down Expand Up @@ -515,6 +516,14 @@ static void P_XYMovement (mobj_t* mo)
return;
}
}

// [RH] Don't explode on horizon lines.
if (map_format.zdoom && blockline->special == zl_line_horizon)
{
P_RemoveMobj(mo);
return;
}

P_ExplodeMissile(mo);
}
else // whatever else it is, it is now standing still in (x,y)
Expand Down
8 changes: 8 additions & 0 deletions prboom2/src/r_segs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@
#include "lprintf.h"

#include "dsda/mapinfo.h"
#include "dsda/line_special.h"
#include "dsda/map_format.h"
#include "dsda/render_stats.h"

// OPTIMIZE: closed two sided lines as single sided
Expand Down Expand Up @@ -929,6 +931,12 @@ void R_StoreWallRange(const int start, const int stop)
}
}

if (map_format.zdoom && curline->linedef->special == zl_line_horizon)
{
rw_scale = ds_p->scale1 = ds_p->scale2 = rw_scalestep = 0;
midtexture = toptexture = bottomtexture = maskedtexture = 0;
}

// calculate rw_offset (only needed for textured lines)
segtextured = midtexture | toptexture | bottomtexture | maskedtexture;

Expand Down
Loading