Skip to content

Remove nebula bitmap limit#5128

Merged
BMagnu merged 3 commits into
scp-fs2open:masterfrom
MjnMixael:remove_nebula_bitmap_limit
Feb 20, 2023
Merged

Remove nebula bitmap limit#5128
BMagnu merged 3 commits into
scp-fs2open:masterfrom
MjnMixael:remove_nebula_bitmap_limit

Conversation

@MjnMixael

Copy link
Copy Markdown
Contributor

Removes MAX_NEB2_BITMAPS which was previously just 10; a limit I hit just but modularizing the MediaVPs nebula.tbl which only adds three bitmaps to retail's 8. Instead of simply raising the limit this PR vectorizes the bitmap list. Bitmaps are only ever referenced by name (unlike poofs which use flags) so it makes sense to just make this a quick vector of strings.

Sneaks in one small QoL parsing feature to check for end of file in a modular table so that -neb.tbms which don't specify poofs won't require two #end lines.

Comment thread fred2/bgbitmapdlg.cpp Outdated
@Baezon Baezon added enhancement A new feature or upgrade of an existing feature to add additional functionality. Waiting for Stable Marks a pull request that is to be merged after the next stable release, due to a release cycle labels Jan 18, 2023
@BMagnu BMagnu removed the Waiting for Stable Marks a pull request that is to be merged after the next stable release, due to a release cycle label Feb 14, 2023
@BMagnu BMagnu merged commit b2fe7a9 into scp-fs2open:master Feb 20, 2023
@MjnMixael MjnMixael deleted the remove_nebula_bitmap_limit branch February 20, 2023 14:13
Goober5000 added a commit to Goober5000/fs2open.github.com that referenced this pull request Jul 17, 2025
This allows the first half of a modular -neb.tbm to be skipped, allowing just poofs to be specified without the need for a preceding empty bitmap section.  It's a follow-up to scp-fs2open#5128 which allowed just bitmaps to be specified without the need for a subsequent empty poof section.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

enhancement A new feature or upgrade of an existing feature to add additional functionality.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants