5
9
Fork
You've already forked blankart
10

Fix SOC menus erroring out when SRB2_CONFIG_ENABLE_DISCORDRPC is OFF #225

Merged
NepDisk merged 1 commit from Nicomedia/blankart:discordless into next 2026年03月08日 23:29:42 +01:00
Contributor
Copy link

Adds not defined guards before calling get_menutype in deh_soc and dehacked.

The alternative was to let the enums for such menus be declared, but then hide the actual menu buttons as some code already does.

Adds not defined guards before calling get_menutype in deh_soc and dehacked. The alternative was to let the enums for such menus be declared, but then hide the actual menu buttons as some code already does.
Instead of being based on a fixed range of tiers, it is now based on a sine curve. The larger the useodds is the more they mash. Also don't calculate if you are going to be forced to mash anyway.
When stacking is on bots will attempt to stack them together. Their timing is based on their difficulty, less skilled bots are more wasteful while better bots are less wasteful. Also adjusts Rocket sneakers to also use this logic.
This might solve some cases of a bot stacking sneakers when it shouldn't
Thanks Alug! 014a22e933 
the latter calls strlen which is not needed as the empty string has no length
Thanks Alug! f4dc161831 e35dc9e097 2f684bba95 
dont early return on 0 len, let it be the falltrough case, this seems to help branch prediction
This reverts commit c3ee45e6fa.
This is an issue that mostly affects hardcode, Lua authors don't have to worry about this.
fixes #219
this probably should be rewritten to be camera based not player based instead
This will be super useful for programming bots that keep custom data
This reverts commit 8c624cdc65.
This reverts commit ba2b525172.
Saturn addition that we forgot about
This reverts commit b0da7ac519.
This reverts commit 80db0bde07.
This reverts commit ead56b83e3.
This reverts commit c582767603.
This reverts commit b0cf9cdc18.
the latter calls strlen which is not needed as the empty string has no length
This allows Blankart to be built on NixOS.
Reviewed-on: #221 
seen this a bunch of times now that occasionally something tries to access uninit values from a surface info
since those are really small we just always init them now
based on https://git.do.srb2.org/STJr/SRB2/-/merge_requests/2747 
It's 2026, and the only time since Super Mario Kart where 150cc is made unlockable is a god-damned arcade game
Plus, it literally makes more sense for Expert (200cc) to be the unlockable speed now
Add affine bounding struct, move affine_t to r_defs, add affine and bounding to drawcolumndata_t
The whole thing can actually draw in Software now!
Kudos to Generic
spryscale still has alignment issues
It builds and *doesn't* segfault; I can finally sleep!
Turns out the secret sauce is a... recursive function
Colormap translations work, jury's still out on if translucency and brightmaps do
Up next is... column splitting. Dear god.
Guest starring: even MORE flag variables!
Papersprites are all that remain
Trying to fix a horizontal screen clip bug
Why are we scaling it down *twice?*
- Vertical flips
- A proper fix for ceiling offsets/sprite splits
- Baked offsets, rolling offsets, offsets in general (saltyhop works again!)
- Did a few races, can't find any visual bugs of note
OpenGL implementation (hopefully) soon
We lose hardware spritesplits in the process; I do not care
Per internal talks
He made a BANDAID so TRASH even his TEAM clowned him
Now you can choose between sane rotation + scaling, or SRB2 rotation + scaling
Hooray?!
"Things yama forgets about until the last minute"
:holdingbugtears:
Currently software only; would require a shader or more "involved" solution for OpenGL
Software is a renderer I fully believe was crafted by the deranged
Reviewed-on: #223 
Minus tooltips since we don't have the RR c++ draw namespace yet...
Also this cleans up both object trackers that are used to be only called on object spawn and removal.
https://git.do.srb2.org/STJr/SRB2/-/merge_requests/1773/diffs\?commit_id\=929925771c0a8602f2747f2523d35c6c9d7d6382 
https://git.do.srb2.org/STJr/SRB2/-/merge_requests/1773/diffs\?commit_id\=19c73a3903b942b1459eb1e93ce36fcf9a1a3c53 
https://git.do.srb2.org/STJr/SRB2/-/merge_requests/1773/diffs\?commit_id\=0a4a9072a88e0277edd06a7488d6013ca452102a 
https://git.do.srb2.org/STJr/SRB2/-/merge_requests/1773/diffs\?commit_id\=aafcf49e9284a03558f0573f0e97a88c1b36dec6 
https://git.do.srb2.org/STJr/SRB2/-/merge_requests/1773/diffs\?commit_id\=7c30c4a75ea06d08211c079d5e0c8b47fba4f1b0 
This reverts commit cbb8738446.
https://git.do.srb2.org/STJr/SRB2/-/merge_requests/1773/diffs\?commit_id\=be5574a4c717b6e68efe9cd7c6666bbd9223a7f9 
git.do.srb2.org/STJr/SRB2/-/merge_requests/1773/diffs?commit_id=5865fdb21c0f31083dc26f93db31570e9f520ad5
https://git.do.srb2.org/STJr/SRB2/-/merge_requests/1773/diffs\?commit_id\=707687beea50a2bfcc14638e923ac516195351b1 
https://git.do.srb2.org/STJr/SRB2/-/merge_requests/1773/diffs\?commit_id\=690467290add5108aaa5f0cc3e14129b38ce405c 
https://git.do.srb2.org/STJr/SRB2/-/merge_requests/1773/diffs\?commit_id\=ec71baa6576e40085b2a51924fa6300bab690b900 
That goddamned Robotnik Coaster splatbooster
https://git.do.srb2.org/STJr/SRB2/-/merge_requests/1774/diffs\?commit_id\=c2103e52c259bb14d5d4b40c8bb9b131d5a78169 
https://git.do.srb2.org/STJr/SRB2/-/merge_requests/1774/diffs\?commit_id\=f6638c0f90a35cc13d97b985389bc058e1d57c3e 
Tanks so much Alug!!!!
Reviewed-on: #224 
Nicomedia changed target branch from master to next 2026年03月08日 19:49:44 +01:00

Looks good, Merging.

Looks good, Merging.
Sign in to join this conversation.
No reviewers
Labels
Clear labels
???
What
Bug
Something is not working
Concern
This may not be an issue yet, but it may lead to some.
Contribution Welcome
Contributions are very welcome, get started here
Crash
This issue or pull request is about something crash related
Duplicate
This issue or pull request already exists
Enhancement
New feature
Fixed in different branch
This was fixed in a branch seperate from master already.
Game Input
Related to the game's input systems in some way
Game Logic
This relates to game logic related issues
Help Wanted
Need some help
HUD
This issue or pull request is about something HUD related
Invalid
Something is wrong
Menu
This relates to menu code
Must be fixed for Beta 1
Needs to be fixed before Beta 1 can come out
Must be fixed for full release
Needs to be fixed for a full release to ever happen
Near-unfixable
The circumstances to recreate and/or fix this bug are too much to take on
Needs rechecking
This was a problem at some point but needs to be checked if its still an issue
Netcode
Related to the game's networking system
OpenGL Renderer
This is OpenGL renderer related
Question
More information is needed
Refactor
This rewrites an amount of code to be better in someway
Rendering
This is related to rendering
Software Renderer
This is software renderer related
SRB2Kart Compat
This relates to compatibility with SRB2Kart Content
Upstream
Related to an upstream repository, already reported there
Windows Exclusive
This only occurs on windows.
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
2 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
NepDisk/blankart!225
Reference in a new issue
NepDisk/blankart
No description provided.
Delete branch "Nicomedia/blankart:discordless"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?