Commit graph

4691 commits

Author SHA1 Message Date
Monster Iestyn
a4a975224a Clean up doomtype.h a bit, add indenting and comments to make some preprocessor code more readable 2018-11-08 16:31:20 +00:00
Monster Iestyn
b34e8c5390 Remove FUNCMATH from functions with a void return value or args, or examine variables other than their args (which could be modified) 2018-11-08 16:26:55 +00:00
TehRealSalt
fa3bb9b317 Textures' string bits are now optional.
I thought about just exposing R_TextureNumForName and leaving it to the user, since that makes it obvious that this is still an integer field, but I also liked being able to just specify a string and be done with it. I'm not picky either way.
2018-11-07 22:01:57 -05:00
TehRealSalt
a146024cfd Serious deep-cleaning to most of the kartstuff
More optional fields, more careful eye placed on return values and other checks
2018-11-07 21:04:57 -05:00
TehRealSalt
95759f3fa8 These are integers, whoops 2018-11-07 18:37:06 -05:00
TehRealSalt
7410ddad12 Add Kart globals 2018-11-07 18:31:07 -05:00
TehRealSalt
3009c22312 typo 2018-11-07 18:24:44 -05:00
TehRealSalt
f2598898cf Add missing K_ functions 2018-11-07 18:23:28 -05:00
TehRealSalt
fc9bd81910 IsPlayerAdmin support, since admin was removed 2018-11-07 18:07:34 -05:00
TehRealSalt
cf61784f5f toptexture, bottomtexture, and midtexture use strings instead of magic numbers 2018-11-07 17:53:49 -05:00
Alam Arias
899452e9bc Merge pull request #321 from GoldenTails/next-add-a-lua-variable-to-ultimate-mode-so-people-can-check-it
Add Lua Ultimate Mode global variable so people can use it.
2018-11-07 17:53:20 -05:00
toaster
d1f6584c6a Fix disabling music on the menu. 2018-11-07 22:18:46 +00:00
toaster
f5bec0d2e5 Merge branch 'master' into 'lua-hudlib'
# Conflicts:
#   src/lua_hudlib.c
2018-11-07 16:57:11 -05:00
Monster Iestyn
6042ac0c78 ST_Ticker also should not have FUNCMATH, as it also has side effects 2018-11-07 21:45:27 +00:00
toaster
13dea76a81 * Add numbers to the staff name strings as Sryder requested.
* Make the maximum number of staff ghosts 99 instead of 100. It's a minor thing, and insignificant in the grand scheme of things, but it fixes a bugbear I haven't been able to get out of my head since originally starting to maintain this code. (In the case of 100, it'd do S00, which'd have some fucky effects on ordering. If we WANTED to start with S00, we shoulda used that slot in the first place.)
2018-11-07 21:42:10 +00:00
Monster Iestyn
95c2d12d94 HU_Start should not have FUNCMATH, it has side effects 2018-11-07 21:37:42 +00:00
Monster Iestyn
7c0fb1702f D_PostEvent_end is only used by Allegro (used by the DOS port) to help timers work, so check for PC_DOS in preprocessor code. Also remove FUNCMATH from said function. 2018-11-07 21:21:36 +00:00
TehRealSalt
9a5d360a74 Disable DEVELOP mode 2018-11-07 16:19:02 -05:00
TehRealSalt
c7b0df8172 Merge remote-tracking branch 'srb2public/next'
(Huge change: NO_MIDI is now a define, simply because that makes it easier for me to resolve merge conflicts if I can see the original code and the new code. Also means that people who REALLY miss MIDI can compile & fix it themselves :P)
2018-11-07 16:15:14 -05:00
Monster Iestyn
856afe0708 P_NullPrecipThinker no longer should have FUNCMATH (though I'm not sure if it should have had it in the first place anyway) 2018-11-07 21:00:38 +00:00
TCLScrufflet
2c73512a23 Merge branch 'master' into remote_view_fixes 2018-11-07 17:57:49 -02:00
TehRealSalt
fbbddfff0a Log this 2018-11-07 14:56:36 -05:00
Sal
80de0a74f1 Merge branch 'info_tidy' into 'master'
Murder the fancharacters and associated

See merge request KartKrew/Kart!83
2018-11-07 14:50:10 -05:00
Sal
378202e2eb Merge branch 'fix_startbumps' into 'master'
Fix startbumps.

See merge request KartKrew/Kart!84
2018-11-07 14:50:00 -05:00
toaster
94cd2bb354 Clean but quick: Rename all user-facing things that say "emblem" to say "medal" instead. Don't touch SOC, don't touch code, otherwise we'll be here all year. 2018-11-07 18:05:29 +00:00
GoldenTails
71f97a4a92 Add Lua Ultimate Mode global variable so people can use it. 2018-11-06 18:09:45 -06:00
toaster
c89008518e No-show of debug stuff, and make karteliminatelast into a debug to justify its hiding. 2018-11-06 18:54:00 +00:00
toaster
424a62c3cc Fix replaying guest demos 2018-11-06 13:38:53 +00:00
toaster
2890e726c1 Fix startbumps.
A more detailed explanation:
* P_CheckPosition is the function which determines collisions.
* In Vanilla, collisions do not happen between players unless tailspickup is off (which it basically never is).
* Even with tailspickup off, on-spawn player collisions do not affect momentum.
* However, in kart, player collisions cause the player to get bumped.
* It would succeed at the P_CheckPosition call because players aren't *solid* solid, even though they cause bumps.
* It would fail at the K_CheckPlayersRespawnColliding call, but that would be too late, *as the player already has been bumped.*
* The player would therefore be moved to a new location, but still retain bump momentum, and the bump sound would have played for both players.
* Therefore, the obvious solution is to swap P_CheckPosition and K_CheckPlayersRespawnColliding, so that it checks for players BEFORE it performs object collisions at that spot.
* The reason we didn't see this MUCH before is that it can only ever happen in the case of ties.

I could've easily done this into master, but obviously I figure yalls'd at least like to check this first.
2018-11-06 13:33:27 +00:00
toaster
2282beec32 Disable attempt at preventing replays with the same staff member back to back, based on Discord discussion. If the RNG does this to you, you're on your own. 2018-11-05 23:18:34 +00:00
toaster
886613164f MT_POKEY, MT_ENEMYFLIP and the fancharacters - and the associated states/thinker modifications - gone. 2018-11-05 23:06:28 +00:00
MPC
eef8119123 Minor remote viewpoint bugfixes. 2018-11-05 20:40:51 -02:00
toaster
c2b790d14a Blank out the fancharacters as requested, but don't remove them from the info lists... a fun thing for TCRF to look at eventually, maybe, and I don't want to have to do a from-scratch build at this stage in the game or risk any instability that could arise from sweeping info cleanups.
In fact, the only reason I even considered doing this is that the sprites had to be removed, leaving these actively causing errors when placed.
2018-11-05 19:58:20 +00:00
toaster
cffd674cb7 * Re-add support for command "help" (ie, basically no help at all).
* Rename "suicide" command to "respawn" so the game doesn't tell you to kill yourself when you try to get help for it.
* Add a "manual" command to open the manual.
2018-11-05 19:02:34 +00:00
toaster
935607cfab You were right, Sal, "%s ran out of time." should've died back when you were working on the branch to remove all the prints. 2018-11-05 14:33:39 +00:00
toaster
3a2249b1af Cleaner code logic. Should make no real difference to exe, so not gonna upload another. 2018-11-05 14:28:32 +00:00
toaster
06ab5cf099 Fix "laststaff" setting 2018-11-05 14:03:09 +00:00
toaster
1dfd7ab4e5 Merge branch 'master' into staff_names 2018-11-05 13:46:10 +00:00
toaster
4568753e4c TITLE SCREEN DEMOS: Pick a random Staff Attack demo!!!
Also: Fix watching a demo replay of a map with a palette not resetting your palette back to normal when you go back to the menu(/titlescreen).
2018-11-05 13:45:40 +00:00
toaster
5f8e8f4ab2 Black out the background around the GAMEQUIT picture, since we removed the automatic doing of that for non-green resolutions. 2018-11-05 12:52:15 +00:00
toaster
94ea5b6c89 Redo the help command stuff, this time with much less impact on other areas of the code for sanity as we approach R1. 2018-11-05 12:49:28 +00:00
toaster
33ca25c705 Merge branch 'fix-mixed-declarations' into 'master'
Literally a single compiler warning.

See merge request KartKrew/Kart!80
2018-11-04 16:49:45 -05:00
toaster
ab9f908cad Properly support widescreen in Y_IntermissionDrawer (I meant to do this in charscleanup but forgot). 2018-11-04 21:48:47 +00:00
Sryder
f6ff9c603e Literally a single compiler warning. 2018-11-04 17:37:18 +00:00
toaster
d950cfd9d7 Correctly disable OGL-only menus/options in software. 2018-11-04 14:41:24 +00:00
toaster
839062bc2b Add a wide lap sticker for the record attack menu, so you're not looking at the same icon twice to mean two different things.
https://cdn.discordapp.com/attachments/270211093761097728/508614473628647442/kart0002.png
2018-11-04 12:15:13 +00:00
TehRealSalt
3d90abf538 Mixed up validity check... 2018-11-03 22:53:12 -04:00
toaster
220d4d5605 Staff attack ghost names on the REPLAY... menu.
Also: Remove playercolor being set to the replay's color. No need to kill your settings, seeing as it makes no tangible effect on your replay (doesn't even lose colour when you die, so I don't even know...)
2018-11-04 01:00:17 +00:00
Sal
b7f82fdcc4 Merge branch 'battle-arrow-fix' into 'master'
Battle arrow fixes and cleanup

See merge request KartKrew/Kart!78
2018-11-03 17:50:29 -04:00
TehRealSalt
bf4846c42b Battle arrow fixes and cleanup 2018-11-03 17:45:38 -04:00