Commit graph

19807 commits

Author SHA1 Message Date
toaster
60355d9efd Move two of the three remaining NUMMAPS arrays part of the mapheader_t struct
- mapvisited and recorddata_t (previously mainrecords)
- Changed how gamedata is saved and loaded
- Change the versioncheck (funny hex provided by chengi) AND call it `developringdata.dat` in develop builds
- Fix a bunch of off-by-ones in condition and emblem data
ALSO, for Time Attack:
- Fix menu not showing off your times
- Now save times even when gamedata modified, since the menu didn't care (come back to it?)
- Don't save times or do intermission screen if the Capsule Attack ended because you lost all your bumpers
- Fix a crash adding ghosts in Capsule Attack
2022-09-21 22:12:36 +01:00
toaster
b8f3e64ca1 discord.c compilation warning 2022-09-21 19:22:33 +01:00
toaster
fc9697b2e1 Repair D_StartTitle component of netgame title fallthrough prevention 2022-09-21 19:22:05 +01:00
toaster
0a48165d3a Disable hardcoded Discord API map icons for now, we can address this at release 2022-09-18 20:43:15 +01:00
toaster
93e72d3f66 Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart into big-large-map-markers 2022-09-18 20:00:52 +01:00
toaster
7d990c4f15 Rework nextmap to be automatic
- Refactor significantly (now has its own func, `G_GetNextMap`)
    - If gametype uses cups, iterate through cups to find the current level, then grab the next valid level
    - If not, get the next valid mapheader for your gametype
    - SOC `nextmap`/`marathonnext` is not just deprecated but REMOVED
    - Hide the NEXTMAP_ constants again, but leave support dummied out for if we have them publically accessible again
- Also get rid of a bunch of OTHER mapheader stuff we're never gonna use
    - NiGHTS Grades? NOPE
    - Vanilla titlecard patches? NOPE
    - Boss music fadeout/replacement? NOPE
    - Select Heading? NOPE
    - You've been blocked.
- Don't show maps without lumps on the level select list
- this is me being petty, but making it NOTIMEATTACK in SOC instead of TIMEATTACK so we can reconsider the maps with/without them.
2022-09-18 20:00:28 +01:00
Sally Coolatta
d0482b4905 Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart 2022-09-18 09:13:23 -04:00
Sally Coolatta
7aa29f80a9 /4 -> /3 2022-09-18 09:13:08 -04:00
Oni
473545d8eb Merge branch 'poh-bee-suited-up' into 'master'
Poh-Bee sprites + laser sound

See merge request KartKrew/Kart!685
2022-09-18 11:57:30 +00:00
Sally Coolatta
fe960530da Pohbee turns around when reaching the waypoint 2022-09-18 05:20:29 -04:00
Sally Coolatta
ab8126b706 Add Tyron's sound 2022-09-18 05:06:45 -04:00
Sally Coolatta
dc350a77df Remove old powerup warning option 2022-09-18 04:58:17 -04:00
Sally Coolatta
e610c41d0f Add Poh-Bee sprites 2022-09-18 04:33:03 -04:00
toaster
b68710faf2 Rework special nextmap events.
- G_MapNumber now handles special NEXTMAP_ nextmapspecial_t constants that exist at the end of the available type.
- Cleanup of G_DoCompleted
- Add bounds checking to the various SOC maincfg map starts (spstage_start, etc)
- Add lump checking to titlemap behaviour
2022-09-17 19:10:04 +01:00
toaster
8ea80d64ef Randmapbuffer now prepared for infinite maps
- Now a struct with zone-allocated buffer member
- Instead of bunging it on the end of the buffer, the time for G_SometimesGetDifferentGametype is its own struct member
2022-09-17 16:13:50 +01:00
toaster
d42812d5b5 Don't select a map - whether random (voting screen, randommap command, etc) or specific (map command) if it has no associated lump. 2022-09-17 14:08:11 +01:00
toaster
1a284ec7c6 Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart into big-large-map-markers
# Conflicts:
#	src/d_netcmd.c
2022-09-17 13:57:26 +01:00
toaster
7e17f5456c I_Error in all situations where mapheaders were previously allocated outside of SOC.
Also:
- improved error prints for SOC condition definitions
- improved bounds checking to use `nummapheaders` for iterating over mapheaderinfo
There are still situations that use NUMMAPS like mapvisited, randmapbuffer, etc, which need to be addressed before merger.
2022-09-17 13:07:48 +01:00
James R
4c89619ac4 Merge branch 'sdl-vsync' into 'master'
SDL: Support setting vsync at runtime

See merge request KartKrew/Kart!663
2022-09-17 07:28:55 +00:00
James R
6a6a0accee Merge remote-tracking branch 'origin/cvar-default-ports' 2022-09-17 00:18:10 -07:00
James R
3d2d8bce16 Merge branch 'spritestuff-ports' into 'master'
Spritestuff ports

See merge request KartKrew/Kart!669
2022-09-17 07:10:44 +00:00
James R
1cf1643233 Merge branch 'stability-fix-ports' into 'master'
Stability fix ports

See merge request KartKrew/Kart!670
2022-09-17 07:08:26 +00:00
toaster
accb88869d Don't strip previous thumbnail/minimap information on header replace, since the lumpnum will remain the same otherwise 2022-09-17 00:43:26 +01:00
toaster
1fbd5655f5 Replay hut: Show nolvl if the user hasn't added the map, or blanklvl if they have. 2022-09-17 00:03:49 +01:00
toaster
acc92ba4c9 Catch some areas that previously checked for map lump, but stopped doing so for a bit. 2022-09-17 00:02:54 +01:00
toaster
dcd63aece9 Repair bootmap.
We're not even going to use this feature, but it showed up as nonsensical while reviewing, and would take more work to strip out
2022-09-16 23:40:42 +01:00
toaster
6bd29a51b1 Remove test strtok print 2022-09-16 23:13:54 +01:00
toaster
04e5cfd338 Fix cups.
* Required an adjustment of everywhere using G_MapNumber to return the raw header number, instead of off-by-one ala gamemap.
    * Fixing gamemap is a viable improvement for a future commit, but this commit is already pretty big.
    * Remove SCANTHINGS, since it used G_MapNumber and didn't work with long map names OR virtres anyways.
* Support freeing new information in CLEAR LEVELS maincfg event, since I tried to use that to test cups.
* Make Patch_Free's usability match Z_Free -- passing NULL is permitted and a no-op.
2022-09-16 22:51:02 +01:00
toaster
4f1bb14732 Extra catch to prevent SIGSEGV 2022-09-16 15:07:12 +01:00
toaster
46441092dc Address initial review comments + associated cleanup
- Grab thumbnail and minimap pictures even for base game maps
- Repair modified game event for replacement map load
- PU_STATIC thumbnail and minimap, freed on new file load lump discovery
- Fix W_CheckNumForMap to not SIGSEGV if no match
- Reduce the number of pointless map lump hunts, we've already got it stored
- Prevent use-after-free for map pictures on voting screen
- Cache "BLANKLVL" patch once
- Draw minimap on the time attack menu

Unfortunately cups are still broken and I'm not sure where to start on that, or if it's just not having a sample wad to test with that includes cups
2022-09-16 15:01:49 +01:00
Sally Coolatta
8f38555a86 fixme for james :) 2022-09-16 00:06:02 -04:00
Sal
6d79df0577 Merge branch 'm-for-mini' into 'master'
New Shrink

See merge request KartKrew/Kart!682
2022-09-16 04:03:09 +00:00
Sally Coolatta
01b1a9d3a7 Prevent poh-bees on no-respawn waypoints 2022-09-15 21:44:45 -04:00
Sally Coolatta
94c64519d4 Make grow/shrink particles closer to base scale 2022-09-15 21:44:08 -04:00
Sally Coolatta
cb2d2cb2ba Cleanup objects properly 2022-09-15 20:03:32 -04:00
Sally Coolatta
eda9e0cd9d Offset for shrink particles 2022-09-15 19:54:50 -04:00
Sally Coolatta
c80f46f7c7 Reduce code duplication 2022-09-15 19:52:35 -04:00
Sally Coolatta
04323fc39e Adjust Grow/Shrink camera with scale again 2022-09-15 03:19:57 -04:00
Sally Coolatta
3950a228c0 Lower shrink odds slightly 2022-09-15 02:51:53 -04:00
Sally Coolatta
b1f9dd8264 Line up the laser visual better 2022-09-15 02:42:16 -04:00
Sally Coolatta
dc44196c49 Bigger laser shimmer 2022-09-15 02:27:20 -04:00
Sally Coolatta
d6f5fc117f Merge branch 'master' into m-for-mini 2022-09-15 02:06:51 -04:00
James R
6af7df8d40 Fix -Wsign-compare 2022-09-14 23:02:55 -07:00
Sal
41593330a8 Merge branch 'fixeddiv-overflow' into 'master'
Fix #263

Closes #263

See merge request KartKrew/Kart!681
2022-09-15 05:54:37 +00:00
Sally Coolatta
e2e984ec14 More consistent chain length 2022-09-15 01:54:19 -04:00
James R
ef0ff01ef1 FixedDiv2: divide numerator before taking absolute value to avoid INT32_MIN overflow to 0 2022-09-14 22:38:12 -07:00
Sally Coolatta
71723a803d Implement pohbee chain
Crashes when drawing the sprites after looking at it for like half a second and idk why tf
2022-09-15 01:03:08 -04:00
Sally Coolatta
72948ad49d Make timer more obvious on grow particles 2022-09-14 23:50:48 -04:00
Sally Coolatta
cee2c25e27 Don't drop items from Shrink 2022-09-14 19:17:45 -04:00
Sally Coolatta
c65e5af718 Reduce grow add from lasers 2022-09-14 19:15:42 -04:00