From 676d26bc2273d2179988c739001524026360bf13 Mon Sep 17 00:00:00 2001 From: viciious Date: Fri, 21 Jun 2024 20:55:28 +0300 Subject: [PATCH] More vanilla-like plats and doors --- doomdef.h | 4 ++-- p_doors.c | 6 +++--- p_plats.c | 4 ++-- p_spec.h | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/doomdef.h b/doomdef.h index 6e1cd1110..838c7d6c2 100644 --- a/doomdef.h +++ b/doomdef.h @@ -106,9 +106,9 @@ typedef int fixed_t; #endif #ifdef THINKERS_30HZ -#define THINKERS_TICS 1 -#else #define THINKERS_TICS 2 +#else +#define THINKERS_TICS 4 #endif #define ANG45 0x20000000 diff --git a/p_doors.c b/p_doors.c index 99507c3a2..e55eaf098 100644 --- a/p_doors.c +++ b/p_doors.c @@ -69,7 +69,7 @@ void T_VerticalDoor (vldoor_t *door) break; case close30ThenOpen: door->direction = 0; - door->topcountdown = 15*30*THINKERS_TICS; + door->topcountdown = 35*30*THINKERS_TICS; break; default: break; @@ -411,7 +411,7 @@ void P_SpawnDoorCloseIn30 (sector_t *sec) door->direction = 0; door->type = normal; door->speed = VDOORSPEED; - door->topcountdown = 30 * 15 * THINKERS_TICS; + door->topcountdown = 30 * 35 * THINKERS_TICS; } /*================================================================== */ @@ -435,6 +435,6 @@ void P_SpawnDoorRaiseIn5Mins (sector_t *sec, int secnum) door->topheight = P_FindLowestCeilingSurrounding(sec); door->topheight -= 4*FRACUNIT; door->topwait = VDOORWAIT; - door->topcountdown = 5 * 60 * 15 * THINKERS_TICS; + door->topcountdown = 5 * 60 * 35 * THINKERS_TICS; } diff --git a/p_plats.c b/p_plats.c index 1f727db52..3351aca55 100644 --- a/p_plats.c +++ b/p_plats.c @@ -153,7 +153,7 @@ int EV_DoPlat(line_t *line,plattype_e type,int amount) if (plat->low > sec->floorheight) plat->low = sec->floorheight; plat->high = sec->floorheight; - plat->wait = 15*PLATWAIT; + plat->wait = 35*PLATWAIT; plat->status = down; S_StartPositionedSound((void *)sec,sfx_pstart,&P_SectorOrg); break; @@ -165,7 +165,7 @@ int EV_DoPlat(line_t *line,plattype_e type,int amount) plat->high = P_FindHighestFloorSurrounding(sec); if (plat->high < sec->floorheight) plat->high = sec->floorheight; - plat->wait = 15*PLATWAIT; + plat->wait = 35*PLATWAIT; plat->status = P_Random()&1; S_StartPositionedSound((void *)sec,sfx_pstart,&P_SectorOrg); break; diff --git a/p_spec.h b/p_spec.h index 3c081d024..86c337611 100644 --- a/p_spec.h +++ b/p_spec.h @@ -222,7 +222,7 @@ typedef struct VINT type; } plat_t; -#define PLATWAIT 3*2/THINKERS_TICS /* seconds */ +#define PLATWAIT 3/THINKERS_TICS /* seconds */ #define PLATSPEED (FRACUNIT*THINKERS_TICS) #define MAXPLATS 30 @@ -267,8 +267,8 @@ typedef struct VINT topcountdown; /* when it reaches 0, start going down */ } vldoor_t; -#define VDOORSPEED FRACUNIT*3*THINKERS_TICS -#define VDOORWAIT 140/THINKERS_TICS +#define VDOORSPEED FRACUNIT*2*THINKERS_TICS +#define VDOORWAIT 150/THINKERS_TICS void EV_VerticalDoor (line_t *line, mobj_t *thing); int EV_DoLockedDoor(line_t* line, vldoor_e type, mobj_t* thing);