Commit graph

21 commits

Author SHA1 Message Date
MascaraSnake
193a592d46 Merge branch 'dyn-alloc-action-name' into 'next'
Dynamically allocate space for a state's action field

See merge request STJr/SRB2!1478
2022-12-31 09:35:15 +00:00
sphere
27f2b04109 Merge branch 'readhuditem-parse-fix' into 'next'
readhuditem parse fixes

Closes #887

See merge request STJr/SRB2!1816
2022-09-28 21:04:44 +00:00
SteelT
fe8be242d0 readhuditem parse fixes
Fix readhuditem not parsing flags correctly
Fix unknown word warning erroneously describing the HUD item as a level header
2022-09-26 02:31:50 -04:00
spherallic
508536e3d7 Fix map number checks when reading unlockable conditions. 2022-09-05 20:41:09 +02:00
spherallic
14295ac7de 2022 2022-03-03 20:24:46 +01:00
SteelT
a72d6bba22 Merge branch 'skin-unlocks-sanity' into 'next'
[SUGOI] Remove skin->availability, add SECRET_SKIN

See merge request STJr/SRB2!1474
2021-05-28 21:30:16 -04:00
sphere
186ef0479d Merge branch 'death-of-musicslots2' into 'next'
Remove music slot compatibility

See merge request STJr/SRB2!1321
2021-05-19 05:27:31 -04:00
Steel Titanium
a2667f4dc9 Merge branch 'master' into next 2021-05-11 20:08:44 -04:00
Sally Coolatta
5d93f86499 Merge branch 'next' into skin-unlocks-sanity 2021-05-08 12:55:46 -04:00
Monster Iestyn
a98b0834a6 Merge branch 'deh-buffer-unclog' into 'next'
Fix a series of buffer overflows in SOC (primarily Character section) loading

See merge request STJr/SRB2!1457
2021-05-07 18:47:51 -04:00
LJ Sonic
d325c7e6d3 The year is 2021 2021-05-07 17:45:56 +02:00
GoldenTails
691b17a88e Dynamically allocate space for a state's action field
It was previously restricted arbitrarily to 32 cells (31 usable characters) due to someone else's laziness
2021-04-27 17:28:49 -05:00
Sally Coolatta
92107f28d5 Add string variable for unlockables and emblems
Skin unlockables / skin emblems are now checked at runtime to see if there's any matches.
2021-04-25 17:54:47 -04:00
Sally Coolatta
8278e621fb Removed skin->availability
Locked skins now are a specific unlockable type, instead of being tied to the skin's properties.

This has plagued custom gamedata since 2.2 launch. It's extremely obnoxious having to set aside random numbers as dummy unlockables just to ensure that Amy Fang & Metal are unlocked from the start in a custom map pack.

Other changes made to accommodate this:
 - R_GetSkinAvailabilities is now created from the list of unlockables set to skin type. (1st skin unlockable defined is (1), 2nd skin unlockable defined is (1 << 1), etc...)
- The "Added skin x" print shows up when loading addons but not at all for the base game, because the previous behavior of hiding based on if the skin was locked would now require iterating unlockables, which felt wrong to do during that stage of the loading process
 - I noticed in my test wad that Sonic&Tails would give you Sonic&Sonic out if Tails was locked. I fixed that by making both skins required to show the character select option.

Mods that reserved empty dummy unlockables for Amy Fang and Metal won't have to do anything. Mods that wanted to re-lock them behind different requirements will have to update, but in the future they will not have to be in specific slots. Additionally, now Sonic Tails and Knuckles can also be locked for mods.
2021-04-25 07:18:32 -04:00
Sally Coolatta
ce3c5e081e Missed a few lines in the prev commit 2021-04-20 22:19:56 -04:00
Sally Coolatta
8f01e85ade Allow spaces in captions defined in SOC 2021-04-20 22:10:11 -04:00
X.organic
f0f3b33d71
Edit note_size alias to get rid of warnings 2021-04-12 19:09:21 +02:00
X.organic
701c6c8968
Fix myhashfgets-related buffer overflows in deh_soc.c 2021-04-12 19:09:12 +02:00
Steel Titanium
83e80eef9b Add deprecation warning when using the level header parameter 2020-12-12 18:54:47 -05:00
Steel Titanium
ab156e1709 Remove music slot compatibility 2020-12-11 23:11:15 -05:00
GoldenTails
8fef61aa29 Split dehacked.c into multiple files. 2020-11-23 21:42:26 -06:00