Skip to content

Heretic umapinfo support #532

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 21 commits into
base: master
Choose a base branch
from
Open

Heretic umapinfo support #532

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
032003f
Heretic umapinfo: levelname
Pedro-Beirao Nov 14, 2024
9cae651
Heretic umapinfo: author
Pedro-Beirao Nov 14, 2024
c9ac379
Heretic umapinfo: fix entering levelname
Pedro-Beirao Nov 14, 2024
3353cec
Heretic umapinfo: exitpic enterpic
Pedro-Beirao Nov 14, 2024
be2c7f9
Heretic umapinfo: move stats up in gameepisode > 3
Pedro-Beirao Nov 14, 2024
8932387
Heretic umapinfo: partime
Pedro-Beirao Nov 15, 2024
6653360
Heretic umapinfo: enterpic default handling
Pedro-Beirao Nov 15, 2024
3143538
Heretic umapinfo: endgame
Pedro-Beirao Nov 15, 2024
33893e0
Heretic umapinfo: finale
Pedro-Beirao Nov 16, 2024
f070ce2
Heretic umapinfo: disable not implemented keys
Pedro-Beirao Nov 16, 2024
762bb63
Heretic umapinfo: endpic
Pedro-Beirao Nov 16, 2024
20e10f3
Heretic umapinfo: enable nointermission
Pedro-Beirao Nov 16, 2024
915859d
Heretic umapinfo: define endpic
Pedro-Beirao Nov 16, 2024
cd35a8f
Support episode patches
Pedro-Beirao Aug 8, 2025
cc47cbd
Remove support for custom patches in menu in heretic
Pedro-Beirao Aug 8, 2025
be926d0
If there is a interpic, it should display entering even on gameepisod…
Pedro-Beirao Aug 9, 2025
de41d7d
Levelpic
Pedro-Beirao Aug 9, 2025
41231b9
Fix warnings
Pedro-Beirao Aug 9, 2025
1c42673
Small fixes
Pedro-Beirao Aug 10, 2025
d9ed5c6
Add bossaction
Pedro-Beirao Aug 10, 2025
74785cb
Add endbunny
Pedro-Beirao Aug 12, 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
5 changes: 4 additions & 1 deletion prboom2/src/dsda/mapinfo/u.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,7 @@ extern int finalecount;
extern const char* finaletext;
extern const char* finaleflat;
extern const char* finalepatch;
extern const char* endpic;
extern int acceleratestage;
extern int midstage;

Expand Down Expand Up @@ -244,6 +245,8 @@ int dsda_UStartFinale(void) {

if (!finaleflat)
finaleflat = "FLOOR4_8"; // use a single fallback for all maps.

endpic = gamemapinfo->endpic;

return true;
}
Expand Down Expand Up @@ -497,7 +500,7 @@ int dsda_UPrepareFinale(int* result) {
void dsda_ULoadMapInfo(void) {
int p;

if (dsda_Flag(dsda_arg_nomapinfo) || dsda_UseMapinfo() || raven)
if (dsda_Flag(dsda_arg_nomapinfo) || dsda_UseMapinfo() || hexen)
return;

p = -1;
Expand Down
4 changes: 2 additions & 2 deletions prboom2/src/dsda/mobjinfo.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,14 +90,14 @@ dsda_deh_mobjinfo_t dsda_GetDehMobjInfo(int index) {
}

void dsda_InitializeMobjInfo(int zero, int max, int count) {
extern dboolean raven;
extern dboolean hexen;

num_mobj_types = count;
mobj_types_zero = zero;

mobjinfo = Z_Calloc(num_mobj_types, sizeof(*mobjinfo));

if (raven) return;
if (hexen) return;

deh_mobj_index_hash.start_index = num_mobj_types;
deh_mobj_index_hash.end_index = num_mobj_types;
Expand Down
257 changes: 256 additions & 1 deletion prboom2/src/dsda/name.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,12 @@

#include "string.h"

#include "doomdef.h"
#include "dsda/mobjinfo.h"

#include "name.h"

static const char* const actor_names[] = {
static const char* const actor_names_doom[] = {
"DoomPlayer",
"ZombieMan",
"ShotgunGuy",
Expand Down Expand Up @@ -275,6 +276,259 @@ static const char* const actor_names[] = {
NULL
};

static const char* const actor_names_heretic[] = {
/* 1 */ "CrystalVial",
/* 2 */ "SilverShield",
/* 3 */ "EnchantedShield",
/* 4 */ "BagOfHolding",
/* 5 */ "SuperMap",
/* 6 */ "ArtiInvisibility",
/* 7 */ "ArtiHealth",
/* 8 */ "ArtiFly",
/* 9 */ "ArtiInvulnerability",
/* 10 */ "ArtiTomeOfPower",
/* 11 */ "ArtiEgg",
/* 12 */ "EggFX",
/* 13 */ "ArtiSuperHealth",
/* 14 */ "ArtiTorch",
/* 15 */ "ArtiTimeBomb",
/* 16 */ "ActivatedTimeBomb",
/* 17 */ "ArtiTeleport",
/* 18 */ "Pod",
/* 19 */ "PodGoo",
/* 20 */ "PodGenerator",
/* 21 */ "WaterSplash",
/* 22 */ "WaterSplashBase",
/* 23 */ "LavaSplash",
/* 24 */ "LavaSmoke",
/* 25 */ "SludgeChunk",
/* 26 */ "SludgeSplash",
/* 27 */ "SkullHang70",
/* 28 */ "SkullHang60",
/* 29 */ "SkullHang45",
/* 30 */ "SkullHang35",
/* 31 */ "Chandelier",
/* 32 */ "SerpentTorch",
/* 33 */ "SmallPillar",
/* 34 */ "StalagmiteSmall",
/* 35 */ "StalagmiteLarge",
/* 36 */ "StalactiteSmall",
/* 37 */ "StalactiteLarge",
/* 38 */ "FireBrazier",
/* 39 */ "Barrel",
/* 40 */ "BrownPillar",
/* 41 */ "Moss1",
/* 42 */ "Moss2",
/* 43 */ "WallTorch",
/* 44 */ "HangingCorpse",
/* 45 */ "KeyGizmoBlue",
/* 46 */ "KeyGizmoGreen",
/* 47 */ "KeyGizmoYellow",
/* 48 */ "KeyGizmoFloat",
/* 49 */ "Volcano",
/* 50 */ "VolcanoBlast",
/* 51 */ "VolcanoTBlast",
/* 52 */ "TeleGlitterGenerator1",
/* 53 */ "TeleGlitterGenerator2",
/* 54 */ "TeleGlitter1",
/* 55 */ "TeleGlitter2",
/* 56 */ "TeleportFog",
/* 57 */ "TeleportDest",
/* 58 */ "StaffPuff",
/* 59 */ "StaffPuff2",
/* 60 */ "BeakPuff",
/* 61 */ "Gauntlets",
/* 62 */ "GauntletPuff1",
/* 63 */ "GauntletPuff2",
/* 64 */ "Blaster",
/* 65 */ "BlasterFX1",
/* 66 */ "BlasterSmoke",
/* 67 */ "Ripper",
/* 68 */ "BlasterPuffCrash",
/* 69 */ "BlasterPuffSpawn",
/* 70 */ "MaceSpawner",
/* 71 */ "MaceFX1",
/* 72 */ "MaceFX2",
/* 73 */ "MaceFX3",
/* 74 */ "MaceFX4",
/* 75 */ "SkullRod",
/* 76 */ "HornRodFX1",
/* 77 */ "HornRodFX2",
/* 78 */ "RainPillar1",
/* 79 */ "RainPillar2",
/* 80 */ "RainPillar",
/* 81 */ "RainPillar4",
/* 82 */ "GoldWandFX1",
/* 83 */ "GoldWandFX2",
/* 84 */ "GoldWandPuff1",
/* 85 */ "GoldWandPuff2",
/* 86 */ "PhoenixRod",
/* 87 */ "PhoenixFX1",
/* 88 */ "PhoenixFXUnknown",
/* 89 */ "PhoenixPuff",
/* 90 */ "PhoenixFX2",
/* 91 */ "Crossbow",
/* 92 */ "CrossbowFX1",
/* 93 */ "CrossbowFX2",
/* 94 */ "CrossbowFX3",
/* 95 */ "CrossbowFX4",
/* 96 */ "Blood",
/* 97 */ "BloodSplatter",
/* 98 */ "HereticPlayer",
/* 99 */ "BloodySkull",
/* 100 */ "ChickenPlayer",
/* 101 */ "Chicken",
/* 102 */ "Feather",
/* 103 */ "Mummy",
/* 104 */ "MummyLeader",
/* 105 */ "MummyGhost",
/* 106 */ "MummyLeaderGhost",
/* 107 */ "MummySoul",
/* 108 */ "MummyFX1",
/* 109 */ "Beast",
/* 110 */ "BeastBall",
/* 111 */ "BurnBall",
/* 112 */ "BurnBallFB",
/* 113 */ "Puffy",
/* 114 */ "Snake",
/* 115 */ "SnakeProjA",
/* 116 */ "SnakeProjB",
/* 117 */ "Ironlich",
/* 118 */ "HeadFX1",
/* 119 */ "HeadFX2",
/* 120 */ "HeadFX3",
/* 121 */ "Whirlwind",
/* 122 */ "Clink",
/* 123 */ "Wizard",
/* 124 */ "WizardFX1",
/* 125 */ "HereticImp",
/* 126 */ "HereticImpLeader",
/* 127 */ "HereticImpChunk1",
/* 128 */ "HereticImpChunk2",
/* 129 */ "HereticImpBall",
/* 130 */ "Knight",
/* 131 */ "KnightGhost",
/* 132 */ "KnightAxe",
/* 133 */ "RedAxe",
/* 134 */ "Sorcerer1",
/* 135 */ "SorcererFX1",
/* 136 */ "Sorcerer2",
/* 137 */ "Sorcerer2FX1",
/* 138 */ "Sorcerer2FXSpark",
/* 139 */ "Sorcerer2FX2",
/* 140 */ "Sorcerer2Telefade",
/* 141 */ "Minotaur",
/* 142 */ "MinotaurFX1",
/* 143 */ "MinotaurFX2",
/* 144 */ "MinotaurFX3",
/* 145 */ "KeyGreen",
/* 146 */ "KeyBlue",
/* 147 */ "KeyYellow",
/* 148 */ "GoldWandAmmo",
/* 149 */ "GoldWandHefty",
/* 150 */ "MaceAmmo",
/* 151 */ "MaceHefty",
/* 152 */ "CrossbowAmmo",
/* 153 */ "CrossbowHefty",
/* 154 */ "SkullRodAmmo",
/* 155 */ "SkullRodHefty",
/* 156 */ "PhoenixRodAmmo",
/* 157 */ "PhoenixRodHefty",
/* 158 */ "BlasterAmmo",
/* 159 */ "BlasterHefty",
/* */ "Deh_Actor_160",
/* */ "Deh_Actor_161",
/* */ "Deh_Actor_162",
/* */ "Deh_Actor_163",
/* */ "Deh_Actor_164",
/* */ "Deh_Actor_165",
/* */ "Deh_Actor_166",
/* */ "Deh_Actor_167",
/* */ "Deh_Actor_168",
/* */ "Deh_Actor_169",
/* */ "Deh_Actor_170",
/* */ "Deh_Actor_171",
/* */ "Deh_Actor_172",
/* */ "Deh_Actor_173",
/* */ "Deh_Actor_174",
/* */ "Deh_Actor_175",
/* */ "Deh_Actor_176",
/* */ "Deh_Actor_177",
/* */ "Deh_Actor_178",
/* */ "Deh_Actor_179",
/* */ "Deh_Actor_180",
/* */ "Deh_Actor_181",
/* */ "Deh_Actor_182",
/* */ "Deh_Actor_183",
/* */ "Deh_Actor_184",
/* */ "Deh_Actor_185",
/* */ "Deh_Actor_186",
/* */ "Deh_Actor_187",
/* */ "Deh_Actor_188",
/* */ "Deh_Actor_189",
/* */ "Deh_Actor_190",
/* */ "Deh_Actor_191",
/* */ "Deh_Actor_192",
/* */ "Deh_Actor_193",
/* */ "Deh_Actor_194",
/* */ "Deh_Actor_195",
/* */ "Deh_Actor_196",
/* */ "Deh_Actor_197",
/* */ "Deh_Actor_198",
/* */ "Deh_Actor_199",
/* */ "Deh_Actor_200",
/* */ "Deh_Actor_201",
/* */ "Deh_Actor_202",
/* */ "Deh_Actor_203",
/* */ "Deh_Actor_204",
/* */ "Deh_Actor_205",
/* */ "Deh_Actor_206",
/* */ "Deh_Actor_207",
/* */ "Deh_Actor_208",
/* */ "Deh_Actor_209",
/* */ "Deh_Actor_210",
/* */ "Deh_Actor_211",
/* */ "Deh_Actor_212",
/* */ "Deh_Actor_213",
/* */ "Deh_Actor_214",
/* */ "Deh_Actor_215",
/* */ "Deh_Actor_216",
/* */ "Deh_Actor_217",
/* */ "Deh_Actor_218",
/* */ "Deh_Actor_219",
/* */ "Deh_Actor_220",
/* */ "Deh_Actor_221",
/* */ "Deh_Actor_222",
/* */ "Deh_Actor_223",
/* */ "Deh_Actor_224",
/* */ "Deh_Actor_225",
/* */ "Deh_Actor_226",
/* */ "Deh_Actor_227",
/* */ "Deh_Actor_228",
/* */ "Deh_Actor_229",
/* */ "Deh_Actor_230",
/* */ "Deh_Actor_231",
/* */ "Deh_Actor_232",
/* */ "Deh_Actor_233",
/* */ "Deh_Actor_234",
/* */ "Deh_Actor_235",
/* */ "Deh_Actor_236",
/* */ "Deh_Actor_237",
/* */ "Deh_Actor_238",
/* */ "Deh_Actor_239",
/* */ "Deh_Actor_240",
/* */ "Deh_Actor_241",
/* */ "Deh_Actor_242",
/* */ "Deh_Actor_243",
/* */ "Deh_Actor_244",
/* */ "Deh_Actor_245",
/* */ "Deh_Actor_246",
/* */ "Deh_Actor_247",
/* */ "Deh_Actor_248",
/* */ "Deh_Actor_249",
NULL
};

static const char* const action_names[] = {
/* 0 */ "",
/* 1 */ "Polyobj_StartLine",
Expand Down Expand Up @@ -567,6 +821,7 @@ static const char* const action_names[] = {

int dsda_ActorNameToType(const char* name) {
int i;
const char** const actor_names = raven ? actor_names_heretic : actor_names_doom;

for (i = 0; actor_names[i]; ++i)
if (!stricmp(name, actor_names[i]))
Expand Down
10 changes: 6 additions & 4 deletions prboom2/src/f_finale.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ int finalecount;
const char* finaletext;
const char* finaleflat;
const char* finalepatch;
const char* endpic;

// defines for the end mission display text // phares

Expand All @@ -88,6 +89,11 @@ void F_StartFinale (void)
int mnum;
int muslump;

finaletext = NULL;
finaleflat = NULL;
finalepatch = NULL;
endpic = NULL;

if (heretic) return Heretic_F_StartFinale();
if (hexen) return Hexen_F_StartFinale();

Expand All @@ -98,10 +104,6 @@ void F_StartFinale (void)
// killough 3/28/98: clear accelerative text flags
acceleratestage = midstage = 0;

finaletext = NULL;
finaleflat = NULL;
finalepatch = NULL;

dsda_InterMusic(&mnum, &muslump);

if (muslump >= 0)
Expand Down
Loading
Loading