stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-12-28 05:11:34 +00:00
Code Issues Projects Releases Packages Wiki Activity
Kart-Public/src/m_menu.c

11535 lines
325 KiB
C
Raw Normal View History

SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
Starting from scratch. SRB2 v2.1.15
2016-07-06 04:09:17 +00:00
// Copyright (C) 2011-2016 by Matthew "Inuyasha" Walsh.
Update source copyrights to 2018
2018-11-25 12:35:38 +00:00
// Copyright (C) 1999-2018 by Sonic Team Junior.
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
// See the 'LICENSE' file for more details.
//-----------------------------------------------------------------------------
/// \file m_menu.c
/// \brief XMOD's extremely revamped menu system.
#ifdef __GNUC__
#include <unistd.h>
#endif
#include "m_menu.h"
#include "doomdef.h"
#include "d_main.h"
#include "d_netcmd.h"
#include "console.h"
Implement Uncapped (squashed) Co-Authored-By: Sally Coolatta <tehrealsalt@gmail.com> Co-Authored-By: James R <justsomejames2@gmail.com> Co-Authored-By: Monster Iestyn <iestynjealous@ntlworld.com> Co-Authored-By: katsy <katmint@live.com> Place Frame Interpolation in "Experimental" video options header This seems like an appropriate way to describe the feature for now. Add smooth level platter under interpolation, `renderdeltatics` `renderdeltatics` can be used as a standard delta time in any place, allowing for smooth menus. It will always be equal to `realtics` when frame interpolation is turned off, producing consistent framerate behavior everywhere it is used. Add smooth rendering to save select screen Add smooth rendering to Record/NiGHTS Attack, F_SkyScroll Ensure viewsector is accurate to viewx/viewy This fixes a potential crash in OpenGL when changing between levels. Ensure + commands get executed before map start Always have precise_t defined Fix misc dropshadow issues Reset view interpolation on level load Remove unnecessary precipmobj thinker hack Add reset interpolation state functions Reset precip interpolation on snap to ceil Reset mobj interp state on TeleportMove Only swap view interp state if a tick is run Run anti-lag chasecam at tic frequency Fixes jittery and unstable chasecam in high latency netgames Homogenize mobj interpolations Add sector plane level interpolations Add SectorScroll interpolator Add SideScroll interpolator Add Polyobj interpolator Intialize interpolator list at a better time Delete interpolators associated with thinkers Interpolate mobj angles and player drawangle Interpolate HWR_DrawModel Add functions to handle interpolation Much less code duplication P_InitAngle, to fix angle interpolation on spawning objects Fully fix drop shadows It used the thing's floorz / ceilingz directly -- that wouldn't account for interpolated coordinates. Do not speed up underwater/heatwave effect in OpenGL Closer OpenGL underwater/heatwave effect to Software Interpolate from time of previous tic Previously interpolated from last 35th of a second, which may be offset from game time due to connection lag. Consider this the proper fix to 54148a0dd0 too. Calculate FPS stuff even if frame is skipped I decided ultimately to actually keep the frame skip optimization disabled, because I think it is actually a little bit helpful that you can still get accurate rendering perfstats while paused, however if we decide otherwise then we can have this optimization back without making the game act like it's lagging. Keep rect in memory Feel better about this than creating one all da time Lots of FPS stuff - Disabled VSync, due to the numerous problems it has. - Instead, added an FPS cap. - Frame interpolation is now tied to fpscap != 35. - By default, the FPS cap is set to the monitor's refresh rate. - Rewrote the FPS counter. (This also consolidates several more commits ahead of this fixing various issues. -eid) Misc changes after Kart cherry-picks Fix renderdeltatics with new timing data Update mobj oldstates before all thinkers Allow FPS cap values Adjust how FPS cap is checked to improve FPS stability Fix precip crash from missing vars Improve the framerate limiter's timing for extreme stable FPS Handle the sleep at the end of D_SRB2Loop instead of the start Simplifies logic in the other parts of the loop, and fixes problems with it frequently waiting too long. Reset mobj interp state on add Add mobj interpolator on load netgame Move mobj interpolators to r_fps Dynamic slope interpolators I_GetFrameTime to try and improve frame pace (It doesn't feel that much better though.) Move I_FinishUpdate to D_SRB2Loop to sync screen updates with FPS cap, use timestamps in I_FrameCapSleep to simplify the code Fix plane interpolation light level flickering Fix flickering plane interpolation for OpenGL in the exact same way Funny OpenGL renderer being at least 50% copy-pasted Software code :) P_SetOrigin & P_MoveOrigin to replace P_TeleportMove Convert P_TeleportMove use to origin funcs Revert "P_InitAngle, to fix angle interpolation on spawning objects" This reverts commit a80c98bd164a2748cbbfad9027b34601185d93f5. Waypoint polyobjects interpolate z & children Add interpolation to more moving plane types Adds interpolation to the following: - Crumbling platforms - Mario blocks - Floatbob platforms (this one works really strangely due to two thinkers, maybe double-check this one?) Reset overlays interp states each TryRunTics Interpolate model interpolation (lol) Use interp tracer pos for GL linkdraw Papersprite angle interpolation Makes the ending signpost smooth Move intermission emerald bounce to ticker Bring back shadows on polyobjects Also optimizes the method used so rings can show their shadows too. Using just the subsector is a tad bit imprecise admittedly but any more precise methods get really laggy. Fix a bunch of ticking in hu_ drawing functions Revert "Reset overlays interp states each TryRunTics" This reverts commit a71a216faa20e8751b3bd0157354e8d748940c92. Move intro ticking out of the drawer Adjust 1up monitor icon z offsets Fixes interpolation issues with 1up monitors. Delta time choose player menu animations Add drawerlib deltaTime function Interpolate afterimages further back Use old sleep in dedicated mode Clamp cechotimer to 0 Fixes issues with cechos staying on-screen and glitching out (NiGHTS items for example). Revert "Remove unnecessary precipmobj thinker hack" This reverts commit 0e38208620d19ec2ab690740438ac2fc7862a49e. Fix frame pacing when game lags behind The frame timestamp should've been made at the start of the frame, not the end. Fix I_FrameCapSleep not respecting cpusleep Jonathan Joestar bruh Allow dedicated to use precise sleep timing again Instead of only using one old sleep, just enforce framerate cap to match TICRATE. Make Lua TeleportMove call MoveOrigin Reset Metal fume interp state on appear Add interpdebug Put interpdebug stuff in perfstats instead Add timescale cvar Slow the game down to debug animations / interpolation problems! Speed it up if you need to get somewhere quickly while mapping! Enable timescale outside of DEVELOP builds It has NETVAR, so it should be fine -- put an end to useful debugging features excluded in multiplayer! Force interpolation when timescale != 1.0 Reset old_z in MT_LOCKON think Fixes interpolation artifacting due to spawn pos. Fix cutscenes in interp Fix boss1 laser in interp Interpolate mobj scale Precalculate refresh rate Slower PCs can have issue querying mode over and over. This might kinda suck for windowed mode if you have different refresh rate displays but oh well Fix interp scaling crashing software Reset interp scale when Lua sets .scale Disable angle interp on fresh mobjs Fix interp scale crash for hires sprites Interp shadow scales Copy interp state in P_SpawnMobjFromMobj Fix multiplayer character select Don't interpolate mobj state if frac = 1.0 Fix Mario block item placement Interpolate spritescale/offset x/y Fix offset copies for SpawnMobjFromMobj THANKS SAL Add Lua HUD drawlists Buffers draw calls between tics to ensure hooks run at the originally intended rate. Rename drawerlib deltaTime to getDeltaTime Make renderisnewtic is false between tics I know what I'm doing! I swear Completely refactor timing system Time is now tracked internally in the game using I_GetPreciseTime and I_UpdateTime. I_Time now pulls from this internal timer. The system code no longer needs to keep track of time itself. This significantly improves frame and tic timing in interp mode, resulting in a much smoother image with essentially no judder at any framerate. Ensure mobj interpolators reset on level load Ensure view is not interpolated on first frame Disable sprite offset interpolation (for now) Refactor timing code even more System layer is greatly simplified and framecap logic has been moved internally. I_Sleep now takes a sleep duration and I_SleepDuration generically implements a precise sleep with spin loop.
2019-10-06 22:40:52 +00:00
#include "r_fps.h"
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
#include "r_local.h"
#include "hu_stuff.h"
#include "g_game.h"
#include "g_input.h"
#include "m_argv.h"
// Data.
#include "sounds.h"
#include "s_sound.h"
Implement Uncapped (squashed) Co-Authored-By: Sally Coolatta <tehrealsalt@gmail.com> Co-Authored-By: James R <justsomejames2@gmail.com> Co-Authored-By: Monster Iestyn <iestynjealous@ntlworld.com> Co-Authored-By: katsy <katmint@live.com> Place Frame Interpolation in "Experimental" video options header This seems like an appropriate way to describe the feature for now. Add smooth level platter under interpolation, `renderdeltatics` `renderdeltatics` can be used as a standard delta time in any place, allowing for smooth menus. It will always be equal to `realtics` when frame interpolation is turned off, producing consistent framerate behavior everywhere it is used. Add smooth rendering to save select screen Add smooth rendering to Record/NiGHTS Attack, F_SkyScroll Ensure viewsector is accurate to viewx/viewy This fixes a potential crash in OpenGL when changing between levels. Ensure + commands get executed before map start Always have precise_t defined Fix misc dropshadow issues Reset view interpolation on level load Remove unnecessary precipmobj thinker hack Add reset interpolation state functions Reset precip interpolation on snap to ceil Reset mobj interp state on TeleportMove Only swap view interp state if a tick is run Run anti-lag chasecam at tic frequency Fixes jittery and unstable chasecam in high latency netgames Homogenize mobj interpolations Add sector plane level interpolations Add SectorScroll interpolator Add SideScroll interpolator Add Polyobj interpolator Intialize interpolator list at a better time Delete interpolators associated with thinkers Interpolate mobj angles and player drawangle Interpolate HWR_DrawModel Add functions to handle interpolation Much less code duplication P_InitAngle, to fix angle interpolation on spawning objects Fully fix drop shadows It used the thing's floorz / ceilingz directly -- that wouldn't account for interpolated coordinates. Do not speed up underwater/heatwave effect in OpenGL Closer OpenGL underwater/heatwave effect to Software Interpolate from time of previous tic Previously interpolated from last 35th of a second, which may be offset from game time due to connection lag. Consider this the proper fix to 54148a0dd0 too. Calculate FPS stuff even if frame is skipped I decided ultimately to actually keep the frame skip optimization disabled, because I think it is actually a little bit helpful that you can still get accurate rendering perfstats while paused, however if we decide otherwise then we can have this optimization back without making the game act like it's lagging. Keep rect in memory Feel better about this than creating one all da time Lots of FPS stuff - Disabled VSync, due to the numerous problems it has. - Instead, added an FPS cap. - Frame interpolation is now tied to fpscap != 35. - By default, the FPS cap is set to the monitor's refresh rate. - Rewrote the FPS counter. (This also consolidates several more commits ahead of this fixing various issues. -eid) Misc changes after Kart cherry-picks Fix renderdeltatics with new timing data Update mobj oldstates before all thinkers Allow FPS cap values Adjust how FPS cap is checked to improve FPS stability Fix precip crash from missing vars Improve the framerate limiter's timing for extreme stable FPS Handle the sleep at the end of D_SRB2Loop instead of the start Simplifies logic in the other parts of the loop, and fixes problems with it frequently waiting too long. Reset mobj interp state on add Add mobj interpolator on load netgame Move mobj interpolators to r_fps Dynamic slope interpolators I_GetFrameTime to try and improve frame pace (It doesn't feel that much better though.) Move I_FinishUpdate to D_SRB2Loop to sync screen updates with FPS cap, use timestamps in I_FrameCapSleep to simplify the code Fix plane interpolation light level flickering Fix flickering plane interpolation for OpenGL in the exact same way Funny OpenGL renderer being at least 50% copy-pasted Software code :) P_SetOrigin & P_MoveOrigin to replace P_TeleportMove Convert P_TeleportMove use to origin funcs Revert "P_InitAngle, to fix angle interpolation on spawning objects" This reverts commit a80c98bd164a2748cbbfad9027b34601185d93f5. Waypoint polyobjects interpolate z & children Add interpolation to more moving plane types Adds interpolation to the following: - Crumbling platforms - Mario blocks - Floatbob platforms (this one works really strangely due to two thinkers, maybe double-check this one?) Reset overlays interp states each TryRunTics Interpolate model interpolation (lol) Use interp tracer pos for GL linkdraw Papersprite angle interpolation Makes the ending signpost smooth Move intermission emerald bounce to ticker Bring back shadows on polyobjects Also optimizes the method used so rings can show their shadows too. Using just the subsector is a tad bit imprecise admittedly but any more precise methods get really laggy. Fix a bunch of ticking in hu_ drawing functions Revert "Reset overlays interp states each TryRunTics" This reverts commit a71a216faa20e8751b3bd0157354e8d748940c92. Move intro ticking out of the drawer Adjust 1up monitor icon z offsets Fixes interpolation issues with 1up monitors. Delta time choose player menu animations Add drawerlib deltaTime function Interpolate afterimages further back Use old sleep in dedicated mode Clamp cechotimer to 0 Fixes issues with cechos staying on-screen and glitching out (NiGHTS items for example). Revert "Remove unnecessary precipmobj thinker hack" This reverts commit 0e38208620d19ec2ab690740438ac2fc7862a49e. Fix frame pacing when game lags behind The frame timestamp should've been made at the start of the frame, not the end. Fix I_FrameCapSleep not respecting cpusleep Jonathan Joestar bruh Allow dedicated to use precise sleep timing again Instead of only using one old sleep, just enforce framerate cap to match TICRATE. Make Lua TeleportMove call MoveOrigin Reset Metal fume interp state on appear Add interpdebug Put interpdebug stuff in perfstats instead Add timescale cvar Slow the game down to debug animations / interpolation problems! Speed it up if you need to get somewhere quickly while mapping! Enable timescale outside of DEVELOP builds It has NETVAR, so it should be fine -- put an end to useful debugging features excluded in multiplayer! Force interpolation when timescale != 1.0 Reset old_z in MT_LOCKON think Fixes interpolation artifacting due to spawn pos. Fix cutscenes in interp Fix boss1 laser in interp Interpolate mobj scale Precalculate refresh rate Slower PCs can have issue querying mode over and over. This might kinda suck for windowed mode if you have different refresh rate displays but oh well Fix interp scaling crashing software Reset interp scale when Lua sets .scale Disable angle interp on fresh mobjs Fix interp scale crash for hires sprites Interp shadow scales Copy interp state in P_SpawnMobjFromMobj Fix multiplayer character select Don't interpolate mobj state if frac = 1.0 Fix Mario block item placement Interpolate spritescale/offset x/y Fix offset copies for SpawnMobjFromMobj THANKS SAL Add Lua HUD drawlists Buffers draw calls between tics to ensure hooks run at the originally intended rate. Rename drawerlib deltaTime to getDeltaTime Make renderisnewtic is false between tics I know what I'm doing! I swear Completely refactor timing system Time is now tracked internally in the game using I_GetPreciseTime and I_UpdateTime. I_Time now pulls from this internal timer. The system code no longer needs to keep track of time itself. This significantly improves frame and tic timing in interp mode, resulting in a much smoother image with essentially no judder at any framerate. Ensure mobj interpolators reset on level load Ensure view is not interpolated on first frame Disable sprite offset interpolation (for now) Refactor timing code even more System layer is greatly simplified and framecap logic has been moved internally. I_Sleep now takes a sleep duration and I_SleepDuration generically implements a precise sleep with spin loop.
2019-10-06 22:40:52 +00:00
#include "i_time.h"
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
#include "i_system.h"
Make mod update, room list and server list multithreaded This took fucking ages and it still fails sometimes in edge cases, but I don't give a FUCK right now.
2020-04-27 02:46:35 +00:00
#include "i_threads.h"
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Addons menu. Bitch.
2018-08-28 20:08:47 +00:00
// Addfile
#include "filesrch.h"
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
#include "v_video.h"
#include "i_video.h"
#include "keys.h"
#include "z_zone.h"
#include "w_wad.h"
#include "p_local.h"
#include "p_setup.h"
#include "f_finale.h"
#ifdef HWRENDER
#include "hardware/hw_main.h"
#endif
#include "d_net.h"
#include "mserv.h"
#include "m_misc.h"
#include "m_anigif.h"
#include "byteptr.h"
#include "st_stuff.h"
#include "i_sound.h"
Some Color code, Kart powers
2016-08-12 01:42:11 +00:00
#include "k_kart.h" // SRB2kart
Toggles for kitchen sink, ten banana, & quad orbinaut, and a screen that they can fit on
2018-08-31 17:18:19 +00:00
#include "d_player.h" // KITEM_ constants
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
add deadzone + storing of previous joyx/y values etc to attempt to make joysticks less sensitive in menus
2018-12-02 21:52:30 +00:00
#include "i_joy.h" // for joystick menu controls
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Condition Sets
#include "m_cond.h"
// And just some randomness for the exits.
#include "m_random.h"
Lots of changes to better support hotplugging and unstable device indexes * Don't save cv_usejoystick/2 because hotplugging changes can be made invalid by next run * Properly set cv_usejoystick/2 for menu toggling * Force-disable a player's joystick if setting another player's joystick to the same device * Properly set cv_usejoystick/2 value of BOTH target player AND other players when hotplugging and unplugging
2018-12-14 08:58:07 +00:00
#if defined(HAVE_SDL)
#include "SDL.h"
#if SDL_VERSION_ATLEAST(2,0,0)
#include "sdl/sdlmain.h" // JOYSTICK_HOTPLUG
#endif
#endif
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
#ifdef PC_DOS
#include <stdio.h> // for snprintf
int snprintf(char *str, size_t n, const char *fmt, ...);
//int vsnprintf(char *str, size_t n, const char *fmt, va_list ap);
#endif
Put the cvar in the menu
2020-08-17 06:31:30 +00:00
#ifdef HAVE_DISCORDRPC
Invite menu started Functions! Is not pretty yet!
2020-08-21 08:14:33 +00:00
//#include "discord_rpc.h"
Put the cvar in the menu
2020-08-17 06:31:30 +00:00
#include "discord.h"
#endif
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
#define SKULLXOFF -32
#define LINEHEIGHT 16
#define STRINGHEIGHT 8
#define FONTBHEIGHT 20
#define SMALLLINEHEIGHT 8
#define SLIDER_RANGE 10
#define SLIDER_WIDTH (8*SLIDER_RANGE+6)
#define SERVERS_PER_PAGE 11
typedef enum
{
QUITMSG = 0,
QUITMSG1,
QUITMSG2,
QUITMSG3,
QUITMSG4,
QUITMSG5,
QUITMSG6,
QUITMSG7,
QUIT2MSG,
QUIT2MSG1,
QUIT2MSG2,
QUIT2MSG3,
QUIT2MSG4,
QUIT2MSG5,
QUIT2MSG6,
QUIT3MSG,
QUIT3MSG1,
QUIT3MSG2,
QUIT3MSG3,
QUIT3MSG4,
QUIT3MSG5,
QUIT3MSG6,
NUM_QUITMESSAGES
} text_enum;
Make mod update, room list and server list multithreaded This took fucking ages and it still fails sometimes in edge cases, but I don't give a FUCK right now.
2020-04-27 02:46:35 +00:00
#ifdef HAVE_THREADS
I_mutex m_menu_mutex;
#endif
M_waiting_mode_t m_waiting_mode = M_NOT_WAITING;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
const char *quitmsg[NUM_QUITMESSAGES];
// Stuff for customizing the player select screen Tails 09-22-2003
Update the SP menu stuff to use MAXSKINS Co-authoered-by: Steel Titanium (steeltitanium1@gmail.com>
2019-01-16 01:09:55 +00:00
description_t description[MAXSKINS];
Stupidbad-big commit, but PLEASE don't ask me to re-do this on another branch, I swear to god. I know it makes things more difficult on you, and I'm sorry for that, but I'm definitely feeling the goddamn crunch right now and I wanna take a step back from this spaghetti nightmare and clear my head. * Do that thing where the character icons are ALWAYS 1x sized, through having two seperate lumps. * Revamp the S_SKIN parameters to be `facerank` (rankings - equivalent of half-scale old face), `facewant` (WANTED - equivalent of old face), and `facemmap` (equivalent of old iconprefix). * Do that thing Oni wanted where it shows two postions above and two positions below your current ranking (and you) to the left of the screen, instead of always the top 4, with some limits to avoid drawing outside of everything. * Replace the last few shitty Mario numbers (for the left rankings) with cool, new Oni numbers. * Change a bunch of offsets and things so the tab rankings and the intermission work nicer with 9+ players.
2018-10-28 16:27:55 +00:00
//static char *char_notes = NULL;
//static fixed_t char_scroll = 0;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
boolean menuactive = false;
boolean fromlevelselect = false;
typedef enum
{
LLM_CREATESERVER,
LLM_LEVELSELECT,
LLM_RECORDATTACK,
LLM_NIGHTSATTACK
} levellist_mode_t;
levellist_mode_t levellistmode = LLM_CREATESERVER;
UINT8 maplistoption = 0;
Fix up controller menu support
2018-12-02 01:13:14 +00:00
static char joystickInfo[8][29];
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
#ifndef NONET
static UINT32 serverlistpage;
#endif
Stupidbad-big commit, but PLEASE don't ask me to re-do this on another branch, I swear to god. I know it makes things more difficult on you, and I'm sorry for that, but I'm definitely feeling the goddamn crunch right now and I wanna take a step back from this spaghetti nightmare and clear my head. * Do that thing where the character icons are ALWAYS 1x sized, through having two seperate lumps. * Revamp the S_SKIN parameters to be `facerank` (rankings - equivalent of half-scale old face), `facewant` (WANTED - equivalent of old face), and `facemmap` (equivalent of old iconprefix). * Do that thing Oni wanted where it shows two postions above and two positions below your current ranking (and you) to the left of the screen, instead of always the top 4, with some limits to avoid drawing outside of everything. * Replace the last few shitty Mario numbers (for the left rankings) with cool, new Oni numbers. * Change a bunch of offsets and things so the tab rankings and the intermission work nicer with 9+ players.
2018-10-28 16:27:55 +00:00
//static saveinfo_t savegameinfo[MAXSAVEGAMES]; // Extra info about the save games.
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
INT16 startmap; // Mario, NiGHTS, or just a plain old normal game?
static INT16 itemOn = 1; // menu item skull is on, Hack by Tails 09-18-2002
static INT16 skullAnimCounter = 10; // skull animation counter
Reset to defaults option in controls
2018-11-23 03:50:40 +00:00
static UINT8 setupcontrolplayer;
A lot lol The importants: - Fixed compiling - Combined G_BuildTiccmd for all players, no more need for a function for each - You can actually start 3p/4p mode
2017-12-17 03:32:43 +00:00
static INT32 (*setupcontrols)[2]; // pointer to the gamecontrols of the player being edited
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// shhh... what am I doing... nooooo!
static INT32 vidm_testingmode = 0;
static INT32 vidm_previousmode;
static INT32 vidm_selected = 0;
static INT32 vidm_nummodes;
static INT32 vidm_column_size;
//
// PROTOTYPES
//
static void M_StopMessage(INT32 choice);
#ifndef NONET
static void M_HandleServerPage(INT32 choice);
#endif
// Prototyping is fun, innit?
// ==========================================================================
// NEEDED FUNCTION PROTOTYPES GO HERE
// ==========================================================================
Basically, update master server code to v2 Removes rooms, replaced with cv_advertise and "Advertise" on the host menu. According to the new API, SRB2APPLICATION is sent instead of MODID. A contact field was added, but there is no means of accessing it or setting it. As a slight change, the server list will be populated even on an outdated version of the game. (The new API was designed with this in mind.) The update alert is still presented first of course.
2020-09-11 12:56:40 +00:00
void M_SetWaitingMode(int mode);
int M_GetWaitingMode(void);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// the haxor message menu
menu_t MessageDef;
Invite menu started Functions! Is not pretty yet!
2020-08-21 08:14:33 +00:00
#ifdef HAVE_DISCORDRPC
Ask to join is a menu option, rather than trying to replace your menu temporarily.
2020-08-22 11:16:52 +00:00
menu_t MISC_DiscordRequestsDef;
Invite menu started Functions! Is not pretty yet!
2020-08-21 08:14:33 +00:00
static void M_HandleDiscordRequests(INT32 choice);
static void M_DrawDiscordRequests(void);
#endif
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
menu_t SPauseDef;
Addons menu. Bitch.
2018-08-28 20:08:47 +00:00
#define lsheadingheight 16
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Sky Room
Some unlockable stuff - Secrets renamed to Extras - Extras leads to the checklist instead of another menu - Credits & Sound Test are on the Options menu now - New title screen cheat for unlocking everything ("banana", or "← ↑ → → ↑ ← ↓ → Enter")
2018-03-02 00:00:16 +00:00
//static void M_CustomLevelSelect(INT32 choice);
//static void M_CustomWarp(INT32 choice);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
FUNCNORETURN static ATTRNORETURN void M_UltimateCheat(INT32 choice);
Stupidbad-big commit, but PLEASE don't ask me to re-do this on another branch, I swear to god. I know it makes things more difficult on you, and I'm sorry for that, but I'm definitely feeling the goddamn crunch right now and I wanna take a step back from this spaghetti nightmare and clear my head. * Do that thing where the character icons are ALWAYS 1x sized, through having two seperate lumps. * Revamp the S_SKIN parameters to be `facerank` (rankings - equivalent of half-scale old face), `facewant` (WANTED - equivalent of old face), and `facemmap` (equivalent of old iconprefix). * Do that thing Oni wanted where it shows two postions above and two positions below your current ranking (and you) to the left of the screen, instead of always the top 4, with some limits to avoid drawing outside of everything. * Replace the last few shitty Mario numbers (for the left rankings) with cool, new Oni numbers. * Change a bunch of offsets and things so the tab rankings and the intermission work nicer with 9+ players.
2018-10-28 16:27:55 +00:00
//static void M_LoadGameLevelSelect(INT32 choice);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
static void M_GetAllEmeralds(INT32 choice);
static void M_DestroyRobots(INT32 choice);
Stupidbad-big commit, but PLEASE don't ask me to re-do this on another branch, I swear to god. I know it makes things more difficult on you, and I'm sorry for that, but I'm definitely feeling the goddamn crunch right now and I wanna take a step back from this spaghetti nightmare and clear my head. * Do that thing where the character icons are ALWAYS 1x sized, through having two seperate lumps. * Revamp the S_SKIN parameters to be `facerank` (rankings - equivalent of half-scale old face), `facewant` (WANTED - equivalent of old face), and `facemmap` (equivalent of old iconprefix). * Do that thing Oni wanted where it shows two postions above and two positions below your current ranking (and you) to the left of the screen, instead of always the top 4, with some limits to avoid drawing outside of everything. * Replace the last few shitty Mario numbers (for the left rankings) with cool, new Oni numbers. * Change a bunch of offsets and things so the tab rankings and the intermission work nicer with 9+ players.
2018-10-28 16:27:55 +00:00
//static void M_LevelSelectWarp(INT32 choice);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
static void M_Credits(INT32 choice);
static void M_PandorasBox(INT32 choice);
static void M_EmblemHints(INT32 choice);
:(
2018-03-29 05:14:47 +00:00
static char *M_GetConditionString(condition_t cond);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
menu_t SR_MainDef, SR_UnlockChecklistDef;
// Misc. Main Menu
Move menu options around 1 Player now goes directly to Time Attack, and Extras is now a submenu with Unlockables, Statistics, and a currently-dummied option for Replay Hut.
2019-03-30 22:25:54 +00:00
#if 0 // Bring this back when we have actual single-player
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
static void M_SinglePlayerMenu(INT32 choice);
Move menu options around 1 Player now goes directly to Time Attack, and Extras is now a submenu with Unlockables, Statistics, and a currently-dummied option for Replay Hut.
2019-03-30 22:25:54 +00:00
#endif
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
static void M_Options(INT32 choice);
* User manual! * Some visual ordering fixes for the item menu, plus a #define-toggleable option for the bottom right slot to be traversable for ease-of-use purposes (even if it doesn't do anything).
2018-09-08 16:02:03 +00:00
static void M_Manual(INT32 choice);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
static void M_SelectableClearMenus(INT32 choice);
static void M_Retry(INT32 choice);
static void M_EndGame(INT32 choice);
static void M_MapChange(INT32 choice);
static void M_ChangeLevel(INT32 choice);
static void M_ConfirmSpectate(INT32 choice);
static void M_ConfirmEnterGame(INT32 choice);
static void M_ConfirmTeamScramble(INT32 choice);
static void M_ConfirmTeamChange(INT32 choice);
Spectate/Enter menu for online splitscreen Just like the menu option
2018-10-16 00:28:35 +00:00
static void M_ConfirmSpectateChange(INT32 choice);
Some unlockable stuff - Secrets renamed to Extras - Extras leads to the checklist instead of another menu - Credits & Sound Test are on the Options menu now - New title screen cheat for unlocking everything ("banana", or "← ↑ → → ↑ ← ↓ → Enter")
2018-03-02 00:00:16 +00:00
//static void M_SecretsMenu(INT32 choice);
Stupidbad-big commit, but PLEASE don't ask me to re-do this on another branch, I swear to god. I know it makes things more difficult on you, and I'm sorry for that, but I'm definitely feeling the goddamn crunch right now and I wanna take a step back from this spaghetti nightmare and clear my head. * Do that thing where the character icons are ALWAYS 1x sized, through having two seperate lumps. * Revamp the S_SKIN parameters to be `facerank` (rankings - equivalent of half-scale old face), `facewant` (WANTED - equivalent of old face), and `facemmap` (equivalent of old iconprefix). * Do that thing Oni wanted where it shows two postions above and two positions below your current ranking (and you) to the left of the screen, instead of always the top 4, with some limits to avoid drawing outside of everything. * Replace the last few shitty Mario numbers (for the left rankings) with cool, new Oni numbers. * Change a bunch of offsets and things so the tab rankings and the intermission work nicer with 9+ players.
2018-10-28 16:27:55 +00:00
//static void M_SetupChoosePlayer(INT32 choice);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
static void M_QuitSRB2(INT32 choice);
menu_t SP_MainDef, MP_MainDef, OP_MainDef;
Spectate/Enter menu for online splitscreen Just like the menu option
2018-10-16 00:28:35 +00:00
menu_t MISC_ScrambleTeamDef, MISC_ChangeTeamDef, MISC_ChangeSpectateDef;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Single Player
Lots of changes - Menus now have all of the Kart cvars - Removed any cvars that aren't useful for Kart from the menu (they still exist in the console, though) - Removed SP and NiGHTS Mode options from the main menu - "kartcc" is renamed "kartspeed", uses values 0-2 instead of multiples of 50, or the terms "Relaxed", "Standard", and "Turbo" - Many gametype options (game speed, frantic, mirror, & karma comeback) are now changed on map load instead of instantly - New cvar, "kartminimap", for disabling the minimap - The maxplayers cvar now actually matches up with our 16 player limit - Game now keeps track of matches played. Has a condition type associated with it, as well. - Game checks for unlocks and saves gamedata when finishing a match, even in MP - Removed most of the normal emblems, added a single emblem for Green Hills. Didn't know what to do with extra emblems and such so I just left them (FOR NOW c:<)
2018-01-16 03:31:14 +00:00
//static void M_LoadGame(INT32 choice);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
static void M_TimeAttack(INT32 choice);
* Fix the fades mess, and have the title screen always have a smooth, non-checkered fade from blapck! * Fix all the bugs with skin not being set properly or kept synchronised with the multiplayer setup in record attack. * Reduce the amount of flashing on the voting screen.
2018-07-04 21:57:50 +00:00
static boolean M_QuitTimeAttackMenu(void);
Lots of changes - Menus now have all of the Kart cvars - Removed any cvars that aren't useful for Kart from the menu (they still exist in the console, though) - Removed SP and NiGHTS Mode options from the main menu - "kartcc" is renamed "kartspeed", uses values 0-2 instead of multiples of 50, or the terms "Relaxed", "Standard", and "Turbo" - Many gametype options (game speed, frantic, mirror, & karma comeback) are now changed on map load instead of instantly - New cvar, "kartminimap", for disabling the minimap - The maxplayers cvar now actually matches up with our 16 player limit - Game now keeps track of matches played. Has a condition type associated with it, as well. - Game checks for unlocks and saves gamedata when finishing a match, even in MP - Removed most of the normal emblems, added a single emblem for Green Hills. Didn't know what to do with extra emblems and such so I just left them (FOR NOW c:<)
2018-01-16 03:31:14 +00:00
//static void M_NightsAttack(INT32 choice);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
static void M_Statistics(INT32 choice);
Change color in menu, replay support for specific staff ghosts Todo: replace the vague number with the demo's recorded player name
2017-10-21 02:01:07 +00:00
static void M_HandleStaffReplay(INT32 choice);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
static void M_ReplayTimeAttack(INT32 choice);
static void M_ChooseTimeAttack(INT32 choice);
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
//static void M_ChooseNightsAttack(INT32 choice);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
static void M_ModeAttackEndGame(INT32 choice);
static void M_SetGuestReplay(INT32 choice);
Stupidbad-big commit, but PLEASE don't ask me to re-do this on another branch, I swear to god. I know it makes things more difficult on you, and I'm sorry for that, but I'm definitely feeling the goddamn crunch right now and I wanna take a step back from this spaghetti nightmare and clear my head. * Do that thing where the character icons are ALWAYS 1x sized, through having two seperate lumps. * Revamp the S_SKIN parameters to be `facerank` (rankings - equivalent of half-scale old face), `facewant` (WANTED - equivalent of old face), and `facemmap` (equivalent of old iconprefix). * Do that thing Oni wanted where it shows two postions above and two positions below your current ranking (and you) to the left of the screen, instead of always the top 4, with some limits to avoid drawing outside of everything. * Replace the last few shitty Mario numbers (for the left rankings) with cool, new Oni numbers. * Change a bunch of offsets and things so the tab rankings and the intermission work nicer with 9+ players.
2018-10-28 16:27:55 +00:00
//static void M_ChoosePlayer(INT32 choice);
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
menu_t SP_LevelStatsDef;
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
static menu_t SP_TimeAttackDef, SP_ReplayDef, SP_GuestReplayDef, SP_GhostDef;
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
//static menu_t SP_NightsAttackDef, SP_NightsReplayDef, SP_NightsGuestReplayDef, SP_NightsGhostDef;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Multiplayer
#ifndef NONET
Add warning and reset flow for non-default masterserver address
2022-05-24 04:12:24 +00:00
static void M_PreStartServerMenu(INT32 choice);
static void M_PreStartServerMenuChoice(event_t *ev);
static void M_PreConnectMenu(INT32 choice);
static void M_PreConnectMenuChoice(event_t *ev);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
static void M_StartServerMenu(INT32 choice);
static void M_ConnectMenu(INT32 choice);
Add warning message when attempting to use the master server browser while `modifiedgame` is true. (We assume that if you're using an IP address connection, you're more of a power user.)
2019-01-18 13:04:12 +00:00
static void M_ConnectMenuModChecks(INT32 choice);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
static void M_Refresh(INT32 choice);
static void M_Connect(INT32 choice);
#endif
Add warning message when attempting to use the master server browser while `modifiedgame` is true. (We assume that if you're using an IP address connection, you're more of a power user.)
2019-01-18 13:04:12 +00:00
static void M_StartOfflineServerMenu(INT32 choice);
static void M_StartServer(INT32 choice);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
static void M_SetupMultiPlayer(INT32 choice);
static void M_SetupMultiPlayer2(INT32 choice);
initial quad stuff (does not work)
2017-12-08 07:29:01 +00:00
static void M_SetupMultiPlayer3(INT32 choice);
static void M_SetupMultiPlayer4(INT32 choice);
`[22:03] TehRealSalt: Not organized code-wise, figured toaster would want to help with that since she's the Menu Queen and she probably has better ideas on how to do it` The Menu Queen is in the house~ :sparkles: * Magical, single-page player select and general netgamey stuff, while still remaining both pretty and functional. * Death to NOFOURPLAYER, now that the cat's out the bag. * Clean up NONET, assuming people try to make DD builds on release. * Minor tweaks across the board, mostly places where I wanted to pilfer minor code from and realised it wasn't done optimally originally.
2018-10-16 21:11:47 +00:00
static void M_SetupMultiHandler(INT32 choice);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Options
// Split into multiple parts due to size
// Controls
New bindable keys You can now remap Change Viewpoint, Screenshot, and Toggle GIF Recording to other keys, mainly for gamepads They also pushed me to my breaking point and I couldn't tolerate the control menu anymore, thanks to toaster for the scrolling backport
2018-09-27 20:55:21 +00:00
menu_t OP_ControlsDef, OP_AllControlsDef;
NOFOURPLAYER as a compile option
2018-01-01 18:11:24 +00:00
menu_t OP_MouseOptionsDef, OP_Mouse2OptionsDef;
`[22:03] TehRealSalt: Not organized code-wise, figured toaster would want to help with that since she's the Menu Queen and she probably has better ideas on how to do it` The Menu Queen is in the house~ :sparkles: * Magical, single-page player select and general netgamey stuff, while still remaining both pretty and functional. * Death to NOFOURPLAYER, now that the cat's out the bag. * Clean up NONET, assuming people try to make DD builds on release. * Minor tweaks across the board, mostly places where I wanted to pilfer minor code from and realised it wasn't done optimally originally.
2018-10-16 21:11:47 +00:00
menu_t OP_Joystick1Def, OP_Joystick2Def, OP_Joystick3Def, OP_Joystick4Def;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
static void M_VideoModeMenu(INT32 choice);
static void M_Setup1PControlsMenu(INT32 choice);
static void M_Setup2PControlsMenu(INT32 choice);
initial quad stuff (does not work)
2017-12-08 07:29:01 +00:00
static void M_Setup3PControlsMenu(INT32 choice);
static void M_Setup4PControlsMenu(INT32 choice);
`[22:03] TehRealSalt: Not organized code-wise, figured toaster would want to help with that since she's the Menu Queen and she probably has better ideas on how to do it` The Menu Queen is in the house~ :sparkles: * Magical, single-page player select and general netgamey stuff, while still remaining both pretty and functional. * Death to NOFOURPLAYER, now that the cat's out the bag. * Clean up NONET, assuming people try to make DD builds on release. * Minor tweaks across the board, mostly places where I wanted to pilfer minor code from and realised it wasn't done optimally originally.
2018-10-16 21:11:47 +00:00
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
static void M_Setup1PJoystickMenu(INT32 choice);
static void M_Setup2PJoystickMenu(INT32 choice);
initial quad stuff (does not work)
2017-12-08 07:29:01 +00:00
static void M_Setup3PJoystickMenu(INT32 choice);
static void M_Setup4PJoystickMenu(INT32 choice);
`[22:03] TehRealSalt: Not organized code-wise, figured toaster would want to help with that since she's the Menu Queen and she probably has better ideas on how to do it` The Menu Queen is in the house~ :sparkles: * Magical, single-page player select and general netgamey stuff, while still remaining both pretty and functional. * Death to NOFOURPLAYER, now that the cat's out the bag. * Clean up NONET, assuming people try to make DD builds on release. * Minor tweaks across the board, mostly places where I wanted to pilfer minor code from and realised it wasn't done optimally originally.
2018-10-16 21:11:47 +00:00
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
static void M_AssignJoystick(INT32 choice);
static void M_ChangeControl(INT32 choice);
Reset to defaults option in controls
2018-11-23 03:50:40 +00:00
static void M_ResetControls(INT32 choice);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Video & Sound
menu_t OP_VideoOptionsDef, OP_VideoModeDef;
#ifdef HWRENDER
'sal-lighting' code ports from v2
2020-04-26 00:56:50 +00:00
menu_t OP_OpenGLOptionsDef, OP_OpenGLColorDef;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
#endif
menu_t OP_SoundOptionsDef;
Minor mistakes on my part
2018-10-22 21:24:58 +00:00
//static void M_RestartAudio(void);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
//Misc
Menu fix-up - Use center menu style for the tiny extras menu - Move Screenshot Options, Add-on Options, Replay Options, and Erase Data into Data Options again
2019-05-02 05:33:11 +00:00
menu_t OP_DataOptionsDef, OP_ScreenshotOptionsDef, OP_EraseDataDef;
Add some options, maxplayer/allownewplayer dont need to be netvars anymore
2020-08-22 05:53:27 +00:00
#ifdef HAVE_DISCORDRPC
menu_t OP_DiscordOptionsDef;
#endif
Fix all actionable comments in my review of sonicitems.
2018-08-09 21:59:52 +00:00
menu_t OP_HUDOptionsDef, OP_ChatOptionsDef;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
menu_t OP_GameOptionsDef, OP_ServerOptionsDef;
Advanced Server Options menu More accessible way of modifying ping limit, timeouts, max file send, etc now that the defaults are stricter
2018-11-27 17:10:46 +00:00
#ifndef NONET
menu_t OP_AdvServerOptionsDef;
#endif
Better menus
2018-06-15 00:18:29 +00:00
//menu_t OP_NetgameOptionsDef, OP_GametypeOptionsDef;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
menu_t OP_MonitorToggleDef;
static void M_ScreenshotOptions(INT32 choice);
static void M_EraseData(INT32 choice);
Addons menu. Bitch.
2018-08-28 20:08:47 +00:00
static void M_Addons(INT32 choice);
static void M_AddonsOptions(INT32 choice);
static patch_t *addonsp[NUM_EXT+5];
#define numaddonsshown 4
Start on the replay hut menu!
2019-03-31 01:57:53 +00:00
// Replay hut
Add subscreen to confirm replay watching This will have other goodies on it later!
2019-03-31 22:29:41 +00:00
menu_t MISC_ReplayHutDef;
Menu fix-up - Use center menu style for the tiny extras menu - Move Screenshot Options, Add-on Options, Replay Options, and Erase Data into Data Options again
2019-05-02 05:33:11 +00:00
menu_t MISC_ReplayOptionsDef;
List demos by title in the replay hut
2019-03-31 06:22:41 +00:00
static void M_HandleReplayHutList(INT32 choice);
Start on the replay hut menu!
2019-03-31 01:57:53 +00:00
static void M_DrawReplayHut(void);
Add subscreen to confirm replay watching This will have other goodies on it later!
2019-03-31 22:29:41 +00:00
static void M_DrawReplayStartMenu(void);
Enable exiting and playing demos from replay hut properly
2019-03-31 18:50:20 +00:00
static boolean M_QuitReplayHut(void);
Add subscreen to confirm replay watching This will have other goodies on it later!
2019-03-31 22:29:41 +00:00
static void M_HutStartReplay(INT32 choice);
Start on the replay hut menu!
2019-03-31 01:57:53 +00:00
Begin work on playback menu
2019-04-05 07:38:48 +00:00
static void M_DrawPlaybackMenu(void);
Add demo rewinding Preview is fairly basic, and only shows players rewinding. Full state is restored via reloading the replay and jumping to the timestamp once the rewind is done.
2019-04-06 19:51:00 +00:00
static void M_PlaybackRewind(INT32 choice);
Begin work on playback menu
2019-04-05 07:38:48 +00:00
static void M_PlaybackPause(INT32 choice);
static void M_PlaybackFastForward(INT32 choice);
static void M_PlaybackAdvance(INT32 choice);
static void M_PlaybackSetViews(INT32 choice);
static void M_PlaybackAdjustView(INT32 choice);
replay freecam + enhancements
2019-09-05 21:24:23 +00:00
static void M_PlaybackToggleFreecam(INT32 choice);
Fix title menu not working if you leave a replay early
2019-04-06 23:17:56 +00:00
static void M_PlaybackQuit(INT32 choice);
Begin work on playback menu
2019-04-05 07:38:48 +00:00
HORRID HACK around holding enter in the playback menu having awful, crash-causing side-effects
2019-05-02 16:00:51 +00:00
static UINT8 playback_enterheld = 0; // horrid hack to prevent holding the button from being extremely fucked
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Drawing functions
static void M_DrawGenericMenu(void);
Add replay options screen
2019-03-31 18:50:29 +00:00
static void M_DrawGenericBackgroundMenu(void);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
static void M_DrawCenteredMenu(void);
Addons menu. Bitch.
2018-08-28 20:08:47 +00:00
static void M_DrawAddons(void);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
static void M_DrawSkyRoom(void);
static void M_DrawChecklist(void);
static void M_DrawEmblemHints(void);
static void M_DrawPauseMenu(void);
More menu stuff! * Center level selection. * Re-work Record Attack screen. * Re-order MP Main menu, hide in NONET. * Combined yeeeah on vote screen. * Colour gametype on tab and tally. * (unrelated) Don't show "CHECK" if exiting.
2018-07-02 00:55:01 +00:00
static void M_DrawLevelSelectOnly(boolean leftfade, boolean rightfade);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
static void M_DrawServerMenu(void);
static void M_DrawImageDef(void);
Stupidbad-big commit, but PLEASE don't ask me to re-do this on another branch, I swear to god. I know it makes things more difficult on you, and I'm sorry for that, but I'm definitely feeling the goddamn crunch right now and I wanna take a step back from this spaghetti nightmare and clear my head. * Do that thing where the character icons are ALWAYS 1x sized, through having two seperate lumps. * Revamp the S_SKIN parameters to be `facerank` (rankings - equivalent of half-scale old face), `facewant` (WANTED - equivalent of old face), and `facemmap` (equivalent of old iconprefix). * Do that thing Oni wanted where it shows two postions above and two positions below your current ranking (and you) to the left of the screen, instead of always the top 4, with some limits to avoid drawing outside of everything. * Replace the last few shitty Mario numbers (for the left rankings) with cool, new Oni numbers. * Change a bunch of offsets and things so the tab rankings and the intermission work nicer with 9+ players.
2018-10-28 16:27:55 +00:00
//static void M_DrawLoad(void);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
static void M_DrawLevelStats(void);
static void M_DrawTimeAttackMenu(void);
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
//static void M_DrawNightsAttackMenu(void);
Stupidbad-big commit, but PLEASE don't ask me to re-do this on another branch, I swear to god. I know it makes things more difficult on you, and I'm sorry for that, but I'm definitely feeling the goddamn crunch right now and I wanna take a step back from this spaghetti nightmare and clear my head. * Do that thing where the character icons are ALWAYS 1x sized, through having two seperate lumps. * Revamp the S_SKIN parameters to be `facerank` (rankings - equivalent of half-scale old face), `facewant` (WANTED - equivalent of old face), and `facemmap` (equivalent of old iconprefix). * Do that thing Oni wanted where it shows two postions above and two positions below your current ranking (and you) to the left of the screen, instead of always the top 4, with some limits to avoid drawing outside of everything. * Replace the last few shitty Mario numbers (for the left rankings) with cool, new Oni numbers. * Change a bunch of offsets and things so the tab rankings and the intermission work nicer with 9+ players.
2018-10-28 16:27:55 +00:00
//static void M_DrawSetupChoosePlayerMenu(void);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
static void M_DrawControl(void);
Don't look at this commit too closely until after netgame, I want to surprise yalls!! * Lots of menu changes! * Little arrows next to changeable cvars! * Show default value for sliders! * Pretty pretty pretty. * I don't know how to describe some of these changes. * Effectively nuke MIDI music support! * Skiddown at the start of a race is more interesting! * Spinning in waterslides! * Tiny bugfix in voting, plus a little celebration...
2018-06-30 22:18:13 +00:00
static void M_DrawVideoMenu(void);
Fix all actionable comments in my review of sonicitems.
2018-08-09 21:59:52 +00:00
static void M_DrawHUDOptions(void);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
static void M_DrawVideoMode(void);
Toggles for kitchen sink, ten banana, & quad orbinaut, and a screen that they can fit on
2018-08-31 17:18:19 +00:00
static void M_DrawMonitorToggles(void);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
#ifdef HWRENDER
static void M_OGL_DrawColorMenu(void);
#endif
`[22:03] TehRealSalt: Not organized code-wise, figured toaster would want to help with that since she's the Menu Queen and she probably has better ideas on how to do it` The Menu Queen is in the house~ :sparkles: * Magical, single-page player select and general netgamey stuff, while still remaining both pretty and functional. * Death to NOFOURPLAYER, now that the cat's out the bag. * Clean up NONET, assuming people try to make DD builds on release. * Minor tweaks across the board, mostly places where I wanted to pilfer minor code from and realised it wasn't done optimally originally.
2018-10-16 21:11:47 +00:00
static void M_DrawMPMainMenu(void);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
#ifndef NONET
static void M_DrawConnectMenu(void);
#endif
static void M_DrawJoystick(void);
static void M_DrawSetupMultiPlayerMenu(void);
// Handling functions
#ifndef NONET
static boolean M_CancelConnect(void);
#endif
static boolean M_ExitPandorasBox(void);
static boolean M_QuitMultiPlayerMenu(void);
Addons menu. Bitch.
2018-08-28 20:08:47 +00:00
static void M_HandleAddons(INT32 choice);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
static void M_HandleSoundTest(INT32 choice);
static void M_HandleImageDef(INT32 choice);
Stupidbad-big commit, but PLEASE don't ask me to re-do this on another branch, I swear to god. I know it makes things more difficult on you, and I'm sorry for that, but I'm definitely feeling the goddamn crunch right now and I wanna take a step back from this spaghetti nightmare and clear my head. * Do that thing where the character icons are ALWAYS 1x sized, through having two seperate lumps. * Revamp the S_SKIN parameters to be `facerank` (rankings - equivalent of half-scale old face), `facewant` (WANTED - equivalent of old face), and `facemmap` (equivalent of old iconprefix). * Do that thing Oni wanted where it shows two postions above and two positions below your current ranking (and you) to the left of the screen, instead of always the top 4, with some limits to avoid drawing outside of everything. * Replace the last few shitty Mario numbers (for the left rankings) with cool, new Oni numbers. * Change a bunch of offsets and things so the tab rankings and the intermission work nicer with 9+ players.
2018-10-28 16:27:55 +00:00
//static void M_HandleLoadSave(INT32 choice);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
static void M_HandleLevelStats(INT32 choice);
#ifndef NONET
static void M_HandleConnectIP(INT32 choice);
#endif
static void M_HandleSetupMultiPlayer(INT32 choice);
static void M_HandleVideoMode(INT32 choice);
Toggles for kitchen sink, ten banana, & quad orbinaut, and a screen that they can fit on
2018-08-31 17:18:19 +00:00
static void M_HandleMonitorToggles(INT32 choice);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Consvar onchange functions
static void Nextmap_OnChange(void);
static void Newgametype_OnChange(void);
Spectate/Enter menu for online splitscreen Just like the menu option
2018-10-16 00:28:35 +00:00
static void Dummymenuplayer_OnChange(void);
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
//static void Dummymares_OnChange(void);
Change color in menu, replay support for specific staff ghosts Todo: replace the vague number with the demo's recorded player name
2017-10-21 02:01:07 +00:00
static void Dummystaff_OnChange(void);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// ==========================================================================
// CONSOLE VARIABLES AND THEIR POSSIBLE VALUES GO HERE.
// ==========================================================================
Make "Focus lost" HUD overlay optional
2019-03-11 19:50:01 +00:00
consvar_t cv_showfocuslost = {"showfocuslost", "Yes", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL };
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
static CV_PossibleValue_t map_cons_t[] = {
Added "Random" to the level selection list, for those days when you know you *want* to race but don't have any idea what to do.
2018-08-15 15:12:36 +00:00
{0,"MIN"},
This is wrong and is causing issues and I'm entirely surprised this hasn't tripped vanilla yet
2018-07-08 23:07:54 +00:00
{NUMMAPS, "MAX"},
{0, NULL}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
};
SRB2 2.1.7 release
2014-04-14 05:14:58 +00:00
consvar_t cv_nextmap = {"nextmap", "1", CV_HIDEN|CV_CALL, map_cons_t, Nextmap_OnChange, 0, NULL, NULL, 0, 0, NULL};
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
static CV_PossibleValue_t skins_cons_t[MAXSKINS+1] = {{1, DEFAULTSKIN}};
consvar_t cv_chooseskin = {"chooseskin", DEFAULTSKIN, CV_HIDEN|CV_CALL, skins_cons_t, Nextmap_OnChange, 0, NULL, NULL, 0, 0, NULL};
// This gametype list is integral for many different reasons.
Added the Gametype_Names array and G_GetGametypeByName for ease in converting gametype nums to strings and vice versa gametype_cons_t is now initialised using the Gametype_Names array, like how Color_cons_t is initialised using Color_Names # Conflicts: # src/doomstat.h # src/m_menu.c
2019-03-18 22:00:23 +00:00
// When you add gametypes here, don't forget to update them in dehacked.c and doomstat.h!
CV_PossibleValue_t gametype_cons_t[NUMGAMETYPES+1];
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Added Accelcode, start boosting, reverted drifting, etc.
2017-02-07 22:19:04 +00:00
consvar_t cv_newgametype = {"newgametype", "Race", CV_HIDEN|CV_CALL, gametype_cons_t, Newgametype_OnChange, 0, NULL, NULL, 0, 0, NULL};
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
static CV_PossibleValue_t serversort_cons_t[] = {
{0,"Ping"},
SRB2 2.1.2 release
2014-03-17 12:13:16 +00:00
{1,"Modified State"},
{2,"Most Players"},
{3,"Least Players"},
Use less confusing player sorting key names
2019-02-10 02:10:54 +00:00
{4,"Max Player Slots"},
SRB2 2.1.2 release
2014-03-17 12:13:16 +00:00
{5,"Gametype"},
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{0,NULL}
};
Remove CV_HIDEN flag for serversort
2019-01-29 18:27:43 +00:00
consvar_t cv_serversort = {"serversort", "Ping", CV_CALL, serversort_cons_t, M_SortServerList, 0, NULL, NULL, 0, 0, NULL};
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// autorecord demos for time attack
static consvar_t cv_autorecord = {"autorecord", "Yes", 0, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
Fix a bunch of issues with record attack! * Fixed the issue where your runs would be saved as belonging to the wrong character. * Make the Ghost menu always visible. This isn't PERFECT, but it's better than hiding the option to toggle ghosts just because you're doing your first run as a new character. * Fix the number of laps carrying over from MP(!!!!!!!!! plugged a huge security hole for the authenticity of replays...) Other stuff! * Hide map hell maps in the statistics. * Clean up some nonet stuff in the menu. * Put player setup last again, and tweaked its wording. * Disable the special Kart waiting for players behaviour when not playing a netgame - seeing a double gamestate transition in record attack is weird.
2018-07-06 17:08:35 +00:00
CV_PossibleValue_t ghost_cons_t[] = {{0, "Hide"}, {1, "Show Character"}, {2, "Show All"}, {0, NULL}};
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
CV_PossibleValue_t ghost2_cons_t[] = {{0, "Hide"}, {1, "Show"}, {0, NULL}};
Change color in menu, replay support for specific staff ghosts Todo: replace the vague number with the demo's recorded player name
2017-10-21 02:01:07 +00:00
consvar_t cv_ghost_besttime = {"ghost_besttime", "Show All", CV_SAVE, ghost_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
consvar_t cv_ghost_bestlap = {"ghost_bestlap", "Show All", CV_SAVE, ghost_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
Change color in menu, replay support for specific staff ghosts Todo: replace the vague number with the demo's recorded player name
2017-10-21 02:01:07 +00:00
consvar_t cv_ghost_last = {"ghost_last", "Show All", CV_SAVE, ghost_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
consvar_t cv_ghost_guest = {"ghost_guest", "Show", CV_SAVE, ghost2_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
More score/rings cleanup, hide some hud elements, and most importantly: staff ghosts! Would be nice to have an option to directly replay a specific staff ghost, but this should be fine for now
2017-10-18 03:14:51 +00:00
consvar_t cv_ghost_staff = {"ghost_staff", "Show", CV_SAVE, ghost2_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
//Console variables used solely in the menu system.
//todo: add a way to use non-console variables in the menu
// or make these consvars legitimate like color or skin.
Change dummysplitplayers into splitplayers, unhide it, and set it when joining and not just hosting Silly oversight
2018-09-30 22:07:05 +00:00
static void Splitplayers_OnChange(void);
CV_PossibleValue_t splitplayers_cons_t[] = {{1, "One"}, {2, "Two"}, {3, "Three"}, {4, "Four"}, {0, NULL}};
consvar_t cv_splitplayers = {"splitplayers", "One", CV_CALL, splitplayers_cons_t, Splitplayers_OnChange, 0, NULL, NULL, 0, 0, NULL};
Don't look at this commit too closely until after netgame, I want to surprise yalls!! * Lots of menu changes! * Little arrows next to changeable cvars! * Show default value for sliders! * Pretty pretty pretty. * I don't know how to describe some of these changes. * Effectively nuke MIDI music support! * Skiddown at the start of a race is more interesting! * Spinning in waterslides! * Tiny bugfix in voting, plus a little celebration...
2018-06-30 22:18:13 +00:00
Spectate/Enter menu for online splitscreen Just like the menu option
2018-10-16 00:28:35 +00:00
static CV_PossibleValue_t dummymenuplayer_cons_t[] = {{0, "NOPE"}, {1, "P1"}, {2, "P2"}, {3, "P3"}, {4, "P4"}, {0, NULL}};
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
static CV_PossibleValue_t dummyteam_cons_t[] = {{0, "Spectator"}, {1, "Red"}, {2, "Blue"}, {0, NULL}};
Spectate/Enter menu for online splitscreen Just like the menu option
2018-10-16 00:28:35 +00:00
static CV_PossibleValue_t dummyspectate_cons_t[] = {{0, "Spectator"}, {1, "Playing"}, {0, NULL}};
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
static CV_PossibleValue_t dummyscramble_cons_t[] = {{0, "Random"}, {1, "Points"}, {0, NULL}};
static CV_PossibleValue_t ringlimit_cons_t[] = {{0, "MIN"}, {9999, "MAX"}, {0, NULL}};
static CV_PossibleValue_t liveslimit_cons_t[] = {{0, "MIN"}, {99, "MAX"}, {0, NULL}};
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
/*static CV_PossibleValue_t dummymares_cons_t[] = {
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{-1, "END"}, {0,"Overall"}, {1,"Mare 1"}, {2,"Mare 2"}, {3,"Mare 3"}, {4,"Mare 4"}, {5,"Mare 5"}, {6,"Mare 6"}, {7,"Mare 7"}, {8,"Mare 8"}, {0,NULL}
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
};*/
Change color in menu, replay support for specific staff ghosts Todo: replace the vague number with the demo's recorded player name
2017-10-21 02:01:07 +00:00
static CV_PossibleValue_t dummystaff_cons_t[] = {{0, "MIN"}, {100, "MAX"}, {0, NULL}};
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Spectate/Enter menu for online splitscreen Just like the menu option
2018-10-16 00:28:35 +00:00
static consvar_t cv_dummymenuplayer = {"dummymenuplayer", "P1", CV_HIDEN|CV_CALL, dummymenuplayer_cons_t, Dummymenuplayer_OnChange, 0, NULL, NULL, 0, 0, NULL};
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
static consvar_t cv_dummyteam = {"dummyteam", "Spectator", CV_HIDEN, dummyteam_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
Spectate/Enter menu for online splitscreen Just like the menu option
2018-10-16 00:28:35 +00:00
static consvar_t cv_dummyspectate = {"dummyspectate", "Spectator", CV_HIDEN, dummyspectate_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
static consvar_t cv_dummyscramble = {"dummyscramble", "Random", CV_HIDEN, dummyscramble_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
static consvar_t cv_dummyrings = {"dummyrings", "0", CV_HIDEN, ringlimit_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
static consvar_t cv_dummylives = {"dummylives", "0", CV_HIDEN, liveslimit_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
static consvar_t cv_dummycontinues = {"dummycontinues", "0", CV_HIDEN, liveslimit_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
//static consvar_t cv_dummymares = {"dummymares", "Overall", CV_HIDEN|CV_CALL, dummymares_cons_t, Dummymares_OnChange, 0, NULL, NULL, 0, 0, NULL};
Change color in menu, replay support for specific staff ghosts Todo: replace the vague number with the demo's recorded player name
2017-10-21 02:01:07 +00:00
static consvar_t cv_dummystaff = {"dummystaff", "0", CV_HIDEN|CV_CALL, dummystaff_cons_t, Dummystaff_OnChange, 0, NULL, NULL, 0, 0, NULL};
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// ==========================================================================
// ORGANIZATION START.
// ==========================================================================
// Note: Never should we be jumping from one category of menu options to another
// without first going to the Main Menu.
// Note: Ignore the above if you're working with the Pause menu.
// Note: (Prefix)_MainMenu should be the target of all Main Menu options that
// point to submenus.
// ---------
// Main Menu
// ---------
static menuitem_t MainMenu[] =
{
Move menu options around 1 Player now goes directly to Time Attack, and Extras is now a submenu with Unlockables, Statistics, and a currently-dummied option for Replay Hut.
2019-03-30 22:25:54 +00:00
{IT_SUBMENU|IT_STRING, NULL, "Extras", &SR_MainDef, 76},
//{IT_CALL |IT_STRING, NULL, "1 Player", M_SinglePlayerMenu, 84},
{IT_CALL |IT_STRING, NULL, "Time Attack", M_TimeAttack, 84},
{IT_SUBMENU|IT_STRING, NULL, "Multiplayer", &MP_MainDef, 92},
{IT_CALL |IT_STRING, NULL, "Options", M_Options, 100},
{IT_CALL |IT_STRING, NULL, "Addons", M_Addons, 108},
{IT_CALL |IT_STRING, NULL, "Quit Game", M_QuitSRB2, 116},
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
};
typedef enum
{
secrets = 0,
singleplr,
multiplr,
options,
Addons menu. Bitch.
2018-08-28 20:08:47 +00:00
addons,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
quitdoom
} main_e;
Addons menu. Bitch.
2018-08-28 20:08:47 +00:00
static menuitem_t MISC_AddonsMenu[] =
{
{IT_KEYHANDLER | IT_NOTHING, NULL, "", M_HandleAddons, 0}, // dummy menuitem for the control func
};
Start on the replay hut menu!
2019-03-31 01:57:53 +00:00
static menuitem_t MISC_ReplayHutMenu[] =
{
Menu fix-up - Use center menu style for the tiny extras menu - Move Screenshot Options, Add-on Options, Replay Options, and Erase Data into Data Options again
2019-05-02 05:33:11 +00:00
{IT_KEYHANDLER|IT_NOTHING, NULL, "", M_HandleReplayHutList, 0}, // Dummy menuitem for the replay list
{IT_NOTHING, NULL, "", NULL, 0}, // Dummy for handling wrapping to the top of the menu..
Start on the replay hut menu!
2019-03-31 01:57:53 +00:00
};
Add subscreen to confirm replay watching This will have other goodies on it later!
2019-03-31 22:29:41 +00:00
static menuitem_t MISC_ReplayStartMenu[] =
{
{IT_CALL |IT_STRING, NULL, "Load Addons and Watch", M_HutStartReplay, 0},
{IT_CALL |IT_STRING, NULL, "Watch Without Addons", M_HutStartReplay, 10},
{IT_CALL |IT_STRING, NULL, "Watch Replay", M_HutStartReplay, 10},
{IT_SUBMENU |IT_STRING, NULL, "Back", &MISC_ReplayHutDef, 30},
};
Add replay options screen
2019-03-31 18:50:29 +00:00
static menuitem_t MISC_ReplayOptionsMenu[] =
{
{IT_CVAR|IT_STRING, NULL, "Record Replays", &cv_recordmultiplayerdemos, 0},
{IT_CVAR|IT_STRING, NULL, "Sync Check Interval", &cv_netdemosyncquality, 10},
};
Replay playback changes: - Store level state periodically - Load the closest usable level state when done rewinding for quicker resumes - Make playback menu fade out after 5 seconds of no activity (but not while paused) - Remove wrapping from replay hut (original wrapping was broken at some point before 1.1 and it's not necessary anyway) - Allow holding enter on frame advance for noisy slow-mo from fickleheart
2019-10-28 16:14:51 +00:00
static tic_t playback_last_menu_interaction_leveltime = 0;
Begin work on playback menu
2019-04-05 07:38:48 +00:00
static menuitem_t PlaybackMenu[] =
{
replay freecam + enhancements
2019-09-05 21:24:23 +00:00
{IT_CALL | IT_STRING, "M_PHIDE", "Hide Menu (Esc)", M_SelectableClearMenus, 0},
Reference graphics for menu and other stuff
2019-04-06 07:17:30 +00:00
replay freecam + enhancements
2019-09-05 21:24:23 +00:00
{IT_CALL | IT_STRING, "M_PREW", "Rewind ([)", M_PlaybackRewind, 20},
{IT_CALL | IT_STRING, "M_PPAUSE", "Pause (\\)", M_PlaybackPause, 36},
{IT_CALL | IT_STRING, "M_PFFWD", "Fast-Forward (])", M_PlaybackFastForward, 52},
{IT_CALL | IT_STRING, "M_PSTEPB", "Backup Frame ([)", M_PlaybackRewind, 20},
Playback menu improvements
2019-04-13 19:42:15 +00:00
{IT_CALL | IT_STRING, "M_PRESUM", "Resume", M_PlaybackPause, 36},
replay freecam + enhancements
2019-09-05 21:24:23 +00:00
{IT_CALL | IT_STRING, "M_PFADV", "Advance Frame (])", M_PlaybackAdvance, 52},
Support playback menu for record attack replays too
2019-04-06 23:59:11 +00:00
replay freecam + enhancements
2019-09-05 21:24:23 +00:00
{IT_ARROWS | IT_STRING, "M_PVIEWS", "View Count (- and =)", M_PlaybackSetViews, 72},
{IT_ARROWS | IT_STRING, "M_PNVIEW", "Viewpoint (1)", M_PlaybackAdjustView, 88},
{IT_ARROWS | IT_STRING, "M_PNVIEW", "Viewpoint 2 (2)", M_PlaybackAdjustView, 104},
{IT_ARROWS | IT_STRING, "M_PNVIEW", "Viewpoint 3 (3)", M_PlaybackAdjustView, 120},
{IT_ARROWS | IT_STRING, "M_PNVIEW", "Viewpoint 4 (4)", M_PlaybackAdjustView, 136},
Support playback menu for record attack replays too
2019-04-06 23:59:11 +00:00
replay freecam + enhancements
2019-09-05 21:24:23 +00:00
{IT_CALL | IT_STRING, "M_PVIEWS", "Toggle Free Camera (')", M_PlaybackToggleFreecam, 156},
{IT_CALL | IT_STRING, "M_PEXIT", "Stop Playback", M_PlaybackQuit, 172},
Begin work on playback menu
2019-04-05 07:38:48 +00:00
};
typedef enum
{
playback_hide,
playback_rewind,
playback_pause,
playback_fastforward,
Playback menu improvements
2019-04-13 19:42:15 +00:00
playback_backframe,
playback_resume,
Begin work on playback menu
2019-04-05 07:38:48 +00:00
playback_advanceframe,
playback_viewcount,
playback_view1,
playback_view2,
playback_view3,
playback_view4,
replay freecam + enhancements
2019-09-05 21:24:23 +00:00
playback_freecamera,
Temporarily disable Extra Options menu
2019-04-13 20:23:31 +00:00
//playback_moreoptions,
Begin work on playback menu
2019-04-05 07:38:48 +00:00
playback_quit
} playback_e;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// ---------------------------------
// Pause Menu Mode Attacking Edition
// ---------------------------------
static menuitem_t MAPauseMenu[] =
{
{IT_CALL | IT_STRING, NULL, "Continue", M_SelectableClearMenus,48},
{IT_CALL | IT_STRING, NULL, "Retry", M_ModeAttackRetry, 56},
{IT_CALL | IT_STRING, NULL, "Abort", M_ModeAttackEndGame, 64},
};
typedef enum
{
mapause_continue,
mapause_retry,
mapause_abort
} mapause_e;
// ---------------------
// Pause Menu MP Edition
// ---------------------
static menuitem_t MPauseMenu[] =
{
Use "addons" instead of "add-ons" for consistency
2020-04-22 07:24:59 +00:00
{IT_STRING | IT_CALL, NULL, "Addons...", M_Addons, 8},
merge srb2 next
2019-01-05 20:59:23 +00:00
{IT_STRING | IT_SUBMENU, NULL, "Scramble Teams...", &MISC_ScrambleTeamDef, 16},
{IT_STRING | IT_CALL, NULL, "Switch Map..." , M_MapChange, 24},
Ask to join is a menu option, rather than trying to replace your menu temporarily.
2020-08-22 11:16:52 +00:00
#ifdef HAVE_DISCORDRPC
{IT_STRING | IT_SUBMENU, NULL, "Ask To Join Requests...", &MISC_DiscordRequestsDef, 24},
#endif
merge srb2 next
2019-01-05 20:59:23 +00:00
{IT_CALL | IT_STRING, NULL, "Continue", M_SelectableClearMenus, 40},
{IT_CALL | IT_STRING, NULL, "P1 Setup...", M_SetupMultiPlayer, 48}, // splitscreen
{IT_CALL | IT_STRING, NULL, "P2 Setup...", M_SetupMultiPlayer2, 56}, // splitscreen
{IT_CALL | IT_STRING, NULL, "P3 Setup...", M_SetupMultiPlayer3, 64}, // splitscreen
{IT_CALL | IT_STRING, NULL, "P4 Setup...", M_SetupMultiPlayer4, 72}, // splitscreen
{IT_STRING | IT_CALL, NULL, "Spectate", M_ConfirmSpectate, 48}, // alone
{IT_STRING | IT_CALL, NULL, "Enter Game", M_ConfirmEnterGame, 48}, // alone
{IT_STRING | IT_CALL, NULL, "Cancel Join", M_ConfirmSpectate, 48}, // alone
{IT_STRING | IT_SUBMENU, NULL, "Switch Team...", &MISC_ChangeTeamDef, 48},
{IT_STRING | IT_SUBMENU, NULL, "Enter/Spectate...", &MISC_ChangeSpectateDef,48},
{IT_CALL | IT_STRING, NULL, "Player Setup...", M_SetupMultiPlayer, 56}, // alone
{IT_CALL | IT_STRING, NULL, "Options", M_Options, 64},
{IT_CALL | IT_STRING, NULL, "Return to Title", M_EndGame, 80},
{IT_CALL | IT_STRING, NULL, "Quit Game", M_QuitSRB2, 88},
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
};
typedef enum
{
Addons menu. Bitch.
2018-08-28 20:08:47 +00:00
mpause_addons = 0,
mpause_scramble,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
mpause_switchmap,
Ask to join is a menu option, rather than trying to replace your menu temporarily.
2020-08-22 11:16:52 +00:00
#ifdef HAVE_DISCORDRPC
mpause_discordrequests,
#endif
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
mpause_continue,
mpause_psetupsplit,
mpause_psetupsplit2,
Fix 3P and 4P configuration screens They don't crash anymore!
2017-12-18 10:56:38 +00:00
mpause_psetupsplit3,
mpause_psetupsplit4,
`[22:03] TehRealSalt: Not organized code-wise, figured toaster would want to help with that since she's the Menu Queen and she probably has better ideas on how to do it` The Menu Queen is in the house~ :sparkles: * Magical, single-page player select and general netgamey stuff, while still remaining both pretty and functional. * Death to NOFOURPLAYER, now that the cat's out the bag. * Clean up NONET, assuming people try to make DD builds on release. * Minor tweaks across the board, mostly places where I wanted to pilfer minor code from and realised it wasn't done optimally originally.
2018-10-16 21:11:47 +00:00
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
mpause_spectate,
mpause_entergame,
* Make cancelling a join work on the pause menu and console. (You need to write "changeteam spectator" to cancel a PF_WANTSTOJOIN.) * Stop respawning spectators when their PF_WANTSTOJOIN request hasn't been processed yet. * Handle PF_WANTSTOJOIN requests in GS_WAITINGPLAYERS. * Refactor K_CheckSpectateStatus, and make it so PF_WANTSTOJOIN requests are processed if there's only one player in the server, even if they're on lap 2 or up. * Make the player entry mechanism in P_SpawnPlayer use the PF_WANTSTOJOIN mechanism so that it can also take advantage of the level refresh mechanism with no extra code. * NOTE: This does a bad hack in order to not send multiple mapchanges while the joining timer is low! If you can think of a better way to do this, please let me know/commit it. * Change the timer until you can hit ITEM again when a spectator who has to wait to join shorter. * (controversial, but I think necessary) - flash the ITEM text when the above-mentioned timer is nonzero.
2018-07-21 15:45:08 +00:00
mpause_canceljoin,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
mpause_switchteam,
Spectate/Enter menu for online splitscreen Just like the menu option
2018-10-16 00:28:35 +00:00
mpause_switchspectate,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
mpause_psetup,
mpause_options,
mpause_title,
mpause_quit
} mpause_e;
// ---------------------
// Pause Menu SP Edition
// ---------------------
static menuitem_t SPauseMenu[] =
{
// Pandora's Box will be shifted up if both options are available
{IT_CALL | IT_STRING, NULL, "Pandora's Box...", M_PandorasBox, 16},
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:01:50 +00:00
{IT_CALL | IT_STRING, NULL, "Medal Hints...", M_EmblemHints, 24},
Stupidbad-big commit, but PLEASE don't ask me to re-do this on another branch, I swear to god. I know it makes things more difficult on you, and I'm sorry for that, but I'm definitely feeling the goddamn crunch right now and I wanna take a step back from this spaghetti nightmare and clear my head. * Do that thing where the character icons are ALWAYS 1x sized, through having two seperate lumps. * Revamp the S_SKIN parameters to be `facerank` (rankings - equivalent of half-scale old face), `facewant` (WANTED - equivalent of old face), and `facemmap` (equivalent of old iconprefix). * Do that thing Oni wanted where it shows two postions above and two positions below your current ranking (and you) to the left of the screen, instead of always the top 4, with some limits to avoid drawing outside of everything. * Replace the last few shitty Mario numbers (for the left rankings) with cool, new Oni numbers. * Change a bunch of offsets and things so the tab rankings and the intermission work nicer with 9+ players.
2018-10-28 16:27:55 +00:00
//{IT_CALL | IT_STRING, NULL, "Level Select...", M_LoadGameLevelSelect, 32},
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{IT_CALL | IT_STRING, NULL, "Continue", M_SelectableClearMenus,48},
{IT_CALL | IT_STRING, NULL, "Retry", M_Retry, 56},
{IT_CALL | IT_STRING, NULL, "Options", M_Options, 64},
{IT_CALL | IT_STRING, NULL, "Return to Title", M_EndGame, 80},
{IT_CALL | IT_STRING, NULL, "Quit Game", M_QuitSRB2, 88},
};
typedef enum
{
spause_pandora = 0,
spause_hints,
Stupidbad-big commit, but PLEASE don't ask me to re-do this on another branch, I swear to god. I know it makes things more difficult on you, and I'm sorry for that, but I'm definitely feeling the goddamn crunch right now and I wanna take a step back from this spaghetti nightmare and clear my head. * Do that thing where the character icons are ALWAYS 1x sized, through having two seperate lumps. * Revamp the S_SKIN parameters to be `facerank` (rankings - equivalent of half-scale old face), `facewant` (WANTED - equivalent of old face), and `facemmap` (equivalent of old iconprefix). * Do that thing Oni wanted where it shows two postions above and two positions below your current ranking (and you) to the left of the screen, instead of always the top 4, with some limits to avoid drawing outside of everything. * Replace the last few shitty Mario numbers (for the left rankings) with cool, new Oni numbers. * Change a bunch of offsets and things so the tab rankings and the intermission work nicer with 9+ players.
2018-10-28 16:27:55 +00:00
//spause_levelselect,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
spause_continue,
spause_retry,
spause_options,
spause_title,
spause_quit
} spause_e;
Invite menu started Functions! Is not pretty yet!
2020-08-21 08:14:33 +00:00
#ifdef HAVE_DISCORDRPC
Ask to join is a menu option, rather than trying to replace your menu temporarily.
2020-08-22 11:16:52 +00:00
static menuitem_t MISC_DiscordRequestsMenu[] =
Invite menu started Functions! Is not pretty yet!
2020-08-21 08:14:33 +00:00
{
{IT_KEYHANDLER|IT_NOTHING, NULL, "", M_HandleDiscordRequests, 0},
};
#endif
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// -----------------
// Misc menu options
// -----------------
// Prefix: MISC_
static menuitem_t MISC_ScrambleTeamMenu[] =
{
{IT_STRING|IT_CVAR, NULL, "Scramble Method", &cv_dummyscramble, 30},
{IT_WHITESTRING|IT_CALL, NULL, "Confirm", M_ConfirmTeamScramble, 90},
};
static menuitem_t MISC_ChangeTeamMenu[] =
{
Spectate/Enter menu for online splitscreen Just like the menu option
2018-10-16 00:28:35 +00:00
{IT_STRING|IT_CVAR, NULL, "Player", &cv_dummymenuplayer, 30},
{IT_STRING|IT_CVAR, NULL, "Team", &cv_dummyteam, 40},
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{IT_WHITESTRING|IT_CALL, NULL, "Confirm", M_ConfirmTeamChange, 90},
};
Spectate/Enter menu for online splitscreen Just like the menu option
2018-10-16 00:28:35 +00:00
static menuitem_t MISC_ChangeSpectateMenu[] =
{
{IT_STRING|IT_CVAR, NULL, "Player", &cv_dummymenuplayer, 30},
{IT_STRING|IT_CVAR, NULL, "Status", &cv_dummyspectate, 40},
{IT_WHITESTRING|IT_CALL, NULL, "Confirm", M_ConfirmSpectateChange, 90},
};
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
static menuitem_t MISC_ChangeLevelMenu[] =
{
* Completely revamp a bunch of menu stuff! * Improve control menus significantly - a more layout-neutral, gameplay importance based order, with spacing, and less depth to get to the important stuff. * Port over the improved MP main menu from internal, including flattening the IP connect onto its level. * Allow for selecting the number of splitscreen players using a menu option, rather than three seperate menu choices. * Improve the layout of all of the level/gametype select menus slightly. * (unrelated) Make fourth player area in 3p splitscreen use the tiling background instead of a pure black area. * (unrelated) Tweak minimap ordering slightly.
2018-06-30 15:01:03 +00:00
{IT_STRING|IT_CVAR, NULL, "Game Type", &cv_newgametype, 68},
{IT_STRING|IT_CVAR, NULL, "Level", &cv_nextmap, 78},
Don't look at this commit too closely until after netgame, I want to surprise yalls!! * Lots of menu changes! * Little arrows next to changeable cvars! * Show default value for sliders! * Pretty pretty pretty. * I don't know how to describe some of these changes. * Effectively nuke MIDI music support! * Skiddown at the start of a race is more interesting! * Spinning in waterslides! * Tiny bugfix in voting, plus a little celebration...
2018-06-30 22:18:13 +00:00
{IT_WHITESTRING|IT_CALL, NULL, "Change Level", M_ChangeLevel, 130},
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
};
static menuitem_t MISC_HelpMenu[] =
{
More manual pages, plus renaming the option to `Tricks & Secrets (F1)` - PLUS, the magic of a little animated how-to for leafing through the pages. Requires new patch.kart, as I wanted the leading zeroes and Jeck wanted to add more pages without more commits later...
2018-09-10 11:39:59 +00:00
{IT_KEYHANDLER | IT_NOTHING, NULL, "MANUAL00", M_HandleImageDef, 0},
{IT_KEYHANDLER | IT_NOTHING, NULL, "MANUAL01", M_HandleImageDef, 1},
{IT_KEYHANDLER | IT_NOTHING, NULL, "MANUAL02", M_HandleImageDef, 1},
{IT_KEYHANDLER | IT_NOTHING, NULL, "MANUAL03", M_HandleImageDef, 1},
{IT_KEYHANDLER | IT_NOTHING, NULL, "MANUAL04", M_HandleImageDef, 1},
{IT_KEYHANDLER | IT_NOTHING, NULL, "MANUAL05", M_HandleImageDef, 1},
{IT_KEYHANDLER | IT_NOTHING, NULL, "MANUAL06", M_HandleImageDef, 1},
{IT_KEYHANDLER | IT_NOTHING, NULL, "MANUAL07", M_HandleImageDef, 1},
{IT_KEYHANDLER | IT_NOTHING, NULL, "MANUAL08", M_HandleImageDef, 1},
{IT_KEYHANDLER | IT_NOTHING, NULL, "MANUAL09", M_HandleImageDef, 1},
{IT_KEYHANDLER | IT_NOTHING, NULL, "MANUAL10", M_HandleImageDef, 1},
{IT_KEYHANDLER | IT_NOTHING, NULL, "MANUAL11", M_HandleImageDef, 1},
Manual has more pages and less terrible large-size support.
2018-09-25 21:33:22 +00:00
{IT_KEYHANDLER | IT_NOTHING, NULL, "MANUAL12", M_HandleImageDef, 1},
{IT_KEYHANDLER | IT_NOTHING, NULL, "MANUAL99", M_HandleImageDef, 0},
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
};
// --------------------------------
// Sky Room and all of its submenus
// --------------------------------
// Prefix: SR_
// Pause Menu Pandora's Box Options
static menuitem_t SR_PandorasBox[] =
{
{IT_STRING | IT_CVAR, NULL, "Rings", &cv_dummyrings, 20},
{IT_STRING | IT_CVAR, NULL, "Lives", &cv_dummylives, 30},
{IT_STRING | IT_CVAR, NULL, "Continues", &cv_dummycontinues, 40},
{IT_STRING | IT_CVAR, NULL, "Gravity", &cv_gravity, 60},
{IT_STRING | IT_CVAR, NULL, "Throw Rings", &cv_ringslinger, 70},
{IT_STRING | IT_CALL, NULL, "Get All Emeralds", M_GetAllEmeralds, 90},
{IT_STRING | IT_CALL, NULL, "Destroy All Robots", M_DestroyRobots, 100},
{IT_STRING | IT_CALL, NULL, "Ultimate Cheat", M_UltimateCheat, 130},
};
// Sky Room Custom Unlocks
static menuitem_t SR_MainMenu[] =
{
Menu fix-up - Use center menu style for the tiny extras menu - Move Screenshot Options, Add-on Options, Replay Options, and Erase Data into Data Options again
2019-05-02 05:33:11 +00:00
{IT_STRING|IT_SUBMENU, NULL, "Unlockables", &SR_UnlockChecklistDef, 100},
{IT_CALL|IT_STRING|IT_CALL_NOTMODIFIED, NULL, "Statistics", M_Statistics, 108},
{IT_CALL|IT_STRING, NULL, "Replay Hut", M_ReplayHut, 116},
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{IT_DISABLED, NULL, "", NULL, 0}, // Custom1
{IT_DISABLED, NULL, "", NULL, 0}, // Custom2
{IT_DISABLED, NULL, "", NULL, 0}, // Custom3
{IT_DISABLED, NULL, "", NULL, 0}, // Custom4
{IT_DISABLED, NULL, "", NULL, 0}, // Custom5
{IT_DISABLED, NULL, "", NULL, 0}, // Custom6
{IT_DISABLED, NULL, "", NULL, 0}, // Custom7
{IT_DISABLED, NULL, "", NULL, 0}, // Custom8
{IT_DISABLED, NULL, "", NULL, 0}, // Custom9
{IT_DISABLED, NULL, "", NULL, 0}, // Custom10
{IT_DISABLED, NULL, "", NULL, 0}, // Custom11
{IT_DISABLED, NULL, "", NULL, 0}, // Custom12
{IT_DISABLED, NULL, "", NULL, 0}, // Custom13
{IT_DISABLED, NULL, "", NULL, 0}, // Custom14
{IT_DISABLED, NULL, "", NULL, 0}, // Custom15
{IT_DISABLED, NULL, "", NULL, 0}, // Custom16
{IT_DISABLED, NULL, "", NULL, 0}, // Custom17
{IT_DISABLED, NULL, "", NULL, 0}, // Custom18
{IT_DISABLED, NULL, "", NULL, 0}, // Custom19
{IT_DISABLED, NULL, "", NULL, 0}, // Custom20
{IT_DISABLED, NULL, "", NULL, 0}, // Custom21
{IT_DISABLED, NULL, "", NULL, 0}, // Custom22
{IT_DISABLED, NULL, "", NULL, 0}, // Custom23
{IT_DISABLED, NULL, "", NULL, 0}, // Custom24
{IT_DISABLED, NULL, "", NULL, 0}, // Custom25
{IT_DISABLED, NULL, "", NULL, 0}, // Custom26
{IT_DISABLED, NULL, "", NULL, 0}, // Custom27
{IT_DISABLED, NULL, "", NULL, 0}, // Custom28
{IT_DISABLED, NULL, "", NULL, 0}, // Custom29
{IT_DISABLED, NULL, "", NULL, 0}, // Custom30
{IT_DISABLED, NULL, "", NULL, 0}, // Custom31
{IT_DISABLED, NULL, "", NULL, 0}, // Custom32
};
Stupidbad-big commit, but PLEASE don't ask me to re-do this on another branch, I swear to god. I know it makes things more difficult on you, and I'm sorry for that, but I'm definitely feeling the goddamn crunch right now and I wanna take a step back from this spaghetti nightmare and clear my head. * Do that thing where the character icons are ALWAYS 1x sized, through having two seperate lumps. * Revamp the S_SKIN parameters to be `facerank` (rankings - equivalent of half-scale old face), `facewant` (WANTED - equivalent of old face), and `facemmap` (equivalent of old iconprefix). * Do that thing Oni wanted where it shows two postions above and two positions below your current ranking (and you) to the left of the screen, instead of always the top 4, with some limits to avoid drawing outside of everything. * Replace the last few shitty Mario numbers (for the left rankings) with cool, new Oni numbers. * Change a bunch of offsets and things so the tab rankings and the intermission work nicer with 9+ players.
2018-10-28 16:27:55 +00:00
/*static menuitem_t SR_LevelSelectMenu[] =
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
* Completely revamp a bunch of menu stuff! * Improve control menus significantly - a more layout-neutral, gameplay importance based order, with spacing, and less depth to get to the important stuff. * Port over the improved MP main menu from internal, including flattening the IP connect onto its level. * Allow for selecting the number of splitscreen players using a menu option, rather than three seperate menu choices. * Improve the layout of all of the level/gametype select menus slightly. * (unrelated) Make fourth player area in 3p splitscreen use the tiling background instead of a pure black area. * (unrelated) Tweak minimap ordering slightly.
2018-06-30 15:01:03 +00:00
{IT_STRING|IT_CVAR, NULL, "Level", &cv_nextmap, 78},
{IT_WHITESTRING|IT_CALL, NULL, "Start", M_LevelSelectWarp, 130},
Stupidbad-big commit, but PLEASE don't ask me to re-do this on another branch, I swear to god. I know it makes things more difficult on you, and I'm sorry for that, but I'm definitely feeling the goddamn crunch right now and I wanna take a step back from this spaghetti nightmare and clear my head. * Do that thing where the character icons are ALWAYS 1x sized, through having two seperate lumps. * Revamp the S_SKIN parameters to be `facerank` (rankings - equivalent of half-scale old face), `facewant` (WANTED - equivalent of old face), and `facemmap` (equivalent of old iconprefix). * Do that thing Oni wanted where it shows two postions above and two positions below your current ranking (and you) to the left of the screen, instead of always the top 4, with some limits to avoid drawing outside of everything. * Replace the last few shitty Mario numbers (for the left rankings) with cool, new Oni numbers. * Change a bunch of offsets and things so the tab rankings and the intermission work nicer with 9+ players.
2018-10-28 16:27:55 +00:00
};*/
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
static menuitem_t SR_UnlockChecklistMenu[] =
{
whoop, minor thing
2018-03-04 23:57:34 +00:00
{IT_SUBMENU | IT_STRING, NULL, "NEXT", &MainDef, 192},
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
};
static menuitem_t SR_EmblemHintMenu[] =
{
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:01:50 +00:00
{IT_STRING|IT_CVAR, NULL, "Medal Radar", &cv_itemfinder, 10},
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{IT_WHITESTRING|IT_SUBMENU, NULL, "Back", &SPauseDef, 20}
};
// --------------------------------
// 1 Player and all of its submenus
// --------------------------------
// Prefix: SP_
// Single Player Main
static menuitem_t SP_MainMenu[] =
{
Lots of changes - Menus now have all of the Kart cvars - Removed any cvars that aren't useful for Kart from the menu (they still exist in the console, though) - Removed SP and NiGHTS Mode options from the main menu - "kartcc" is renamed "kartspeed", uses values 0-2 instead of multiples of 50, or the terms "Relaxed", "Standard", and "Turbo" - Many gametype options (game speed, frantic, mirror, & karma comeback) are now changed on map load instead of instantly - New cvar, "kartminimap", for disabling the minimap - The maxplayers cvar now actually matches up with our 16 player limit - Game now keeps track of matches played. Has a condition type associated with it, as well. - Game checks for unlocks and saves gamedata when finishing a match, even in MP - Removed most of the normal emblems, added a single emblem for Green Hills. Didn't know what to do with extra emblems and such so I just left them (FOR NOW c:<)
2018-01-16 03:31:14 +00:00
//{IT_CALL | IT_STRING, NULL, "Start Game", M_LoadGame, 92},
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{IT_SECRET, NULL, "Record Attack", M_TimeAttack, 100},
Lots of changes - Menus now have all of the Kart cvars - Removed any cvars that aren't useful for Kart from the menu (they still exist in the console, though) - Removed SP and NiGHTS Mode options from the main menu - "kartcc" is renamed "kartspeed", uses values 0-2 instead of multiples of 50, or the terms "Relaxed", "Standard", and "Turbo" - Many gametype options (game speed, frantic, mirror, & karma comeback) are now changed on map load instead of instantly - New cvar, "kartminimap", for disabling the minimap - The maxplayers cvar now actually matches up with our 16 player limit - Game now keeps track of matches played. Has a condition type associated with it, as well. - Game checks for unlocks and saves gamedata when finishing a match, even in MP - Removed most of the normal emblems, added a single emblem for Green Hills. Didn't know what to do with extra emblems and such so I just left them (FOR NOW c:<)
2018-01-16 03:31:14 +00:00
//{IT_SECRET, NULL, "NiGHTS Mode", M_NightsAttack, 108},
{IT_CALL | IT_STRING | IT_CALL_NOTMODIFIED, NULL, "Statistics", M_Statistics, 108},
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
};
enum
{
Lots of changes - Menus now have all of the Kart cvars - Removed any cvars that aren't useful for Kart from the menu (they still exist in the console, though) - Removed SP and NiGHTS Mode options from the main menu - "kartcc" is renamed "kartspeed", uses values 0-2 instead of multiples of 50, or the terms "Relaxed", "Standard", and "Turbo" - Many gametype options (game speed, frantic, mirror, & karma comeback) are now changed on map load instead of instantly - New cvar, "kartminimap", for disabling the minimap - The maxplayers cvar now actually matches up with our 16 player limit - Game now keeps track of matches played. Has a condition type associated with it, as well. - Game checks for unlocks and saves gamedata when finishing a match, even in MP - Removed most of the normal emblems, added a single emblem for Green Hills. Didn't know what to do with extra emblems and such so I just left them (FOR NOW c:<)
2018-01-16 03:31:14 +00:00
//sploadgame,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
sprecordattack,
Lots of changes - Menus now have all of the Kart cvars - Removed any cvars that aren't useful for Kart from the menu (they still exist in the console, though) - Removed SP and NiGHTS Mode options from the main menu - "kartcc" is renamed "kartspeed", uses values 0-2 instead of multiples of 50, or the terms "Relaxed", "Standard", and "Turbo" - Many gametype options (game speed, frantic, mirror, & karma comeback) are now changed on map load instead of instantly - New cvar, "kartminimap", for disabling the minimap - The maxplayers cvar now actually matches up with our 16 player limit - Game now keeps track of matches played. Has a condition type associated with it, as well. - Game checks for unlocks and saves gamedata when finishing a match, even in MP - Removed most of the normal emblems, added a single emblem for Green Hills. Didn't know what to do with extra emblems and such so I just left them (FOR NOW c:<)
2018-01-16 03:31:14 +00:00
//spnightsmode,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
spstatistics
};
// Single Player Load Game
Stupidbad-big commit, but PLEASE don't ask me to re-do this on another branch, I swear to god. I know it makes things more difficult on you, and I'm sorry for that, but I'm definitely feeling the goddamn crunch right now and I wanna take a step back from this spaghetti nightmare and clear my head. * Do that thing where the character icons are ALWAYS 1x sized, through having two seperate lumps. * Revamp the S_SKIN parameters to be `facerank` (rankings - equivalent of half-scale old face), `facewant` (WANTED - equivalent of old face), and `facemmap` (equivalent of old iconprefix). * Do that thing Oni wanted where it shows two postions above and two positions below your current ranking (and you) to the left of the screen, instead of always the top 4, with some limits to avoid drawing outside of everything. * Replace the last few shitty Mario numbers (for the left rankings) with cool, new Oni numbers. * Change a bunch of offsets and things so the tab rankings and the intermission work nicer with 9+ players.
2018-10-28 16:27:55 +00:00
/*static menuitem_t SP_LoadGameMenu[] =
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
{IT_KEYHANDLER | IT_NOTHING, NULL, "", M_HandleLoadSave, '\0'}, // dummy menuitem for the control func
};
// Single Player Level Select
static menuitem_t SP_LevelSelectMenu[] =
{
* Completely revamp a bunch of menu stuff! * Improve control menus significantly - a more layout-neutral, gameplay importance based order, with spacing, and less depth to get to the important stuff. * Port over the improved MP main menu from internal, including flattening the IP connect onto its level. * Allow for selecting the number of splitscreen players using a menu option, rather than three seperate menu choices. * Improve the layout of all of the level/gametype select menus slightly. * (unrelated) Make fourth player area in 3p splitscreen use the tiling background instead of a pure black area. * (unrelated) Tweak minimap ordering slightly.
2018-06-30 15:01:03 +00:00
{IT_STRING|IT_CVAR, NULL, "Level", &cv_nextmap, 78},
{IT_WHITESTRING|IT_CALL, NULL, "Start", M_LevelSelectWarp, 130},
Stupidbad-big commit, but PLEASE don't ask me to re-do this on another branch, I swear to god. I know it makes things more difficult on you, and I'm sorry for that, but I'm definitely feeling the goddamn crunch right now and I wanna take a step back from this spaghetti nightmare and clear my head. * Do that thing where the character icons are ALWAYS 1x sized, through having two seperate lumps. * Revamp the S_SKIN parameters to be `facerank` (rankings - equivalent of half-scale old face), `facewant` (WANTED - equivalent of old face), and `facemmap` (equivalent of old iconprefix). * Do that thing Oni wanted where it shows two postions above and two positions below your current ranking (and you) to the left of the screen, instead of always the top 4, with some limits to avoid drawing outside of everything. * Replace the last few shitty Mario numbers (for the left rankings) with cool, new Oni numbers. * Change a bunch of offsets and things so the tab rankings and the intermission work nicer with 9+ players.
2018-10-28 16:27:55 +00:00
};*/
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Single Player Time Attack
static menuitem_t SP_TimeAttackMenu[] =
{
More menu stuff! * Center level selection. * Re-work Record Attack screen. * Re-order MP Main menu, hide in NONET. * Combined yeeeah on vote screen. * Colour gametype on tab and tally. * (unrelated) Don't show "CHECK" if exiting.
2018-07-02 00:55:01 +00:00
{IT_STRING|IT_CVAR|IT_CV_STRING, NULL, "Name", &cv_playername, 0},
Layout tweaks to record attack menu and statistics screen.
2018-07-12 14:45:00 +00:00
{IT_STRING|IT_CVAR, NULL, "Character", &cv_chooseskin, 13},
More menu stuff! * Center level selection. * Re-work Record Attack screen. * Re-order MP Main menu, hide in NONET. * Combined yeeeah on vote screen. * Colour gametype on tab and tally. * (unrelated) Don't show "CHECK" if exiting.
2018-07-02 00:55:01 +00:00
{IT_STRING|IT_CVAR, NULL, "Color", &cv_playercolor, 26},
{IT_STRING|IT_CVAR, NULL, "Level", &cv_nextmap, 78},
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
More menu stuff! * Center level selection. * Re-work Record Attack screen. * Re-order MP Main menu, hide in NONET. * Combined yeeeah on vote screen. * Colour gametype on tab and tally. * (unrelated) Don't show "CHECK" if exiting.
2018-07-02 00:55:01 +00:00
{IT_DISABLED, NULL, "Guest...", &SP_GuestReplayDef, 98},
{IT_DISABLED, NULL, "Replay...", &SP_ReplayDef, 108},
Fix a bunch of issues with record attack! * Fixed the issue where your runs would be saved as belonging to the wrong character. * Make the Ghost menu always visible. This isn't PERFECT, but it's better than hiding the option to toggle ghosts just because you're doing your first run as a new character. * Fix the number of laps carrying over from MP(!!!!!!!!! plugged a huge security hole for the authenticity of replays...) Other stuff! * Hide map hell maps in the statistics. * Clean up some nonet stuff in the menu. * Put player setup last again, and tweaked its wording. * Disable the special Kart waiting for players behaviour when not playing a netgame - seeing a double gamestate transition in record attack is weird.
2018-07-06 17:08:35 +00:00
{IT_WHITESTRING|IT_SUBMENU, NULL, "Ghosts...", &SP_GhostDef, 118},
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
{IT_WHITESTRING|IT_CALL|IT_CALL_NOTMODIFIED, NULL, "Start", M_ChooseTimeAttack, 130},
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
};
enum
{
More menu stuff! * Center level selection. * Re-work Record Attack screen. * Re-order MP Main menu, hide in NONET. * Combined yeeeah on vote screen. * Colour gametype on tab and tally. * (unrelated) Don't show "CHECK" if exiting.
2018-07-02 00:55:01 +00:00
taname,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
taplayer,
Change color in menu, replay support for specific staff ghosts Todo: replace the vague number with the demo's recorded player name
2017-10-21 02:01:07 +00:00
tacolor,
More menu stuff! * Center level selection. * Re-work Record Attack screen. * Re-order MP Main menu, hide in NONET. * Combined yeeeah on vote screen. * Colour gametype on tab and tally. * (unrelated) Don't show "CHECK" if exiting.
2018-07-02 00:55:01 +00:00
talevel,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
taguest,
tareplay,
taghost,
tastart
};
static menuitem_t SP_ReplayMenu[] =
{
More menu stuff! * Center level selection. * Re-work Record Attack screen. * Re-order MP Main menu, hide in NONET. * Combined yeeeah on vote screen. * Colour gametype on tab and tally. * (unrelated) Don't show "CHECK" if exiting.
2018-07-02 00:55:01 +00:00
{IT_WHITESTRING|IT_CALL, NULL, "Replay Best Time", M_ReplayTimeAttack, 90},
{IT_WHITESTRING|IT_CALL, NULL, "Replay Best Lap", M_ReplayTimeAttack, 98},
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
More menu stuff! * Center level selection. * Re-work Record Attack screen. * Re-order MP Main menu, hide in NONET. * Combined yeeeah on vote screen. * Colour gametype on tab and tally. * (unrelated) Don't show "CHECK" if exiting.
2018-07-02 00:55:01 +00:00
{IT_WHITESTRING|IT_CALL, NULL, "Replay Last", M_ReplayTimeAttack, 106},
{IT_WHITESTRING|IT_CALL, NULL, "Replay Guest", M_ReplayTimeAttack, 114},
{IT_WHITESTRING|IT_KEYHANDLER, NULL, "Replay Staff",M_HandleStaffReplay,122},
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
More menu stuff! * Center level selection. * Re-work Record Attack screen. * Re-order MP Main menu, hide in NONET. * Combined yeeeah on vote screen. * Colour gametype on tab and tally. * (unrelated) Don't show "CHECK" if exiting.
2018-07-02 00:55:01 +00:00
{IT_WHITESTRING|IT_SUBMENU, NULL, "Back", &SP_TimeAttackDef, 130}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
};
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
/*static menuitem_t SP_NightsReplayMenu[] =
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
{
Change color in menu, replay support for specific staff ghosts Todo: replace the vague number with the demo's recorded player name
2017-10-21 02:01:07 +00:00
{IT_WHITESTRING|IT_CALL, NULL, "Replay Best Score", M_ReplayTimeAttack, 0},
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
{IT_WHITESTRING|IT_CALL, NULL, "Replay Best Time", M_ReplayTimeAttack,16},
Change color in menu, replay support for specific staff ghosts Todo: replace the vague number with the demo's recorded player name
2017-10-21 02:01:07 +00:00
{IT_WHITESTRING|IT_CALL, NULL, "Replay Last", M_ReplayTimeAttack,21},
{IT_WHITESTRING|IT_CALL, NULL, "Replay Guest", M_ReplayTimeAttack,29},
{IT_WHITESTRING|IT_KEYHANDLER, NULL, "Replay Staff",M_HandleStaffReplay,37},
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
{IT_WHITESTRING|IT_SUBMENU, NULL, "Back", &SP_NightsAttackDef, 50}
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
};*/
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
static menuitem_t SP_GuestReplayMenu[] =
{
More menu stuff! * Center level selection. * Re-work Record Attack screen. * Re-order MP Main menu, hide in NONET. * Combined yeeeah on vote screen. * Colour gametype on tab and tally. * (unrelated) Don't show "CHECK" if exiting.
2018-07-02 00:55:01 +00:00
{IT_WHITESTRING|IT_CALL, NULL, "Save Best Time as Guest", M_SetGuestReplay, 94},
{IT_WHITESTRING|IT_CALL, NULL, "Save Best Lap as Guest", M_SetGuestReplay,102},
{IT_WHITESTRING|IT_CALL, NULL, "Save Last as Guest", M_SetGuestReplay,110},
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
More menu stuff! * Center level selection. * Re-work Record Attack screen. * Re-order MP Main menu, hide in NONET. * Combined yeeeah on vote screen. * Colour gametype on tab and tally. * (unrelated) Don't show "CHECK" if exiting.
2018-07-02 00:55:01 +00:00
{IT_WHITESTRING|IT_CALL, NULL, "Delete Guest Replay", M_SetGuestReplay,120},
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
More menu stuff! * Center level selection. * Re-work Record Attack screen. * Re-order MP Main menu, hide in NONET. * Combined yeeeah on vote screen. * Colour gametype on tab and tally. * (unrelated) Don't show "CHECK" if exiting.
2018-07-02 00:55:01 +00:00
{IT_WHITESTRING|IT_SUBMENU, NULL, "Back", &SP_TimeAttackDef, 130}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
};
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
/*static menuitem_t SP_NightsGuestReplayMenu[] =
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
{
{IT_WHITESTRING|IT_CALL, NULL, "Save Best Score as Guest", M_SetGuestReplay, 8},
{IT_WHITESTRING|IT_CALL, NULL, "Save Best Time as Guest", M_SetGuestReplay,16},
{IT_WHITESTRING|IT_CALL, NULL, "Save Last as Guest", M_SetGuestReplay,24},
{IT_WHITESTRING|IT_CALL, NULL, "Delete Guest Replay", M_SetGuestReplay,37},
{IT_WHITESTRING|IT_SUBMENU, NULL, "Back", &SP_NightsAttackDef, 50}
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
};*/
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
static menuitem_t SP_GhostMenu[] =
{
More menu stuff! * Center level selection. * Re-work Record Attack screen. * Re-order MP Main menu, hide in NONET. * Combined yeeeah on vote screen. * Colour gametype on tab and tally. * (unrelated) Don't show "CHECK" if exiting.
2018-07-02 00:55:01 +00:00
{IT_STRING|IT_CVAR, NULL, "Best Time", &cv_ghost_besttime, 88},
{IT_STRING|IT_CVAR, NULL, "Best Lap", &cv_ghost_bestlap, 96},
{IT_STRING|IT_CVAR, NULL, "Last", &cv_ghost_last, 104},
Fix a bunch of issues with record attack! * Fixed the issue where your runs would be saved as belonging to the wrong character. * Make the Ghost menu always visible. This isn't PERFECT, but it's better than hiding the option to toggle ghosts just because you're doing your first run as a new character. * Fix the number of laps carrying over from MP(!!!!!!!!! plugged a huge security hole for the authenticity of replays...) Other stuff! * Hide map hell maps in the statistics. * Clean up some nonet stuff in the menu. * Put player setup last again, and tweaked its wording. * Disable the special Kart waiting for players behaviour when not playing a netgame - seeing a double gamestate transition in record attack is weird.
2018-07-06 17:08:35 +00:00
{IT_DISABLED, NULL, "Guest", &cv_ghost_guest, 112},
{IT_DISABLED, NULL, "Staff Attack",&cv_ghost_staff, 120},
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
More menu stuff! * Center level selection. * Re-work Record Attack screen. * Re-order MP Main menu, hide in NONET. * Combined yeeeah on vote screen. * Colour gametype on tab and tally. * (unrelated) Don't show "CHECK" if exiting.
2018-07-02 00:55:01 +00:00
{IT_WHITESTRING|IT_SUBMENU, NULL, "Back", &SP_TimeAttackDef, 130}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
};
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
/*static menuitem_t SP_NightsGhostMenu[] =
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
{
More score/rings cleanup, hide some hud elements, and most importantly: staff ghosts! Would be nice to have an option to directly replay a specific staff ghost, but this should be fine for now
2017-10-18 03:14:51 +00:00
{IT_STRING|IT_CVAR, NULL, "Best Score", &cv_ghost_bestscore, 0},
{IT_STRING|IT_CVAR, NULL, "Best Time", &cv_ghost_besttime, 8},
{IT_STRING|IT_CVAR, NULL, "Last", &cv_ghost_last, 16},
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
More score/rings cleanup, hide some hud elements, and most importantly: staff ghosts! Would be nice to have an option to directly replay a specific staff ghost, but this should be fine for now
2017-10-18 03:14:51 +00:00
{IT_STRING|IT_CVAR, NULL, "Guest", &cv_ghost_guest, 29},
{IT_STRING|IT_CVAR, NULL, "Staff Attack",&cv_ghost_staff, 37},
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
Change color in menu, replay support for specific staff ghosts Todo: replace the vague number with the demo's recorded player name
2017-10-21 02:01:07 +00:00
{IT_WHITESTRING|IT_SUBMENU, NULL, "Back", &SP_NightsAttackDef, 50}
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
};*/
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Single Player Nights Attack
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
/*static menuitem_t SP_NightsAttackMenu[] =
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
{IT_STRING|IT_CVAR, NULL, "Level", &cv_nextmap, 44},
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
{IT_STRING|IT_CVAR, NULL, "Show Records For", &cv_dummymares, 54},
{IT_DISABLED, NULL, "Guest Option...", &SP_NightsGuestReplayDef, 108},
{IT_DISABLED, NULL, "Replay...", &SP_NightsReplayDef, 118},
{IT_DISABLED, NULL, "Ghosts...", &SP_NightsGhostDef, 128},
If the game becomes modified during a record attack run, end it RA menu can be opened if the game is modified, but Start can't be selected. (Obvious reason: so scripts to display info can be used easier) Fixed the stupid background for messages in the Record Attack menu, it was bugging me
2016-08-20 05:18:43 +00:00
{IT_WHITESTRING|IT_CALL|IT_CALL_NOTMODIFIED, NULL, "Start", M_ChooseNightsAttack, 138},
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
};*/
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
enum
{
nalevel,
narecords,
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
naguest,
nareplay,
naghost,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
nastart
};
// Statistics
static menuitem_t SP_LevelStatsMenu[] =
{
{IT_KEYHANDLER | IT_NOTHING, NULL, "", M_HandleLevelStats, '\0'}, // dummy menuitem for the control func
};
// A rare case.
// External files modify this menu, so we can't call it static.
// And I'm too lazy to go through and rename it everywhere. ARRGH!
Stupidbad-big commit, but PLEASE don't ask me to re-do this on another branch, I swear to god. I know it makes things more difficult on you, and I'm sorry for that, but I'm definitely feeling the goddamn crunch right now and I wanna take a step back from this spaghetti nightmare and clear my head. * Do that thing where the character icons are ALWAYS 1x sized, through having two seperate lumps. * Revamp the S_SKIN parameters to be `facerank` (rankings - equivalent of half-scale old face), `facewant` (WANTED - equivalent of old face), and `facemmap` (equivalent of old iconprefix). * Do that thing Oni wanted where it shows two postions above and two positions below your current ranking (and you) to the left of the screen, instead of always the top 4, with some limits to avoid drawing outside of everything. * Replace the last few shitty Mario numbers (for the left rankings) with cool, new Oni numbers. * Change a bunch of offsets and things so the tab rankings and the intermission work nicer with 9+ players.
2018-10-28 16:27:55 +00:00
#define M_ChoosePlayer NULL
Update the (unused) SP menu stuff to use MAXSKINS
2019-01-16 01:09:55 +00:00
menuitem_t PlayerMenu[MAXSKINS];
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// -----------------------------------
// Multiplayer and all of its submenus
// -----------------------------------
// Prefix: MP_
NOFOURPLAYER as a compile option
2018-01-01 18:11:24 +00:00
`[22:03] TehRealSalt: Not organized code-wise, figured toaster would want to help with that since she's the Menu Queen and she probably has better ideas on how to do it` The Menu Queen is in the house~ :sparkles: * Magical, single-page player select and general netgamey stuff, while still remaining both pretty and functional. * Death to NOFOURPLAYER, now that the cat's out the bag. * Clean up NONET, assuming people try to make DD builds on release. * Minor tweaks across the board, mostly places where I wanted to pilfer minor code from and realised it wasn't done optimally originally.
2018-10-16 21:11:47 +00:00
static menuitem_t MP_MainMenu[] =
Sorta messy menu to set splitscreen Now this branch is completely functional!
2018-09-30 21:09:59 +00:00
{
`[22:03] TehRealSalt: Not organized code-wise, figured toaster would want to help with that since she's the Menu Queen and she probably has better ideas on how to do it` The Menu Queen is in the house~ :sparkles: * Magical, single-page player select and general netgamey stuff, while still remaining both pretty and functional. * Death to NOFOURPLAYER, now that the cat's out the bag. * Clean up NONET, assuming people try to make DD builds on release. * Minor tweaks across the board, mostly places where I wanted to pilfer minor code from and realised it wasn't done optimally originally.
2018-10-16 21:11:47 +00:00
{IT_HEADER, NULL, "Players", NULL, 0},
{IT_STRING|IT_CVAR, NULL, "Number of local players", &cv_splitplayers, 10},
Sorta messy menu to set splitscreen Now this branch is completely functional!
2018-09-30 21:09:59 +00:00
`[22:03] TehRealSalt: Not organized code-wise, figured toaster would want to help with that since she's the Menu Queen and she probably has better ideas on how to do it` The Menu Queen is in the house~ :sparkles: * Magical, single-page player select and general netgamey stuff, while still remaining both pretty and functional. * Death to NOFOURPLAYER, now that the cat's out the bag. * Clean up NONET, assuming people try to make DD builds on release. * Minor tweaks across the board, mostly places where I wanted to pilfer minor code from and realised it wasn't done optimally originally.
2018-10-16 21:11:47 +00:00
{IT_STRING|IT_KEYHANDLER,NULL, "Player setup...", M_SetupMultiHandler,18},
{IT_HEADER, NULL, "Host a game", NULL, 100-24},
#ifndef NONET
Add warning and reset flow for non-default masterserver address
2022-05-24 04:12:24 +00:00
{IT_STRING|IT_CALL, NULL, "Internet/LAN...", M_PreStartServerMenu, 110-24},
Sorta messy menu to set splitscreen Now this branch is completely functional!
2018-09-30 21:09:59 +00:00
#else
`[22:03] TehRealSalt: Not organized code-wise, figured toaster would want to help with that since she's the Menu Queen and she probably has better ideas on how to do it` The Menu Queen is in the house~ :sparkles: * Magical, single-page player select and general netgamey stuff, while still remaining both pretty and functional. * Death to NOFOURPLAYER, now that the cat's out the bag. * Clean up NONET, assuming people try to make DD builds on release. * Minor tweaks across the board, mostly places where I wanted to pilfer minor code from and realised it wasn't done optimally originally.
2018-10-16 21:11:47 +00:00
{IT_GRAYEDOUT, NULL, "Internet/LAN...", NULL, 110-24},
Sorta messy menu to set splitscreen Now this branch is completely functional!
2018-09-30 21:09:59 +00:00
#endif
`[22:03] TehRealSalt: Not organized code-wise, figured toaster would want to help with that since she's the Menu Queen and she probably has better ideas on how to do it` The Menu Queen is in the house~ :sparkles: * Magical, single-page player select and general netgamey stuff, while still remaining both pretty and functional. * Death to NOFOURPLAYER, now that the cat's out the bag. * Clean up NONET, assuming people try to make DD builds on release. * Minor tweaks across the board, mostly places where I wanted to pilfer minor code from and realised it wasn't done optimally originally.
2018-10-16 21:11:47 +00:00
{IT_STRING|IT_CALL, NULL, "Offline...", M_StartOfflineServerMenu, 118-24},
Sorta messy menu to set splitscreen Now this branch is completely functional!
2018-09-30 21:09:59 +00:00
`[22:03] TehRealSalt: Not organized code-wise, figured toaster would want to help with that since she's the Menu Queen and she probably has better ideas on how to do it` The Menu Queen is in the house~ :sparkles: * Magical, single-page player select and general netgamey stuff, while still remaining both pretty and functional. * Death to NOFOURPLAYER, now that the cat's out the bag. * Clean up NONET, assuming people try to make DD builds on release. * Minor tweaks across the board, mostly places where I wanted to pilfer minor code from and realised it wasn't done optimally originally.
2018-10-16 21:11:47 +00:00
{IT_HEADER, NULL, "Join a game", NULL, 132-24},
#ifndef NONET
Add warning and reset flow for non-default masterserver address
2022-05-24 04:12:24 +00:00
{IT_STRING|IT_CALL, NULL, "Internet server browser...",M_PreConnectMenu, 142-24},
`[22:03] TehRealSalt: Not organized code-wise, figured toaster would want to help with that since she's the Menu Queen and she probably has better ideas on how to do it` The Menu Queen is in the house~ :sparkles: * Magical, single-page player select and general netgamey stuff, while still remaining both pretty and functional. * Death to NOFOURPLAYER, now that the cat's out the bag. * Clean up NONET, assuming people try to make DD builds on release. * Minor tweaks across the board, mostly places where I wanted to pilfer minor code from and realised it wasn't done optimally originally.
2018-10-16 21:11:47 +00:00
{IT_STRING|IT_KEYHANDLER, NULL, "Specify IPv4 address:", M_HandleConnectIP, 150-24},
#else
Add warning message when attempting to use the master server browser while `modifiedgame` is true. (We assume that if you're using an IP address connection, you're more of a power user.)
2019-01-18 13:04:12 +00:00
{IT_GRAYEDOUT, NULL, "Internet server browser...",NULL, 142-24},
{IT_GRAYEDOUT, NULL, "Specify IPv4 address:", NULL, 150-24},
`[22:03] TehRealSalt: Not organized code-wise, figured toaster would want to help with that since she's the Menu Queen and she probably has better ideas on how to do it` The Menu Queen is in the house~ :sparkles: * Magical, single-page player select and general netgamey stuff, while still remaining both pretty and functional. * Death to NOFOURPLAYER, now that the cat's out the bag. * Clean up NONET, assuming people try to make DD builds on release. * Minor tweaks across the board, mostly places where I wanted to pilfer minor code from and realised it wasn't done optimally originally.
2018-10-16 21:11:47 +00:00
#endif
Sorta messy menu to set splitscreen Now this branch is completely functional!
2018-09-30 21:09:59 +00:00
//{IT_HEADER, NULL, "Player setup", NULL, 80},
//{IT_STRING|IT_CALL, NULL, "Name, character, color...", M_SetupMultiPlayer, 90},
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
};
`[22:03] TehRealSalt: Not organized code-wise, figured toaster would want to help with that since she's the Menu Queen and she probably has better ideas on how to do it` The Menu Queen is in the house~ :sparkles: * Magical, single-page player select and general netgamey stuff, while still remaining both pretty and functional. * Death to NOFOURPLAYER, now that the cat's out the bag. * Clean up NONET, assuming people try to make DD builds on release. * Minor tweaks across the board, mostly places where I wanted to pilfer minor code from and realised it wasn't done optimally originally.
2018-10-16 21:11:47 +00:00
#ifndef NONET
* Completely revamp a bunch of menu stuff! * Improve control menus significantly - a more layout-neutral, gameplay importance based order, with spacing, and less depth to get to the important stuff. * Port over the improved MP main menu from internal, including flattening the IP connect onto its level. * Allow for selecting the number of splitscreen players using a menu option, rather than three seperate menu choices. * Improve the layout of all of the level/gametype select menus slightly. * (unrelated) Make fourth player area in 3p splitscreen use the tiling background instead of a pure black area. * (unrelated) Tweak minimap ordering slightly.
2018-06-30 15:01:03 +00:00
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
static menuitem_t MP_ServerMenu[] =
{
remove join passwords
2019-08-04 09:26:26 +00:00
{IT_STRING|IT_CVAR, NULL, "Max. Player Count", &cv_maxplayers, 10},
Basically, update master server code to v2 Removes rooms, replaced with cv_advertise and "Advertise" on the host menu. According to the new API, SRB2APPLICATION is sent instead of MODID. A contact field was added, but there is no means of accessing it or setting it. As a slight change, the server list will be populated even on an outdated version of the game. (The new API was designed with this in mind.) The update alert is still presented first of course.
2020-09-11 12:56:40 +00:00
{IT_STRING|IT_CVAR, NULL, "Advertise", &cv_advertise, 20},
remove join passwords
2019-08-04 09:26:26 +00:00
{IT_STRING|IT_CVAR|IT_CV_STRING, NULL, "Server Name", &cv_servername, 30},
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Add join password to server host menu
2019-03-09 21:00:48 +00:00
{IT_STRING|IT_CVAR, NULL, "Game Type", &cv_newgametype, 68},
{IT_STRING|IT_CVAR, NULL, "Level", &cv_nextmap, 78},
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Add join password to server host menu
2019-03-09 21:00:48 +00:00
{IT_WHITESTRING|IT_CALL, NULL, "Start", M_StartServer, 130},
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
};
`[22:03] TehRealSalt: Not organized code-wise, figured toaster would want to help with that since she's the Menu Queen and she probably has better ideas on how to do it` The Menu Queen is in the house~ :sparkles: * Magical, single-page player select and general netgamey stuff, while still remaining both pretty and functional. * Death to NOFOURPLAYER, now that the cat's out the bag. * Clean up NONET, assuming people try to make DD builds on release. * Minor tweaks across the board, mostly places where I wanted to pilfer minor code from and realised it wasn't done optimally originally.
2018-10-16 21:11:47 +00:00
#endif
Sorta messy menu to set splitscreen Now this branch is completely functional!
2018-09-30 21:09:59 +00:00
// Separated offline and normal servers.
static menuitem_t MP_OfflineServerMenu[] =
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Make some minor tweaks to the two server setup menus (splitscreen and not-splitscreen). I wouldn't have done this, but I was already in the code to fix the bugs, so I hit something that was bugging me[/sonic adventure voice] as well
2018-08-15 14:22:50 +00:00
{IT_STRING|IT_CVAR, NULL, "Game Type", &cv_newgametype, 68},
* Completely revamp a bunch of menu stuff! * Improve control menus significantly - a more layout-neutral, gameplay importance based order, with spacing, and less depth to get to the important stuff. * Port over the improved MP main menu from internal, including flattening the IP connect onto its level. * Allow for selecting the number of splitscreen players using a menu option, rather than three seperate menu choices. * Improve the layout of all of the level/gametype select menus slightly. * (unrelated) Make fourth player area in 3p splitscreen use the tiling background instead of a pure black area. * (unrelated) Tweak minimap ordering slightly.
2018-06-30 15:01:03 +00:00
{IT_STRING|IT_CVAR, NULL, "Level", &cv_nextmap, 78},
Sorta messy menu to set splitscreen Now this branch is completely functional!
2018-09-30 21:09:59 +00:00
* Completely revamp a bunch of menu stuff! * Improve control menus significantly - a more layout-neutral, gameplay importance based order, with spacing, and less depth to get to the important stuff. * Port over the improved MP main menu from internal, including flattening the IP connect onto its level. * Allow for selecting the number of splitscreen players using a menu option, rather than three seperate menu choices. * Improve the layout of all of the level/gametype select menus slightly. * (unrelated) Make fourth player area in 3p splitscreen use the tiling background instead of a pure black area. * (unrelated) Tweak minimap ordering slightly.
2018-06-30 15:01:03 +00:00
{IT_WHITESTRING|IT_CALL, NULL, "Start", M_StartServer, 130},
};
static menuitem_t MP_PlayerSetupMenu[] =
{
{IT_KEYHANDLER | IT_STRING, NULL, "Name", M_HandleSetupMultiPlayer, 0},
{IT_KEYHANDLER | IT_STRING, NULL, "Character", M_HandleSetupMultiPlayer, 16}, // Tails 01-18-2001
{IT_KEYHANDLER | IT_STRING, NULL, "Color", M_HandleSetupMultiPlayer, 152},
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
};
#ifndef NONET
static menuitem_t MP_ConnectMenu[] =
{
Basically, update master server code to v2 Removes rooms, replaced with cv_advertise and "Advertise" on the host menu. According to the new API, SRB2APPLICATION is sent instead of MODID. A contact field was added, but there is no means of accessing it or setting it. As a slight change, the server list will be populated even on an outdated version of the game. (The new API was designed with this in mind.) The update alert is still presented first of course.
2020-09-11 12:56:40 +00:00
{IT_STRING | IT_CVAR, NULL, "Sort By", &cv_serversort, 4},
{IT_STRING | IT_KEYHANDLER, NULL, "Page", M_HandleServerPage, 12},
{IT_STRING | IT_CALL, NULL, "Refresh", M_Refresh, 20},
{IT_STRING | IT_SPACE, NULL, "", M_Connect, 36},
{IT_STRING | IT_SPACE, NULL, "", M_Connect, 48},
{IT_STRING | IT_SPACE, NULL, "", M_Connect, 60},
{IT_STRING | IT_SPACE, NULL, "", M_Connect, 72},
{IT_STRING | IT_SPACE, NULL, "", M_Connect, 84},
{IT_STRING | IT_SPACE, NULL, "", M_Connect, 96},
{IT_STRING | IT_SPACE, NULL, "", M_Connect, 108},
{IT_STRING | IT_SPACE, NULL, "", M_Connect, 120},
{IT_STRING | IT_SPACE, NULL, "", M_Connect, 132},
{IT_STRING | IT_SPACE, NULL, "", M_Connect, 144},
{IT_STRING | IT_SPACE, NULL, "", M_Connect, 156},
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
};
enum
{
mp_connect_sort,
mp_connect_page,
mp_connect_refresh,
FIRSTSERVERLINE
};
#endif
// ------------------------------------
// Options and most (?) of its submenus
// ------------------------------------
// Prefix: OP_
static menuitem_t OP_MainMenu[] =
{
Better menus
2018-06-15 00:18:29 +00:00
{IT_SUBMENU|IT_STRING, NULL, "Control Setup...", &OP_ControlsDef, 10},
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Better menus
2018-06-15 00:18:29 +00:00
{IT_SUBMENU|IT_STRING, NULL, "Video Options...", &OP_VideoOptionsDef, 30},
{IT_SUBMENU|IT_STRING, NULL, "Sound Options...", &OP_SoundOptionsDef, 40},
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
* Get chat to compile with errormode on. * Add chat options to the HUD and Sound Option menus.
2018-08-02 22:52:07 +00:00
{IT_SUBMENU|IT_STRING, NULL, "HUD Options...", &OP_HUDOptionsDef, 60},
Menu fix-up - Use center menu style for the tiny extras menu - Move Screenshot Options, Add-on Options, Replay Options, and Erase Data into Data Options again
2019-05-02 05:33:11 +00:00
{IT_SUBMENU|IT_STRING, NULL, "Gameplay Options...", &OP_GameOptionsDef, 70},
{IT_SUBMENU|IT_STRING, NULL, "Server Options...", &OP_ServerOptionsDef, 80},
Some unlockable stuff - Secrets renamed to Extras - Extras leads to the checklist instead of another menu - Credits & Sound Test are on the Options menu now - New title screen cheat for unlocking everything ("banana", or "← ↑ → → ↑ ← ↓ → Enter")
2018-03-02 00:00:16 +00:00
Menu fix-up - Use center menu style for the tiny extras menu - Move Screenshot Options, Add-on Options, Replay Options, and Erase Data into Data Options again
2019-05-02 05:33:11 +00:00
{IT_SUBMENU|IT_STRING, NULL, "Data Options...", &OP_DataOptionsDef, 100},
Better menus
2018-06-15 00:18:29 +00:00
Menu fix-up - Use center menu style for the tiny extras menu - Move Screenshot Options, Add-on Options, Replay Options, and Erase Data into Data Options again
2019-05-02 05:33:11 +00:00
{IT_CALL|IT_STRING, NULL, "Tricks & Secrets (F1)", M_Manual, 120},
{IT_CALL|IT_STRING, NULL, "Play Credits", M_Credits, 130},
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
};
static menuitem_t OP_ControlsMenu[] =
{
* Completely revamp a bunch of menu stuff! * Improve control menus significantly - a more layout-neutral, gameplay importance based order, with spacing, and less depth to get to the important stuff. * Port over the improved MP main menu from internal, including flattening the IP connect onto its level. * Allow for selecting the number of splitscreen players using a menu option, rather than three seperate menu choices. * Improve the layout of all of the level/gametype select menus slightly. * (unrelated) Make fourth player area in 3p splitscreen use the tiling background instead of a pure black area. * (unrelated) Tweak minimap ordering slightly.
2018-06-30 15:01:03 +00:00
{IT_CALL | IT_STRING, NULL, "Player 1 Controls...", M_Setup1PControlsMenu, 10},
{IT_CALL | IT_STRING, NULL, "Player 2 Controls...", M_Setup2PControlsMenu, 20},
NOFOURPLAYER as a compile option
2018-01-01 18:11:24 +00:00
* Completely revamp a bunch of menu stuff! * Improve control menus significantly - a more layout-neutral, gameplay importance based order, with spacing, and less depth to get to the important stuff. * Port over the improved MP main menu from internal, including flattening the IP connect onto its level. * Allow for selecting the number of splitscreen players using a menu option, rather than three seperate menu choices. * Improve the layout of all of the level/gametype select menus slightly. * (unrelated) Make fourth player area in 3p splitscreen use the tiling background instead of a pure black area. * (unrelated) Tweak minimap ordering slightly.
2018-06-30 15:01:03 +00:00
{IT_CALL | IT_STRING, NULL, "Player 3 Controls...", &M_Setup3PControlsMenu, 30},
{IT_CALL | IT_STRING, NULL, "Player 4 Controls...", &M_Setup4PControlsMenu, 40},
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Reset to defaults option in controls
2018-11-23 03:50:40 +00:00
{IT_STRING | IT_CVAR, NULL, "Controls per key", &cv_controlperkey, 60},
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
};
New bindable keys You can now remap Change Viewpoint, Screenshot, and Toggle GIF Recording to other keys, mainly for gamepads They also pushed me to my breaking point and I couldn't tolerate the control menu anymore, thanks to toaster for the scrolling backport
2018-09-27 20:55:21 +00:00
static menuitem_t OP_AllControlsMenu[] =
{
Add confirmation to reset controls
2018-11-26 08:12:22 +00:00
{IT_SUBMENU|IT_STRING, NULL, "Gamepad Options...", &OP_Joystick1Def, 0},
{IT_CALL|IT_STRING, NULL, "Reset to defaults", M_ResetControls, 8},
New bindable keys You can now remap Change Viewpoint, Screenshot, and Toggle GIF Recording to other keys, mainly for gamepads They also pushed me to my breaking point and I couldn't tolerate the control menu anymore, thanks to toaster for the scrolling backport
2018-09-27 20:55:21 +00:00
//{IT_SPACE, NULL, NULL, NULL, 0},
{IT_HEADER, NULL, "Gameplay Controls", NULL, 0},
{IT_SPACE, NULL, NULL, NULL, 0},
{IT_CONTROL, NULL, "Accelerate", M_ChangeControl, gc_accelerate },
{IT_CONTROL, NULL, "Turn Left", M_ChangeControl, gc_turnleft },
{IT_CONTROL, NULL, "Turn Right", M_ChangeControl, gc_turnright },
{IT_CONTROL, NULL, "Drift", M_ChangeControl, gc_drift },
{IT_CONTROL, NULL, "Brake", M_ChangeControl, gc_brake },
{IT_CONTROL, NULL, "Use/Throw Item", M_ChangeControl, gc_fire },
{IT_CONTROL, NULL, "Aim Forward", M_ChangeControl, gc_aimforward },
{IT_CONTROL, NULL, "Aim Backward", M_ChangeControl, gc_aimbackward},
{IT_CONTROL, NULL, "Look Backward", M_ChangeControl, gc_lookback },
{IT_HEADER, NULL, "Miscelleanous Controls", NULL, 0},
{IT_SPACE, NULL, NULL, NULL, 0},
{IT_CONTROL, NULL, "Chat", M_ChangeControl, gc_talkkey },
//{IT_CONTROL, NULL, "Team Chat", M_ChangeControl, gc_teamkey },
{IT_CONTROL, NULL, "Show Rankings", M_ChangeControl, gc_scores },
{IT_CONTROL, NULL, "Change Viewpoint", M_ChangeControl, gc_viewpoint },
{IT_CONTROL, NULL, "Reset Camera", M_ChangeControl, gc_camreset },
{IT_CONTROL, NULL, "Toggle First-Person", M_ChangeControl, gc_camtoggle },
{IT_CONTROL, NULL, "Pause", M_ChangeControl, gc_pause },
{IT_CONTROL, NULL, "Screenshot", M_ChangeControl, gc_screenshot },
{IT_CONTROL, NULL, "Toggle GIF Recording", M_ChangeControl, gc_recordgif },
{IT_CONTROL, NULL, "Open/Close Menu (ESC)", M_ChangeControl, gc_systemmenu },
{IT_CONTROL, NULL, "Developer Console", M_ChangeControl, gc_console },
{IT_HEADER, NULL, "Spectator Controls", NULL, 0},
{IT_SPACE, NULL, NULL, NULL, 0},
{IT_CONTROL, NULL, "Become Spectator", M_ChangeControl, gc_spectate },
{IT_CONTROL, NULL, "Look Up", M_ChangeControl, gc_lookup },
{IT_CONTROL, NULL, "Look Down", M_ChangeControl, gc_lookdown },
{IT_CONTROL, NULL, "Center View", M_ChangeControl, gc_centerview },
{IT_HEADER, NULL, "Custom Lua Actions", NULL, 0},
{IT_SPACE, NULL, NULL, NULL, 0},
{IT_CONTROL, NULL, "Custom Action 1", M_ChangeControl, gc_custom1 },
{IT_CONTROL, NULL, "Custom Action 2", M_ChangeControl, gc_custom2 },
{IT_CONTROL, NULL, "Custom Action 3", M_ChangeControl, gc_custom3 },
Spectator-only looking, fixed crosshairs
2018-01-24 21:53:20 +00:00
};
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
static menuitem_t OP_Joystick1Menu[] =
{
* Completely revamp a bunch of menu stuff! * Improve control menus significantly - a more layout-neutral, gameplay importance based order, with spacing, and less depth to get to the important stuff. * Port over the improved MP main menu from internal, including flattening the IP connect onto its level. * Allow for selecting the number of splitscreen players using a menu option, rather than three seperate menu choices. * Improve the layout of all of the level/gametype select menus slightly. * (unrelated) Make fourth player area in 3p splitscreen use the tiling background instead of a pure black area. * (unrelated) Tweak minimap ordering slightly.
2018-06-30 15:01:03 +00:00
{IT_STRING | IT_CALL, NULL, "Select Gamepad..." , M_Setup1PJoystickMenu, 10},
Better gamepad axis support
2018-03-11 22:07:28 +00:00
{IT_STRING | IT_CVAR, NULL, "Aim Forward/Back" , &cv_aimaxis , 30},
{IT_STRING | IT_CVAR, NULL, "Turn Left/Right" , &cv_turnaxis , 40},
{IT_STRING | IT_CVAR, NULL, "Accelerate" , &cv_moveaxis , 50},
{IT_STRING | IT_CVAR, NULL, "Brake" , &cv_brakeaxis , 60},
{IT_STRING | IT_CVAR, NULL, "Drift" , &cv_driftaxis , 70},
{IT_STRING | IT_CVAR, NULL, "Use Item" , &cv_fireaxis , 80},
{IT_STRING | IT_CVAR, NULL, "Look Up/Down" , &cv_lookaxis , 90},
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
};
static menuitem_t OP_Joystick2Menu[] =
{
* Completely revamp a bunch of menu stuff! * Improve control menus significantly - a more layout-neutral, gameplay importance based order, with spacing, and less depth to get to the important stuff. * Port over the improved MP main menu from internal, including flattening the IP connect onto its level. * Allow for selecting the number of splitscreen players using a menu option, rather than three seperate menu choices. * Improve the layout of all of the level/gametype select menus slightly. * (unrelated) Make fourth player area in 3p splitscreen use the tiling background instead of a pure black area. * (unrelated) Tweak minimap ordering slightly.
2018-06-30 15:01:03 +00:00
{IT_STRING | IT_CALL, NULL, "Select Gamepad..." , M_Setup2PJoystickMenu, 10},
Better gamepad axis support
2018-03-11 22:07:28 +00:00
{IT_STRING | IT_CVAR, NULL, "Aim Forward/Back" , &cv_aimaxis2 , 30},
{IT_STRING | IT_CVAR, NULL, "Turn Left/Right" , &cv_turnaxis2 , 40},
{IT_STRING | IT_CVAR, NULL, "Accelerate" , &cv_moveaxis2 , 50},
{IT_STRING | IT_CVAR, NULL, "Brake" , &cv_brakeaxis2 , 60},
{IT_STRING | IT_CVAR, NULL, "Drift" , &cv_driftaxis2 , 70},
{IT_STRING | IT_CVAR, NULL, "Use Item" , &cv_fireaxis2 , 80},
{IT_STRING | IT_CVAR, NULL, "Look Up/Down" , &cv_lookaxis2 , 90},
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
};
initial quad stuff (does not work)
2017-12-08 07:29:01 +00:00
static menuitem_t OP_Joystick3Menu[] =
{
* Completely revamp a bunch of menu stuff! * Improve control menus significantly - a more layout-neutral, gameplay importance based order, with spacing, and less depth to get to the important stuff. * Port over the improved MP main menu from internal, including flattening the IP connect onto its level. * Allow for selecting the number of splitscreen players using a menu option, rather than three seperate menu choices. * Improve the layout of all of the level/gametype select menus slightly. * (unrelated) Make fourth player area in 3p splitscreen use the tiling background instead of a pure black area. * (unrelated) Tweak minimap ordering slightly.
2018-06-30 15:01:03 +00:00
{IT_STRING | IT_CALL, NULL, "Select Gamepad..." , M_Setup3PJoystickMenu, 10},
Better gamepad axis support
2018-03-11 22:07:28 +00:00
{IT_STRING | IT_CVAR, NULL, "Aim Forward/Back" , &cv_aimaxis3 , 30},
{IT_STRING | IT_CVAR, NULL, "Turn Left/Right" , &cv_turnaxis3 , 40},
{IT_STRING | IT_CVAR, NULL, "Accelerate" , &cv_moveaxis3 , 50},
{IT_STRING | IT_CVAR, NULL, "Brake" , &cv_brakeaxis3 , 60},
{IT_STRING | IT_CVAR, NULL, "Drift" , &cv_driftaxis3 , 70},
{IT_STRING | IT_CVAR, NULL, "Use Item" , &cv_fireaxis3 , 80},
{IT_STRING | IT_CVAR, NULL, "Look Up/Down" , &cv_lookaxis3 , 90},
initial quad stuff (does not work)
2017-12-08 07:29:01 +00:00
};
static menuitem_t OP_Joystick4Menu[] =
{
* Completely revamp a bunch of menu stuff! * Improve control menus significantly - a more layout-neutral, gameplay importance based order, with spacing, and less depth to get to the important stuff. * Port over the improved MP main menu from internal, including flattening the IP connect onto its level. * Allow for selecting the number of splitscreen players using a menu option, rather than three seperate menu choices. * Improve the layout of all of the level/gametype select menus slightly. * (unrelated) Make fourth player area in 3p splitscreen use the tiling background instead of a pure black area. * (unrelated) Tweak minimap ordering slightly.
2018-06-30 15:01:03 +00:00
{IT_STRING | IT_CALL, NULL, "Select Gamepad..." , M_Setup4PJoystickMenu, 10},
Better gamepad axis support
2018-03-11 22:07:28 +00:00
{IT_STRING | IT_CVAR, NULL, "Aim Forward/Back" , &cv_aimaxis4 , 30},
{IT_STRING | IT_CVAR, NULL, "Turn Left/Right" , &cv_turnaxis4 , 40},
{IT_STRING | IT_CVAR, NULL, "Accelerate" , &cv_moveaxis4 , 50},
{IT_STRING | IT_CVAR, NULL, "Brake" , &cv_brakeaxis4 , 60},
{IT_STRING | IT_CVAR, NULL, "Drift" , &cv_driftaxis4 , 70},
{IT_STRING | IT_CVAR, NULL, "Use Item" , &cv_fireaxis4 , 80},
{IT_STRING | IT_CVAR, NULL, "Look Up/Down" , &cv_lookaxis4 , 90},
initial quad stuff (does not work)
2017-12-08 07:29:01 +00:00
};
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
static menuitem_t OP_JoystickSetMenu[] =
{
Fix joystick menu drawing (also it was impossible to pick the 8th joystick, what's up with that?!)
2018-07-03 20:18:17 +00:00
{IT_CALL | IT_NOTHING, "None", NULL, M_AssignJoystick, LINEHEIGHT+5},
{IT_CALL | IT_NOTHING, "", NULL, M_AssignJoystick, (LINEHEIGHT*2)+5},
{IT_CALL | IT_NOTHING, "", NULL, M_AssignJoystick, (LINEHEIGHT*3)+5},
{IT_CALL | IT_NOTHING, "", NULL, M_AssignJoystick, (LINEHEIGHT*4)+5},
{IT_CALL | IT_NOTHING, "", NULL, M_AssignJoystick, (LINEHEIGHT*5)+5},
{IT_CALL | IT_NOTHING, "", NULL, M_AssignJoystick, (LINEHEIGHT*6)+5},
{IT_CALL | IT_NOTHING, "", NULL, M_AssignJoystick, (LINEHEIGHT*7)+5},
{IT_CALL | IT_NOTHING, "", NULL, M_AssignJoystick, (LINEHEIGHT*8)+5},
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
};
* Completely revamp a bunch of menu stuff! * Improve control menus significantly - a more layout-neutral, gameplay importance based order, with spacing, and less depth to get to the important stuff. * Port over the improved MP main menu from internal, including flattening the IP connect onto its level. * Allow for selecting the number of splitscreen players using a menu option, rather than three seperate menu choices. * Improve the layout of all of the level/gametype select menus slightly. * (unrelated) Make fourth player area in 3p splitscreen use the tiling background instead of a pure black area. * (unrelated) Tweak minimap ordering slightly.
2018-06-30 15:01:03 +00:00
/*static menuitem_t OP_MouseOptionsMenu[] =
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
{IT_STRING | IT_CVAR, NULL, "Use Mouse", &cv_usemouse, 10},
Added chasefreecam to menu
2018-11-22 22:32:03 +00:00
{IT_STRING | IT_CVAR, NULL, "First-Person MouseLook", &cv_alwaysfreelook, 30},
{IT_STRING | IT_CVAR, NULL, "Third-Person MouseLook", &cv_chasefreelook, 40},
{IT_STRING | IT_CVAR, NULL, "Mouse Move", &cv_mousemove, 50},
{IT_STRING | IT_CVAR, NULL, "Invert Mouse", &cv_invertmouse, 60},
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{IT_STRING | IT_CVAR | IT_CV_SLIDER,
Added chasefreecam to menu
2018-11-22 22:32:03 +00:00
NULL, "Mouse X Speed", &cv_mousesens, 70},
SRB2 2.1.14 release
2015-01-01 19:50:31 +00:00
{IT_STRING | IT_CVAR | IT_CV_SLIDER,
Added chasefreecam to menu
2018-11-22 22:32:03 +00:00
NULL, "Mouse Y Speed", &cv_mouseysens, 80},
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
};
static menuitem_t OP_Mouse2OptionsMenu[] =
{
{IT_STRING | IT_CVAR, NULL, "Use Mouse 2", &cv_usemouse2, 10},
{IT_STRING | IT_CVAR, NULL, "Second Mouse Serial Port",
&cv_mouse2port, 20},
Added chasefreecam to menu
2018-11-22 22:32:03 +00:00
{IT_STRING | IT_CVAR, NULL, "First-Person MouseLook", &cv_alwaysfreelook2, 30},
{IT_STRING | IT_CVAR, NULL, "Third-Person MouseLook", &cv_chasefreelook2, 40},
{IT_STRING | IT_CVAR, NULL, "Mouse Move", &cv_mousemove2, 50},
{IT_STRING | IT_CVAR, NULL, "Invert Mouse", &cv_invertmouse2, 60},
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{IT_STRING | IT_CVAR | IT_CV_SLIDER,
Added chasefreecam to menu
2018-11-22 22:32:03 +00:00
NULL, "Mouse X Speed", &cv_mousesens2, 70},
SRB2 2.1.14 release
2015-01-01 19:50:31 +00:00
{IT_STRING | IT_CVAR | IT_CV_SLIDER,
Added chasefreecam to menu
2018-11-22 22:32:03 +00:00
NULL, "Mouse Y Speed", &cv_mouseysens2, 80},
* Completely revamp a bunch of menu stuff! * Improve control menus significantly - a more layout-neutral, gameplay importance based order, with spacing, and less depth to get to the important stuff. * Port over the improved MP main menu from internal, including flattening the IP connect onto its level. * Allow for selecting the number of splitscreen players using a menu option, rather than three seperate menu choices. * Improve the layout of all of the level/gametype select menus slightly. * (unrelated) Make fourth player area in 3p splitscreen use the tiling background instead of a pure black area. * (unrelated) Tweak minimap ordering slightly.
2018-06-30 15:01:03 +00:00
};*/
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
static menuitem_t OP_VideoOptionsMenu[] =
{
Don't look at this commit too closely until after netgame, I want to surprise yalls!! * Lots of menu changes! * Little arrows next to changeable cvars! * Show default value for sliders! * Pretty pretty pretty. * I don't know how to describe some of these changes. * Effectively nuke MIDI music support! * Skiddown at the start of a race is more interesting! * Spinning in waterslides! * Tiny bugfix in voting, plus a little celebration...
2018-06-30 22:18:13 +00:00
{IT_STRING | IT_CALL, NULL, "Set Resolution...", M_VideoModeMenu, 10},
change SDL into HAVE_SDL
2014-07-25 23:10:24 +00:00
#if (defined (__unix__) && !defined (MSDOS)) || defined (UNIXCOMMON) || defined (HAVE_SDL)
* Tint, not Teint. * Update/rearrange menus a tad, to be more appealing and correct some categorisation in general.
2018-08-05 15:34:51 +00:00
{IT_STRING|IT_CVAR, NULL, "Fullscreen", &cv_fullscreen, 20},
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
#endif
{IT_STRING | IT_CVAR | IT_CV_SLIDER,
* Tint, not Teint. * Update/rearrange menus a tad, to be more appealing and correct some categorisation in general.
2018-08-05 15:34:51 +00:00
NULL, "Gamma", &cv_usegamma, 30},
Fix all actionable comments in my review of sonicitems.
2018-08-09 21:59:52 +00:00
{IT_STRING | IT_CVAR, NULL, "Draw Distance", &cv_drawdist, 45},
//{IT_STRING | IT_CVAR, NULL, "NiGHTS Draw Dist", &cv_drawdist_nights, 55},
{IT_STRING | IT_CVAR, NULL, "Weather Draw Distance",&cv_drawdist_precip, 55},
Final weather stuff. * Multiplied rain speed by 3, per Oni's request. * Disable weather density - force to 1 if weather draw distance, otherwise zero * Move the ceilingpic check into a more convenient part of the weather spawning loop. * `drawdist_precip_cons_t` - replaces "Infinite" with "None". * Disable the lowest normal draw distance (256), given... both kart and srb2 are basically unplayable like that. * Disable cv_drawdist_nights entirely.
2018-10-14 21:32:34 +00:00
//{IT_STRING | IT_CVAR, NULL, "Weather Density", &cv_precipdensity, 65},
{IT_STRING | IT_CVAR, NULL, "Skyboxes", &cv_skybox, 65},
'sal-lighting' code ports from v2
2020-04-26 00:56:50 +00:00
{IT_STRING | IT_CVAR, NULL, "Field of View", &cv_fov, 75},
Better menus
2018-06-15 00:18:29 +00:00
Move FOV option out of OGL options
2019-05-23 06:16:20 +00:00
{IT_STRING | IT_CVAR, NULL, "Show FPS", &cv_ticrate, 90},
{IT_STRING | IT_CVAR, NULL, "Vertical Sync", &cv_vidwait, 100},
Implement Uncapped (squashed) Co-Authored-By: Sally Coolatta <tehrealsalt@gmail.com> Co-Authored-By: James R <justsomejames2@gmail.com> Co-Authored-By: Monster Iestyn <iestynjealous@ntlworld.com> Co-Authored-By: katsy <katmint@live.com> Place Frame Interpolation in "Experimental" video options header This seems like an appropriate way to describe the feature for now. Add smooth level platter under interpolation, `renderdeltatics` `renderdeltatics` can be used as a standard delta time in any place, allowing for smooth menus. It will always be equal to `realtics` when frame interpolation is turned off, producing consistent framerate behavior everywhere it is used. Add smooth rendering to save select screen Add smooth rendering to Record/NiGHTS Attack, F_SkyScroll Ensure viewsector is accurate to viewx/viewy This fixes a potential crash in OpenGL when changing between levels. Ensure + commands get executed before map start Always have precise_t defined Fix misc dropshadow issues Reset view interpolation on level load Remove unnecessary precipmobj thinker hack Add reset interpolation state functions Reset precip interpolation on snap to ceil Reset mobj interp state on TeleportMove Only swap view interp state if a tick is run Run anti-lag chasecam at tic frequency Fixes jittery and unstable chasecam in high latency netgames Homogenize mobj interpolations Add sector plane level interpolations Add SectorScroll interpolator Add SideScroll interpolator Add Polyobj interpolator Intialize interpolator list at a better time Delete interpolators associated with thinkers Interpolate mobj angles and player drawangle Interpolate HWR_DrawModel Add functions to handle interpolation Much less code duplication P_InitAngle, to fix angle interpolation on spawning objects Fully fix drop shadows It used the thing's floorz / ceilingz directly -- that wouldn't account for interpolated coordinates. Do not speed up underwater/heatwave effect in OpenGL Closer OpenGL underwater/heatwave effect to Software Interpolate from time of previous tic Previously interpolated from last 35th of a second, which may be offset from game time due to connection lag. Consider this the proper fix to 54148a0dd0 too. Calculate FPS stuff even if frame is skipped I decided ultimately to actually keep the frame skip optimization disabled, because I think it is actually a little bit helpful that you can still get accurate rendering perfstats while paused, however if we decide otherwise then we can have this optimization back without making the game act like it's lagging. Keep rect in memory Feel better about this than creating one all da time Lots of FPS stuff - Disabled VSync, due to the numerous problems it has. - Instead, added an FPS cap. - Frame interpolation is now tied to fpscap != 35. - By default, the FPS cap is set to the monitor's refresh rate. - Rewrote the FPS counter. (This also consolidates several more commits ahead of this fixing various issues. -eid) Misc changes after Kart cherry-picks Fix renderdeltatics with new timing data Update mobj oldstates before all thinkers Allow FPS cap values Adjust how FPS cap is checked to improve FPS stability Fix precip crash from missing vars Improve the framerate limiter's timing for extreme stable FPS Handle the sleep at the end of D_SRB2Loop instead of the start Simplifies logic in the other parts of the loop, and fixes problems with it frequently waiting too long. Reset mobj interp state on add Add mobj interpolator on load netgame Move mobj interpolators to r_fps Dynamic slope interpolators I_GetFrameTime to try and improve frame pace (It doesn't feel that much better though.) Move I_FinishUpdate to D_SRB2Loop to sync screen updates with FPS cap, use timestamps in I_FrameCapSleep to simplify the code Fix plane interpolation light level flickering Fix flickering plane interpolation for OpenGL in the exact same way Funny OpenGL renderer being at least 50% copy-pasted Software code :) P_SetOrigin & P_MoveOrigin to replace P_TeleportMove Convert P_TeleportMove use to origin funcs Revert "P_InitAngle, to fix angle interpolation on spawning objects" This reverts commit a80c98bd164a2748cbbfad9027b34601185d93f5. Waypoint polyobjects interpolate z & children Add interpolation to more moving plane types Adds interpolation to the following: - Crumbling platforms - Mario blocks - Floatbob platforms (this one works really strangely due to two thinkers, maybe double-check this one?) Reset overlays interp states each TryRunTics Interpolate model interpolation (lol) Use interp tracer pos for GL linkdraw Papersprite angle interpolation Makes the ending signpost smooth Move intermission emerald bounce to ticker Bring back shadows on polyobjects Also optimizes the method used so rings can show their shadows too. Using just the subsector is a tad bit imprecise admittedly but any more precise methods get really laggy. Fix a bunch of ticking in hu_ drawing functions Revert "Reset overlays interp states each TryRunTics" This reverts commit a71a216faa20e8751b3bd0157354e8d748940c92. Move intro ticking out of the drawer Adjust 1up monitor icon z offsets Fixes interpolation issues with 1up monitors. Delta time choose player menu animations Add drawerlib deltaTime function Interpolate afterimages further back Use old sleep in dedicated mode Clamp cechotimer to 0 Fixes issues with cechos staying on-screen and glitching out (NiGHTS items for example). Revert "Remove unnecessary precipmobj thinker hack" This reverts commit 0e38208620d19ec2ab690740438ac2fc7862a49e. Fix frame pacing when game lags behind The frame timestamp should've been made at the start of the frame, not the end. Fix I_FrameCapSleep not respecting cpusleep Jonathan Joestar bruh Allow dedicated to use precise sleep timing again Instead of only using one old sleep, just enforce framerate cap to match TICRATE. Make Lua TeleportMove call MoveOrigin Reset Metal fume interp state on appear Add interpdebug Put interpdebug stuff in perfstats instead Add timescale cvar Slow the game down to debug animations / interpolation problems! Speed it up if you need to get somewhere quickly while mapping! Enable timescale outside of DEVELOP builds It has NETVAR, so it should be fine -- put an end to useful debugging features excluded in multiplayer! Force interpolation when timescale != 1.0 Reset old_z in MT_LOCKON think Fixes interpolation artifacting due to spawn pos. Fix cutscenes in interp Fix boss1 laser in interp Interpolate mobj scale Precalculate refresh rate Slower PCs can have issue querying mode over and over. This might kinda suck for windowed mode if you have different refresh rate displays but oh well Fix interp scaling crashing software Reset interp scale when Lua sets .scale Disable angle interp on fresh mobjs Fix interp scale crash for hires sprites Interp shadow scales Copy interp state in P_SpawnMobjFromMobj Fix multiplayer character select Don't interpolate mobj state if frac = 1.0 Fix Mario block item placement Interpolate spritescale/offset x/y Fix offset copies for SpawnMobjFromMobj THANKS SAL Add Lua HUD drawlists Buffers draw calls between tics to ensure hooks run at the originally intended rate. Rename drawerlib deltaTime to getDeltaTime Make renderisnewtic is false between tics I know what I'm doing! I swear Completely refactor timing system Time is now tracked internally in the game using I_GetPreciseTime and I_UpdateTime. I_Time now pulls from this internal timer. The system code no longer needs to keep track of time itself. This significantly improves frame and tic timing in interp mode, resulting in a much smoother image with essentially no judder at any framerate. Ensure mobj interpolators reset on level load Ensure view is not interpolated on first frame Disable sprite offset interpolation (for now) Refactor timing code even more System layer is greatly simplified and framecap logic has been moved internally. I_Sleep now takes a sleep duration and I_SleepDuration generically implements a precise sleep with spin loop.
2019-10-06 22:40:52 +00:00
{IT_STRING | IT_CVAR, NULL, "FPS Cap", &cv_fpscap, 110},
* Tint, not Teint. * Update/rearrange menus a tad, to be more appealing and correct some categorisation in general.
2018-08-05 15:34:51 +00:00
#ifdef HWRENDER
Implement Uncapped (squashed) Co-Authored-By: Sally Coolatta <tehrealsalt@gmail.com> Co-Authored-By: James R <justsomejames2@gmail.com> Co-Authored-By: Monster Iestyn <iestynjealous@ntlworld.com> Co-Authored-By: katsy <katmint@live.com> Place Frame Interpolation in "Experimental" video options header This seems like an appropriate way to describe the feature for now. Add smooth level platter under interpolation, `renderdeltatics` `renderdeltatics` can be used as a standard delta time in any place, allowing for smooth menus. It will always be equal to `realtics` when frame interpolation is turned off, producing consistent framerate behavior everywhere it is used. Add smooth rendering to save select screen Add smooth rendering to Record/NiGHTS Attack, F_SkyScroll Ensure viewsector is accurate to viewx/viewy This fixes a potential crash in OpenGL when changing between levels. Ensure + commands get executed before map start Always have precise_t defined Fix misc dropshadow issues Reset view interpolation on level load Remove unnecessary precipmobj thinker hack Add reset interpolation state functions Reset precip interpolation on snap to ceil Reset mobj interp state on TeleportMove Only swap view interp state if a tick is run Run anti-lag chasecam at tic frequency Fixes jittery and unstable chasecam in high latency netgames Homogenize mobj interpolations Add sector plane level interpolations Add SectorScroll interpolator Add SideScroll interpolator Add Polyobj interpolator Intialize interpolator list at a better time Delete interpolators associated with thinkers Interpolate mobj angles and player drawangle Interpolate HWR_DrawModel Add functions to handle interpolation Much less code duplication P_InitAngle, to fix angle interpolation on spawning objects Fully fix drop shadows It used the thing's floorz / ceilingz directly -- that wouldn't account for interpolated coordinates. Do not speed up underwater/heatwave effect in OpenGL Closer OpenGL underwater/heatwave effect to Software Interpolate from time of previous tic Previously interpolated from last 35th of a second, which may be offset from game time due to connection lag. Consider this the proper fix to 54148a0dd0 too. Calculate FPS stuff even if frame is skipped I decided ultimately to actually keep the frame skip optimization disabled, because I think it is actually a little bit helpful that you can still get accurate rendering perfstats while paused, however if we decide otherwise then we can have this optimization back without making the game act like it's lagging. Keep rect in memory Feel better about this than creating one all da time Lots of FPS stuff - Disabled VSync, due to the numerous problems it has. - Instead, added an FPS cap. - Frame interpolation is now tied to fpscap != 35. - By default, the FPS cap is set to the monitor's refresh rate. - Rewrote the FPS counter. (This also consolidates several more commits ahead of this fixing various issues. -eid) Misc changes after Kart cherry-picks Fix renderdeltatics with new timing data Update mobj oldstates before all thinkers Allow FPS cap values Adjust how FPS cap is checked to improve FPS stability Fix precip crash from missing vars Improve the framerate limiter's timing for extreme stable FPS Handle the sleep at the end of D_SRB2Loop instead of the start Simplifies logic in the other parts of the loop, and fixes problems with it frequently waiting too long. Reset mobj interp state on add Add mobj interpolator on load netgame Move mobj interpolators to r_fps Dynamic slope interpolators I_GetFrameTime to try and improve frame pace (It doesn't feel that much better though.) Move I_FinishUpdate to D_SRB2Loop to sync screen updates with FPS cap, use timestamps in I_FrameCapSleep to simplify the code Fix plane interpolation light level flickering Fix flickering plane interpolation for OpenGL in the exact same way Funny OpenGL renderer being at least 50% copy-pasted Software code :) P_SetOrigin & P_MoveOrigin to replace P_TeleportMove Convert P_TeleportMove use to origin funcs Revert "P_InitAngle, to fix angle interpolation on spawning objects" This reverts commit a80c98bd164a2748cbbfad9027b34601185d93f5. Waypoint polyobjects interpolate z & children Add interpolation to more moving plane types Adds interpolation to the following: - Crumbling platforms - Mario blocks - Floatbob platforms (this one works really strangely due to two thinkers, maybe double-check this one?) Reset overlays interp states each TryRunTics Interpolate model interpolation (lol) Use interp tracer pos for GL linkdraw Papersprite angle interpolation Makes the ending signpost smooth Move intermission emerald bounce to ticker Bring back shadows on polyobjects Also optimizes the method used so rings can show their shadows too. Using just the subsector is a tad bit imprecise admittedly but any more precise methods get really laggy. Fix a bunch of ticking in hu_ drawing functions Revert "Reset overlays interp states each TryRunTics" This reverts commit a71a216faa20e8751b3bd0157354e8d748940c92. Move intro ticking out of the drawer Adjust 1up monitor icon z offsets Fixes interpolation issues with 1up monitors. Delta time choose player menu animations Add drawerlib deltaTime function Interpolate afterimages further back Use old sleep in dedicated mode Clamp cechotimer to 0 Fixes issues with cechos staying on-screen and glitching out (NiGHTS items for example). Revert "Remove unnecessary precipmobj thinker hack" This reverts commit 0e38208620d19ec2ab690740438ac2fc7862a49e. Fix frame pacing when game lags behind The frame timestamp should've been made at the start of the frame, not the end. Fix I_FrameCapSleep not respecting cpusleep Jonathan Joestar bruh Allow dedicated to use precise sleep timing again Instead of only using one old sleep, just enforce framerate cap to match TICRATE. Make Lua TeleportMove call MoveOrigin Reset Metal fume interp state on appear Add interpdebug Put interpdebug stuff in perfstats instead Add timescale cvar Slow the game down to debug animations / interpolation problems! Speed it up if you need to get somewhere quickly while mapping! Enable timescale outside of DEVELOP builds It has NETVAR, so it should be fine -- put an end to useful debugging features excluded in multiplayer! Force interpolation when timescale != 1.0 Reset old_z in MT_LOCKON think Fixes interpolation artifacting due to spawn pos. Fix cutscenes in interp Fix boss1 laser in interp Interpolate mobj scale Precalculate refresh rate Slower PCs can have issue querying mode over and over. This might kinda suck for windowed mode if you have different refresh rate displays but oh well Fix interp scaling crashing software Reset interp scale when Lua sets .scale Disable angle interp on fresh mobjs Fix interp scale crash for hires sprites Interp shadow scales Copy interp state in P_SpawnMobjFromMobj Fix multiplayer character select Don't interpolate mobj state if frac = 1.0 Fix Mario block item placement Interpolate spritescale/offset x/y Fix offset copies for SpawnMobjFromMobj THANKS SAL Add Lua HUD drawlists Buffers draw calls between tics to ensure hooks run at the originally intended rate. Rename drawerlib deltaTime to getDeltaTime Make renderisnewtic is false between tics I know what I'm doing! I swear Completely refactor timing system Time is now tracked internally in the game using I_GetPreciseTime and I_UpdateTime. I_Time now pulls from this internal timer. The system code no longer needs to keep track of time itself. This significantly improves frame and tic timing in interp mode, resulting in a much smoother image with essentially no judder at any framerate. Ensure mobj interpolators reset on level load Ensure view is not interpolated on first frame Disable sprite offset interpolation (for now) Refactor timing code even more System layer is greatly simplified and framecap logic has been moved internally. I_Sleep now takes a sleep duration and I_SleepDuration generically implements a precise sleep with spin loop.
2019-10-06 22:40:52 +00:00
{IT_SUBMENU|IT_STRING, NULL, "OpenGL Options...", &OP_OpenGLOptionsDef, 130},
* Tint, not Teint. * Update/rearrange menus a tad, to be more appealing and correct some categorisation in general.
2018-08-05 15:34:51 +00:00
#endif
};
enum
{
op_video_res = 0,
#if (defined (__unix__) && !defined (MSDOS)) || defined (UNIXCOMMON) || defined (HAVE_SDL)
op_video_fullscreen,
#endif
op_video_gamma,
op_video_dd,
op_video_wdd,
Final weather stuff. * Multiplied rain speed by 3, per Oni's request. * Disable weather density - force to 1 if weather draw distance, otherwise zero * Move the ceilingpic check into a more convenient part of the weather spawning loop. * `drawdist_precip_cons_t` - replaces "Infinite" with "None". * Disable the lowest normal draw distance (256), given... both kart and srb2 are basically unplayable like that. * Disable cv_drawdist_nights entirely.
2018-10-14 21:32:34 +00:00
//op_video_wd,
* Tint, not Teint. * Update/rearrange menus a tad, to be more appealing and correct some categorisation in general.
2018-08-05 15:34:51 +00:00
op_video_skybox,
Move FOV option out of OGL options
2019-05-23 06:16:20 +00:00
op_video_fov,
* Tint, not Teint. * Update/rearrange menus a tad, to be more appealing and correct some categorisation in general.
2018-08-05 15:34:51 +00:00
op_video_fps,
op_video_vsync,
Fix Software disabling FPS cap instead of the OpenGL submenu.
2022-07-10 19:17:23 +00:00
op_video_fpscap,
* Tint, not Teint. * Update/rearrange menus a tad, to be more appealing and correct some categorisation in general.
2018-08-05 15:34:51 +00:00
#ifdef HWRENDER
op_video_ogl,
#endif
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
};
static menuitem_t OP_VideoModeMenu[] =
{
{IT_KEYHANDLER | IT_NOTHING, NULL, "", M_HandleVideoMode, '\0'}, // dummy menuitem for the control func
};
#ifdef HWRENDER
static menuitem_t OP_OpenGLOptionsMenu[] =
{
'sal-lighting' code ports from v2
2020-04-26 00:56:50 +00:00
{IT_STRING | IT_CVAR, NULL, "3D Models", &cv_grmdls, 10},
{IT_STRING | IT_CVAR, NULL, "Fallback Player 3D Model", &cv_grfallbackplayermodel, 20},
{IT_STRING|IT_CVAR, NULL, "Shaders", &cv_grshaders, 30},
As requested by Jeck: * gr_md2 on the menu. * Disable interpolerated model option completely for now. Also, tweaked the GL menus a bit to suck less, since I was ferreting around in that area.
2018-10-27 20:16:19 +00:00
'sal-lighting' code ports from v2
2020-04-26 00:56:50 +00:00
{IT_STRING|IT_CVAR, NULL, "Texture Quality", &cv_scr_depth, 50},
{IT_STRING|IT_CVAR, NULL, "Texture Filter", &cv_grfiltermode, 60},
{IT_STRING|IT_CVAR, NULL, "Anisotropic", &cv_granisotropicmode, 70},
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
'sal-lighting' code ports from v2
2020-04-26 00:56:50 +00:00
{IT_STRING|IT_CVAR, NULL, "Wall Contrast Style", &cv_grfakecontrast, 90},
{IT_STRING|IT_CVAR, NULL, "Sprite Billboarding", &cv_grspritebillboarding, 100},
{IT_STRING|IT_CVAR, NULL, "Software Perspective", &cv_grshearing, 110},
{IT_SUBMENU|IT_STRING, NULL, "Gamma...", &OP_OpenGLColorDef, 130},
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
};
static menuitem_t OP_OpenGLColorMenu[] =
{
Better menus
2018-06-15 00:18:29 +00:00
{IT_STRING|IT_CVAR|IT_CV_SLIDER, NULL, "Red", &cv_grgammared, 10},
{IT_STRING|IT_CVAR|IT_CV_SLIDER, NULL, "Green", &cv_grgammagreen, 20},
{IT_STRING|IT_CVAR|IT_CV_SLIDER, NULL, "Blue", &cv_grgammablue, 30},
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
};
#endif
static menuitem_t OP_SoundOptionsMenu[] =
{
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 13:49:50 +00:00
{IT_STRING|IT_CVAR, NULL, "SFX", &cv_gamesounds, 10},
Better menus
2018-06-15 00:18:29 +00:00
{IT_STRING|IT_CVAR|IT_CV_SLIDER,
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 13:49:50 +00:00
NULL, "SFX Volume", &cv_soundvolume, 18},
Don't look at this commit too closely until after netgame, I want to surprise yalls!! * Lots of menu changes! * Little arrows next to changeable cvars! * Show default value for sliders! * Pretty pretty pretty. * I don't know how to describe some of these changes. * Effectively nuke MIDI music support! * Skiddown at the start of a race is more interesting! * Spinning in waterslides! * Tiny bugfix in voting, plus a little celebration...
2018-06-30 22:18:13 +00:00
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 13:49:50 +00:00
{IT_STRING|IT_CVAR, NULL, "Music", &cv_gamedigimusic, 30},
Better menus
2018-06-15 00:18:29 +00:00
{IT_STRING|IT_CVAR|IT_CV_SLIDER,
Don't look at this commit too closely until after netgame, I want to surprise yalls!! * Lots of menu changes! * Little arrows next to changeable cvars! * Show default value for sliders! * Pretty pretty pretty. * I don't know how to describe some of these changes. * Effectively nuke MIDI music support! * Skiddown at the start of a race is more interesting! * Spinning in waterslides! * Tiny bugfix in voting, plus a little celebration...
2018-06-30 22:18:13 +00:00
NULL, "Music Volume", &cv_digmusicvolume, 38},
/* -- :nonnathisshit:
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 13:49:50 +00:00
{IT_STRING|IT_CVAR, NULL, "MIDI", &cv_gamemidimusic, 50},
Better menus
2018-06-15 00:18:29 +00:00
{IT_STRING|IT_CVAR|IT_CV_SLIDER,
Don't look at this commit too closely until after netgame, I want to surprise yalls!! * Lots of menu changes! * Little arrows next to changeable cvars! * Show default value for sliders! * Pretty pretty pretty. * I don't know how to describe some of these changes. * Effectively nuke MIDI music support! * Skiddown at the start of a race is more interesting! * Spinning in waterslides! * Tiny bugfix in voting, plus a little celebration...
2018-06-30 22:18:13 +00:00
NULL, "MIDI Volume", &cv_midimusicvolume, 58},
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
#ifdef PC_DOS
Better menus
2018-06-15 00:18:29 +00:00
{IT_STRING|IT_CVAR|IT_CV_SLIDER,
NULL, "CD Volume", &cd_volume, 40},
Don't look at this commit too closely until after netgame, I want to surprise yalls!! * Lots of menu changes! * Little arrows next to changeable cvars! * Show default value for sliders! * Pretty pretty pretty. * I don't know how to describe some of these changes. * Effectively nuke MIDI music support! * Skiddown at the start of a race is more interesting! * Spinning in waterslides! * Tiny bugfix in voting, plus a little celebration...
2018-06-30 22:18:13 +00:00
#endif*/
Remove restart audio system from the menu Learned the cause of the seemingly random crashes it causes; doesn't seem easy to fix, so it can stay a relatively-unknown console command until it does
2018-10-22 21:03:02 +00:00
//{IT_STRING|IT_CALL, NULL, "Restart Audio System", M_RestartAudio, 50},
Don't look at this commit too closely until after netgame, I want to surprise yalls!! * Lots of menu changes! * Little arrows next to changeable cvars! * Show default value for sliders! * Pretty pretty pretty. * I don't know how to describe some of these changes. * Effectively nuke MIDI music support! * Skiddown at the start of a race is more interesting! * Spinning in waterslides! * Tiny bugfix in voting, plus a little celebration...
2018-06-30 22:18:13 +00:00
Remove restart audio system from the menu Learned the cause of the seemingly random crashes it causes; doesn't seem easy to fix, so it can stay a relatively-unknown console command until it does
2018-10-22 21:03:02 +00:00
{IT_STRING|IT_CVAR, NULL, "Reverse L/R Channels", &stereoreverse, 50},
{IT_STRING|IT_CVAR, NULL, "Surround Sound", &surround, 60},
Better menus
2018-06-15 00:18:29 +00:00
merge srb2 next
2019-01-05 20:59:23 +00:00
{IT_STRING|IT_CVAR, NULL, "Chat Notifications", &cv_chatnotifications, 75},
Remove restart audio system from the menu Learned the cause of the seemingly random crashes it causes; doesn't seem easy to fix, so it can stay a relatively-unknown console command until it does
2018-10-22 21:03:02 +00:00
{IT_STRING|IT_CVAR, NULL, "Character voices", &cv_kartvoices, 85},
{IT_STRING|IT_CVAR, NULL, "Powerup Warning", &cv_kartinvinsfx, 95},
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 13:49:50 +00:00
{IT_KEYHANDLER|IT_STRING, NULL, "Sound Test", M_HandleSoundTest, 110},
Miscellaneous window de-focus options Music pausing is now optional. Sounds may be paused--on by default. The game itself being paused in off-line mode is now optional. (showfocuslost now loads from config.)
2019-03-11 21:57:11 +00:00
{IT_STRING|IT_CVAR, NULL, "Play Music While Unfocused", &cv_playmusicifunfocused, 125},
{IT_STRING|IT_CVAR, NULL, "Play SFX While Unfocused", &cv_playsoundifunfocused, 135},
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
};
Menu fix-up - Use center menu style for the tiny extras menu - Move Screenshot Options, Add-on Options, Replay Options, and Erase Data into Data Options again
2019-05-02 05:33:11 +00:00
static menuitem_t OP_DataOptionsMenu[] =
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Put the cvar in the menu
2020-08-17 06:31:30 +00:00
Menu fix-up - Use center menu style for the tiny extras menu - Move Screenshot Options, Add-on Options, Replay Options, and Erase Data into Data Options again
2019-05-02 05:33:11 +00:00
{IT_STRING | IT_CALL, NULL, "Screenshot Options...", M_ScreenshotOptions, 10},
Use "addons" instead of "add-ons" for consistency
2020-04-22 07:24:59 +00:00
{IT_STRING | IT_CALL, NULL, "Addon Options...", M_AddonsOptions, 20},
Menu fix-up - Use center menu style for the tiny extras menu - Move Screenshot Options, Add-on Options, Replay Options, and Erase Data into Data Options again
2019-05-02 05:33:11 +00:00
{IT_STRING | IT_SUBMENU, NULL, "Replay Options...", &MISC_ReplayOptionsDef, 30},
Add some options, maxplayer/allownewplayer dont need to be netvars anymore
2020-08-22 05:53:27 +00:00
#ifdef HAVE_DISCORDRPC
{IT_STRING | IT_SUBMENU, NULL, "Discord Options...", &OP_DiscordOptionsDef, 40},
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Add some options, maxplayer/allownewplayer dont need to be netvars anymore
2020-08-22 05:53:27 +00:00
{IT_STRING | IT_SUBMENU, NULL, "Erase Data...", &OP_EraseDataDef, 60},
#else
Menu fix-up - Use center menu style for the tiny extras menu - Move Screenshot Options, Add-on Options, Replay Options, and Erase Data into Data Options again
2019-05-02 05:33:11 +00:00
{IT_STRING | IT_SUBMENU, NULL, "Erase Data...", &OP_EraseDataDef, 50},
Put the cvar in the menu
2020-08-17 06:31:30 +00:00
#endif
Menu fix-up - Use center menu style for the tiny extras menu - Move Screenshot Options, Add-on Options, Replay Options, and Erase Data into Data Options again
2019-05-02 05:33:11 +00:00
};
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
static menuitem_t OP_ScreenshotOptionsMenu[] =
{
{IT_STRING|IT_CVAR, NULL, "Storage Location", &cv_screenshot_option, 10},
{IT_STRING|IT_CVAR|IT_CV_STRING, NULL, "Custom Folder", &cv_screenshot_folder, 20},
{IT_HEADER, NULL, "Screenshots (F8)", NULL, 50},
{IT_STRING|IT_CVAR, NULL, "Memory Level", &cv_zlib_memory, 60},
{IT_STRING|IT_CVAR, NULL, "Compression Level", &cv_zlib_level, 70},
{IT_STRING|IT_CVAR, NULL, "Strategy", &cv_zlib_strategy, 80},
{IT_STRING|IT_CVAR, NULL, "Window Size", &cv_zlib_window_bits, 90},
{IT_HEADER, NULL, "Movie Mode (F9)", NULL, 105},
{IT_STRING|IT_CVAR, NULL, "Capture Mode", &cv_moviemode, 115},
{IT_STRING|IT_CVAR, NULL, "Region Optimizing", &cv_gif_optimize, 125},
{IT_STRING|IT_CVAR, NULL, "Downscaling", &cv_gif_downscale, 135},
{IT_STRING|IT_CVAR, NULL, "Memory Level", &cv_zlib_memorya, 125},
{IT_STRING|IT_CVAR, NULL, "Compression Level", &cv_zlib_levela, 135},
{IT_STRING|IT_CVAR, NULL, "Strategy", &cv_zlib_strategya, 145},
{IT_STRING|IT_CVAR, NULL, "Window Size", &cv_zlib_window_bitsa, 155},
};
enum
{
op_screenshot_folder = 1,
op_screenshot_capture = 8,
op_screenshot_gif_start = 9,
op_screenshot_gif_end = 10,
op_screenshot_apng_start = 11,
op_screenshot_apng_end = 14,
};
static menuitem_t OP_EraseDataMenu[] =
{
{IT_STRING | IT_CALL, NULL, "Erase Record Data", M_EraseData, 10},
Better menus
2018-06-15 00:18:29 +00:00
{IT_STRING | IT_CALL, NULL, "Erase Unlockable Data", M_EraseData, 20},
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{IT_STRING | IT_CALL, NULL, "\x85" "Erase ALL Data", M_EraseData, 40},
};
Addons menu. Bitch.
2018-08-28 20:08:47 +00:00
static menuitem_t OP_AddonsOptionsMenu[] =
{
{IT_HEADER, NULL, "Menu", NULL, 0},
{IT_STRING|IT_CVAR, NULL, "Location", &cv_addons_option, 10},
{IT_STRING|IT_CVAR|IT_CV_STRING, NULL, "Custom Folder", &cv_addons_folder, 20},
Add some options, maxplayer/allownewplayer dont need to be netvars anymore
2020-08-22 05:53:27 +00:00
{IT_STRING|IT_CVAR, NULL, "Identify addons via", &cv_addons_md5, 48},
Addons menu. Bitch.
2018-08-28 20:08:47 +00:00
{IT_STRING|IT_CVAR, NULL, "Show unsupported file types", &cv_addons_showall, 58},
{IT_HEADER, NULL, "Search", NULL, 76},
{IT_STRING|IT_CVAR, NULL, "Matching", &cv_addons_search_type, 86},
{IT_STRING|IT_CVAR, NULL, "Case-sensitive", &cv_addons_search_case, 96},
};
enum
{
op_addons_folder = 2,
};
Add some options, maxplayer/allownewplayer dont need to be netvars anymore
2020-08-22 05:53:27 +00:00
#ifdef HAVE_DISCORDRPC
static menuitem_t OP_DiscordOptionsMenu[] =
{
{IT_STRING | IT_CVAR, NULL, "Rich Presence", &cv_discordrp, 10},
{IT_HEADER, NULL, "Rich Presence Settings", NULL, 30},
{IT_STRING | IT_CVAR, NULL, "Streamer Mode", &cv_discordstreamer, 40},
{IT_STRING | IT_CVAR, NULL, "Allow Ask To Join", &cv_discordasks, 60},
{IT_STRING | IT_CVAR, NULL, "Allow Invites", &cv_discordinvites, 70},
};
#endif
Better menus
2018-06-15 00:18:29 +00:00
static menuitem_t OP_HUDOptionsMenu[] =
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
* Get chat to compile with errormode on. * Add chat options to the HUD and Sound Option menus.
2018-08-02 22:52:07 +00:00
{IT_STRING | IT_CVAR, NULL, "Show HUD (F3)", &cv_showhud, 10},
SRB2 2.1.4 release
2014-03-21 18:42:55 +00:00
{IT_STRING | IT_CVAR | IT_CV_SLIDER,
Better menus
2018-06-15 00:18:29 +00:00
NULL, "HUD Visibility", &cv_translucenthud, 20},
Lots of changes - Menus now have all of the Kart cvars - Removed any cvars that aren't useful for Kart from the menu (they still exist in the console, though) - Removed SP and NiGHTS Mode options from the main menu - "kartcc" is renamed "kartspeed", uses values 0-2 instead of multiples of 50, or the terms "Relaxed", "Standard", and "Turbo" - Many gametype options (game speed, frantic, mirror, & karma comeback) are now changed on map load instead of instantly - New cvar, "kartminimap", for disabling the minimap - The maxplayers cvar now actually matches up with our 16 player limit - Game now keeps track of matches played. Has a condition type associated with it, as well. - Game checks for unlocks and saves gamedata when finishing a match, even in MP - Removed most of the normal emblems, added a single emblem for Green Hills. Didn't know what to do with extra emblems and such so I just left them (FOR NOW c:<)
2018-01-16 03:31:14 +00:00
Ping kick changes + other quality of life improvements [REDO]
2019-02-16 02:51:44 +00:00
{IT_STRING | IT_SUBMENU, NULL, "Online HUD options...",&OP_ChatOptionsDef, 35},
Fix all actionable comments in my review of sonicitems.
2018-08-09 21:59:52 +00:00
{IT_STRING | IT_CVAR, NULL, "Background Glass", &cons_backcolor, 45},
Belp - Minimap heads that aren't yours are transparent - Minimap has a visibility slider - Bomb stuff renamed to Mine
2018-02-08 03:33:27 +00:00
{IT_STRING | IT_CVAR | IT_CV_SLIDER,
Fix all actionable comments in my review of sonicitems.
2018-08-09 21:59:52 +00:00
NULL, "Minimap Visibility", &cv_kartminimap, 60},
{IT_STRING | IT_CVAR, NULL, "Speedometer Display", &cv_kartspeedometer, 70},
{IT_STRING | IT_CVAR, NULL, "Show \"CHECK\"", &cv_kartcheck, 80},
{IT_STRING | IT_CVAR, NULL, "Menu Highlights", &cons_menuhighlight, 95},
// highlight info - (GOOD HIGHLIGHT, WARNING HIGHLIGHT) - 105 (see M_DrawHUDOptions)
{IT_STRING | IT_CVAR, NULL, "Console Text Size", &cv_constextsize, 120},
Make "Focus lost" HUD overlay optional
2019-03-11 19:50:01 +00:00
{IT_STRING | IT_CVAR, NULL, "Show \"FOCUS LOST\"", &cv_showfocuslost, 135},
Fix all actionable comments in my review of sonicitems.
2018-08-09 21:59:52 +00:00
};
Lots of changes - Menus now have all of the Kart cvars - Removed any cvars that aren't useful for Kart from the menu (they still exist in the console, though) - Removed SP and NiGHTS Mode options from the main menu - "kartcc" is renamed "kartspeed", uses values 0-2 instead of multiples of 50, or the terms "Relaxed", "Standard", and "Turbo" - Many gametype options (game speed, frantic, mirror, & karma comeback) are now changed on map load instead of instantly - New cvar, "kartminimap", for disabling the minimap - The maxplayers cvar now actually matches up with our 16 player limit - Game now keeps track of matches played. Has a condition type associated with it, as well. - Game checks for unlocks and saves gamedata when finishing a match, even in MP - Removed most of the normal emblems, added a single emblem for Green Hills. Didn't know what to do with extra emblems and such so I just left them (FOR NOW c:<)
2018-01-16 03:31:14 +00:00
Ping kick changes + other quality of life improvements [REDO]
2019-02-16 02:51:44 +00:00
// Ok it's still called chatoptions but we'll put ping display in here to be clean
Fix all actionable comments in my review of sonicitems.
2018-08-09 21:59:52 +00:00
static menuitem_t OP_ChatOptionsMenu[] =
{
// will ANYONE who doesn't know how to use the console want to touch this one?
merge srb2 next
2019-01-05 20:59:23 +00:00
{IT_STRING | IT_CVAR, NULL, "Chat Mode", &cv_consolechat, 10}, // nonetheless...
* Get chat to compile with errormode on. * Add chat options to the HUD and Sound Option menus.
2018-08-02 22:52:07 +00:00
{IT_STRING | IT_CVAR | IT_CV_SLIDER,
merge srb2 next
2019-01-05 20:59:23 +00:00
NULL, "Chat Box Width", &cv_chatwidth, 25},
* Get chat to compile with errormode on. * Add chat options to the HUD and Sound Option menus.
2018-08-02 22:52:07 +00:00
{IT_STRING | IT_CVAR | IT_CV_SLIDER,
merge srb2 next
2019-01-05 20:59:23 +00:00
NULL, "Chat Box Height", &cv_chatheight, 35},
{IT_STRING | IT_CVAR, NULL, "Chat Background Tint", &cv_chatbacktint, 50},
{IT_STRING | IT_CVAR, NULL, "Message Fadeout Time", &cv_chattime, 60},
{IT_STRING | IT_CVAR, NULL, "Spam Protection", &cv_chatspamprotection, 70},
Ping kick changes + other quality of life improvements [REDO]
2019-02-16 02:51:44 +00:00
{IT_STRING | IT_CVAR, NULL, "Local ping display", &cv_showping, 90}, // shows ping next to framerate if we want to.
Better menus
2018-06-15 00:18:29 +00:00
};
static menuitem_t OP_GameOptionsMenu[] =
{
{IT_STRING | IT_SUBMENU, NULL, "Random Item Toggles...", &OP_MonitorToggleDef, 10},
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Better menus
2018-06-15 00:18:29 +00:00
{IT_STRING | IT_CVAR, NULL, "Game Speed", &cv_kartspeed, 30},
{IT_STRING | IT_CVAR, NULL, "Frantic Items", &cv_kartfrantic, 40},
* Make Encore Mode an unlockable, rather than freely available. * Make unlockables have a "showing" conditionset, for when you're able to see them on the Extras screen. * A shorter Encore ruby-pulse fade, for when encore mode is already active!
2018-08-08 19:48:29 +00:00
{IT_SECRET, NULL, "Encore Mode", &cv_kartencore, 50},
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
* Rework min/max cvars to allow for "named" values! They probably won't work if they're inside the range, but... * Combine the numlaps and usemapnumlaps functionality on the menu into basenumlaps, which numlaps is set to every race start, except when it's map default value (0) in which case it loads the map's lap count.
2018-06-29 16:49:02 +00:00
{IT_STRING | IT_CVAR, NULL, "Number of Laps", &cv_basenumlaps, 70},
{IT_STRING | IT_CVAR, NULL, "Exit Countdown Timer", &cv_countdowntime, 80},
Better menus
2018-06-15 00:18:29 +00:00
merge srb2 next
2019-01-05 20:59:23 +00:00
{IT_STRING | IT_CVAR, NULL, "Time Limit", &cv_timelimit, 100},
{IT_STRING | IT_CVAR, NULL, "Starting Bumpers", &cv_kartbumpers, 110},
{IT_STRING | IT_CVAR, NULL, "Karma Comeback", &cv_kartcomeback, 120},
Better menus
2018-06-15 00:18:29 +00:00
merge srb2 next
2019-01-05 20:59:23 +00:00
{IT_STRING | IT_CVAR, NULL, "Force Character", &cv_forceskin, 140},
{IT_STRING | IT_CVAR, NULL, "Restrict Character Changes", &cv_restrictskinchange, 150},
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
};
static menuitem_t OP_ServerOptionsMenu[] =
{
#ifndef NONET
{IT_STRING | IT_CVAR | IT_CV_STRING,
Better menus
2018-06-15 00:18:29 +00:00
NULL, "Server Name", &cv_servername, 10},
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
#endif
Better menus
2018-06-15 00:18:29 +00:00
{IT_STRING | IT_CVAR, NULL, "Intermission Timer", &cv_inttime, 40},
* Tint, not Teint. * Update/rearrange menus a tad, to be more appealing and correct some categorisation in general.
2018-08-05 15:34:51 +00:00
{IT_STRING | IT_CVAR, NULL, "Map Progression", &cv_advancemap, 50},
{IT_STRING | IT_CVAR, NULL, "Voting Timer", &cv_votetime, 60},
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
{IT_STRING | IT_CVAR, NULL, "Voting Rule Changes", &cv_kartvoterulechanges, 70},
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
#ifndef NONET
Do a bunch of major modifications to the voting system's rule change system! * Add `kartvoterulechanges`, or "Voting Rule Changes" on the menu, to allow some user control over event frequency. * "Never" - does what it says on the tin. * "Sometimes" - 1/8 chance of Encore if host has unlocked it, only gametype change when buffer is full * "Frequent" - 1/2 chance of Encore if host has unlocked it, gametype change every 5 maps * "Always" - If host has unlocked Encore, alternates between Encore and Gametype. Otherwise, always a gametype change * There's probably room for a setting between "Sometimes" and "Frequent", but I didn't want to overload the host with options and these were the ones that made sense. * Better handling of buffer refreshes, to prevent two of the same map appearing next to each other in the voting unless there literally aren't that many maps. * Mostly unrelated: Minor bugfix for Y_SetupVoteFinish, preventing music changes/random sounds playing on the You Will Join Next Race screen. (Branch-appropriate, at least.)
2018-09-11 14:41:41 +00:00
{IT_STRING | IT_CVAR, NULL, "Max. Player Count", &cv_maxplayers, 90},
{IT_STRING | IT_CVAR, NULL, "Allow Players to Join", &cv_allownewplayer, 100},
Use "addons" instead of "add-ons" for consistency
2020-04-22 07:24:59 +00:00
{IT_STRING | IT_CVAR, NULL, "Allow Addon Downloading", &cv_downloading, 110},
Advanced Server Options menu More accessible way of modifying ping limit, timeouts, max file send, etc now that the defaults are stricter
2018-11-27 17:10:46 +00:00
{IT_STRING | IT_CVAR, NULL, "Pause Permission", &cv_pause, 120},
{IT_STRING | IT_CVAR, NULL, "Mute All Chat", &cv_mute, 130},
Better menus
2018-06-15 00:18:29 +00:00
Advanced Server Options menu More accessible way of modifying ping limit, timeouts, max file send, etc now that the defaults are stricter
2018-11-27 17:10:46 +00:00
{IT_SUBMENU|IT_STRING, NULL, "Advanced Options...", &OP_AdvServerOptionsDef,150},
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
#endif
};
Advanced Server Options menu More accessible way of modifying ping limit, timeouts, max file send, etc now that the defaults are stricter
2018-11-27 17:10:46 +00:00
#ifndef NONET
static menuitem_t OP_AdvServerOptionsMenu[] =
{
{IT_STRING | IT_CVAR | IT_CV_STRING,
NULL, "Server Browser Address", &cv_masterserver, 10},
{IT_STRING | IT_CVAR, NULL, "Attempts to resynchronise", &cv_resynchattempts, 40},
Ping measured in frame delay instead of milliseconds The part of HOSTMOD ministats that I wanted. Can go back to ms using the pingmeasurement cvar. If Tyron wants to bring ministats fully in I think it'd be better to bring its ideas to replace the current HUD instead, ideally using the existing ping gfx, so they should bring it up with Oni # Conflicts: # src/d_clisrv.c # src/d_netcmd.c # src/d_netcmd.h # src/doomstat.h # src/hu_stuff.c # src/m_menu.c
2022-07-10 15:06:50 +00:00
{IT_STRING | IT_CVAR, NULL, "Delay limit (frames)", &cv_maxping, 50},
{IT_STRING | IT_CVAR, NULL, "Delay timeout (s)", &cv_pingtimeout, 60},
Ping kick changes + other quality of life improvements [REDO]
2019-02-16 02:51:44 +00:00
{IT_STRING | IT_CVAR, NULL, "Connection timeout (tics)", &cv_nettimeout, 70},
{IT_STRING | IT_CVAR, NULL, "Join timeout (tics)", &cv_jointimeout, 80},
Advanced Server Options menu More accessible way of modifying ping limit, timeouts, max file send, etc now that the defaults are stricter
2018-11-27 17:10:46 +00:00
Ping kick changes + other quality of life improvements [REDO]
2019-02-16 02:51:44 +00:00
{IT_STRING | IT_CVAR, NULL, "Max. file transfer send (KB)", &cv_maxsend, 100},
{IT_STRING | IT_CVAR, NULL, "File transfer packet rate", &cv_downloadspeed, 110},
Advanced Server Options menu More accessible way of modifying ping limit, timeouts, max file send, etc now that the defaults are stricter
2018-11-27 17:10:46 +00:00
Ping kick changes + other quality of life improvements [REDO]
2019-02-16 02:51:44 +00:00
{IT_STRING | IT_CVAR, NULL, "Log join addresses", &cv_showjoinaddress, 130},
{IT_STRING | IT_CVAR, NULL, "Log resyncs", &cv_blamecfail, 140},
{IT_STRING | IT_CVAR, NULL, "Log file transfers", &cv_noticedownload, 150},
Advanced Server Options menu More accessible way of modifying ping limit, timeouts, max file send, etc now that the defaults are stricter
2018-11-27 17:10:46 +00:00
};
#endif
Better menus
2018-06-15 00:18:29 +00:00
/*static menuitem_t OP_NetgameOptionsMenu[] =
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
{IT_STRING | IT_CVAR, NULL, "Time Limit", &cv_timelimit, 10},
{IT_STRING | IT_CVAR, NULL, "Point Limit", &cv_pointlimit, 18},
Lots of changes - Menus now have all of the Kart cvars - Removed any cvars that aren't useful for Kart from the menu (they still exist in the console, though) - Removed SP and NiGHTS Mode options from the main menu - "kartcc" is renamed "kartspeed", uses values 0-2 instead of multiples of 50, or the terms "Relaxed", "Standard", and "Turbo" - Many gametype options (game speed, frantic, mirror, & karma comeback) are now changed on map load instead of instantly - New cvar, "kartminimap", for disabling the minimap - The maxplayers cvar now actually matches up with our 16 player limit - Game now keeps track of matches played. Has a condition type associated with it, as well. - Game checks for unlocks and saves gamedata when finishing a match, even in MP - Removed most of the normal emblems, added a single emblem for Green Hills. Didn't know what to do with extra emblems and such so I just left them (FOR NOW c:<)
2018-01-16 03:31:14 +00:00
{IT_STRING | IT_CVAR, NULL, "Frantic Items", &cv_kartfrantic, 34},
{IT_STRING | IT_CVAR, NULL, "Item Respawn", &cv_itemrespawn, 50},
Random items poof instead of sparkle Also added a poof when they respawn in Battle
2018-06-14 03:37:37 +00:00
{IT_STRING | IT_CVAR, NULL, "Item Respawn Delay", &cv_itemrespawntime, 58},
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Random items poof instead of sparkle Also added a poof when they respawn in Battle
2018-06-14 03:37:37 +00:00
{IT_STRING | IT_CVAR, NULL, "Player Respawn Delay", &cv_respawntime, 74},
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Lots of changes - Menus now have all of the Kart cvars - Removed any cvars that aren't useful for Kart from the menu (they still exist in the console, though) - Removed SP and NiGHTS Mode options from the main menu - "kartcc" is renamed "kartspeed", uses values 0-2 instead of multiples of 50, or the terms "Relaxed", "Standard", and "Turbo" - Many gametype options (game speed, frantic, mirror, & karma comeback) are now changed on map load instead of instantly - New cvar, "kartminimap", for disabling the minimap - The maxplayers cvar now actually matches up with our 16 player limit - Game now keeps track of matches played. Has a condition type associated with it, as well. - Game checks for unlocks and saves gamedata when finishing a match, even in MP - Removed most of the normal emblems, added a single emblem for Green Hills. Didn't know what to do with extra emblems and such so I just left them (FOR NOW c:<)
2018-01-16 03:31:14 +00:00
{IT_STRING | IT_CVAR, NULL, "Force Skin #", &cv_forceskin, 90},
Random items poof instead of sparkle Also added a poof when they respawn in Battle
2018-06-14 03:37:37 +00:00
{IT_STRING | IT_CVAR, NULL, "Restrict Skin Changes", &cv_restrictskinchange, 98},
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Lots of changes - Menus now have all of the Kart cvars - Removed any cvars that aren't useful for Kart from the menu (they still exist in the console, though) - Removed SP and NiGHTS Mode options from the main menu - "kartcc" is renamed "kartspeed", uses values 0-2 instead of multiples of 50, or the terms "Relaxed", "Standard", and "Turbo" - Many gametype options (game speed, frantic, mirror, & karma comeback) are now changed on map load instead of instantly - New cvar, "kartminimap", for disabling the minimap - The maxplayers cvar now actually matches up with our 16 player limit - Game now keeps track of matches played. Has a condition type associated with it, as well. - Game checks for unlocks and saves gamedata when finishing a match, even in MP - Removed most of the normal emblems, added a single emblem for Green Hills. Didn't know what to do with extra emblems and such so I just left them (FOR NOW c:<)
2018-01-16 03:31:14 +00:00
//{IT_STRING | IT_CVAR, NULL, "Autobalance Teams", &cv_autobalance, 114},
//{IT_STRING | IT_CVAR, NULL, "Scramble Teams on Map Change", &cv_scrambleonchange, 122},
Better menus
2018-06-15 00:18:29 +00:00
};*/
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Better menus
2018-06-15 00:18:29 +00:00
/*static menuitem_t OP_GametypeOptionsMenu[] =
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Lots of changes - Menus now have all of the Kart cvars - Removed any cvars that aren't useful for Kart from the menu (they still exist in the console, though) - Removed SP and NiGHTS Mode options from the main menu - "kartcc" is renamed "kartspeed", uses values 0-2 instead of multiples of 50, or the terms "Relaxed", "Standard", and "Turbo" - Many gametype options (game speed, frantic, mirror, & karma comeback) are now changed on map load instead of instantly - New cvar, "kartminimap", for disabling the minimap - The maxplayers cvar now actually matches up with our 16 player limit - Game now keeps track of matches played. Has a condition type associated with it, as well. - Game checks for unlocks and saves gamedata when finishing a match, even in MP - Removed most of the normal emblems, added a single emblem for Green Hills. Didn't know what to do with extra emblems and such so I just left them (FOR NOW c:<)
2018-01-16 03:31:14 +00:00
{IT_HEADER, NULL, "RACE", NULL, 2},
{IT_STRING | IT_CVAR, NULL, "Game Speed", &cv_kartspeed, 10},
Encore mode - a fresh take on mirror mode! * Palette remaps. * Branding. TODO: * Doesn't work in GL. (Mostly.) I have SOME ideas on how to tackle this, but... * Transmaps are broken in Encore for some reason. * I tried to make in-level colormaps shimmy over, but it didn't quite work, so I commented it out and only semi-fixed it.
2018-07-23 22:50:41 +00:00
{IT_STRING | IT_CVAR, NULL, "Encore Mode", &cv_kartencore, 18},
Lots of changes - Menus now have all of the Kart cvars - Removed any cvars that aren't useful for Kart from the menu (they still exist in the console, though) - Removed SP and NiGHTS Mode options from the main menu - "kartcc" is renamed "kartspeed", uses values 0-2 instead of multiples of 50, or the terms "Relaxed", "Standard", and "Turbo" - Many gametype options (game speed, frantic, mirror, & karma comeback) are now changed on map load instead of instantly - New cvar, "kartminimap", for disabling the minimap - The maxplayers cvar now actually matches up with our 16 player limit - Game now keeps track of matches played. Has a condition type associated with it, as well. - Game checks for unlocks and saves gamedata when finishing a match, even in MP - Removed most of the normal emblems, added a single emblem for Green Hills. Didn't know what to do with extra emblems and such so I just left them (FOR NOW c:<)
2018-01-16 03:31:14 +00:00
{IT_STRING | IT_CVAR, NULL, "Number of Laps", &cv_numlaps, 26},
{IT_STRING | IT_CVAR, NULL, "Use Map Lap Counts", &cv_usemapnumlaps, 34},
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Lots of changes - Menus now have all of the Kart cvars - Removed any cvars that aren't useful for Kart from the menu (they still exist in the console, though) - Removed SP and NiGHTS Mode options from the main menu - "kartcc" is renamed "kartspeed", uses values 0-2 instead of multiples of 50, or the terms "Relaxed", "Standard", and "Turbo" - Many gametype options (game speed, frantic, mirror, & karma comeback) are now changed on map load instead of instantly - New cvar, "kartminimap", for disabling the minimap - The maxplayers cvar now actually matches up with our 16 player limit - Game now keeps track of matches played. Has a condition type associated with it, as well. - Game checks for unlocks and saves gamedata when finishing a match, even in MP - Removed most of the normal emblems, added a single emblem for Green Hills. Didn't know what to do with extra emblems and such so I just left them (FOR NOW c:<)
2018-01-16 03:31:14 +00:00
{IT_HEADER, NULL, "BATTLE", NULL, 50},
Changed all instances of "balloon" to "bumper" Also changed "It's you!" to "Select character & color..."
2018-07-03 19:14:47 +00:00
{IT_STRING | IT_CVAR, NULL, "Starting Bumpers", &cv_kartbumpers, 58},
Lots of changes - Menus now have all of the Kart cvars - Removed any cvars that aren't useful for Kart from the menu (they still exist in the console, though) - Removed SP and NiGHTS Mode options from the main menu - "kartcc" is renamed "kartspeed", uses values 0-2 instead of multiples of 50, or the terms "Relaxed", "Standard", and "Turbo" - Many gametype options (game speed, frantic, mirror, & karma comeback) are now changed on map load instead of instantly - New cvar, "kartminimap", for disabling the minimap - The maxplayers cvar now actually matches up with our 16 player limit - Game now keeps track of matches played. Has a condition type associated with it, as well. - Game checks for unlocks and saves gamedata when finishing a match, even in MP - Removed most of the normal emblems, added a single emblem for Green Hills. Didn't know what to do with extra emblems and such so I just left them (FOR NOW c:<)
2018-01-16 03:31:14 +00:00
{IT_STRING | IT_CVAR, NULL, "Karma Comeback", &cv_kartcomeback, 66},
Better menus
2018-06-15 00:18:29 +00:00
};*/
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
* User manual! * Some visual ordering fixes for the item menu, plus a #define-toggleable option for the bottom right slot to be traversable for ease-of-use purposes (even if it doesn't do anything).
2018-09-08 16:02:03 +00:00
#define ITEMTOGGLEBOTTOMRIGHT
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
static menuitem_t OP_MonitorToggleMenu[] =
{
Toggles for kitchen sink, ten banana, & quad orbinaut, and a screen that they can fit on
2018-08-31 17:18:19 +00:00
// Mostly handled by the drawing function.
Lots of changes - Menus now have all of the Kart cvars - Removed any cvars that aren't useful for Kart from the menu (they still exist in the console, though) - Removed SP and NiGHTS Mode options from the main menu - "kartcc" is renamed "kartspeed", uses values 0-2 instead of multiples of 50, or the terms "Relaxed", "Standard", and "Turbo" - Many gametype options (game speed, frantic, mirror, & karma comeback) are now changed on map load instead of instantly - New cvar, "kartminimap", for disabling the minimap - The maxplayers cvar now actually matches up with our 16 player limit - Game now keeps track of matches played. Has a condition type associated with it, as well. - Game checks for unlocks and saves gamedata when finishing a match, even in MP - Removed most of the normal emblems, added a single emblem for Green Hills. Didn't know what to do with extra emblems and such so I just left them (FOR NOW c:<)
2018-01-16 03:31:14 +00:00
// Instead of using this for dumb monitors, lets use the new item bools we have :V
Toggles for kitchen sink, ten banana, & quad orbinaut, and a screen that they can fit on
2018-08-31 17:18:19 +00:00
{IT_KEYHANDLER | IT_NOTHING, NULL, "Sneakers", M_HandleMonitorToggles, KITEM_SNEAKER},
{IT_KEYHANDLER | IT_NOTHING, NULL, "Sneakers x3", M_HandleMonitorToggles, KRITEM_TRIPLESNEAKER},
{IT_KEYHANDLER | IT_NOTHING, NULL, "Rocket Sneakers", M_HandleMonitorToggles, KITEM_ROCKETSNEAKER},
Toggle All option
2018-08-31 18:41:37 +00:00
{IT_KEYHANDLER | IT_NOTHING, NULL, "Toggle All", M_HandleMonitorToggles, 0},
Toggles for kitchen sink, ten banana, & quad orbinaut, and a screen that they can fit on
2018-08-31 17:18:19 +00:00
{IT_KEYHANDLER | IT_NOTHING, NULL, "Bananas", M_HandleMonitorToggles, KITEM_BANANA},
{IT_KEYHANDLER | IT_NOTHING, NULL, "Bananas x3", M_HandleMonitorToggles, KRITEM_TRIPLEBANANA},
{IT_KEYHANDLER | IT_NOTHING, NULL, "Bananas x10", M_HandleMonitorToggles, KRITEM_TENFOLDBANANA},
{IT_KEYHANDLER | IT_NOTHING, NULL, "Eggman Monitors", M_HandleMonitorToggles, KITEM_EGGMAN},
* User manual! * Some visual ordering fixes for the item menu, plus a #define-toggleable option for the bottom right slot to be traversable for ease-of-use purposes (even if it doesn't do anything).
2018-09-08 16:02:03 +00:00
{IT_KEYHANDLER | IT_NOTHING, NULL, "Orbinauts", M_HandleMonitorToggles, KITEM_ORBINAUT},
Toggles for kitchen sink, ten banana, & quad orbinaut, and a screen that they can fit on
2018-08-31 17:18:19 +00:00
{IT_KEYHANDLER | IT_NOTHING, NULL, "Orbinauts x3", M_HandleMonitorToggles, KRITEM_TRIPLEORBINAUT},
{IT_KEYHANDLER | IT_NOTHING, NULL, "Orbinauts x4", M_HandleMonitorToggles, KRITEM_QUADORBINAUT},
* User manual! * Some visual ordering fixes for the item menu, plus a #define-toggleable option for the bottom right slot to be traversable for ease-of-use purposes (even if it doesn't do anything).
2018-09-08 16:02:03 +00:00
{IT_KEYHANDLER | IT_NOTHING, NULL, "Mines", M_HandleMonitorToggles, KITEM_MINE},
Toggles for kitchen sink, ten banana, & quad orbinaut, and a screen that they can fit on
2018-08-31 17:18:19 +00:00
{IT_KEYHANDLER | IT_NOTHING, NULL, "Jawz", M_HandleMonitorToggles, KITEM_JAWZ},
{IT_KEYHANDLER | IT_NOTHING, NULL, "Jawz x2", M_HandleMonitorToggles, KRITEM_DUALJAWZ},
{IT_KEYHANDLER | IT_NOTHING, NULL, "Ballhogs", M_HandleMonitorToggles, KITEM_BALLHOG},
{IT_KEYHANDLER | IT_NOTHING, NULL, "Self-Propelled Bombs", M_HandleMonitorToggles, KITEM_SPB},
Toggle All option
2018-08-31 18:41:37 +00:00
{IT_KEYHANDLER | IT_NOTHING, NULL, "Invinciblity", M_HandleMonitorToggles, KITEM_INVINCIBILITY},
Toggles for kitchen sink, ten banana, & quad orbinaut, and a screen that they can fit on
2018-08-31 17:18:19 +00:00
{IT_KEYHANDLER | IT_NOTHING, NULL, "Grow", M_HandleMonitorToggles, KITEM_GROW},
{IT_KEYHANDLER | IT_NOTHING, NULL, "Shrink", M_HandleMonitorToggles, KITEM_SHRINK},
{IT_KEYHANDLER | IT_NOTHING, NULL, "Thunder Shields", M_HandleMonitorToggles, KITEM_THUNDERSHIELD},
{IT_KEYHANDLER | IT_NOTHING, NULL, "Hyudoros", M_HandleMonitorToggles, KITEM_HYUDORO},
{IT_KEYHANDLER | IT_NOTHING, NULL, "Pogo Springs", M_HandleMonitorToggles, KITEM_POGOSPRING},
* User manual! * Some visual ordering fixes for the item menu, plus a #define-toggleable option for the bottom right slot to be traversable for ease-of-use purposes (even if it doesn't do anything).
2018-09-08 16:02:03 +00:00
{IT_KEYHANDLER | IT_NOTHING, NULL, "Kitchen Sinks", M_HandleMonitorToggles, KITEM_KITCHENSINK},
#ifdef ITEMTOGGLEBOTTOMRIGHT
{IT_KEYHANDLER | IT_NOTHING, NULL, "---", M_HandleMonitorToggles, 255},
#endif
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
};
// ==========================================================================
// ALL MENU DEFINITIONS GO HERE
// ==========================================================================
// Main Menu and related
menu_t MainDef = CENTERMENUSTYLE(NULL, MainMenu, NULL, 72);
Addons menu. Bitch.
2018-08-28 20:08:47 +00:00
menu_t MISC_AddonsDef =
{
NULL,
sizeof (MISC_AddonsMenu)/sizeof (menuitem_t),
Menu fix-up - Use center menu style for the tiny extras menu - Move Screenshot Options, Add-on Options, Replay Options, and Erase Data into Data Options again
2019-05-02 05:33:11 +00:00
&OP_DataOptionsDef,
Addons menu. Bitch.
2018-08-28 20:08:47 +00:00
MISC_AddonsMenu,
M_DrawAddons,
50, 28,
0,
NULL
};
Start on the replay hut menu!
2019-03-31 01:57:53 +00:00
menu_t MISC_ReplayHutDef =
{
Enable exiting and playing demos from replay hut properly
2019-03-31 18:50:20 +00:00
NULL,
Start on the replay hut menu!
2019-03-31 01:57:53 +00:00
sizeof (MISC_ReplayHutMenu)/sizeof (menuitem_t),
Enable exiting and playing demos from replay hut properly
2019-03-31 18:50:20 +00:00
NULL,
Start on the replay hut menu!
2019-03-31 01:57:53 +00:00
MISC_ReplayHutMenu,
M_DrawReplayHut,
30, 80,
Menu fix-up - Use center menu style for the tiny extras menu - Move Screenshot Options, Add-on Options, Replay Options, and Erase Data into Data Options again
2019-05-02 05:33:11 +00:00
0,
Enable exiting and playing demos from replay hut properly
2019-03-31 18:50:20 +00:00
M_QuitReplayHut
Start on the replay hut menu!
2019-03-31 01:57:53 +00:00
};
Add subscreen to confirm replay watching This will have other goodies on it later!
2019-03-31 22:29:41 +00:00
Add replay options screen
2019-03-31 18:50:29 +00:00
menu_t MISC_ReplayOptionsDef =
{
Reference graphics for menu and other stuff
2019-04-06 07:17:30 +00:00
"M_REPOPT",
Add replay options screen
2019-03-31 18:50:29 +00:00
sizeof (MISC_ReplayOptionsMenu)/sizeof (menuitem_t),
Menu fix-up - Use center menu style for the tiny extras menu - Move Screenshot Options, Add-on Options, Replay Options, and Erase Data into Data Options again
2019-05-02 05:33:11 +00:00
&OP_DataOptionsDef,
Add replay options screen
2019-03-31 18:50:29 +00:00
MISC_ReplayOptionsMenu,
Menu fix-up - Use center menu style for the tiny extras menu - Move Screenshot Options, Add-on Options, Replay Options, and Erase Data into Data Options again
2019-05-02 05:33:11 +00:00
M_DrawGenericMenu,
Add replay options screen
2019-03-31 18:50:29 +00:00
27, 40,
0,
NULL
};
Start on the replay hut menu!
2019-03-31 01:57:53 +00:00
Add subscreen to confirm replay watching This will have other goodies on it later!
2019-03-31 22:29:41 +00:00
menu_t MISC_ReplayStartDef =
{
NULL,
sizeof (MISC_ReplayStartMenu)/sizeof (menuitem_t),
&MISC_ReplayHutDef,
MISC_ReplayStartMenu,
M_DrawReplayStartMenu,
30, 90,
0,
NULL
};
Begin work on playback menu
2019-04-05 07:38:48 +00:00
menu_t PlaybackMenuDef = {
NULL,
sizeof (PlaybackMenu)/sizeof (menuitem_t),
NULL,
PlaybackMenu,
M_DrawPlaybackMenu,
Temporarily disable Extra Options menu
2019-04-13 20:23:31 +00:00
//BASEVIDWIDTH/2 - 94, 2,
BASEVIDWIDTH/2 - 88, 2,
Begin work on playback menu
2019-04-05 07:38:48 +00:00
0,
NULL
};
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
menu_t MAPauseDef = PAUSEMENUSTYLE(MAPauseMenu, 40, 72);
menu_t SPauseDef = PAUSEMENUSTYLE(SPauseMenu, 40, 72);
menu_t MPauseDef = PAUSEMENUSTYLE(MPauseMenu, 40, 72);
Invite menu started Functions! Is not pretty yet!
2020-08-21 08:14:33 +00:00
#ifdef HAVE_DISCORDRPC
Ask to join is a menu option, rather than trying to replace your menu temporarily.
2020-08-22 11:16:52 +00:00
menu_t MISC_DiscordRequestsDef = {
Invite menu started Functions! Is not pretty yet!
2020-08-21 08:14:33 +00:00
NULL,
Ask to join is a menu option, rather than trying to replace your menu temporarily.
2020-08-22 11:16:52 +00:00
sizeof (MISC_DiscordRequestsMenu)/sizeof (menuitem_t),
&MPauseDef,
MISC_DiscordRequestsMenu,
Invite menu started Functions! Is not pretty yet!
2020-08-21 08:14:33 +00:00
M_DrawDiscordRequests,
0, 0,
0,
NULL
};
#endif
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Misc Main Menu
menu_t MISC_ScrambleTeamDef = DEFAULTMENUSTYLE(NULL, MISC_ScrambleTeamMenu, &MPauseDef, 27, 40);
menu_t MISC_ChangeTeamDef = DEFAULTMENUSTYLE(NULL, MISC_ChangeTeamMenu, &MPauseDef, 27, 40);
Spectate/Enter menu for online splitscreen Just like the menu option
2018-10-16 00:28:35 +00:00
menu_t MISC_ChangeSpectateDef = DEFAULTMENUSTYLE(NULL, MISC_ChangeSpectateMenu, &MPauseDef, 27, 40);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
menu_t MISC_ChangeLevelDef = MAPICONMENUSTYLE(NULL, MISC_ChangeLevelMenu, &MPauseDef);
menu_t MISC_HelpDef = IMAGEDEF(MISC_HelpMenu);
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
//
// M_GetGametypeColor
//
// Pretty and consistent ^u^
// See also G_GetGametypeColor.
//
Fixed the menu highlight thing
2018-10-25 17:41:14 +00:00
static INT32 highlightflags, recommendedflags, warningflags;
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
inline static void M_GetGametypeColor(void)
{
INT16 gt;
warningflags = V_REDMAP;
recommendedflags = V_GREENMAP;
if (cons_menuhighlight.value)
{
highlightflags = cons_menuhighlight.value;
if (highlightflags == V_REDMAP)
{
warningflags = V_ORANGEMAP;
return;
}
if (highlightflags == V_GREENMAP)
{
recommendedflags = V_SKYMAP;
return;
}
return;
}
warningflags = V_REDMAP;
recommendedflags = V_GREENMAP;
if (modeattacking // == ATTACKING_RECORD
|| gamestate == GS_TIMEATTACK)
{
highlightflags = V_ORANGEMAP;
return;
}
More menu stuff! * Center level selection. * Re-work Record Attack screen. * Re-order MP Main menu, hide in NONET. * Combined yeeeah on vote screen. * Colour gametype on tab and tally. * (unrelated) Don't show "CHECK" if exiting.
2018-07-02 00:55:01 +00:00
if (currentMenu->drawroutine == M_DrawServerMenu)
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
gt = cv_newgametype.value;
More menu stuff! * Center level selection. * Re-work Record Attack screen. * Re-order MP Main menu, hide in NONET. * Combined yeeeah on vote screen. * Colour gametype on tab and tally. * (unrelated) Don't show "CHECK" if exiting.
2018-07-02 00:55:01 +00:00
else if (!Playing())
{
highlightflags = V_YELLOWMAP;
return;
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
}
else
gt = gametype;
if (gt == GT_MATCH)
{
highlightflags = V_REDMAP;
warningflags = V_ORANGEMAP;
return;
}
if (gt == GT_RACE)
{
highlightflags = V_SKYMAP;
return;
}
highlightflags = V_YELLOWMAP; // FALLBACK
}
Fixed the menu highlight thing
2018-10-25 17:41:14 +00:00
// excuse me but I'm extremely lazy:
INT32 HU_GetHighlightColor(void)
{
M_GetGametypeColor(); // update flag colour reguardless of the menu being opened or not.
return highlightflags;
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Sky Room
menu_t SR_PandoraDef =
{
"M_PANDRA",
sizeof (SR_PandorasBox)/sizeof (menuitem_t),
&SPauseDef,
SR_PandorasBox,
M_DrawGenericMenu,
60, 40,
0,
M_ExitPandorasBox
};
Menu fix-up - Use center menu style for the tiny extras menu - Move Screenshot Options, Add-on Options, Replay Options, and Erase Data into Data Options again
2019-05-02 05:33:11 +00:00
menu_t SR_MainDef = CENTERMENUSTYLE(NULL, SR_MainMenu, &MainDef, 72);
* Completely revamp a bunch of menu stuff! * Improve control menus significantly - a more layout-neutral, gameplay importance based order, with spacing, and less depth to get to the important stuff. * Port over the improved MP main menu from internal, including flattening the IP connect onto its level. * Allow for selecting the number of splitscreen players using a menu option, rather than three seperate menu choices. * Improve the layout of all of the level/gametype select menus slightly. * (unrelated) Make fourth player area in 3p splitscreen use the tiling background instead of a pure black area. * (unrelated) Tweak minimap ordering slightly.
2018-06-30 15:01:03 +00:00
Stupidbad-big commit, but PLEASE don't ask me to re-do this on another branch, I swear to god. I know it makes things more difficult on you, and I'm sorry for that, but I'm definitely feeling the goddamn crunch right now and I wanna take a step back from this spaghetti nightmare and clear my head. * Do that thing where the character icons are ALWAYS 1x sized, through having two seperate lumps. * Revamp the S_SKIN parameters to be `facerank` (rankings - equivalent of half-scale old face), `facewant` (WANTED - equivalent of old face), and `facemmap` (equivalent of old iconprefix). * Do that thing Oni wanted where it shows two postions above and two positions below your current ranking (and you) to the left of the screen, instead of always the top 4, with some limits to avoid drawing outside of everything. * Replace the last few shitty Mario numbers (for the left rankings) with cool, new Oni numbers. * Change a bunch of offsets and things so the tab rankings and the intermission work nicer with 9+ players.
2018-10-28 16:27:55 +00:00
//menu_t SR_LevelSelectDef = MAPICONMENUSTYLE(NULL, SR_LevelSelectMenu, &SR_MainDef);
* Completely revamp a bunch of menu stuff! * Improve control menus significantly - a more layout-neutral, gameplay importance based order, with spacing, and less depth to get to the important stuff. * Port over the improved MP main menu from internal, including flattening the IP connect onto its level. * Allow for selecting the number of splitscreen players using a menu option, rather than three seperate menu choices. * Improve the layout of all of the level/gametype select menus slightly. * (unrelated) Make fourth player area in 3p splitscreen use the tiling background instead of a pure black area. * (unrelated) Tweak minimap ordering slightly.
2018-06-30 15:01:03 +00:00
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
menu_t SR_UnlockChecklistDef =
{
NULL,
1,
Move menu options around 1 Player now goes directly to Time Attack, and Extras is now a submenu with Unlockables, Statistics, and a currently-dummied option for Replay Hut.
2019-03-30 22:25:54 +00:00
&SR_MainDef,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
SR_UnlockChecklistMenu,
M_DrawChecklist,
280, 185,
0,
NULL
};
menu_t SR_EmblemHintDef =
{
NULL,
sizeof (SR_EmblemHintMenu)/sizeof (menuitem_t),
&SPauseDef,
SR_EmblemHintMenu,
M_DrawEmblemHints,
60, 150,
0,
NULL
};
// Single Player
menu_t SP_MainDef = CENTERMENUSTYLE(NULL, SP_MainMenu, &MainDef, 72);
Stupidbad-big commit, but PLEASE don't ask me to re-do this on another branch, I swear to god. I know it makes things more difficult on you, and I'm sorry for that, but I'm definitely feeling the goddamn crunch right now and I wanna take a step back from this spaghetti nightmare and clear my head. * Do that thing where the character icons are ALWAYS 1x sized, through having two seperate lumps. * Revamp the S_SKIN parameters to be `facerank` (rankings - equivalent of half-scale old face), `facewant` (WANTED - equivalent of old face), and `facemmap` (equivalent of old iconprefix). * Do that thing Oni wanted where it shows two postions above and two positions below your current ranking (and you) to the left of the screen, instead of always the top 4, with some limits to avoid drawing outside of everything. * Replace the last few shitty Mario numbers (for the left rankings) with cool, new Oni numbers. * Change a bunch of offsets and things so the tab rankings and the intermission work nicer with 9+ players.
2018-10-28 16:27:55 +00:00
/*menu_t SP_LoadDef =
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
"M_PICKG",
1,
&SP_MainDef,
SP_LoadGameMenu,
M_DrawLoad,
68, 46,
0,
NULL
};
Stupidbad-big commit, but PLEASE don't ask me to re-do this on another branch, I swear to god. I know it makes things more difficult on you, and I'm sorry for that, but I'm definitely feeling the goddamn crunch right now and I wanna take a step back from this spaghetti nightmare and clear my head. * Do that thing where the character icons are ALWAYS 1x sized, through having two seperate lumps. * Revamp the S_SKIN parameters to be `facerank` (rankings - equivalent of half-scale old face), `facewant` (WANTED - equivalent of old face), and `facemmap` (equivalent of old iconprefix). * Do that thing Oni wanted where it shows two postions above and two positions below your current ranking (and you) to the left of the screen, instead of always the top 4, with some limits to avoid drawing outside of everything. * Replace the last few shitty Mario numbers (for the left rankings) with cool, new Oni numbers. * Change a bunch of offsets and things so the tab rankings and the intermission work nicer with 9+ players.
2018-10-28 16:27:55 +00:00
menu_t SP_LevelSelectDef = MAPICONMENUSTYLE(NULL, SP_LevelSelectMenu, &SP_LoadDef);*/
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
menu_t SP_LevelStatsDef =
{
"M_STATS",
1,
Move menu options around 1 Player now goes directly to Time Attack, and Extras is now a submenu with Unlockables, Statistics, and a currently-dummied option for Replay Hut.
2019-03-30 22:25:54 +00:00
&SR_MainDef,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
SP_LevelStatsMenu,
M_DrawLevelStats,
280, 185,
0,
NULL
};
static menu_t SP_TimeAttackDef =
{
"M_ATTACK",
sizeof (SP_TimeAttackMenu)/sizeof (menuitem_t),
&MainDef, // Doesn't matter.
SP_TimeAttackMenu,
M_DrawTimeAttackMenu,
More menu stuff! * Center level selection. * Re-work Record Attack screen. * Re-order MP Main menu, hide in NONET. * Combined yeeeah on vote screen. * Colour gametype on tab and tally. * (unrelated) Don't show "CHECK" if exiting.
2018-07-02 00:55:01 +00:00
34, 40,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
0,
* Fix the fades mess, and have the title screen always have a smooth, non-checkered fade from blapck! * Fix all the bugs with skin not being set properly or kept synchronised with the multiplayer setup in record attack. * Reduce the amount of flashing on the voting screen.
2018-07-04 21:57:50 +00:00
M_QuitTimeAttackMenu
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
};
static menu_t SP_ReplayDef =
{
"M_ATTACK",
sizeof(SP_ReplayMenu)/sizeof(menuitem_t),
&SP_TimeAttackDef,
SP_ReplayMenu,
M_DrawTimeAttackMenu,
More menu stuff! * Center level selection. * Re-work Record Attack screen. * Re-order MP Main menu, hide in NONET. * Combined yeeeah on vote screen. * Colour gametype on tab and tally. * (unrelated) Don't show "CHECK" if exiting.
2018-07-02 00:55:01 +00:00
34, 40,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
0,
NULL
};
static menu_t SP_GuestReplayDef =
{
"M_ATTACK",
sizeof(SP_GuestReplayMenu)/sizeof(menuitem_t),
&SP_TimeAttackDef,
SP_GuestReplayMenu,
M_DrawTimeAttackMenu,
More menu stuff! * Center level selection. * Re-work Record Attack screen. * Re-order MP Main menu, hide in NONET. * Combined yeeeah on vote screen. * Colour gametype on tab and tally. * (unrelated) Don't show "CHECK" if exiting.
2018-07-02 00:55:01 +00:00
34, 40,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
0,
NULL
};
static menu_t SP_GhostDef =
{
"M_ATTACK",
sizeof(SP_GhostMenu)/sizeof(menuitem_t),
&SP_TimeAttackDef,
SP_GhostMenu,
M_DrawTimeAttackMenu,
More menu stuff! * Center level selection. * Re-work Record Attack screen. * Re-order MP Main menu, hide in NONET. * Combined yeeeah on vote screen. * Colour gametype on tab and tally. * (unrelated) Don't show "CHECK" if exiting.
2018-07-02 00:55:01 +00:00
34, 40,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
0,
NULL
};
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
/*static menu_t SP_NightsAttackDef =
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
"M_NIGHTS",
sizeof (SP_NightsAttackMenu)/sizeof (menuitem_t),
&MainDef, // Doesn't matter.
SP_NightsAttackMenu,
M_DrawNightsAttackMenu,
32, 40,
0,
NULL
};
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
static menu_t SP_NightsReplayDef =
{
"M_NIGHTS",
sizeof(SP_NightsReplayMenu)/sizeof(menuitem_t),
&SP_NightsAttackDef,
SP_NightsReplayMenu,
M_DrawNightsAttackMenu,
32, 120,
0,
NULL
};
static menu_t SP_NightsGuestReplayDef =
{
"M_NIGHTS",
sizeof(SP_NightsGuestReplayMenu)/sizeof(menuitem_t),
&SP_NightsAttackDef,
SP_NightsGuestReplayMenu,
M_DrawNightsAttackMenu,
32, 120,
0,
NULL
};
static menu_t SP_NightsGhostDef =
{
"M_NIGHTS",
sizeof(SP_NightsGhostMenu)/sizeof(menuitem_t),
&SP_NightsAttackDef,
SP_NightsGhostMenu,
M_DrawNightsAttackMenu,
32, 120,
0,
NULL
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
};*/
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Stupidbad-big commit, but PLEASE don't ask me to re-do this on another branch, I swear to god. I know it makes things more difficult on you, and I'm sorry for that, but I'm definitely feeling the goddamn crunch right now and I wanna take a step back from this spaghetti nightmare and clear my head. * Do that thing where the character icons are ALWAYS 1x sized, through having two seperate lumps. * Revamp the S_SKIN parameters to be `facerank` (rankings - equivalent of half-scale old face), `facewant` (WANTED - equivalent of old face), and `facemmap` (equivalent of old iconprefix). * Do that thing Oni wanted where it shows two postions above and two positions below your current ranking (and you) to the left of the screen, instead of always the top 4, with some limits to avoid drawing outside of everything. * Replace the last few shitty Mario numbers (for the left rankings) with cool, new Oni numbers. * Change a bunch of offsets and things so the tab rankings and the intermission work nicer with 9+ players.
2018-10-28 16:27:55 +00:00
/*menu_t SP_PlayerDef =
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
"M_PICKP",
sizeof (PlayerMenu)/sizeof (menuitem_t),//player_end,
&SP_MainDef,
PlayerMenu,
M_DrawSetupChoosePlayerMenu,
24, 32,
0,
NULL
Stupidbad-big commit, but PLEASE don't ask me to re-do this on another branch, I swear to god. I know it makes things more difficult on you, and I'm sorry for that, but I'm definitely feeling the goddamn crunch right now and I wanna take a step back from this spaghetti nightmare and clear my head. * Do that thing where the character icons are ALWAYS 1x sized, through having two seperate lumps. * Revamp the S_SKIN parameters to be `facerank` (rankings - equivalent of half-scale old face), `facewant` (WANTED - equivalent of old face), and `facemmap` (equivalent of old iconprefix). * Do that thing Oni wanted where it shows two postions above and two positions below your current ranking (and you) to the left of the screen, instead of always the top 4, with some limits to avoid drawing outside of everything. * Replace the last few shitty Mario numbers (for the left rankings) with cool, new Oni numbers. * Change a bunch of offsets and things so the tab rankings and the intermission work nicer with 9+ players.
2018-10-28 16:27:55 +00:00
};*/
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Multiplayer
* Completely revamp a bunch of menu stuff! * Improve control menus significantly - a more layout-neutral, gameplay importance based order, with spacing, and less depth to get to the important stuff. * Port over the improved MP main menu from internal, including flattening the IP connect onto its level. * Allow for selecting the number of splitscreen players using a menu option, rather than three seperate menu choices. * Improve the layout of all of the level/gametype select menus slightly. * (unrelated) Make fourth player area in 3p splitscreen use the tiling background instead of a pure black area. * (unrelated) Tweak minimap ordering slightly.
2018-06-30 15:01:03 +00:00
menu_t MP_MainDef =
{
"M_MULTI",
sizeof (MP_MainMenu)/sizeof (menuitem_t),
`[22:03] TehRealSalt: Not organized code-wise, figured toaster would want to help with that since she's the Menu Queen and she probably has better ideas on how to do it` The Menu Queen is in the house~ :sparkles: * Magical, single-page player select and general netgamey stuff, while still remaining both pretty and functional. * Death to NOFOURPLAYER, now that the cat's out the bag. * Clean up NONET, assuming people try to make DD builds on release. * Minor tweaks across the board, mostly places where I wanted to pilfer minor code from and realised it wasn't done optimally originally.
2018-10-16 21:11:47 +00:00
&MainDef,
* Completely revamp a bunch of menu stuff! * Improve control menus significantly - a more layout-neutral, gameplay importance based order, with spacing, and less depth to get to the important stuff. * Port over the improved MP main menu from internal, including flattening the IP connect onto its level. * Allow for selecting the number of splitscreen players using a menu option, rather than three seperate menu choices. * Improve the layout of all of the level/gametype select menus slightly. * (unrelated) Make fourth player area in 3p splitscreen use the tiling background instead of a pure black area. * (unrelated) Tweak minimap ordering slightly.
2018-06-30 15:01:03 +00:00
MP_MainMenu,
M_DrawMPMainMenu,
`[22:03] TehRealSalt: Not organized code-wise, figured toaster would want to help with that since she's the Menu Queen and she probably has better ideas on how to do it` The Menu Queen is in the house~ :sparkles: * Magical, single-page player select and general netgamey stuff, while still remaining both pretty and functional. * Death to NOFOURPLAYER, now that the cat's out the bag. * Clean up NONET, assuming people try to make DD builds on release. * Minor tweaks across the board, mostly places where I wanted to pilfer minor code from and realised it wasn't done optimally originally.
2018-10-16 21:11:47 +00:00
42, 30,
* Completely revamp a bunch of menu stuff! * Improve control menus significantly - a more layout-neutral, gameplay importance based order, with spacing, and less depth to get to the important stuff. * Port over the improved MP main menu from internal, including flattening the IP connect onto its level. * Allow for selecting the number of splitscreen players using a menu option, rather than three seperate menu choices. * Improve the layout of all of the level/gametype select menus slightly. * (unrelated) Make fourth player area in 3p splitscreen use the tiling background instead of a pure black area. * (unrelated) Tweak minimap ordering slightly.
2018-06-30 15:01:03 +00:00
0,
Fix NONET. I thought I did this already during development, but I guess it got broken near the end.
2019-02-09 09:58:48 +00:00
#ifndef NONET
* Completely revamp a bunch of menu stuff! * Improve control menus significantly - a more layout-neutral, gameplay importance based order, with spacing, and less depth to get to the important stuff. * Port over the improved MP main menu from internal, including flattening the IP connect onto its level. * Allow for selecting the number of splitscreen players using a menu option, rather than three seperate menu choices. * Improve the layout of all of the level/gametype select menus slightly. * (unrelated) Make fourth player area in 3p splitscreen use the tiling background instead of a pure black area. * (unrelated) Tweak minimap ordering slightly.
2018-06-30 15:01:03 +00:00
M_CancelConnect
Fix NONET. I thought I did this already during development, but I guess it got broken near the end.
2019-02-09 09:58:48 +00:00
#else
NULL
Fix a bunch of issues with record attack! * Fixed the issue where your runs would be saved as belonging to the wrong character. * Make the Ghost menu always visible. This isn't PERFECT, but it's better than hiding the option to toggle ghosts just because you're doing your first run as a new character. * Fix the number of laps carrying over from MP(!!!!!!!!! plugged a huge security hole for the authenticity of replays...) Other stuff! * Hide map hell maps in the statistics. * Clean up some nonet stuff in the menu. * Put player setup last again, and tweaked its wording. * Disable the special Kart waiting for players behaviour when not playing a netgame - seeing a double gamestate transition in record attack is weird.
2018-07-06 17:08:35 +00:00
#endif
Fix NONET. I thought I did this already during development, but I guess it got broken near the end.
2019-02-09 09:58:48 +00:00
};
Sorta messy menu to set splitscreen Now this branch is completely functional!
2018-09-30 21:09:59 +00:00
menu_t MP_OfflineServerDef = MAPICONMENUSTYLE("M_MULTI", MP_OfflineServerMenu, &MP_MainDef);
Fix NONET. I thought I did this already during development, but I guess it got broken near the end.
2019-02-09 09:58:48 +00:00
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
#ifndef NONET
Fix NONET. I thought I did this already during development, but I guess it got broken near the end.
2019-02-09 09:58:48 +00:00
menu_t MP_ServerDef = MAPICONMENUSTYLE("M_MULTI", MP_ServerMenu, &MP_MainDef);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
menu_t MP_ConnectDef =
{
"M_MULTI",
sizeof (MP_ConnectMenu)/sizeof (menuitem_t),
&MP_MainDef,
MP_ConnectMenu,
M_DrawConnectMenu,
27,24,
0,
M_CancelConnect
};
#endif
menu_t MP_PlayerSetupDef =
{
Previous EXE: The Better Edition - Improve balloon-based items. Much more distinguished differences between the different ranks - Reverted Feather strafing. You can now just... properly move in the air, if you're using a Feather or a Bounce Pad. - Bounce pads are now stronger while using speed items. - Fixed the long standing bug about offroad & ziplines working when you're on FOFs above them. This is a tricky subject, so please report any issues you may come across related to this. - Shells should no longer travel to Mars, nor will they when using bounce pads. They should now do a gentle hop. - :WIP: new MP Player Setup screen, now shows character stats. Will later feature the list of characters in a row of icons, and a backported 2.2 color selector with toast's permission - Renamed "Match" to "Battle" :p - Yet MORE minor cases where kartspeed & kartweight were being read as fixed_t when they're freakin' UINT8's, people!
2017-11-28 06:13:23 +00:00
NULL, //"M_SPLAYR"
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
sizeof (MP_PlayerSetupMenu)/sizeof (menuitem_t),
&MP_MainDef,
MP_PlayerSetupMenu,
M_DrawSetupMultiPlayerMenu,
Tweak player setup menu.
2018-07-02 13:43:52 +00:00
36, 14,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
0,
M_QuitMultiPlayerMenu
};
// Options
Unlock all cheat no longer sets game modified if it can't find anything to unlock Sound test is also in the Options menu now.
2018-03-04 23:42:06 +00:00
menu_t OP_MainDef =
{
"M_OPTTTL",
sizeof (OP_MainMenu)/sizeof (menuitem_t),
&MainDef,
OP_MainMenu,
Better menus
2018-06-15 00:18:29 +00:00
M_DrawGenericMenu,
Unlock all cheat no longer sets game modified if it can't find anything to unlock Sound test is also in the Options menu now.
2018-03-04 23:42:06 +00:00
60, 30,
0,
NULL
};
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
menu_t OP_ControlsDef = DEFAULTMENUSTYLE("M_CONTRO", OP_ControlsMenu, &OP_MainDef, 60, 30);
New bindable keys You can now remap Change Viewpoint, Screenshot, and Toggle GIF Recording to other keys, mainly for gamepads They also pushed me to my breaking point and I couldn't tolerate the control menu anymore, thanks to toaster for the scrolling backport
2018-09-27 20:55:21 +00:00
menu_t OP_AllControlsDef = CONTROLMENUSTYLE(OP_AllControlsMenu, &OP_ControlsDef);
menu_t OP_Joystick1Def = DEFAULTMENUSTYLE("M_CONTRO", OP_Joystick1Menu, &OP_AllControlsDef, 60, 30);
menu_t OP_Joystick2Def = DEFAULTMENUSTYLE("M_CONTRO", OP_Joystick2Menu, &OP_AllControlsDef, 60, 30);
menu_t OP_Joystick3Def = DEFAULTMENUSTYLE("M_CONTRO", OP_Joystick3Menu, &OP_AllControlsDef, 60, 30);
menu_t OP_Joystick4Def = DEFAULTMENUSTYLE("M_CONTRO", OP_Joystick4Menu, &OP_AllControlsDef, 60, 30);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
menu_t OP_JoystickSetDef =
{
"M_CONTRO",
sizeof (OP_JoystickSetMenu)/sizeof (menuitem_t),
&OP_Joystick1Def,
OP_JoystickSetMenu,
M_DrawJoystick,
50, 40,
0,
NULL
};
Don't look at this commit too closely until after netgame, I want to surprise yalls!! * Lots of menu changes! * Little arrows next to changeable cvars! * Show default value for sliders! * Pretty pretty pretty. * I don't know how to describe some of these changes. * Effectively nuke MIDI music support! * Skiddown at the start of a race is more interesting! * Spinning in waterslides! * Tiny bugfix in voting, plus a little celebration...
2018-06-30 22:18:13 +00:00
menu_t OP_VideoOptionsDef =
{
"M_VIDEO",
sizeof(OP_VideoOptionsMenu)/sizeof(menuitem_t),
&OP_MainDef,
OP_VideoOptionsMenu,
M_DrawVideoMenu,
* Tint, not Teint. * Update/rearrange menus a tad, to be more appealing and correct some categorisation in general.
2018-08-05 15:34:51 +00:00
30, 30,
Don't look at this commit too closely until after netgame, I want to surprise yalls!! * Lots of menu changes! * Little arrows next to changeable cvars! * Show default value for sliders! * Pretty pretty pretty. * I don't know how to describe some of these changes. * Effectively nuke MIDI music support! * Skiddown at the start of a race is more interesting! * Spinning in waterslides! * Tiny bugfix in voting, plus a little celebration...
2018-06-30 22:18:13 +00:00
0,
NULL
};
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
menu_t OP_VideoModeDef =
{
"M_VIDEO",
1,
&OP_VideoOptionsDef,
OP_VideoModeMenu,
M_DrawVideoMode,
48, 26,
0,
NULL
};
Better menus
2018-06-15 00:18:29 +00:00
menu_t OP_SoundOptionsDef =
{
"M_SOUND",
sizeof (OP_SoundOptionsMenu)/sizeof (menuitem_t),
&OP_MainDef,
OP_SoundOptionsMenu,
M_DrawSkyRoom,
* Tint, not Teint. * Update/rearrange menus a tad, to be more appealing and correct some categorisation in general.
2018-08-05 15:34:51 +00:00
30, 30,
Better menus
2018-06-15 00:18:29 +00:00
0,
NULL
};
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
menu_t OP_HUDOptionsDef =
{
"M_HUD",
sizeof (OP_HUDOptionsMenu)/sizeof (menuitem_t),
&OP_MainDef,
OP_HUDOptionsMenu,
Fix all actionable comments in my review of sonicitems.
2018-08-09 21:59:52 +00:00
M_DrawHUDOptions,
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
30, 30,
0,
NULL
};
Fix all actionable comments in my review of sonicitems.
2018-08-09 21:59:52 +00:00
menu_t OP_ChatOptionsDef = DEFAULTMENUSTYLE("M_HUD", OP_ChatOptionsMenu, &OP_HUDOptionsDef, 30, 30);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
menu_t OP_GameOptionsDef = DEFAULTMENUSTYLE("M_GAME", OP_GameOptionsMenu, &OP_MainDef, 30, 30);
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
menu_t OP_ServerOptionsDef = DEFAULTMENUSTYLE("M_SERVER", OP_ServerOptionsMenu, &OP_MainDef, 24, 30);
Advanced Server Options menu More accessible way of modifying ping limit, timeouts, max file send, etc now that the defaults are stricter
2018-11-27 17:10:46 +00:00
#ifndef NONET
menu_t OP_AdvServerOptionsDef = DEFAULTMENUSTYLE("M_SERVER", OP_AdvServerOptionsMenu, &OP_ServerOptionsDef, 24, 30);
#endif
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Better menus
2018-06-15 00:18:29 +00:00
//menu_t OP_NetgameOptionsDef = DEFAULTMENUSTYLE("M_SERVER", OP_NetgameOptionsMenu, &OP_ServerOptionsDef, 30, 30);
//menu_t OP_GametypeOptionsDef = DEFAULTMENUSTYLE("M_SERVER", OP_GametypeOptionsMenu, &OP_ServerOptionsDef, 30, 30);
merge srb2 next
2019-01-05 20:59:23 +00:00
//menu_t OP_ChatOptionsDef = DEFAULTMENUSTYLE("M_GAME", OP_ChatOptionsMenu, &OP_GameOptionsDef, 30, 30);
Toggles for kitchen sink, ten banana, & quad orbinaut, and a screen that they can fit on
2018-08-31 17:18:19 +00:00
menu_t OP_MonitorToggleDef =
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Toggles for kitchen sink, ten banana, & quad orbinaut, and a screen that they can fit on
2018-08-31 17:18:19 +00:00
"M_GAME",
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
sizeof (OP_MonitorToggleMenu)/sizeof (menuitem_t),
Toggles for kitchen sink, ten banana, & quad orbinaut, and a screen that they can fit on
2018-08-31 17:18:19 +00:00
&OP_GameOptionsDef,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
OP_MonitorToggleMenu,
M_DrawMonitorToggles,
Toggles for kitchen sink, ten banana, & quad orbinaut, and a screen that they can fit on
2018-08-31 17:18:19 +00:00
47, 30,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
0,
NULL
Toggles for kitchen sink, ten banana, & quad orbinaut, and a screen that they can fit on
2018-08-31 17:18:19 +00:00
};
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
#ifdef HWRENDER
menu_t OP_OpenGLOptionsDef = DEFAULTMENUSTYLE("M_VIDEO", OP_OpenGLOptionsMenu, &OP_VideoOptionsDef, 30, 30);
menu_t OP_OpenGLColorDef =
{
"M_VIDEO",
sizeof (OP_OpenGLColorMenu)/sizeof (menuitem_t),
&OP_OpenGLOptionsDef,
OP_OpenGLColorMenu,
M_OGL_DrawColorMenu,
60, 40,
0,
NULL
};
#endif
Menu fix-up - Use center menu style for the tiny extras menu - Move Screenshot Options, Add-on Options, Replay Options, and Erase Data into Data Options again
2019-05-02 05:33:11 +00:00
menu_t OP_DataOptionsDef = DEFAULTMENUSTYLE("M_DATA", OP_DataOptionsMenu, &OP_MainDef, 60, 30);
menu_t OP_ScreenshotOptionsDef = DEFAULTMENUSTYLE("M_SCSHOT", OP_ScreenshotOptionsMenu, &OP_DataOptionsDef, 30, 30);
menu_t OP_AddonsOptionsDef = DEFAULTMENUSTYLE("M_ADDONS", OP_AddonsOptionsMenu, &OP_DataOptionsDef, 30, 30);
Compile m_menu.c without HAVE_DISCORDRPC
2020-08-22 08:58:59 +00:00
#ifdef HAVE_DISCORDRPC
Add some options, maxplayer/allownewplayer dont need to be netvars anymore
2020-08-22 05:53:27 +00:00
menu_t OP_DiscordOptionsDef = DEFAULTMENUSTYLE(NULL, OP_DiscordOptionsMenu, &OP_DataOptionsDef, 30, 30);
Compile m_menu.c without HAVE_DISCORDRPC
2020-08-22 08:58:59 +00:00
#endif
Menu fix-up - Use center menu style for the tiny extras menu - Move Screenshot Options, Add-on Options, Replay Options, and Erase Data into Data Options again
2019-05-02 05:33:11 +00:00
menu_t OP_EraseDataDef = DEFAULTMENUSTYLE("M_DATA", OP_EraseDataMenu, &OP_DataOptionsDef, 30, 30);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// ==========================================================================
// CVAR ONCHANGE EVENTS GO HERE
// ==========================================================================
// (there's only a couple anyway)
// Prototypes
static INT32 M_FindFirstMap(INT32 gtype);
static INT32 M_GetFirstLevelInList(void);
// Nextmap. Used for Time Attack.
static void Nextmap_OnChange(void)
{
char *leveltitle;
Change color in menu, replay support for specific staff ghosts Todo: replace the vague number with the demo's recorded player name
2017-10-21 02:01:07 +00:00
UINT8 active;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Update the string in the consvar.
Z_Free(cv_nextmap.zstring);
leveltitle = G_BuildMapTitle(cv_nextmap.value);
cv_nextmap.string = cv_nextmap.zstring = leveltitle ? leveltitle : Z_StrDup(G_BuildMapName(cv_nextmap.value));
Fix a bunch of issues with record attack! * Fixed the issue where your runs would be saved as belonging to the wrong character. * Make the Ghost menu always visible. This isn't PERFECT, but it's better than hiding the option to toggle ghosts just because you're doing your first run as a new character. * Fix the number of laps carrying over from MP(!!!!!!!!! plugged a huge security hole for the authenticity of replays...) Other stuff! * Hide map hell maps in the statistics. * Clean up some nonet stuff in the menu. * Put player setup last again, and tweaked its wording. * Disable the special Kart waiting for players behaviour when not playing a netgame - seeing a double gamestate transition in record attack is weird.
2018-07-06 17:08:35 +00:00
if (currentMenu == &SP_TimeAttackDef)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Fix a bunch of issues with record attack! * Fixed the issue where your runs would be saved as belonging to the wrong character. * Make the Ghost menu always visible. This isn't PERFECT, but it's better than hiding the option to toggle ghosts just because you're doing your first run as a new character. * Fix the number of laps carrying over from MP(!!!!!!!!! plugged a huge security hole for the authenticity of replays...) Other stuff! * Hide map hell maps in the statistics. * Clean up some nonet stuff in the menu. * Put player setup last again, and tweaked its wording. * Disable the special Kart waiting for players behaviour when not playing a netgame - seeing a double gamestate transition in record attack is weird.
2018-07-06 17:08:35 +00:00
// see also p_setup.c's P_LoadRecordGhosts
const size_t glen = strlen(srb2home)+1+strlen("replay")+1+strlen(timeattackfolder)+1+strlen("MAPXX")+1;
char *gpath = malloc(glen);
INT32 i;
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
Fix a bunch of issues with record attack! * Fixed the issue where your runs would be saved as belonging to the wrong character. * Make the Ghost menu always visible. This isn't PERFECT, but it's better than hiding the option to toggle ghosts just because you're doing your first run as a new character. * Fix the number of laps carrying over from MP(!!!!!!!!! plugged a huge security hole for the authenticity of replays...) Other stuff! * Hide map hell maps in the statistics. * Clean up some nonet stuff in the menu. * Put player setup last again, and tweaked its wording. * Disable the special Kart waiting for players behaviour when not playing a netgame - seeing a double gamestate transition in record attack is weird.
2018-07-06 17:08:35 +00:00
if (!gpath)
return;
Change color in menu, replay support for specific staff ghosts Todo: replace the vague number with the demo's recorded player name
2017-10-21 02:01:07 +00:00
Fix a bunch of issues with record attack! * Fixed the issue where your runs would be saved as belonging to the wrong character. * Make the Ghost menu always visible. This isn't PERFECT, but it's better than hiding the option to toggle ghosts just because you're doing your first run as a new character. * Fix the number of laps carrying over from MP(!!!!!!!!! plugged a huge security hole for the authenticity of replays...) Other stuff! * Hide map hell maps in the statistics. * Clean up some nonet stuff in the menu. * Put player setup last again, and tweaked its wording. * Disable the special Kart waiting for players behaviour when not playing a netgame - seeing a double gamestate transition in record attack is weird.
2018-07-06 17:08:35 +00:00
sprintf(gpath,"%s"PATHSEP"replay"PATHSEP"%s"PATHSEP"%s", srb2home, timeattackfolder, G_BuildMapName(cv_nextmap.value));
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
Change color in menu, replay support for specific staff ghosts Todo: replace the vague number with the demo's recorded player name
2017-10-21 02:01:07 +00:00
CV_StealthSetValue(&cv_dummystaff, 0);
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
active = false;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
SP_TimeAttackMenu[taguest].status = IT_DISABLED;
SP_TimeAttackMenu[tareplay].status = IT_DISABLED;
Fix a bunch of issues with record attack! * Fixed the issue where your runs would be saved as belonging to the wrong character. * Make the Ghost menu always visible. This isn't PERFECT, but it's better than hiding the option to toggle ghosts just because you're doing your first run as a new character. * Fix the number of laps carrying over from MP(!!!!!!!!! plugged a huge security hole for the authenticity of replays...) Other stuff! * Hide map hell maps in the statistics. * Clean up some nonet stuff in the menu. * Put player setup last again, and tweaked its wording. * Disable the special Kart waiting for players behaviour when not playing a netgame - seeing a double gamestate transition in record attack is weird.
2018-07-06 17:08:35 +00:00
//SP_TimeAttackMenu[taghost].status = IT_DISABLED;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Check if file exists, if not, disable REPLAY option
Fix a bunch of issues with record attack! * Fixed the issue where your runs would be saved as belonging to the wrong character. * Make the Ghost menu always visible. This isn't PERFECT, but it's better than hiding the option to toggle ghosts just because you're doing your first run as a new character. * Fix the number of laps carrying over from MP(!!!!!!!!! plugged a huge security hole for the authenticity of replays...) Other stuff! * Hide map hell maps in the statistics. * Clean up some nonet stuff in the menu. * Put player setup last again, and tweaked its wording. * Disable the special Kart waiting for players behaviour when not playing a netgame - seeing a double gamestate transition in record attack is weird.
2018-07-06 17:08:35 +00:00
for (i = 0; i < 4; i++)
{
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
SP_ReplayMenu[i].status = IT_DISABLED;
SP_GuestReplayMenu[i].status = IT_DISABLED;
}
Fix a bunch of issues with record attack! * Fixed the issue where your runs would be saved as belonging to the wrong character. * Make the Ghost menu always visible. This isn't PERFECT, but it's better than hiding the option to toggle ghosts just because you're doing your first run as a new character. * Fix the number of laps carrying over from MP(!!!!!!!!! plugged a huge security hole for the authenticity of replays...) Other stuff! * Hide map hell maps in the statistics. * Clean up some nonet stuff in the menu. * Put player setup last again, and tweaked its wording. * Disable the special Kart waiting for players behaviour when not playing a netgame - seeing a double gamestate transition in record attack is weird.
2018-07-06 17:08:35 +00:00
SP_ReplayMenu[4].status = IT_DISABLED;
SP_GhostMenu[3].status = IT_DISABLED;
SP_GhostMenu[4].status = IT_DISABLED;
if (FIL_FileExists(va("%s-%s-time-best.lmp", gpath, cv_chooseskin.string))) {
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
SP_ReplayMenu[0].status = IT_WHITESTRING|IT_CALL;
SP_GuestReplayMenu[0].status = IT_WHITESTRING|IT_CALL;
Change color in menu, replay support for specific staff ghosts Todo: replace the vague number with the demo's recorded player name
2017-10-21 02:01:07 +00:00
active |= 3;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
Fix a bunch of issues with record attack! * Fixed the issue where your runs would be saved as belonging to the wrong character. * Make the Ghost menu always visible. This isn't PERFECT, but it's better than hiding the option to toggle ghosts just because you're doing your first run as a new character. * Fix the number of laps carrying over from MP(!!!!!!!!! plugged a huge security hole for the authenticity of replays...) Other stuff! * Hide map hell maps in the statistics. * Clean up some nonet stuff in the menu. * Put player setup last again, and tweaked its wording. * Disable the special Kart waiting for players behaviour when not playing a netgame - seeing a double gamestate transition in record attack is weird.
2018-07-06 17:08:35 +00:00
if (FIL_FileExists(va("%s-%s-lap-best.lmp", gpath, cv_chooseskin.string))) {
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
SP_ReplayMenu[1].status = IT_WHITESTRING|IT_CALL;
SP_GuestReplayMenu[1].status = IT_WHITESTRING|IT_CALL;
Change color in menu, replay support for specific staff ghosts Todo: replace the vague number with the demo's recorded player name
2017-10-21 02:01:07 +00:00
active |= 3;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
Fix a bunch of issues with record attack! * Fixed the issue where your runs would be saved as belonging to the wrong character. * Make the Ghost menu always visible. This isn't PERFECT, but it's better than hiding the option to toggle ghosts just because you're doing your first run as a new character. * Fix the number of laps carrying over from MP(!!!!!!!!! plugged a huge security hole for the authenticity of replays...) Other stuff! * Hide map hell maps in the statistics. * Clean up some nonet stuff in the menu. * Put player setup last again, and tweaked its wording. * Disable the special Kart waiting for players behaviour when not playing a netgame - seeing a double gamestate transition in record attack is weird.
2018-07-06 17:08:35 +00:00
if (FIL_FileExists(va("%s-%s-last.lmp", gpath, cv_chooseskin.string))) {
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
SP_ReplayMenu[2].status = IT_WHITESTRING|IT_CALL;
SP_GuestReplayMenu[2].status = IT_WHITESTRING|IT_CALL;
Change color in menu, replay support for specific staff ghosts Todo: replace the vague number with the demo's recorded player name
2017-10-21 02:01:07 +00:00
active |= 3;
}
Fix a bunch of issues with record attack! * Fixed the issue where your runs would be saved as belonging to the wrong character. * Make the Ghost menu always visible. This isn't PERFECT, but it's better than hiding the option to toggle ghosts just because you're doing your first run as a new character. * Fix the number of laps carrying over from MP(!!!!!!!!! plugged a huge security hole for the authenticity of replays...) Other stuff! * Hide map hell maps in the statistics. * Clean up some nonet stuff in the menu. * Put player setup last again, and tweaked its wording. * Disable the special Kart waiting for players behaviour when not playing a netgame - seeing a double gamestate transition in record attack is weird.
2018-07-06 17:08:35 +00:00
if (FIL_FileExists(va("%s-guest.lmp", gpath)))
{
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
SP_ReplayMenu[3].status = IT_WHITESTRING|IT_CALL;
SP_GuestReplayMenu[3].status = IT_WHITESTRING|IT_CALL;
Fix a bunch of issues with record attack! * Fixed the issue where your runs would be saved as belonging to the wrong character. * Make the Ghost menu always visible. This isn't PERFECT, but it's better than hiding the option to toggle ghosts just because you're doing your first run as a new character. * Fix the number of laps carrying over from MP(!!!!!!!!! plugged a huge security hole for the authenticity of replays...) Other stuff! * Hide map hell maps in the statistics. * Clean up some nonet stuff in the menu. * Put player setup last again, and tweaked its wording. * Disable the special Kart waiting for players behaviour when not playing a netgame - seeing a double gamestate transition in record attack is weird.
2018-07-06 17:08:35 +00:00
SP_GhostMenu[3].status = IT_STRING|IT_CVAR;
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
active |= 3;
}
* 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
CV_SetValue(&cv_dummystaff, 1);
if (cv_dummystaff.value)
Fix a bunch of issues with record attack! * Fixed the issue where your runs would be saved as belonging to the wrong character. * Make the Ghost menu always visible. This isn't PERFECT, but it's better than hiding the option to toggle ghosts just because you're doing your first run as a new character. * Fix the number of laps carrying over from MP(!!!!!!!!! plugged a huge security hole for the authenticity of replays...) Other stuff! * Hide map hell maps in the statistics. * Clean up some nonet stuff in the menu. * Put player setup last again, and tweaked its wording. * Disable the special Kart waiting for players behaviour when not playing a netgame - seeing a double gamestate transition in record attack is weird.
2018-07-06 17:08:35 +00:00
{
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
SP_ReplayMenu[4].status = IT_WHITESTRING|IT_KEYHANDLER;
Fix a bunch of issues with record attack! * Fixed the issue where your runs would be saved as belonging to the wrong character. * Make the Ghost menu always visible. This isn't PERFECT, but it's better than hiding the option to toggle ghosts just because you're doing your first run as a new character. * Fix the number of laps carrying over from MP(!!!!!!!!! plugged a huge security hole for the authenticity of replays...) Other stuff! * Hide map hell maps in the statistics. * Clean up some nonet stuff in the menu. * Put player setup last again, and tweaked its wording. * Disable the special Kart waiting for players behaviour when not playing a netgame - seeing a double gamestate transition in record attack is weird.
2018-07-06 17:08:35 +00:00
SP_GhostMenu[4].status = IT_STRING|IT_CVAR;
Change color in menu, replay support for specific staff ghosts Todo: replace the vague number with the demo's recorded player name
2017-10-21 02:01:07 +00:00
CV_StealthSetValue(&cv_dummystaff, 1);
active |= 1;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
Fix a bunch of issues with record attack! * Fixed the issue where your runs would be saved as belonging to the wrong character. * Make the Ghost menu always visible. This isn't PERFECT, but it's better than hiding the option to toggle ghosts just because you're doing your first run as a new character. * Fix the number of laps carrying over from MP(!!!!!!!!! plugged a huge security hole for the authenticity of replays...) Other stuff! * Hide map hell maps in the statistics. * Clean up some nonet stuff in the menu. * Put player setup last again, and tweaked its wording. * Disable the special Kart waiting for players behaviour when not playing a netgame - seeing a double gamestate transition in record attack is weird.
2018-07-06 17:08:35 +00:00
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (active) {
Change color in menu, replay support for specific staff ghosts Todo: replace the vague number with the demo's recorded player name
2017-10-21 02:01:07 +00:00
if (active & 1)
SP_TimeAttackMenu[tareplay].status = IT_WHITESTRING|IT_SUBMENU;
if (active & 2)
SP_TimeAttackMenu[taguest].status = IT_WHITESTRING|IT_SUBMENU;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
Fix a bunch of issues with record attack! * Fixed the issue where your runs would be saved as belonging to the wrong character. * Make the Ghost menu always visible. This isn't PERFECT, but it's better than hiding the option to toggle ghosts just because you're doing your first run as a new character. * Fix the number of laps carrying over from MP(!!!!!!!!! plugged a huge security hole for the authenticity of replays...) Other stuff! * Hide map hell maps in the statistics. * Clean up some nonet stuff in the menu. * Put player setup last again, and tweaked its wording. * Disable the special Kart waiting for players behaviour when not playing a netgame - seeing a double gamestate transition in record attack is weird.
2018-07-06 17:08:35 +00:00
else if (itemOn == tareplay) // Reset lastOn so replay isn't still selected when not available.
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
currentMenu->lastOn = itemOn;
itemOn = tastart;
}
if (mapheaderinfo[cv_nextmap.value-1] && mapheaderinfo[cv_nextmap.value-1]->forcecharacter[0] != '\0')
CV_Set(&cv_chooseskin, mapheaderinfo[cv_nextmap.value-1]->forcecharacter);
Free unwittingly malloc'd memory.
2018-07-06 22:59:05 +00:00
free(gpath);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
}
Spectate/Enter menu for online splitscreen Just like the menu option
2018-10-16 00:28:35 +00:00
static void Dummymenuplayer_OnChange(void)
{
if (cv_dummymenuplayer.value < 1)
CV_StealthSetValue(&cv_dummymenuplayer, splitscreen+1);
else if (cv_dummymenuplayer.value > splitscreen+1)
CV_StealthSetValue(&cv_dummymenuplayer, 1);
}
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
/*static void Dummymares_OnChange(void)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
if (!nightsrecords[cv_nextmap.value-1])
{
CV_StealthSetValue(&cv_dummymares, 0);
return;
}
else
{
UINT8 mares = nightsrecords[cv_nextmap.value-1]->nummares;
if (cv_dummymares.value < 0)
CV_StealthSetValue(&cv_dummymares, mares);
else if (cv_dummymares.value > mares)
CV_StealthSetValue(&cv_dummymares, 0);
}
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
}*/
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
* 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
char dummystaffname[22];
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
Change color in menu, replay support for specific staff ghosts Todo: replace the vague number with the demo's recorded player name
2017-10-21 02:01:07 +00:00
static void Dummystaff_OnChange(void)
{
lumpnum_t l;
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
dummystaffname[0] = '\0';
Change color in menu, replay support for specific staff ghosts Todo: replace the vague number with the demo's recorded player name
2017-10-21 02:01:07 +00:00
if ((l = W_CheckNumForName(va("%sS01",G_BuildMapName(cv_nextmap.value)))) == LUMPERROR)
{
CV_StealthSetValue(&cv_dummystaff, 0);
return;
}
else
{
* 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
char *temp = dummystaffname;
Change color in menu, replay support for specific staff ghosts Todo: replace the vague number with the demo's recorded player name
2017-10-21 02:01:07 +00:00
UINT8 numstaff = 1;
* 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
while (numstaff < 99 && (l = W_CheckNumForName(va("%sS%02u",G_BuildMapName(cv_nextmap.value),numstaff+1))) != LUMPERROR)
Change color in menu, replay support for specific staff ghosts Todo: replace the vague number with the demo's recorded player name
2017-10-21 02:01:07 +00:00
numstaff++;
if (cv_dummystaff.value < 1)
CV_StealthSetValue(&cv_dummystaff, numstaff);
else if (cv_dummystaff.value > numstaff)
CV_StealthSetValue(&cv_dummystaff, 1);
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
if ((l = W_CheckNumForName(va("%sS%02u",G_BuildMapName(cv_nextmap.value), cv_dummystaff.value))) == LUMPERROR)
return; // shouldn't happen but might as well check...
G_UpdateStaffGhostName(l);
* 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
while (*temp)
temp++;
sprintf(temp, " - %d", cv_dummystaff.value);
Change color in menu, replay support for specific staff ghosts Todo: replace the vague number with the demo's recorded player name
2017-10-21 02:01:07 +00:00
}
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Newgametype. Used for gametype changes.
static void Newgametype_OnChange(void)
{
Added "Random" to the level selection list, for those days when you know you *want* to race but don't have any idea what to do.
2018-08-15 15:12:36 +00:00
if (cv_nextmap.value && menuactive)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Added "Random" to the level selection list, for those days when you know you *want* to race but don't have any idea what to do.
2018-08-15 15:12:36 +00:00
if (!mapheaderinfo[cv_nextmap.value-1])
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
P_AllocMapHeader((INT16)(cv_nextmap.value-1));
Added Accelcode, start boosting, reverted drifting, etc.
2017-02-07 22:19:04 +00:00
if ((cv_newgametype.value == GT_RACE && !(mapheaderinfo[cv_nextmap.value-1]->typeoflevel & TOL_RACE)) || // SRB2kart
//(cv_newgametype.value == GT_COMPETITION && !(mapheaderinfo[cv_nextmap.value-1]->typeoflevel & TOL_COMPETITION)) ||
//(cv_newgametype.value == GT_RACE && !(mapheaderinfo[cv_nextmap.value-1]->typeoflevel & TOL_RACE)) ||
((cv_newgametype.value == GT_MATCH || cv_newgametype.value == GT_TEAMMATCH) && !(mapheaderinfo[cv_nextmap.value-1]->typeoflevel & TOL_MATCH))) // ||
//((cv_newgametype.value == GT_TAG || cv_newgametype.value == GT_HIDEANDSEEK) && !(mapheaderinfo[cv_nextmap.value-1]->typeoflevel & TOL_TAG)) ||
//(cv_newgametype.value == GT_CTF && !(mapheaderinfo[cv_nextmap.value-1]->typeoflevel & TOL_CTF)))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
INT32 value = 0;
switch (cv_newgametype.value)
{
case GT_COOP:
Added Accelcode, start boosting, reverted drifting, etc.
2017-02-07 22:19:04 +00:00
value = TOL_RACE; // SRB2kart
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
break;
case GT_COMPETITION:
value = TOL_COMPETITION;
break;
case GT_RACE:
value = TOL_RACE;
break;
case GT_MATCH:
case GT_TEAMMATCH:
value = TOL_MATCH;
break;
case GT_TAG:
case GT_HIDEANDSEEK:
value = TOL_TAG;
break;
case GT_CTF:
value = TOL_CTF;
break;
}
CV_SetValue(&cv_nextmap, M_FindFirstMap(value));
Don't look at this commit too closely until after netgame, I want to surprise yalls!! * Lots of menu changes! * Little arrows next to changeable cvars! * Show default value for sliders! * Pretty pretty pretty. * I don't know how to describe some of these changes. * Effectively nuke MIDI music support! * Skiddown at the start of a race is more interesting! * Spinning in waterslides! * Tiny bugfix in voting, plus a little celebration...
2018-06-30 22:18:13 +00:00
//CV_AddValue(&cv_nextmap, -1);
//CV_AddValue(&cv_nextmap, 1);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
}
}
void Screenshot_option_Onchange(void)
{
OP_ScreenshotOptionsMenu[op_screenshot_folder].status =
(cv_screenshot_option.value == 3 ? IT_CVAR|IT_STRING|IT_CV_STRING : IT_DISABLED);
}
void Moviemode_mode_Onchange(void)
{
INT32 i, cstart, cend;
for (i = op_screenshot_gif_start; i <= op_screenshot_apng_end; ++i)
OP_ScreenshotOptionsMenu[i].status = IT_DISABLED;
switch (cv_moviemode.value)
{
case MM_GIF:
cstart = op_screenshot_gif_start;
cend = op_screenshot_gif_end;
break;
case MM_APNG:
cstart = op_screenshot_apng_start;
cend = op_screenshot_apng_end;
break;
default:
return;
}
for (i = cstart; i <= cend; ++i)
OP_ScreenshotOptionsMenu[i].status = IT_STRING|IT_CVAR;
}
Addons menu. Bitch.
2018-08-28 20:08:47 +00:00
void Addons_option_Onchange(void)
{
OP_AddonsOptionsMenu[op_addons_folder].status =
(cv_addons_option.value == 3 ? IT_CVAR|IT_STRING|IT_CV_STRING : IT_DISABLED);
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// ==========================================================================
// END ORGANIZATION STUFF.
// ==========================================================================
// current menudef
menu_t *currentMenu = &MainDef;
// =========================================================================
// BASIC MENU HANDLING
// =========================================================================
static void M_ChangeCvar(INT32 choice)
{
consvar_t *cv = (consvar_t *)currentMenu->menuitems[itemOn].itemaction;
* Add a way to revert all non-awkward cvars back to their default settings, with special casing for prefcolor as a default for playercolor on the record attack menu. * Make MT_GHOST's dispoffset -1, so that at the starting line in record attack your player is always visible even when you have multiple ghosts in play.
2018-07-06 19:40:42 +00:00
if (choice == -1)
{
Improve the defaulting thing to not play the sound if the cvar isn't to be touched.
2018-07-06 19:55:22 +00:00
if (cv == &cv_playercolor)
* Add a way to revert all non-awkward cvars back to their default settings, with special casing for prefcolor as a default for playercolor on the record attack menu. * Make MT_GHOST's dispoffset -1, so that at the starting line in record attack your player is always visible even when you have multiple ghosts in play.
2018-07-06 19:40:42 +00:00
{
Improve the defaulting thing to not play the sound if the cvar isn't to be touched.
2018-07-06 19:55:22 +00:00
SINT8 skinno = R_SkinAvailable(cv_chooseskin.string);
Some minor things to help draw sonicitems to a close. * "kartvoices" cvar. Possible values "Never", "Tasteful" (default), and "Meme". * Added a way to move quickly through the credits, rather than skip them entirely (hold spacebar or down arrow). * Fix a few mistakes in M_ChangeCvar, some of which I introduced and some of which were weird in the first place. * Tweak the offset of the arrows that let you know you can modify a cvar by pressing left or right (some via a patch.kart change, but others via tweaking the drawing location).
2018-07-29 17:35:56 +00:00
if (skinno != -1)
CV_SetValue(cv,skins[skinno].prefcolor);
return;
* Add a way to revert all non-awkward cvars back to their default settings, with special casing for prefcolor as a default for playercolor on the record attack menu. * Make MT_GHOST's dispoffset -1, so that at the starting line in record attack your player is always visible even when you have multiple ghosts in play.
2018-07-06 19:40:42 +00:00
}
CV_Set(cv,cv->defaultvalue);
return;
}
Some minor things to help draw sonicitems to a close. * "kartvoices" cvar. Possible values "Never", "Tasteful" (default), and "Meme". * Added a way to move quickly through the credits, rather than skip them entirely (hold spacebar or down arrow). * Fix a few mistakes in M_ChangeCvar, some of which I introduced and some of which were weird in the first place. * Tweak the offset of the arrows that let you know you can modify a cvar by pressing left or right (some via a patch.kart change, but others via tweaking the drawing location).
2018-07-29 17:35:56 +00:00
choice = (choice<<1) - 1;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (((currentMenu->menuitems[itemOn].status & IT_CVARTYPE) == IT_CV_SLIDER)
||((currentMenu->menuitems[itemOn].status & IT_CVARTYPE) == IT_CV_INVISSLIDER)
||((currentMenu->menuitems[itemOn].status & IT_CVARTYPE) == IT_CV_NOMOD))
{
Some minor things to help draw sonicitems to a close. * "kartvoices" cvar. Possible values "Never", "Tasteful" (default), and "Meme". * Added a way to move quickly through the credits, rather than skip them entirely (hold spacebar or down arrow). * Fix a few mistakes in M_ChangeCvar, some of which I introduced and some of which were weird in the first place. * Tweak the offset of the arrows that let you know you can modify a cvar by pressing left or right (some via a patch.kart change, but others via tweaking the drawing location).
2018-07-29 17:35:56 +00:00
CV_SetValue(cv,cv->value+choice);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
else if (cv->flags & CV_FLOAT)
{
char s[20];
Some minor things to help draw sonicitems to a close. * "kartvoices" cvar. Possible values "Never", "Tasteful" (default), and "Meme". * Added a way to move quickly through the credits, rather than skip them entirely (hold spacebar or down arrow). * Fix a few mistakes in M_ChangeCvar, some of which I introduced and some of which were weird in the first place. * Tweak the offset of the arrows that let you know you can modify a cvar by pressing left or right (some via a patch.kart change, but others via tweaking the drawing location).
2018-07-29 17:35:56 +00:00
sprintf(s,"%f",FIXED_TO_FLOAT(cv->value)+(choice)*(1.0f/16.0f));
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
CV_Set(cv,s);
}
else
Advanced Server Options menu More accessible way of modifying ping limit, timeouts, max file send, etc now that the defaults are stricter
2018-11-27 17:10:46 +00:00
{
#ifndef NONET
if (cv == &cv_nettimeout || cv == &cv_jointimeout)
choice *= (TICRATE/7);
else if (cv == &cv_maxsend)
choice *= 512;
#endif
Some minor things to help draw sonicitems to a close. * "kartvoices" cvar. Possible values "Never", "Tasteful" (default), and "Meme". * Added a way to move quickly through the credits, rather than skip them entirely (hold spacebar or down arrow). * Fix a few mistakes in M_ChangeCvar, some of which I introduced and some of which were weird in the first place. * Tweak the offset of the arrows that let you know you can modify a cvar by pressing left or right (some via a patch.kart change, but others via tweaking the drawing location).
2018-07-29 17:35:56 +00:00
CV_AddValue(cv,choice);
Advanced Server Options menu More accessible way of modifying ping limit, timeouts, max file send, etc now that the defaults are stricter
2018-11-27 17:10:46 +00:00
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
static boolean M_ChangeStringCvar(INT32 choice)
{
consvar_t *cv = (consvar_t *)currentMenu->menuitems[itemOn].itemaction;
Don't look at this commit too closely until after netgame, I want to surprise yalls!! * Lots of menu changes! * Little arrows next to changeable cvars! * Show default value for sliders! * Pretty pretty pretty. * I don't know how to describe some of these changes. * Effectively nuke MIDI music support! * Skiddown at the start of a race is more interesting! * Spinning in waterslides! * Tiny bugfix in voting, plus a little celebration...
2018-06-30 22:18:13 +00:00
char buf[MAXSTRINGLENGTH];
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
size_t len;
Don't look at this commit too closely until after netgame, I want to surprise yalls!! * Lots of menu changes! * Little arrows next to changeable cvars! * Show default value for sliders! * Pretty pretty pretty. * I don't know how to describe some of these changes. * Effectively nuke MIDI music support! * Skiddown at the start of a race is more interesting! * Spinning in waterslides! * Tiny bugfix in voting, plus a little celebration...
2018-06-30 22:18:13 +00:00
if (shiftdown && choice >= 32 && choice <= 127)
choice = shiftxform[choice];
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
switch (choice)
{
case KEY_BACKSPACE:
len = strlen(cv->string);
if (len > 0)
{
Don't look at this commit too closely until after netgame, I want to surprise yalls!! * Lots of menu changes! * Little arrows next to changeable cvars! * Show default value for sliders! * Pretty pretty pretty. * I don't know how to describe some of these changes. * Effectively nuke MIDI music support! * Skiddown at the start of a race is more interesting! * Spinning in waterslides! * Tiny bugfix in voting, plus a little celebration...
2018-06-30 22:18:13 +00:00
S_StartSound(NULL,sfx_menu1); // Tails
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
M_Memcpy(buf, cv->string, len);
buf[len-1] = 0;
CV_Set(cv, buf);
}
return true;
Don't look at this commit too closely until after netgame, I want to surprise yalls!! * Lots of menu changes! * Little arrows next to changeable cvars! * Show default value for sliders! * Pretty pretty pretty. * I don't know how to describe some of these changes. * Effectively nuke MIDI music support! * Skiddown at the start of a race is more interesting! * Spinning in waterslides! * Tiny bugfix in voting, plus a little celebration...
2018-06-30 22:18:13 +00:00
case KEY_DEL:
if (cv->string[0])
{
S_StartSound(NULL,sfx_menu1); // Tails
CV_Set(cv, "");
}
return true;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
default:
if (choice >= 32 && choice <= 127)
{
len = strlen(cv->string);
if (len < MAXSTRINGLENGTH - 1)
{
Don't look at this commit too closely until after netgame, I want to surprise yalls!! * Lots of menu changes! * Little arrows next to changeable cvars! * Show default value for sliders! * Pretty pretty pretty. * I don't know how to describe some of these changes. * Effectively nuke MIDI music support! * Skiddown at the start of a race is more interesting! * Spinning in waterslides! * Tiny bugfix in voting, plus a little celebration...
2018-06-30 22:18:13 +00:00
S_StartSound(NULL,sfx_menu1); // Tails
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
M_Memcpy(buf, cv->string, len);
buf[len++] = (char)choice;
buf[len] = 0;
CV_Set(cv, buf);
}
return true;
}
break;
}
return false;
}
static void M_NextOpt(void)
{
INT16 oldItemOn = itemOn; // prevent infinite loop
do
{
if (itemOn + 1 > currentMenu->numitems - 1)
itemOn = 0;
else
itemOn++;
} while (oldItemOn != itemOn && (currentMenu->menuitems[itemOn].status & IT_TYPE) == IT_SPACE);
}
static void M_PrevOpt(void)
{
INT16 oldItemOn = itemOn; // prevent infinite loop
do
{
if (!itemOn)
itemOn = currentMenu->numitems - 1;
else
itemOn--;
} while (oldItemOn != itemOn && (currentMenu->menuitems[itemOn].status & IT_TYPE) == IT_SPACE);
}
Starting from scratch. SRB2 v2.1.15
2016-07-06 04:09:17 +00:00
// lock out further input in a tic when important buttons are pressed
// (in other words -- stop bullshit happening by mashing buttons in fades)
static boolean noFurtherInput = false;
* 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
static void Command_Manual_f(void)
{
if (modeattacking)
return;
M_StartControlPanel();
M_Manual(INT32_MAX);
itemOn = 0;
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
//
// M_Responder
//
boolean M_Responder(event_t *ev)
{
INT32 ch = -1;
// INT32 i;
static tic_t joywait = 0, mousewait = 0;
add deadzone + storing of previous joyx/y values etc to attempt to make joysticks less sensitive in menus
2018-12-02 21:52:30 +00:00
static INT32 pjoyx = 0, pjoyy = 0;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
static INT32 pmousex = 0, pmousey = 0;
static INT32 lastx = 0, lasty = 0;
void (*routine)(INT32 choice); // for some casting problem
Move public demo vars to a single struct
2019-03-25 02:32:15 +00:00
if (dedicated || (demo.playback && demo.title)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
|| gamestate == GS_INTRO || gamestate == GS_CUTSCENE || gamestate == GS_GAMEEND
|| gamestate == GS_CREDITS || gamestate == GS_EVALUATION)
return false;
Starting from scratch. SRB2 v2.1.15
2016-07-06 04:09:17 +00:00
if (noFurtherInput)
{
// Ignore input after enter/escape/other buttons
// (but still allow shift keyup so caps doesn't get stuck)
return false;
}
Restore a change lost in the merge madness, do some SDL_GameController prep
2018-12-10 15:00:15 +00:00
else if (ev->type == ev_keydown)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Restore a change lost in the merge madness, do some SDL_GameController prep
2018-12-10 15:00:15 +00:00
ch = ev->data1;
Make M_Responder respond to joy buttons only in-menu (multiplayer bug?)
2018-12-03 08:33:12 +00:00
Restore a change lost in the merge madness, do some SDL_GameController prep
2018-12-10 15:00:15 +00:00
// added 5-2-98 remap virtual keys (mouse & joystick buttons)
switch (ch)
{
case KEY_MOUSE1:
//case KEY_JOY1:
//case KEY_JOY1 + 2:
ch = KEY_ENTER;
break;
/*case KEY_JOY1 + 3: // Brake can function as 'n' for message boxes now.
Make M_Responder respond to joy buttons only in-menu (multiplayer bug?)
2018-12-03 08:33:12 +00:00
ch = 'n';
Restore a change lost in the merge madness, do some SDL_GameController prep
2018-12-10 15:00:15 +00:00
break;*/
case KEY_MOUSE1 + 1:
//case KEY_JOY1 + 1:
ch = KEY_BACKSPACE;
break;
case KEY_HAT1:
ch = KEY_UPARROW;
break;
case KEY_HAT1 + 1:
ch = KEY_DOWNARROW;
break;
case KEY_HAT1 + 2:
ch = KEY_LEFTARROW;
break;
case KEY_HAT1 + 3:
ch = KEY_RIGHTARROW;
break;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
Restore a change lost in the merge madness, do some SDL_GameController prep
2018-12-10 15:00:15 +00:00
}
else if (menuactive)
{
if (ev->type == ev_joystick && ev->data1 == 0 && joywait < I_GetTime())
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Add options for adjusting deadzone, increase default deadzone from 0.25 to 0.5
2019-05-02 03:30:53 +00:00
const INT32 jdeadzone = ((JOYAXISRANGE-1) * cv_deadzone.value) >> FRACBITS;
make menu respond to joystick axis events without joyscale having to be 0
2018-12-02 21:18:28 +00:00
if (ev->data3 != INT32_MAX)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
add deadzone + storing of previous joyx/y values etc to attempt to make joysticks less sensitive in menus
2018-12-02 21:52:30 +00:00
if (Joystick.bGamepadStyle || abs(ev->data3) > jdeadzone)
make menu respond to joystick axis events without joyscale having to be 0
2018-12-02 21:18:28 +00:00
{
add deadzone + storing of previous joyx/y values etc to attempt to make joysticks less sensitive in menus
2018-12-02 21:52:30 +00:00
if (ev->data3 < 0 && pjoyy >= 0)
{
ch = KEY_UPARROW;
joywait = I_GetTime() + NEWTICRATE/7;
}
else if (ev->data3 > 0 && pjoyy <= 0)
{
ch = KEY_DOWNARROW;
joywait = I_GetTime() + NEWTICRATE/7;
}
pjoyy = ev->data3;
make menu respond to joystick axis events without joyscale having to be 0
2018-12-02 21:18:28 +00:00
}
add deadzone + storing of previous joyx/y values etc to attempt to make joysticks less sensitive in menus
2018-12-02 21:52:30 +00:00
else
pjoyy = 0;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
make menu respond to joystick axis events without joyscale having to be 0
2018-12-02 21:18:28 +00:00
if (ev->data2 != INT32_MAX)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
add deadzone + storing of previous joyx/y values etc to attempt to make joysticks less sensitive in menus
2018-12-02 21:52:30 +00:00
if (Joystick.bGamepadStyle || abs(ev->data2) > jdeadzone)
make menu respond to joystick axis events without joyscale having to be 0
2018-12-02 21:18:28 +00:00
{
add deadzone + storing of previous joyx/y values etc to attempt to make joysticks less sensitive in menus
2018-12-02 21:52:30 +00:00
if (ev->data2 < 0 && pjoyx >= 0)
{
ch = KEY_LEFTARROW;
joywait = I_GetTime() + NEWTICRATE/17;
}
else if (ev->data2 > 0 && pjoyx <= 0)
{
ch = KEY_RIGHTARROW;
joywait = I_GetTime() + NEWTICRATE/17;
}
pjoyx = ev->data2;
make menu respond to joystick axis events without joyscale having to be 0
2018-12-02 21:18:28 +00:00
}
add deadzone + storing of previous joyx/y values etc to attempt to make joysticks less sensitive in menus
2018-12-02 21:52:30 +00:00
else
pjoyx = 0;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
}
else if (ev->type == ev_mouse && mousewait < I_GetTime())
{
pmousey += ev->data3;
if (pmousey < lasty-30)
{
ch = KEY_DOWNARROW;
mousewait = I_GetTime() + NEWTICRATE/7;
pmousey = lasty -= 30;
}
else if (pmousey > lasty + 30)
{
ch = KEY_UPARROW;
mousewait = I_GetTime() + NEWTICRATE/7;
pmousey = lasty += 30;
}
pmousex += ev->data2;
if (pmousex < lastx - 30)
{
ch = KEY_LEFTARROW;
mousewait = I_GetTime() + NEWTICRATE/7;
pmousex = lastx -= 30;
}
else if (pmousex > lastx+30)
{
ch = KEY_RIGHTARROW;
mousewait = I_GetTime() + NEWTICRATE/7;
pmousex = lastx += 30;
}
}
}
if (ch == -1)
return false;
ESC rebind works on both bound keys
2018-09-27 00:51:25 +00:00
else if (ch == gamecontrol[gc_systemmenu][0] || ch == gamecontrol[gc_systemmenu][1]) // allow remappable ESC key
Add support for overriding the ESC key
2017-12-25 07:09:06 +00:00
ch = KEY_ESCAPE;
Stop the keyboard from treating accelerate and break as menu keys
2019-01-15 09:02:52 +00:00
else if ((ch == gamecontrol[gc_accelerate][0] || ch == gamecontrol[gc_accelerate][1]) && ch >= KEY_MOUSE1)
Restore a change lost in the merge madness, do some SDL_GameController prep
2018-12-10 15:00:15 +00:00
ch = KEY_ENTER;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// F-Keys
if (!menuactive)
{
Starting from scratch. SRB2 v2.1.15
2016-07-06 04:09:17 +00:00
noFurtherInput = true;
Add support for overriding the ESC key
2017-12-25 07:09:06 +00:00
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
switch (ch)
{
case KEY_F1: // Help key
* 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
Command_Manual_f();
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return true;
case KEY_F2: // Empty
return true;
case KEY_F3: // Toggle HUD
CV_SetValue(&cv_showhud, !cv_showhud.value);
return true;
case KEY_F4: // Sound Volume
if (modeattacking)
return true;
M_StartControlPanel();
Starting from scratch. SRB2 v2.1.15
2016-07-06 04:09:17 +00:00
M_Options(0);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
currentMenu = &OP_SoundOptionsDef;
itemOn = 0;
return true;
#ifndef DC
case KEY_F5: // Video Mode
if (modeattacking)
return true;
M_StartControlPanel();
Starting from scratch. SRB2 v2.1.15
2016-07-06 04:09:17 +00:00
M_Options(0);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
M_VideoModeMenu(0);
return true;
#endif
case KEY_F6: // Empty
return true;
case KEY_F7: // Options
if (modeattacking)
return true;
M_StartControlPanel();
Starting from scratch. SRB2 v2.1.15
2016-07-06 04:09:17 +00:00
M_Options(0);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
M_SetupNextMenu(&OP_MainDef);
return true;
// Screenshots on F8 now handled elsewhere
// Same with Moviemode on F9
case KEY_F10: // Quit SRB2
M_QuitSRB2(0);
return true;
Fuck the gamma shortcut, replace it with a fullscreen toggle
2021-03-11 20:03:30 +00:00
case KEY_F11: // Fullscreen
CV_AddValue(&cv_fullscreen, 1);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return true;
// Spymode on F12 handled in game logic
case KEY_ESCAPE: // Pop up menu
if (chat_on)
{
HU_clearChatChars();
chat_on = false;
}
else
M_StartControlPanel();
return true;
}
Starting from scratch. SRB2 v2.1.15
2016-07-06 04:09:17 +00:00
noFurtherInput = false; // turns out we didn't care
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return false;
}
Stop the keyboard from treating accelerate and break as menu keys
2019-01-15 09:02:52 +00:00
if ((ch == gamecontrol[gc_brake][0] || ch == gamecontrol[gc_brake][1]) && ch >= KEY_MOUSE1) // do this here, otherwise brake opens the menu mid-game
Restore a change lost in the merge madness, do some SDL_GameController prep
2018-12-10 15:00:15 +00:00
ch = KEY_ESCAPE;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
routine = currentMenu->menuitems[itemOn].itemaction;
// Handle menuitems which need a specific key handling
if (routine && (currentMenu->menuitems[itemOn].status & IT_TYPE) == IT_KEYHANDLER)
{
if (shiftdown && ch >= 32 && ch <= 127)
ch = shiftxform[ch];
routine(ch);
return true;
}
if (currentMenu->menuitems[itemOn].status == IT_MSGHANDLER)
{
if (currentMenu->menuitems[itemOn].alphaKey != MM_EVENTHANDLER)
{
if (ch == ' ' || ch == 'n' || ch == 'y' || ch == KEY_ESCAPE || ch == KEY_ENTER)
{
if (routine)
routine(ch);
M_StopMessage(0);
Starting from scratch. SRB2 v2.1.15
2016-07-06 04:09:17 +00:00
noFurtherInput = true;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return true;
}
return true;
}
else
{
// dirty hack: for customising controls, I want only buttons/keys, not moves
if (ev->type == ev_mouse || ev->type == ev_mouse2 || ev->type == ev_joystick
A lot lol The importants: - Fixed compiling - Combined G_BuildTiccmd for all players, no more need for a function for each - You can actually start 3p/4p mode
2017-12-17 03:32:43 +00:00
|| ev->type == ev_joystick2 || ev->type == ev_joystick3 || ev->type == ev_joystick4)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return true;
if (routine)
{
void (*otherroutine)(event_t *sev) = currentMenu->menuitems[itemOn].itemaction;
otherroutine(ev); //Alam: what a hack
}
return true;
}
}
// BP: one of the more big hack i have never made
if (routine && (currentMenu->menuitems[itemOn].status & IT_TYPE) == IT_CVAR)
{
remove join passwords
2019-08-04 09:26:26 +00:00
if ((currentMenu->menuitems[itemOn].status & IT_CVARTYPE) == IT_CV_STRING)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Toggle showing password with tab
2019-03-09 21:14:08 +00:00
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (shiftdown && ch >= 32 && ch <= 127)
ch = shiftxform[ch];
if (M_ChangeStringCvar(ch))
return true;
else
routine = NULL;
}
else
routine = M_ChangeCvar;
}
Add back viewpoint names & fix console inputs in replays
2020-04-30 13:50:30 +00:00
if (currentMenu == &PlaybackMenuDef && !con_destlines)
Begin work on playback menu
2019-04-05 07:38:48 +00:00
{
Replay playback changes: - Store level state periodically - Load the closest usable level state when done rewinding for quicker resumes - Make playback menu fade out after 5 seconds of no activity (but not while paused) - Remove wrapping from replay hut (original wrapping was broken at some point before 1.1 and it's not necessary anyway) - Allow holding enter on frame advance for noisy slow-mo from fickleheart
2019-10-28 16:14:51 +00:00
playback_last_menu_interaction_leveltime = leveltime;
Begin work on playback menu
2019-04-05 07:38:48 +00:00
// Flip left/right with up/down for the playback menu, since it's a horizontal icon row.
switch (ch)
{
HORRID HACK around holding enter in the playback menu having awful, crash-causing side-effects
2019-05-02 16:00:51 +00:00
case KEY_LEFTARROW: ch = KEY_UPARROW; break;
case KEY_UPARROW: ch = KEY_RIGHTARROW; break;
case KEY_RIGHTARROW: ch = KEY_DOWNARROW; break;
case KEY_DOWNARROW: ch = KEY_LEFTARROW; break;
replay freecam + enhancements
2019-09-05 21:24:23 +00:00
// arbitrary keyboard shortcuts because fuck you
case '\'': // toggle freecam
M_PlaybackToggleFreecam(0);
break;
case ']': // ffw / advance frame (depends on if paused or not)
if (paused)
M_PlaybackAdvance(0);
else
M_PlaybackFastForward(0);
break;
case '[': // rewind /backupframe, uses the same function
M_PlaybackRewind(0);
break;
case '\\': // pause
M_PlaybackPause(0);
break;
// viewpoints, an annoyance (tm)
case '-': // viewpoint minus
M_PlaybackSetViews(-1); // yeah lol.
break;
case '=': // viewpoint plus
M_PlaybackSetViews(1); // yeah lol.
break;
// switch viewpoints:
case '1': // viewpoint for p1 (also f12)
// maximum laziness:
if (!demo.freecam)
G_AdjustView(1, 1, true);
break;
case '2': // viewpoint for p2
if (!demo.freecam)
G_AdjustView(2, 1, true);
break;
case '3': // viewpoint for p3
if (!demo.freecam)
G_AdjustView(3, 1, true);
break;
case '4': // viewpoint for p4
if (!demo.freecam)
G_AdjustView(4, 1, true);
break;
HORRID HACK around holding enter in the playback menu having awful, crash-causing side-effects
2019-05-02 16:00:51 +00:00
default: break;
Begin work on playback menu
2019-04-05 07:38:48 +00:00
}
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Keys usable within menu
switch (ch)
{
case KEY_DOWNARROW:
M_NextOpt();
S_StartSound(NULL, sfx_menu1);
Stupidbad-big commit, but PLEASE don't ask me to re-do this on another branch, I swear to god. I know it makes things more difficult on you, and I'm sorry for that, but I'm definitely feeling the goddamn crunch right now and I wanna take a step back from this spaghetti nightmare and clear my head. * Do that thing where the character icons are ALWAYS 1x sized, through having two seperate lumps. * Revamp the S_SKIN parameters to be `facerank` (rankings - equivalent of half-scale old face), `facewant` (WANTED - equivalent of old face), and `facemmap` (equivalent of old iconprefix). * Do that thing Oni wanted where it shows two postions above and two positions below your current ranking (and you) to the left of the screen, instead of always the top 4, with some limits to avoid drawing outside of everything. * Replace the last few shitty Mario numbers (for the left rankings) with cool, new Oni numbers. * Change a bunch of offsets and things so the tab rankings and the intermission work nicer with 9+ players.
2018-10-28 16:27:55 +00:00
/*if (currentMenu == &SP_PlayerDef)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Z_Free(char_notes);
char_notes = NULL;
Stupidbad-big commit, but PLEASE don't ask me to re-do this on another branch, I swear to god. I know it makes things more difficult on you, and I'm sorry for that, but I'm definitely feeling the goddamn crunch right now and I wanna take a step back from this spaghetti nightmare and clear my head. * Do that thing where the character icons are ALWAYS 1x sized, through having two seperate lumps. * Revamp the S_SKIN parameters to be `facerank` (rankings - equivalent of half-scale old face), `facewant` (WANTED - equivalent of old face), and `facemmap` (equivalent of old iconprefix). * Do that thing Oni wanted where it shows two postions above and two positions below your current ranking (and you) to the left of the screen, instead of always the top 4, with some limits to avoid drawing outside of everything. * Replace the last few shitty Mario numbers (for the left rankings) with cool, new Oni numbers. * Change a bunch of offsets and things so the tab rankings and the intermission work nicer with 9+ players.
2018-10-28 16:27:55 +00:00
}*/
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return true;
case KEY_UPARROW:
M_PrevOpt();
S_StartSound(NULL, sfx_menu1);
Stupidbad-big commit, but PLEASE don't ask me to re-do this on another branch, I swear to god. I know it makes things more difficult on you, and I'm sorry for that, but I'm definitely feeling the goddamn crunch right now and I wanna take a step back from this spaghetti nightmare and clear my head. * Do that thing where the character icons are ALWAYS 1x sized, through having two seperate lumps. * Revamp the S_SKIN parameters to be `facerank` (rankings - equivalent of half-scale old face), `facewant` (WANTED - equivalent of old face), and `facemmap` (equivalent of old iconprefix). * Do that thing Oni wanted where it shows two postions above and two positions below your current ranking (and you) to the left of the screen, instead of always the top 4, with some limits to avoid drawing outside of everything. * Replace the last few shitty Mario numbers (for the left rankings) with cool, new Oni numbers. * Change a bunch of offsets and things so the tab rankings and the intermission work nicer with 9+ players.
2018-10-28 16:27:55 +00:00
/*if (currentMenu == &SP_PlayerDef)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Z_Free(char_notes);
char_notes = NULL;
Stupidbad-big commit, but PLEASE don't ask me to re-do this on another branch, I swear to god. I know it makes things more difficult on you, and I'm sorry for that, but I'm definitely feeling the goddamn crunch right now and I wanna take a step back from this spaghetti nightmare and clear my head. * Do that thing where the character icons are ALWAYS 1x sized, through having two seperate lumps. * Revamp the S_SKIN parameters to be `facerank` (rankings - equivalent of half-scale old face), `facewant` (WANTED - equivalent of old face), and `facemmap` (equivalent of old iconprefix). * Do that thing Oni wanted where it shows two postions above and two positions below your current ranking (and you) to the left of the screen, instead of always the top 4, with some limits to avoid drawing outside of everything. * Replace the last few shitty Mario numbers (for the left rankings) with cool, new Oni numbers. * Change a bunch of offsets and things so the tab rankings and the intermission work nicer with 9+ players.
2018-10-28 16:27:55 +00:00
}*/
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return true;
case KEY_LEFTARROW:
if (routine && ((currentMenu->menuitems[itemOn].status & IT_TYPE) == IT_ARROWS
|| (currentMenu->menuitems[itemOn].status & IT_TYPE) == IT_CVAR))
{
Some minor things to help draw sonicitems to a close. * "kartvoices" cvar. Possible values "Never", "Tasteful" (default), and "Meme". * Added a way to move quickly through the credits, rather than skip them entirely (hold spacebar or down arrow). * Fix a few mistakes in M_ChangeCvar, some of which I introduced and some of which were weird in the first place. * Tweak the offset of the arrows that let you know you can modify a cvar by pressing left or right (some via a patch.kart change, but others via tweaking the drawing location).
2018-07-29 17:35:56 +00:00
if (currentMenu != &OP_SoundOptionsDef || itemOn > 3)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
S_StartSound(NULL, sfx_menu1);
routine(0);
}
return true;
case KEY_RIGHTARROW:
if (routine && ((currentMenu->menuitems[itemOn].status & IT_TYPE) == IT_ARROWS
|| (currentMenu->menuitems[itemOn].status & IT_TYPE) == IT_CVAR))
{
Some minor things to help draw sonicitems to a close. * "kartvoices" cvar. Possible values "Never", "Tasteful" (default), and "Meme". * Added a way to move quickly through the credits, rather than skip them entirely (hold spacebar or down arrow). * Fix a few mistakes in M_ChangeCvar, some of which I introduced and some of which were weird in the first place. * Tweak the offset of the arrows that let you know you can modify a cvar by pressing left or right (some via a patch.kart change, but others via tweaking the drawing location).
2018-07-29 17:35:56 +00:00
if (currentMenu != &OP_SoundOptionsDef || itemOn > 3)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
S_StartSound(NULL, sfx_menu1);
routine(1);
}
return true;
case KEY_ENTER:
Starting from scratch. SRB2 v2.1.15
2016-07-06 04:09:17 +00:00
noFurtherInput = true;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
currentMenu->lastOn = itemOn;
HORRID HACK around holding enter in the playback menu having awful, crash-causing side-effects
2019-05-02 16:00:51 +00:00
if (currentMenu == &PlaybackMenuDef)
{
boolean held = (boolean)playback_enterheld;
if (held)
return true;
Replay playback changes: - Store level state periodically - Load the closest usable level state when done rewinding for quicker resumes - Make playback menu fade out after 5 seconds of no activity (but not while paused) - Remove wrapping from replay hut (original wrapping was broken at some point before 1.1 and it's not necessary anyway) - Allow holding enter on frame advance for noisy slow-mo from fickleheart
2019-10-28 16:14:51 +00:00
playback_enterheld = 3;
HORRID HACK around holding enter in the playback menu having awful, crash-causing side-effects
2019-05-02 16:00:51 +00:00
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (routine)
{
if (((currentMenu->menuitems[itemOn].status & IT_TYPE)==IT_CALL
|| (currentMenu->menuitems[itemOn].status & IT_TYPE)==IT_SUBMENU)
&& (currentMenu->menuitems[itemOn].status & IT_CALLTYPE))
{
Code cleanup as requested by Sal and Sryder. * majormods and savemoddata cannot coexist as true values, so going through and making situations that involve both only reference one. * Clean up comments in `dehacked.c`.
2019-01-26 16:58:45 +00:00
if (((currentMenu->menuitems[itemOn].status & IT_CALLTYPE) & IT_CALL_NOTMODIFIED) && majormods)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
S_StartSound(NULL, sfx_menu1);
Use "addons" instead of "add-ons" for consistency
2020-04-22 07:24:59 +00:00
M_StartMessage(M_GetText("This cannot be done with complex addons\nor in a cheated game.\n\n(Press a key)\n"), NULL, MM_NOTHING);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return true;
}
}
S_StartSound(NULL, sfx_menu1);
switch (currentMenu->menuitems[itemOn].status & IT_TYPE)
{
case IT_CVAR:
case IT_ARROWS:
routine(1); // right arrow
break;
case IT_CALL:
routine(itemOn);
break;
case IT_SUBMENU:
currentMenu->lastOn = itemOn;
M_SetupNextMenu((menu_t *)currentMenu->menuitems[itemOn].itemaction);
break;
}
}
return true;
case KEY_ESCAPE:
Restore a change lost in the merge madness, do some SDL_GameController prep
2018-12-10 15:00:15 +00:00
//case KEY_JOY1 + 2:
Starting from scratch. SRB2 v2.1.15
2016-07-06 04:09:17 +00:00
noFurtherInput = true;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
currentMenu->lastOn = itemOn;
if (currentMenu->prevMenu)
{
//If we entered the game search menu, but didn't enter a game,
//make sure the game doesn't still think we're in a netgame.
if (!Playing() && netgame && multiplayer)
{
netgame = false;
multiplayer = false;
}
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
if (currentMenu == &SP_TimeAttackDef) //|| currentMenu == &SP_NightsAttackDef
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
// D_StartTitle does its own wipe, since GS_TIMEATTACK is now a complete gamestate.
menuactive = false;
D_StartTitle();
}
else
M_SetupNextMenu(currentMenu->prevMenu);
}
else
M_ClearMenus(true);
return true;
case KEY_BACKSPACE:
if ((currentMenu->menuitems[itemOn].status) == IT_CONTROL)
{
// detach any keys associated with the game control
G_ClearControlKeys(setupcontrols, currentMenu->menuitems[itemOn].alphaKey);
Correct that thing Lat` found where sometimes the controls menus'd get "stuck" replacing the second key every time, effectively only allowing one key until you clear it and try again. Also, sounds.
2018-09-29 15:18:16 +00:00
S_StartSound(NULL, sfx_shldls);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return true;
}
* Add a way to revert all non-awkward cvars back to their default settings, with special casing for prefcolor as a default for playercolor on the record attack menu. * Make MT_GHOST's dispoffset -1, so that at the starting line in record attack your player is always visible even when you have multiple ghosts in play.
2018-07-06 19:40:42 +00:00
if (routine && ((currentMenu->menuitems[itemOn].status & IT_TYPE) == IT_ARROWS
|| (currentMenu->menuitems[itemOn].status & IT_TYPE) == IT_CVAR))
{
Improve the defaulting thing to not play the sound if the cvar isn't to be touched.
2018-07-06 19:55:22 +00:00
consvar_t *cv = (consvar_t *)currentMenu->menuitems[itemOn].itemaction;
if (cv == &cv_chooseskin
|| cv == &cv_dummystaff
|| cv == &cv_nextmap
|| cv == &cv_newgametype)
return true;
Some minor things to help draw sonicitems to a close. * "kartvoices" cvar. Possible values "Never", "Tasteful" (default), and "Meme". * Added a way to move quickly through the credits, rather than skip them entirely (hold spacebar or down arrow). * Fix a few mistakes in M_ChangeCvar, some of which I introduced and some of which were weird in the first place. * Tweak the offset of the arrows that let you know you can modify a cvar by pressing left or right (some via a patch.kart change, but others via tweaking the drawing location).
2018-07-29 17:35:56 +00:00
if (currentMenu != &OP_SoundOptionsDef || itemOn > 3)
* Add a way to revert all non-awkward cvars back to their default settings, with special casing for prefcolor as a default for playercolor on the record attack menu. * Make MT_GHOST's dispoffset -1, so that at the starting line in record attack your player is always visible even when you have multiple ghosts in play.
2018-07-06 19:40:42 +00:00
S_StartSound(NULL, sfx_menu1);
routine(-1);
return true;
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Why _does_ backspace go back anyway?
Revert this now that we have ESC functionality (I mean. I still think this feels nicer than pressing the menu button, but...)
2018-09-16 00:13:29 +00:00
//currentMenu->lastOn = itemOn;
//if (currentMenu->prevMenu)
// M_SetupNextMenu(currentMenu->prevMenu);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return false;
default:
break;
}
return true;
}
replay freecam + enhancements
2019-09-05 21:24:23 +00:00
// special responder for demos
boolean M_DemoResponder(event_t *ev)
{
INT32 ch = -1; // cur event data
boolean eatinput = false; // :omnom:
//should be accounted for beforehand but just to be safe...
if (!demo.playback || demo.title)
return false;
if (noFurtherInput)
{
// Ignore input after enter/escape/other buttons
// (but still allow shift keyup so caps doesn't get stuck)
return false;
}
Add back viewpoint names & fix console inputs in replays
2020-04-30 13:50:30 +00:00
else if (ev->type == ev_keydown && !con_destlines) // not while the console is on please
replay freecam + enhancements
2019-09-05 21:24:23 +00:00
{
ch = ev->data1;
// since this is ONLY for demos, there isn't MUCH for us to do.
// mirrored from m_responder
switch (ch)
{
// arbitrary keyboard shortcuts because fuck you
case '\'': // toggle freecam
M_PlaybackToggleFreecam(0);
eatinput = true;
break;
case ']': // ffw / advance frame (depends on if paused or not)
if (paused)
M_PlaybackAdvance(0);
else
M_PlaybackFastForward(0);
eatinput = true;
break;
case '[': // rewind /backupframe, uses the same function
M_PlaybackRewind(0);
break;
case '\\': // pause
M_PlaybackPause(0);
eatinput = true;
break;
// viewpoints, an annoyance (tm)
case '-': // viewpoint minus
M_PlaybackSetViews(-1); // yeah lol.
eatinput = true;
break;
case '=': // viewpoint plus
M_PlaybackSetViews(1); // yeah lol.
eatinput = true;
break;
// switch viewpoints:
case '1': // viewpoint for p1 (also f12)
// maximum laziness:
if (!demo.freecam)
G_AdjustView(1, 1, true);
break;
case '2': // viewpoint for p2
if (!demo.freecam)
G_AdjustView(2, 1, true);
break;
case '3': // viewpoint for p3
if (!demo.freecam)
G_AdjustView(3, 1, true);
break;
case '4': // viewpoint for p4
if (!demo.freecam)
G_AdjustView(4, 1, true);
break;
default: break;
}
}
return eatinput;
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
//
// M_Drawer
// Called after the view has been rendered,
// but before it has been blitted.
//
void M_Drawer(void)
{
if (currentMenu == &MessageDef)
menuactive = true;
Starting from scratch. SRB2 v2.1.15
2016-07-06 04:09:17 +00:00
if (menuactive)
{
// now that's more readable with a faded background (yeah like Quake...)
Begin work on playback menu
2019-04-05 07:38:48 +00:00
if (!WipeInAction && currentMenu != &PlaybackMenuDef) // Replay playback has its own background
Fade-in intro Also made flashing not-local, again.
2018-06-26 14:14:59 +00:00
V_DrawFadeScreen(0xFF00, 16);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Starting from scratch. SRB2 v2.1.15
2016-07-06 04:09:17 +00:00
if (currentMenu->drawroutine)
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
{
M_GetGametypeColor();
Starting from scratch. SRB2 v2.1.15
2016-07-06 04:09:17 +00:00
currentMenu->drawroutine(); // call current menu Draw routine
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Starting from scratch. SRB2 v2.1.15
2016-07-06 04:09:17 +00:00
// Draw version down in corner
// ... but only in the MAIN MENU. I'm a picky bastard.
if (currentMenu == &MainDef)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Starting from scratch. SRB2 v2.1.15
2016-07-06 04:09:17 +00:00
if (customversionstring[0] != '\0')
{
Minor adjustments for a taller thin font
2018-01-29 01:37:53 +00:00
V_DrawThinString(vid.dupx, vid.height - 20*vid.dupy, V_NOSCALESTART|V_TRANSLUCENT, "Mod version:");
V_DrawThinString(vid.dupx, vid.height - 10*vid.dupy, V_NOSCALESTART|V_TRANSLUCENT|V_ALLOWLOWERCASE, customversionstring);
Starting from scratch. SRB2 v2.1.15
2016-07-06 04:09:17 +00:00
}
else
{
#ifdef DEVELOP // Development -- show revision / branch info
Keep the old y offsets, though.
2018-11-03 07:38:41 +00:00
V_DrawThinString(vid.dupx, vid.height - 20*vid.dupy, V_NOSCALESTART|V_TRANSLUCENT|V_ALLOWLOWERCASE, compbranch);
V_DrawThinString(vid.dupx, vid.height - 10*vid.dupy, V_NOSCALESTART|V_TRANSLUCENT|V_ALLOWLOWERCASE, comprevision);
Starting from scratch. SRB2 v2.1.15
2016-07-06 04:09:17 +00:00
#else // Regular build
Minor adjustments for a taller thin font
2018-01-29 01:37:53 +00:00
V_DrawThinString(vid.dupx, vid.height - 10*vid.dupy, V_NOSCALESTART|V_TRANSLUCENT|V_ALLOWLOWERCASE, va("%s", VERSIONSTRING));
Starting from scratch. SRB2 v2.1.15
2016-07-06 04:09:17 +00:00
#endif
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
Starting from scratch. SRB2 v2.1.15
2016-07-06 04:09:17 +00:00
}
// focus lost notification goes on top of everything, even the former everything
Make "Focus lost" HUD overlay optional
2019-03-11 19:50:01 +00:00
if (window_notinfocus && cv_showfocuslost.value)
Starting from scratch. SRB2 v2.1.15
2016-07-06 04:09:17 +00:00
{
M_DrawTextBox((BASEVIDWIDTH/2) - (60), (BASEVIDHEIGHT/2) - (16), 13, 2);
if (gamestate == GS_LEVEL && (P_AutoPause() || paused))
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
V_DrawCenteredString(BASEVIDWIDTH/2, (BASEVIDHEIGHT/2) - (4), highlightflags, "Game Paused");
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
else
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
V_DrawCenteredString(BASEVIDWIDTH/2, (BASEVIDHEIGHT/2) - (4), highlightflags, "Focus Lost");
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
}
//
// M_StartControlPanel
//
void M_StartControlPanel(void)
{
// intro might call this repeatedly
if (menuactive)
{
CON_ToggleOff(); // move away console
return;
}
menuactive = true;
Begin work on playback menu
2019-04-05 07:38:48 +00:00
if (demo.playback)
{
currentMenu = &PlaybackMenuDef;
Replay playback changes: - Store level state periodically - Load the closest usable level state when done rewinding for quicker resumes - Make playback menu fade out after 5 seconds of no activity (but not while paused) - Remove wrapping from replay hut (original wrapping was broken at some point before 1.1 and it's not necessary anyway) - Allow holding enter on frame advance for noisy slow-mo from fickleheart
2019-10-28 16:14:51 +00:00
playback_last_menu_interaction_leveltime = leveltime;
Begin work on playback menu
2019-04-05 07:38:48 +00:00
}
else if (!Playing())
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
// Secret menu!
Some unlockable stuff - Secrets renamed to Extras - Extras leads to the checklist instead of another menu - Credits & Sound Test are on the Options menu now - New title screen cheat for unlocking everything ("banana", or "← ↑ → → ↑ ← ↓ → Enter")
2018-03-02 00:00:16 +00:00
//MainMenu[secrets].status = (M_AnySecretUnlocked()) ? (IT_STRING | IT_CALL) : (IT_DISABLED);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
currentMenu = &MainDef;
itemOn = singleplr;
}
else if (modeattacking)
{
currentMenu = &MAPauseDef;
itemOn = mapause_continue;
}
else if (!(netgame || multiplayer)) // Single Player
{
Some token efforts to make singleplayer mode (accessible only via `-warp` and `map mapxx -force`) not COMPLETELY broken. * Fixed the conditionals for `suicide` and `retry` commands - `suicide` is now allowed in singleplayer, and `retry` no longer checks your lives (for now). * Disable the "traditional" level reload method (which `retry` tried to use), since it was completely broken with the other changes we've made. Mapchanges only. * Made retries cause a mapchange, per the above. * Disable the last source of skincolor trampling in the game - loading a level while not netgame or record attacking.
2018-10-17 12:40:17 +00:00
if (gamestate != GS_LEVEL /*|| ultimatemode*/) // intermission, so gray out stuff.
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
SPauseMenu[spause_pandora].status = (M_SecretUnlocked(SECRET_PANDORA)) ? (IT_GRAYEDOUT) : (IT_DISABLED);
SPauseMenu[spause_retry].status = IT_GRAYEDOUT;
}
else
{
Some token efforts to make singleplayer mode (accessible only via `-warp` and `map mapxx -force`) not COMPLETELY broken. * Fixed the conditionals for `suicide` and `retry` commands - `suicide` is now allowed in singleplayer, and `retry` no longer checks your lives (for now). * Disable the "traditional" level reload method (which `retry` tried to use), since it was completely broken with the other changes we've made. Mapchanges only. * Made retries cause a mapchange, per the above. * Disable the last source of skincolor trampling in the game - loading a level while not netgame or record attacking.
2018-10-17 12:40:17 +00:00
//INT32 numlives = 2;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
SPauseMenu[spause_pandora].status = (M_SecretUnlocked(SECRET_PANDORA)) ? (IT_STRING | IT_CALL) : (IT_DISABLED);
Some token efforts to make singleplayer mode (accessible only via `-warp` and `map mapxx -force`) not COMPLETELY broken. * Fixed the conditionals for `suicide` and `retry` commands - `suicide` is now allowed in singleplayer, and `retry` no longer checks your lives (for now). * Disable the "traditional" level reload method (which `retry` tried to use), since it was completely broken with the other changes we've made. Mapchanges only. * Made retries cause a mapchange, per the above. * Disable the last source of skincolor trampling in the game - loading a level while not netgame or record attacking.
2018-10-17 12:40:17 +00:00
/*if (&players[consoleplayer])
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
numlives = players[consoleplayer].lives;
if (players[consoleplayer].playerstate != PST_LIVE)
++numlives;
}
// The list of things that can disable retrying is (was?) a little too complex
// for me to want to use the short if statement syntax
if (numlives <= 1 || G_IsSpecialStage(gamemap))
SPauseMenu[spause_retry].status = (IT_GRAYEDOUT);
Some token efforts to make singleplayer mode (accessible only via `-warp` and `map mapxx -force`) not COMPLETELY broken. * Fixed the conditionals for `suicide` and `retry` commands - `suicide` is now allowed in singleplayer, and `retry` no longer checks your lives (for now). * Disable the "traditional" level reload method (which `retry` tried to use), since it was completely broken with the other changes we've made. Mapchanges only. * Made retries cause a mapchange, per the above. * Disable the last source of skincolor trampling in the game - loading a level while not netgame or record attacking.
2018-10-17 12:40:17 +00:00
else*/
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
SPauseMenu[spause_retry].status = (IT_STRING | IT_CALL);
}
// We can always use level select though. :33
Stupidbad-big commit, but PLEASE don't ask me to re-do this on another branch, I swear to god. I know it makes things more difficult on you, and I'm sorry for that, but I'm definitely feeling the goddamn crunch right now and I wanna take a step back from this spaghetti nightmare and clear my head. * Do that thing where the character icons are ALWAYS 1x sized, through having two seperate lumps. * Revamp the S_SKIN parameters to be `facerank` (rankings - equivalent of half-scale old face), `facewant` (WANTED - equivalent of old face), and `facemmap` (equivalent of old iconprefix). * Do that thing Oni wanted where it shows two postions above and two positions below your current ranking (and you) to the left of the screen, instead of always the top 4, with some limits to avoid drawing outside of everything. * Replace the last few shitty Mario numbers (for the left rankings) with cool, new Oni numbers. * Change a bunch of offsets and things so the tab rankings and the intermission work nicer with 9+ players.
2018-10-28 16:27:55 +00:00
//SPauseMenu[spause_levelselect].status = (gamecomplete) ? (IT_STRING | IT_CALL) : (IT_DISABLED);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// And emblem hints.
SPauseMenu[spause_hints].status = (M_SecretUnlocked(SECRET_EMBLEMHINTS)) ? (IT_STRING | IT_CALL) : (IT_DISABLED);
// Shift up Pandora's Box if both pandora and levelselect are active
/*if (SPauseMenu[spause_pandora].status != (IT_DISABLED)
&& SPauseMenu[spause_levelselect].status != (IT_DISABLED))
SPauseMenu[spause_pandora].alphaKey = 24;
else
SPauseMenu[spause_pandora].alphaKey = 32;*/
currentMenu = &SPauseDef;
itemOn = spause_continue;
}
else // multiplayer
{
MPauseMenu[mpause_switchmap].status = IT_DISABLED;
Addons menu. Bitch.
2018-08-28 20:08:47 +00:00
MPauseMenu[mpause_addons].status = IT_DISABLED;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
MPauseMenu[mpause_scramble].status = IT_DISABLED;
MPauseMenu[mpause_psetupsplit].status = IT_DISABLED;
MPauseMenu[mpause_psetupsplit2].status = IT_DISABLED;
Fix 3P and 4P configuration screens They don't crash anymore!
2017-12-18 10:56:38 +00:00
MPauseMenu[mpause_psetupsplit3].status = IT_DISABLED;
MPauseMenu[mpause_psetupsplit4].status = IT_DISABLED;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
MPauseMenu[mpause_spectate].status = IT_DISABLED;
MPauseMenu[mpause_entergame].status = IT_DISABLED;
* Make cancelling a join work on the pause menu and console. (You need to write "changeteam spectator" to cancel a PF_WANTSTOJOIN.) * Stop respawning spectators when their PF_WANTSTOJOIN request hasn't been processed yet. * Handle PF_WANTSTOJOIN requests in GS_WAITINGPLAYERS. * Refactor K_CheckSpectateStatus, and make it so PF_WANTSTOJOIN requests are processed if there's only one player in the server, even if they're on lap 2 or up. * Make the player entry mechanism in P_SpawnPlayer use the PF_WANTSTOJOIN mechanism so that it can also take advantage of the level refresh mechanism with no extra code. * NOTE: This does a bad hack in order to not send multiple mapchanges while the joining timer is low! If you can think of a better way to do this, please let me know/commit it. * Change the timer until you can hit ITEM again when a spectator who has to wait to join shorter. * (controversial, but I think necessary) - flash the ITEM text when the above-mentioned timer is nonzero.
2018-07-21 15:45:08 +00:00
MPauseMenu[mpause_canceljoin].status = IT_DISABLED;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
MPauseMenu[mpause_switchteam].status = IT_DISABLED;
Spectate/Enter menu for online splitscreen Just like the menu option
2018-10-16 00:28:35 +00:00
MPauseMenu[mpause_switchspectate].status = IT_DISABLED;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
MPauseMenu[mpause_psetup].status = IT_DISABLED;
Spectate/Enter menu for online splitscreen Just like the menu option
2018-10-16 00:28:35 +00:00
MISC_ChangeTeamMenu[0].status = IT_DISABLED;
MISC_ChangeSpectateMenu[0].status = IT_DISABLED;
Ask to join is a menu option, rather than trying to replace your menu temporarily.
2020-08-22 11:16:52 +00:00
Fix 3P and 4P configuration screens They don't crash anymore!
2017-12-18 10:56:38 +00:00
// Reset these in case splitscreen messes things up
Ask to join is a menu option, rather than trying to replace your menu temporarily.
2020-08-22 11:16:52 +00:00
MPauseMenu[mpause_addons].alphaKey = 8;
MPauseMenu[mpause_scramble].alphaKey = 8;
MPauseMenu[mpause_switchmap].alphaKey = 24;
Spectate/Enter menu for online splitscreen Just like the menu option
2018-10-16 00:28:35 +00:00
MPauseMenu[mpause_switchteam].alphaKey = 48;
MPauseMenu[mpause_switchspectate].alphaKey = 48;
Fix 3P and 4P configuration screens They don't crash anymore!
2017-12-18 10:56:38 +00:00
MPauseMenu[mpause_options].alphaKey = 64;
MPauseMenu[mpause_title].alphaKey = 80;
MPauseMenu[mpause_quit].alphaKey = 88;
Ask to join is a menu option, rather than trying to replace your menu temporarily.
2020-08-22 11:16:52 +00:00
Spectate/Enter menu for online splitscreen Just like the menu option
2018-10-16 00:28:35 +00:00
Dummymenuplayer_OnChange();
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Multiple admins
2017-11-11 05:34:37 +00:00
if ((server || IsPlayerAdmin(consoleplayer)))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
MPauseMenu[mpause_switchmap].status = IT_STRING | IT_CALL;
Addons menu. Bitch.
2018-08-28 20:08:47 +00:00
MPauseMenu[mpause_addons].status = IT_STRING | IT_CALL;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (G_GametypeHasTeams())
MPauseMenu[mpause_scramble].status = IT_STRING | IT_SUBMENU;
}
if (splitscreen)
Fix 3P and 4P configuration screens They don't crash anymore!
2017-12-18 10:56:38 +00:00
{
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
MPauseMenu[mpause_psetupsplit].status = MPauseMenu[mpause_psetupsplit2].status = IT_STRING | IT_CALL;
Spectate/Enter menu for online splitscreen Just like the menu option
2018-10-16 00:28:35 +00:00
MISC_ChangeTeamMenu[0].status = MISC_ChangeSpectateMenu[0].status = IT_STRING|IT_CVAR;
if (netgame)
{
if (G_GametypeHasTeams())
{
MPauseMenu[mpause_switchteam].status = IT_STRING | IT_SUBMENU;
MPauseMenu[mpause_switchteam].alphaKey += ((splitscreen+1) * 8);
MPauseMenu[mpause_options].alphaKey += 8;
MPauseMenu[mpause_title].alphaKey += 8;
MPauseMenu[mpause_quit].alphaKey += 8;
}
else if (G_GametypeHasSpectators())
{
MPauseMenu[mpause_switchspectate].status = IT_STRING | IT_SUBMENU;
MPauseMenu[mpause_switchspectate].alphaKey += ((splitscreen+1) * 8);
MPauseMenu[mpause_options].alphaKey += 8;
MPauseMenu[mpause_title].alphaKey += 8;
MPauseMenu[mpause_quit].alphaKey += 8;
}
}
Fix 3P and 4P configuration screens They don't crash anymore!
2017-12-18 10:56:38 +00:00
Merge remote-tracking branch 'origin/quads' into quads # Conflicts: # src/k_kart.c
2017-12-19 02:11:59 +00:00
if (splitscreen > 1)
Fix 3P and 4P configuration screens They don't crash anymore!
2017-12-18 10:56:38 +00:00
{
MPauseMenu[mpause_psetupsplit3].status = IT_STRING | IT_CALL;
Spectate/Enter menu for online splitscreen Just like the menu option
2018-10-16 00:28:35 +00:00
MPauseMenu[mpause_options].alphaKey += 8;
MPauseMenu[mpause_title].alphaKey += 8;
MPauseMenu[mpause_quit].alphaKey += 8;
Fix 3P and 4P configuration screens They don't crash anymore!
2017-12-18 10:56:38 +00:00
Spectate/Enter menu for online splitscreen Just like the menu option
2018-10-16 00:28:35 +00:00
if (splitscreen > 2)
Fix 3P and 4P configuration screens They don't crash anymore!
2017-12-18 10:56:38 +00:00
{
MPauseMenu[mpause_psetupsplit4].status = IT_STRING | IT_CALL;
Spectate/Enter menu for online splitscreen Just like the menu option
2018-10-16 00:28:35 +00:00
MPauseMenu[mpause_options].alphaKey += 8;
MPauseMenu[mpause_title].alphaKey += 8;
MPauseMenu[mpause_quit].alphaKey += 8;
Fix 3P and 4P configuration screens They don't crash anymore!
2017-12-18 10:56:38 +00:00
}
}
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
else
{
MPauseMenu[mpause_psetup].status = IT_STRING | IT_CALL;
if (G_GametypeHasTeams())
MPauseMenu[mpause_switchteam].status = IT_STRING | IT_SUBMENU;
else if (G_GametypeHasSpectators())
* Make cancelling a join work on the pause menu and console. (You need to write "changeteam spectator" to cancel a PF_WANTSTOJOIN.) * Stop respawning spectators when their PF_WANTSTOJOIN request hasn't been processed yet. * Handle PF_WANTSTOJOIN requests in GS_WAITINGPLAYERS. * Refactor K_CheckSpectateStatus, and make it so PF_WANTSTOJOIN requests are processed if there's only one player in the server, even if they're on lap 2 or up. * Make the player entry mechanism in P_SpawnPlayer use the PF_WANTSTOJOIN mechanism so that it can also take advantage of the level refresh mechanism with no extra code. * NOTE: This does a bad hack in order to not send multiple mapchanges while the joining timer is low! If you can think of a better way to do this, please let me know/commit it. * Change the timer until you can hit ITEM again when a spectator who has to wait to join shorter. * (controversial, but I think necessary) - flash the ITEM text when the above-mentioned timer is nonzero.
2018-07-21 15:45:08 +00:00
{
if (!players[consoleplayer].spectator)
MPauseMenu[mpause_spectate].status = IT_STRING | IT_CALL;
else if (players[consoleplayer].pflags & PF_WANTSTOJOIN)
MPauseMenu[mpause_canceljoin].status = IT_STRING | IT_CALL;
else
MPauseMenu[mpause_entergame].status = IT_STRING | IT_CALL;
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
else // in this odd case, we still want something to be on the menu even if it's useless
MPauseMenu[mpause_spectate].status = IT_GRAYEDOUT;
}
Ask to join is a menu option, rather than trying to replace your menu temporarily.
2020-08-22 11:16:52 +00:00
#ifdef HAVE_DISCORDRPC
{
UINT8 i;
for (i = 0; i < mpause_discordrequests; i++)
MPauseMenu[i].alphaKey -= 8;
MPauseMenu[mpause_discordrequests].alphaKey = MPauseMenu[i].alphaKey;
Make join requests options on pause menu selectable even if you're already in the menu
2020-08-23 00:16:49 +00:00
M_RefreshPauseMenu();
Ask to join is a menu option, rather than trying to replace your menu temporarily.
2020-08-22 11:16:52 +00:00
}
#endif
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
currentMenu = &MPauseDef;
itemOn = mpause_continue;
}
CON_ToggleOff(); // move away console
}
void M_EndModeAttackRun(void)
{
M_ModeAttackEndGame(0);
}
//
// M_ClearMenus
//
void M_ClearMenus(boolean callexitmenufunc)
{
if (!menuactive)
return;
if (currentMenu->quitroutine && callexitmenufunc && !currentMenu->quitroutine())
return; // we can't quit this menu (also used to set parameter from the menu)
#ifndef DC // Save the config file. I'm sick of crashing the game later and losing all my changes!
COM_BufAddText(va("saveconfig \"%s\" -silent\n", configfile));
#endif //Alam: But not on the Dreamcast's VMUs
if (currentMenu == &MessageDef) // Oh sod off!
currentMenu = &MainDef; // Not like it matters
menuactive = false;
}
//
// M_SetupNextMenu
//
void M_SetupNextMenu(menu_t *menudef)
{
INT16 i;
if (currentMenu->quitroutine)
{
// If you're going from a menu to itself, why are you running the quitroutine? You're not quitting it! -SH
if (currentMenu != menudef && !currentMenu->quitroutine())
return; // we can't quit this menu (also used to set parameter from the menu)
}
currentMenu = menudef;
itemOn = currentMenu->lastOn;
// in case of...
if (itemOn >= currentMenu->numitems)
itemOn = currentMenu->numitems - 1;
// the curent item can be disabled,
// this code go up until an enabled item found
if ((currentMenu->menuitems[itemOn].status & IT_TYPE) == IT_SPACE)
{
for (i = 0; i < currentMenu->numitems; i++)
{
if ((currentMenu->menuitems[i].status & IT_TYPE) != IT_SPACE)
{
itemOn = i;
break;
}
}
}
}
//
// M_Ticker
//
void M_Ticker(void)
{
Starting from scratch. SRB2 v2.1.15
2016-07-06 04:09:17 +00:00
// reset input trigger
noFurtherInput = false;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (dedicated)
return;
if (--skullAnimCounter <= 0)
skullAnimCounter = 8;
HORRID HACK around holding enter in the playback menu having awful, crash-causing side-effects
2019-05-02 16:00:51 +00:00
if (currentMenu == &PlaybackMenuDef)
{
if (playback_enterheld > 0)
playback_enterheld--;
}
else
playback_enterheld = 0;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
//added : 30-01-98 : test mode for five seconds
if (vidm_testingmode > 0)
{
// restore the previous video mode
if (--vidm_testingmode == 0)
setmodeneeded = vidm_previousmode + 1;
}
Make mod update, room list and server list multithreaded This took fucking ages and it still fails sometimes in edge cases, but I don't give a FUCK right now.
2020-04-27 02:46:35 +00:00
Do not do master server things when NOCURL
2020-08-17 04:42:58 +00:00
#if defined (MASTERSERVER) && defined (HAVE_THREADS)
Make mod update, room list and server list multithreaded This took fucking ages and it still fails sometimes in edge cases, but I don't give a FUCK right now.
2020-04-27 02:46:35 +00:00
I_lock_mutex(&ms_ServerList_mutex);
{
if (ms_ServerList)
{
CL_QueryServerList(ms_ServerList);
free(ms_ServerList);
ms_ServerList = NULL;
}
}
I_unlock_mutex(ms_ServerList_mutex);
#endif
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
//
// M_Init
//
void M_Init(void)
{
Update the (unused) SP menu stuff to use MAXSKINS
2019-01-16 01:09:55 +00:00
UINT8 i;
* 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
COM_AddCommand("manual", Command_Manual_f);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
CV_RegisterVar(&cv_nextmap);
CV_RegisterVar(&cv_newgametype);
CV_RegisterVar(&cv_chooseskin);
CV_RegisterVar(&cv_autorecord);
if (dedicated)
return;
// Menu hacks
Spectate/Enter menu for online splitscreen Just like the menu option
2018-10-16 00:28:35 +00:00
CV_RegisterVar(&cv_dummymenuplayer);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
CV_RegisterVar(&cv_dummyteam);
Spectate/Enter menu for online splitscreen Just like the menu option
2018-10-16 00:28:35 +00:00
CV_RegisterVar(&cv_dummyspectate);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
CV_RegisterVar(&cv_dummyscramble);
CV_RegisterVar(&cv_dummyrings);
CV_RegisterVar(&cv_dummylives);
CV_RegisterVar(&cv_dummycontinues);
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
//CV_RegisterVar(&cv_dummymares);
Change color in menu, replay support for specific staff ghosts Todo: replace the vague number with the demo's recorded player name
2017-10-21 02:01:07 +00:00
CV_RegisterVar(&cv_dummystaff);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
quitmsg[QUITMSG] = M_GetText("Eggman's tied explosives\nto your girlfriend, and\nwill activate them if\nyou press the 'Y' key!\nPress 'N' to save her!\n\n(Press 'Y' to quit)");
quitmsg[QUITMSG1] = M_GetText("What would Tails say if\nhe saw you quitting the game?\n\n(Press 'Y' to quit)");
quitmsg[QUITMSG2] = M_GetText("Hey!\nWhere do ya think you're goin'?\n\n(Press 'Y' to quit)");
quitmsg[QUITMSG3] = M_GetText("Forget your studies!\nPlay some more!\n\n(Press 'Y' to quit)");
Don't look at this commit too closely until after netgame, I want to surprise yalls!! * Lots of menu changes! * Little arrows next to changeable cvars! * Show default value for sliders! * Pretty pretty pretty. * I don't know how to describe some of these changes. * Effectively nuke MIDI music support! * Skiddown at the start of a race is more interesting! * Spinning in waterslides! * Tiny bugfix in voting, plus a little celebration...
2018-06-30 22:18:13 +00:00
quitmsg[QUITMSG4] = M_GetText("You're trying to say you\nlike Sonic R better than\nthis, aren't you?\n\n(Press 'Y' to quit)");
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
quitmsg[QUITMSG5] = M_GetText("Don't leave yet -- there's a\nsuper emerald around that corner!\n\n(Press 'Y' to quit)");
quitmsg[QUITMSG6] = M_GetText("You'd rather work than play?\n\n(Press 'Y' to quit)");
quitmsg[QUITMSG7] = M_GetText("Go ahead and leave. See if I care...\n*sniffle*\n\n(Press 'Y' to quit)");
quitmsg[QUIT2MSG] = M_GetText("If you leave now,\nEggman will take over the world!\n\n(Press 'Y' to quit)");
Fun quit messages Press the 'N' key to unlock the Golden Kart!
2018-06-28 23:35:52 +00:00
quitmsg[QUIT2MSG1] = M_GetText("On your mark,\nget set,\nhit the 'N' key!\n\n(Press 'Y' to quit)");
quitmsg[QUIT2MSG2] = M_GetText("Aw c'mon, just\na few more laps!\n\n(Press 'Y' to quit)");
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
quitmsg[QUIT2MSG3] = M_GetText("Did you get all those Chaos Emeralds?\n\n(Press 'Y' to quit)");
Fun quit messages Press the 'N' key to unlock the Golden Kart!
2018-06-28 23:35:52 +00:00
quitmsg[QUIT2MSG4] = M_GetText("If you leave, I'll use\nmy Jawz on you!\n\n(Press 'Y' to quit)");
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
quitmsg[QUIT2MSG5] = M_GetText("Don't go!\nYou might find the hidden\nlevels!\n\n(Press 'Y' to quit)");
quitmsg[QUIT2MSG6] = M_GetText("Hit the 'N' key, Sonic!\nThe 'N' key!\n\n(Press 'Y' to quit)");
quitmsg[QUIT3MSG] = M_GetText("Are you really going to give up?\nWe certainly would never give you up.\n\n(Press 'Y' to quit)");
quitmsg[QUIT3MSG1] = M_GetText("Come on, just ONE more netgame!\n\n(Press 'Y' to quit)");
Fun quit messages Press the 'N' key to unlock the Golden Kart!
2018-06-28 23:35:52 +00:00
quitmsg[QUIT3MSG2] = M_GetText("Press 'N' to unlock\nthe Golden Kart!\n\n(Press 'Y' to quit)");
Intermissions... * Do the gametype change stuff on the voting screen. * Make all the picking sound and setting stuff one function, rather than in two seperate places that need to be kept identical. * Have the timer at the bottom be the highlight colour. * Map hell! LF2_HIDEINMENU is craftily reused... * Less allocation and deallocation for the adjacent G_RandMaps. Other stuff... * Fix command_map_f not resetting players' score in battle. * Shiny titlescreen! * Fix a random bonus newline in one of the quit messages.
2018-07-02 22:17:30 +00:00
quitmsg[QUIT3MSG3] = M_GetText("Couldn't handle\nthe banana meta?\n\n(Press 'Y' to quit)");
Most items work (netgame needs testing), will do fireballs later.
2017-02-26 22:37:52 +00:00
quitmsg[QUIT3MSG4] = M_GetText("Every time you press 'Y', an\nSRB2Kart Developer cries...\n\n(Press 'Y' to quit)");
Fun quit messages Press the 'N' key to unlock the Golden Kart!
2018-06-28 23:35:52 +00:00
quitmsg[QUIT3MSG5] = M_GetText("You'll be back to play soon, though...\n...right?\n\n(Press 'Y' to quit)");
quitmsg[QUIT3MSG6] = M_GetText("Aww, is Eggman's Nightclub too\ndifficult for you?\n\n(Press 'Y' to quit)");
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Update the (unused) SP menu stuff to use MAXSKINS
2019-01-16 01:09:55 +00:00
// Setup PlayerMenu table
for (i = 0; i < MAXSKINS; i++)
{
PlayerMenu[i].status = (i == 0 ? IT_CALL : IT_DISABLED);
PlayerMenu[i].patch = PlayerMenu[i].text = NULL;
PlayerMenu[i].itemaction = M_ChoosePlayer;
PlayerMenu[i].alphaKey = 0;
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
#ifdef HWRENDER
// Permanently hide some options based on render mode
if (rendermode == render_soft)
'sal-lighting' code ports from v2
2020-04-26 00:56:50 +00:00
OP_VideoOptionsMenu[op_video_ogl].status = IT_DISABLED;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
#endif
#ifndef NONET
CV_RegisterVar(&cv_serversort);
#endif
//todo put this somewhere better...
CV_RegisterVar(&cv_allcaps);
}
Setup the tables even eariler. I really hate that PlayerMenu status hack, but that's really the only way I could think off to show the entires for Tails, Knuckles and the Sonic&Tails pair.
2019-01-27 04:16:49 +00:00
void M_InitCharacterTables(void)
{
UINT8 i;
Update the SP menu stuff to use MAXSKINS Co-authoered-by: Steel Titanium (steeltitanium1@gmail.com>
2019-01-16 01:09:55 +00:00
// Setup PlayerMenu table
for (i = 0; i < MAXSKINS; i++)
{
PlayerMenu[i].status = (i < 4 ? IT_CALL : IT_DISABLED);
PlayerMenu[i].patch = PlayerMenu[i].text = NULL;
PlayerMenu[i].itemaction = M_ChoosePlayer;
PlayerMenu[i].alphaKey = 0;
}
// Setup description table
for (i = 0; i < MAXSKINS; i++)
{
if (i == 0)
{
strcpy(description[i].notes, "\x82Sonic\x80 is the fastest of the three, but also the hardest to control. Beginners beware, but experts will find Sonic very powerful.\n\n\x82""Ability:\x80 Speed Thok\nDouble jump to zoom forward with a huge burst of speed.\n\n\x82Tip:\x80 Simply letting go of forward does not slow down in SRB2. To slow down, hold the opposite direction.");
strcpy(description[i].picname, "");
strcpy(description[i].skinname, "sonic");
}
else if (i == 1)
{
strcpy(description[i].notes, "\x82Tails\x80 is the most mobile of the three, but has the slowest speed. Because of his mobility, he's well-\nsuited to beginners.\n\n\x82""Ability:\x80 Fly\nDouble jump to start flying for a limited time. Repetitively hit the jump button to ascend.\n\n\x82Tip:\x80 To quickly descend while flying, hit the spin button.");
strcpy(description[i].picname, "");
strcpy(description[i].skinname, "tails");
}
else if (i == 2)
{
strcpy(description[i].notes, "\x82Knuckles\x80 is well-\nrounded and can destroy breakable walls simply by touching them, but he can't jump as high as the other two.\n\n\x82""Ability:\x80 Glide & Climb\nDouble jump to glide in the air as long as jump is held. Glide into a wall to climb it.\n\n\x82Tip:\x80 Press spin while climbing to jump off the wall; press jump instead to jump off\nand face away from\nthe wall.");
strcpy(description[i].picname, "");
strcpy(description[i].skinname, "knuckles");
}
else if (i == 3)
{
strcpy(description[i].notes, "\x82Sonic & Tails\x80 team up to take on Dr. Eggman!\nControl Sonic while Tails desperately struggles to keep up.\n\nPlayer 2 can control Tails directly by setting the controls in the options menu.\nTails's directional controls are relative to Player 1's camera.\n\nTails can pick up Sonic while flying and carry him around.");
strcpy(description[i].picname, "CHRS&T");
strcpy(description[i].skinname, "sonic&tails");
}
else
{
strcpy(description[i].notes, "???");
strcpy(description[i].picname, "");
strcpy(description[i].skinname, "");
}
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
// ==========================================================================
// SPECIAL MENU OPTION DRAW ROUTINES GO HERE
// ==========================================================================
// Converts a string into question marks.
// Used for the secrets menu, to hide yet-to-be-unlocked stuff.
static const char *M_CreateSecretMenuOption(const char *str)
{
static char qbuf[32];
int i;
for (i = 0; i < 31; ++i)
{
if (!str[i])
{
qbuf[i] = '\0';
return qbuf;
}
else if (str[i] != ' ')
qbuf[i] = '?';
else
qbuf[i] = ' ';
}
qbuf[31] = '\0';
return qbuf;
}
static void M_DrawThermo(INT32 x, INT32 y, consvar_t *cv)
{
INT32 xx = x, i;
lumpnum_t leftlump, rightlump, centerlump[2], cursorlump;
patch_t *p;
leftlump = W_GetNumForName("M_THERML");
rightlump = W_GetNumForName("M_THERMR");
centerlump[0] = W_GetNumForName("M_THERMM");
centerlump[1] = W_GetNumForName("M_THERMM");
cursorlump = W_GetNumForName("M_THERMO");
V_DrawScaledPatch(xx, y, 0, p = W_CachePatchNum(leftlump,PU_CACHE));
xx += SHORT(p->width) - SHORT(p->leftoffset);
for (i = 0; i < 16; i++)
{
V_DrawScaledPatch(xx, y, V_WRAPX, W_CachePatchNum(centerlump[i & 1], PU_CACHE));
xx += 8;
}
V_DrawScaledPatch(xx, y, 0, W_CachePatchNum(rightlump, PU_CACHE));
xx = (cv->value - cv->PossibleValue[0].value) * (15*8) /
(cv->PossibleValue[1].value - cv->PossibleValue[0].value);
V_DrawScaledPatch((x + 8) + xx, y, 0, W_CachePatchNum(cursorlump, PU_CACHE));
}
// A smaller 'Thermo', with range given as percents (0-100)
Don't look at this commit too closely until after netgame, I want to surprise yalls!! * Lots of menu changes! * Little arrows next to changeable cvars! * Show default value for sliders! * Pretty pretty pretty. * I don't know how to describe some of these changes. * Effectively nuke MIDI music support! * Skiddown at the start of a race is more interesting! * Spinning in waterslides! * Tiny bugfix in voting, plus a little celebration...
2018-06-30 22:18:13 +00:00
static void M_DrawSlider(INT32 x, INT32 y, const consvar_t *cv, boolean ontop)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
INT32 i;
INT32 range;
patch_t *p;
for (i = 0; cv->PossibleValue[i+1].strvalue; i++);
Don't look at this commit too closely until after netgame, I want to surprise yalls!! * Lots of menu changes! * Little arrows next to changeable cvars! * Show default value for sliders! * Pretty pretty pretty. * I don't know how to describe some of these changes. * Effectively nuke MIDI music support! * Skiddown at the start of a race is more interesting! * Spinning in waterslides! * Tiny bugfix in voting, plus a little celebration...
2018-06-30 22:18:13 +00:00
x = BASEVIDWIDTH - x - SLIDER_WIDTH;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Don't look at this commit too closely until after netgame, I want to surprise yalls!! * Lots of menu changes! * Little arrows next to changeable cvars! * Show default value for sliders! * Pretty pretty pretty. * I don't know how to describe some of these changes. * Effectively nuke MIDI music support! * Skiddown at the start of a race is more interesting! * Spinning in waterslides! * Tiny bugfix in voting, plus a little celebration...
2018-06-30 22:18:13 +00:00
if (ontop)
{
Some minor things to help draw sonicitems to a close. * "kartvoices" cvar. Possible values "Never", "Tasteful" (default), and "Meme". * Added a way to move quickly through the credits, rather than skip them entirely (hold spacebar or down arrow). * Fix a few mistakes in M_ChangeCvar, some of which I introduced and some of which were weird in the first place. * Tweak the offset of the arrows that let you know you can modify a cvar by pressing left or right (some via a patch.kart change, but others via tweaking the drawing location).
2018-07-29 17:35:56 +00:00
V_DrawCharacter(x - 16 - (skullAnimCounter/5), y,
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
'\x1C' | highlightflags, false); // left arrow
Don't look at this commit too closely until after netgame, I want to surprise yalls!! * Lots of menu changes! * Little arrows next to changeable cvars! * Show default value for sliders! * Pretty pretty pretty. * I don't know how to describe some of these changes. * Effectively nuke MIDI music support! * Skiddown at the start of a race is more interesting! * Spinning in waterslides! * Tiny bugfix in voting, plus a little celebration...
2018-06-30 22:18:13 +00:00
V_DrawCharacter(x+(SLIDER_RANGE*8) + 8 + (skullAnimCounter/5), y,
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
'\x1D' | highlightflags, false); // right arrow
Don't look at this commit too closely until after netgame, I want to surprise yalls!! * Lots of menu changes! * Little arrows next to changeable cvars! * Show default value for sliders! * Pretty pretty pretty. * I don't know how to describe some of these changes. * Effectively nuke MIDI music support! * Skiddown at the start of a race is more interesting! * Spinning in waterslides! * Tiny bugfix in voting, plus a little celebration...
2018-06-30 22:18:13 +00:00
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Don't look at this commit too closely until after netgame, I want to surprise yalls!! * Lots of menu changes! * Little arrows next to changeable cvars! * Show default value for sliders! * Pretty pretty pretty. * I don't know how to describe some of these changes. * Effectively nuke MIDI music support! * Skiddown at the start of a race is more interesting! * Spinning in waterslides! * Tiny bugfix in voting, plus a little celebration...
2018-06-30 22:18:13 +00:00
if ((range = atoi(cv->defaultvalue)) != cv->value)
{
range = ((range - cv->PossibleValue[0].value) * 100 /
(cv->PossibleValue[1].value - cv->PossibleValue[0].value));
if (range < 0)
range = 0;
if (range > 100)
range = 100;
// draw the default
p = W_CachePatchName("M_SLIDEC", PU_CACHE);
V_DrawScaledPatch(x - 4 + (((SLIDER_RANGE)*8 + 4)*range)/100, y, 0, p);
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
V_DrawScaledPatch(x - 8, y, 0, W_CachePatchName("M_SLIDEL", PU_CACHE));
p = W_CachePatchName("M_SLIDEM", PU_CACHE);
for (i = 0; i < SLIDER_RANGE; i++)
V_DrawScaledPatch (x+i*8, y, 0,p);
p = W_CachePatchName("M_SLIDER", PU_CACHE);
V_DrawScaledPatch(x+SLIDER_RANGE*8, y, 0, p);
Don't look at this commit too closely until after netgame, I want to surprise yalls!! * Lots of menu changes! * Little arrows next to changeable cvars! * Show default value for sliders! * Pretty pretty pretty. * I don't know how to describe some of these changes. * Effectively nuke MIDI music support! * Skiddown at the start of a race is more interesting! * Spinning in waterslides! * Tiny bugfix in voting, plus a little celebration...
2018-06-30 22:18:13 +00:00
range = ((cv->value - cv->PossibleValue[0].value) * 100 /
(cv->PossibleValue[1].value - cv->PossibleValue[0].value));
if (range < 0)
range = 0;
if (range > 100)
range = 100;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// draw the slider cursor
p = W_CachePatchName("M_SLIDEC", PU_CACHE);
Don't look at this commit too closely until after netgame, I want to surprise yalls!! * Lots of menu changes! * Little arrows next to changeable cvars! * Show default value for sliders! * Pretty pretty pretty. * I don't know how to describe some of these changes. * Effectively nuke MIDI music support! * Skiddown at the start of a race is more interesting! * Spinning in waterslides! * Tiny bugfix in voting, plus a little celebration...
2018-06-30 22:18:13 +00:00
V_DrawScaledPatch(x - 4 + (((SLIDER_RANGE)*8 + 4)*range)/100, y, 0, p);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
//
// Draw a textbox, like Quake does, because sometimes it's difficult
// to read the text with all the stuff in the background...
//
void M_DrawTextBox(INT32 x, INT32 y, INT32 width, INT32 boxlines)
{
// Solid color textbox.
V_DrawFill(x+5, y+5, width*8+6, boxlines*8+6, 239);
//V_DrawFill(x+8, y+8, width*8, boxlines*8, 31);
/*
patch_t *p;
INT32 cx, cy, n;
INT32 step, boff;
step = 8;
boff = 8;
// draw left side
cx = x;
cy = y;
V_DrawScaledPatch(cx, cy, 0, W_CachePatchNum(viewborderlump[BRDR_TL], PU_CACHE));
cy += boff;
p = W_CachePatchNum(viewborderlump[BRDR_L], PU_CACHE);
for (n = 0; n < boxlines; n++)
{
V_DrawScaledPatch(cx, cy, V_WRAPY, p);
cy += step;
}
V_DrawScaledPatch(cx, cy, 0, W_CachePatchNum(viewborderlump[BRDR_BL], PU_CACHE));
// draw middle
V_DrawFlatFill(x + boff, y + boff, width*step, boxlines*step, st_borderpatchnum);
cx += boff;
cy = y;
while (width > 0)
{
V_DrawScaledPatch(cx, cy, V_WRAPX, W_CachePatchNum(viewborderlump[BRDR_T], PU_CACHE));
V_DrawScaledPatch(cx, y + boff + boxlines*step, V_WRAPX, W_CachePatchNum(viewborderlump[BRDR_B], PU_CACHE));
width--;
cx += step;
}
// draw right side
cy = y;
V_DrawScaledPatch(cx, cy, 0, W_CachePatchNum(viewborderlump[BRDR_TR], PU_CACHE));
cy += boff;
p = W_CachePatchNum(viewborderlump[BRDR_R], PU_CACHE);
for (n = 0; n < boxlines; n++)
{
V_DrawScaledPatch(cx, cy, V_WRAPY, p);
cy += step;
}
V_DrawScaledPatch(cx, cy, 0, W_CachePatchNum(viewborderlump[BRDR_BR], PU_CACHE));
*/
}
//
// Draw border for the savegame description
//
Comment out M_DrawSaveLoadBorder
2018-12-06 02:27:51 +00:00
/*static void M_DrawSaveLoadBorder(INT32 x,INT32 y)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
INT32 i;
V_DrawScaledPatch (x-8,y+7,0,W_CachePatchName("M_LSLEFT",PU_CACHE));
for (i = 0;i < 24;i++)
{
V_DrawScaledPatch (x,y+7,0,W_CachePatchName("M_LSCNTR",PU_CACHE));
x += 8;
}
V_DrawScaledPatch (x,y+7,0,W_CachePatchName("M_LSRGHT",PU_CACHE));
Comment out M_DrawSaveLoadBorder
2018-12-06 02:27:51 +00:00
}*/
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// horizontally centered text
static void M_CentreText(INT32 y, const char *string)
{
INT32 x;
//added : 02-02-98 : centre on 320, because V_DrawString centers on vid.width...
x = (BASEVIDWIDTH - V_StringWidth(string, V_OLDSPACING))>>1;
V_DrawString(x,y,V_OLDSPACING,string);
}
//
// M_DrawMapEmblems
//
// used by pause & statistics to draw a row of emblems for a map
//
static void M_DrawMapEmblems(INT32 mapnum, INT32 x, INT32 y)
{
UINT8 lasttype = UINT8_MAX, curtype;
emblem_t *emblem = M_GetLevelEmblems(mapnum);
while (emblem)
{
switch (emblem->type)
{
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
case ET_TIME: //case ET_SCORE: case ET_RINGS:
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
curtype = 1; break;
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
/*case ET_NGRADE: case ET_NTIME:
curtype = 2; break;*/
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
default:
curtype = 0; break;
}
// Shift over if emblem is of a different discipline
if (lasttype != UINT8_MAX && lasttype != curtype)
x -= 4;
lasttype = curtype;
if (emblem->collected)
V_DrawSmallMappedPatch(x, y, 0, W_CachePatchName(M_GetEmblemPatch(emblem), PU_CACHE),
Cache colormaps everywhere to avoid memory leaks
2019-03-16 05:39:52 +00:00
R_GetTranslationColormap(TC_DEFAULT, M_GetEmblemColor(emblem), GTC_MENUCACHE));
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
else
V_DrawSmallScaledPatch(x, y, 0, W_CachePatchName("NEEDIT", PU_CACHE));
emblem = M_GetLevelEmblems(-1);
That's it for me. No new features, no major sprite replacements. Maybe bugfixing stuff like this I did while half-asleep just in case it turns out I missed a test case. * Oni's new 1x Bumpers and Out-Of-Bumpers competition-style 'X'! * Modify alignment for `GOTITx` emblem drawing to match new Chaos Coin sprites. * Adjust m_cond.c list to use new Chaos Coin Emblem sprite slots.
2018-11-01 00:10:34 +00:00
x -= 8;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
}
static void M_DrawMenuTitle(void)
{
if (currentMenu->menutitlepic)
{
patch_t *p = W_CachePatchName(currentMenu->menutitlepic, PU_CACHE);
if (p->height > 24) // title is larger than normal
{
INT32 xtitle = (BASEVIDWIDTH - (SHORT(p->width)/2))/2;
INT32 ytitle = (30 - (SHORT(p->height)/2))/2;
if (xtitle < 0)
xtitle = 0;
if (ytitle < 0)
ytitle = 0;
V_DrawSmallScaledPatch(xtitle, ytitle, 0, p);
}
else
{
INT32 xtitle = (BASEVIDWIDTH - SHORT(p->width))/2;
INT32 ytitle = (30 - SHORT(p->height))/2;
if (xtitle < 0)
xtitle = 0;
if (ytitle < 0)
ytitle = 0;
V_DrawScaledPatch(xtitle, ytitle, 0, p);
}
}
}
static void M_DrawGenericMenu(void)
{
Tweak player setup menu.
2018-07-02 13:43:52 +00:00
INT32 x, y, w, i, cursory = 0;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// DRAW MENU
x = currentMenu->x;
y = currentMenu->y;
// draw title (or big pic)
M_DrawMenuTitle();
for (i = 0; i < currentMenu->numitems; i++)
{
if (i == itemOn)
cursory = y;
switch (currentMenu->menuitems[i].status & IT_DISPLAY)
{
case IT_PATCH:
if (currentMenu->menuitems[i].patch && currentMenu->menuitems[i].patch[0])
{
if (currentMenu->menuitems[i].status & IT_CENTER)
{
patch_t *p;
p = W_CachePatchName(currentMenu->menuitems[i].patch, PU_CACHE);
V_DrawScaledPatch((BASEVIDWIDTH - SHORT(p->width))/2, y, 0, p);
}
else
{
V_DrawScaledPatch(x, y, 0,
W_CachePatchName(currentMenu->menuitems[i].patch, PU_CACHE));
}
}
Build: kill GCC 7's implicit-fallthrough warning
2017-09-28 13:39:47 +00:00
/* FALLTHRU */
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
case IT_NOTHING:
case IT_DYBIGSPACE:
* Completely revamp a bunch of menu stuff! * Improve control menus significantly - a more layout-neutral, gameplay importance based order, with spacing, and less depth to get to the important stuff. * Port over the improved MP main menu from internal, including flattening the IP connect onto its level. * Allow for selecting the number of splitscreen players using a menu option, rather than three seperate menu choices. * Improve the layout of all of the level/gametype select menus slightly. * (unrelated) Make fourth player area in 3p splitscreen use the tiling background instead of a pure black area. * (unrelated) Tweak minimap ordering slightly.
2018-06-30 15:01:03 +00:00
y = currentMenu->y+currentMenu->menuitems[i].alphaKey;//+= LINEHEIGHT;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
break;
case IT_BIGSLIDER:
M_DrawThermo(x, y, (consvar_t *)currentMenu->menuitems[i].itemaction);
y += LINEHEIGHT;
break;
case IT_STRING:
case IT_WHITESTRING:
if (currentMenu->menuitems[i].alphaKey)
y = currentMenu->y+currentMenu->menuitems[i].alphaKey;
if (i == itemOn)
cursory = y;
if ((currentMenu->menuitems[i].status & IT_DISPLAY)==IT_STRING)
V_DrawString(x, y, 0, currentMenu->menuitems[i].text);
else
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
V_DrawString(x, y, highlightflags, currentMenu->menuitems[i].text);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Cvar specific handling
switch (currentMenu->menuitems[i].status & IT_TYPE)
case IT_CVAR:
{
consvar_t *cv = (consvar_t *)currentMenu->menuitems[i].itemaction;
switch (currentMenu->menuitems[i].status & IT_CVARTYPE)
{
case IT_CV_SLIDER:
Don't look at this commit too closely until after netgame, I want to surprise yalls!! * Lots of menu changes! * Little arrows next to changeable cvars! * Show default value for sliders! * Pretty pretty pretty. * I don't know how to describe some of these changes. * Effectively nuke MIDI music support! * Skiddown at the start of a race is more interesting! * Spinning in waterslides! * Tiny bugfix in voting, plus a little celebration...
2018-06-30 22:18:13 +00:00
M_DrawSlider(x, y, cv, (i == itemOn));
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
case IT_CV_NOPRINT: // color use this
case IT_CV_INVISSLIDER: // monitor toggles use this
break;
case IT_CV_STRING:
M_DrawTextBox(x, y + 4, MAXSTRINGLENGTH, 1);
V_DrawString(x + 8, y + 12, V_ALLOWLOWERCASE, cv->string);
if (skullAnimCounter < 4 && i == itemOn)
V_DrawCharacter(x + 8 + V_StringWidth(cv->string, 0), y + 12,
'_' | 0x80, false);
y += 16;
break;
default:
Tweak player setup menu.
2018-07-02 13:43:52 +00:00
w = V_StringWidth(cv->string, 0);
V_DrawString(BASEVIDWIDTH - x - w, y,
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
((cv->flags & CV_CHEAT) && !CV_IsSetToDefault(cv) ? warningflags : highlightflags), cv->string);
Don't look at this commit too closely until after netgame, I want to surprise yalls!! * Lots of menu changes! * Little arrows next to changeable cvars! * Show default value for sliders! * Pretty pretty pretty. * I don't know how to describe some of these changes. * Effectively nuke MIDI music support! * Skiddown at the start of a race is more interesting! * Spinning in waterslides! * Tiny bugfix in voting, plus a little celebration...
2018-06-30 22:18:13 +00:00
if (i == itemOn)
{
Tweak player setup menu.
2018-07-02 13:43:52 +00:00
V_DrawCharacter(BASEVIDWIDTH - x - 10 - w - (skullAnimCounter/5), y,
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
'\x1C' | highlightflags, false); // left arrow
Don't look at this commit too closely until after netgame, I want to surprise yalls!! * Lots of menu changes! * Little arrows next to changeable cvars! * Show default value for sliders! * Pretty pretty pretty. * I don't know how to describe some of these changes. * Effectively nuke MIDI music support! * Skiddown at the start of a race is more interesting! * Spinning in waterslides! * Tiny bugfix in voting, plus a little celebration...
2018-06-30 22:18:13 +00:00
V_DrawCharacter(BASEVIDWIDTH - x + 2 + (skullAnimCounter/5), y,
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
'\x1D' | highlightflags, false); // right arrow
Don't look at this commit too closely until after netgame, I want to surprise yalls!! * Lots of menu changes! * Little arrows next to changeable cvars! * Show default value for sliders! * Pretty pretty pretty. * I don't know how to describe some of these changes. * Effectively nuke MIDI music support! * Skiddown at the start of a race is more interesting! * Spinning in waterslides! * Tiny bugfix in voting, plus a little celebration...
2018-06-30 22:18:13 +00:00
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
break;
}
break;
}
y += STRINGHEIGHT;
break;
case IT_STRING2:
V_DrawString(x, y, 0, currentMenu->menuitems[i].text);
Build: kill GCC 7's implicit-fallthrough warning
2017-09-28 13:39:47 +00:00
/* FALLTHRU */
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
case IT_DYLITLSPACE:
y += SMALLLINEHEIGHT;
break;
case IT_GRAYPATCH:
if (currentMenu->menuitems[i].patch && currentMenu->menuitems[i].patch[0])
V_DrawMappedPatch(x, y, 0,
W_CachePatchName(currentMenu->menuitems[i].patch,PU_CACHE), graymap);
y += LINEHEIGHT;
break;
case IT_TRANSTEXT:
if (currentMenu->menuitems[i].alphaKey)
y = currentMenu->y+currentMenu->menuitems[i].alphaKey;
Build: kill GCC 7's implicit-fallthrough warning
2017-09-28 13:39:47 +00:00
/* FALLTHRU */
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
case IT_TRANSTEXT2:
V_DrawString(x, y, V_TRANSLUCENT, currentMenu->menuitems[i].text);
y += SMALLLINEHEIGHT;
break;
case IT_QUESTIONMARKS:
if (currentMenu->menuitems[i].alphaKey)
y = currentMenu->y+currentMenu->menuitems[i].alphaKey;
V_DrawString(x, y, V_TRANSLUCENT|V_OLDSPACING, M_CreateSecretMenuOption(currentMenu->menuitems[i].text));
y += SMALLLINEHEIGHT;
break;
case IT_HEADERTEXT: // draws 16 pixels to the left, in yellow text
if (currentMenu->menuitems[i].alphaKey)
y = currentMenu->y+currentMenu->menuitems[i].alphaKey;
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
V_DrawString(x-16, y, highlightflags, currentMenu->menuitems[i].text);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
y += SMALLLINEHEIGHT;
break;
}
}
// DRAW THE SKULL CURSOR
if (((currentMenu->menuitems[itemOn].status & IT_DISPLAY) == IT_PATCH)
|| ((currentMenu->menuitems[itemOn].status & IT_DISPLAY) == IT_NOTHING))
{
V_DrawScaledPatch(currentMenu->x + SKULLXOFF, cursory - 5, 0,
W_CachePatchName("M_CURSOR", PU_CACHE));
}
else
{
V_DrawScaledPatch(currentMenu->x - 24, cursory, 0,
W_CachePatchName("M_CURSOR", PU_CACHE));
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
V_DrawString(currentMenu->x, cursory, highlightflags, currentMenu->menuitems[itemOn].text);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
}
Add replay options screen
2019-03-31 18:50:29 +00:00
static void M_DrawGenericBackgroundMenu(void)
{
V_DrawPatchFill(W_CachePatchName("SRB2BACK", PU_CACHE));
M_DrawGenericMenu();
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
static void M_DrawPauseMenu(void)
{
* Lots of Record Attack love! * Record Attack Input display! * Show Record Attack emblem and emblem time on the HUD! Changes colours with the player, just like vanilla internal's. * Remove the ugly dark blue box on the singleplayer (including pause screen) whose only purpose in Kart was to contain the Record Attack emblem info! * Unrelated shit! * Improve loading Kart HUD graphics. * Fix mirrored HUD graphics being one screen pixel (not basevid pixel) offset.
2018-07-15 22:13:36 +00:00
#if 0
Functional, ready for netgame!
2018-01-28 04:52:01 +00:00
if (!netgame && !multiplayer && (gamestate == GS_LEVEL || gamestate == GS_INTERMISSION || gamestate == GS_VOTING))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
emblem_t *emblem_detail[3] = {NULL, NULL, NULL};
char emblem_text[3][20];
INT32 i;
M_DrawTextBox(27, 16, 32, 6);
// Draw any and all emblems at the top.
M_DrawMapEmblems(gamemap, 272, 28);
Use strlen for all of the valid zone title/act num checks
2018-06-05 21:28:46 +00:00
if (strlen(mapheaderinfo[gamemap-1]->zonttl) > 0)
P != M
2018-02-08 23:14:56 +00:00
{
Use strlen for all of the valid zone title/act num checks
2018-06-05 21:28:46 +00:00
if (strlen(mapheaderinfo[gamemap-1]->actnum) > 0)
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
V_DrawString(40, 28, highlightflags, va("%s %s %s", mapheaderinfo[gamemap-1]->lvlttl, mapheaderinfo[gamemap-1]->zonttl, mapheaderinfo[gamemap-1]->actnum));
P != M
2018-02-08 23:14:56 +00:00
else
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
V_DrawString(40, 28, highlightflags, va("%s %s", mapheaderinfo[gamemap-1]->lvlttl, mapheaderinfo[gamemap-1]->zonttl));
P != M
2018-02-08 23:14:56 +00:00
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
else
P != M
2018-02-08 23:14:56 +00:00
{
Use strlen for all of the valid zone title/act num checks
2018-06-05 21:28:46 +00:00
if (strlen(mapheaderinfo[gamemap-1]->actnum) > 0)
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
V_DrawString(40, 28, highlightflags, va("%s %s", mapheaderinfo[gamemap-1]->lvlttl, mapheaderinfo[gamemap-1]->actnum));
P != M
2018-02-08 23:14:56 +00:00
else
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
V_DrawString(40, 28, highlightflags, mapheaderinfo[gamemap-1]->lvlttl);
P != M
2018-02-08 23:14:56 +00:00
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Set up the detail boxes.
{
emblem_t *emblem = M_GetLevelEmblems(gamemap);
while (emblem)
{
INT32 emblemslot;
char targettext[9], currenttext[9];
switch (emblem->type)
{
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
/*case ET_SCORE:
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
snprintf(targettext, 9, "%d", emblem->var);
snprintf(currenttext, 9, "%u", G_GetBestScore(gamemap));
targettext[8] = 0;
currenttext[8] = 0;
emblemslot = 0;
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
break;*/
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
case ET_TIME:
emblemslot = emblem->var; // dumb hack
snprintf(targettext, 9, "%i:%02i.%02i",
G_TicsToMinutes((tic_t)emblemslot, false),
G_TicsToSeconds((tic_t)emblemslot),
G_TicsToCentiseconds((tic_t)emblemslot));
emblemslot = (INT32)G_GetBestTime(gamemap); // dumb hack pt ii
if ((tic_t)emblemslot == UINT32_MAX)
snprintf(currenttext, 9, "-:--.--");
else
snprintf(currenttext, 9, "%i:%02i.%02i",
G_TicsToMinutes((tic_t)emblemslot, false),
G_TicsToSeconds((tic_t)emblemslot),
G_TicsToCentiseconds((tic_t)emblemslot));
targettext[8] = 0;
currenttext[8] = 0;
emblemslot = 1;
break;
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
/*case ET_RINGS:
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
snprintf(targettext, 9, "%d", emblem->var);
snprintf(currenttext, 9, "%u", G_GetBestRings(gamemap));
targettext[8] = 0;
currenttext[8] = 0;
emblemslot = 2;
break;
case ET_NGRADE:
snprintf(targettext, 9, "%u", P_GetScoreForGrade(gamemap, 0, emblem->var));
snprintf(currenttext, 9, "%u", G_GetBestNightsScore(gamemap, 0));
targettext[8] = 0;
currenttext[8] = 0;
emblemslot = 1;
break;
case ET_NTIME:
emblemslot = emblem->var; // dumb hack pt iii
snprintf(targettext, 9, "%i:%02i.%02i",
G_TicsToMinutes((tic_t)emblemslot, false),
G_TicsToSeconds((tic_t)emblemslot),
G_TicsToCentiseconds((tic_t)emblemslot));
emblemslot = (INT32)G_GetBestNightsTime(gamemap, 0); // dumb hack pt iv
if ((tic_t)emblemslot == UINT32_MAX)
snprintf(currenttext, 9, "-:--.--");
else
snprintf(currenttext, 9, "%i:%02i.%02i",
G_TicsToMinutes((tic_t)emblemslot, false),
G_TicsToSeconds((tic_t)emblemslot),
G_TicsToCentiseconds((tic_t)emblemslot));
targettext[8] = 0;
currenttext[8] = 0;
emblemslot = 2;
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
break;*/
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
default:
goto bademblem;
}
if (emblem_detail[emblemslot])
goto bademblem;
emblem_detail[emblemslot] = emblem;
snprintf(emblem_text[emblemslot], 20, "%8s /%8s", currenttext, targettext);
emblem_text[emblemslot][19] = 0;
bademblem:
emblem = M_GetLevelEmblems(-1);
}
}
for (i = 0; i < 3; ++i)
{
emblem_t *emblem = emblem_detail[i];
if (!emblem)
continue;
if (emblem->collected)
V_DrawSmallMappedPatch(40, 44 + (i*8), 0, W_CachePatchName(M_GetEmblemPatch(emblem), PU_CACHE),
Cache colormaps everywhere to avoid memory leaks
2019-03-16 05:39:52 +00:00
R_GetTranslationColormap(TC_DEFAULT, M_GetEmblemColor(emblem), GTC_MENUCACHE));
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
else
V_DrawSmallScaledPatch(40, 44 + (i*8), 0, W_CachePatchName("NEEDIT", PU_CACHE));
switch (emblem->type)
{
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
/*case ET_SCORE:
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
case ET_NGRADE:
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
V_DrawString(56, 44 + (i*8), highlightflags, "SCORE:");
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
break;*/
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
case ET_TIME:
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
//case ET_NTIME:
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
V_DrawString(56, 44 + (i*8), highlightflags, "TIME:");
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
break;
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
/*case ET_RINGS:
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
V_DrawString(56, 44 + (i*8), highlightflags, "RINGS:");
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
break;*/
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
V_DrawRightAlignedString(284, 44 + (i*8), V_MONOSPACE, emblem_text[i]);
}
}
* Lots of Record Attack love! * Record Attack Input display! * Show Record Attack emblem and emblem time on the HUD! Changes colours with the player, just like vanilla internal's. * Remove the ugly dark blue box on the singleplayer (including pause screen) whose only purpose in Kart was to contain the Record Attack emblem info! * Unrelated shit! * Improve loading Kart HUD graphics. * Fix mirrored HUD graphics being one screen pixel (not basevid pixel) offset.
2018-07-15 22:13:36 +00:00
#endif
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Ask to join is a menu option, rather than trying to replace your menu temporarily.
2020-08-22 11:16:52 +00:00
#ifdef HAVE_DISCORDRPC
// kind of hackily baked in here
if (currentMenu == &MPauseDef && discordRequestList != NULL)
{
const tic_t freq = TICRATE/2;
if ((leveltime % freq) >= freq/2)
{
V_DrawFixedPatch(204 * FRACUNIT,
(currentMenu->y + MPauseMenu[mpause_discordrequests].alphaKey - 1) * FRACUNIT,
FRACUNIT,
0,
W_CachePatchName("K_REQUE2", PU_CACHE),
NULL
);
}
}
#endif
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
M_DrawGenericMenu();
}
static void M_DrawCenteredMenu(void)
{
INT32 x, y, i, cursory = 0;
// DRAW MENU
x = currentMenu->x;
y = currentMenu->y;
// draw title (or big pic)
M_DrawMenuTitle();
for (i = 0; i < currentMenu->numitems; i++)
{
if (i == itemOn)
cursory = y;
switch (currentMenu->menuitems[i].status & IT_DISPLAY)
{
case IT_PATCH:
if (currentMenu->menuitems[i].patch && currentMenu->menuitems[i].patch[0])
{
if (currentMenu->menuitems[i].status & IT_CENTER)
{
patch_t *p;
p = W_CachePatchName(currentMenu->menuitems[i].patch, PU_CACHE);
V_DrawScaledPatch((BASEVIDWIDTH - SHORT(p->width))/2, y, 0, p);
}
else
{
V_DrawScaledPatch(x, y, 0,
W_CachePatchName(currentMenu->menuitems[i].patch, PU_CACHE));
}
}
Build: kill GCC 7's implicit-fallthrough warning
2017-09-28 13:39:47 +00:00
/* FALLTHRU */
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
case IT_NOTHING:
case IT_DYBIGSPACE:
y += LINEHEIGHT;
break;
case IT_BIGSLIDER:
M_DrawThermo(x, y, (consvar_t *)currentMenu->menuitems[i].itemaction);
y += LINEHEIGHT;
break;
case IT_STRING:
case IT_WHITESTRING:
if (currentMenu->menuitems[i].alphaKey)
y = currentMenu->y+currentMenu->menuitems[i].alphaKey;
if (i == itemOn)
cursory = y;
if ((currentMenu->menuitems[i].status & IT_DISPLAY)==IT_STRING)
V_DrawCenteredString(x, y, 0, currentMenu->menuitems[i].text);
else
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
V_DrawCenteredString(x, y, highlightflags, currentMenu->menuitems[i].text);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Cvar specific handling
switch(currentMenu->menuitems[i].status & IT_TYPE)
case IT_CVAR:
{
consvar_t *cv = (consvar_t *)currentMenu->menuitems[i].itemaction;
switch(currentMenu->menuitems[i].status & IT_CVARTYPE)
{
case IT_CV_SLIDER:
Don't look at this commit too closely until after netgame, I want to surprise yalls!! * Lots of menu changes! * Little arrows next to changeable cvars! * Show default value for sliders! * Pretty pretty pretty. * I don't know how to describe some of these changes. * Effectively nuke MIDI music support! * Skiddown at the start of a race is more interesting! * Spinning in waterslides! * Tiny bugfix in voting, plus a little celebration...
2018-06-30 22:18:13 +00:00
M_DrawSlider(x, y, cv, (i == itemOn));
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
case IT_CV_NOPRINT: // color use this
break;
case IT_CV_STRING:
M_DrawTextBox(x, y + 4, MAXSTRINGLENGTH, 1);
V_DrawString(x + 8, y + 12, V_ALLOWLOWERCASE, cv->string);
if (skullAnimCounter < 4 && i == itemOn)
V_DrawCharacter(x + 8 + V_StringWidth(cv->string, 0), y + 12,
'_' | 0x80, false);
y += 16;
break;
default:
V_DrawString(BASEVIDWIDTH - x - V_StringWidth(cv->string, 0), y,
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
((cv->flags & CV_CHEAT) && !CV_IsSetToDefault(cv) ? warningflags : highlightflags), cv->string);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
break;
}
break;
}
y += STRINGHEIGHT;
break;
case IT_STRING2:
V_DrawCenteredString(x, y, 0, currentMenu->menuitems[i].text);
Build: kill GCC 7's implicit-fallthrough warning
2017-09-28 13:39:47 +00:00
/* FALLTHRU */
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
case IT_DYLITLSPACE:
y += SMALLLINEHEIGHT;
break;
case IT_QUESTIONMARKS:
if (currentMenu->menuitems[i].alphaKey)
y = currentMenu->y+currentMenu->menuitems[i].alphaKey;
V_DrawCenteredString(x, y, V_TRANSLUCENT|V_OLDSPACING, M_CreateSecretMenuOption(currentMenu->menuitems[i].text));
y += SMALLLINEHEIGHT;
break;
case IT_GRAYPATCH:
if (currentMenu->menuitems[i].patch && currentMenu->menuitems[i].patch[0])
V_DrawMappedPatch(x, y, 0,
W_CachePatchName(currentMenu->menuitems[i].patch,PU_CACHE), graymap);
y += LINEHEIGHT;
break;
}
}
// DRAW THE SKULL CURSOR
if (((currentMenu->menuitems[itemOn].status & IT_DISPLAY) == IT_PATCH)
|| ((currentMenu->menuitems[itemOn].status & IT_DISPLAY) == IT_NOTHING))
{
V_DrawScaledPatch(x + SKULLXOFF, cursory - 5, 0,
W_CachePatchName("M_CURSOR", PU_CACHE));
}
else
{
V_DrawScaledPatch(x - V_StringWidth(currentMenu->menuitems[itemOn].text, 0)/2 - 24, cursory, 0,
W_CachePatchName("M_CURSOR", PU_CACHE));
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
V_DrawCenteredString(x, cursory, highlightflags, currentMenu->menuitems[itemOn].text);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
}
//
// M_StringHeight
//
// Find string height from hu_font chars
//
static inline size_t M_StringHeight(const char *string)
{
size_t h = 8, i;
for (i = 0; i < strlen(string); i++)
if (string[i] == '\n')
h += 8;
return h;
}
// ==========================================================================
// Extraneous menu patching functions
// ==========================================================================
//
// M_PatchSkinNameTable
//
// Like M_PatchLevelNameTable, but for cv_chooseskin
//
static void M_PatchSkinNameTable(void)
{
INT32 j;
memset(skins_cons_t, 0, sizeof (skins_cons_t));
for (j = 0; j < MAXSKINS; j++)
{
if (skins[j].name[0] != '\0')
{
skins_cons_t[j].strvalue = skins[j].name;
Fix a bunch of issues with record attack! * Fixed the issue where your runs would be saved as belonging to the wrong character. * Make the Ghost menu always visible. This isn't PERFECT, but it's better than hiding the option to toggle ghosts just because you're doing your first run as a new character. * Fix the number of laps carrying over from MP(!!!!!!!!! plugged a huge security hole for the authenticity of replays...) Other stuff! * Hide map hell maps in the statistics. * Clean up some nonet stuff in the menu. * Put player setup last again, and tweaked its wording. * Disable the special Kart waiting for players behaviour when not playing a netgame - seeing a double gamestate transition in record attack is weird.
2018-07-06 17:08:35 +00:00
skins_cons_t[j].value = j+1;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
else
{
skins_cons_t[j].strvalue = NULL;
skins_cons_t[j].value = 0;
* Fix the fades mess, and have the title screen always have a smooth, non-checkered fade from blapck! * Fix all the bugs with skin not being set properly or kept synchronised with the multiplayer setup in record attack. * Reduce the amount of flashing on the voting screen.
2018-07-04 21:57:50 +00:00
break;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
}
* Fix the fades mess, and have the title screen always have a smooth, non-checkered fade from blapck! * Fix all the bugs with skin not being set properly or kept synchronised with the multiplayer setup in record attack. * Reduce the amount of flashing on the voting screen.
2018-07-04 21:57:50 +00:00
j = R_SkinAvailable(cv_skin.string);
if (j == -1)
j = 0;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
* Fix the fades mess, and have the title screen always have a smooth, non-checkered fade from blapck! * Fix all the bugs with skin not being set properly or kept synchronised with the multiplayer setup in record attack. * Reduce the amount of flashing on the voting screen.
2018-07-04 21:57:50 +00:00
CV_SetValue(&cv_chooseskin, j+1); // This causes crash sometimes?!
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return;
}
// Call before showing any level-select menus
static void M_PrepareLevelSelect(void)
{
if (levellistmode != LLM_CREATESERVER)
CV_SetValue(&cv_nextmap, M_GetFirstLevelInList());
else
Newgametype_OnChange(); // Make sure to start on an appropriate map if wads have been added
}
//
// M_CanShowLevelInList
//
// Determines whether to show a given map in the various level-select lists.
// Set gt = -1 to ignore gametype.
//
boolean M_CanShowLevelInList(INT32 mapnum, INT32 gt)
{
Added "Random" to the level selection list, for those days when you know you *want* to race but don't have any idea what to do.
2018-08-15 15:12:36 +00:00
// Random map!
if (mapnum == -1)
return (gamestate != GS_TIMEATTACK && !modeattacking);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Does the map exist?
if (!mapheaderinfo[mapnum])
return false;
// Does the map have a name?
if (!mapheaderinfo[mapnum]->lvlttl[0])
return false;
switch (levellistmode)
{
case LLM_CREATESERVER:
// Should the map be hidden?
* Fix the fades mess, and have the title screen always have a smooth, non-checkered fade from blapck! * Fix all the bugs with skin not being set properly or kept synchronised with the multiplayer setup in record attack. * Reduce the amount of flashing on the voting screen.
2018-07-04 21:57:50 +00:00
if (mapheaderinfo[mapnum]->menuflags & LF2_HIDEINMENU && mapnum+1 != gamemap)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return false;
if (M_MapLocked(mapnum+1))
return false; // not unlocked
Access to map hell maps in record attack. Currently dependent on 50 emblems. Also: temporarily cleaned up the M_CanShowLevelInList record attack conditions to automatically match what we want, instead of requiring us to apply a bunch of vanilla flags just to emulate our "available unless explicitly hidden" MP mechanism like is currently in maps.kart.
2018-10-06 20:08:09 +00:00
/*if (gt == GT_COOP && (mapheaderinfo[mapnum]->typeoflevel & TOL_COOP))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return true;
if (gt == GT_COMPETITION && (mapheaderinfo[mapnum]->typeoflevel & TOL_COMPETITION))
return true;
if (gt == GT_CTF && (mapheaderinfo[mapnum]->typeoflevel & TOL_CTF))
return true;
if ((gt == GT_TAG || gt == GT_HIDEANDSEEK) && (mapheaderinfo[mapnum]->typeoflevel & TOL_TAG))
Access to map hell maps in record attack. Currently dependent on 50 emblems. Also: temporarily cleaned up the M_CanShowLevelInList record attack conditions to automatically match what we want, instead of requiring us to apply a bunch of vanilla flags just to emulate our "available unless explicitly hidden" MP mechanism like is currently in maps.kart.
2018-10-06 20:08:09 +00:00
return true;*/
if ((gt == GT_MATCH || gt == GT_TEAMMATCH) && (mapheaderinfo[mapnum]->typeoflevel & TOL_MATCH))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return true;
if (gt == GT_RACE && (mapheaderinfo[mapnum]->typeoflevel & TOL_RACE))
return true;
return false;
Access to map hell maps in record attack. Currently dependent on 50 emblems. Also: temporarily cleaned up the M_CanShowLevelInList record attack conditions to automatically match what we want, instead of requiring us to apply a bunch of vanilla flags just to emulate our "available unless explicitly hidden" MP mechanism like is currently in maps.kart.
2018-10-06 20:08:09 +00:00
/*case LLM_LEVELSELECT:
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (mapheaderinfo[mapnum]->levelselect != maplistoption)
return false;
if (M_MapLocked(mapnum+1))
return false; // not unlocked
Access to map hell maps in record attack. Currently dependent on 50 emblems. Also: temporarily cleaned up the M_CanShowLevelInList record attack conditions to automatically match what we want, instead of requiring us to apply a bunch of vanilla flags just to emulate our "available unless explicitly hidden" MP mechanism like is currently in maps.kart.
2018-10-06 20:08:09 +00:00
return true;*/
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
case LLM_RECORDATTACK:
Access to map hell maps in record attack. Currently dependent on 50 emblems. Also: temporarily cleaned up the M_CanShowLevelInList record attack conditions to automatically match what we want, instead of requiring us to apply a bunch of vanilla flags just to emulate our "available unless explicitly hidden" MP mechanism like is currently in maps.kart.
2018-10-06 20:08:09 +00:00
/*if (!(mapheaderinfo[mapnum]->menuflags & LF2_RECORDATTACK))
return false;*/
if (!(mapheaderinfo[mapnum]->typeoflevel & TOL_RACE))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return false;
if (M_MapLocked(mapnum+1))
return false; // not unlocked
Access to map hell maps in record attack. Currently dependent on 50 emblems. Also: temporarily cleaned up the M_CanShowLevelInList record attack conditions to automatically match what we want, instead of requiring us to apply a bunch of vanilla flags just to emulate our "available unless explicitly hidden" MP mechanism like is currently in maps.kart.
2018-10-06 20:08:09 +00:00
if (M_SecretUnlocked(SECRET_HELLATTACK))
return true; // now you're in hell
if (mapheaderinfo[mapnum]->menuflags & LF2_HIDEINMENU)
return false; // map hell
/*if (mapheaderinfo[mapnum]->menuflags & LF2_NOVISITNEEDED)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return true;
if (!mapvisited[mapnum])
Access to map hell maps in record attack. Currently dependent on 50 emblems. Also: temporarily cleaned up the M_CanShowLevelInList record attack conditions to automatically match what we want, instead of requiring us to apply a bunch of vanilla flags just to emulate our "available unless explicitly hidden" MP mechanism like is currently in maps.kart.
2018-10-06 20:08:09 +00:00
return false;*/
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return true;
Access to map hell maps in record attack. Currently dependent on 50 emblems. Also: temporarily cleaned up the M_CanShowLevelInList record attack conditions to automatically match what we want, instead of requiring us to apply a bunch of vanilla flags just to emulate our "available unless explicitly hidden" MP mechanism like is currently in maps.kart.
2018-10-06 20:08:09 +00:00
/*case LLM_NIGHTSATTACK:
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (!(mapheaderinfo[mapnum]->menuflags & LF2_NIGHTSATTACK))
return false;
if (M_MapLocked(mapnum+1))
return false; // not unlocked
if (mapheaderinfo[mapnum]->menuflags & LF2_NOVISITNEEDED)
return true;
if (!mapvisited[mapnum])
return false;
Access to map hell maps in record attack. Currently dependent on 50 emblems. Also: temporarily cleaned up the M_CanShowLevelInList record attack conditions to automatically match what we want, instead of requiring us to apply a bunch of vanilla flags just to emulate our "available unless explicitly hidden" MP mechanism like is currently in maps.kart.
2018-10-06 20:08:09 +00:00
return true;*/
default:
return false;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
// Hmm? Couldn't decide?
return false;
}
static INT32 M_CountLevelsToShowInList(void)
{
INT32 mapnum, count = 0;
for (mapnum = 0; mapnum < NUMMAPS; mapnum++)
if (M_CanShowLevelInList(mapnum, -1))
count++;
return count;
}
static INT32 M_GetFirstLevelInList(void)
{
INT32 mapnum;
for (mapnum = 0; mapnum < NUMMAPS; mapnum++)
if (M_CanShowLevelInList(mapnum, -1))
return mapnum + 1;
return 1;
}
// ==================================================
// MESSAGE BOX (aka: a hacked, cobbled together menu)
// ==================================================
static void M_DrawMessageMenu(void);
// Because this is just a hack-ish 'menu', I'm not putting this with the others
static menuitem_t MessageMenu[] =
{
// TO HACK
{0,NULL, NULL, NULL,0}
};
menu_t MessageDef =
{
NULL, // title
1, // # of menu items
NULL, // previous menu (TO HACK)
MessageMenu, // menuitem_t ->
M_DrawMessageMenu, // drawing routine ->
0, 0, // x, y (TO HACK)
0, // lastOn, flags (TO HACK)
NULL
};
void M_StartMessage(const char *string, void *routine,
menumessagetype_t itemtype)
{
size_t max = 0, start = 0, i, strlines;
static char *message = NULL;
Z_Free(message);
message = Z_StrDup(string);
DEBFILE(message);
// Rudementary word wrapping.
// Simple and effective. Does not handle nonuniform letter sizes, colors, etc. but who cares.
strlines = 0;
for (i = 0; message[i]; i++)
{
if (message[i] == ' ')
{
start = i;
max += 4;
}
else if (message[i] == '\n')
{
strlines = i;
start = 0;
max = 0;
continue;
}
else
max += 8;
// Start trying to wrap if presumed length exceeds the screen width.
if (max >= BASEVIDWIDTH && start > 0)
{
message[start] = '\n';
max -= (start-strlines)*8;
strlines = start;
start = 0;
}
}
start = 0;
max = 0;
M_StartControlPanel(); // can't put menuactive to true
if (currentMenu == &MessageDef) // Prevent recursion
Add message boxes for file add errors
2019-05-02 16:03:50 +00:00
MessageDef.prevMenu = ((demo.playback) ? &PlaybackMenuDef : &MainDef);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
else
MessageDef.prevMenu = currentMenu;
MessageDef.menuitems[0].text = message;
MessageDef.menuitems[0].alphaKey = (UINT8)itemtype;
if (!routine && itemtype != MM_NOTHING) itemtype = MM_NOTHING;
switch (itemtype)
{
case MM_NOTHING:
MessageDef.menuitems[0].status = IT_MSGHANDLER;
MessageDef.menuitems[0].itemaction = M_StopMessage;
break;
case MM_YESNO:
MessageDef.menuitems[0].status = IT_MSGHANDLER;
MessageDef.menuitems[0].itemaction = routine;
break;
case MM_EVENTHANDLER:
MessageDef.menuitems[0].status = IT_MSGHANDLER;
MessageDef.menuitems[0].itemaction = routine;
break;
}
//added : 06-02-98: now draw a textbox around the message
// compute lenght max and the numbers of lines
for (strlines = 0; *(message+start); strlines++)
{
for (i = 0;i < strlen(message+start);i++)
{
if (*(message+start+i) == '\n')
{
if (i > max)
max = i;
start += i;
i = (size_t)-1; //added : 07-02-98 : damned!
start++;
break;
}
}
if (i == strlen(message+start))
Fix an issue where if the last line of an M_StartMessage was the longest, the box width wouldn't account for it.
2022-06-15 16:00:09 +00:00
{
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
start += i;
Fix an issue where if the last line of an M_StartMessage was the longest, the box width wouldn't account for it.
2022-06-15 16:00:09 +00:00
if (i > max)
max = i;
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
MessageDef.x = (INT16)((BASEVIDWIDTH - 8*max-16)/2);
MessageDef.y = (INT16)((BASEVIDHEIGHT - M_StringHeight(message))/2);
MessageDef.lastOn = (INT16)((strlines<<8)+max);
//M_SetupNextMenu();
currentMenu = &MessageDef;
itemOn = 0;
}
#define MAXMSGLINELEN 256
static void M_DrawMessageMenu(void)
{
INT32 y = currentMenu->y;
size_t i, start = 0;
INT16 max;
char string[MAXMSGLINELEN];
INT32 mlines;
const char *msg = currentMenu->menuitems[0].text;
mlines = currentMenu->lastOn>>8;
max = (INT16)((UINT8)(currentMenu->lastOn & 0xFF)*8);
If the game becomes modified during a record attack run, end it RA menu can be opened if the game is modified, but Start can't be selected. (Obvious reason: so scripts to display info can be used easier) Fixed the stupid background for messages in the Record Attack menu, it was bugging me
2016-08-20 05:18:43 +00:00
// hack: draw RA background in RA menus
if (gamestate == GS_TIMEATTACK)
V_DrawPatchFill(W_CachePatchName("SRB2BACK", PU_CACHE));
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
M_DrawTextBox(currentMenu->x, y - 8, (max+7)>>3, mlines);
while (*(msg+start))
{
size_t len = strlen(msg+start);
for (i = 0; i < len; i++)
{
if (*(msg+start+i) == '\n')
{
memset(string, 0, MAXMSGLINELEN);
if (i >= MAXMSGLINELEN)
{
CONS_Printf("M_DrawMessageMenu: too long segment in %s\n", msg);
return;
}
else
{
strncpy(string,msg+start, i);
string[i] = '\0';
start += i;
i = (size_t)-1; //added : 07-02-98 : damned!
start++;
}
break;
}
}
if (i == strlen(msg+start))
{
if (i >= MAXMSGLINELEN)
{
CONS_Printf("M_DrawMessageMenu: too long segment in %s\n", msg);
return;
}
else
{
strcpy(string, msg + start);
start += i;
}
}
V_DrawString((BASEVIDWIDTH - V_StringWidth(string, 0))/2,y,V_ALLOWLOWERCASE,string);
y += 8; //SHORT(hu_font[0]->height);
}
}
// default message handler
static void M_StopMessage(INT32 choice)
{
(void)choice;
if (menuactive)
M_SetupNextMenu(MessageDef.prevMenu);
}
// =========
// IMAGEDEFS
// =========
// Draw an Image Def. Aka, Help images.
// Defines what image is used in (menuitem_t)->text.
// You can even put multiple images in one menu!
static void M_DrawImageDef(void)
{
destroy hw_glide.h because no modern GPU supports such API
2019-03-21 21:23:40 +00:00
patch_t *patch = W_CachePatchName(currentMenu->menuitems[itemOn].text,PU_CACHE);
if (patch->width <= BASEVIDWIDTH)
V_DrawScaledPatch(0,0,0,patch);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
else
destroy hw_glide.h because no modern GPU supports such API
2019-03-21 21:23:40 +00:00
V_DrawSmallScaledPatch(0,0,0,patch);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
* User manual! * Some visual ordering fixes for the item menu, plus a #define-toggleable option for the bottom right slot to be traversable for ease-of-use purposes (even if it doesn't do anything).
2018-09-08 16:02:03 +00:00
if (currentMenu->menuitems[itemOn].alphaKey)
{
More manual pages, plus renaming the option to `Tricks & Secrets (F1)` - PLUS, the magic of a little animated how-to for leafing through the pages. Requires new patch.kart, as I wanted the leading zeroes and Jeck wanted to add more pages without more commits later...
2018-09-10 11:39:59 +00:00
V_DrawString(2,BASEVIDHEIGHT-10, V_YELLOWMAP, va("%d", (itemOn<<1)-1)); // intentionally not highlightflags, unlike below
* User manual! * Some visual ordering fixes for the item menu, plus a #define-toggleable option for the bottom right slot to be traversable for ease-of-use purposes (even if it doesn't do anything).
2018-09-08 16:02:03 +00:00
V_DrawRightAlignedString(BASEVIDWIDTH-2,BASEVIDHEIGHT-10, V_YELLOWMAP, va("%d", itemOn<<1)); // ditto
}
More manual pages, plus renaming the option to `Tricks & Secrets (F1)` - PLUS, the magic of a little animated how-to for leafing through the pages. Requires new patch.kart, as I wanted the leading zeroes and Jeck wanted to add more pages without more commits later...
2018-09-10 11:39:59 +00:00
else
{
final menu tweaks before i fall asleep in my chair
2018-11-14 01:27:01 +00:00
INT32 x = BASEVIDWIDTH>>1, y = (BASEVIDHEIGHT>>1) - 4;
x += (itemOn ? 1 : -1)*((BASEVIDWIDTH>>2) + 10);
More manual pages, plus renaming the option to `Tricks & Secrets (F1)` - PLUS, the magic of a little animated how-to for leafing through the pages. Requires new patch.kart, as I wanted the leading zeroes and Jeck wanted to add more pages without more commits later...
2018-09-10 11:39:59 +00:00
V_DrawCenteredString(x, y-10, highlightflags, "USE ARROW KEYS");
V_DrawCharacter(x - 10 - (skullAnimCounter/5), y,
'\x1C' | highlightflags, false); // left arrow
V_DrawCharacter(x + 2 + (skullAnimCounter/5), y,
'\x1D' | highlightflags, false); // right arrow
V_DrawCenteredString(x, y+10, highlightflags, "TO LEAF THROUGH");
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
// Handles the ImageDefs. Just a specialized function that
// uses left and right movement.
static void M_HandleImageDef(INT32 choice)
{
* User manual! * Some visual ordering fixes for the item menu, plus a #define-toggleable option for the bottom right slot to be traversable for ease-of-use purposes (even if it doesn't do anything).
2018-09-08 16:02:03 +00:00
boolean exitmenu = false;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
switch (choice)
{
case KEY_RIGHTARROW:
* User manual! * Some visual ordering fixes for the item menu, plus a #define-toggleable option for the bottom right slot to be traversable for ease-of-use purposes (even if it doesn't do anything).
2018-09-08 16:02:03 +00:00
if (itemOn >= (INT16)(currentMenu->numitems-1))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
break;
S_StartSound(NULL, sfx_menu1);
* User manual! * Some visual ordering fixes for the item menu, plus a #define-toggleable option for the bottom right slot to be traversable for ease-of-use purposes (even if it doesn't do anything).
2018-09-08 16:02:03 +00:00
itemOn++;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
break;
case KEY_LEFTARROW:
* User manual! * Some visual ordering fixes for the item menu, plus a #define-toggleable option for the bottom right slot to be traversable for ease-of-use purposes (even if it doesn't do anything).
2018-09-08 16:02:03 +00:00
if (!itemOn)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
break;
S_StartSound(NULL, sfx_menu1);
* User manual! * Some visual ordering fixes for the item menu, plus a #define-toggleable option for the bottom right slot to be traversable for ease-of-use purposes (even if it doesn't do anything).
2018-09-08 16:02:03 +00:00
itemOn--;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
break;
case KEY_ESCAPE:
case KEY_ENTER:
* User manual! * Some visual ordering fixes for the item menu, plus a #define-toggleable option for the bottom right slot to be traversable for ease-of-use purposes (even if it doesn't do anything).
2018-09-08 16:02:03 +00:00
exitmenu = true;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
break;
}
* User manual! * Some visual ordering fixes for the item menu, plus a #define-toggleable option for the bottom right slot to be traversable for ease-of-use purposes (even if it doesn't do anything).
2018-09-08 16:02:03 +00:00
if (exitmenu)
{
if (currentMenu->prevMenu)
M_SetupNextMenu(currentMenu->prevMenu);
else
M_ClearMenus(true);
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
// ======================
// MISC MAIN MENU OPTIONS
// ======================
Addons menu. Bitch.
2018-08-28 20:08:47 +00:00
static void M_AddonsOptions(INT32 choice)
{
(void)choice;
Addons_option_Onchange();
M_SetupNextMenu(&OP_AddonsOptionsDef);
}
Use "addons" instead of "add-ons" for consistency
2020-04-22 07:24:59 +00:00
#define LOCATIONSTRING1 "Visit \x83SRB2.ORG/MODS\x80 to get & make addons!"
#define LOCATIONSTRING2 "Visit \x88SRB2.ORG/MODS\x80 to get & make addons!"
Addons menu. Bitch.
2018-08-28 20:08:47 +00:00
static void M_Addons(INT32 choice)
{
const char *pathname = ".";
(void)choice;
#if 1
if (cv_addons_option.value == 0)
pathname = usehome ? srb2home : srb2path;
else if (cv_addons_option.value == 1)
pathname = srb2home;
else if (cv_addons_option.value == 2)
pathname = srb2path;
else
#endif
if (cv_addons_option.value == 3 && *cv_addons_folder.string != '\0')
pathname = cv_addons_folder.string;
strlcpy(menupath, pathname, 1024);
menupathindex[(menudepthleft = menudepth-1)] = strlen(menupath) + 1;
if (menupath[menupathindex[menudepthleft]-2] != PATHSEP[0])
{
menupath[menupathindex[menudepthleft]-1] = PATHSEP[0];
menupath[menupathindex[menudepthleft]] = 0;
}
else
--menupathindex[menudepthleft];
Start on the replay hut menu!
2019-03-31 01:57:53 +00:00
if (!preparefilemenu(false, false))
Addons menu. Bitch.
2018-08-28 20:08:47 +00:00
{
M_StartMessage(va("No files/folders found.\n\n%s\n\n(Press a key)\n", (recommendedflags == V_SKYMAP ? LOCATIONSTRING2 : LOCATIONSTRING1)),NULL,MM_NOTHING);
return;
}
else
dir_on[menudepthleft] = 0;
if (addonsp[0]) // never going to have some provided but not all, saves individually checking
{
size_t i;
for (i = 0; i < NUM_EXT+5; i++)
W_UnlockCachedPatch(addonsp[i]);
}
addonsp[EXT_FOLDER] = W_CachePatchName("M_FFLDR", PU_STATIC);
addonsp[EXT_UP] = W_CachePatchName("M_FBACK", PU_STATIC);
addonsp[EXT_NORESULTS] = W_CachePatchName("M_FNOPE", PU_STATIC);
addonsp[EXT_TXT] = W_CachePatchName("M_FTXT", PU_STATIC);
addonsp[EXT_CFG] = W_CachePatchName("M_FCFG", PU_STATIC);
addonsp[EXT_WAD] = W_CachePatchName("M_FWAD", PU_STATIC);
Hide kart-specific addons behavior behind USE_KART
2018-12-16 21:07:47 +00:00
#ifdef USE_KART
* Add support for .kart files. * Wrap behind-the-scenes `addfile/exec` contents in quotation marks to allow for files with spaces in them.
2018-08-29 13:19:08 +00:00
addonsp[EXT_KART] = W_CachePatchName("M_FKART", PU_STATIC);
Hide kart-specific addons behavior behind USE_KART
2018-12-16 21:07:47 +00:00
#endif
Enable pk3 in addons menu
2018-11-29 15:07:53 +00:00
addonsp[EXT_PK3] = W_CachePatchName("M_FPK3", PU_STATIC);
Addons menu. Bitch.
2018-08-28 20:08:47 +00:00
addonsp[EXT_SOC] = W_CachePatchName("M_FSOC", PU_STATIC);
addonsp[EXT_LUA] = W_CachePatchName("M_FLUA", PU_STATIC);
addonsp[NUM_EXT] = W_CachePatchName("M_FUNKN", PU_STATIC);
addonsp[NUM_EXT+1] = W_CachePatchName("M_FSEL", PU_STATIC);
addonsp[NUM_EXT+2] = W_CachePatchName("M_FLOAD", PU_STATIC);
addonsp[NUM_EXT+3] = W_CachePatchName("M_FSRCH", PU_STATIC);
addonsp[NUM_EXT+4] = W_CachePatchName("M_FSAVE", PU_STATIC);
MISC_AddonsDef.prevMenu = currentMenu;
M_SetupNextMenu(&MISC_AddonsDef);
}
#define width 4
#define vpadding 27
#define h (BASEVIDHEIGHT-(2*vpadding))
#define NUMCOLOURS 8 // when toast's coding it's british english hacker fucker
static void M_DrawTemperature(INT32 x, fixed_t t)
{
INT32 y;
// bounds check
if (t > FRACUNIT)
t = FRACUNIT;
/*else if (t < 0) -- not needed
t = 0;*/
// scale
if (t > 1)
t = (FixedMul(h<<FRACBITS, t)>>FRACBITS);
// border
V_DrawFill(x - 1, vpadding, 1, h, 120);
V_DrawFill(x + width, vpadding, 1, h, 120);
V_DrawFill(x - 1, vpadding-1, width+2, 1, 120);
V_DrawFill(x - 1, vpadding+h, width+2, 1, 120);
// bar itself
y = h;
if (t)
for (t = h - t; y > 0; y--)
{
UINT8 colours[NUMCOLOURS] = {135, 133, 92, 77, 114, 178, 161, 162};
UINT8 c;
if (y <= t) break;
if (y+vpadding >= BASEVIDHEIGHT/2)
c = 185;
else
c = colours[(NUMCOLOURS*(y-1))/(h/2)];
V_DrawFill(x, y-1 + vpadding, width, 1, c);
}
// fill the rest of the backing
if (y)
V_DrawFill(x, vpadding, width, y, 30);
}
#undef width
#undef vpadding
#undef h
#undef NUMCOLOURS
static char *M_AddonsHeaderPath(void)
{
UINT32 len;
static char header[1024];
strlcpy(header, va("%s folder%s", cv_addons_option.string, menupath+menupathindex[menudepth-1]-1), 1024);
len = strlen(header);
if (len > 34)
{
len = len-34;
header[len] = header[len+1] = header[len+2] = '.';
}
else
len = 0;
return header+len;
}
final menu tweaks before i fall asleep in my chair
2018-11-14 01:27:01 +00:00
#define UNEXIST S_StartSound(NULL, sfx_s26d);\
Addons menu. Bitch.
2018-08-28 20:08:47 +00:00
M_SetupNextMenu(MISC_AddonsDef.prevMenu);\
M_StartMessage(va("\x82%s\x80\nThis folder no longer exists!\nAborting to main menu.\n\n(Press a key)\n", M_AddonsHeaderPath()),NULL,MM_NOTHING)
#define CLEARNAME Z_Free(refreshdirname);\
refreshdirname = NULL
* Increased leniency for SOC wrt "major mods". * If your file defines state and object freeslots in SOC, you are allowed to modify those freeslots IN ANY SOC SCRIPT IN THE SAME FILE without being marked as a "major mod". * If your file contains broken unlockables/emblems that don't actually have effect for any reason, it's not counted as a "major mod". * Added add-ons menu message for adding a "major mod".
2019-01-17 20:51:41 +00:00
static boolean prevmajormods = false;
Addons menu. Bitch.
2018-08-28 20:08:47 +00:00
static void M_AddonsClearName(INT32 choice)
{
* Refactor all instances of `majormods = true;` to route through G_SetGameModified, and catch a few spots I missed in the process. * Make G_SetGameModified only console-print for major mods. * Add amnesty to "major mod" detection while loading files with custom savedatas. * Improved the console prints for command `isgamemodified`.
2019-01-17 22:01:28 +00:00
if (!majormods || prevmajormods)
* Increased leniency for SOC wrt "major mods". * If your file defines state and object freeslots in SOC, you are allowed to modify those freeslots IN ANY SOC SCRIPT IN THE SAME FILE without being marked as a "major mod". * If your file contains broken unlockables/emblems that don't actually have effect for any reason, it's not counted as a "major mod". * Added add-ons menu message for adding a "major mod".
2019-01-17 20:51:41 +00:00
{
CLEARNAME;
}
Addons menu. Bitch.
2018-08-28 20:08:47 +00:00
M_StopMessage(choice);
}
// returns whether to do message draw
static boolean M_AddonsRefresh(void)
{
Start on the replay hut menu!
2019-03-31 01:57:53 +00:00
if ((refreshdirmenu & REFRESHDIR_NORMAL) && !preparefilemenu(true, false))
Addons menu. Bitch.
2018-08-28 20:08:47 +00:00
{
UNEXIST;
* Did some reviewing, turns out there's literally no reason to disable savemoddata when majormods gets tripped and it's just a stupid thing vanilla did for modifiedgame for some reason that we almost inherited with our new solution? * Adjusted the save system to acknowledge the new status quo. Instead of trying to save modifiedgame in the file like some sort of extremely boneheaded honour system everyone and their mothers hacks around, we just use it to determine whether the save is for a mod with savedata or not (this keeps backwards compatibility based on how we were using it, anyways, especially with the *force* parameter...) * Added a menu message for attempting to play a demo set on a map that isn't loaded, as opposed to letting it I_Error. * Minor tweaks to addons menu representing modded status.
2019-01-28 16:32:07 +00:00
if (refreshdirname)
{
CLEARNAME;
}
Addons menu. Bitch.
2018-08-28 20:08:47 +00:00
return true;
}
* Refactor all instances of `majormods = true;` to route through G_SetGameModified, and catch a few spots I missed in the process. * Make G_SetGameModified only console-print for major mods. * Add amnesty to "major mod" detection while loading files with custom savedatas. * Improved the console prints for command `isgamemodified`.
2019-01-17 22:01:28 +00:00
if (!majormods && prevmajormods)
prevmajormods = false;
if ((refreshdirmenu & REFRESHDIR_ADDFILE) || (majormods && !prevmajormods))
Addons menu. Bitch.
2018-08-28 20:08:47 +00:00
{
char *message = NULL;
if (refreshdirmenu & REFRESHDIR_NOTLOADED)
{
final menu tweaks before i fall asleep in my chair
2018-11-14 01:27:01 +00:00
S_StartSound(NULL, sfx_s26d);
Addons menu. Bitch.
2018-08-28 20:08:47 +00:00
if (refreshdirmenu & REFRESHDIR_MAX)
Use "addons" instead of "add-ons" for consistency
2020-04-22 07:24:59 +00:00
message = va("%c%s\x80\nMaximum number of addons reached.\nA file could not be loaded.\nIf you wish to play with this addon, restart the game to clear existing ones.\n\n(Press a key)\n", ('\x80' + (highlightflags>>V_CHARCOLORSHIFT)), refreshdirname);
Addons menu. Bitch.
2018-08-28 20:08:47 +00:00
else
message = va("%c%s\x80\nA file was not loaded.\nCheck the console log for more information.\n\n(Press a key)\n", ('\x80' + (highlightflags>>V_CHARCOLORSHIFT)), refreshdirname);
}
else if (refreshdirmenu & (REFRESHDIR_WARNING|REFRESHDIR_ERROR))
{
final menu tweaks before i fall asleep in my chair
2018-11-14 01:27:01 +00:00
S_StartSound(NULL, sfx_s224);
Addons menu. Bitch.
2018-08-28 20:08:47 +00:00
message = va("%c%s\x80\nA file was loaded with %s.\nCheck the console log for more information.\n\n(Press a key)\n", ('\x80' + (highlightflags>>V_CHARCOLORSHIFT)), refreshdirname, ((refreshdirmenu & REFRESHDIR_ERROR) ? "errors" : "warnings"));
}
Code cleanup as requested by Sal and Sryder. * majormods and savemoddata cannot coexist as true values, so going through and making situations that involve both only reference one. * Clean up comments in `dehacked.c`.
2019-01-26 16:58:45 +00:00
else if (majormods && !prevmajormods)
* Increased leniency for SOC wrt "major mods". * If your file defines state and object freeslots in SOC, you are allowed to modify those freeslots IN ANY SOC SCRIPT IN THE SAME FILE without being marked as a "major mod". * If your file contains broken unlockables/emblems that don't actually have effect for any reason, it's not counted as a "major mod". * Added add-ons menu message for adding a "major mod".
2019-01-17 20:51:41 +00:00
{
S_StartSound(NULL, sfx_s221);
Clarify addon-related messages
2020-08-05 05:40:56 +00:00
message = va("%c%s\x80\nYou've loaded a gameplay-modifying addon.\n\nRecord Attack has been disabled, but you\ncan still play alone in local Multiplayer.\n\nIf you wish to play Record Attack mode, restart the game to disable loaded addons.\n\n(Press a key)\n", ('\x80' + (highlightflags>>V_CHARCOLORSHIFT)), refreshdirname);
* Increased leniency for SOC wrt "major mods". * If your file defines state and object freeslots in SOC, you are allowed to modify those freeslots IN ANY SOC SCRIPT IN THE SAME FILE without being marked as a "major mod". * If your file contains broken unlockables/emblems that don't actually have effect for any reason, it's not counted as a "major mod". * Added add-ons menu message for adding a "major mod".
2019-01-17 20:51:41 +00:00
prevmajormods = majormods;
}
Addons menu. Bitch.
2018-08-28 20:08:47 +00:00
if (message)
{
M_StartMessage(message,M_AddonsClearName,MM_EVENTHANDLER);
return true;
}
final menu tweaks before i fall asleep in my chair
2018-11-14 01:27:01 +00:00
S_StartSound(NULL, sfx_s221);
Addons menu. Bitch.
2018-08-28 20:08:47 +00:00
CLEARNAME;
}
return false;
}
static void M_DrawAddons(void)
{
INT32 x, y;
Add a scroll bar to the addons menu. Should hopefully make the temperature gauge a little less problematic...
2018-09-23 12:22:00 +00:00
ssize_t i, m;
Addons menu. Bitch.
2018-08-28 20:08:47 +00:00
const UINT8 *flashcol = NULL;
Add a scroll bar to the addons menu. Should hopefully make the temperature gauge a little less problematic...
2018-09-23 12:22:00 +00:00
UINT8 hilicol;
Addons menu. Bitch.
2018-08-28 20:08:47 +00:00
// hack - need to refresh at end of frame to handle addfile...
if (refreshdirmenu & M_AddonsRefresh())
{
M_DrawMessageMenu();
return;
}
if (Playing())
V_DrawCenteredString(BASEVIDWIDTH/2, 5, warningflags, "Adding files mid-game may cause problems.");
else
V_DrawCenteredString(BASEVIDWIDTH/2, 5, 0, (recommendedflags == V_SKYMAP ? LOCATIONSTRING2 : LOCATIONSTRING1));
if (numwadfiles <= mainwads+1)
y = 0;
else if (numwadfiles >= MAX_WADFILES)
y = FRACUNIT;
else
{
Strip out things that limit wad files added by filename
2019-04-18 04:09:10 +00:00
y = FixedDiv(((ssize_t)(numwadfiles) - (ssize_t)(mainwads+1))<<FRACBITS, ((ssize_t)MAX_WADFILES - (ssize_t)(mainwads+1))<<FRACBITS);
Addons menu. Bitch.
2018-08-28 20:08:47 +00:00
if (y > FRACUNIT) // happens because of how we're shrinkin' it a little
y = FRACUNIT;
}
M_DrawTemperature(BASEVIDWIDTH - 19 - 5, y);
// DRAW MENU
x = currentMenu->x;
y = currentMenu->y + 1;
Add a scroll bar to the addons menu. Should hopefully make the temperature gauge a little less problematic...
2018-09-23 12:22:00 +00:00
hilicol = V_GetStringColormap(highlightflags)[120];
Addons menu. Bitch.
2018-08-28 20:08:47 +00:00
V_DrawString(x-21, (y - 16) + (lsheadingheight - 12), highlightflags|V_ALLOWLOWERCASE, M_AddonsHeaderPath());
Add a scroll bar to the addons menu. Should hopefully make the temperature gauge a little less problematic...
2018-09-23 12:22:00 +00:00
V_DrawFill(x-21, (y - 16) + (lsheadingheight - 3), MAXSTRINGLENGTH*8+6, 1, hilicol);
Addons menu. Bitch.
2018-08-28 20:08:47 +00:00
V_DrawFill(x-21, (y - 16) + (lsheadingheight - 2), MAXSTRINGLENGTH*8+6, 1, 30);
Add a scroll bar to the addons menu. Should hopefully make the temperature gauge a little less problematic...
2018-09-23 12:22:00 +00:00
m = (BASEVIDHEIGHT - currentMenu->y + 2) - (y - 1);
V_DrawFill(x - 21, y - 1, MAXSTRINGLENGTH*8+6, m, 239);
// scrollbar!
if (sizedirmenu <= (2*numaddonsshown + 1))
i = 0;
else
{
ssize_t q = m;
m = ((2*numaddonsshown + 1) * m)/sizedirmenu;
if (dir_on[menudepthleft] <= numaddonsshown) // all the way up
i = 0;
else if (sizedirmenu <= (dir_on[menudepthleft] + numaddonsshown + 1)) // all the way down
i = q-m;
else
i = ((dir_on[menudepthleft] - numaddonsshown) * (q-m))/(sizedirmenu - (2*numaddonsshown + 1));
}
V_DrawFill(x + MAXSTRINGLENGTH*8+5 - 21, (y - 1) + i, 1, m, hilicol);
Addons menu. Bitch.
2018-08-28 20:08:47 +00:00
// get bottom...
Add a scroll bar to the addons menu. Should hopefully make the temperature gauge a little less problematic...
2018-09-23 12:22:00 +00:00
m = dir_on[menudepthleft] + numaddonsshown + 1;
if (m > (ssize_t)sizedirmenu)
m = sizedirmenu;
Addons menu. Bitch.
2018-08-28 20:08:47 +00:00
Better rewrite for addons draw adjustment [Kart]
2019-01-03 00:58:21 +00:00
// then compute top and adjust bottom if needed!
if (m < (2*numaddonsshown + 1))
Addons menu. Bitch.
2018-08-28 20:08:47 +00:00
{
Better rewrite for addons draw adjustment [Kart]
2019-01-03 00:58:21 +00:00
m = min(sizedirmenu, 2*numaddonsshown + 1);
Addons menu. Bitch.
2018-08-28 20:08:47 +00:00
i = 0;
}
Better rewrite for addons draw adjustment [Kart]
2019-01-03 00:58:21 +00:00
else
i = m - (2*numaddonsshown + 1);
Addons menu. Bitch.
2018-08-28 20:08:47 +00:00
if (i != 0)
V_DrawString(19, y+4 - (skullAnimCounter/5), highlightflags, "\x1A");
if (skullAnimCounter < 4)
flashcol = V_GetStringColormap(highlightflags);
Add a scroll bar to the addons menu. Should hopefully make the temperature gauge a little less problematic...
2018-09-23 12:22:00 +00:00
for (; i < m; i++)
Addons menu. Bitch.
2018-08-28 20:08:47 +00:00
{
UINT32 flags = V_ALLOWLOWERCASE;
if (y > BASEVIDHEIGHT) break;
if (dirmenu[i])
#define type (UINT8)(dirmenu[i][DIR_TYPE])
{
if (type & EXT_LOADED)
Somehow butchered the code cleanliness (indentation/not taking advantage of a macro I defined specifically for this) here a little by accident - tidied up.
2018-09-23 12:34:49 +00:00
{
flags |= V_TRANSLUCENT;
V_DrawSmallScaledPatch(x-(16+4), y, V_TRANSLUCENT, addonsp[(type & ~EXT_LOADED)]);
Addons menu. Bitch.
2018-08-28 20:08:47 +00:00
V_DrawSmallScaledPatch(x-(16+4), y, 0, addonsp[NUM_EXT+2]);
Somehow butchered the code cleanliness (indentation/not taking advantage of a macro I defined specifically for this) here a little by accident - tidied up.
2018-09-23 12:34:49 +00:00
}
else
V_DrawSmallScaledPatch(x-(16+4), y, 0, addonsp[(type & ~EXT_LOADED)]);
Addons menu. Bitch.
2018-08-28 20:08:47 +00:00
if ((size_t)i == dir_on[menudepthleft])
{
V_DrawFixedPatch((x-(16+4))<<FRACBITS, (y)<<FRACBITS, FRACUNIT/2, 0, addonsp[NUM_EXT+1], flashcol);
flags = V_ALLOWLOWERCASE|highlightflags;
}
#define charsonside 14
if (dirmenu[i][DIR_LEN] > (charsonside*2 + 3))
V_DrawString(x, y+4, flags, va("%.*s...%s", charsonside, dirmenu[i]+DIR_STRING, dirmenu[i]+DIR_STRING+dirmenu[i][DIR_LEN]-(charsonside+1)));
#undef charsonside
else
V_DrawString(x, y+4, flags, dirmenu[i]+DIR_STRING);
}
#undef type
y += 16;
}
Add a scroll bar to the addons menu. Should hopefully make the temperature gauge a little less problematic...
2018-09-23 12:22:00 +00:00
if (m != (ssize_t)sizedirmenu)
Addons menu. Bitch.
2018-08-28 20:08:47 +00:00
V_DrawString(19, y-12 + (skullAnimCounter/5), highlightflags, "\x1B");
y = BASEVIDHEIGHT - currentMenu->y + 1;
M_DrawTextBox(x - (21 + 5), y, MAXSTRINGLENGTH, 1);
if (menusearch[0])
V_DrawString(x - 18, y + 8, V_ALLOWLOWERCASE, menusearch+1);
else
V_DrawString(x - 18, y + 8, V_ALLOWLOWERCASE|V_TRANSLUCENT, "Type to search...");
if (skullAnimCounter < 4)
V_DrawCharacter(x - 18 + V_StringWidth(menusearch+1, 0), y + 8,
'_' | 0x80, false);
x -= (21 + 5 + 16);
V_DrawSmallScaledPatch(x, y + 4, (menusearch[0] ? 0 : V_TRANSLUCENT), addonsp[NUM_EXT+3]);
x = BASEVIDWIDTH - x - 16;
* Did some reviewing, turns out there's literally no reason to disable savemoddata when majormods gets tripped and it's just a stupid thing vanilla did for modifiedgame for some reason that we almost inherited with our new solution? * Adjusted the save system to acknowledge the new status quo. Instead of trying to save modifiedgame in the file like some sort of extremely boneheaded honour system everyone and their mothers hacks around, we just use it to determine whether the save is for a mod with savedata or not (this keeps backwards compatibility based on how we were using it, anyways, especially with the *force* parameter...) * Added a menu message for attempting to play a demo set on a map that isn't loaded, as opposed to letting it I_Error. * Minor tweaks to addons menu representing modded status.
2019-01-28 16:32:07 +00:00
V_DrawSmallScaledPatch(x, y + 4, ((!majormods) ? 0 : V_TRANSLUCENT), addonsp[NUM_EXT+4]);
Addons menu. Bitch.
2018-08-28 20:08:47 +00:00
if (modifiedgame)
V_DrawSmallScaledPatch(x, y + 4, 0, addonsp[NUM_EXT+2]);
}
static void M_AddonExec(INT32 ch)
{
if (ch != 'y' && ch != KEY_ENTER)
return;
S_StartSound(NULL, sfx_zoom);
* Add support for .kart files. * Wrap behind-the-scenes `addfile/exec` contents in quotation marks to allow for files with spaces in them.
2018-08-29 13:19:08 +00:00
COM_BufAddText(va("exec \"%s%s\"", menupath, dirmenu[dir_on[menudepthleft]]+DIR_STRING));
Addons menu. Bitch.
2018-08-28 20:08:47 +00:00
}
#define len menusearch[0]
static boolean M_ChangeStringAddons(INT32 choice)
{
if (shiftdown && choice >= 32 && choice <= 127)
choice = shiftxform[choice];
switch (choice)
{
case KEY_DEL:
if (len)
{
len = menusearch[1] = 0;
return true;
}
break;
case KEY_BACKSPACE:
if (len)
{
menusearch[1+--len] = 0;
return true;
}
break;
default:
if (choice >= 32 && choice <= 127)
{
if (len < MAXSTRINGLENGTH - 1)
{
menusearch[1+len++] = (char)choice;
menusearch[1+len] = 0;
return true;
}
}
break;
}
return false;
}
#undef len
static void M_HandleAddons(INT32 choice)
{
boolean exitmenu = false; // exit to previous menu
if (M_ChangeStringAddons(choice))
{
char *tempname = NULL;
if (dirmenu && dirmenu[dir_on[menudepthleft]])
tempname = Z_StrDup(dirmenu[dir_on[menudepthleft]]+DIR_STRING); // don't need to I_Error if can't make - not important, just QoL
The pipeline halted for some reason, so here's the smallest possible legitimate change to bump it back into action: Replacing commenting-out with `#ifdef`ing.
2018-09-23 15:13:58 +00:00
#if 0 // much slower
Start on the replay hut menu!
2019-03-31 01:57:53 +00:00
if (!preparefilemenu(true, false))
Addons menu. Bitch.
2018-08-28 20:08:47 +00:00
{
UNEXIST;
return;
The pipeline halted for some reason, so here's the smallest possible legitimate change to bump it back into action: Replacing commenting-out with `#ifdef`ing.
2018-09-23 15:13:58 +00:00
}
#else // streamlined
searchfilemenu(tempname);
#endif
Addons menu. Bitch.
2018-08-28 20:08:47 +00:00
}
switch (choice)
{
case KEY_DOWNARROW:
if (dir_on[menudepthleft] < sizedirmenu-1)
dir_on[menudepthleft]++;
S_StartSound(NULL, sfx_menu1);
break;
case KEY_UPARROW:
if (dir_on[menudepthleft])
dir_on[menudepthleft]--;
S_StartSound(NULL, sfx_menu1);
break;
case KEY_PGDN:
{
UINT8 i;
for (i = numaddonsshown; i && (dir_on[menudepthleft] < sizedirmenu-1); i--)
dir_on[menudepthleft]++;
}
S_StartSound(NULL, sfx_menu1);
break;
case KEY_PGUP:
{
UINT8 i;
for (i = numaddonsshown; i && (dir_on[menudepthleft]); i--)
dir_on[menudepthleft]--;
}
S_StartSound(NULL, sfx_menu1);
break;
case KEY_ENTER:
{
boolean refresh = true;
if (!dirmenu[dir_on[menudepthleft]])
final menu tweaks before i fall asleep in my chair
2018-11-14 01:27:01 +00:00
S_StartSound(NULL, sfx_s26d);
Addons menu. Bitch.
2018-08-28 20:08:47 +00:00
else
{
switch (dirmenu[dir_on[menudepthleft]][DIR_TYPE])
{
case EXT_FOLDER:
strcpy(&menupath[menupathindex[menudepthleft]],dirmenu[dir_on[menudepthleft]]+DIR_STRING);
if (menudepthleft)
{
menupathindex[--menudepthleft] = strlen(menupath);
menupath[menupathindex[menudepthleft]] = 0;
Start on the replay hut menu!
2019-03-31 01:57:53 +00:00
if (!preparefilemenu(false, false))
Addons menu. Bitch.
2018-08-28 20:08:47 +00:00
{
final menu tweaks before i fall asleep in my chair
2018-11-14 01:27:01 +00:00
S_StartSound(NULL, sfx_s224);
Addons menu. Bitch.
2018-08-28 20:08:47 +00:00
M_StartMessage(va("%c%s\x80\nThis folder is empty.\n\n(Press a key)\n", ('\x80' + (highlightflags>>V_CHARCOLORSHIFT)), M_AddonsHeaderPath()),NULL,MM_NOTHING);
menupath[menupathindex[++menudepthleft]] = 0;
Start on the replay hut menu!
2019-03-31 01:57:53 +00:00
if (!preparefilemenu(true, false))
Addons menu. Bitch.
2018-08-28 20:08:47 +00:00
{
UNEXIST;
return;
}
}
else
{
S_StartSound(NULL, sfx_menu1);
dir_on[menudepthleft] = 1;
}
refresh = false;
}
else
{
final menu tweaks before i fall asleep in my chair
2018-11-14 01:27:01 +00:00
S_StartSound(NULL, sfx_s26d);
Addons menu. Bitch.
2018-08-28 20:08:47 +00:00
M_StartMessage(va("%c%s\x80\nThis folder is too deep to navigate to!\n\n(Press a key)\n", ('\x80' + (highlightflags>>V_CHARCOLORSHIFT)), M_AddonsHeaderPath()),NULL,MM_NOTHING);
menupath[menupathindex[menudepthleft]] = 0;
}
break;
case EXT_UP:
S_StartSound(NULL, sfx_menu1);
menupath[menupathindex[++menudepthleft]] = 0;
Start on the replay hut menu!
2019-03-31 01:57:53 +00:00
if (!preparefilemenu(false, false))
Addons menu. Bitch.
2018-08-28 20:08:47 +00:00
{
UNEXIST;
return;
}
break;
case EXT_TXT:
M_StartMessage(va("%c%s\x80\nThis file may not be a console script.\nAttempt to run anyways? \n\n(Press 'Y' to confirm)\n", ('\x80' + (highlightflags>>V_CHARCOLORSHIFT)), dirmenu[dir_on[menudepthleft]]+DIR_STRING),M_AddonExec,MM_YESNO);
break;
case EXT_CFG:
M_AddonExec(KEY_ENTER);
break;
case EXT_LUA:
#ifndef HAVE_BLUA
final menu tweaks before i fall asleep in my chair
2018-11-14 01:27:01 +00:00
S_StartSound(NULL, sfx_s26d);
merge srb2 next
2019-01-05 20:59:23 +00:00
M_StartMessage(va("%c%s\x80\nThis version of SRB2Kart does not\nhave support for .lua files.\n\n(Press a key)\n", ('\x80' + (highlightflags>>V_CHARCOLORSHIFT)), dirmenu[dir_on[menudepthleft]]+DIR_STRING),NULL,MM_NOTHING);
Addons menu. Bitch.
2018-08-28 20:08:47 +00:00
break;
#endif
// else intentional fallthrough
case EXT_SOC:
case EXT_WAD:
Hide kart-specific addons behavior behind USE_KART
2018-12-16 21:07:47 +00:00
#ifdef USE_KART
* Add support for .kart files. * Wrap behind-the-scenes `addfile/exec` contents in quotation marks to allow for files with spaces in them.
2018-08-29 13:19:08 +00:00
case EXT_KART:
Hide kart-specific addons behavior behind USE_KART
2018-12-16 21:07:47 +00:00
#endif
Enable pk3 in addons menu
2018-11-29 15:07:53 +00:00
case EXT_PK3:
* Add support for .kart files. * Wrap behind-the-scenes `addfile/exec` contents in quotation marks to allow for files with spaces in them.
2018-08-29 13:19:08 +00:00
COM_BufAddText(va("addfile \"%s%s\"", menupath, dirmenu[dir_on[menudepthleft]]+DIR_STRING));
Addons menu. Bitch.
2018-08-28 20:08:47 +00:00
break;
default:
final menu tweaks before i fall asleep in my chair
2018-11-14 01:27:01 +00:00
S_StartSound(NULL, sfx_s26d);
Addons menu. Bitch.
2018-08-28 20:08:47 +00:00
}
}
if (refresh)
refreshdirmenu |= REFRESHDIR_NORMAL;
}
break;
case KEY_ESCAPE:
exitmenu = true;
break;
default:
break;
}
if (exitmenu)
{
closefilemenu(true);
This isn't vanilla, don't be a shit about secrets and addfile (plus it helps that this fixes a crash)
2018-09-09 14:17:41 +00:00
// Secret menu!
//MainMenu[secrets].status = (M_AnySecretUnlocked()) ? (IT_STRING | IT_CALL) : (IT_DISABLED);
Addons menu. Bitch.
2018-08-28 20:08:47 +00:00
if (currentMenu->prevMenu)
M_SetupNextMenu(currentMenu->prevMenu);
else
M_ClearMenus(true);
}
}
Start on the replay hut menu!
2019-03-31 01:57:53 +00:00
// ---- REPLAY HUT -----
List demos by title in the replay hut
2019-03-31 06:22:41 +00:00
menudemo_t *demolist;
Start on the replay hut menu!
2019-03-31 01:57:53 +00:00
Display infobox for the currently-selected replay
2019-03-31 07:54:09 +00:00
#define DF_ENCORE 0x40
static INT16 replayScrollTitle = 0;
Turn the INT8's into SINT8's
2019-04-09 18:34:34 +00:00
static SINT8 replayScrollDelay = TICRATE, replayScrollDir = 1;
Start on the replay hut menu!
2019-03-31 01:57:53 +00:00
List demos by title in the replay hut
2019-03-31 06:22:41 +00:00
static void PrepReplayList(void)
{
size_t i;
if (demolist)
Z_Free(demolist);
demolist = Z_Calloc(sizeof(menudemo_t) * sizedirmenu, PU_STATIC, NULL);
for (i = 0; i < sizedirmenu; i++)
{
Support directory navigation properly
2019-03-31 21:28:18 +00:00
if (dirmenu[i][DIR_TYPE] == EXT_UP)
{
demolist[i].type = MD_SUBDIR;
sprintf(demolist[i].title, "UP");
}
else if (dirmenu[i][DIR_TYPE] == EXT_FOLDER)
List demos by title in the replay hut
2019-03-31 06:22:41 +00:00
{
demolist[i].type = MD_SUBDIR;
strncpy(demolist[i].title, dirmenu[i] + DIR_STRING, 64);
}
else
{
demolist[i].type = MD_NOTLOADED;
snprintf(demolist[i].filepath, 255, "%s%s", menupath, dirmenu[i] + DIR_STRING);
sprintf(demolist[i].title, ".....");
}
}
}
Return to replay hut after watching a replay
2019-04-01 00:26:53 +00:00
void M_ReplayHut(INT32 choice)
Start on the replay hut menu!
2019-03-31 01:57:53 +00:00
{
(void)choice;
Return to replay hut after watching a replay
2019-04-01 00:26:53 +00:00
if (!demo.inreplayhut)
Enable exiting and playing demos from replay hut properly
2019-03-31 18:50:20 +00:00
{
snprintf(menupath, 1024, "%s"PATHSEP"replay"PATHSEP"online"PATHSEP, srb2home);
menupathindex[(menudepthleft = menudepth-1)] = strlen(menupath);
}
Start on the replay hut menu!
2019-03-31 01:57:53 +00:00
if (!preparefilemenu(false, true))
{
M_StartMessage("No replays found.\n\n(Press a key)\n", NULL, MM_NOTHING);
return;
}
Return to replay hut after watching a replay
2019-04-01 00:26:53 +00:00
else if (!demo.inreplayhut)
Start on the replay hut menu!
2019-03-31 01:57:53 +00:00
dir_on[menudepthleft] = 0;
Return to replay hut after watching a replay
2019-04-01 00:26:53 +00:00
demo.inreplayhut = true;
Start on the replay hut menu!
2019-03-31 01:57:53 +00:00
Read and write standings to replays
2019-04-01 20:07:27 +00:00
replayScrollTitle = 0; replayScrollDelay = TICRATE; replayScrollDir = 1;
List demos by title in the replay hut
2019-03-31 06:22:41 +00:00
PrepReplayList();
Return to replay hut after watching a replay
2019-04-01 00:26:53 +00:00
menuactive = true;
Start on the replay hut menu!
2019-03-31 01:57:53 +00:00
M_SetupNextMenu(&MISC_ReplayHutDef);
G_SetGamestate(GS_TIMEATTACK);
Fix being able to carry rewind state where it shouldn't be
2019-04-13 19:22:48 +00:00
demo.rewinding = false;
Replay playback changes: - Store level state periodically - Load the closest usable level state when done rewinding for quicker resumes - Make playback menu fade out after 5 seconds of no activity (but not while paused) - Remove wrapping from replay hut (original wrapping was broken at some point before 1.1 and it's not necessary anyway) - Allow holding enter on frame advance for noisy slow-mo from fickleheart
2019-10-28 16:14:51 +00:00
CL_ClearRewinds();
Fix being able to carry rewind state where it shouldn't be
2019-04-13 19:22:48 +00:00
Start on the replay hut menu!
2019-03-31 01:57:53 +00:00
S_ChangeMusicInternal("replst", true);
}
List demos by title in the replay hut
2019-03-31 06:22:41 +00:00
static void M_HandleReplayHutList(INT32 choice)
{
switch (choice)
{
case KEY_UPARROW:
Support directory navigation properly
2019-03-31 21:28:18 +00:00
if (dir_on[menudepthleft])
dir_on[menudepthleft]--;
List demos by title in the replay hut
2019-03-31 06:22:41 +00:00
else
Replay playback changes: - Store level state periodically - Load the closest usable level state when done rewinding for quicker resumes - Make playback menu fade out after 5 seconds of no activity (but not while paused) - Remove wrapping from replay hut (original wrapping was broken at some point before 1.1 and it's not necessary anyway) - Allow holding enter on frame advance for noisy slow-mo from fickleheart
2019-10-28 16:14:51 +00:00
return;
//M_PrevOpt();
List demos by title in the replay hut
2019-03-31 06:22:41 +00:00
S_StartSound(NULL, sfx_menu1);
Display infobox for the currently-selected replay
2019-03-31 07:54:09 +00:00
replayScrollTitle = 0; replayScrollDelay = TICRATE; replayScrollDir = 1;
List demos by title in the replay hut
2019-03-31 06:22:41 +00:00
break;
case KEY_DOWNARROW:
Support directory navigation properly
2019-03-31 21:28:18 +00:00
if (dir_on[menudepthleft] < sizedirmenu-1)
dir_on[menudepthleft]++;
List demos by title in the replay hut
2019-03-31 06:22:41 +00:00
else
Replay playback changes: - Store level state periodically - Load the closest usable level state when done rewinding for quicker resumes - Make playback menu fade out after 5 seconds of no activity (but not while paused) - Remove wrapping from replay hut (original wrapping was broken at some point before 1.1 and it's not necessary anyway) - Allow holding enter on frame advance for noisy slow-mo from fickleheart
2019-10-28 16:14:51 +00:00
return;
//itemOn = 0; // Not M_NextOpt because that would take us to the extra dummy item
List demos by title in the replay hut
2019-03-31 06:22:41 +00:00
S_StartSound(NULL, sfx_menu1);
Display infobox for the currently-selected replay
2019-03-31 07:54:09 +00:00
replayScrollTitle = 0; replayScrollDelay = TICRATE; replayScrollDir = 1;
List demos by title in the replay hut
2019-03-31 06:22:41 +00:00
break;
Enable exiting and playing demos from replay hut properly
2019-03-31 18:50:20 +00:00
case KEY_ESCAPE:
M_QuitReplayHut();
break;
case KEY_ENTER:
Support directory navigation properly
2019-03-31 21:28:18 +00:00
switch (dirmenu[dir_on[menudepthleft]][DIR_TYPE])
{
case EXT_FOLDER:
strcpy(&menupath[menupathindex[menudepthleft]],dirmenu[dir_on[menudepthleft]]+DIR_STRING);
if (menudepthleft)
{
menupathindex[--menudepthleft] = strlen(menupath);
menupath[menupathindex[menudepthleft]] = 0;
if (!preparefilemenu(false, true))
{
S_StartSound(NULL, sfx_s224);
M_StartMessage(va("%c%s\x80\nThis folder is empty.\n\n(Press a key)\n", ('\x80' + (highlightflags>>V_CHARCOLORSHIFT)), M_AddonsHeaderPath()),NULL,MM_NOTHING);
menupath[menupathindex[++menudepthleft]] = 0;
if (!preparefilemenu(true, true))
{
M_QuitReplayHut();
return;
}
}
else
{
S_StartSound(NULL, sfx_menu1);
dir_on[menudepthleft] = 1;
PrepReplayList();
}
}
else
{
S_StartSound(NULL, sfx_s26d);
M_StartMessage(va("%c%s\x80\nThis folder is too deep to navigate to!\n\n(Press a key)\n", ('\x80' + (highlightflags>>V_CHARCOLORSHIFT)), M_AddonsHeaderPath()),NULL,MM_NOTHING);
menupath[menupathindex[menudepthleft]] = 0;
}
break;
case EXT_UP:
S_StartSound(NULL, sfx_menu1);
menupath[menupathindex[++menudepthleft]] = 0;
if (!preparefilemenu(false, true))
{
M_QuitReplayHut();
return;
}
PrepReplayList();
break;
default:
Add subscreen to confirm replay watching This will have other goodies on it later!
2019-03-31 22:29:41 +00:00
// We can't just use M_SetupNextMenu because that'll run ReplayDef's quitroutine and boot us back to the title screen!
Support directory navigation properly
2019-03-31 21:28:18 +00:00
currentMenu->lastOn = itemOn;
Add subscreen to confirm replay watching This will have other goodies on it later!
2019-03-31 22:29:41 +00:00
currentMenu = &MISC_ReplayStartDef;
Support directory navigation properly
2019-03-31 21:28:18 +00:00
Read and write standings to replays
2019-04-01 20:07:27 +00:00
replayScrollTitle = 0; replayScrollDelay = TICRATE; replayScrollDir = 1;
Add subscreen to confirm replay watching This will have other goodies on it later!
2019-03-31 22:29:41 +00:00
switch (demolist[dir_on[menudepthleft]].addonstatus)
{
case DFILE_ERROR_CANNOTLOAD:
// Only show "Watch Replay Without Addons"
MISC_ReplayStartMenu[0].status = IT_DISABLED;
MISC_ReplayStartMenu[1].status = IT_CALL|IT_STRING;
//MISC_ReplayStartMenu[1].alphaKey = 0;
MISC_ReplayStartMenu[2].status = IT_DISABLED;
itemOn = 1;
break;
case DFILE_ERROR_NOTLOADED:
case DFILE_ERROR_INCOMPLETEOUTOFORDER:
// Show "Load Addons and Watch Replay" and "Watch Replay Without Addons"
MISC_ReplayStartMenu[0].status = IT_CALL|IT_STRING;
MISC_ReplayStartMenu[1].status = IT_CALL|IT_STRING;
//MISC_ReplayStartMenu[1].alphaKey = 10;
MISC_ReplayStartMenu[2].status = IT_DISABLED;
itemOn = 0;
break;
case DFILE_ERROR_EXTRAFILES:
case DFILE_ERROR_OUTOFORDER:
default:
// Show "Watch Replay"
MISC_ReplayStartMenu[0].status = IT_DISABLED;
MISC_ReplayStartMenu[1].status = IT_DISABLED;
MISC_ReplayStartMenu[2].status = IT_CALL|IT_STRING;
//MISC_ReplayStartMenu[2].alphaKey = 0;
itemOn = 2;
break;
}
}
break;
}
}
Support non-green resolutions in the replay hut
2019-04-06 16:16:19 +00:00
#define SCALEDVIEWWIDTH (vid.width/vid.dupx)
#define SCALEDVIEWHEIGHT (vid.height/vid.dupy)
Add subscreen to confirm replay watching This will have other goodies on it later!
2019-03-31 22:29:41 +00:00
static void DrawReplayHutReplayInfo(void)
{
lumpnum_t lumpnum;
something something character placeholders im tired
2019-04-02 04:34:53 +00:00
patch_t *patch;
UINT8 *colormap;
Add subscreen to confirm replay watching This will have other goodies on it later!
2019-03-31 22:29:41 +00:00
INT32 x, y, w, h;
switch (demolist[dir_on[menudepthleft]].type)
{
case MD_NOTLOADED:
Support non-green resolutions in the replay hut
2019-04-06 16:16:19 +00:00
V_DrawCenteredString(160, 40, V_SNAPTOTOP, "Loading replay information...");
Add subscreen to confirm replay watching This will have other goodies on it later!
2019-03-31 22:29:41 +00:00
break;
case MD_INVALID:
Support non-green resolutions in the replay hut
2019-04-06 16:16:19 +00:00
V_DrawCenteredString(160, 40, V_SNAPTOTOP|warningflags, "This replay cannot be played.");
Add subscreen to confirm replay watching This will have other goodies on it later!
2019-03-31 22:29:41 +00:00
break;
case MD_SUBDIR:
break; // Can't think of anything to draw here right now
case MD_OUTDATED:
Support non-green resolutions in the replay hut
2019-04-06 16:16:19 +00:00
V_DrawThinString(17, 64, V_SNAPTOTOP|V_ALLOWLOWERCASE|V_TRANSLUCENT|highlightflags, "Recorded on an outdated version.");
Add subscreen to confirm replay watching This will have other goodies on it later!
2019-03-31 22:29:41 +00:00
/*fallthru*/
default:
// Draw level stuff
x = 15; y = 15;
// A 160x100 image of the level as entry MAPxxP
//CONS_Printf("%d %s\n", demolist[dir_on[menudepthleft]].map, G_BuildMapName(demolist[dir_on[menudepthleft]].map));
lumpnum = W_CheckNumForName(va("%sP", G_BuildMapName(demolist[dir_on[menudepthleft]].map)));
if (lumpnum != LUMPERROR)
something something character placeholders im tired
2019-04-02 04:34:53 +00:00
patch = W_CachePatchNum(lumpnum, PU_CACHE);
Add subscreen to confirm replay watching This will have other goodies on it later!
2019-03-31 22:29:41 +00:00
else
Reference graphics for menu and other stuff
2019-04-06 07:17:30 +00:00
patch = W_CachePatchName("M_NOLVL", PU_CACHE);
Add subscreen to confirm replay watching This will have other goodies on it later!
2019-03-31 22:29:41 +00:00
if (!(demolist[dir_on[menudepthleft]].kartspeed & DF_ENCORE))
Support non-green resolutions in the replay hut
2019-04-06 16:16:19 +00:00
V_DrawSmallScaledPatch(x, y, V_SNAPTOTOP, patch);
Add subscreen to confirm replay watching This will have other goodies on it later!
2019-03-31 22:29:41 +00:00
else
{
something something character placeholders im tired
2019-04-02 04:34:53 +00:00
w = SHORT(patch->width);
h = SHORT(patch->height);
Support non-green resolutions in the replay hut
2019-04-06 16:16:19 +00:00
V_DrawSmallScaledPatch(x+(w>>1), y, V_SNAPTOTOP|V_FLIP, patch);
Add subscreen to confirm replay watching This will have other goodies on it later!
2019-03-31 22:29:41 +00:00
{
Interpolate the Phantom Ruby floating animation. Also, I fell for the copypasted code bait CLASSIC, so now all instances of the Ruby are decoupled from FPS cap.
2022-07-10 20:46:17 +00:00
static angle_t rubyfloattime = 0;
Add subscreen to confirm replay watching This will have other goodies on it later!
2019-03-31 22:29:41 +00:00
const fixed_t rubyheight = FINESINE(rubyfloattime>>ANGLETOFINESHIFT);
Support non-green resolutions in the replay hut
2019-04-06 16:16:19 +00:00
V_DrawFixedPatch((x+(w>>2))<<FRACBITS, ((y+(h>>2))<<FRACBITS) - (rubyheight<<1), FRACUNIT, V_SNAPTOTOP, W_CachePatchName("RUBYICON", PU_CACHE), NULL);
Interpolate the Phantom Ruby floating animation. Also, I fell for the copypasted code bait CLASSIC, so now all instances of the Ruby are decoupled from FPS cap.
2022-07-10 20:46:17 +00:00
rubyfloattime += FixedMul(ANGLE_MAX/NEWTICRATE, renderdeltatics);
Add subscreen to confirm replay watching This will have other goodies on it later!
2019-03-31 22:29:41 +00:00
}
}
x += 85;
if (mapheaderinfo[demolist[dir_on[menudepthleft]].map-1])
Support non-green resolutions in the replay hut
2019-04-06 16:16:19 +00:00
V_DrawString(x, y, V_SNAPTOTOP, G_BuildMapTitle(demolist[dir_on[menudepthleft]].map));
Add subscreen to confirm replay watching This will have other goodies on it later!
2019-03-31 22:29:41 +00:00
else
Support non-green resolutions in the replay hut
2019-04-06 16:16:19 +00:00
V_DrawString(x, y, V_SNAPTOTOP|V_ALLOWLOWERCASE|V_TRANSLUCENT, "Level is not loaded.");
Add subscreen to confirm replay watching This will have other goodies on it later!
2019-03-31 22:29:41 +00:00
Show non-default lap count on replay screen too
2019-04-01 17:56:23 +00:00
if (demolist[dir_on[menudepthleft]].numlaps)
Support non-green resolutions in the replay hut
2019-04-06 16:16:19 +00:00
V_DrawThinString(x, y+9, V_SNAPTOTOP|V_ALLOWLOWERCASE, va("(%d laps)", demolist[dir_on[menudepthleft]].numlaps));
Show non-default lap count on replay screen too
2019-04-01 17:56:23 +00:00
Support non-green resolutions in the replay hut
2019-04-06 16:16:19 +00:00
V_DrawString(x, y+20, V_SNAPTOTOP|V_ALLOWLOWERCASE, demolist[dir_on[menudepthleft]].gametype == GT_RACE ?
Add subscreen to confirm replay watching This will have other goodies on it later!
2019-03-31 22:29:41 +00:00
va("Race (%s speed)", kartspeed_cons_t[demolist[dir_on[menudepthleft]].kartspeed & ~DF_ENCORE].strvalue) :
"Battle Mode");
Draw placeholder when no standings are available
2019-04-02 01:30:24 +00:00
if (!demolist[dir_on[menudepthleft]].standings[0].ranking)
{
// No standings were loaded!
Support non-green resolutions in the replay hut
2019-04-06 16:16:19 +00:00
V_DrawString(x, y+39, V_SNAPTOTOP|V_ALLOWLOWERCASE|V_TRANSLUCENT, "No standings available.");
Draw placeholder when no standings are available
2019-04-02 01:30:24 +00:00
break;
}
Support non-green resolutions in the replay hut
2019-04-06 16:16:19 +00:00
V_DrawThinString(x, y+29, V_SNAPTOTOP|highlightflags, "WINNER");
V_DrawString(x+38, y+30, V_SNAPTOTOP|V_ALLOWLOWERCASE, demolist[dir_on[menudepthleft]].standings[0].name);
Add subscreen to confirm replay watching This will have other goodies on it later!
2019-03-31 22:29:41 +00:00
Read and write standings to replays
2019-04-01 20:07:27 +00:00
if (demolist[dir_on[menudepthleft]].gametype == GT_RACE)
{
Support non-green resolutions in the replay hut
2019-04-06 16:16:19 +00:00
V_DrawThinString(x, y+39, V_SNAPTOTOP|highlightflags, "TIME");
V_DrawRightAlignedString(x+84, y+40, V_SNAPTOTOP, va("%d'%02d\"%02d",
Read and write standings to replays
2019-04-01 20:07:27 +00:00
G_TicsToMinutes(demolist[dir_on[menudepthleft]].standings[0].timeorscore, true),
G_TicsToSeconds(demolist[dir_on[menudepthleft]].standings[0].timeorscore),
G_TicsToCentiseconds(demolist[dir_on[menudepthleft]].standings[0].timeorscore)
));
}
else
{
Support non-green resolutions in the replay hut
2019-04-06 16:16:19 +00:00
V_DrawThinString(x, y+39, V_SNAPTOTOP|highlightflags, "SCORE");
V_DrawString(x+32, y+40, V_SNAPTOTOP, va("%d", demolist[dir_on[menudepthleft]].standings[0].timeorscore));
Read and write standings to replays
2019-04-01 20:07:27 +00:00
}
Add subscreen to confirm replay watching This will have other goodies on it later!
2019-03-31 22:29:41 +00:00
// Character face!
Read and write standings to replays
2019-04-01 20:07:27 +00:00
if (W_CheckNumForName(skins[demolist[dir_on[menudepthleft]].standings[0].skin].facewant) != LUMPERROR)
Add subscreen to confirm replay watching This will have other goodies on it later!
2019-03-31 22:29:41 +00:00
{
something something character placeholders im tired
2019-04-02 04:34:53 +00:00
patch = facewantprefix[demolist[dir_on[menudepthleft]].standings[0].skin];
colormap = R_GetTranslationColormap(
Read and write standings to replays
2019-04-01 20:07:27 +00:00
demolist[dir_on[menudepthleft]].standings[0].skin,
demolist[dir_on[menudepthleft]].standings[0].color,
Add subscreen to confirm replay watching This will have other goodies on it later!
2019-03-31 22:29:41 +00:00
GTC_MENUCACHE);
Support directory navigation properly
2019-03-31 21:28:18 +00:00
}
something something character placeholders im tired
2019-04-02 04:34:53 +00:00
else
{
Reference graphics for menu and other stuff
2019-04-06 07:17:30 +00:00
patch = W_CachePatchName("M_NOWANT", PU_CACHE);
something something character placeholders im tired
2019-04-02 04:34:53 +00:00
colormap = R_GetTranslationColormap(
TC_RAINBOW,
demolist[dir_on[menudepthleft]].standings[0].color,
GTC_MENUCACHE);
}
Support non-green resolutions in the replay hut
2019-04-06 16:16:19 +00:00
V_DrawMappedPatch(BASEVIDWIDTH-15 - SHORT(patch->width), y+20, V_SNAPTOTOP, patch, colormap);
Enable exiting and playing demos from replay hut properly
2019-03-31 18:50:20 +00:00
break;
List demos by title in the replay hut
2019-03-31 06:22:41 +00:00
}
}
Start on the replay hut menu!
2019-03-31 01:57:53 +00:00
static void M_DrawReplayHut(void)
{
INT32 x, y, cursory = 0;
INT16 i;
List demos by title in the replay hut
2019-03-31 06:22:41 +00:00
INT16 replaylistitem = currentMenu->numitems-2;
boolean processed_one_this_frame = false;
Start on the replay hut menu!
2019-03-31 01:57:53 +00:00
List demos by title in the replay hut
2019-03-31 06:22:41 +00:00
static UINT16 replayhutmenuy = 0;
Start on the replay hut menu!
2019-03-31 01:57:53 +00:00
V_DrawPatchFill(W_CachePatchName("SRB2BACK", PU_CACHE));
Proposal: VHS effect over the replay hut background?
2019-04-10 14:10:09 +00:00
if (cv_vhseffect.value)
V_DrawVhsEffect(false);
Start on the replay hut menu!
2019-03-31 01:57:53 +00:00
// Draw menu choices
x = currentMenu->x;
y = currentMenu->y;
List demos by title in the replay hut
2019-03-31 06:22:41 +00:00
if (itemOn > replaylistitem)
{
itemOn = replaylistitem;
Support directory navigation properly
2019-03-31 21:28:18 +00:00
dir_on[menudepthleft] = sizedirmenu-1;
Display infobox for the currently-selected replay
2019-03-31 07:54:09 +00:00
replayScrollTitle = 0; replayScrollDelay = TICRATE; replayScrollDir = 1;
List demos by title in the replay hut
2019-03-31 06:22:41 +00:00
}
else if (itemOn < replaylistitem)
{
Support directory navigation properly
2019-03-31 21:28:18 +00:00
dir_on[menudepthleft] = 0;
Display infobox for the currently-selected replay
2019-03-31 07:54:09 +00:00
replayScrollTitle = 0; replayScrollDelay = TICRATE; replayScrollDir = 1;
List demos by title in the replay hut
2019-03-31 06:22:41 +00:00
}
if (itemOn == replaylistitem)
Start on the replay hut menu!
2019-03-31 01:57:53 +00:00
{
INT32 maxy;
// Scroll menu items if needed
Support directory navigation properly
2019-03-31 21:28:18 +00:00
cursory = y + currentMenu->menuitems[replaylistitem].alphaKey + dir_on[menudepthleft]*10;
List demos by title in the replay hut
2019-03-31 06:22:41 +00:00
maxy = y + currentMenu->menuitems[replaylistitem].alphaKey + sizedirmenu*10;
Start on the replay hut menu!
2019-03-31 01:57:53 +00:00
List demos by title in the replay hut
2019-03-31 06:22:41 +00:00
if (cursory > maxy - 20)
cursory = maxy - 20;
Start on the replay hut menu!
2019-03-31 01:57:53 +00:00
Support non-green resolutions in the replay hut
2019-04-06 16:16:19 +00:00
if (cursory - replayhutmenuy > SCALEDVIEWHEIGHT-50)
replayhutmenuy += (cursory-SCALEDVIEWHEIGHT-replayhutmenuy + 51)/2;
List demos by title in the replay hut
2019-03-31 06:22:41 +00:00
else if (cursory - replayhutmenuy < 110)
Display infobox for the currently-selected replay
2019-03-31 07:54:09 +00:00
replayhutmenuy += (max(0, cursory-110)-replayhutmenuy - 1)/2;
Start on the replay hut menu!
2019-03-31 01:57:53 +00:00
}
List demos by title in the replay hut
2019-03-31 06:22:41 +00:00
else
replayhutmenuy /= 2;
y -= replayhutmenuy;
Start on the replay hut menu!
2019-03-31 01:57:53 +00:00
// Draw static menu items
List demos by title in the replay hut
2019-03-31 06:22:41 +00:00
for (i = 0; i < replaylistitem; i++)
Start on the replay hut menu!
2019-03-31 01:57:53 +00:00
{
Don't draw options menu entry above replay infobox
2019-04-01 00:29:05 +00:00
INT32 localy = y + currentMenu->menuitems[i].alphaKey;
if (localy < 65)
continue;
Start on the replay hut menu!
2019-03-31 01:57:53 +00:00
if (i == itemOn)
Don't draw options menu entry above replay infobox
2019-04-01 00:29:05 +00:00
cursory = localy;
Start on the replay hut menu!
2019-03-31 01:57:53 +00:00
if ((currentMenu->menuitems[i].status & IT_DISPLAY)==IT_STRING)
Support non-green resolutions in the replay hut
2019-04-06 16:16:19 +00:00
V_DrawString(x, localy, V_SNAPTOTOP|V_SNAPTOLEFT, currentMenu->menuitems[i].text);
Start on the replay hut menu!
2019-03-31 01:57:53 +00:00
else
Support non-green resolutions in the replay hut
2019-04-06 16:16:19 +00:00
V_DrawString(x, localy, V_SNAPTOTOP|V_SNAPTOLEFT|highlightflags, currentMenu->menuitems[i].text);
Start on the replay hut menu!
2019-03-31 01:57:53 +00:00
}
Add scroll bar to replay hut
2019-04-15 04:17:12 +00:00
y += currentMenu->menuitems[replaylistitem].alphaKey;
Start on the replay hut menu!
2019-03-31 01:57:53 +00:00
for (i = 0; i < (INT16)sizedirmenu; i++)
{
List demos by title in the replay hut
2019-03-31 06:22:41 +00:00
INT32 localy = y+i*10;
Draw icons for directories
2019-04-01 17:25:12 +00:00
INT32 localx = x;
Display infobox for the currently-selected replay
2019-03-31 07:54:09 +00:00
if (localy < 65)
continue;
Support non-green resolutions in the replay hut
2019-04-06 16:16:19 +00:00
if (localy >= SCALEDVIEWHEIGHT)
Display infobox for the currently-selected replay
2019-03-31 07:54:09 +00:00
break;
if (demolist[i].type == MD_NOTLOADED && !processed_one_this_frame)
List demos by title in the replay hut
2019-03-31 06:22:41 +00:00
{
processed_one_this_frame = true;
G_LoadDemoInfo(&demolist[i]);
}
Draw icons for directories
2019-04-01 17:25:12 +00:00
if (demolist[i].type == MD_SUBDIR)
{
localx += 8;
Support non-green resolutions in the replay hut
2019-04-06 16:16:19 +00:00
V_DrawScaledPatch(x - 4, localy, V_SNAPTOTOP|V_SNAPTOLEFT, W_CachePatchName(dirmenu[i][DIR_TYPE] == EXT_UP ? "M_RBACK" : "M_RFLDR", PU_CACHE));
Draw icons for directories
2019-04-01 17:25:12 +00:00
}
Support directory navigation properly
2019-03-31 21:28:18 +00:00
if (itemOn == replaylistitem && i == (INT16)dir_on[menudepthleft])
List demos by title in the replay hut
2019-03-31 06:22:41 +00:00
{
cursory = localy;
Display infobox for the currently-selected replay
2019-03-31 07:54:09 +00:00
if (replayScrollDelay)
replayScrollDelay--;
else if (replayScrollDir > 0)
{
Support non-green resolutions in the replay hut
2019-04-06 16:16:19 +00:00
if (replayScrollTitle < (V_StringWidth(demolist[i].title, 0) - (SCALEDVIEWWIDTH - (x<<1)))<<1)
Display infobox for the currently-selected replay
2019-03-31 07:54:09 +00:00
replayScrollTitle++;
else
{
replayScrollDelay = TICRATE;
replayScrollDir = -1;
}
}
else
{
if (replayScrollTitle > 0)
replayScrollTitle--;
else
{
replayScrollDelay = TICRATE;
replayScrollDir = 1;
}
}
Support non-green resolutions in the replay hut
2019-04-06 16:16:19 +00:00
V_DrawString(localx - (replayScrollTitle>>1), localy, V_SNAPTOTOP|V_SNAPTOLEFT|highlightflags|V_ALLOWLOWERCASE, demolist[i].title);
List demos by title in the replay hut
2019-03-31 06:22:41 +00:00
}
else
Support non-green resolutions in the replay hut
2019-04-06 16:16:19 +00:00
V_DrawString(localx, localy, V_SNAPTOTOP|V_SNAPTOLEFT|V_ALLOWLOWERCASE, demolist[i].title);
Start on the replay hut menu!
2019-03-31 01:57:53 +00:00
}
Add scroll bar to replay hut
2019-04-15 04:17:12 +00:00
// Draw scrollbar
y = sizedirmenu*10 + currentMenu->menuitems[replaylistitem].alphaKey + 30;
if (y > SCALEDVIEWHEIGHT-80)
{
V_DrawFill(BASEVIDWIDTH-4, 75, 4, SCALEDVIEWHEIGHT-80, V_SNAPTOTOP|V_SNAPTORIGHT|239);
V_DrawFill(BASEVIDWIDTH-3, 76 + (SCALEDVIEWHEIGHT-80) * replayhutmenuy / y, 2, (((SCALEDVIEWHEIGHT-80) * (SCALEDVIEWHEIGHT-80))-1) / y - 1, V_SNAPTOTOP|V_SNAPTORIGHT|229);
}
Start on the replay hut menu!
2019-03-31 01:57:53 +00:00
// Draw the cursor
Support non-green resolutions in the replay hut
2019-04-06 16:16:19 +00:00
V_DrawScaledPatch(currentMenu->x - 24, cursory, V_SNAPTOTOP|V_SNAPTOLEFT,
Start on the replay hut menu!
2019-03-31 01:57:53 +00:00
W_CachePatchName("M_CURSOR", PU_CACHE));
Support non-green resolutions in the replay hut
2019-04-06 16:16:19 +00:00
V_DrawString(currentMenu->x, cursory, V_SNAPTOTOP|V_SNAPTOLEFT|highlightflags, currentMenu->menuitems[itemOn].text);
Display infobox for the currently-selected replay
2019-03-31 07:54:09 +00:00
// Now draw some replay info!
Support non-green resolutions in the replay hut
2019-04-06 16:16:19 +00:00
V_DrawFill(10, 10, 300, 60, V_SNAPTOTOP|239);
Display infobox for the currently-selected replay
2019-03-31 07:54:09 +00:00
if (itemOn == replaylistitem)
{
Add subscreen to confirm replay watching This will have other goodies on it later!
2019-03-31 22:29:41 +00:00
DrawReplayHutReplayInfo();
}
}
Display infobox for the currently-selected replay
2019-03-31 07:54:09 +00:00
Add subscreen to confirm replay watching This will have other goodies on it later!
2019-03-31 22:29:41 +00:00
static void M_DrawReplayStartMenu(void)
{
const char *warning;
Read and write standings to replays
2019-04-01 20:07:27 +00:00
UINT8 i;
Display infobox for the currently-selected replay
2019-03-31 07:54:09 +00:00
Add subscreen to confirm replay watching This will have other goodies on it later!
2019-03-31 22:29:41 +00:00
M_DrawGenericBackgroundMenu();
Read and write standings to replays
2019-04-01 20:07:27 +00:00
#define STARTY 62-(replayScrollTitle>>1)
// Draw rankings beyond first
for (i = 1; i < MAXPLAYERS && demolist[dir_on[menudepthleft]].standings[i].ranking; i++)
{
something something character placeholders im tired
2019-04-02 04:34:53 +00:00
patch_t *patch;
UINT8 *colormap;
Support non-green resolutions in the replay hut
2019-04-06 16:16:19 +00:00
V_DrawRightAlignedString(BASEVIDWIDTH-100, STARTY + i*20, V_SNAPTOTOP|highlightflags, va("%2d", demolist[dir_on[menudepthleft]].standings[i].ranking));
V_DrawThinString(BASEVIDWIDTH-96, STARTY + i*20, V_SNAPTOTOP|V_ALLOWLOWERCASE, demolist[dir_on[menudepthleft]].standings[i].name);
Read and write standings to replays
2019-04-01 20:07:27 +00:00
if (demolist[dir_on[menudepthleft]].standings[i].timeorscore == UINT32_MAX-1)
Support non-green resolutions in the replay hut
2019-04-06 16:16:19 +00:00
V_DrawThinString(BASEVIDWIDTH-92, STARTY + i*20 + 9, V_SNAPTOTOP, "NO CONTEST");
Read and write standings to replays
2019-04-01 20:07:27 +00:00
else if (demolist[dir_on[menudepthleft]].gametype == GT_RACE)
Support non-green resolutions in the replay hut
2019-04-06 16:16:19 +00:00
V_DrawRightAlignedString(BASEVIDWIDTH-40, STARTY + i*20 + 9, V_SNAPTOTOP, va("%d'%02d\"%02d",
Read and write standings to replays
2019-04-01 20:07:27 +00:00
G_TicsToMinutes(demolist[dir_on[menudepthleft]].standings[i].timeorscore, true),
G_TicsToSeconds(demolist[dir_on[menudepthleft]].standings[i].timeorscore),
G_TicsToCentiseconds(demolist[dir_on[menudepthleft]].standings[i].timeorscore)
));
else
Support non-green resolutions in the replay hut
2019-04-06 16:16:19 +00:00
V_DrawString(BASEVIDWIDTH-92, STARTY + i*20 + 9, V_SNAPTOTOP, va("%d", demolist[dir_on[menudepthleft]].standings[i].timeorscore));
something something character placeholders im tired
2019-04-02 04:34:53 +00:00
Read and write standings to replays
2019-04-01 20:07:27 +00:00
// Character face!
if (W_CheckNumForName(skins[demolist[dir_on[menudepthleft]].standings[i].skin].facerank) != LUMPERROR)
{
something something character placeholders im tired
2019-04-02 04:34:53 +00:00
patch = facerankprefix[demolist[dir_on[menudepthleft]].standings[i].skin];
colormap = R_GetTranslationColormap(
Read and write standings to replays
2019-04-01 20:07:27 +00:00
demolist[dir_on[menudepthleft]].standings[i].skin,
demolist[dir_on[menudepthleft]].standings[i].color,
GTC_MENUCACHE);
}
something something character placeholders im tired
2019-04-02 04:34:53 +00:00
else
{
Reference graphics for menu and other stuff
2019-04-06 07:17:30 +00:00
patch = W_CachePatchName("M_NORANK", PU_CACHE);
something something character placeholders im tired
2019-04-02 04:34:53 +00:00
colormap = R_GetTranslationColormap(
TC_RAINBOW,
demolist[dir_on[menudepthleft]].standings[i].color,
GTC_MENUCACHE);
}
Support non-green resolutions in the replay hut
2019-04-06 16:16:19 +00:00
V_DrawMappedPatch(BASEVIDWIDTH-5 - SHORT(patch->width), STARTY + i*20, V_SNAPTOTOP, patch, colormap);
Read and write standings to replays
2019-04-01 20:07:27 +00:00
}
#undef STARTY
// Handle scrolling rankings
if (replayScrollDelay)
replayScrollDelay--;
else if (replayScrollDir > 0)
{
Support non-green resolutions in the replay hut
2019-04-06 16:16:19 +00:00
if (replayScrollTitle < (i*20 - SCALEDVIEWHEIGHT + 100)<<1)
Read and write standings to replays
2019-04-01 20:07:27 +00:00
replayScrollTitle++;
else
{
replayScrollDelay = TICRATE;
replayScrollDir = -1;
}
}
else
{
if (replayScrollTitle > 0)
replayScrollTitle--;
else
{
replayScrollDelay = TICRATE;
replayScrollDir = 1;
}
}
Support non-green resolutions in the replay hut
2019-04-06 16:16:19 +00:00
V_DrawFill(10, 10, 300, 60, V_SNAPTOTOP|239);
Add subscreen to confirm replay watching This will have other goodies on it later!
2019-03-31 22:29:41 +00:00
DrawReplayHutReplayInfo();
Display infobox for the currently-selected replay
2019-03-31 07:54:09 +00:00
Support non-green resolutions in the replay hut
2019-04-06 16:16:19 +00:00
V_DrawString(10, 72, V_SNAPTOTOP|highlightflags|V_ALLOWLOWERCASE, demolist[dir_on[menudepthleft]].title);
Display infobox for the currently-selected replay
2019-03-31 07:54:09 +00:00
Add subscreen to confirm replay watching This will have other goodies on it later!
2019-03-31 22:29:41 +00:00
// Draw a warning prompt if needed
switch (demolist[dir_on[menudepthleft]].addonstatus)
{
case DFILE_ERROR_CANNOTLOAD:
warning = "Some addons in this replay cannot be loaded.\nYou can watch anyway, but desyncs may occur.";
break;
Display infobox for the currently-selected replay
2019-03-31 07:54:09 +00:00
Add subscreen to confirm replay watching This will have other goodies on it later!
2019-03-31 22:29:41 +00:00
case DFILE_ERROR_NOTLOADED:
case DFILE_ERROR_INCOMPLETEOUTOFORDER:
Use "addons" instead of "add-ons" for consistency
2020-04-22 07:24:59 +00:00
warning = "Loading addons will mark your game as modified, and Record Attack may be unavailable.\nYou can watch without loading addons, but desyncs may occur.";
Add subscreen to confirm replay watching This will have other goodies on it later!
2019-03-31 22:29:41 +00:00
break;
Display infobox for the currently-selected replay
2019-03-31 07:54:09 +00:00
Add subscreen to confirm replay watching This will have other goodies on it later!
2019-03-31 22:29:41 +00:00
case DFILE_ERROR_EXTRAFILES:
Use "addons" instead of "add-ons" for consistency
2020-04-22 07:24:59 +00:00
warning = "You have addons loaded that were not present in this replay.\nYou can watch anyway, but desyncs may occur.";
Add subscreen to confirm replay watching This will have other goodies on it later!
2019-03-31 22:29:41 +00:00
break;
Display infobox for the currently-selected replay
2019-03-31 07:54:09 +00:00
Add subscreen to confirm replay watching This will have other goodies on it later!
2019-03-31 22:29:41 +00:00
case DFILE_ERROR_OUTOFORDER:
Use "addons" instead of "add-ons" for consistency
2020-04-22 07:24:59 +00:00
warning = "You have this replay's addons loaded, but they are out of order.\nYou can watch anyway, but desyncs may occur.";
Add subscreen to confirm replay watching This will have other goodies on it later!
2019-03-31 22:29:41 +00:00
break;
Display infobox for the currently-selected replay
2019-03-31 07:54:09 +00:00
Add subscreen to confirm replay watching This will have other goodies on it later!
2019-03-31 22:29:41 +00:00
default:
return;
Display infobox for the currently-selected replay
2019-03-31 07:54:09 +00:00
}
Add subscreen to confirm replay watching This will have other goodies on it later!
2019-03-31 22:29:41 +00:00
Support non-green resolutions in the replay hut
2019-04-06 16:16:19 +00:00
V_DrawSmallString(4, BASEVIDHEIGHT-14, V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_ALLOWLOWERCASE, warning);
Start on the replay hut menu!
2019-03-31 01:57:53 +00:00
}
Enable exiting and playing demos from replay hut properly
2019-03-31 18:50:20 +00:00
static boolean M_QuitReplayHut(void)
{
// D_StartTitle does its own wipe, since GS_TIMEATTACK is now a complete gamestate.
menuactive = false;
D_StartTitle();
if (demolist)
Z_Free(demolist);
demolist = NULL;
Return to replay hut after watching a replay
2019-04-01 00:26:53 +00:00
demo.inreplayhut = false;
Enable exiting and playing demos from replay hut properly
2019-03-31 18:50:20 +00:00
return true;
}
Add subscreen to confirm replay watching This will have other goodies on it later!
2019-03-31 22:29:41 +00:00
static void M_HutStartReplay(INT32 choice)
{
(void)choice;
M_ClearMenus(false);
demo.loadfiles = (itemOn == 0);
demo.ignorefiles = (itemOn != 0);
G_DoPlayDemo(demolist[dir_on[menudepthleft]].filepath);
}
Support playback menu for record attack replays too
2019-04-06 23:59:11 +00:00
void M_SetPlaybackMenuPointer(void)
{
itemOn = playback_pause;
}
Begin work on playback menu
2019-04-05 07:38:48 +00:00
static void M_DrawPlaybackMenu(void)
{
INT16 i;
patch_t *icon;
UINT8 *activemap = R_GetTranslationColormap(TC_RAINBOW, SKINCOLOR_GOLD, GTC_MENUCACHE);
Replay playback changes: - Store level state periodically - Load the closest usable level state when done rewinding for quicker resumes - Make playback menu fade out after 5 seconds of no activity (but not while paused) - Remove wrapping from replay hut (original wrapping was broken at some point before 1.1 and it's not necessary anyway) - Allow holding enter on frame advance for noisy slow-mo from fickleheart
2019-10-28 16:14:51 +00:00
UINT32 transmap = max(0, (INT32)(leveltime - playback_last_menu_interaction_leveltime - 4*TICRATE)) / 5;
transmap = min(8, transmap) << V_ALPHASHIFT;
if (leveltime - playback_last_menu_interaction_leveltime >= 6*TICRATE)
playback_last_menu_interaction_leveltime = leveltime - 6*TICRATE;
Begin work on playback menu
2019-04-05 07:38:48 +00:00
// Toggle items
Add demo rewinding Preview is fairly basic, and only shows players rewinding. Full state is restored via reloading the replay and jumping to the timestamp once the rewind is done.
2019-04-06 19:51:00 +00:00
if (paused && !demo.rewinding)
Begin work on playback menu
2019-04-05 07:38:48 +00:00
{
Playback menu improvements
2019-04-13 19:42:15 +00:00
PlaybackMenu[playback_pause].status = PlaybackMenu[playback_fastforward].status = PlaybackMenu[playback_rewind].status = IT_DISABLED;
PlaybackMenu[playback_resume].status = PlaybackMenu[playback_advanceframe].status = PlaybackMenu[playback_backframe].status = IT_CALL|IT_STRING;
if (itemOn >= playback_rewind && itemOn <= playback_fastforward)
itemOn += playback_backframe - playback_rewind;
Begin work on playback menu
2019-04-05 07:38:48 +00:00
}
else
{
Playback menu improvements
2019-04-13 19:42:15 +00:00
PlaybackMenu[playback_pause].status = PlaybackMenu[playback_fastforward].status = PlaybackMenu[playback_rewind].status = IT_CALL|IT_STRING;
PlaybackMenu[playback_resume].status = PlaybackMenu[playback_advanceframe].status = PlaybackMenu[playback_backframe].status = IT_DISABLED;
if (itemOn >= playback_backframe && itemOn <= playback_advanceframe)
itemOn -= playback_backframe - playback_rewind;
Begin work on playback menu
2019-04-05 07:38:48 +00:00
}
Support playback menu for record attack replays too
2019-04-06 23:59:11 +00:00
if (modeattacking)
{
for (i = playback_viewcount; i <= playback_view4; i++)
PlaybackMenu[i].status = IT_DISABLED;
replay freecam + enhancements
2019-09-05 21:24:23 +00:00
PlaybackMenu[playback_freecamera].alphaKey = 72;
PlaybackMenu[playback_quit].alphaKey = 88;
Support playback menu for record attack replays too
2019-04-06 23:59:11 +00:00
replay freecam + enhancements
2019-09-05 21:24:23 +00:00
currentMenu->x = BASEVIDWIDTH/2 - 52;
Support playback menu for record attack replays too
2019-04-06 23:59:11 +00:00
}
else
{
ENSURE viewcount slider is present for multiplayer demos
2019-05-02 16:42:29 +00:00
PlaybackMenu[playback_viewcount].status = IT_ARROWS|IT_STRING;
Support playback menu for record attack replays too
2019-04-06 23:59:11 +00:00
for (i = 0; i <= splitscreen; i++)
PlaybackMenu[playback_view1+i].status = IT_ARROWS|IT_STRING;
for (i = splitscreen+1; i < 4; i++)
PlaybackMenu[playback_view1+i].status = IT_DISABLED;
replay freecam + enhancements
2019-09-05 21:24:23 +00:00
PlaybackMenu[playback_freecamera].alphaKey = 156;
PlaybackMenu[playback_quit].alphaKey = 172;
Temporarily disable Extra Options menu
2019-04-13 20:23:31 +00:00
currentMenu->x = BASEVIDWIDTH/2 - 88;
Support playback menu for record attack replays too
2019-04-06 23:59:11 +00:00
}
Begin work on playback menu
2019-04-05 07:38:48 +00:00
// wip
//M_DrawTextBox(currentMenu->x-68, currentMenu->y-7, 15, 15);
//M_DrawCenteredMenu();
for (i = 0; i < currentMenu->numitems; i++)
{
UINT8 *inactivemap = NULL;
if (i >= playback_view1 && i <= playback_view4)
{
Support playback menu for record attack replays too
2019-04-06 23:59:11 +00:00
if (modeattacking) continue;
Begin work on playback menu
2019-04-05 07:38:48 +00:00
if (splitscreen >= i - playback_view1)
{
Remove bad +1
2019-05-02 04:49:05 +00:00
INT32 ply = displayplayers[i - playback_view1];
Begin work on playback menu
2019-04-05 07:38:48 +00:00
icon = facerankprefix[players[ply].skin];
if (i != itemOn)
inactivemap = R_GetTranslationColormap(players[ply].skin, players[ply].skincolor, GTC_MENUCACHE);
}
Reference graphics for menu and other stuff
2019-04-06 07:17:30 +00:00
else if (currentMenu->menuitems[i].patch && W_CheckNumForName(currentMenu->menuitems[i].patch) != LUMPERROR)
Begin work on playback menu
2019-04-05 07:38:48 +00:00
icon = W_CachePatchName(currentMenu->menuitems[i].patch, PU_CACHE);
else
icon = W_CachePatchName("PLAYRANK", PU_CACHE); // temp
}
else if (currentMenu->menuitems[i].status == IT_DISABLED)
continue;
Reference graphics for menu and other stuff
2019-04-06 07:17:30 +00:00
else if (currentMenu->menuitems[i].patch && W_CheckNumForName(currentMenu->menuitems[i].patch) != LUMPERROR)
Begin work on playback menu
2019-04-05 07:38:48 +00:00
icon = W_CachePatchName(currentMenu->menuitems[i].patch, PU_CACHE);
else
icon = W_CachePatchName("PLAYRANK", PU_CACHE); // temp
Various fixes and tweaks to rewinds
2019-04-06 23:06:02 +00:00
if ((i == playback_fastforward && cv_playbackspeed.value > 1) || (i == playback_rewind && demo.rewinding))
Replay playback changes: - Store level state periodically - Load the closest usable level state when done rewinding for quicker resumes - Make playback menu fade out after 5 seconds of no activity (but not while paused) - Remove wrapping from replay hut (original wrapping was broken at some point before 1.1 and it's not necessary anyway) - Allow holding enter on frame advance for noisy slow-mo from fickleheart
2019-10-28 16:14:51 +00:00
V_DrawMappedPatch(currentMenu->x + currentMenu->menuitems[i].alphaKey, currentMenu->y, transmap|V_SNAPTOTOP, icon, R_GetTranslationColormap(TC_RAINBOW, SKINCOLOR_JAWZ, GTC_MENUCACHE));
Begin work on playback menu
2019-04-05 07:38:48 +00:00
else
Replay playback changes: - Store level state periodically - Load the closest usable level state when done rewinding for quicker resumes - Make playback menu fade out after 5 seconds of no activity (but not while paused) - Remove wrapping from replay hut (original wrapping was broken at some point before 1.1 and it's not necessary anyway) - Allow holding enter on frame advance for noisy slow-mo from fickleheart
2019-10-28 16:14:51 +00:00
V_DrawMappedPatch(currentMenu->x + currentMenu->menuitems[i].alphaKey, currentMenu->y, transmap|V_SNAPTOTOP, icon, (i == itemOn) ? activemap : inactivemap);
Begin work on playback menu
2019-04-05 07:38:48 +00:00
if (i == itemOn)
Playback menu improvements
2019-04-13 19:42:15 +00:00
{
Change color of active playback items
2019-04-13 20:23:23 +00:00
V_DrawCharacter(currentMenu->x + currentMenu->menuitems[i].alphaKey + 4, currentMenu->y + 14,
Replay playback changes: - Store level state periodically - Load the closest usable level state when done rewinding for quicker resumes - Make playback menu fade out after 5 seconds of no activity (but not while paused) - Remove wrapping from replay hut (original wrapping was broken at some point before 1.1 and it's not necessary anyway) - Allow holding enter on frame advance for noisy slow-mo from fickleheart
2019-10-28 16:14:51 +00:00
'\x1A' | transmap|V_SNAPTOTOP|highlightflags, false);
Change color of active playback items
2019-04-13 20:23:23 +00:00
Replay playback changes: - Store level state periodically - Load the closest usable level state when done rewinding for quicker resumes - Make playback menu fade out after 5 seconds of no activity (but not while paused) - Remove wrapping from replay hut (original wrapping was broken at some point before 1.1 and it's not necessary anyway) - Allow holding enter on frame advance for noisy slow-mo from fickleheart
2019-10-28 16:14:51 +00:00
V_DrawCenteredString(BASEVIDWIDTH/2, currentMenu->y + 18, transmap|V_SNAPTOTOP|V_ALLOWLOWERCASE, currentMenu->menuitems[i].text);
Playback menu improvements
2019-04-13 19:42:15 +00:00
if ((currentMenu->menuitems[i].status & IT_TYPE) == IT_ARROWS)
{
char *str;
if (!(i == playback_viewcount && splitscreen == 3))
V_DrawCharacter(BASEVIDWIDTH/2 - 4, currentMenu->y + 28 - (skullAnimCounter/5),
Replay playback changes: - Store level state periodically - Load the closest usable level state when done rewinding for quicker resumes - Make playback menu fade out after 5 seconds of no activity (but not while paused) - Remove wrapping from replay hut (original wrapping was broken at some point before 1.1 and it's not necessary anyway) - Allow holding enter on frame advance for noisy slow-mo from fickleheart
2019-10-28 16:14:51 +00:00
'\x1A' | transmap|V_SNAPTOTOP|highlightflags, false); // up arrow
Playback menu improvements
2019-04-13 19:42:15 +00:00
if (!(i == playback_viewcount && splitscreen == 0))
V_DrawCharacter(BASEVIDWIDTH/2 - 4, currentMenu->y + 48 + (skullAnimCounter/5),
Replay playback changes: - Store level state periodically - Load the closest usable level state when done rewinding for quicker resumes - Make playback menu fade out after 5 seconds of no activity (but not while paused) - Remove wrapping from replay hut (original wrapping was broken at some point before 1.1 and it's not necessary anyway) - Allow holding enter on frame advance for noisy slow-mo from fickleheart
2019-10-28 16:14:51 +00:00
'\x1B' | transmap|V_SNAPTOTOP|highlightflags, false); // down arrow
Playback menu improvements
2019-04-13 19:42:15 +00:00
switch (i)
{
case playback_viewcount:
str = va("%d", splitscreen+1);
break;
case playback_view1:
case playback_view2:
case playback_view3:
case playback_view4:
Huge splitscreen refactor Did not get to finish all refactoring or even compile this, I'll continue later
2019-04-18 07:08:11 +00:00
str = player_names[displayplayers[i - playback_view1]]; // 0 to 3
Playback menu improvements
2019-04-13 19:42:15 +00:00
break;
default: // shouldn't ever be reached but whatever
continue;
}
Replay playback changes: - Store level state periodically - Load the closest usable level state when done rewinding for quicker resumes - Make playback menu fade out after 5 seconds of no activity (but not while paused) - Remove wrapping from replay hut (original wrapping was broken at some point before 1.1 and it's not necessary anyway) - Allow holding enter on frame advance for noisy slow-mo from fickleheart
2019-10-28 16:14:51 +00:00
V_DrawCenteredString(BASEVIDWIDTH/2, currentMenu->y + 38, transmap|V_SNAPTOTOP|V_ALLOWLOWERCASE|highlightflags, str);
Playback menu improvements
2019-04-13 19:42:15 +00:00
}
}
Begin work on playback menu
2019-04-05 07:38:48 +00:00
}
}
Add demo rewinding Preview is fairly basic, and only shows players rewinding. Full state is restored via reloading the replay and jumping to the timestamp once the rewind is done.
2019-04-06 19:51:00 +00:00
static void M_PlaybackRewind(INT32 choice)
{
Various fixes and tweaks to rewinds
2019-04-06 23:06:02 +00:00
static tic_t lastconfirmtime;
Add demo rewinding Preview is fairly basic, and only shows players rewinding. Full state is restored via reloading the replay and jumping to the timestamp once the rewind is done.
2019-04-06 19:51:00 +00:00
(void)choice;
if (!demo.rewinding)
Allow backwards frame advance while paused
2019-04-06 20:36:53 +00:00
{
if (paused)
{
G_ConfirmRewind(leveltime-1);
paused = true;
S_PauseAudio();
}
else
demo.rewinding = paused = true;
}
Various fixes and tweaks to rewinds
2019-04-06 23:06:02 +00:00
else if (lastconfirmtime + TICRATE/2 < I_GetTime())
{
lastconfirmtime = I_GetTime();
Add demo rewinding Preview is fairly basic, and only shows players rewinding. Full state is restored via reloading the replay and jumping to the timestamp once the rewind is done.
2019-04-06 19:51:00 +00:00
G_ConfirmRewind(leveltime);
Various fixes and tweaks to rewinds
2019-04-06 23:06:02 +00:00
}
Add demo rewinding Preview is fairly basic, and only shows players rewinding. Full state is restored via reloading the replay and jumping to the timestamp once the rewind is done.
2019-04-06 19:51:00 +00:00
Various fixes and tweaks to rewinds
2019-04-06 23:06:02 +00:00
CV_SetValue(&cv_playbackspeed, 1);
Add demo rewinding Preview is fairly basic, and only shows players rewinding. Full state is restored via reloading the replay and jumping to the timestamp once the rewind is done.
2019-04-06 19:51:00 +00:00
}
Begin work on playback menu
2019-04-05 07:38:48 +00:00
static void M_PlaybackPause(INT32 choice)
{
(void)choice;
paused = !paused;
Add demo rewinding Preview is fairly basic, and only shows players rewinding. Full state is restored via reloading the replay and jumping to the timestamp once the rewind is done.
2019-04-06 19:51:00 +00:00
if (demo.rewinding)
{
G_ConfirmRewind(leveltime);
paused = true;
S_PauseAudio();
}
else if (paused)
Begin work on playback menu
2019-04-05 07:38:48 +00:00
S_PauseAudio();
else
S_ResumeAudio();
CV_SetValue(&cv_playbackspeed, 1);
}
static void M_PlaybackFastForward(INT32 choice)
{
(void)choice;
Add demo rewinding Preview is fairly basic, and only shows players rewinding. Full state is restored via reloading the replay and jumping to the timestamp once the rewind is done.
2019-04-06 19:51:00 +00:00
if (demo.rewinding)
{
G_ConfirmRewind(leveltime);
paused = false;
S_ResumeAudio();
}
Begin work on playback menu
2019-04-05 07:38:48 +00:00
CV_SetValue(&cv_playbackspeed, cv_playbackspeed.value == 1 ? 4 : 1);
}
static void M_PlaybackAdvance(INT32 choice)
{
(void)choice;
paused = false;
TryRunTics(1);
paused = true;
}
static void M_PlaybackSetViews(INT32 choice)
{
replay freecam + enhancements
2019-09-05 21:24:23 +00:00
if (demo.freecam)
return; // not here.
Begin work on playback menu
2019-04-05 07:38:48 +00:00
if (choice > 0)
{
if (splitscreen < 3)
G_AdjustView(splitscreen + 2, 0, true);
}
else if (splitscreen)
{
splitscreen--;
R_ExecuteSetViewSize();
}
}
static void M_PlaybackAdjustView(INT32 choice)
{
G_AdjustView(itemOn - playback_viewcount, (choice > 0) ? 1 : -1, true);
}
Add subscreen to confirm replay watching This will have other goodies on it later!
2019-03-31 22:29:41 +00:00
replay freecam + enhancements
2019-09-05 21:24:23 +00:00
// this one's rather tricky
static void M_PlaybackToggleFreecam(INT32 choice)
{
(void)choice;
M_ClearMenus(true);
// remove splitscreen:
splitscreen = 0;
R_ExecuteSetViewSize();
P_InitCameraCmd(); // init camera controls
if (!demo.freecam) // toggle on
{
demo.freecam = true;
democam.cam = &camera[0]; // this is rather useful
}
else // toggle off
{
demo.freecam = false;
// reset democam vars:
democam.cam = NULL;
democam.turnheld = false;
democam.keyboardlook = false; // reset only these. localangle / aiming gets set before the cam does anything anyway
}
}
Fix title menu not working if you leave a replay early
2019-04-06 23:17:56 +00:00
static void M_PlaybackQuit(INT32 choice)
{
(void)choice;
G_StopDemo();
if (demo.inreplayhut)
M_ReplayHut(choice);
else if (modeattacking)
Support playback menu for record attack replays too
2019-04-06 23:59:11 +00:00
{
M_EndModeAttackRun();
S_ChangeMusicInternal("racent", true);
}
Fix title menu not working if you leave a replay early
2019-04-06 23:17:56 +00:00
else
D_StartTitle();
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
static void M_PandorasBox(INT32 choice)
{
(void)choice;
CV_StealthSetValue(&cv_dummyrings, max(players[consoleplayer].health - 1, 0));
CV_StealthSetValue(&cv_dummylives, players[consoleplayer].lives);
CV_StealthSetValue(&cv_dummycontinues, players[consoleplayer].continues);
M_SetupNextMenu(&SR_PandoraDef);
}
static boolean M_ExitPandorasBox(void)
{
if (cv_dummyrings.value != max(players[consoleplayer].health - 1, 0))
COM_ImmedExecute(va("setrings %d", cv_dummyrings.value));
if (cv_dummylives.value != players[consoleplayer].lives)
COM_ImmedExecute(va("setlives %d", cv_dummylives.value));
if (cv_dummycontinues.value != players[consoleplayer].continues)
COM_ImmedExecute(va("setcontinues %d", cv_dummycontinues.value));
return true;
}
static void M_ChangeLevel(INT32 choice)
{
char mapname[6];
(void)choice;
strlcpy(mapname, G_BuildMapName(cv_nextmap.value), sizeof (mapname));
strlwr(mapname);
mapname[5] = '\0';
M_ClearMenus(true);
COM_BufAddText(va("map %s -gametype \"%s\"\n", mapname, cv_newgametype.string));
}
static void M_ConfirmSpectate(INT32 choice)
{
(void)choice;
Make "Enter Game" option use the big blue window notice if you cannot switch teams, instead of falling back on changeteam's own console notice
2017-03-02 14:28:52 +00:00
// We allow switching to spectator even if team changing is not allowed
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
M_ClearMenus(true);
COM_ImmedExecute("changeteam spectator");
}
static void M_ConfirmEnterGame(INT32 choice)
{
(void)choice;
Spectate/Enter menu for online splitscreen Just like the menu option
2018-10-16 00:28:35 +00:00
if (!cv_allowteamchange.value)
Make "Enter Game" option use the big blue window notice if you cannot switch teams, instead of falling back on changeteam's own console notice
2017-03-02 14:28:52 +00:00
{
M_StartMessage(M_GetText("The server is not allowing\nteam changes at this time.\nPress a key.\n"), NULL, MM_NOTHING);
return;
Spectate/Enter menu for online splitscreen Just like the menu option
2018-10-16 00:28:35 +00:00
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
M_ClearMenus(true);
COM_ImmedExecute("changeteam playing");
}
static void M_ConfirmTeamScramble(INT32 choice)
{
(void)choice;
M_ClearMenus(true);
Spectate/Enter menu for online splitscreen Just like the menu option
2018-10-16 00:28:35 +00:00
COM_ImmedExecute(va("teamscramble %d", cv_dummyscramble.value+1));
}
static void M_ConfirmTeamChange(INT32 choice)
{
(void)choice;
if (cv_dummymenuplayer.value > splitscreen+1)
return;
if (!cv_allowteamchange.value && cv_dummyteam.value)
{
M_StartMessage(M_GetText("The server is not allowing\nteam changes at this time.\nPress a key.\n"), NULL, MM_NOTHING);
return;
}
M_ClearMenus(true);
switch (cv_dummymenuplayer.value)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
case 1:
Spectate/Enter menu for online splitscreen Just like the menu option
2018-10-16 00:28:35 +00:00
default:
COM_ImmedExecute(va("changeteam %s", cv_dummyteam.string));
break;
case 2:
COM_ImmedExecute(va("changeteam2 %s", cv_dummyteam.string));
break;
case 3:
COM_ImmedExecute(va("changeteam3 %s", cv_dummyteam.string));
break;
case 4:
COM_ImmedExecute(va("changeteam4 %s", cv_dummyteam.string));
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
break;
}
}
Spectate/Enter menu for online splitscreen Just like the menu option
2018-10-16 00:28:35 +00:00
static void M_ConfirmSpectateChange(INT32 choice)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
(void)choice;
Spectate/Enter menu for online splitscreen Just like the menu option
2018-10-16 00:28:35 +00:00
if (cv_dummymenuplayer.value > splitscreen+1)
return;
if (!cv_allowteamchange.value && cv_dummyspectate.value)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
M_StartMessage(M_GetText("The server is not allowing\nteam changes at this time.\nPress a key.\n"), NULL, MM_NOTHING);
return;
}
M_ClearMenus(true);
Spectate/Enter menu for online splitscreen Just like the menu option
2018-10-16 00:28:35 +00:00
switch (cv_dummymenuplayer.value)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
case 1:
Spectate/Enter menu for online splitscreen Just like the menu option
2018-10-16 00:28:35 +00:00
default:
COM_ImmedExecute(va("changeteam %s", cv_dummyspectate.string));
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
break;
case 2:
Spectate/Enter menu for online splitscreen Just like the menu option
2018-10-16 00:28:35 +00:00
COM_ImmedExecute(va("changeteam2 %s", cv_dummyspectate.string));
break;
case 3:
COM_ImmedExecute(va("changeteam3 %s", cv_dummyspectate.string));
break;
case 4:
COM_ImmedExecute(va("changeteam4 %s", cv_dummyspectate.string));
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
break;
}
}
static void M_Options(INT32 choice)
{
(void)choice;
Better menus
2018-06-15 00:18:29 +00:00
// if the player is not admin or server, disable gameplay & server options
Menu fix-up - Use center menu style for the tiny extras menu - Move Screenshot Options, Add-on Options, Replay Options, and Erase Data into Data Options again
2019-05-02 05:33:11 +00:00
OP_MainMenu[4].status = OP_MainMenu[5].status = (Playing() && !(server || IsPlayerAdmin(consoleplayer))) ? (IT_GRAYEDOUT) : (IT_STRING|IT_SUBMENU);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Menu fix-up - Use center menu style for the tiny extras menu - Move Screenshot Options, Add-on Options, Replay Options, and Erase Data into Data Options again
2019-05-02 05:33:11 +00:00
OP_MainMenu[8].status = (Playing()) ? (IT_GRAYEDOUT) : (IT_STRING|IT_CALL); // Play credits
Add some options, maxplayer/allownewplayer dont need to be netvars anymore
2020-08-22 05:53:27 +00:00
#ifdef HAVE_DISCORDRPC
OP_DataOptionsMenu[4].status = (Playing()) ? (IT_GRAYEDOUT) : (IT_STRING|IT_SUBMENU); // Erase data
#else
Menu fix-up - Use center menu style for the tiny extras menu - Move Screenshot Options, Add-on Options, Replay Options, and Erase Data into Data Options again
2019-05-02 05:33:11 +00:00
OP_DataOptionsMenu[3].status = (Playing()) ? (IT_GRAYEDOUT) : (IT_STRING|IT_SUBMENU); // Erase data
Add some options, maxplayer/allownewplayer dont need to be netvars anymore
2020-08-22 05:53:27 +00:00
#endif
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
* Make Encore Mode an unlockable, rather than freely available. * Make unlockables have a "showing" conditionset, for when you're able to see them on the Extras screen. * A shorter Encore ruby-pulse fade, for when encore mode is already active!
2018-08-08 19:48:29 +00:00
OP_GameOptionsMenu[3].status =
(M_SecretUnlocked(SECRET_ENCORE)) ? (IT_CVAR|IT_STRING) : IT_SECRET; // cv_kartencore
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
OP_MainDef.prevMenu = currentMenu;
M_SetupNextMenu(&OP_MainDef);
}
* User manual! * Some visual ordering fixes for the item menu, plus a #define-toggleable option for the bottom right slot to be traversable for ease-of-use purposes (even if it doesn't do anything).
2018-09-08 16:02:03 +00:00
static void M_Manual(INT32 choice)
{
(void)choice;
MISC_HelpDef.prevMenu = (choice == INT32_MAX ? NULL : currentMenu);
M_SetupNextMenu(&MISC_HelpDef);
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
static void M_RetryResponse(INT32 ch)
{
if (ch != 'y' && ch != KEY_ENTER)
return;
Minor compiler warnings
2022-08-04 16:03:16 +00:00
if (netgame || multiplayer) // Should never happen!
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return;
M_ClearMenus(true);
G_SetRetryFlag();
}
static void M_Retry(INT32 choice)
{
(void)choice;
Some token efforts to make singleplayer mode (accessible only via `-warp` and `map mapxx -force`) not COMPLETELY broken. * Fixed the conditionals for `suicide` and `retry` commands - `suicide` is now allowed in singleplayer, and `retry` no longer checks your lives (for now). * Disable the "traditional" level reload method (which `retry` tried to use), since it was completely broken with the other changes we've made. Mapchanges only. * Made retries cause a mapchange, per the above. * Disable the last source of skincolor trampling in the game - loading a level while not netgame or record attacking.
2018-10-17 12:40:17 +00:00
M_StartMessage(M_GetText("Start this race over?\n\n(Press 'Y' to confirm)\n"),M_RetryResponse,MM_YESNO);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
static void M_SelectableClearMenus(INT32 choice)
{
(void)choice;
M_ClearMenus(true);
}
Make join requests options on pause menu selectable even if you're already in the menu
2020-08-23 00:16:49 +00:00
void M_RefreshPauseMenu(void)
{
#ifdef HAVE_DISCORDRPC
if (discordRequestList != NULL)
{
MPauseMenu[mpause_discordrequests].status = IT_STRING | IT_SUBMENU;
}
else
{
MPauseMenu[mpause_discordrequests].status = IT_GRAYEDOUT;
}
#endif
}
Print and display rules from the master server Update HMS version to 2.2. Fetch the rules when master server cvar set. Print rules in console when server register. Display the rules in the menu when entering the server hosting menu or when changing the advertise cvar.
2022-07-03 05:20:52 +00:00
void M_PopupMasterServerRules(void)
{
#ifdef MASTERSERVER
if (cv_advertise.value && (serverrunning || currentMenu == &MP_ServerDef))
{
char *rules = GetMasterServerRules();
Only show the rules popup if rules have been recorded.
2022-07-09 20:12:13 +00:00
if (rules)
{
M_StartMessage(va("%s\n(press any key)", rules), NULL, MM_NOTHING);
Z_Free(rules);
}
Print and display rules from the master server Update HMS version to 2.2. Fetch the rules when master server cvar set. Print rules in console when server register. Display the rules in the menu when entering the server hosting menu or when changing the advertise cvar.
2022-07-03 05:20:52 +00:00
}
#endif
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// ======
// CHEATS
// ======
static void M_UltimateCheat(INT32 choice)
{
(void)choice;
I_Quit();
}
static void M_GetAllEmeralds(INT32 choice)
{
(void)choice;
emeralds = ((EMERALD7)*2)-1;
M_StartMessage(M_GetText("You now have all 7 emeralds.\nUse them wisely.\nWith great power comes great ring drain.\n"),NULL,MM_NOTHING);
* Refactor all instances of `majormods = true;` to route through G_SetGameModified, and catch a few spots I missed in the process. * Make G_SetGameModified only console-print for major mods. * Add amnesty to "major mod" detection while loading files with custom savedatas. * Improved the console prints for command `isgamemodified`.
2019-01-17 22:01:28 +00:00
G_SetGameModified(multiplayer, true);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
static void M_DestroyRobotsResponse(INT32 ch)
{
if (ch != 'y' && ch != KEY_ENTER)
return;
// Destroy all robots
P_DestroyRobots();
* Refactor all instances of `majormods = true;` to route through G_SetGameModified, and catch a few spots I missed in the process. * Make G_SetGameModified only console-print for major mods. * Add amnesty to "major mod" detection while loading files with custom savedatas. * Improved the console prints for command `isgamemodified`.
2019-01-17 22:01:28 +00:00
G_SetGameModified(multiplayer, true);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
static void M_DestroyRobots(INT32 choice)
{
(void)choice;
M_StartMessage(M_GetText("Do you want to destroy all\nrobots in the current level?\n\n(Press 'Y' to confirm)\n"),M_DestroyRobotsResponse,MM_YESNO);
}
Stupidbad-big commit, but PLEASE don't ask me to re-do this on another branch, I swear to god. I know it makes things more difficult on you, and I'm sorry for that, but I'm definitely feeling the goddamn crunch right now and I wanna take a step back from this spaghetti nightmare and clear my head. * Do that thing where the character icons are ALWAYS 1x sized, through having two seperate lumps. * Revamp the S_SKIN parameters to be `facerank` (rankings - equivalent of half-scale old face), `facewant` (WANTED - equivalent of old face), and `facemmap` (equivalent of old iconprefix). * Do that thing Oni wanted where it shows two postions above and two positions below your current ranking (and you) to the left of the screen, instead of always the top 4, with some limits to avoid drawing outside of everything. * Replace the last few shitty Mario numbers (for the left rankings) with cool, new Oni numbers. * Change a bunch of offsets and things so the tab rankings and the intermission work nicer with 9+ players.
2018-10-28 16:27:55 +00:00
/*static void M_LevelSelectWarp(INT32 choice)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
boolean fromloadgame = (currentMenu == &SP_LevelSelectDef);
(void)choice;
if (W_CheckNumForName(G_BuildMapName(cv_nextmap.value)) == LUMPERROR)
{
// CONS_Alert(CONS_WARNING, "Internal game map '%s' not found\n", G_BuildMapName(cv_nextmap.value));
return;
}
startmap = (INT16)(cv_nextmap.value);
fromlevelselect = true;
if (fromloadgame)
G_LoadGame((UINT32)cursaveslot, startmap);
else
{
cursaveslot = -1;
M_SetupChoosePlayer(0);
}
Stupidbad-big commit, but PLEASE don't ask me to re-do this on another branch, I swear to god. I know it makes things more difficult on you, and I'm sorry for that, but I'm definitely feeling the goddamn crunch right now and I wanna take a step back from this spaghetti nightmare and clear my head. * Do that thing where the character icons are ALWAYS 1x sized, through having two seperate lumps. * Revamp the S_SKIN parameters to be `facerank` (rankings - equivalent of half-scale old face), `facewant` (WANTED - equivalent of old face), and `facemmap` (equivalent of old iconprefix). * Do that thing Oni wanted where it shows two postions above and two positions below your current ranking (and you) to the left of the screen, instead of always the top 4, with some limits to avoid drawing outside of everything. * Replace the last few shitty Mario numbers (for the left rankings) with cool, new Oni numbers. * Change a bunch of offsets and things so the tab rankings and the intermission work nicer with 9+ players.
2018-10-28 16:27:55 +00:00
}*/
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// ========
// SKY ROOM
// ========
UINT8 skyRoomMenuTranslations[MAXUNLOCKABLES];
:(
2018-03-29 05:14:47 +00:00
static char *M_GetConditionString(condition_t cond)
Start of a better unlockable checklist Still WIP, doesn't display properly
2018-03-29 05:14:29 +00:00
{
switch(cond.type)
{
case UC_PLAYTIME:
Finished checklist
2018-03-29 15:43:56 +00:00
return va("Play for %i:%02i:%02i",
Start of a better unlockable checklist Still WIP, doesn't display properly
2018-03-29 05:14:29 +00:00
G_TicsToHours(cond.requirement),
G_TicsToMinutes(cond.requirement, false),
G_TicsToSeconds(cond.requirement));
case UC_MATCHESPLAYED:
Finished checklist
2018-03-29 15:43:56 +00:00
return va("Play %d matches", cond.requirement);
Start of a better unlockable checklist Still WIP, doesn't display properly
2018-03-29 05:14:29 +00:00
case UC_GAMECLEAR:
if (cond.requirement > 1)
Finished checklist
2018-03-29 15:43:56 +00:00
return va("Beat game %d times", cond.requirement);
Start of a better unlockable checklist Still WIP, doesn't display properly
2018-03-29 05:14:29 +00:00
else
Finished checklist
2018-03-29 15:43:56 +00:00
return va("Beat the game");
Start of a better unlockable checklist Still WIP, doesn't display properly
2018-03-29 05:14:29 +00:00
case UC_ALLEMERALDS:
if (cond.requirement > 1)
Finished checklist
2018-03-29 15:43:56 +00:00
return va("Beat game w/ all emeralds %d times", cond.requirement);
Start of a better unlockable checklist Still WIP, doesn't display properly
2018-03-29 05:14:29 +00:00
else
Finished checklist
2018-03-29 15:43:56 +00:00
return va("Beat game w/ all emeralds");
Start of a better unlockable checklist Still WIP, doesn't display properly
2018-03-29 05:14:29 +00:00
case UC_OVERALLTIME:
Finished checklist
2018-03-29 15:43:56 +00:00
return va("Get overall time of %i:%02i:%02i",
Start of a better unlockable checklist Still WIP, doesn't display properly
2018-03-29 05:14:29 +00:00
G_TicsToHours(cond.requirement),
G_TicsToMinutes(cond.requirement, false),
G_TicsToSeconds(cond.requirement));
case UC_MAPVISITED:
Finished checklist
2018-03-29 15:43:56 +00:00
return va("Visit %s", G_BuildMapTitle(cond.requirement-1));
Start of a better unlockable checklist Still WIP, doesn't display properly
2018-03-29 05:14:29 +00:00
case UC_MAPBEATEN:
Finished checklist
2018-03-29 15:43:56 +00:00
return va("Beat %s", G_BuildMapTitle(cond.requirement-1));
Start of a better unlockable checklist Still WIP, doesn't display properly
2018-03-29 05:14:29 +00:00
case UC_MAPALLEMERALDS:
Finished checklist
2018-03-29 15:43:56 +00:00
return va("Beat %s w/ all emeralds", G_BuildMapTitle(cond.requirement-1));
Start of a better unlockable checklist Still WIP, doesn't display properly
2018-03-29 05:14:29 +00:00
case UC_MAPTIME:
Finished checklist
2018-03-29 15:43:56 +00:00
return va("Beat %s in %i:%02i.%02i", G_BuildMapTitle(cond.extrainfo1-1),
Start of a better unlockable checklist Still WIP, doesn't display properly
2018-03-29 05:14:29 +00:00
G_TicsToMinutes(cond.requirement, true),
G_TicsToSeconds(cond.requirement),
G_TicsToCentiseconds(cond.requirement));
case UC_TOTALEMBLEMS:
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:01:50 +00:00
return va("Get %d medals", cond.requirement);
Start of a better unlockable checklist Still WIP, doesn't display properly
2018-03-29 05:14:29 +00:00
case UC_EXTRAEMBLEM:
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:01:50 +00:00
return va("Get \"%s\" medal", extraemblems[cond.requirement-1].name);
Start of a better unlockable checklist Still WIP, doesn't display properly
2018-03-29 05:14:29 +00:00
default:
Intro camera can noclip, fix several compile errors
2018-06-25 13:18:30 +00:00
return NULL;
Start of a better unlockable checklist Still WIP, doesn't display properly
2018-03-29 05:14:29 +00:00
}
}
Forgot to remove some debug stuff
2018-03-29 16:01:04 +00:00
#define NUMCHECKLIST 23
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
static void M_DrawChecklist(void)
{
Intro camera can noclip, fix several compile errors
2018-06-25 13:18:30 +00:00
UINT32 i, line = 0, c;
INT32 lastid;
Slightly less duplication
2018-11-14 19:39:37 +00:00
boolean secret = false;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
for (i = 0; i < MAXUNLOCKABLES; i++)
{
Hide unlockables with ???s
2018-11-14 19:15:24 +00:00
const char *secretname;
Slightly less duplication
2018-11-14 19:39:37 +00:00
secret = (!M_Achieved(unlockables[i].showconditionset - 1) && !unlockables[i].unlocked);
Hide unlockables with ???s
2018-11-14 19:15:24 +00:00
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (unlockables[i].name[0] == 0 || unlockables[i].nochecklist
* Make Encore Mode an unlockable, rather than freely available. * Make unlockables have a "showing" conditionset, for when you're able to see them on the Extras screen. * A shorter Encore ruby-pulse fade, for when encore mode is already active!
2018-08-08 19:48:29 +00:00
|| !unlockables[i].conditionset || unlockables[i].conditionset > MAXCONDITIONSETS
Slightly less duplication
2018-11-14 19:39:37 +00:00
|| (unlockables[i].type == SECRET_HELLATTACK && secret)) // TODO: turn this into an unlockable setting instead of tying it to Hell Attack
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
continue;
Start of a better unlockable checklist Still WIP, doesn't display properly
2018-03-29 05:14:29 +00:00
++line;
Hide unlockables with ???s
2018-11-14 19:15:24 +00:00
secretname = M_CreateSecretMenuOption(unlockables[i].name);
V_DrawString(8, (line*8), V_RETURN8|(unlockables[i].unlocked ? recommendedflags : warningflags), (secret ? secretname : unlockables[i].name));
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Finished checklist
2018-03-29 15:43:56 +00:00
if (conditionSets[unlockables[i].conditionset - 1].numconditions)
Start of a better unlockable checklist Still WIP, doesn't display properly
2018-03-29 05:14:29 +00:00
{
Finished checklist
2018-03-29 15:43:56 +00:00
c = 0;
lastid = -1;
Start of a better unlockable checklist Still WIP, doesn't display properly
2018-03-29 05:14:29 +00:00
Finished checklist
2018-03-29 15:43:56 +00:00
for (c = 0; c < conditionSets[unlockables[i].conditionset - 1].numconditions; c++)
{
condition_t cond = conditionSets[unlockables[i].conditionset - 1].condition[c];
UINT8 achieved = M_CheckCondition(&cond);
char *str = M_GetConditionString(cond);
Hide unlockables with ???s
2018-11-14 19:15:24 +00:00
const char *secretstr = M_CreateSecretMenuOption(str);
Start of a better unlockable checklist Still WIP, doesn't display properly
2018-03-29 05:14:29 +00:00
Finished checklist
2018-03-29 15:43:56 +00:00
if (!str)
continue;
++line;
Start of a better unlockable checklist Still WIP, doesn't display properly
2018-03-29 05:14:29 +00:00
Intro camera can noclip, fix several compile errors
2018-06-25 13:18:30 +00:00
if (lastid == -1 || cond.id != (UINT32)lastid)
Finished checklist
2018-03-29 15:43:56 +00:00
{
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
V_DrawString(16, (line*8), V_MONOSPACE|V_ALLOWLOWERCASE|(achieved ? highlightflags : 0), "*");
Hide unlockables with ???s
2018-11-14 19:15:24 +00:00
V_DrawString(32, (line*8), V_MONOSPACE|V_ALLOWLOWERCASE|(achieved ? highlightflags : 0), (secret ? secretstr : str));
Finished checklist
2018-03-29 15:43:56 +00:00
}
else
{
Hide unlockables with ???s
2018-11-14 19:15:24 +00:00
V_DrawString(32, (line*8), V_MONOSPACE|V_ALLOWLOWERCASE|(achieved ? highlightflags : 0), (secret ? "?" : "&"));
V_DrawString(48, (line*8), V_MONOSPACE|V_ALLOWLOWERCASE|(achieved ? highlightflags : 0), (secret ? secretstr : str));
Finished checklist
2018-03-29 15:43:56 +00:00
}
lastid = cond.id;
}
Start of a better unlockable checklist Still WIP, doesn't display properly
2018-03-29 05:14:29 +00:00
}
Finished checklist
2018-03-29 15:43:56 +00:00
++line;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Start of a better unlockable checklist Still WIP, doesn't display properly
2018-03-29 05:14:29 +00:00
if (line >= NUMCHECKLIST)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
break;
}
}
Finished checklist
2018-03-29 15:43:56 +00:00
#undef NUMCHECKLIST
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
#define NUMHINTS 5
static void M_EmblemHints(INT32 choice)
{
(void)choice;
SR_EmblemHintMenu[0].status = (M_SecretUnlocked(SECRET_ITEMFINDER)) ? (IT_CVAR|IT_STRING) : (IT_SECRET);
M_SetupNextMenu(&SR_EmblemHintDef);
itemOn = 1; // always start on back.
}
static void M_DrawEmblemHints(void)
{
INT32 i, j = 0;
UINT32 collected = 0;
emblem_t *emblem;
const char *hint;
for (i = 0; i < numemblems; i++)
{
emblem = &emblemlocations[i];
if (emblem->level != gamemap || emblem->type > ET_SKIN)
continue;
if (emblem->collected)
{
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
collected = recommendedflags;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
V_DrawMappedPatch(12, 12+(28*j), 0, W_CachePatchName(M_GetEmblemPatch(emblem), PU_CACHE),
Cache colormaps everywhere to avoid memory leaks
2019-03-16 05:39:52 +00:00
R_GetTranslationColormap(TC_DEFAULT, M_GetEmblemColor(emblem), GTC_MENUCACHE));
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
else
{
collected = 0;
V_DrawScaledPatch(12, 12+(28*j), 0, W_CachePatchName("NEEDIT", PU_CACHE));
}
if (emblem->hint[0])
hint = emblem->hint;
else
hint = M_GetText("No hints available.");
hint = V_WordWrap(40, BASEVIDWIDTH-12, 0, hint);
V_DrawString(40, 8+(28*j), V_RETURN8|V_ALLOWLOWERCASE|collected, hint);
if (++j >= NUMHINTS)
break;
}
if (!j)
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:01:50 +00:00
V_DrawCenteredString(160, 48, highlightflags, "No hidden medals on this map.");
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
M_DrawGenericMenu();
}
static void M_DrawSkyRoom(void)
{
INT32 i, y = 0;
Don't look at this commit too closely until after netgame, I want to surprise yalls!! * Lots of menu changes! * Little arrows next to changeable cvars! * Show default value for sliders! * Pretty pretty pretty. * I don't know how to describe some of these changes. * Effectively nuke MIDI music support! * Skiddown at the start of a race is more interesting! * Spinning in waterslides! * Tiny bugfix in voting, plus a little celebration...
2018-06-30 22:18:13 +00:00
INT32 lengthstring = 0;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
M_DrawGenericMenu();
Don't look at this commit too closely until after netgame, I want to surprise yalls!! * Lots of menu changes! * Little arrows next to changeable cvars! * Show default value for sliders! * Pretty pretty pretty. * I don't know how to describe some of these changes. * Effectively nuke MIDI music support! * Skiddown at the start of a race is more interesting! * Spinning in waterslides! * Tiny bugfix in voting, plus a little celebration...
2018-06-30 22:18:13 +00:00
if (currentMenu == &OP_SoundOptionsDef)
{
V_DrawRightAlignedString(BASEVIDWIDTH - currentMenu->x,
currentMenu->y+currentMenu->menuitems[0].alphaKey,
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 21:15:14 +00:00
(sound_disabled ? warningflags : highlightflags),
(sound_disabled ? "OFF" : "ON"));
Don't look at this commit too closely until after netgame, I want to surprise yalls!! * Lots of menu changes! * Little arrows next to changeable cvars! * Show default value for sliders! * Pretty pretty pretty. * I don't know how to describe some of these changes. * Effectively nuke MIDI music support! * Skiddown at the start of a race is more interesting! * Spinning in waterslides! * Tiny bugfix in voting, plus a little celebration...
2018-06-30 22:18:13 +00:00
V_DrawRightAlignedString(BASEVIDWIDTH - currentMenu->x,
currentMenu->y+currentMenu->menuitems[2].alphaKey,
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 21:15:14 +00:00
(digital_disabled ? warningflags : highlightflags),
(digital_disabled ? "OFF" : "ON"));
Don't look at this commit too closely until after netgame, I want to surprise yalls!! * Lots of menu changes! * Little arrows next to changeable cvars! * Show default value for sliders! * Pretty pretty pretty. * I don't know how to describe some of these changes. * Effectively nuke MIDI music support! * Skiddown at the start of a race is more interesting! * Spinning in waterslides! * Tiny bugfix in voting, plus a little celebration...
2018-06-30 22:18:13 +00:00
/*V_DrawRightAlignedString(BASEVIDWIDTH - currentMenu->x,
currentMenu->y+currentMenu->menuitems[5].alphaKey,
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 21:15:14 +00:00
(midi_disabled ? warningflags : highlightflags),
(midi_disabled ? "OFF" : "ON"));*/
Don't look at this commit too closely until after netgame, I want to surprise yalls!! * Lots of menu changes! * Little arrows next to changeable cvars! * Show default value for sliders! * Pretty pretty pretty. * I don't know how to describe some of these changes. * Effectively nuke MIDI music support! * Skiddown at the start of a race is more interesting! * Spinning in waterslides! * Tiny bugfix in voting, plus a little celebration...
2018-06-30 22:18:13 +00:00
if (itemOn == 0)
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 21:15:14 +00:00
lengthstring = 8*(sound_disabled ? 3 : 2);
Don't look at this commit too closely until after netgame, I want to surprise yalls!! * Lots of menu changes! * Little arrows next to changeable cvars! * Show default value for sliders! * Pretty pretty pretty. * I don't know how to describe some of these changes. * Effectively nuke MIDI music support! * Skiddown at the start of a race is more interesting! * Spinning in waterslides! * Tiny bugfix in voting, plus a little celebration...
2018-06-30 22:18:13 +00:00
else if (itemOn == 2)
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 21:15:14 +00:00
lengthstring = 8*(digital_disabled ? 3 : 2);
Don't look at this commit too closely until after netgame, I want to surprise yalls!! * Lots of menu changes! * Little arrows next to changeable cvars! * Show default value for sliders! * Pretty pretty pretty. * I don't know how to describe some of these changes. * Effectively nuke MIDI music support! * Skiddown at the start of a race is more interesting! * Spinning in waterslides! * Tiny bugfix in voting, plus a little celebration...
2018-06-30 22:18:13 +00:00
/*else if (itemOn == 5)
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 21:15:14 +00:00
lengthstring = 8*(midi_disabled ? 3 : 2);*/
Don't look at this commit too closely until after netgame, I want to surprise yalls!! * Lots of menu changes! * Little arrows next to changeable cvars! * Show default value for sliders! * Pretty pretty pretty. * I don't know how to describe some of these changes. * Effectively nuke MIDI music support! * Skiddown at the start of a race is more interesting! * Spinning in waterslides! * Tiny bugfix in voting, plus a little celebration...
2018-06-30 22:18:13 +00:00
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
for (i = 0; i < currentMenu->numitems; ++i)
{
Don't look at this commit too closely until after netgame, I want to surprise yalls!! * Lots of menu changes! * Little arrows next to changeable cvars! * Show default value for sliders! * Pretty pretty pretty. * I don't know how to describe some of these changes. * Effectively nuke MIDI music support! * Skiddown at the start of a race is more interesting! * Spinning in waterslides! * Tiny bugfix in voting, plus a little celebration...
2018-06-30 22:18:13 +00:00
if (currentMenu->menuitems[i].itemaction == M_HandleSoundTest)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
y = currentMenu->menuitems[i].alphaKey;
break;
}
}
Some minor things to help draw sonicitems to a close. * "kartvoices" cvar. Possible values "Never", "Tasteful" (default), and "Meme". * Added a way to move quickly through the credits, rather than skip them entirely (hold spacebar or down arrow). * Fix a few mistakes in M_ChangeCvar, some of which I introduced and some of which were weird in the first place. * Tweak the offset of the arrows that let you know you can modify a cvar by pressing left or right (some via a patch.kart change, but others via tweaking the drawing location).
2018-07-29 17:35:56 +00:00
Don't look at this commit too closely until after netgame, I want to surprise yalls!! * Lots of menu changes! * Little arrows next to changeable cvars! * Show default value for sliders! * Pretty pretty pretty. * I don't know how to describe some of these changes. * Effectively nuke MIDI music support! * Skiddown at the start of a race is more interesting! * Spinning in waterslides! * Tiny bugfix in voting, plus a little celebration...
2018-06-30 22:18:13 +00:00
if (y)
{
y += currentMenu->y;
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
V_DrawRightAlignedString(BASEVIDWIDTH - currentMenu->x, y, highlightflags, cv_soundtest.string);
Don't look at this commit too closely until after netgame, I want to surprise yalls!! * Lots of menu changes! * Little arrows next to changeable cvars! * Show default value for sliders! * Pretty pretty pretty. * I don't know how to describe some of these changes. * Effectively nuke MIDI music support! * Skiddown at the start of a race is more interesting! * Spinning in waterslides! * Tiny bugfix in voting, plus a little celebration...
2018-06-30 22:18:13 +00:00
if (cv_soundtest.value)
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
V_DrawRightAlignedString(BASEVIDWIDTH - currentMenu->x, y + 8, highlightflags, S_sfx[cv_soundtest.value].name);
Don't look at this commit too closely until after netgame, I want to surprise yalls!! * Lots of menu changes! * Little arrows next to changeable cvars! * Show default value for sliders! * Pretty pretty pretty. * I don't know how to describe some of these changes. * Effectively nuke MIDI music support! * Skiddown at the start of a race is more interesting! * Spinning in waterslides! * Tiny bugfix in voting, plus a little celebration...
2018-06-30 22:18:13 +00:00
if (i == itemOn)
lengthstring = V_StringWidth(cv_soundtest.string, 0);
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Don't look at this commit too closely until after netgame, I want to surprise yalls!! * Lots of menu changes! * Little arrows next to changeable cvars! * Show default value for sliders! * Pretty pretty pretty. * I don't know how to describe some of these changes. * Effectively nuke MIDI music support! * Skiddown at the start of a race is more interesting! * Spinning in waterslides! * Tiny bugfix in voting, plus a little celebration...
2018-06-30 22:18:13 +00:00
if (lengthstring)
{
V_DrawCharacter(BASEVIDWIDTH - currentMenu->x - 10 - lengthstring - (skullAnimCounter/5), currentMenu->y+currentMenu->menuitems[itemOn].alphaKey,
Some minor things to help draw sonicitems to a close. * "kartvoices" cvar. Possible values "Never", "Tasteful" (default), and "Meme". * Added a way to move quickly through the credits, rather than skip them entirely (hold spacebar or down arrow). * Fix a few mistakes in M_ChangeCvar, some of which I introduced and some of which were weird in the first place. * Tweak the offset of the arrows that let you know you can modify a cvar by pressing left or right (some via a patch.kart change, but others via tweaking the drawing location).
2018-07-29 17:35:56 +00:00
'\x1C' | highlightflags, false); // left arrow
Don't look at this commit too closely until after netgame, I want to surprise yalls!! * Lots of menu changes! * Little arrows next to changeable cvars! * Show default value for sliders! * Pretty pretty pretty. * I don't know how to describe some of these changes. * Effectively nuke MIDI music support! * Skiddown at the start of a race is more interesting! * Spinning in waterslides! * Tiny bugfix in voting, plus a little celebration...
2018-06-30 22:18:13 +00:00
V_DrawCharacter(BASEVIDWIDTH - currentMenu->x + 2 + (skullAnimCounter/5), currentMenu->y+currentMenu->menuitems[itemOn].alphaKey,
Some minor things to help draw sonicitems to a close. * "kartvoices" cvar. Possible values "Never", "Tasteful" (default), and "Meme". * Added a way to move quickly through the credits, rather than skip them entirely (hold spacebar or down arrow). * Fix a few mistakes in M_ChangeCvar, some of which I introduced and some of which were weird in the first place. * Tweak the offset of the arrows that let you know you can modify a cvar by pressing left or right (some via a patch.kart change, but others via tweaking the drawing location).
2018-07-29 17:35:56 +00:00
'\x1D' | highlightflags, false); // right arrow
Don't look at this commit too closely until after netgame, I want to surprise yalls!! * Lots of menu changes! * Little arrows next to changeable cvars! * Show default value for sliders! * Pretty pretty pretty. * I don't know how to describe some of these changes. * Effectively nuke MIDI music support! * Skiddown at the start of a race is more interesting! * Spinning in waterslides! * Tiny bugfix in voting, plus a little celebration...
2018-06-30 22:18:13 +00:00
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
static void M_HandleSoundTest(INT32 choice)
{
boolean exitmenu = false; // exit to previous menu
switch (choice)
{
case KEY_DOWNARROW:
M_NextOpt();
S_StartSound(NULL, sfx_menu1);
break;
case KEY_UPARROW:
M_PrevOpt();
S_StartSound(NULL, sfx_menu1);
break;
case KEY_BACKSPACE:
case KEY_ESCAPE:
exitmenu = true;
break;
case KEY_RIGHTARROW:
CV_AddValue(&cv_soundtest, 1);
break;
case KEY_LEFTARROW:
CV_AddValue(&cv_soundtest, -1);
break;
case KEY_ENTER:
S_StopSounds();
S_StartSound(NULL, cv_soundtest.value);
break;
default:
break;
}
if (exitmenu)
{
if (currentMenu->prevMenu)
M_SetupNextMenu(currentMenu->prevMenu);
else
M_ClearMenus(true);
}
}
// Entering secrets menu
Some unlockable stuff - Secrets renamed to Extras - Extras leads to the checklist instead of another menu - Credits & Sound Test are on the Options menu now - New title screen cheat for unlocking everything ("banana", or "← ↑ → → ↑ ← ↓ → Enter")
2018-03-02 00:00:16 +00:00
/*static void M_SecretsMenu(INT32 choice)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
INT32 i, j, ul;
UINT8 done[MAXUNLOCKABLES];
UINT16 curheight;
(void)choice;
// Clear all before starting
for (i = 1; i < MAXUNLOCKABLES+1; ++i)
SR_MainMenu[i].status = IT_DISABLED;
memset(skyRoomMenuTranslations, 0, sizeof(skyRoomMenuTranslations));
memset(done, 0, sizeof(done));
for (i = 1; i < MAXUNLOCKABLES+1; ++i)
{
curheight = UINT16_MAX;
ul = -1;
// Autosort unlockables
for (j = 0; j < MAXUNLOCKABLES; ++j)
{
if (!unlockables[j].height || done[j] || unlockables[j].type < 0)
continue;
if (unlockables[j].height < curheight)
{
curheight = unlockables[j].height;
ul = j;
}
}
if (ul < 0)
break;
done[ul] = true;
skyRoomMenuTranslations[i-1] = (UINT8)ul;
SR_MainMenu[i].text = unlockables[ul].name;
SR_MainMenu[i].alphaKey = (UINT8)unlockables[ul].height;
if (unlockables[ul].type == SECRET_HEADER)
{
SR_MainMenu[i].status = IT_HEADER;
continue;
}
SR_MainMenu[i].status = IT_SECRET;
if (unlockables[ul].unlocked)
{
switch (unlockables[ul].type)
{
case SECRET_LEVELSELECT:
SR_MainMenu[i].status = IT_STRING|IT_CALL;
SR_MainMenu[i].itemaction = M_CustomLevelSelect;
break;
case SECRET_WARP:
SR_MainMenu[i].status = IT_STRING|IT_CALL;
SR_MainMenu[i].itemaction = M_CustomWarp;
break;
case SECRET_CREDITS:
SR_MainMenu[i].status = IT_STRING|IT_CALL;
SR_MainMenu[i].itemaction = M_Credits;
break;
case SECRET_SOUNDTEST:
SR_MainMenu[i].status = IT_STRING|IT_KEYHANDLER;
SR_MainMenu[i].itemaction = M_HandleSoundTest;
default:
break;
}
}
}
M_SetupNextMenu(&SR_MainDef);
Some unlockable stuff - Secrets renamed to Extras - Extras leads to the checklist instead of another menu - Credits & Sound Test are on the Options menu now - New title screen cheat for unlocking everything ("banana", or "← ↑ → → ↑ ← ↓ → Enter")
2018-03-02 00:00:16 +00:00
}*/
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// ==================
// NEW GAME FUNCTIONS
// ==================
Stupidbad-big commit, but PLEASE don't ask me to re-do this on another branch, I swear to god. I know it makes things more difficult on you, and I'm sorry for that, but I'm definitely feeling the goddamn crunch right now and I wanna take a step back from this spaghetti nightmare and clear my head. * Do that thing where the character icons are ALWAYS 1x sized, through having two seperate lumps. * Revamp the S_SKIN parameters to be `facerank` (rankings - equivalent of half-scale old face), `facewant` (WANTED - equivalent of old face), and `facemmap` (equivalent of old iconprefix). * Do that thing Oni wanted where it shows two postions above and two positions below your current ranking (and you) to the left of the screen, instead of always the top 4, with some limits to avoid drawing outside of everything. * Replace the last few shitty Mario numbers (for the left rankings) with cool, new Oni numbers. * Change a bunch of offsets and things so the tab rankings and the intermission work nicer with 9+ players.
2018-10-28 16:27:55 +00:00
/*INT32 ultimate_selectable = false;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
static void M_NewGame(void)
{
fromlevelselect = false;
startmap = spstage_start;
Added Accelcode, start boosting, reverted drifting, etc.
2017-02-07 22:19:04 +00:00
CV_SetValue(&cv_newgametype, GT_RACE); // SRB2kart
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
M_SetupChoosePlayer(0);
Stupidbad-big commit, but PLEASE don't ask me to re-do this on another branch, I swear to god. I know it makes things more difficult on you, and I'm sorry for that, but I'm definitely feeling the goddamn crunch right now and I wanna take a step back from this spaghetti nightmare and clear my head. * Do that thing where the character icons are ALWAYS 1x sized, through having two seperate lumps. * Revamp the S_SKIN parameters to be `facerank` (rankings - equivalent of half-scale old face), `facewant` (WANTED - equivalent of old face), and `facemmap` (equivalent of old iconprefix). * Do that thing Oni wanted where it shows two postions above and two positions below your current ranking (and you) to the left of the screen, instead of always the top 4, with some limits to avoid drawing outside of everything. * Replace the last few shitty Mario numbers (for the left rankings) with cool, new Oni numbers. * Change a bunch of offsets and things so the tab rankings and the intermission work nicer with 9+ players.
2018-10-28 16:27:55 +00:00
}*/
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Some unlockable stuff - Secrets renamed to Extras - Extras leads to the checklist instead of another menu - Credits & Sound Test are on the Options menu now - New title screen cheat for unlocking everything ("banana", or "← ↑ → → ↑ ← ↓ → Enter")
2018-03-02 00:00:16 +00:00
/*static void M_CustomWarp(INT32 choice)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
INT32 ul = skyRoomMenuTranslations[choice-1];
startmap = (INT16)(unlockables[ul].variable);
M_SetupChoosePlayer(0);
Some unlockable stuff - Secrets renamed to Extras - Extras leads to the checklist instead of another menu - Credits & Sound Test are on the Options menu now - New title screen cheat for unlocking everything ("banana", or "← ↑ → → ↑ ← ↓ → Enter")
2018-03-02 00:00:16 +00:00
}*/
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
static void M_Credits(INT32 choice)
{
(void)choice;
cursaveslot = -2;
M_ClearMenus(true);
F_StartCredits();
}
Some unlockable stuff - Secrets renamed to Extras - Extras leads to the checklist instead of another menu - Credits & Sound Test are on the Options menu now - New title screen cheat for unlocking everything ("banana", or "← ↑ → → ↑ ← ↓ → Enter")
2018-03-02 00:00:16 +00:00
/*static void M_CustomLevelSelect(INT32 choice)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
INT32 ul = skyRoomMenuTranslations[choice-1];
SR_LevelSelectDef.prevMenu = currentMenu;
levellistmode = LLM_LEVELSELECT;
maplistoption = (UINT8)(unlockables[ul].variable);
if (M_CountLevelsToShowInList() == 0)
{
M_StartMessage(M_GetText("No selectable levels found.\n"),NULL,MM_NOTHING);
return;
}
M_PrepareLevelSelect();
M_SetupNextMenu(&SR_LevelSelectDef);
Some unlockable stuff - Secrets renamed to Extras - Extras leads to the checklist instead of another menu - Credits & Sound Test are on the Options menu now - New title screen cheat for unlocking everything ("banana", or "← ↑ → → ↑ ← ↓ → Enter")
2018-03-02 00:00:16 +00:00
}*/
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// ==================
// SINGLE PLAYER MENU
// ==================
Move menu options around 1 Player now goes directly to Time Attack, and Extras is now a submenu with Unlockables, Statistics, and a currently-dummied option for Replay Hut.
2019-03-30 22:25:54 +00:00
#if 0 // Bring this back when we have actual single-player
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
static void M_SinglePlayerMenu(INT32 choice)
{
(void)choice;
SP_MainMenu[sprecordattack].status =
If the game becomes modified during a record attack run, end it RA menu can be opened if the game is modified, but Start can't be selected. (Obvious reason: so scripts to display info can be used easier) Fixed the stupid background for messages in the Record Attack menu, it was bugging me
2016-08-20 05:18:43 +00:00
(M_SecretUnlocked(SECRET_RECORDATTACK)) ? IT_CALL|IT_STRING : IT_SECRET;
Lots of changes - Menus now have all of the Kart cvars - Removed any cvars that aren't useful for Kart from the menu (they still exist in the console, though) - Removed SP and NiGHTS Mode options from the main menu - "kartcc" is renamed "kartspeed", uses values 0-2 instead of multiples of 50, or the terms "Relaxed", "Standard", and "Turbo" - Many gametype options (game speed, frantic, mirror, & karma comeback) are now changed on map load instead of instantly - New cvar, "kartminimap", for disabling the minimap - The maxplayers cvar now actually matches up with our 16 player limit - Game now keeps track of matches played. Has a condition type associated with it, as well. - Game checks for unlocks and saves gamedata when finishing a match, even in MP - Removed most of the normal emblems, added a single emblem for Green Hills. Didn't know what to do with extra emblems and such so I just left them (FOR NOW c:<)
2018-01-16 03:31:14 +00:00
/*SP_MainMenu[spnightsmode].status =
(M_SecretUnlocked(SECRET_NIGHTSMODE)) ? IT_CALL|IT_STRING : IT_SECRET;*/
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
M_SetupNextMenu(&SP_MainDef);
}
Move menu options around 1 Player now goes directly to Time Attack, and Extras is now a submenu with Unlockables, Statistics, and a currently-dummied option for Replay Hut.
2019-03-30 22:25:54 +00:00
#endif
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Stupidbad-big commit, but PLEASE don't ask me to re-do this on another branch, I swear to god. I know it makes things more difficult on you, and I'm sorry for that, but I'm definitely feeling the goddamn crunch right now and I wanna take a step back from this spaghetti nightmare and clear my head. * Do that thing where the character icons are ALWAYS 1x sized, through having two seperate lumps. * Revamp the S_SKIN parameters to be `facerank` (rankings - equivalent of half-scale old face), `facewant` (WANTED - equivalent of old face), and `facemmap` (equivalent of old iconprefix). * Do that thing Oni wanted where it shows two postions above and two positions below your current ranking (and you) to the left of the screen, instead of always the top 4, with some limits to avoid drawing outside of everything. * Replace the last few shitty Mario numbers (for the left rankings) with cool, new Oni numbers. * Change a bunch of offsets and things so the tab rankings and the intermission work nicer with 9+ players.
2018-10-28 16:27:55 +00:00
/*static void M_LoadGameLevelSelect(INT32 choice)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
(void)choice;
levellistmode = LLM_LEVELSELECT;
maplistoption = 1;
if (M_CountLevelsToShowInList() == 0)
{
M_StartMessage(M_GetText("No selectable levels found.\n"),NULL,MM_NOTHING);
return;
}
SP_LevelSelectDef.prevMenu = currentMenu;
M_PrepareLevelSelect();
M_SetupNextMenu(&SP_LevelSelectDef);
Stupidbad-big commit, but PLEASE don't ask me to re-do this on another branch, I swear to god. I know it makes things more difficult on you, and I'm sorry for that, but I'm definitely feeling the goddamn crunch right now and I wanna take a step back from this spaghetti nightmare and clear my head. * Do that thing where the character icons are ALWAYS 1x sized, through having two seperate lumps. * Revamp the S_SKIN parameters to be `facerank` (rankings - equivalent of half-scale old face), `facewant` (WANTED - equivalent of old face), and `facemmap` (equivalent of old iconprefix). * Do that thing Oni wanted where it shows two postions above and two positions below your current ranking (and you) to the left of the screen, instead of always the top 4, with some limits to avoid drawing outside of everything. * Replace the last few shitty Mario numbers (for the left rankings) with cool, new Oni numbers. * Change a bunch of offsets and things so the tab rankings and the intermission work nicer with 9+ players.
2018-10-28 16:27:55 +00:00
}*/
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// ==============
// LOAD GAME MENU
// ==============
Stupidbad-big commit, but PLEASE don't ask me to re-do this on another branch, I swear to god. I know it makes things more difficult on you, and I'm sorry for that, but I'm definitely feeling the goddamn crunch right now and I wanna take a step back from this spaghetti nightmare and clear my head. * Do that thing where the character icons are ALWAYS 1x sized, through having two seperate lumps. * Revamp the S_SKIN parameters to be `facerank` (rankings - equivalent of half-scale old face), `facewant` (WANTED - equivalent of old face), and `facemmap` (equivalent of old iconprefix). * Do that thing Oni wanted where it shows two postions above and two positions below your current ranking (and you) to the left of the screen, instead of always the top 4, with some limits to avoid drawing outside of everything. * Replace the last few shitty Mario numbers (for the left rankings) with cool, new Oni numbers. * Change a bunch of offsets and things so the tab rankings and the intermission work nicer with 9+ players.
2018-10-28 16:27:55 +00:00
/*static INT32 saveSlotSelected = 0;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
static short menumovedir = 0;
static void M_DrawLoadGameData(void)
{
INT32 ecks;
INT32 i;
ecks = SP_LoadDef.x + 24;
M_DrawTextBox(SP_LoadDef.x-12,144, 24, 4);
if (saveSlotSelected == NOSAVESLOT) // last slot is play without saving
{
if (ultimate_selectable)
{
V_DrawCenteredString(ecks + 68, 144, V_ORANGEMAP, "ULTIMATE MODE");
V_DrawCenteredString(ecks + 68, 156, 0, "NO RINGS, NO ONE-UPS,");
V_DrawCenteredString(ecks + 68, 164, 0, "NO CONTINUES, ONE LIFE,");
V_DrawCenteredString(ecks + 68, 172, 0, "FINAL DESTINATION.");
}
else
{
V_DrawCenteredString(ecks + 68, 144, V_ORANGEMAP, "PLAY WITHOUT SAVING");
V_DrawCenteredString(ecks + 68, 156, 0, "THIS GAME WILL NOT BE");
V_DrawCenteredString(ecks + 68, 164, 0, "SAVED, BUT YOU CAN STILL");
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:01:50 +00:00
V_DrawCenteredString(ecks + 68, 172, 0, "GET MEDALS AND SECRETS.");
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
return;
}
if (savegameinfo[saveSlotSelected].lives == -42) // Empty
{
V_DrawCenteredString(ecks + 68, 160, 0, "NO DATA");
return;
}
if (savegameinfo[saveSlotSelected].lives == -666) // savegame is bad
{
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
V_DrawCenteredString(ecks + 68, 144, warningflags, "CORRUPT SAVE FILE");
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
V_DrawCenteredString(ecks + 68, 156, 0, "THIS SAVE FILE");
V_DrawCenteredString(ecks + 68, 164, 0, "CAN NOT BE LOADED.");
V_DrawCenteredString(ecks + 68, 172, 0, "DELETE USING BACKSPACE.");
return;
}
// Draw the back sprite, it looks ugly if we don't
V_DrawScaledPatch(SP_LoadDef.x, 144+8, 0, livesback);
if (savegameinfo[saveSlotSelected].skincolor == 0)
V_DrawScaledPatch(SP_LoadDef.x,144+8,0,W_CachePatchName(skins[savegameinfo[saveSlotSelected].skinnum].face, PU_CACHE));
else
{
Cache colormaps everywhere to avoid memory leaks
2019-03-16 05:39:52 +00:00
UINT8 *colormap = R_GetTranslationColormap(savegameinfo[saveSlotSelected].skinnum, savegameinfo[saveSlotSelected].skincolor, GTC_MENUCACHE);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
V_DrawMappedPatch(SP_LoadDef.x,144+8,0,W_CachePatchName(skins[savegameinfo[saveSlotSelected].skinnum].face, PU_CACHE), colormap);
}
V_DrawString(ecks + 12, 152, 0, savegameinfo[saveSlotSelected].playername);
#ifdef SAVEGAMES_OTHERVERSIONS
if (savegameinfo[saveSlotSelected].gamemap & 16384)
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
V_DrawCenteredString(ecks + 68, 144, warningflags, "OUTDATED SAVE FILE!");
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
#endif
if (savegameinfo[saveSlotSelected].gamemap & 8192)
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
V_DrawString(ecks + 12, 160, recommendedflags, "CLEAR!");
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
else
V_DrawString(ecks + 12, 160, 0, va("%s", savegameinfo[saveSlotSelected].levelname));
// Use the big face pic for lives, duh. :3
V_DrawScaledPatch(ecks + 12, 175, 0, W_CachePatchName("STLIVEX", PU_HUDGFX));
V_DrawTallNum(ecks + 40, 172, 0, savegameinfo[saveSlotSelected].lives);
// Absolute ridiculousness, condensed into another function.
V_DrawContinueIcon(ecks + 58, 182, 0, savegameinfo[saveSlotSelected].skinnum, savegameinfo[saveSlotSelected].skincolor);
V_DrawScaledPatch(ecks + 68, 175, 0, W_CachePatchName("STLIVEX", PU_HUDGFX));
V_DrawTallNum(ecks + 96, 172, 0, savegameinfo[saveSlotSelected].continues);
for (i = 0; i < 7; ++i)
{
if (savegameinfo[saveSlotSelected].numemeralds & (1 << i))
V_DrawScaledPatch(ecks + 104 + (i * 8), 172, 0, tinyemeraldpics[i]);
}
}
#define LOADBARHEIGHT SP_LoadDef.y + (LINEHEIGHT * (j+1)) + ymod
#define CURSORHEIGHT SP_LoadDef.y + (LINEHEIGHT*3) - 1
static void M_DrawLoad(void)
{
INT32 i, j;
INT32 ymod = 0, offset = 0;
M_DrawMenuTitle();
Implement Uncapped (squashed) Co-Authored-By: Sally Coolatta <tehrealsalt@gmail.com> Co-Authored-By: James R <justsomejames2@gmail.com> Co-Authored-By: Monster Iestyn <iestynjealous@ntlworld.com> Co-Authored-By: katsy <katmint@live.com> Place Frame Interpolation in "Experimental" video options header This seems like an appropriate way to describe the feature for now. Add smooth level platter under interpolation, `renderdeltatics` `renderdeltatics` can be used as a standard delta time in any place, allowing for smooth menus. It will always be equal to `realtics` when frame interpolation is turned off, producing consistent framerate behavior everywhere it is used. Add smooth rendering to save select screen Add smooth rendering to Record/NiGHTS Attack, F_SkyScroll Ensure viewsector is accurate to viewx/viewy This fixes a potential crash in OpenGL when changing between levels. Ensure + commands get executed before map start Always have precise_t defined Fix misc dropshadow issues Reset view interpolation on level load Remove unnecessary precipmobj thinker hack Add reset interpolation state functions Reset precip interpolation on snap to ceil Reset mobj interp state on TeleportMove Only swap view interp state if a tick is run Run anti-lag chasecam at tic frequency Fixes jittery and unstable chasecam in high latency netgames Homogenize mobj interpolations Add sector plane level interpolations Add SectorScroll interpolator Add SideScroll interpolator Add Polyobj interpolator Intialize interpolator list at a better time Delete interpolators associated with thinkers Interpolate mobj angles and player drawangle Interpolate HWR_DrawModel Add functions to handle interpolation Much less code duplication P_InitAngle, to fix angle interpolation on spawning objects Fully fix drop shadows It used the thing's floorz / ceilingz directly -- that wouldn't account for interpolated coordinates. Do not speed up underwater/heatwave effect in OpenGL Closer OpenGL underwater/heatwave effect to Software Interpolate from time of previous tic Previously interpolated from last 35th of a second, which may be offset from game time due to connection lag. Consider this the proper fix to 54148a0dd0 too. Calculate FPS stuff even if frame is skipped I decided ultimately to actually keep the frame skip optimization disabled, because I think it is actually a little bit helpful that you can still get accurate rendering perfstats while paused, however if we decide otherwise then we can have this optimization back without making the game act like it's lagging. Keep rect in memory Feel better about this than creating one all da time Lots of FPS stuff - Disabled VSync, due to the numerous problems it has. - Instead, added an FPS cap. - Frame interpolation is now tied to fpscap != 35. - By default, the FPS cap is set to the monitor's refresh rate. - Rewrote the FPS counter. (This also consolidates several more commits ahead of this fixing various issues. -eid) Misc changes after Kart cherry-picks Fix renderdeltatics with new timing data Update mobj oldstates before all thinkers Allow FPS cap values Adjust how FPS cap is checked to improve FPS stability Fix precip crash from missing vars Improve the framerate limiter's timing for extreme stable FPS Handle the sleep at the end of D_SRB2Loop instead of the start Simplifies logic in the other parts of the loop, and fixes problems with it frequently waiting too long. Reset mobj interp state on add Add mobj interpolator on load netgame Move mobj interpolators to r_fps Dynamic slope interpolators I_GetFrameTime to try and improve frame pace (It doesn't feel that much better though.) Move I_FinishUpdate to D_SRB2Loop to sync screen updates with FPS cap, use timestamps in I_FrameCapSleep to simplify the code Fix plane interpolation light level flickering Fix flickering plane interpolation for OpenGL in the exact same way Funny OpenGL renderer being at least 50% copy-pasted Software code :) P_SetOrigin & P_MoveOrigin to replace P_TeleportMove Convert P_TeleportMove use to origin funcs Revert "P_InitAngle, to fix angle interpolation on spawning objects" This reverts commit a80c98bd164a2748cbbfad9027b34601185d93f5. Waypoint polyobjects interpolate z & children Add interpolation to more moving plane types Adds interpolation to the following: - Crumbling platforms - Mario blocks - Floatbob platforms (this one works really strangely due to two thinkers, maybe double-check this one?) Reset overlays interp states each TryRunTics Interpolate model interpolation (lol) Use interp tracer pos for GL linkdraw Papersprite angle interpolation Makes the ending signpost smooth Move intermission emerald bounce to ticker Bring back shadows on polyobjects Also optimizes the method used so rings can show their shadows too. Using just the subsector is a tad bit imprecise admittedly but any more precise methods get really laggy. Fix a bunch of ticking in hu_ drawing functions Revert "Reset overlays interp states each TryRunTics" This reverts commit a71a216faa20e8751b3bd0157354e8d748940c92. Move intro ticking out of the drawer Adjust 1up monitor icon z offsets Fixes interpolation issues with 1up monitors. Delta time choose player menu animations Add drawerlib deltaTime function Interpolate afterimages further back Use old sleep in dedicated mode Clamp cechotimer to 0 Fixes issues with cechos staying on-screen and glitching out (NiGHTS items for example). Revert "Remove unnecessary precipmobj thinker hack" This reverts commit 0e38208620d19ec2ab690740438ac2fc7862a49e. Fix frame pacing when game lags behind The frame timestamp should've been made at the start of the frame, not the end. Fix I_FrameCapSleep not respecting cpusleep Jonathan Joestar bruh Allow dedicated to use precise sleep timing again Instead of only using one old sleep, just enforce framerate cap to match TICRATE. Make Lua TeleportMove call MoveOrigin Reset Metal fume interp state on appear Add interpdebug Put interpdebug stuff in perfstats instead Add timescale cvar Slow the game down to debug animations / interpolation problems! Speed it up if you need to get somewhere quickly while mapping! Enable timescale outside of DEVELOP builds It has NETVAR, so it should be fine -- put an end to useful debugging features excluded in multiplayer! Force interpolation when timescale != 1.0 Reset old_z in MT_LOCKON think Fixes interpolation artifacting due to spawn pos. Fix cutscenes in interp Fix boss1 laser in interp Interpolate mobj scale Precalculate refresh rate Slower PCs can have issue querying mode over and over. This might kinda suck for windowed mode if you have different refresh rate displays but oh well Fix interp scaling crashing software Reset interp scale when Lua sets .scale Disable angle interp on fresh mobjs Fix interp scale crash for hires sprites Interp shadow scales Copy interp state in P_SpawnMobjFromMobj Fix multiplayer character select Don't interpolate mobj state if frac = 1.0 Fix Mario block item placement Interpolate spritescale/offset x/y Fix offset copies for SpawnMobjFromMobj THANKS SAL Add Lua HUD drawlists Buffers draw calls between tics to ensure hooks run at the originally intended rate. Rename drawerlib deltaTime to getDeltaTime Make renderisnewtic is false between tics I know what I'm doing! I swear Completely refactor timing system Time is now tracked internally in the game using I_GetPreciseTime and I_UpdateTime. I_Time now pulls from this internal timer. The system code no longer needs to keep track of time itself. This significantly improves frame and tic timing in interp mode, resulting in a much smoother image with essentially no judder at any framerate. Ensure mobj interpolators reset on level load Ensure view is not interpolated on first frame Disable sprite offset interpolation (for now) Refactor timing code even more System layer is greatly simplified and framecap logic has been moved internally. I_Sleep now takes a sleep duration and I_SleepDuration generically implements a precise sleep with spin loop.
2019-10-06 22:40:52 +00:00
fixed_t scrollfrac = FixedDiv(2, 3);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (menumovedir != 0) //movement illusion
{
ymod = (-(LINEHEIGHT/4))*menumovedir;
offset = ((menumovedir > 0) ? -1 : 1);
}
V_DrawCenteredString(BASEVIDWIDTH/2, 40, 0, "Press backspace to delete a save.");
for (i = MAXSAVEGAMES + saveSlotSelected - 2 + offset, j = 0;i <= MAXSAVEGAMES + saveSlotSelected + 2 + offset; i++, j++)
{
if ((menumovedir < 0 && j == 4) || (menumovedir > 0 && j == 0))
continue; //this helps give the illusion of movement
M_DrawSaveLoadBorder(SP_LoadDef.x, LOADBARHEIGHT);
if ((i%MAXSAVEGAMES) == NOSAVESLOT) // play without saving
{
if (ultimate_selectable)
V_DrawCenteredString(SP_LoadDef.x+92, LOADBARHEIGHT - 1, V_ORANGEMAP, "ULTIMATE MODE");
else
V_DrawCenteredString(SP_LoadDef.x+92, LOADBARHEIGHT - 1, V_ORANGEMAP, "PLAY WITHOUT SAVING");
continue;
}
if (savegameinfo[i%MAXSAVEGAMES].lives == -42)
V_DrawString(SP_LoadDef.x-6, LOADBARHEIGHT - 1, V_TRANSLUCENT, "NO DATA");
else if (savegameinfo[i%MAXSAVEGAMES].lives == -666)
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
V_DrawString(SP_LoadDef.x-6, LOADBARHEIGHT - 1, warningflags, "CORRUPT SAVE FILE");
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
else if (savegameinfo[i%MAXSAVEGAMES].gamemap & 8192)
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
V_DrawString(SP_LoadDef.x-6, LOADBARHEIGHT - 1, recommendedflags, "CLEAR!");
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
else
V_DrawString(SP_LoadDef.x-6, LOADBARHEIGHT - 1, 0, va("%s", savegameinfo[i%MAXSAVEGAMES].levelname));
//Draw the save slot number on the right side
V_DrawRightAlignedString(SP_LoadDef.x+192, LOADBARHEIGHT - 1, 0, va("%d",(i%MAXSAVEGAMES) + 1));
}
//Draw cursors on both sides.
V_DrawScaledPatch( 32, CURSORHEIGHT, 0, W_CachePatchName("M_CURSOR", PU_CACHE));
V_DrawScaledPatch(274, CURSORHEIGHT, 0, W_CachePatchName("M_CURSOR", PU_CACHE));
M_DrawLoadGameData();
//finishing the movement illusion
if (menumovedir)
menumovedir += ((menumovedir > 0) ? 1 : -1);
if (abs(menumovedir) > 3)
menumovedir = 0;
}
#undef LOADBARHEIGHT
#undef CURSORHEIGHT
//
// User wants to load this game
//
static void M_LoadSelect(INT32 choice)
{
(void)choice;
if (saveSlotSelected == NOSAVESLOT) //last slot is play without saving
{
M_NewGame();
cursaveslot = -1;
return;
}
if (!FIL_ReadFileOK(va(savegamename, saveSlotSelected)))
{
// This slot is empty, so start a new game here.
M_NewGame();
}
else if (savegameinfo[saveSlotSelected].gamemap & 8192) // Completed
M_LoadGameLevelSelect(saveSlotSelected + 1);
else
G_LoadGame((UINT32)saveSlotSelected, 0);
cursaveslot = saveSlotSelected;
}
#define VERSIONSIZE 16
#define BADSAVE { savegameinfo[slot].lives = -666; Z_Free(savebuffer); return; }
#define CHECKPOS if (save_p >= end_p) BADSAVE
// Reads the save file to list lives, level, player, etc.
// Tails 05-29-2003
static void M_ReadSavegameInfo(UINT32 slot)
{
size_t length;
char savename[255];
UINT8 *savebuffer;
UINT8 *end_p; // buffer end point, don't read past here
UINT8 *save_p;
INT32 fake; // Dummy variable
char temp[sizeof(timeattackfolder)];
char vcheck[VERSIONSIZE];
#ifdef SAVEGAMES_OTHERVERSIONS
boolean oldversion = false;
#endif
sprintf(savename, savegamename, slot);
length = FIL_ReadFile(savename, &savebuffer);
if (length == 0)
{
savegameinfo[slot].lives = -42;
return;
}
end_p = savebuffer + length;
// skip the description field
save_p = savebuffer;
// Version check
memset(vcheck, 0, sizeof (vcheck));
sprintf(vcheck, "version %d", VERSION);
if (strcmp((const char *)save_p, (const char *)vcheck))
{
#ifdef SAVEGAMES_OTHERVERSIONS
oldversion = true;
#else
BADSAVE // Incompatible versions?
#endif
}
save_p += VERSIONSIZE;
// dearchive all the modifications
// P_UnArchiveMisc()
CHECKPOS
fake = READINT16(save_p);
if (((fake-1) & 8191) >= NUMMAPS) BADSAVE
if(!mapheaderinfo[(fake-1) & 8191])
{
savegameinfo[slot].levelname[0] = '\0';
savegameinfo[slot].actnum = 0;
}
else
{
strcpy(savegameinfo[slot].levelname, mapheaderinfo[(fake-1) & 8191]->lvlttl);
actnum is now a 2 character long string For Cloud Cradle Zone, Act K
2018-06-05 05:34:05 +00:00
savegameinfo[slot].actnum = 0; //mapheaderinfo[(fake-1) & 8191]->actnum
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
#ifdef SAVEGAMES_OTHERVERSIONS
if (oldversion)
{
if (fake == 24) //meh, let's count old Clear! saves too
fake |= 8192;
fake |= 16384; // marker for outdated version
}
#endif
savegameinfo[slot].gamemap = fake;
CHECKPOS
fake = READUINT16(save_p)-357; // emeralds
savegameinfo[slot].numemeralds = (UINT8)fake;
CHECKPOS
READSTRINGN(save_p, temp, sizeof(temp)); // mod it belongs to
if (strcmp(temp, timeattackfolder)) BADSAVE
// P_UnArchivePlayer()
CHECKPOS
savegameinfo[slot].skincolor = READUINT8(save_p);
CHECKPOS
savegameinfo[slot].skinnum = READUINT8(save_p);
CHECKPOS
(void)READINT32(save_p); // Score
CHECKPOS
savegameinfo[slot].lives = READINT32(save_p); // lives
CHECKPOS
savegameinfo[slot].continues = READINT32(save_p); // continues
SRB2 2.1.11 release
2014-08-27 03:56:30 +00:00
if (fake & (1<<10))
{
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
CHECKPOS
savegameinfo[slot].botskin = READUINT8(save_p);
SRB2 2.1.11 release
2014-08-27 03:56:30 +00:00
if (savegameinfo[slot].botskin-1 >= numskins)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
savegameinfo[slot].botskin = 0;
CHECKPOS
savegameinfo[slot].botcolor = READUINT8(save_p); // because why not.
SRB2 2.1.11 release
2014-08-27 03:56:30 +00:00
}
else
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
savegameinfo[slot].botskin = 0;
SRB2 2.1.11 release
2014-08-27 03:56:30 +00:00
if (savegameinfo[slot].botskin)
Build: fixup warnings in Debug builds
2017-09-28 20:54:26 +00:00
snprintf(savegameinfo[slot].playername, 36, "%s & %s",
SRB2 2.1.11 release
2014-08-27 03:56:30 +00:00
skins[savegameinfo[slot].skinnum].realname,
skins[savegameinfo[slot].botskin-1].realname);
else
strcpy(savegameinfo[slot].playername, skins[savegameinfo[slot].skinnum].realname);
savegameinfo[slot].playername[31] = 0;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// File end marker check
CHECKPOS
if (READUINT8(save_p) != 0x1d) BADSAVE;
// done
Z_Free(savebuffer);
}
#undef CHECKPOS
#undef BADSAVE
//
// M_ReadSaveStrings
// read the strings from the savegame files
// and put it in savegamestrings global variable
//
static void M_ReadSaveStrings(void)
{
FILE *handle;
UINT32 i;
char name[256];
for (i = 0; i < MAXSAVEGAMES; i++)
{
snprintf(name, sizeof name, savegamename, i);
name[sizeof name - 1] = '\0';
handle = fopen(name, "rb");
if (handle == NULL)
{
savegameinfo[i].lives = -42;
continue;
}
fclose(handle);
M_ReadSavegameInfo(i);
}
}
//
// User wants to delete this game
//
static void M_SaveGameDeleteResponse(INT32 ch)
{
char name[256];
if (ch != 'y' && ch != KEY_ENTER)
return;
// delete savegame
snprintf(name, sizeof name, savegamename, saveSlotSelected);
name[sizeof name - 1] = '\0';
remove(name);
// Refresh savegame menu info
M_ReadSaveStrings();
}
static void M_HandleLoadSave(INT32 choice)
{
boolean exitmenu = false; // exit to previous menu
switch (choice)
{
case KEY_DOWNARROW:
S_StartSound(NULL, sfx_menu1);
++saveSlotSelected;
if (saveSlotSelected >= MAXSAVEGAMES)
saveSlotSelected -= MAXSAVEGAMES;
menumovedir = 1;
break;
case KEY_UPARROW:
S_StartSound(NULL, sfx_menu1);
--saveSlotSelected;
if (saveSlotSelected < 0)
saveSlotSelected += MAXSAVEGAMES;
menumovedir = -1;
break;
case KEY_ENTER:
S_StartSound(NULL, sfx_menu1);
if (savegameinfo[saveSlotSelected].lives != -666) // don't allow loading of "bad saves"
M_LoadSelect(saveSlotSelected);
break;
case KEY_ESCAPE:
exitmenu = true;
break;
case KEY_BACKSPACE:
S_StartSound(NULL, sfx_menu1);
// Don't allow people to 'delete' "Play without Saving."
// Nor allow people to 'delete' slots with no saves in them.
if (saveSlotSelected != NOSAVESLOT && savegameinfo[saveSlotSelected].lives != -42)
M_StartMessage(M_GetText("Are you sure you want to delete\nthis save game?\n\n(Press 'Y' to confirm)\n"),M_SaveGameDeleteResponse,MM_YESNO);
break;
}
if (exitmenu)
{
if (currentMenu->prevMenu)
M_SetupNextMenu(currentMenu->prevMenu);
else
M_ClearMenus(true);
}
}
//
// Selected from SRB2 menu
//
Stupidbad-big commit, but PLEASE don't ask me to re-do this on another branch, I swear to god. I know it makes things more difficult on you, and I'm sorry for that, but I'm definitely feeling the goddamn crunch right now and I wanna take a step back from this spaghetti nightmare and clear my head. * Do that thing where the character icons are ALWAYS 1x sized, through having two seperate lumps. * Revamp the S_SKIN parameters to be `facerank` (rankings - equivalent of half-scale old face), `facewant` (WANTED - equivalent of old face), and `facemmap` (equivalent of old iconprefix). * Do that thing Oni wanted where it shows two postions above and two positions below your current ranking (and you) to the left of the screen, instead of always the top 4, with some limits to avoid drawing outside of everything. * Replace the last few shitty Mario numbers (for the left rankings) with cool, new Oni numbers. * Change a bunch of offsets and things so the tab rankings and the intermission work nicer with 9+ players.
2018-10-28 16:27:55 +00:00
static void M_LoadGame(INT32 choice)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
(void)choice;
M_ReadSaveStrings();
M_SetupNextMenu(&SP_LoadDef);
Stupidbad-big commit, but PLEASE don't ask me to re-do this on another branch, I swear to god. I know it makes things more difficult on you, and I'm sorry for that, but I'm definitely feeling the goddamn crunch right now and I wanna take a step back from this spaghetti nightmare and clear my head. * Do that thing where the character icons are ALWAYS 1x sized, through having two seperate lumps. * Revamp the S_SKIN parameters to be `facerank` (rankings - equivalent of half-scale old face), `facewant` (WANTED - equivalent of old face), and `facemmap` (equivalent of old iconprefix). * Do that thing Oni wanted where it shows two postions above and two positions below your current ranking (and you) to the left of the screen, instead of always the top 4, with some limits to avoid drawing outside of everything. * Replace the last few shitty Mario numbers (for the left rankings) with cool, new Oni numbers. * Change a bunch of offsets and things so the tab rankings and the intermission work nicer with 9+ players.
2018-10-28 16:27:55 +00:00
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
//
// Used by cheats to force the save menu to a specific spot.
//
void M_ForceSaveSlotSelected(INT32 sslot)
{
// Already there? Out of bounds? Whatever, then!
if (sslot == saveSlotSelected || sslot >= MAXSAVEGAMES)
return;
// Figure out whether to display up movement or down movement
menumovedir = (saveSlotSelected - sslot) > 0 ? -1 : 1;
if (abs(saveSlotSelected - sslot) > (MAXSAVEGAMES>>1))
menumovedir *= -1;
saveSlotSelected = sslot;
}
// ================
// CHARACTER SELECT
// ================
static void M_SetupChoosePlayer(INT32 choice)
{
(void)choice;
if (mapheaderinfo[startmap-1] && mapheaderinfo[startmap-1]->forcecharacter[0] != '\0')
{
M_ChoosePlayer(0); //oh for crying out loud just get STARTED, it doesn't matter!
return;
}
if (Playing() == false)
{
S_StopMusic();
Starting from scratch. SRB2 v2.1.15
2016-07-06 04:09:17 +00:00
S_ChangeMusicInternal("chrsel", true);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
SP_PlayerDef.prevMenu = currentMenu;
M_SetupNextMenu(&SP_PlayerDef);
char_scroll = itemOn*128*FRACUNIT; // finish scrolling the menu
Z_Free(char_notes);
char_notes = NULL;
}
// Draw the choose player setup menu, had some fun with player anim
static void M_DrawSetupChoosePlayerMenu(void)
{
const INT32 my = 24;
patch_t *patch;
INT32 i, o, j;
char *picname;
// Black BG
V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 31);
//V_DrawPatchFill(W_CachePatchName("SRB2BACK", PU_CACHE));
// Character select profile images!1
M_DrawTextBox(0, my, 16, 20);
if (abs(itemOn*128*FRACUNIT - char_scroll) > 256*FRACUNIT)
char_scroll = itemOn*128*FRACUNIT;
else if (itemOn*128*FRACUNIT - char_scroll > 128*FRACUNIT)
char_scroll += 48*FRACUNIT;
else if (itemOn*128*FRACUNIT - char_scroll < -128*FRACUNIT)
char_scroll -= 48*FRACUNIT;
else if (itemOn*128*FRACUNIT > char_scroll+16*FRACUNIT)
char_scroll += 16*FRACUNIT;
else if (itemOn*128*FRACUNIT < char_scroll-16*FRACUNIT)
char_scroll -= 16*FRACUNIT;
else // close enough.
char_scroll = itemOn*128*FRACUNIT; // just be exact now.
i = (char_scroll+16*FRACUNIT)/(128*FRACUNIT);
o = ((char_scroll/FRACUNIT)+16)%128;
// prev character
if (i-1 >= 0 && PlayerMenu[i-1].status != IT_DISABLED
&& o < 32)
{
picname = description[i-1].picname;
if (picname[0] == '\0')
{
picname = strtok(Z_StrDup(description[i-1].skinname), "&");
for (j = 0; j < numskins; j++)
if (stricmp(skins[j].name, picname) == 0)
{
Z_Free(picname);
picname = skins[j].charsel;
break;
}
if (j == numskins) // AAAAAAAAAA
picname = skins[0].charsel;
}
patch = W_CachePatchName(picname, PU_CACHE);
if (SHORT(patch->width) >= 256)
SRB2 2.1.4 release
2014-03-21 18:42:55 +00:00
V_DrawCroppedPatch(8<<FRACBITS, (my + 8)<<FRACBITS, FRACUNIT/2, 0, patch, 0, SHORT(patch->height) - 64 + o*2, SHORT(patch->width), SHORT(patch->height));
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
else
SRB2 2.1.4 release
2014-03-21 18:42:55 +00:00
V_DrawCroppedPatch(8<<FRACBITS, (my + 8)<<FRACBITS, FRACUNIT, 0, patch, 0, SHORT(patch->height) - 32 + o, SHORT(patch->width), SHORT(patch->height));
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
W_UnlockCachedPatch(patch);
}
// next character
if (i+1 < currentMenu->numitems && PlayerMenu[i+1].status != IT_DISABLED
&& o < 128)
{
picname = description[i+1].picname;
if (picname[0] == '\0')
{
picname = strtok(Z_StrDup(description[i+1].skinname), "&");
for (j = 0; j < numskins; j++)
if (stricmp(skins[j].name, picname) == 0)
{
Z_Free(picname);
picname = skins[j].charsel;
break;
}
if (j == numskins) // AAAAAAAAAA
picname = skins[0].charsel;
}
patch = W_CachePatchName(picname, PU_CACHE);
if (SHORT(patch->width) >= 256)
SRB2 2.1.4 release
2014-03-21 18:42:55 +00:00
V_DrawCroppedPatch(8<<FRACBITS, (my + 168 - o)<<FRACBITS, FRACUNIT/2, 0, patch, 0, 0, SHORT(patch->width), o*2);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
else
SRB2 2.1.4 release
2014-03-21 18:42:55 +00:00
V_DrawCroppedPatch(8<<FRACBITS, (my + 168 - o)<<FRACBITS, FRACUNIT, 0, patch, 0, 0, SHORT(patch->width), o);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
W_UnlockCachedPatch(patch);
}
// current character
if (i < currentMenu->numitems && PlayerMenu[i].status != IT_DISABLED)
{
picname = description[i].picname;
if (picname[0] == '\0')
{
picname = strtok(Z_StrDup(description[i].skinname), "&");
for (j = 0; j < numskins; j++)
if (stricmp(skins[j].name, picname) == 0)
{
Z_Free(picname);
picname = skins[j].charsel;
break;
}
if (j == numskins) // AAAAAAAAAA
picname = skins[0].charsel;
}
patch = W_CachePatchName(picname, PU_CACHE);
if (o >= 0 && o <= 32)
{
if (SHORT(patch->width) >= 256)
V_DrawSmallScaledPatch(8, my + 40 - o, 0, patch);
else
V_DrawScaledPatch(8, my + 40 - o, 0, patch);
}
else
{
if (SHORT(patch->width) >= 256)
SRB2 2.1.4 release
2014-03-21 18:42:55 +00:00
V_DrawCroppedPatch(8<<FRACBITS, (my + 8)<<FRACBITS, FRACUNIT/2, 0, patch, 0, (o - 32)*2, SHORT(patch->width), SHORT(patch->height));
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
else
SRB2 2.1.4 release
2014-03-21 18:42:55 +00:00
V_DrawCroppedPatch(8<<FRACBITS, (my + 8)<<FRACBITS, FRACUNIT, 0, patch, 0, o - 32, SHORT(patch->width), SHORT(patch->height));
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
W_UnlockCachedPatch(patch);
}
// draw title (or big pic)
M_DrawMenuTitle();
// Character description
M_DrawTextBox(136, my, 21, 20);
if (!char_notes)
char_notes = V_WordWrap(0, 21*8, V_ALLOWLOWERCASE, description[itemOn].notes);
V_DrawString(146, my + 9, V_RETURN8|V_ALLOWLOWERCASE, char_notes);
}
// Chose the player you want to use Tails 03-02-2002
static void M_ChoosePlayer(INT32 choice)
{
char *skin1,*skin2;
INT32 skinnum;
* Encore on the voting screen! Appears randomly once unlocked in the same slot as that which sometimes represents a gametype change (odds inflated for testing purposes). * A better representation of an Encore level, now with inverted graphics (a special remapping we can now use elsewhere whenever if we want!) and a floating Ruby! * Decouple encore's setting from cv_kartencore on mapload. Instead, bake it into D_MapChange and related, which will only some of the time be fed by cv_kartencore's value. * Encore mode now has a special mapheader palette setting, "encorepal", rather than using the same one as non-encore.
2018-08-11 21:23:40 +00:00
//boolean ultmode = (ultimate_selectable && SP_PlayerDef.prevMenu == &SP_LoadDef && saveSlotSelected == NOSAVESLOT);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// skip this if forcecharacter
if (mapheaderinfo[startmap-1] && mapheaderinfo[startmap-1]->forcecharacter[0] == '\0')
{
// M_SetupChoosePlayer didn't call us directly, that means we've been properly set up.
char_scroll = itemOn*128*FRACUNIT; // finish scrolling the menu
M_DrawSetupChoosePlayerMenu(); // draw the finally selected character one last time for the fadeout
}
M_ClearMenus(true);
skin1 = strtok(description[choice].skinname, "&");
skin2 = strtok(NULL, "&");
if (skin2) {
// this character has a second skin
skinnum = R_SkinAvailable(skin1);
botskin = (UINT8)(R_SkinAvailable(skin2)+1);
botingame = true;
botcolor = skins[botskin-1].prefcolor;
// undo the strtok
description[choice].skinname[strlen(skin1)] = '&';
} else {
skinnum = R_SkinAvailable(description[choice].skinname);
botingame = false;
botskin = 0;
botcolor = 0;
}
if (startmap != spstage_start)
cursaveslot = -1;
lastmapsaved = 0;
gamecomplete = false;
* Encore on the voting screen! Appears randomly once unlocked in the same slot as that which sometimes represents a gametype change (odds inflated for testing purposes). * A better representation of an Encore level, now with inverted graphics (a special remapping we can now use elsewhere whenever if we want!) and a floating Ruby! * Decouple encore's setting from cv_kartencore on mapload. Instead, bake it into D_MapChange and related, which will only some of the time be fed by cv_kartencore's value. * Encore mode now has a special mapheader palette setting, "encorepal", rather than using the same one as non-encore.
2018-08-11 21:23:40 +00:00
G_DeferedInitNew(false, G_BuildMapName(startmap), (UINT8)skinnum, 0, fromlevelselect);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
COM_BufAddText("dummyconsvar 1\n"); // G_DeferedInitNew doesn't do this
Stupidbad-big commit, but PLEASE don't ask me to re-do this on another branch, I swear to god. I know it makes things more difficult on you, and I'm sorry for that, but I'm definitely feeling the goddamn crunch right now and I wanna take a step back from this spaghetti nightmare and clear my head. * Do that thing where the character icons are ALWAYS 1x sized, through having two seperate lumps. * Revamp the S_SKIN parameters to be `facerank` (rankings - equivalent of half-scale old face), `facewant` (WANTED - equivalent of old face), and `facemmap` (equivalent of old iconprefix). * Do that thing Oni wanted where it shows two postions above and two positions below your current ranking (and you) to the left of the screen, instead of always the top 4, with some limits to avoid drawing outside of everything. * Replace the last few shitty Mario numbers (for the left rankings) with cool, new Oni numbers. * Change a bunch of offsets and things so the tab rankings and the intermission work nicer with 9+ players.
2018-10-28 16:27:55 +00:00
}*/
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
// ===============
// STATISTICS MENU
// ===============
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
static INT32 statsLocation;
static INT32 statsMax;
static INT16 statsMapList[NUMMAPS+1];
static void M_Statistics(INT32 choice)
{
INT16 i, j = 0;
(void)choice;
memset(statsMapList, 0, sizeof(statsMapList));
for (i = 0; i < NUMMAPS; i++)
{
if (!mapheaderinfo[i] || mapheaderinfo[i]->lvlttl[0] == '\0')
continue;
A couple of RA-related things An unlockables/time emblems update, the stats screen shows all maps without needing to visit each one, and respawning is enabled in Record Attack now
2018-05-31 02:53:06 +00:00
if (!(mapheaderinfo[i]->typeoflevel & TOL_RACE) // TOL_SP
Fix a bunch of issues with record attack! * Fixed the issue where your runs would be saved as belonging to the wrong character. * Make the Ghost menu always visible. This isn't PERFECT, but it's better than hiding the option to toggle ghosts just because you're doing your first run as a new character. * Fix the number of laps carrying over from MP(!!!!!!!!! plugged a huge security hole for the authenticity of replays...) Other stuff! * Hide map hell maps in the statistics. * Clean up some nonet stuff in the menu. * Put player setup last again, and tweaked its wording. * Disable the special Kart waiting for players behaviour when not playing a netgame - seeing a double gamestate transition in record attack is weird.
2018-07-06 17:08:35 +00:00
|| (mapheaderinfo[i]->menuflags & (LF2_HIDEINSTATS|LF2_HIDEINMENU)))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
continue;
A couple of RA-related things An unlockables/time emblems update, the stats screen shows all maps without needing to visit each one, and respawning is enabled in Record Attack now
2018-05-31 02:53:06 +00:00
if (M_MapLocked(i+1)) // !mapvisited[i]
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
continue;
statsMapList[j++] = i;
}
statsMapList[j] = -1;
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
statsMax = j - 11 + numextraemblems;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
statsLocation = 0;
if (statsMax < 0)
statsMax = 0;
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
M_SetupNextMenu(&SP_LevelStatsDef);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
static void M_DrawStatsMaps(int location)
{
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
INT32 y = 80, i = -1;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
INT16 mnum;
extraemblem_t *exemblem;
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
boolean dotopname = true, dobottomarrow = (location < statsMax);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
if (location)
I was getting annoyed by these arrows and their inconsistency, so I made them use the graphics.
2018-09-10 11:41:53 +00:00
V_DrawCharacter(10, y-(skullAnimCounter/5),
'\x1A' | highlightflags, false); // up arrow
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
while (statsMapList[++i] != -1)
{
if (location)
{
--location;
continue;
}
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
else if (dotopname)
{
V_DrawString(20, y, highlightflags, "LEVEL NAME");
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:01:50 +00:00
V_DrawString(256, y, highlightflags, "MEDALS");
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
y += 8;
dotopname = false;
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
mnum = statsMapList[i];
That's it for me. No new features, no major sprite replacements. Maybe bugfixing stuff like this I did while half-asleep just in case it turns out I missed a test case. * Oni's new 1x Bumpers and Out-Of-Bumpers competition-style 'X'! * Modify alignment for `GOTITx` emblem drawing to match new Chaos Coin sprites. * Adjust m_cond.c list to use new Chaos Coin Emblem sprite slots.
2018-11-01 00:10:34 +00:00
M_DrawMapEmblems(mnum+1, 295, y);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
if (mapheaderinfo[mnum]->levelflags & LF_NOZONE)
V_DrawString(20, y, 0, va("%s %s",
mapheaderinfo[mnum]->lvlttl,
mapheaderinfo[mnum]->actnum));
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
else
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
V_DrawString(20, y, 0, va("%s %s %s",
mapheaderinfo[mnum]->lvlttl,
Fix ZONE being all caps, standardize the function comments
2020-08-17 10:13:32 +00:00
(mapheaderinfo[mnum]->zonttl[0] ? mapheaderinfo[mnum]->zonttl : "Zone"),
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
mapheaderinfo[mnum]->actnum));
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
y += 8;
if (y >= BASEVIDHEIGHT-8)
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
goto bottomarrow;
}
if (dotopname && !location)
{
V_DrawString(20, y, highlightflags, "LEVEL NAME");
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:01:50 +00:00
V_DrawString(256, y, highlightflags, "MEDALS");
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
y += 8;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
else if (location)
--location;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Extra Emblems
for (i = -2; i < numextraemblems; ++i)
{
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
if (i == -1)
{
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:01:50 +00:00
V_DrawString(20, y, highlightflags, "EXTRA MEDALS");
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
if (location)
{
y += 8;
location++;
}
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (location)
{
--location;
continue;
}
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
if (i >= 0)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
exemblem = &extraemblems[i];
if (exemblem->collected)
That's it for me. No new features, no major sprite replacements. Maybe bugfixing stuff like this I did while half-asleep just in case it turns out I missed a test case. * Oni's new 1x Bumpers and Out-Of-Bumpers competition-style 'X'! * Modify alignment for `GOTITx` emblem drawing to match new Chaos Coin sprites. * Adjust m_cond.c list to use new Chaos Coin Emblem sprite slots.
2018-11-01 00:10:34 +00:00
V_DrawSmallMappedPatch(295, y, 0, W_CachePatchName(M_GetExtraEmblemPatch(exemblem), PU_CACHE),
Cache colormaps everywhere to avoid memory leaks
2019-03-16 05:39:52 +00:00
R_GetTranslationColormap(TC_DEFAULT, M_GetExtraEmblemColor(exemblem), GTC_MENUCACHE));
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
else
That's it for me. No new features, no major sprite replacements. Maybe bugfixing stuff like this I did while half-asleep just in case it turns out I missed a test case. * Oni's new 1x Bumpers and Out-Of-Bumpers competition-style 'X'! * Modify alignment for `GOTITx` emblem drawing to match new Chaos Coin sprites. * Adjust m_cond.c list to use new Chaos Coin Emblem sprite slots.
2018-11-01 00:10:34 +00:00
V_DrawSmallScaledPatch(295, y, 0, W_CachePatchName("NEEDIT", PU_CACHE));
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
V_DrawString(20, y, 0, va("%s", exemblem->description));
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
y += 8;
if (y >= BASEVIDHEIGHT-8)
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
goto bottomarrow;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
bottomarrow:
if (dobottomarrow)
I was getting annoyed by these arrows and their inconsistency, so I made them use the graphics.
2018-09-10 11:41:53 +00:00
V_DrawCharacter(10, y-8 + (skullAnimCounter/5),
`[22:03] TehRealSalt: Not organized code-wise, figured toaster would want to help with that since she's the Menu Queen and she probably has better ideas on how to do it` The Menu Queen is in the house~ :sparkles: * Magical, single-page player select and general netgamey stuff, while still remaining both pretty and functional. * Death to NOFOURPLAYER, now that the cat's out the bag. * Clean up NONET, assuming people try to make DD builds on release. * Minor tweaks across the board, mostly places where I wanted to pilfer minor code from and realised it wasn't done optimally originally.
2018-10-16 21:11:47 +00:00
'\x1B' | highlightflags, false); // down arrow
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
static void M_DrawLevelStats(void)
{
char beststr[40];
tic_t besttime = 0;
INT32 i;
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
INT32 mapsunfinished = 0;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
M_DrawMenuTitle();
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
V_DrawString(20, 24, highlightflags, "Total Play Time:");
V_DrawCenteredString(BASEVIDWIDTH/2, 32, 0, va("%i hours, %i minutes, %i seconds",
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
G_TicsToHours(totalplaytime),
G_TicsToMinutes(totalplaytime, false),
G_TicsToSeconds(totalplaytime)));
Layout tweaks to record attack menu and statistics screen.
2018-07-12 14:45:00 +00:00
V_DrawString(20, 42, highlightflags, "Total Matches:");
V_DrawRightAlignedString(BASEVIDWIDTH-16, 42, 0, va("%i played", matchesplayed));
Lots of changes - Menus now have all of the Kart cvars - Removed any cvars that aren't useful for Kart from the menu (they still exist in the console, though) - Removed SP and NiGHTS Mode options from the main menu - "kartcc" is renamed "kartspeed", uses values 0-2 instead of multiples of 50, or the terms "Relaxed", "Standard", and "Turbo" - Many gametype options (game speed, frantic, mirror, & karma comeback) are now changed on map load instead of instantly - New cvar, "kartminimap", for disabling the minimap - The maxplayers cvar now actually matches up with our 16 player limit - Game now keeps track of matches played. Has a condition type associated with it, as well. - Game checks for unlocks and saves gamedata when finishing a match, even in MP - Removed most of the normal emblems, added a single emblem for Green Hills. Didn't know what to do with extra emblems and such so I just left them (FOR NOW c:<)
2018-01-16 03:31:14 +00:00
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
for (i = 0; i < NUMMAPS; i++)
{
if (!mapheaderinfo[i] || !(mapheaderinfo[i]->menuflags & LF2_RECORDATTACK))
continue;
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
if (!mainrecords[i] || mainrecords[i]->time <= 0)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
mapsunfinished++;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
continue;
}
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
besttime += mainrecords[i]->time;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
Layout tweaks to record attack menu and statistics screen.
2018-07-12 14:45:00 +00:00
V_DrawString(20, 62, highlightflags, "Combined time records:");
sprintf(beststr, "%i:%02i:%02i.%02i", G_TicsToHours(besttime), G_TicsToMinutes(besttime, false), G_TicsToSeconds(besttime), G_TicsToCentiseconds(besttime));
V_DrawRightAlignedString(BASEVIDWIDTH-16, 62, (mapsunfinished ? warningflags : 0), beststr);
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
if (mapsunfinished)
Layout tweaks to record attack menu and statistics screen.
2018-07-12 14:45:00 +00:00
V_DrawRightAlignedString(BASEVIDWIDTH-16, 70, warningflags, va("(%d unfinished)", mapsunfinished));
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
else
Layout tweaks to record attack menu and statistics screen.
2018-07-12 14:45:00 +00:00
V_DrawRightAlignedString(BASEVIDWIDTH-16, 70, recommendedflags, "(complete)");
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
That's it for me. No new features, no major sprite replacements. Maybe bugfixing stuff like this I did while half-asleep just in case it turns out I missed a test case. * Oni's new 1x Bumpers and Out-Of-Bumpers competition-style 'X'! * Modify alignment for `GOTITx` emblem drawing to match new Chaos Coin sprites. * Adjust m_cond.c list to use new Chaos Coin Emblem sprite slots.
2018-11-01 00:10:34 +00:00
V_DrawString(32, 70, 0, va("x %d/%d", M_CountEmblems(), numemblems+numextraemblems));
V_DrawSmallScaledPatch(20, 70, 0, W_CachePatchName("GOTITA", PU_STATIC));
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
M_DrawStatsMaps(statsLocation);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
// Handle statistics.
static void M_HandleLevelStats(INT32 choice)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
boolean exitmenu = false; // exit to previous menu
switch (choice)
{
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
case KEY_DOWNARROW:
S_StartSound(NULL, sfx_menu1);
if (statsLocation < statsMax)
++statsLocation;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
break;
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
case KEY_UPARROW:
S_StartSound(NULL, sfx_menu1);
if (statsLocation)
--statsLocation;
break;
case KEY_PGDN:
S_StartSound(NULL, sfx_menu1);
statsLocation += (statsLocation+13 >= statsMax) ? statsMax-statsLocation : 13;
break;
case KEY_PGUP:
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
S_StartSound(NULL, sfx_menu1);
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
statsLocation -= (statsLocation < 13) ? statsLocation : 13;
break;
case KEY_ESCAPE:
exitmenu = true;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
break;
}
if (exitmenu)
{
if (currentMenu->prevMenu)
M_SetupNextMenu(currentMenu->prevMenu);
else
M_ClearMenus(true);
}
}
// ===========
// MODE ATTACK
// ===========
// Drawing function for Time Attack
void M_DrawTimeAttackMenu(void)
{
INT32 i, x, y, cursory = 0;
UINT16 dispstatus;
More menu stuff! * Center level selection. * Re-work Record Attack screen. * Re-order MP Main menu, hide in NONET. * Combined yeeeah on vote screen. * Colour gametype on tab and tally. * (unrelated) Don't show "CHECK" if exiting.
2018-07-02 00:55:01 +00:00
//S_ChangeMusicInternal("racent", true); // Eww, but needed for when user hits escape during demo playback
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
V_DrawPatchFill(W_CachePatchName("SRB2BACK", PU_CACHE));
M_DrawMenuTitle();
More menu stuff! * Center level selection. * Re-work Record Attack screen. * Re-order MP Main menu, hide in NONET. * Combined yeeeah on vote screen. * Colour gametype on tab and tally. * (unrelated) Don't show "CHECK" if exiting.
2018-07-02 00:55:01 +00:00
if (currentMenu == &SP_TimeAttackDef)
Fix a bunch of issues with record attack! * Fixed the issue where your runs would be saved as belonging to the wrong character. * Make the Ghost menu always visible. This isn't PERFECT, but it's better than hiding the option to toggle ghosts just because you're doing your first run as a new character. * Fix the number of laps carrying over from MP(!!!!!!!!! plugged a huge security hole for the authenticity of replays...) Other stuff! * Hide map hell maps in the statistics. * Clean up some nonet stuff in the menu. * Put player setup last again, and tweaked its wording. * Disable the special Kart waiting for players behaviour when not playing a netgame - seeing a double gamestate transition in record attack is weird.
2018-07-06 17:08:35 +00:00
M_DrawLevelSelectOnly(true, false);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// draw menu (everything else goes on top of it)
// Sadly we can't just use generic mode menus because we need some extra hacks
x = currentMenu->x;
y = currentMenu->y;
More menu stuff! * Center level selection. * Re-work Record Attack screen. * Re-order MP Main menu, hide in NONET. * Combined yeeeah on vote screen. * Colour gametype on tab and tally. * (unrelated) Don't show "CHECK" if exiting.
2018-07-02 00:55:01 +00:00
// Character face!
Stupidbad-big commit, but PLEASE don't ask me to re-do this on another branch, I swear to god. I know it makes things more difficult on you, and I'm sorry for that, but I'm definitely feeling the goddamn crunch right now and I wanna take a step back from this spaghetti nightmare and clear my head. * Do that thing where the character icons are ALWAYS 1x sized, through having two seperate lumps. * Revamp the S_SKIN parameters to be `facerank` (rankings - equivalent of half-scale old face), `facewant` (WANTED - equivalent of old face), and `facemmap` (equivalent of old iconprefix). * Do that thing Oni wanted where it shows two postions above and two positions below your current ranking (and you) to the left of the screen, instead of always the top 4, with some limits to avoid drawing outside of everything. * Replace the last few shitty Mario numbers (for the left rankings) with cool, new Oni numbers. * Change a bunch of offsets and things so the tab rankings and the intermission work nicer with 9+ players.
2018-10-28 16:27:55 +00:00
if (W_CheckNumForName(skins[cv_chooseskin.value-1].facewant) != LUMPERROR)
More menu stuff! * Center level selection. * Re-work Record Attack screen. * Re-order MP Main menu, hide in NONET. * Combined yeeeah on vote screen. * Colour gametype on tab and tally. * (unrelated) Don't show "CHECK" if exiting.
2018-07-02 00:55:01 +00:00
{
Cache colormaps everywhere to avoid memory leaks
2019-03-16 05:39:52 +00:00
UINT8 *colormap = R_GetTranslationColormap(cv_chooseskin.value-1, cv_playercolor.value, GTC_MENUCACHE);
Stupidbad-big commit, but PLEASE don't ask me to re-do this on another branch, I swear to god. I know it makes things more difficult on you, and I'm sorry for that, but I'm definitely feeling the goddamn crunch right now and I wanna take a step back from this spaghetti nightmare and clear my head. * Do that thing where the character icons are ALWAYS 1x sized, through having two seperate lumps. * Revamp the S_SKIN parameters to be `facerank` (rankings - equivalent of half-scale old face), `facewant` (WANTED - equivalent of old face), and `facemmap` (equivalent of old iconprefix). * Do that thing Oni wanted where it shows two postions above and two positions below your current ranking (and you) to the left of the screen, instead of always the top 4, with some limits to avoid drawing outside of everything. * Replace the last few shitty Mario numbers (for the left rankings) with cool, new Oni numbers. * Change a bunch of offsets and things so the tab rankings and the intermission work nicer with 9+ players.
2018-10-28 16:27:55 +00:00
V_DrawMappedPatch(BASEVIDWIDTH-x - SHORT(facewantprefix[cv_chooseskin.value-1]->width), y, 0, facewantprefix[cv_chooseskin.value-1], colormap);
More menu stuff! * Center level selection. * Re-work Record Attack screen. * Re-order MP Main menu, hide in NONET. * Combined yeeeah on vote screen. * Colour gametype on tab and tally. * (unrelated) Don't show "CHECK" if exiting.
2018-07-02 00:55:01 +00:00
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
for (i = 0; i < currentMenu->numitems; ++i)
{
dispstatus = (currentMenu->menuitems[i].status & IT_DISPLAY);
if (dispstatus != IT_STRING && dispstatus != IT_WHITESTRING)
continue;
y = currentMenu->y+currentMenu->menuitems[i].alphaKey;
if (i == itemOn)
cursory = y;
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
V_DrawString(x, y, (dispstatus == IT_WHITESTRING) ? highlightflags : 0 , currentMenu->menuitems[i].text);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Cvar specific handling
if ((currentMenu->menuitems[i].status & IT_TYPE) == IT_CVAR)
{
consvar_t *cv = (consvar_t *)currentMenu->menuitems[i].itemaction;
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
if (currentMenu->menuitems[i].status & IT_CV_STRING)
{
M_DrawTextBox(x + 32, y - 8, MAXPLAYERNAME, 1);
V_DrawString(x + 40, y, V_ALLOWLOWERCASE, cv->string);
if (itemOn == i && skullAnimCounter < 4) // blink cursor
V_DrawCharacter(x + 40 + V_StringWidth(cv->string, V_ALLOWLOWERCASE), y, '_',false);
}
else
{
More menu stuff! * Center level selection. * Re-work Record Attack screen. * Re-order MP Main menu, hide in NONET. * Combined yeeeah on vote screen. * Colour gametype on tab and tally. * (unrelated) Don't show "CHECK" if exiting.
2018-07-02 00:55:01 +00:00
const char *str = ((cv == &cv_chooseskin) ? skins[cv_chooseskin.value-1].realname : cv->string);
INT32 soffset = 40, strw = V_StringWidth(str, 0);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
More menu stuff! * Center level selection. * Re-work Record Attack screen. * Re-order MP Main menu, hide in NONET. * Combined yeeeah on vote screen. * Colour gametype on tab and tally. * (unrelated) Don't show "CHECK" if exiting.
2018-07-02 00:55:01 +00:00
// hack to keep the menu from overlapping the level icon
if (currentMenu != &SP_TimeAttackDef || cv == &cv_nextmap)
soffset = 0;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
// Should see nothing but strings
More menu stuff! * Center level selection. * Re-work Record Attack screen. * Re-order MP Main menu, hide in NONET. * Combined yeeeah on vote screen. * Colour gametype on tab and tally. * (unrelated) Don't show "CHECK" if exiting.
2018-07-02 00:55:01 +00:00
V_DrawString(BASEVIDWIDTH - x - soffset - strw, y, highlightflags, str);
if (i == itemOn)
{
V_DrawCharacter(BASEVIDWIDTH - x - soffset - 10 - strw - (skullAnimCounter/5), y,
'\x1C' | highlightflags, false); // left arrow
V_DrawCharacter(BASEVIDWIDTH - x - soffset + 2 + (skullAnimCounter/5), y,
'\x1D' | highlightflags, false); // right arrow
}
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
Change color in menu, replay support for specific staff ghosts Todo: replace the vague number with the demo's recorded player name
2017-10-21 02:01:07 +00:00
else if ((currentMenu->menuitems[i].status & IT_TYPE) == IT_KEYHANDLER && cv_dummystaff.value) // bad hacky assumption: IT_KEYHANDLER is assumed to be staff ghost selector
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
{
INT32 strw = V_StringWidth(dummystaffname, V_ALLOWLOWERCASE);
V_DrawString(BASEVIDWIDTH - x - strw, y, highlightflags|V_ALLOWLOWERCASE, dummystaffname);
if (i == itemOn)
{
V_DrawCharacter(BASEVIDWIDTH - x - 10 - strw - (skullAnimCounter/5), y,
'\x1C' | highlightflags, false); // left arrow
V_DrawCharacter(BASEVIDWIDTH - x + 2 + (skullAnimCounter/5), y,
'\x1D' | highlightflags, false); // right arrow
}
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
More menu stuff! * Center level selection. * Re-work Record Attack screen. * Re-order MP Main menu, hide in NONET. * Combined yeeeah on vote screen. * Colour gametype on tab and tally. * (unrelated) Don't show "CHECK" if exiting.
2018-07-02 00:55:01 +00:00
x = currentMenu->x;
y = currentMenu->y;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
More menu stuff! * Center level selection. * Re-work Record Attack screen. * Re-order MP Main menu, hide in NONET. * Combined yeeeah on vote screen. * Colour gametype on tab and tally. * (unrelated) Don't show "CHECK" if exiting.
2018-07-02 00:55:01 +00:00
// DRAW THE SKULL CURSOR
V_DrawScaledPatch(x - 24, cursory, 0, W_CachePatchName("M_CURSOR", PU_CACHE));
V_DrawString(x, cursory, highlightflags, currentMenu->menuitems[itemOn].text);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Level record list
if (cv_nextmap.value)
{
* Prettier record attack screen! * Uses the in-game timer element to draw its times. * This includes showing them time emblems-to-get! * good night sweet prince * Make the emblem time use the same ' and " as the normal time.
2018-08-29 20:37:47 +00:00
INT32 dupadjust = (vid.width/vid.dupx);
tic_t lap = 0, time = 0;
if (mainrecords[cv_nextmap.value-1])
{
lap = mainrecords[cv_nextmap.value-1]->lap;
time = mainrecords[cv_nextmap.value-1]->time;
}
V_DrawFill((BASEVIDWIDTH - dupadjust)>>1, 78, dupadjust, 36, 239);
V_DrawRightAlignedString(149, 80, highlightflags, "BEST LAP:");
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
K_drawKartTimestamp(lap, 19, 86, 0, 2);
* Prettier record attack screen! * Uses the in-game timer element to draw its times. * This includes showing them time emblems-to-get! * good night sweet prince * Make the emblem time use the same ' and " as the normal time.
2018-08-29 20:37:47 +00:00
V_DrawRightAlignedString(292, 80, highlightflags, "BEST TIME:");
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
K_drawKartTimestamp(time, 162, 86, cv_nextmap.value, 1);
* Prettier record attack screen! * Uses the in-game timer element to draw its times. * This includes showing them time emblems-to-get! * good night sweet prince * Make the emblem time use the same ' and " as the normal time.
2018-08-29 20:37:47 +00:00
}
/*{
char beststr[40];
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
emblem_t *em;
if (!mainrecords[cv_nextmap.value-1] || !mainrecords[cv_nextmap.value-1]->time)
sprintf(beststr, "(none)");
else
sprintf(beststr, "%i:%02i.%02i", G_TicsToMinutes(mainrecords[cv_nextmap.value-1]->time, true),
G_TicsToSeconds(mainrecords[cv_nextmap.value-1]->time),
G_TicsToCentiseconds(mainrecords[cv_nextmap.value-1]->time));
More menu stuff! * Center level selection. * Re-work Record Attack screen. * Re-order MP Main menu, hide in NONET. * Combined yeeeah on vote screen. * Colour gametype on tab and tally. * (unrelated) Don't show "CHECK" if exiting.
2018-07-02 00:55:01 +00:00
V_DrawString(64, y+48, highlightflags, "BEST TIME:");
V_DrawRightAlignedString(BASEVIDWIDTH - 64 - 24 - 8, y+48, V_ALLOWLOWERCASE, beststr);
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
if (!mainrecords[cv_nextmap.value-1] || !mainrecords[cv_nextmap.value-1]->lap)
sprintf(beststr, "(none)");
else
sprintf(beststr, "%i:%02i.%02i", G_TicsToMinutes(mainrecords[cv_nextmap.value-1]->lap, true),
G_TicsToSeconds(mainrecords[cv_nextmap.value-1]->lap),
G_TicsToCentiseconds(mainrecords[cv_nextmap.value-1]->lap));
More menu stuff! * Center level selection. * Re-work Record Attack screen. * Re-order MP Main menu, hide in NONET. * Combined yeeeah on vote screen. * Colour gametype on tab and tally. * (unrelated) Don't show "CHECK" if exiting.
2018-07-02 00:55:01 +00:00
V_DrawString(64, y+56, highlightflags, "BEST LAP:");
V_DrawRightAlignedString(BASEVIDWIDTH - 64 - 24 - 8, y+56, V_ALLOWLOWERCASE, beststr);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Draw record emblems.
em = M_GetLevelEmblems(cv_nextmap.value);
while (em)
{
switch (em->type)
{
More menu stuff! * Center level selection. * Re-work Record Attack screen. * Re-order MP Main menu, hide in NONET. * Combined yeeeah on vote screen. * Colour gametype on tab and tally. * (unrelated) Don't show "CHECK" if exiting.
2018-07-02 00:55:01 +00:00
case ET_TIME: break;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
default:
goto skipThisOne;
}
if (em->collected)
More menu stuff! * Center level selection. * Re-work Record Attack screen. * Re-order MP Main menu, hide in NONET. * Combined yeeeah on vote screen. * Colour gametype on tab and tally. * (unrelated) Don't show "CHECK" if exiting.
2018-07-02 00:55:01 +00:00
V_DrawMappedPatch(BASEVIDWIDTH - 64 - 24, y+48, 0, W_CachePatchName(M_GetEmblemPatch(em), PU_CACHE),
Cache colormaps everywhere to avoid memory leaks
2019-03-16 05:39:52 +00:00
R_GetTranslationColormap(TC_DEFAULT, M_GetEmblemColor(em), GTC_MENUCACHE));
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
else
More menu stuff! * Center level selection. * Re-work Record Attack screen. * Re-order MP Main menu, hide in NONET. * Combined yeeeah on vote screen. * Colour gametype on tab and tally. * (unrelated) Don't show "CHECK" if exiting.
2018-07-02 00:55:01 +00:00
V_DrawScaledPatch(BASEVIDWIDTH - 64 - 24, y+48, 0, W_CachePatchName("NEEDIT", PU_CACHE));
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
skipThisOne:
em = M_GetLevelEmblems(-1);
}
* Prettier record attack screen! * Uses the in-game timer element to draw its times. * This includes showing them time emblems-to-get! * good night sweet prince * Make the emblem time use the same ' and " as the normal time.
2018-08-29 20:37:47 +00:00
}*/
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
More menu stuff! * Center level selection. * Re-work Record Attack screen. * Re-order MP Main menu, hide in NONET. * Combined yeeeah on vote screen. * Colour gametype on tab and tally. * (unrelated) Don't show "CHECK" if exiting.
2018-07-02 00:55:01 +00:00
// ALWAYS DRAW player name, level name, skin and color even when not on this menu!
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (currentMenu != &SP_TimeAttackDef)
{
consvar_t *ncv;
More menu stuff! * Center level selection. * Re-work Record Attack screen. * Re-order MP Main menu, hide in NONET. * Combined yeeeah on vote screen. * Colour gametype on tab and tally. * (unrelated) Don't show "CHECK" if exiting.
2018-07-02 00:55:01 +00:00
for (i = 0; i < 4; ++i)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
More menu stuff! * Center level selection. * Re-work Record Attack screen. * Re-order MP Main menu, hide in NONET. * Combined yeeeah on vote screen. * Colour gametype on tab and tally. * (unrelated) Don't show "CHECK" if exiting.
2018-07-02 00:55:01 +00:00
y = currentMenu->y+SP_TimeAttackMenu[i].alphaKey;
V_DrawString(x, y, V_TRANSLUCENT, SP_TimeAttackMenu[i].text);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
ncv = (consvar_t *)SP_TimeAttackMenu[i].itemaction;
More menu stuff! * Center level selection. * Re-work Record Attack screen. * Re-order MP Main menu, hide in NONET. * Combined yeeeah on vote screen. * Colour gametype on tab and tally. * (unrelated) Don't show "CHECK" if exiting.
2018-07-02 00:55:01 +00:00
if (SP_TimeAttackMenu[i].status & IT_CV_STRING)
{
M_DrawTextBox(x + 32, y - 8, MAXPLAYERNAME, 1);
V_DrawString(x + 40, y, V_TRANSLUCENT|V_ALLOWLOWERCASE, ncv->string);
}
More minor adjustments - Display the skin's realname in RA menus - Can no longer set your skincolor to none on the RA menu - Edited several color names to fit within 14 characters
2017-10-21 17:22:54 +00:00
else
More menu stuff! * Center level selection. * Re-work Record Attack screen. * Re-order MP Main menu, hide in NONET. * Combined yeeeah on vote screen. * Colour gametype on tab and tally. * (unrelated) Don't show "CHECK" if exiting.
2018-07-02 00:55:01 +00:00
{
const char *str = ((ncv == &cv_chooseskin) ? skins[cv_chooseskin.value-1].realname : ncv->string);
INT32 soffset = 40, strw = V_StringWidth(str, 0);
// hack to keep the menu from overlapping the level icon
if (ncv == &cv_nextmap)
soffset = 0;
// Should see nothing but strings
V_DrawString(BASEVIDWIDTH - x - soffset - strw, y, highlightflags|V_TRANSLUCENT, str);
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
}
}
// Going to Time Attack menu...
static void M_TimeAttack(INT32 choice)
{
(void)choice;
memset(skins_cons_t, 0, sizeof (skins_cons_t));
levellistmode = LLM_RECORDATTACK; // Don't be dependent on cv_newgametype
if (M_CountLevelsToShowInList() == 0)
{
M_StartMessage(M_GetText("No record-attackable levels found.\n"),NULL,MM_NOTHING);
return;
}
M_PatchSkinNameTable();
M_PrepareLevelSelect();
M_SetupNextMenu(&SP_TimeAttackDef);
Added "Random" to the level selection list, for those days when you know you *want* to race but don't have any idea what to do.
2018-08-15 15:12:36 +00:00
G_SetGamestate(GS_TIMEATTACK);
if (cv_nextmap.value)
Nextmap_OnChange();
else
CV_AddValue(&cv_nextmap, 1);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
itemOn = tastart; // "Start" is selected.
Starting from scratch. SRB2 v2.1.15
2016-07-06 04:09:17 +00:00
S_ChangeMusicInternal("racent", true);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
* Fix the fades mess, and have the title screen always have a smooth, non-checkered fade from blapck! * Fix all the bugs with skin not being set properly or kept synchronised with the multiplayer setup in record attack. * Reduce the amount of flashing on the voting screen.
2018-07-04 21:57:50 +00:00
static boolean M_QuitTimeAttackMenu(void)
{
// you know what? always putting these in the buffer won't hurt anything.
COM_BufAddText(va("skin \"%s\"\n", cv_chooseskin.string));
return true;
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Drawing function for Nights Attack
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
/*void M_DrawNightsAttackMenu(void)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
patch_t *PictureOfLevel;
lumpnum_t lumpnum;
char beststr[40];
Starting from scratch. SRB2 v2.1.15
2016-07-06 04:09:17 +00:00
S_ChangeMusicInternal("racent", true); // Eww, but needed for when user hits escape during demo playback
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
V_DrawPatchFill(W_CachePatchName("SRB2BACK", PU_CACHE));
// draw menu (everything else goes on top of it)
M_DrawGenericMenu();
// A 160x100 image of the level as entry MAPxxP
lumpnum = W_CheckNumForName(va("%sP", G_BuildMapName(cv_nextmap.value)));
if (lumpnum != LUMPERROR)
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
PictureOfLevel = W_CachePatchNum(lumpnum, PU_CACHE);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
else
PictureOfLevel = W_CachePatchName("BLANKLVL", PU_CACHE);
V_DrawSmallScaledPatch(90, 28, 0, PictureOfLevel);
// Level record list
if (cv_nextmap.value)
{
emblem_t *em;
INT32 yHeight;
UINT8 bestoverall = G_GetBestNightsGrade(cv_nextmap.value, 0);
UINT8 bestgrade = G_GetBestNightsGrade(cv_nextmap.value, cv_dummymares.value);
UINT32 bestscore = G_GetBestNightsScore(cv_nextmap.value, cv_dummymares.value);
tic_t besttime = G_GetBestNightsTime(cv_nextmap.value, cv_dummymares.value);
if (P_HasGrades(cv_nextmap.value, 0))
V_DrawScaledPatch(200, 28 + 8, 0, ngradeletters[bestoverall]);
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
if (currentMenu == &SP_NightsAttackDef)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
if (P_HasGrades(cv_nextmap.value, cv_dummymares.value))
{
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
V_DrawString(160-88, 112, highlightflags, "BEST GRADE:");
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
V_DrawSmallScaledPatch(160 + 86 - (ngradeletters[bestgrade]->width/2),
112 + 8 - (ngradeletters[bestgrade]->height/2),
0, ngradeletters[bestgrade]);
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
if (!bestscore)
sprintf(beststr, "(none)");
else
sprintf(beststr, "%u", bestscore);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
V_DrawString(160 - 88, 122, highlightflags, "BEST SCORE:");
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
V_DrawRightAlignedString(160 + 88, 122, V_ALLOWLOWERCASE, beststr);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
if (besttime == UINT32_MAX)
sprintf(beststr, "(none)");
else
sprintf(beststr, "%i:%02i.%02i", G_TicsToMinutes(besttime, true),
G_TicsToSeconds(besttime),
G_TicsToCentiseconds(besttime));
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
V_DrawString(160-88, 132, highlightflags, "BEST TIME:");
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
V_DrawRightAlignedString(160+88, 132, V_ALLOWLOWERCASE, beststr);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
if (cv_dummymares.value == 0) {
// Draw record emblems.
em = M_GetLevelEmblems(cv_nextmap.value);
while (em)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
switch (em->type)
{
case ET_NGRADE: yHeight = 112; break;
case ET_NTIME: yHeight = 132; break;
default:
goto skipThisOne;
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
if (em->collected)
V_DrawSmallMappedPatch(160+88, yHeight, 0, W_CachePatchName(M_GetEmblemPatch(em), PU_CACHE),
Cache colormaps everywhere to avoid memory leaks
2019-03-16 05:39:52 +00:00
R_GetTranslationColormap(TC_DEFAULT, M_GetEmblemColor(em), GTC_MENUCACHE));
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
else
V_DrawSmallScaledPatch(160+88, yHeight, 0, W_CachePatchName("NEEDIT", PU_CACHE));
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
skipThisOne:
em = M_GetLevelEmblems(-1);
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
}
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
// ALWAYS DRAW level name even when not on this menu!
else
{
consvar_t *ncv;
INT32 x = SP_NightsAttackDef.x;
INT32 y = SP_NightsAttackDef.y;
ncv = (consvar_t *)SP_NightsAttackMenu[0].itemaction;
V_DrawString(x, y + SP_NightsAttackMenu[0].alphaKey, V_TRANSLUCENT, SP_NightsAttackMenu[0].text);
V_DrawString(BASEVIDWIDTH - x - V_StringWidth(ncv->string, 0),
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
y + SP_NightsAttackMenu[0].alphaKey, highlightflags|V_TRANSLUCENT, ncv->string);
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
}*/
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Going to Nights Attack menu...
Lots of changes - Menus now have all of the Kart cvars - Removed any cvars that aren't useful for Kart from the menu (they still exist in the console, though) - Removed SP and NiGHTS Mode options from the main menu - "kartcc" is renamed "kartspeed", uses values 0-2 instead of multiples of 50, or the terms "Relaxed", "Standard", and "Turbo" - Many gametype options (game speed, frantic, mirror, & karma comeback) are now changed on map load instead of instantly - New cvar, "kartminimap", for disabling the minimap - The maxplayers cvar now actually matches up with our 16 player limit - Game now keeps track of matches played. Has a condition type associated with it, as well. - Game checks for unlocks and saves gamedata when finishing a match, even in MP - Removed most of the normal emblems, added a single emblem for Green Hills. Didn't know what to do with extra emblems and such so I just left them (FOR NOW c:<)
2018-01-16 03:31:14 +00:00
/*static void M_NightsAttack(INT32 choice)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
(void)choice;
memset(skins_cons_t, 0, sizeof (skins_cons_t));
levellistmode = LLM_NIGHTSATTACK; // Don't be dependent on cv_newgametype
if (M_CountLevelsToShowInList() == 0)
{
M_StartMessage(M_GetText("No NiGHTS-attackable levels found.\n"),NULL,MM_NOTHING);
return;
}
// This is really just to make sure Sonic is the played character, just in case
M_PatchSkinNameTable();
M_PrepareLevelSelect();
M_SetupNextMenu(&SP_NightsAttackDef);
Nextmap_OnChange();
itemOn = nastart; // "Start" is selected.
G_SetGamestate(GS_TIMEATTACK);
Starting from scratch. SRB2 v2.1.15
2016-07-06 04:09:17 +00:00
S_ChangeMusicInternal("racent", true);
Lots of changes - Menus now have all of the Kart cvars - Removed any cvars that aren't useful for Kart from the menu (they still exist in the console, though) - Removed SP and NiGHTS Mode options from the main menu - "kartcc" is renamed "kartspeed", uses values 0-2 instead of multiples of 50, or the terms "Relaxed", "Standard", and "Turbo" - Many gametype options (game speed, frantic, mirror, & karma comeback) are now changed on map load instead of instantly - New cvar, "kartminimap", for disabling the minimap - The maxplayers cvar now actually matches up with our 16 player limit - Game now keeps track of matches played. Has a condition type associated with it, as well. - Game checks for unlocks and saves gamedata when finishing a match, even in MP - Removed most of the normal emblems, added a single emblem for Green Hills. Didn't know what to do with extra emblems and such so I just left them (FOR NOW c:<)
2018-01-16 03:31:14 +00:00
}*/
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Player has selected the "START" from the nights attack screen
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
/*static void M_ChooseNightsAttack(INT32 choice)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
char nameofdemo[256];
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
(void)choice;
emeralds = 0;
M_ClearMenus(true);
modeattacking = ATTACKING_NIGHTS;
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
I_mkdir(va("%s"PATHSEP"replay", srb2home), 0755);
I_mkdir(va("%s"PATHSEP"replay"PATHSEP"%s", srb2home, timeattackfolder), 0755);
snprintf(nameofdemo, sizeof nameofdemo, "replay"PATHSEP"%s"PATHSEP"%s-last", timeattackfolder, G_BuildMapName(cv_nextmap.value));
if (!cv_autorecord.value)
remove(va("%s"PATHSEP"%s.lmp", srb2home, nameofdemo));
else
G_RecordDemo(nameofdemo);
More post processor support, HUD tweaks, SP new game fix Mirror Mode minimap, growing position nums, and general reorganization. Some stuff needs more work but I'm exhausted rn
2017-12-19 06:55:33 +00:00
G_DeferedInitNew(false, G_BuildMapName(cv_nextmap.value), 0, 0, false);
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
}*/
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Player has selected the "START" from the time attack screen
static void M_ChooseTimeAttack(INT32 choice)
{
char *gpath;
const size_t glen = strlen("replay")+1+strlen(timeattackfolder)+1+strlen("MAPXX")+1;
char nameofdemo[256];
(void)choice;
emeralds = 0;
M_ClearMenus(true);
modeattacking = ATTACKING_RECORD;
I_mkdir(va("%s"PATHSEP"replay", srb2home), 0755);
I_mkdir(va("%s"PATHSEP"replay"PATHSEP"%s", srb2home, timeattackfolder), 0755);
if ((gpath = malloc(glen)) == NULL)
I_Error("Out of memory for replay filepath\n");
sprintf(gpath,"replay"PATHSEP"%s"PATHSEP"%s", timeattackfolder, G_BuildMapName(cv_nextmap.value));
snprintf(nameofdemo, sizeof nameofdemo, "%s-%s-last", gpath, cv_chooseskin.string);
if (!cv_autorecord.value)
remove(va("%s"PATHSEP"%s.lmp", srb2home, nameofdemo));
else
G_RecordDemo(nameofdemo);
More post processor support, HUD tweaks, SP new game fix Mirror Mode minimap, growing position nums, and general reorganization. Some stuff needs more work but I'm exhausted rn
2017-12-19 06:55:33 +00:00
G_DeferedInitNew(false, G_BuildMapName(cv_nextmap.value), (UINT8)(cv_chooseskin.value-1), 0, false);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
Change color in menu, replay support for specific staff ghosts Todo: replace the vague number with the demo's recorded player name
2017-10-21 02:01:07 +00:00
static void M_HandleStaffReplay(INT32 choice)
{
boolean exitmenu = false; // exit to previous menu
lumpnum_t l = W_CheckNumForName(va("%sS%02u",G_BuildMapName(cv_nextmap.value),cv_dummystaff.value));
switch (choice)
{
case KEY_DOWNARROW:
M_NextOpt();
Previous EXE: The Better Edition - Improve balloon-based items. Much more distinguished differences between the different ranks - Reverted Feather strafing. You can now just... properly move in the air, if you're using a Feather or a Bounce Pad. - Bounce pads are now stronger while using speed items. - Fixed the long standing bug about offroad & ziplines working when you're on FOFs above them. This is a tricky subject, so please report any issues you may come across related to this. - Shells should no longer travel to Mars, nor will they when using bounce pads. They should now do a gentle hop. - :WIP: new MP Player Setup screen, now shows character stats. Will later feature the list of characters in a row of icons, and a backported 2.2 color selector with toast's permission - Renamed "Match" to "Battle" :p - Yet MORE minor cases where kartspeed & kartweight were being read as fixed_t when they're freakin' UINT8's, people!
2017-11-28 06:13:23 +00:00
S_StartSound(NULL, sfx_menu1);
Change color in menu, replay support for specific staff ghosts Todo: replace the vague number with the demo's recorded player name
2017-10-21 02:01:07 +00:00
break;
case KEY_UPARROW:
M_PrevOpt();
Previous EXE: The Better Edition - Improve balloon-based items. Much more distinguished differences between the different ranks - Reverted Feather strafing. You can now just... properly move in the air, if you're using a Feather or a Bounce Pad. - Bounce pads are now stronger while using speed items. - Fixed the long standing bug about offroad & ziplines working when you're on FOFs above them. This is a tricky subject, so please report any issues you may come across related to this. - Shells should no longer travel to Mars, nor will they when using bounce pads. They should now do a gentle hop. - :WIP: new MP Player Setup screen, now shows character stats. Will later feature the list of characters in a row of icons, and a backported 2.2 color selector with toast's permission - Renamed "Match" to "Battle" :p - Yet MORE minor cases where kartspeed & kartweight were being read as fixed_t when they're freakin' UINT8's, people!
2017-11-28 06:13:23 +00:00
S_StartSound(NULL, sfx_menu1);
Change color in menu, replay support for specific staff ghosts Todo: replace the vague number with the demo's recorded player name
2017-10-21 02:01:07 +00:00
break;
case KEY_BACKSPACE:
case KEY_ESCAPE:
exitmenu = true;
break;
case KEY_RIGHTARROW:
CV_AddValue(&cv_dummystaff, 1);
S_StartSound(NULL, sfx_menu1);
break;
case KEY_LEFTARROW:
CV_AddValue(&cv_dummystaff, -1);
S_StartSound(NULL, sfx_menu1);
break;
case KEY_ENTER:
if (l == LUMPERROR)
break;
M_ClearMenus(true);
modeattacking = ATTACKING_RECORD;
Move public demo vars to a single struct
2019-03-25 02:32:15 +00:00
demo.loadfiles = false; demo.ignorefiles = true; // Just assume that record attack replays have the files needed
Change color in menu, replay support for specific staff ghosts Todo: replace the vague number with the demo's recorded player name
2017-10-21 02:01:07 +00:00
G_DoPlayDemo(va("%sS%02u",G_BuildMapName(cv_nextmap.value),cv_dummystaff.value));
break;
default:
break;
}
if (exitmenu)
{
if (currentMenu->prevMenu)
M_SetupNextMenu(currentMenu->prevMenu);
else
M_ClearMenus(true);
}
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Player has selected the "REPLAY" from the time attack screen
static void M_ReplayTimeAttack(INT32 choice)
{
const char *which;
M_ClearMenus(true);
modeattacking = ATTACKING_RECORD; // set modeattacking before G_DoPlayDemo so the map loader knows
Move public demo vars to a single struct
2019-03-25 02:32:15 +00:00
demo.loadfiles = false; demo.ignorefiles = true; // Just assume that record attack replays have the files needed
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
if (currentMenu == &SP_ReplayDef)
{
switch(choice) {
default:
Some cleanup No longer save score/rings, use the Race tally as a placeholder replacement for the butchered vanilla one
2017-10-17 00:23:26 +00:00
case 0: // best time
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
which = "time-best";
break;
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
case 1: // best lap
which = "lap-best";
break;
case 2: // last
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
which = "last";
break;
Fix replaying guest demos
2018-11-06 13:38:53 +00:00
case 3: // guest
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
// srb2/replay/main/map01-guest.lmp
G_DoPlayDemo(va("%s"PATHSEP"replay"PATHSEP"%s"PATHSEP"%s-guest.lmp", srb2home, timeattackfolder, G_BuildMapName(cv_nextmap.value)));
return;
}
// srb2/replay/main/map01-sonic-time-best.lmp
G_DoPlayDemo(va("%s"PATHSEP"replay"PATHSEP"%s"PATHSEP"%s-%s-%s.lmp", srb2home, timeattackfolder, G_BuildMapName(cv_nextmap.value), cv_chooseskin.string, which));
}
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
/*else if (currentMenu == &SP_NightsReplayDef)
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
{
switch(choice) {
default:
case 0: // best score
which = "score-best";
break;
case 1: // best time
which = "time-best";
break;
case 2: // last
which = "last";
break;
Change color in menu, replay support for specific staff ghosts Todo: replace the vague number with the demo's recorded player name
2017-10-21 02:01:07 +00:00
case 3: // staff
return; // M_HandleStaffReplay
case 4: // guest
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
which = "guest";
break;
}
// srb2/replay/main/map01-score-best.lmp
G_DoPlayDemo(va("%s"PATHSEP"replay"PATHSEP"%s"PATHSEP"%s-%s.lmp", srb2home, timeattackfolder, G_BuildMapName(cv_nextmap.value), which));
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
}*/
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
static void M_EraseGuest(INT32 choice)
{
const char *rguest = va("%s"PATHSEP"replay"PATHSEP"%s"PATHSEP"%s-guest.lmp", srb2home, timeattackfolder, G_BuildMapName(cv_nextmap.value));
(void)choice;
if (FIL_FileExists(rguest))
remove(rguest);
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
/*if (currentMenu == &SP_NightsGuestReplayDef)
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
M_SetupNextMenu(&SP_NightsAttackDef);
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
else*/
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
M_SetupNextMenu(&SP_TimeAttackDef);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
CV_AddValue(&cv_nextmap, -1);
CV_AddValue(&cv_nextmap, 1);
M_StartMessage(M_GetText("Guest replay data erased.\n"),NULL,MM_NOTHING);
}
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
static void M_OverwriteGuest(const char *which)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
char *rguest = Z_StrDup(va("%s"PATHSEP"replay"PATHSEP"%s"PATHSEP"%s-guest.lmp", srb2home, timeattackfolder, G_BuildMapName(cv_nextmap.value)));
UINT8 *buf;
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
size_t len;
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
len = FIL_ReadFile(va("%s"PATHSEP"replay"PATHSEP"%s"PATHSEP"%s-%s-%s.lmp", srb2home, timeattackfolder, G_BuildMapName(cv_nextmap.value), cv_chooseskin.string, which), &buf);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (!len) {
return;
}
if (FIL_FileExists(rguest)) {
M_StopMessage(0);
remove(rguest);
}
FIL_WriteFile(rguest, buf, len);
Z_Free(rguest);
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
/*if (currentMenu == &SP_NightsGuestReplayDef)
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
M_SetupNextMenu(&SP_NightsAttackDef);
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
else*/
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
M_SetupNextMenu(&SP_TimeAttackDef);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
CV_AddValue(&cv_nextmap, -1);
CV_AddValue(&cv_nextmap, 1);
M_StartMessage(M_GetText("Guest replay data saved.\n"),NULL,MM_NOTHING);
}
static void M_OverwriteGuest_Time(INT32 choice)
{
(void)choice;
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
M_OverwriteGuest("time-best");
}
static void M_OverwriteGuest_Lap(INT32 choice)
{
(void)choice;
M_OverwriteGuest("lap-best");
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
/* SRB2Kart
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
static void M_OverwriteGuest_Score(INT32 choice)
{
(void)choice;
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
M_OverwriteGuest("score-best");
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
static void M_OverwriteGuest_Rings(INT32 choice)
{
(void)choice;
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
M_OverwriteGuest("rings-best");
Change color in menu, replay support for specific staff ghosts Todo: replace the vague number with the demo's recorded player name
2017-10-21 02:01:07 +00:00
}*/
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
static void M_OverwriteGuest_Last(INT32 choice)
{
(void)choice;
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
M_OverwriteGuest("last");
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
static void M_SetGuestReplay(INT32 choice)
{
void (*which)(INT32);
switch(choice)
{
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
case 0: // best time
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
which = M_OverwriteGuest_Time;
break;
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
case 1: // best lap
which = M_OverwriteGuest_Lap;
break;
case 2: // last
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
which = M_OverwriteGuest_Last;
break;
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
case 3: // guest
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
default:
M_StartMessage(M_GetText("Are you sure you want to\ndelete the guest replay data?\n\n(Press 'Y' to confirm)\n"),M_EraseGuest,MM_YESNO);
return;
}
if (FIL_FileExists(va("%s"PATHSEP"replay"PATHSEP"%s"PATHSEP"%s-guest.lmp", srb2home, timeattackfolder, G_BuildMapName(cv_nextmap.value))))
M_StartMessage(M_GetText("Are you sure you want to\noverwrite the guest replay data?\n\n(Press 'Y' to confirm)\n"),which,MM_YESNO);
else
which(0);
}
shorten RA intro & allow to restart with pause
2019-09-01 21:04:07 +00:00
void M_ModeAttackRetry(INT32 choice)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
(void)choice;
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
G_CheckDemoStatus(); // Cancel recording
if (modeattacking == ATTACKING_RECORD)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
M_ChooseTimeAttack(0);
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
/*else if (modeattacking == ATTACKING_NIGHTS)
M_ChooseNightsAttack(0);*/
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
static void M_ModeAttackEndGame(INT32 choice)
{
(void)choice;
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
G_CheckDemoStatus(); // Cancel recording
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Functional, ready for netgame!
2018-01-28 04:52:01 +00:00
if (gamestate == GS_LEVEL || gamestate == GS_INTERMISSION || gamestate == GS_VOTING)
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
Command_ExitGame_f();
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
M_StartControlPanel();
switch(modeattacking)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
default:
case ATTACKING_RECORD:
currentMenu = &SP_TimeAttackDef;
break;
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
/*case ATTACKING_NIGHTS:
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
currentMenu = &SP_NightsAttackDef;
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
break;*/
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
itemOn = currentMenu->lastOn;
G_SetGamestate(GS_TIMEATTACK);
modeattacking = ATTACKING_NONE;
Starting from scratch. SRB2 v2.1.15
2016-07-06 04:09:17 +00:00
S_ChangeMusicInternal("racent", true);
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
// Update replay availability.
CV_AddValue(&cv_nextmap, 1);
CV_AddValue(&cv_nextmap, -1);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
// ========
// END GAME
// ========
static void M_ExitGameResponse(INT32 ch)
{
if (ch != 'y' && ch != KEY_ENTER)
return;
//Command_ExitGame_f();
G_SetExitGameFlag();
M_ClearMenus(true);
}
static void M_EndGame(INT32 choice)
{
(void)choice;
Move public demo vars to a single struct
2019-03-25 02:32:15 +00:00
if (demo.playback)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return;
if (!Playing())
return;
M_StartMessage(M_GetText("Are you sure you want to end the game?\n\n(Press 'Y' to confirm)\n"), M_ExitGameResponse, MM_YESNO);
}
//===========================================================================
// Connect Menu
//===========================================================================
Basically, update master server code to v2 Removes rooms, replaced with cv_advertise and "Advertise" on the host menu. According to the new API, SRB2APPLICATION is sent instead of MODID. A contact field was added, but there is no means of accessing it or setting it. As a slight change, the server list will be populated even on an outdated version of the game. (The new API was designed with this in mind.) The update alert is still presented first of course.
2020-09-11 12:56:40 +00:00
void
M_SetWaitingMode (int mode)
{
#ifdef HAVE_THREADS
I_lock_mutex(&m_menu_mutex);
#endif
{
m_waiting_mode = mode;
}
#ifdef HAVE_THREADS
I_unlock_mutex(m_menu_mutex);
#endif
}
int
M_GetWaitingMode (void)
{
int mode;
#ifdef HAVE_THREADS
I_lock_mutex(&m_menu_mutex);
#endif
{
mode = m_waiting_mode;
}
#ifdef HAVE_THREADS
I_unlock_mutex(m_menu_mutex);
#endif
return mode;
}
#ifdef MASTERSERVER
#ifdef HAVE_THREADS
static void
Spawn_masterserver_thread (const char *name, void (*thread)(int*))
{
int *id = malloc(sizeof *id);
I_lock_mutex(&ms_QueryId_mutex);
{
*id = ms_QueryId;
}
I_unlock_mutex(ms_QueryId_mutex);
I_spawn_thread(name, (I_thread_fn)thread, id);
}
static int
Same_instance (int id)
{
int okay;
I_lock_mutex(&ms_QueryId_mutex);
{
okay = ( id == ms_QueryId );
}
I_unlock_mutex(ms_QueryId_mutex);
return okay;
}
#endif/*HAVE_THREADS*/
static void
Fetch_servers_thread (int *id)
{
msg_server_t * server_list;
(void)id;
M_SetWaitingMode(M_WAITING_SERVERS);
#ifdef HAVE_THREADS
server_list = GetShortServersList(*id);
#else
server_list = GetShortServersList(0);
#endif
if (server_list)
{
#ifdef HAVE_THREADS
if (Same_instance(*id))
#endif
{
M_SetWaitingMode(M_NOT_WAITING);
#ifdef HAVE_THREADS
I_lock_mutex(&ms_ServerList_mutex);
{
ms_ServerList = server_list;
}
I_unlock_mutex(ms_ServerList_mutex);
#else
CL_QueryServerList(server_list);
free(server_list);
#endif
}
#ifdef HAVE_THREADS
else
{
free(server_list);
}
#endif
}
#ifdef HAVE_THREADS
free(id);
#endif
}
#endif/*MASTERSERVER*/
#define SERVERHEADERHEIGHT 36
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
#define SERVERLINEHEIGHT 12
#define S_LINEY(n) currentMenu->y + SERVERHEADERHEIGHT + (n * SERVERLINEHEIGHT)
#ifndef NONET
static UINT32 localservercount;
static void M_HandleServerPage(INT32 choice)
{
boolean exitmenu = false; // exit to previous menu
switch (choice)
{
case KEY_DOWNARROW:
M_NextOpt();
S_StartSound(NULL, sfx_menu1);
break;
case KEY_UPARROW:
M_PrevOpt();
S_StartSound(NULL, sfx_menu1);
break;
case KEY_BACKSPACE:
case KEY_ESCAPE:
exitmenu = true;
break;
case KEY_ENTER:
case KEY_RIGHTARROW:
S_StartSound(NULL, sfx_menu1);
if ((serverlistpage + 1) * SERVERS_PER_PAGE < serverlistcount)
serverlistpage++;
break;
case KEY_LEFTARROW:
S_StartSound(NULL, sfx_menu1);
if (serverlistpage > 0)
serverlistpage--;
break;
default:
break;
}
if (exitmenu)
{
if (currentMenu->prevMenu)
M_SetupNextMenu(currentMenu->prevMenu);
else
M_ClearMenus(true);
}
}
static void M_Connect(INT32 choice)
{
// do not call menuexitfunc
M_ClearMenus(false);
COM_BufAddText(va("connect node %d\n", serverlist[choice-FIRSTSERVERLINE + serverlistpage * SERVERS_PER_PAGE].node));
}
static void M_Refresh(INT32 choice)
{
(void)choice;
// Display a little "please wait" message.
M_DrawTextBox(52, BASEVIDHEIGHT/2-10, 25, 3);
V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT/2, 0, "Searching for servers...");
V_DrawCenteredString(BASEVIDWIDTH/2, (BASEVIDHEIGHT/2)+12, 0, "Please wait.");
I_OsPolling();
I_UpdateNoBlit();
if (rendermode == render_soft)
I_FinishUpdate(); // page flip or blit buffer
// first page of servers
serverlistpage = 0;
Make mod update, room list and server list multithreaded This took fucking ages and it still fails sometimes in edge cases, but I don't give a FUCK right now.
2020-04-27 02:46:35 +00:00
Basically, update master server code to v2 Removes rooms, replaced with cv_advertise and "Advertise" on the host menu. According to the new API, SRB2APPLICATION is sent instead of MODID. A contact field was added, but there is no means of accessing it or setting it. As a slight change, the server list will be populated even on an outdated version of the game. (The new API was designed with this in mind.) The update alert is still presented first of course.
2020-09-11 12:56:40 +00:00
#ifdef MASTERSERVER
#ifdef HAVE_THREADS
Spawn_masterserver_thread("fetch-servers", Fetch_servers_thread);
#else/*HAVE_THREADS*/
Fetch_servers_thread(NULL);
#endif/*HAVE_THREADS*/
#else/*MASTERSERVER*/
CL_UpdateServerList();
#endif/*MASTERSERVER*/
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
static void M_DrawConnectMenu(void)
{
Added the Gametype_Names array and G_GetGametypeByName for ease in converting gametype nums to strings and vice versa gametype_cons_t is now initialised using the Gametype_Names array, like how Color_cons_t is initialised using Color_Names # Conflicts: # src/doomstat.h # src/m_menu.c
2019-03-18 22:00:23 +00:00
UINT16 i;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
const char *gt = "Unknown";
Show kartspeed and password status on server browser
2019-03-09 20:30:04 +00:00
const char *spd = "";
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
INT32 numPages = (serverlistcount+(SERVERS_PER_PAGE-1))/SERVERS_PER_PAGE;
Basically, update master server code to v2 Removes rooms, replaced with cv_advertise and "Advertise" on the host menu. According to the new API, SRB2APPLICATION is sent instead of MODID. A contact field was added, but there is no means of accessing it or setting it. As a slight change, the server list will be populated even on an outdated version of the game. (The new API was designed with this in mind.) The update alert is still presented first of course.
2020-09-11 12:56:40 +00:00
int waiting;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
for (i = FIRSTSERVERLINE; i < min(localservercount, SERVERS_PER_PAGE)+FIRSTSERVERLINE; i++)
MP_ConnectMenu[i].status = IT_STRING | IT_SPACE;
if (!numPages)
numPages = 1;
// Page num
V_DrawRightAlignedString(BASEVIDWIDTH - currentMenu->x, currentMenu->y + MP_ConnectMenu[mp_connect_page].alphaKey,
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
highlightflags, va("%u of %d", serverlistpage+1, numPages));
Futureproofing mserv address conveyance
2022-05-24 23:25:18 +00:00
// Did you change the Server Browser address? Have a little reminder.
int mservflags = V_ALLOWLOWERCASE;
if (CV_IsSetToDefault(&cv_masterserver))
mservflags = mservflags|highlightflags|V_30TRANS;
else
mservflags = mservflags|warningflags;
Clearly mark MS reminder + formatting touchup
2022-05-24 23:44:49 +00:00
V_DrawRightAlignedSmallString(BASEVIDWIDTH - currentMenu->x, currentMenu->y+14 + MP_ConnectMenu[mp_connect_page].alphaKey,
mservflags, va("MS: %s", cv_masterserver.string));
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Horizontal line!
Basically, update master server code to v2 Removes rooms, replaced with cv_advertise and "Advertise" on the host menu. According to the new API, SRB2APPLICATION is sent instead of MODID. A contact field was added, but there is no means of accessing it or setting it. As a slight change, the server list will be populated even on an outdated version of the game. (The new API was designed with this in mind.) The update alert is still presented first of course.
2020-09-11 12:56:40 +00:00
V_DrawFill(1, currentMenu->y+32, 318, 1, 0);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (serverlistcount <= 0)
V_DrawString(currentMenu->x,currentMenu->y+SERVERHEADERHEIGHT, 0, "No servers found");
else
for (i = 0; i < min(serverlistcount - serverlistpage * SERVERS_PER_PAGE, SERVERS_PER_PAGE); i++)
{
INT32 slindex = i + serverlistpage * SERVERS_PER_PAGE;
UINT32 globalflags = ((serverlist[slindex].info.numberofplayer >= serverlist[slindex].info.maxplayer) ? V_TRANSLUCENT : 0)
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
|((itemOn == FIRSTSERVERLINE+i) ? highlightflags : 0)|V_ALLOWLOWERCASE;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
V_DrawString(currentMenu->x, S_LINEY(i), globalflags, serverlist[slindex].info.servername);
// Don't use color flags intentionally, the global yellow color will auto override the text color code
if (serverlist[slindex].info.modifiedgame)
V_DrawSmallString(currentMenu->x+202, S_LINEY(i)+8, globalflags, "\x85" "Mod");
if (serverlist[slindex].info.cheatsenabled)
V_DrawSmallString(currentMenu->x+222, S_LINEY(i)+8, globalflags, "\x83" "Cheats");
V_DrawSmallString(currentMenu->x, S_LINEY(i)+8, globalflags,
va("Ping: %u", (UINT32)LONG(serverlist[slindex].info.time)));
gt = "Unknown";
Added the Gametype_Names array and G_GetGametypeByName for ease in converting gametype nums to strings and vice versa gametype_cons_t is now initialised using the Gametype_Names array, like how Color_cons_t is initialised using Color_Names # Conflicts: # src/doomstat.h # src/m_menu.c
2019-03-18 22:00:23 +00:00
if (serverlist[slindex].info.gametype < NUMGAMETYPES)
gt = Gametype_Names[serverlist[slindex].info.gametype];
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
V_DrawSmallString(currentMenu->x+46,S_LINEY(i)+8, globalflags,
va("Players: %02d/%02d", serverlist[slindex].info.numberofplayer, serverlist[slindex].info.maxplayer));
Show kartspeed and password status on server browser
2019-03-09 20:30:04 +00:00
V_DrawSmallString(currentMenu->x+112, S_LINEY(i)+8, globalflags, gt);
remove join passwords
2019-08-04 09:26:26 +00:00
// display game speed for race gametypes
Show kartspeed and password status on server browser
2019-03-09 20:30:04 +00:00
if (serverlist[slindex].info.gametype == GT_RACE)
{
spd = kartspeed_cons_t[serverlist[slindex].info.kartvars & SV_SPEEDMASK].strvalue;
V_DrawSmallString(currentMenu->x+132, S_LINEY(i)+8, globalflags, va("(%s Speed)", spd));
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
MP_ConnectMenu[i+FIRSTSERVERLINE].status = IT_STRING | IT_CALL;
}
localservercount = serverlistcount;
M_DrawGenericMenu();
Make mod update, room list and server list multithreaded This took fucking ages and it still fails sometimes in edge cases, but I don't give a FUCK right now.
2020-04-27 02:46:35 +00:00
Basically, update master server code to v2 Removes rooms, replaced with cv_advertise and "Advertise" on the host menu. According to the new API, SRB2APPLICATION is sent instead of MODID. A contact field was added, but there is no means of accessing it or setting it. As a slight change, the server list will be populated even on an outdated version of the game. (The new API was designed with this in mind.) The update alert is still presented first of course.
2020-09-11 12:56:40 +00:00
waiting = M_GetWaitingMode();
if (waiting)
Make mod update, room list and server list multithreaded This took fucking ages and it still fails sometimes in edge cases, but I don't give a FUCK right now.
2020-04-27 02:46:35 +00:00
{
Basically, update master server code to v2 Removes rooms, replaced with cv_advertise and "Advertise" on the host menu. According to the new API, SRB2APPLICATION is sent instead of MODID. A contact field was added, but there is no means of accessing it or setting it. As a slight change, the server list will be populated even on an outdated version of the game. (The new API was designed with this in mind.) The update alert is still presented first of course.
2020-09-11 12:56:40 +00:00
const char *message;
if (waiting == M_WAITING_VERSION)
message = "Checking for updates...";
else
message = "Searching for servers...";
Make mod update, room list and server list multithreaded This took fucking ages and it still fails sometimes in edge cases, but I don't give a FUCK right now.
2020-04-27 02:46:35 +00:00
// Display a little "please wait" message.
M_DrawTextBox(52, BASEVIDHEIGHT/2-10, 25, 3);
Basically, update master server code to v2 Removes rooms, replaced with cv_advertise and "Advertise" on the host menu. According to the new API, SRB2APPLICATION is sent instead of MODID. A contact field was added, but there is no means of accessing it or setting it. As a slight change, the server list will be populated even on an outdated version of the game. (The new API was designed with this in mind.) The update alert is still presented first of course.
2020-09-11 12:56:40 +00:00
V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT/2, 0, message);
Make mod update, room list and server list multithreaded This took fucking ages and it still fails sometimes in edge cases, but I don't give a FUCK right now.
2020-04-27 02:46:35 +00:00
V_DrawCenteredString(BASEVIDWIDTH/2, (BASEVIDHEIGHT/2)+12, 0, "Please wait.");
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
static boolean M_CancelConnect(void)
{
D_CloseConnection();
return true;
}
// Ascending order, not descending.
// The casts are safe as long as the caller doesn't do anything stupid.
#define SERVER_LIST_ENTRY_COMPARATOR(key) \
static int ServerListEntryComparator_##key(const void *entry1, const void *entry2) \
{ \
SRB2 2.1.2 release
2014-03-17 12:13:16 +00:00
const serverelem_t *sa = (const serverelem_t*)entry1, *sb = (const serverelem_t*)entry2; \
if (sa->info.key != sb->info.key) \
return sa->info.key - sb->info.key; \
return strcmp(sa->info.servername, sb->info.servername); \
}
// This does descending instead of ascending.
#define SERVER_LIST_ENTRY_COMPARATOR_REVERSE(key) \
static int ServerListEntryComparator_##key##_reverse(const void *entry1, const void *entry2) \
{ \
const serverelem_t *sa = (const serverelem_t*)entry1, *sb = (const serverelem_t*)entry2; \
if (sb->info.key != sa->info.key) \
return sb->info.key - sa->info.key; \
return strcmp(sb->info.servername, sa->info.servername); \
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
SERVER_LIST_ENTRY_COMPARATOR(time)
SERVER_LIST_ENTRY_COMPARATOR(numberofplayer)
SRB2 2.1.2 release
2014-03-17 12:13:16 +00:00
SERVER_LIST_ENTRY_COMPARATOR_REVERSE(numberofplayer)
SERVER_LIST_ENTRY_COMPARATOR_REVERSE(maxplayer)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
SERVER_LIST_ENTRY_COMPARATOR(gametype)
SRB2 2.1.2 release
2014-03-17 12:13:16 +00:00
// Special one for modified state.
static int ServerListEntryComparator_modified(const void *entry1, const void *entry2)
{
const serverelem_t *sa = (const serverelem_t*)entry1, *sb = (const serverelem_t*)entry2;
// Modified acts as 2 points, cheats act as one point.
int modstate_a = (sa->info.cheatsenabled ? 1 : 0) | (sa->info.modifiedgame ? 2 : 0);
int modstate_b = (sb->info.cheatsenabled ? 1 : 0) | (sb->info.modifiedgame ? 2 : 0);
if (modstate_a != modstate_b)
return modstate_a - modstate_b;
// Default to strcmp.
return strcmp(sa->info.servername, sb->info.servername);
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
#endif
SRB2 2.1.2 release
2014-03-17 12:13:16 +00:00
void M_SortServerList(void)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
#ifndef NONET
switch(cv_serversort.value)
{
case 0: // Ping.
qsort(serverlist, serverlistcount, sizeof(serverelem_t), ServerListEntryComparator_time);
break;
SRB2 2.1.2 release
2014-03-17 12:13:16 +00:00
case 1: // Modified state.
qsort(serverlist, serverlistcount, sizeof(serverelem_t), ServerListEntryComparator_modified);
break;
case 2: // Most players.
qsort(serverlist, serverlistcount, sizeof(serverelem_t), ServerListEntryComparator_numberofplayer_reverse);
break;
case 3: // Least players.
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
qsort(serverlist, serverlistcount, sizeof(serverelem_t), ServerListEntryComparator_numberofplayer);
break;
SRB2 2.1.2 release
2014-03-17 12:13:16 +00:00
case 4: // Max players.
qsort(serverlist, serverlistcount, sizeof(serverelem_t), ServerListEntryComparator_maxplayer_reverse);
break;
case 5: // Gametype.
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
qsort(serverlist, serverlistcount, sizeof(serverelem_t), ServerListEntryComparator_gametype);
break;
}
#endif
}
#ifndef NONET
#ifdef UPDATE_ALERT
Basically, update master server code to v2 Removes rooms, replaced with cv_advertise and "Advertise" on the host menu. According to the new API, SRB2APPLICATION is sent instead of MODID. A contact field was added, but there is no means of accessing it or setting it. As a slight change, the server list will be populated even on an outdated version of the game. (The new API was designed with this in mind.) The update alert is still presented first of course.
2020-09-11 12:56:40 +00:00
static void M_CheckMODVersion(int id)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
char updatestring[500];
Make mod update, room list and server list multithreaded This took fucking ages and it still fails sometimes in edge cases, but I don't give a FUCK right now.
2020-04-27 02:46:35 +00:00
const char *updatecheck = GetMODVersion(id);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if(updatecheck)
{
sprintf(updatestring, UPDATE_ALERT_STRING, VERSIONSTRING, updatecheck);
Basically, update master server code to v2 Removes rooms, replaced with cv_advertise and "Advertise" on the host menu. According to the new API, SRB2APPLICATION is sent instead of MODID. A contact field was added, but there is no means of accessing it or setting it. As a slight change, the server list will be populated even on an outdated version of the game. (The new API was designed with this in mind.) The update alert is still presented first of course.
2020-09-11 12:56:40 +00:00
#ifdef HAVE_THREADS
I_lock_mutex(&m_menu_mutex);
#endif
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
M_StartMessage(updatestring, NULL, MM_NOTHING);
Basically, update master server code to v2 Removes rooms, replaced with cv_advertise and "Advertise" on the host menu. According to the new API, SRB2APPLICATION is sent instead of MODID. A contact field was added, but there is no means of accessing it or setting it. As a slight change, the server list will be populated even on an outdated version of the game. (The new API was designed with this in mind.) The update alert is still presented first of course.
2020-09-11 12:56:40 +00:00
#ifdef HAVE_THREADS
I_unlock_mutex(m_menu_mutex);
#endif
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
Do not do master server things when NOCURL
2020-08-17 04:42:58 +00:00
#endif/*UPDATE_ALERT*/
Make mod update, room list and server list multithreaded This took fucking ages and it still fails sometimes in edge cases, but I don't give a FUCK right now.
2020-04-27 02:46:35 +00:00
Basically, update master server code to v2 Removes rooms, replaced with cv_advertise and "Advertise" on the host menu. According to the new API, SRB2APPLICATION is sent instead of MODID. A contact field was added, but there is no means of accessing it or setting it. As a slight change, the server list will be populated even on an outdated version of the game. (The new API was designed with this in mind.) The update alert is still presented first of course.
2020-09-11 12:56:40 +00:00
#if defined (UPDATE_ALERT) && defined (HAVE_THREADS)
Make mod update, room list and server list multithreaded This took fucking ages and it still fails sometimes in edge cases, but I don't give a FUCK right now.
2020-04-27 02:46:35 +00:00
static void
Check_new_version_thread (int *id)
{
Basically, update master server code to v2 Removes rooms, replaced with cv_advertise and "Advertise" on the host menu. According to the new API, SRB2APPLICATION is sent instead of MODID. A contact field was added, but there is no means of accessing it or setting it. As a slight change, the server list will be populated even on an outdated version of the game. (The new API was designed with this in mind.) The update alert is still presented first of course.
2020-09-11 12:56:40 +00:00
M_SetWaitingMode(M_WAITING_VERSION);
Make mod update, room list and server list multithreaded This took fucking ages and it still fails sometimes in edge cases, but I don't give a FUCK right now.
2020-04-27 02:46:35 +00:00
Basically, update master server code to v2 Removes rooms, replaced with cv_advertise and "Advertise" on the host menu. According to the new API, SRB2APPLICATION is sent instead of MODID. A contact field was added, but there is no means of accessing it or setting it. As a slight change, the server list will be populated even on an outdated version of the game. (The new API was designed with this in mind.) The update alert is still presented first of course.
2020-09-11 12:56:40 +00:00
M_CheckMODVersion(*id);
Make mod update, room list and server list multithreaded This took fucking ages and it still fails sometimes in edge cases, but I don't give a FUCK right now.
2020-04-27 02:46:35 +00:00
Basically, update master server code to v2 Removes rooms, replaced with cv_advertise and "Advertise" on the host menu. According to the new API, SRB2APPLICATION is sent instead of MODID. A contact field was added, but there is no means of accessing it or setting it. As a slight change, the server list will be populated even on an outdated version of the game. (The new API was designed with this in mind.) The update alert is still presented first of course.
2020-09-11 12:56:40 +00:00
if (Same_instance(*id))
Make mod update, room list and server list multithreaded This took fucking ages and it still fails sometimes in edge cases, but I don't give a FUCK right now.
2020-04-27 02:46:35 +00:00
{
Basically, update master server code to v2 Removes rooms, replaced with cv_advertise and "Advertise" on the host menu. According to the new API, SRB2APPLICATION is sent instead of MODID. A contact field was added, but there is no means of accessing it or setting it. As a slight change, the server list will be populated even on an outdated version of the game. (The new API was designed with this in mind.) The update alert is still presented first of course.
2020-09-11 12:56:40 +00:00
Fetch_servers_thread(id);
Make mod update, room list and server list multithreaded This took fucking ages and it still fails sometimes in edge cases, but I don't give a FUCK right now.
2020-04-27 02:46:35 +00:00
}
else
{
Basically, update master server code to v2 Removes rooms, replaced with cv_advertise and "Advertise" on the host menu. According to the new API, SRB2APPLICATION is sent instead of MODID. A contact field was added, but there is no means of accessing it or setting it. As a slight change, the server list will be populated even on an outdated version of the game. (The new API was designed with this in mind.) The update alert is still presented first of course.
2020-09-11 12:56:40 +00:00
free(id);
Make mod update, room list and server list multithreaded This took fucking ages and it still fails sometimes in edge cases, but I don't give a FUCK right now.
2020-04-27 02:46:35 +00:00
}
}
Basically, update master server code to v2 Removes rooms, replaced with cv_advertise and "Advertise" on the host menu. According to the new API, SRB2APPLICATION is sent instead of MODID. A contact field was added, but there is no means of accessing it or setting it. As a slight change, the server list will be populated even on an outdated version of the game. (The new API was designed with this in mind.) The update alert is still presented first of course.
2020-09-11 12:56:40 +00:00
#endif/*defined (UPDATE_ALERT) && defined (HAVE_THREADS)*/
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
static void M_ConnectMenu(INT32 choice)
{
(void)choice;
// modified game check: no longer handled
// we don't request a restart unless the filelist differs
// first page of servers
serverlistpage = 0;
Basically, update master server code to v2 Removes rooms, replaced with cv_advertise and "Advertise" on the host menu. According to the new API, SRB2APPLICATION is sent instead of MODID. A contact field was added, but there is no means of accessing it or setting it. As a slight change, the server list will be populated even on an outdated version of the game. (The new API was designed with this in mind.) The update alert is still presented first of course.
2020-09-11 12:56:40 +00:00
M_SetupNextMenu(&MP_ConnectDef);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
itemOn = 0;
Basically, update master server code to v2 Removes rooms, replaced with cv_advertise and "Advertise" on the host menu. According to the new API, SRB2APPLICATION is sent instead of MODID. A contact field was added, but there is no means of accessing it or setting it. As a slight change, the server list will be populated even on an outdated version of the game. (The new API was designed with this in mind.) The update alert is still presented first of course.
2020-09-11 12:56:40 +00:00
#if defined (MASTERSERVER) && defined (HAVE_THREADS)
I_lock_mutex(&ms_QueryId_mutex);
Add warning message when attempting to use the master server browser while `modifiedgame` is true. (We assume that if you're using an IP address connection, you're more of a power user.)
2019-01-18 13:04:12 +00:00
{
Basically, update master server code to v2 Removes rooms, replaced with cv_advertise and "Advertise" on the host menu. According to the new API, SRB2APPLICATION is sent instead of MODID. A contact field was added, but there is no means of accessing it or setting it. As a slight change, the server list will be populated even on an outdated version of the game. (The new API was designed with this in mind.) The update alert is still presented first of course.
2020-09-11 12:56:40 +00:00
ms_QueryId++;
Add warning message when attempting to use the master server browser while `modifiedgame` is true. (We assume that if you're using an IP address connection, you're more of a power user.)
2019-01-18 13:04:12 +00:00
}
Basically, update master server code to v2 Removes rooms, replaced with cv_advertise and "Advertise" on the host menu. According to the new API, SRB2APPLICATION is sent instead of MODID. A contact field was added, but there is no means of accessing it or setting it. As a slight change, the server list will be populated even on an outdated version of the game. (The new API was designed with this in mind.) The update alert is still presented first of course.
2020-09-11 12:56:40 +00:00
I_unlock_mutex(ms_QueryId_mutex);
Add warning message when attempting to use the master server browser while `modifiedgame` is true. (We assume that if you're using an IP address connection, you're more of a power user.)
2019-01-18 13:04:12 +00:00
Basically, update master server code to v2 Removes rooms, replaced with cv_advertise and "Advertise" on the host menu. According to the new API, SRB2APPLICATION is sent instead of MODID. A contact field was added, but there is no means of accessing it or setting it. As a slight change, the server list will be populated even on an outdated version of the game. (The new API was designed with this in mind.) The update alert is still presented first of course.
2020-09-11 12:56:40 +00:00
I_lock_mutex(&ms_ServerList_mutex);
{
if (ms_ServerList)
{
free(ms_ServerList);
ms_ServerList = NULL;
}
}
I_unlock_mutex(ms_ServerList_mutex);
Make mod update, room list and server list multithreaded This took fucking ages and it still fails sometimes in edge cases, but I don't give a FUCK right now.
2020-04-27 02:46:35 +00:00
Do not do master server things when NOCURL
2020-08-17 04:42:58 +00:00
#ifdef UPDATE_ALERT
Basically, update master server code to v2 Removes rooms, replaced with cv_advertise and "Advertise" on the host menu. According to the new API, SRB2APPLICATION is sent instead of MODID. A contact field was added, but there is no means of accessing it or setting it. As a slight change, the server list will be populated even on an outdated version of the game. (The new API was designed with this in mind.) The update alert is still presented first of course.
2020-09-11 12:56:40 +00:00
Spawn_masterserver_thread("check-new-version", Check_new_version_thread);
Do not do master server things when NOCURL
2020-08-17 04:42:58 +00:00
#else/*UPDATE_ALERT*/
Basically, update master server code to v2 Removes rooms, replaced with cv_advertise and "Advertise" on the host menu. According to the new API, SRB2APPLICATION is sent instead of MODID. A contact field was added, but there is no means of accessing it or setting it. As a slight change, the server list will be populated even on an outdated version of the game. (The new API was designed with this in mind.) The update alert is still presented first of course.
2020-09-11 12:56:40 +00:00
Spawn_masterserver_thread("fetch-servers", Fetch_servers_thread);
Do not do master server things when NOCURL
2020-08-17 04:42:58 +00:00
#endif/*UPDATE_ALERT*/
Basically, update master server code to v2 Removes rooms, replaced with cv_advertise and "Advertise" on the host menu. According to the new API, SRB2APPLICATION is sent instead of MODID. A contact field was added, but there is no means of accessing it or setting it. As a slight change, the server list will be populated even on an outdated version of the game. (The new API was designed with this in mind.) The update alert is still presented first of course.
2020-09-11 12:56:40 +00:00
#else/*defined (MASTERSERVER) && defined (HAVE_THREADS)*/
Do not do master server things when NOCURL
2020-08-17 04:42:58 +00:00
#ifdef UPDATE_ALERT
Basically, update master server code to v2 Removes rooms, replaced with cv_advertise and "Advertise" on the host menu. According to the new API, SRB2APPLICATION is sent instead of MODID. A contact field was added, but there is no means of accessing it or setting it. As a slight change, the server list will be populated even on an outdated version of the game. (The new API was designed with this in mind.) The update alert is still presented first of course.
2020-09-11 12:56:40 +00:00
M_CheckMODVersion(0);
Do not do master server things when NOCURL
2020-08-17 04:42:58 +00:00
#endif/*UPDATE_ALERT*/
Basically, update master server code to v2 Removes rooms, replaced with cv_advertise and "Advertise" on the host menu. According to the new API, SRB2APPLICATION is sent instead of MODID. A contact field was added, but there is no means of accessing it or setting it. As a slight change, the server list will be populated even on an outdated version of the game. (The new API was designed with this in mind.) The update alert is still presented first of course.
2020-09-11 12:56:40 +00:00
M_Refresh(0);
#endif/*defined (MASTERSERVER) && defined (HAVE_THREADS)*/
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
Basically, update master server code to v2 Removes rooms, replaced with cv_advertise and "Advertise" on the host menu. According to the new API, SRB2APPLICATION is sent instead of MODID. A contact field was added, but there is no means of accessing it or setting it. As a slight change, the server list will be populated even on an outdated version of the game. (The new API was designed with this in mind.) The update alert is still presented first of course.
2020-09-11 12:56:40 +00:00
static void M_ConnectMenuModChecks(INT32 choice)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Basically, update master server code to v2 Removes rooms, replaced with cv_advertise and "Advertise" on the host menu. According to the new API, SRB2APPLICATION is sent instead of MODID. A contact field was added, but there is no means of accessing it or setting it. As a slight change, the server list will be populated even on an outdated version of the game. (The new API was designed with this in mind.) The update alert is still presented first of course.
2020-09-11 12:56:40 +00:00
(void)choice;
// okay never mind we want to COMMUNICATE to the player pre-emptively instead of letting them try and then get confused when it doesn't work
Make mod update, room list and server list multithreaded This took fucking ages and it still fails sometimes in edge cases, but I don't give a FUCK right now.
2020-04-27 02:46:35 +00:00
Basically, update master server code to v2 Removes rooms, replaced with cv_advertise and "Advertise" on the host menu. According to the new API, SRB2APPLICATION is sent instead of MODID. A contact field was added, but there is no means of accessing it or setting it. As a slight change, the server list will be populated even on an outdated version of the game. (The new API was designed with this in mind.) The update alert is still presented first of course.
2020-09-11 12:56:40 +00:00
if (modifiedgame)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Basically, update master server code to v2 Removes rooms, replaced with cv_advertise and "Advertise" on the host menu. According to the new API, SRB2APPLICATION is sent instead of MODID. A contact field was added, but there is no means of accessing it or setting it. As a slight change, the server list will be populated even on an outdated version of the game. (The new API was designed with this in mind.) The update alert is still presented first of course.
2020-09-11 12:56:40 +00:00
M_StartMessage(M_GetText("You have addons loaded.\nYou won't be able to join netgames!\n\nTo play online, restart the game\nand don't load any addons.\nSRB2Kart will automatically add\neverything you need when you join.\n\n(Press a key)\n"),M_ConnectMenu,MM_EVENTHANDLER);
return;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
Basically, update master server code to v2 Removes rooms, replaced with cv_advertise and "Advertise" on the host menu. According to the new API, SRB2APPLICATION is sent instead of MODID. A contact field was added, but there is no means of accessing it or setting it. As a slight change, the server list will be populated even on an outdated version of the game. (The new API was designed with this in mind.) The update alert is still presented first of course.
2020-09-11 12:56:40 +00:00
M_ConnectMenu(-1);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
Add warning and reset flow for non-default masterserver address
2022-05-24 04:12:24 +00:00
Futureproofing mserv address conveyance
2022-05-24 23:25:18 +00:00
boolean firstDismissedNagThisBoot = true;
Add warning and reset flow for non-default masterserver address
2022-05-24 04:12:24 +00:00
static void M_HandleMasterServerResetChoice(event_t *ev)
{
INT32 choice = -1;
choice = ev->data1;
if (ev->type == ev_keydown)
{
if (choice == ' ' || choice == 'y' || choice == KEY_ENTER || choice == gamecontrol[gc_accelerate][0] || choice == gamecontrol[gc_accelerate][1])
{
CV_Set(&cv_masterserver, cv_masterserver.defaultvalue);
Futureproofing mserv address conveyance
2022-05-24 23:25:18 +00:00
CV_Set(&cv_masterserver_nagattempts, cv_masterserver_nagattempts.defaultvalue);
Add warning and reset flow for non-default masterserver address
2022-05-24 04:12:24 +00:00
S_StartSound(NULL, sfx_s221);
Style cleanup
2022-05-25 23:22:43 +00:00
}
else
Futureproofing mserv address conveyance
2022-05-24 23:25:18 +00:00
{
Style cleanup
2022-05-25 23:22:43 +00:00
if (firstDismissedNagThisBoot)
{
if (cv_masterserver_nagattempts.value > 0)
{
Futureproofing mserv address conveyance
2022-05-24 23:25:18 +00:00
CV_SetValue(&cv_masterserver_nagattempts, cv_masterserver_nagattempts.value - 1);
}
firstDismissedNagThisBoot = false;
}
Add warning and reset flow for non-default masterserver address
2022-05-24 04:12:24 +00:00
}
}
}
static void M_PreStartServerMenu(INT32 choice)
{
(void)choice;
Futureproofing mserv address conveyance
2022-05-24 23:25:18 +00:00
if (!CV_IsSetToDefault(&cv_masterserver) && cv_masterserver_nagattempts.value > 0)
Add warning and reset flow for non-default masterserver address
2022-05-24 04:12:24 +00:00
{
M_StartMessage(M_GetText("Hey! You've changed the Server Browser address.\n\nYou won't be able to host games on the official Server Browser.\nUnless you're from the future, this probably isn't what you want.\n\n\x83Press Accel\x80 to fix this and continue.\x80\nPress any other key to continue anyway.\n"),M_PreStartServerMenuChoice,MM_EVENTHANDLER);
return;
}
M_StartServerMenu(-1);
}
static void M_PreConnectMenu(INT32 choice)
{
(void)choice;
Futureproofing mserv address conveyance
2022-05-24 23:25:18 +00:00
if (!CV_IsSetToDefault(&cv_masterserver) && cv_masterserver_nagattempts.value > 0)
Add warning and reset flow for non-default masterserver address
2022-05-24 04:12:24 +00:00
{
M_StartMessage(M_GetText("Hey! You've changed the Server Browser address.\n\nYou won't be able to see games from the official Server Browser.\nUnless you're from the future, this probably isn't what you want.\n\n\x83Press Accel\x80 to fix this and continue.\x80\nPress any other key to continue anyway.\n"),M_PreConnectMenuChoice,MM_EVENTHANDLER);
return;
}
M_ConnectMenuModChecks(-1);
}
static void M_PreStartServerMenuChoice(event_t *ev)
{
M_HandleMasterServerResetChoice(ev);
M_StartServerMenu(-1);
}
static void M_PreConnectMenuChoice(event_t *ev)
{
M_HandleMasterServerResetChoice(ev);
M_ConnectMenuModChecks(-1);
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
#endif //NONET
//===========================================================================
// Start Server Menu
//===========================================================================
//
// FindFirstMap
//
Don't look at this commit too closely until after netgame, I want to surprise yalls!! * Lots of menu changes! * Little arrows next to changeable cvars! * Show default value for sliders! * Pretty pretty pretty. * I don't know how to describe some of these changes. * Effectively nuke MIDI music support! * Skiddown at the start of a race is more interesting! * Spinning in waterslides! * Tiny bugfix in voting, plus a little celebration...
2018-06-30 22:18:13 +00:00
// Finds the first map of a particular gametype (or returns the current map)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Defaults to 1 if nothing found.
//
static INT32 M_FindFirstMap(INT32 gtype)
{
INT32 i;
Don't look at this commit too closely until after netgame, I want to surprise yalls!! * Lots of menu changes! * Little arrows next to changeable cvars! * Show default value for sliders! * Pretty pretty pretty. * I don't know how to describe some of these changes. * Effectively nuke MIDI music support! * Skiddown at the start of a race is more interesting! * Spinning in waterslides! * Tiny bugfix in voting, plus a little celebration...
2018-06-30 22:18:13 +00:00
if (mapheaderinfo[gamemap] && (mapheaderinfo[gamemap]->typeoflevel & gtype))
return gamemap;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
for (i = 0; i < NUMMAPS; i++)
{
Added "Random" to the level selection list, for those days when you know you *want* to race but don't have any idea what to do.
2018-08-15 15:12:36 +00:00
if (!mapheaderinfo[i])
continue;
if (!(mapheaderinfo[i]->typeoflevel & gtype))
continue;
return i + 1;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
return 1;
}
static void M_StartServer(INT32 choice)
{
`[22:03] TehRealSalt: Not organized code-wise, figured toaster would want to help with that since she's the Menu Queen and she probably has better ideas on how to do it` The Menu Queen is in the house~ :sparkles: * Magical, single-page player select and general netgamey stuff, while still remaining both pretty and functional. * Death to NOFOURPLAYER, now that the cat's out the bag. * Clean up NONET, assuming people try to make DD builds on release. * Minor tweaks across the board, mostly places where I wanted to pilfer minor code from and realised it wasn't done optimally originally.
2018-10-16 21:11:47 +00:00
UINT8 ssplayers = cv_splitplayers.value-1;
Sorta messy menu to set splitscreen Now this branch is completely functional!
2018-09-30 21:09:59 +00:00
(void)choice;
if (currentMenu == &MP_OfflineServerDef)
netgame = false;
* Completely revamp a bunch of menu stuff! * Improve control menus significantly - a more layout-neutral, gameplay importance based order, with spacing, and less depth to get to the important stuff. * Port over the improved MP main menu from internal, including flattening the IP connect onto its level. * Allow for selecting the number of splitscreen players using a menu option, rather than three seperate menu choices. * Improve the layout of all of the level/gametype select menus slightly. * (unrelated) Make fourth player area in 3p splitscreen use the tiling background instead of a pure black area. * (unrelated) Tweak minimap ordering slightly.
2018-06-30 15:01:03 +00:00
else
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
netgame = true;
multiplayer = true;
Use demo title as filename for multiplayer replays
2019-03-25 01:36:22 +00:00
strncpy(connectedservername, cv_servername.string, MAXSERVERNAME);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Still need to reset devmode
cv_debug = 0;
Move public demo vars to a single struct
2019-03-25 02:32:15 +00:00
if (demo.playback)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
G_StopDemo();
SRB2 2.1.5 release
2014-03-23 16:00:29 +00:00
if (metalrecording)
G_StopMetalDemo();
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Added "Random" to the level selection list, for those days when you know you *want* to race but don't have any idea what to do.
2018-08-15 15:12:36 +00:00
if (!cv_nextmap.value)
Remove previous commit's votebuffer, allow an external optional buffer to be passed into G_RandMap I meant to fix the previous method, but I didn't even understand how it knew it was in a vote or not... so I just did it my own way :V (Shouldn't FLUSHMAPBUFFEREARLY be on now...?)
2018-11-26 09:27:31 +00:00
CV_SetValue(&cv_nextmap, G_RandMap(G_TOLFlag(cv_newgametype.value), -1, false, 0, false, NULL)+1);
Added "Random" to the level selection list, for those days when you know you *want* to race but don't have any idea what to do.
2018-08-15 15:12:36 +00:00
I have no idea if this is an actual problem or not, but this was in the back of my mind from day 1
2018-09-30 21:17:33 +00:00
if (cv_maxplayers.value < ssplayers+1)
CV_SetValue(&cv_maxplayers, ssplayers+1);
Spectate / enter game in chat + New console colours + Highlight chat scroll arrow + small cleanup for consolefill
2018-10-25 11:21:44 +00:00
Sorta messy menu to set splitscreen Now this branch is completely functional!
2018-09-30 21:09:59 +00:00
if (splitscreen != ssplayers)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Sorta messy menu to set splitscreen Now this branch is completely functional!
2018-09-30 21:09:59 +00:00
splitscreen = ssplayers;
SplitScreen_OnChange();
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
Sorta messy menu to set splitscreen Now this branch is completely functional!
2018-09-30 21:09:59 +00:00
if (currentMenu == &MP_OfflineServerDef) // offline server
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
paused = false;
SV_StartSinglePlayerServer();
Fix gametype being clobbered when starting up a one-player server by marking it as netgame. (There were other ways to fix this, but I figured we'd want to keep the netgame pause menu, so this was the simplest solution...)
2018-10-21 11:51:18 +00:00
multiplayer = true; // yeah, SV_StartSinglePlayerServer clobbers this...
* Encore on the voting screen! Appears randomly once unlocked in the same slot as that which sometimes represents a gametype change (odds inflated for testing purposes). * A better representation of an Encore level, now with inverted graphics (a special remapping we can now use elsewhere whenever if we want!) and a floating Ruby! * Decouple encore's setting from cv_kartencore on mapload. Instead, bake it into D_MapChange and related, which will only some of the time be fed by cv_kartencore's value. * Encore mode now has a special mapheader palette setting, "encorepal", rather than using the same one as non-encore.
2018-08-11 21:23:40 +00:00
D_MapChange(cv_nextmap.value, cv_newgametype.value, (boolean)cv_kartencore.value, 1, 1, false, false);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
Sorta messy menu to set splitscreen Now this branch is completely functional!
2018-09-30 21:09:59 +00:00
else
{
D_MapChange(cv_nextmap.value, cv_newgametype.value, (boolean)cv_kartencore.value, 1, 1, false, false);
COM_BufAddText("dummyconsvar 1\n");
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
M_ClearMenus(true);
}
More menu stuff! * Center level selection. * Re-work Record Attack screen. * Re-order MP Main menu, hide in NONET. * Combined yeeeah on vote screen. * Colour gametype on tab and tally. * (unrelated) Don't show "CHECK" if exiting.
2018-07-02 00:55:01 +00:00
static void M_DrawLevelSelectOnly(boolean leftfade, boolean rightfade)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
lumpnum_t lumpnum;
patch_t *PictureOfLevel;
Sorry, Sal! In my defense, you don't need to recompile from scratch for any of this, despite what it may look like, as the skincolour name lists are walled off from the rest of the dehacked lists... More menu/highlight things: * Rename "Default" to "Game type", to make clearer what it's doing. * Tweak race colouring slightly. * Put a highlight around the level select icon, and make it consistent with voting. * Allow setting the highlight colour to affect the intermissions. * Fix bug with gametype colour getting for record attack. A handful of skincolour things: * Rename Turqouise to Aqua, because it resembles one of my fav 2.2 colours with that name. * Fix incomplete Steel Blue -> Steel rename. * Merge the very similar Blueberry and Sapphire... * ... so Sapphire can be backported! * And Ruby too.
2018-07-02 12:20:04 +00:00
INT32 x, y, w, i, oldval, trans, dupadjust = ((vid.width/vid.dupx) - BASEVIDWIDTH)>>1;
Added Accelcode, start boosting, reverted drifting, etc.
2017-02-07 22:19:04 +00:00
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// A 160x100 image of the level as entry MAPxxP
Added "Random" to the level selection list, for those days when you know you *want* to race but don't have any idea what to do.
2018-08-15 15:12:36 +00:00
if (cv_nextmap.value)
{
lumpnum = W_CheckNumForName(va("%sP", G_BuildMapName(cv_nextmap.value)));
if (lumpnum != LUMPERROR)
PictureOfLevel = W_CachePatchNum(lumpnum, PU_CACHE);
else
PictureOfLevel = W_CachePatchName("BLANKLVL", PU_CACHE);
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
else
Added "Random" to the level selection list, for those days when you know you *want* to race but don't have any idea what to do.
2018-08-15 15:12:36 +00:00
PictureOfLevel = W_CachePatchName("RANDOMLV", PU_CACHE);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Sorry, Sal! In my defense, you don't need to recompile from scratch for any of this, despite what it may look like, as the skincolour name lists are walled off from the rest of the dehacked lists... More menu/highlight things: * Rename "Default" to "Game type", to make clearer what it's doing. * Tweak race colouring slightly. * Put a highlight around the level select icon, and make it consistent with voting. * Allow setting the highlight colour to affect the intermissions. * Fix bug with gametype colour getting for record attack. A handful of skincolour things: * Rename Turqouise to Aqua, because it resembles one of my fav 2.2 colours with that name. * Fix incomplete Steel Blue -> Steel rename. * Merge the very similar Blueberry and Sapphire... * ... so Sapphire can be backported! * And Ruby too.
2018-07-02 12:20:04 +00:00
w = SHORT(PictureOfLevel->width)/2;
i = SHORT(PictureOfLevel->height)/2;
x = BASEVIDWIDTH/2 - w/2;
y = currentMenu->y + 130 + 8 - i;
if (currentMenu->menuitems[itemOn].itemaction == &cv_nextmap && skullAnimCounter < 4)
trans = 120;
else
trans = G_GetGametypeColor(cv_newgametype.value);
V_DrawFill(x-1, y-1, w+2, i+2, trans); // variable reuse...
Don't look at this commit too closely until after netgame, I want to surprise yalls!! * Lots of menu changes! * Little arrows next to changeable cvars! * Show default value for sliders! * Pretty pretty pretty. * I don't know how to describe some of these changes. * Effectively nuke MIDI music support! * Skiddown at the start of a race is more interesting! * Spinning in waterslides! * Tiny bugfix in voting, plus a little celebration...
2018-06-30 22:18:13 +00:00
disable encore ruby/flip on record attack menu with kartencore on
2018-08-29 21:02:42 +00:00
if (!cv_kartencore.value || gamestate == GS_TIMEATTACK || cv_newgametype.value != GT_RACE)
* For testing purposes, show Encoremaps on the level select icons. * HOWEVER, we should seriously address this again later, because the antialiasing DOES result in some unfortunate bullshit... * Encoremap maces per Oni's request and Sal's suggestion
2018-08-10 20:11:45 +00:00
V_DrawSmallScaledPatch(x, y, 0, PictureOfLevel);
else
{
* Encore on the voting screen! Appears randomly once unlocked in the same slot as that which sometimes represents a gametype change (odds inflated for testing purposes). * A better representation of an Encore level, now with inverted graphics (a special remapping we can now use elsewhere whenever if we want!) and a floating Ruby! * Decouple encore's setting from cv_kartencore on mapload. Instead, bake it into D_MapChange and related, which will only some of the time be fed by cv_kartencore's value. * Encore mode now has a special mapheader palette setting, "encorepal", rather than using the same one as non-encore.
2018-08-11 21:23:40 +00:00
/*UINT8 *mappingforencore = NULL;
* For testing purposes, show Encoremaps on the level select icons. * HOWEVER, we should seriously address this again later, because the antialiasing DOES result in some unfortunate bullshit... * Encoremap maces per Oni's request and Sal's suggestion
2018-08-10 20:11:45 +00:00
if ((lumpnum = W_CheckNumForName(va("%sE", mapname))) != LUMPERROR)
* Encore on the voting screen! Appears randomly once unlocked in the same slot as that which sometimes represents a gametype change (odds inflated for testing purposes). * A better representation of an Encore level, now with inverted graphics (a special remapping we can now use elsewhere whenever if we want!) and a floating Ruby! * Decouple encore's setting from cv_kartencore on mapload. Instead, bake it into D_MapChange and related, which will only some of the time be fed by cv_kartencore's value. * Encore mode now has a special mapheader palette setting, "encorepal", rather than using the same one as non-encore.
2018-08-11 21:23:40 +00:00
mappingforencore = W_CachePatchNum(lumpnum, PU_CACHE);*/
* For testing purposes, show Encoremaps on the level select icons. * HOWEVER, we should seriously address this again later, because the antialiasing DOES result in some unfortunate bullshit... * Encoremap maces per Oni's request and Sal's suggestion
2018-08-10 20:11:45 +00:00
* Disable inverting on encore level select pictures at unanimous request of last night's netgame. * Also, correct their alignment in y_inter.c.
2018-08-14 14:32:17 +00:00
V_DrawFixedPatch((x+w)<<FRACBITS, (y)<<FRACBITS, FRACUNIT/2, V_FLIP, PictureOfLevel, 0);
* Encore on the voting screen! Appears randomly once unlocked in the same slot as that which sometimes represents a gametype change (odds inflated for testing purposes). * A better representation of an Encore level, now with inverted graphics (a special remapping we can now use elsewhere whenever if we want!) and a floating Ruby! * Decouple encore's setting from cv_kartencore on mapload. Instead, bake it into D_MapChange and related, which will only some of the time be fed by cv_kartencore's value. * Encore mode now has a special mapheader palette setting, "encorepal", rather than using the same one as non-encore.
2018-08-11 21:23:40 +00:00
{
static angle_t rubyfloattime = 0;
const fixed_t rubyheight = FINESINE(rubyfloattime>>ANGLETOFINESHIFT);
V_DrawFixedPatch((x+w/2)<<FRACBITS, ((y+i/2)<<FRACBITS) - (rubyheight<<1), FRACUNIT, 0, W_CachePatchName("RUBYICON", PU_CACHE), NULL);
Interpolate the Phantom Ruby floating animation. Also, I fell for the copypasted code bait CLASSIC, so now all instances of the Ruby are decoupled from FPS cap.
2022-07-10 20:46:17 +00:00
rubyfloattime += FixedMul(ANGLE_MAX/NEWTICRATE, renderdeltatics);
* Encore on the voting screen! Appears randomly once unlocked in the same slot as that which sometimes represents a gametype change (odds inflated for testing purposes). * A better representation of an Encore level, now with inverted graphics (a special remapping we can now use elsewhere whenever if we want!) and a floating Ruby! * Decouple encore's setting from cv_kartencore on mapload. Instead, bake it into D_MapChange and related, which will only some of the time be fed by cv_kartencore's value. * Encore mode now has a special mapheader palette setting, "encorepal", rather than using the same one as non-encore.
2018-08-11 21:23:40 +00:00
}
* For testing purposes, show Encoremaps on the level select icons. * HOWEVER, we should seriously address this again later, because the antialiasing DOES result in some unfortunate bullshit... * Encoremap maces per Oni's request and Sal's suggestion
2018-08-10 20:11:45 +00:00
}
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
/*V_DrawDiag(x, y, 12, 31);
V_DrawDiag(x, y, 10, G_GetGametypeColor(cv_newgametype.value));*/
* Completely revamp a bunch of menu stuff! * Improve control menus significantly - a more layout-neutral, gameplay importance based order, with spacing, and less depth to get to the important stuff. * Port over the improved MP main menu from internal, including flattening the IP connect onto its level. * Allow for selecting the number of splitscreen players using a menu option, rather than three seperate menu choices. * Improve the layout of all of the level/gametype select menus slightly. * (unrelated) Make fourth player area in 3p splitscreen use the tiling background instead of a pure black area. * (unrelated) Tweak minimap ordering slightly.
2018-06-30 15:01:03 +00:00
Sorry, Sal! In my defense, you don't need to recompile from scratch for any of this, despite what it may look like, as the skincolour name lists are walled off from the rest of the dehacked lists... More menu/highlight things: * Rename "Default" to "Game type", to make clearer what it's doing. * Tweak race colouring slightly. * Put a highlight around the level select icon, and make it consistent with voting. * Allow setting the highlight colour to affect the intermissions. * Fix bug with gametype colour getting for record attack. A handful of skincolour things: * Rename Turqouise to Aqua, because it resembles one of my fav 2.2 colours with that name. * Fix incomplete Steel Blue -> Steel rename. * Merge the very similar Blueberry and Sapphire... * ... so Sapphire can be backported! * And Ruby too.
2018-07-02 12:20:04 +00:00
y += i/4;
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
i = cv_nextmap.value - 1;
More menu stuff! * Center level selection. * Re-work Record Attack screen. * Re-order MP Main menu, hide in NONET. * Combined yeeeah on vote screen. * Colour gametype on tab and tally. * (unrelated) Don't show "CHECK" if exiting.
2018-07-02 00:55:01 +00:00
trans = (leftfade ? V_TRANSLUCENT : 0);
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
#define horizspac 2
do
{
oldval = i;
do
{
i--;
Added "Random" to the level selection list, for those days when you know you *want* to race but don't have any idea what to do.
2018-08-15 15:12:36 +00:00
if (i == -2)
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
i = NUMMAPS-1;
if (i == oldval)
More menu stuff! * Center level selection. * Re-work Record Attack screen. * Re-order MP Main menu, hide in NONET. * Combined yeeeah on vote screen. * Colour gametype on tab and tally. * (unrelated) Don't show "CHECK" if exiting.
2018-07-02 00:55:01 +00:00
return;
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
if(!mapheaderinfo[i])
continue; // Don't allocate the header. That just makes memory usage skyrocket.
} while (!M_CanShowLevelInList(i, cv_newgametype.value));
// A 160x100 image of the level as entry MAPxxP
Added "Random" to the level selection list, for those days when you know you *want* to race but don't have any idea what to do.
2018-08-15 15:12:36 +00:00
if (i+1)
{
lumpnum = W_CheckNumForName(va("%sP", G_BuildMapName(i+1)));
if (lumpnum != LUMPERROR)
PictureOfLevel = W_CachePatchNum(lumpnum, PU_CACHE);
else
PictureOfLevel = W_CachePatchName("BLANKLVL", PU_CACHE);
}
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
else
Added "Random" to the level selection list, for those days when you know you *want* to race but don't have any idea what to do.
2018-08-15 15:12:36 +00:00
PictureOfLevel = W_CachePatchName("RANDOMLV", PU_CACHE);
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
* For testing purposes, show Encoremaps on the level select icons. * HOWEVER, we should seriously address this again later, because the antialiasing DOES result in some unfortunate bullshit... * Encoremap maces per Oni's request and Sal's suggestion
2018-08-10 20:11:45 +00:00
x -= horizspac + w/2;
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
V_DrawTinyScaledPatch(x, y, trans, PictureOfLevel);
} while (x > horizspac-dupadjust);
Sorry, Sal! In my defense, you don't need to recompile from scratch for any of this, despite what it may look like, as the skincolour name lists are walled off from the rest of the dehacked lists... More menu/highlight things: * Rename "Default" to "Game type", to make clearer what it's doing. * Tweak race colouring slightly. * Put a highlight around the level select icon, and make it consistent with voting. * Allow setting the highlight colour to affect the intermissions. * Fix bug with gametype colour getting for record attack. A handful of skincolour things: * Rename Turqouise to Aqua, because it resembles one of my fav 2.2 colours with that name. * Fix incomplete Steel Blue -> Steel rename. * Merge the very similar Blueberry and Sapphire... * ... so Sapphire can be backported! * And Ruby too.
2018-07-02 12:20:04 +00:00
x = (BASEVIDWIDTH + w)/2 + horizspac;
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
i = cv_nextmap.value - 1;
More menu stuff! * Center level selection. * Re-work Record Attack screen. * Re-order MP Main menu, hide in NONET. * Combined yeeeah on vote screen. * Colour gametype on tab and tally. * (unrelated) Don't show "CHECK" if exiting.
2018-07-02 00:55:01 +00:00
trans = (rightfade ? V_TRANSLUCENT : 0);
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
while (x < BASEVIDWIDTH+dupadjust-horizspac)
{
oldval = i;
do
{
i++;
if (i == NUMMAPS)
Added "Random" to the level selection list, for those days when you know you *want* to race but don't have any idea what to do.
2018-08-15 15:12:36 +00:00
i = -1;
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
if (i == oldval)
More menu stuff! * Center level selection. * Re-work Record Attack screen. * Re-order MP Main menu, hide in NONET. * Combined yeeeah on vote screen. * Colour gametype on tab and tally. * (unrelated) Don't show "CHECK" if exiting.
2018-07-02 00:55:01 +00:00
return;
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
if(!mapheaderinfo[i])
continue; // Don't allocate the header. That just makes memory usage skyrocket.
} while (!M_CanShowLevelInList(i, cv_newgametype.value));
// A 160x100 image of the level as entry MAPxxP
Added "Random" to the level selection list, for those days when you know you *want* to race but don't have any idea what to do.
2018-08-15 15:12:36 +00:00
if (i+1)
{
lumpnum = W_CheckNumForName(va("%sP", G_BuildMapName(i+1)));
if (lumpnum != LUMPERROR)
PictureOfLevel = W_CachePatchNum(lumpnum, PU_CACHE);
else
PictureOfLevel = W_CachePatchName("BLANKLVL", PU_CACHE);
}
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
else
Added "Random" to the level selection list, for those days when you know you *want* to race but don't have any idea what to do.
2018-08-15 15:12:36 +00:00
PictureOfLevel = W_CachePatchName("RANDOMLV", PU_CACHE);
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
More menu stuff! * Center level selection. * Re-work Record Attack screen. * Re-order MP Main menu, hide in NONET. * Combined yeeeah on vote screen. * Colour gametype on tab and tally. * (unrelated) Don't show "CHECK" if exiting.
2018-07-02 00:55:01 +00:00
V_DrawTinyScaledPatch(x, y, trans, PictureOfLevel);
* For testing purposes, show Encoremaps on the level select icons. * HOWEVER, we should seriously address this again later, because the antialiasing DOES result in some unfortunate bullshit... * Encoremap maces per Oni's request and Sal's suggestion
2018-08-10 20:11:45 +00:00
x += horizspac + w/2;
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
}
#undef horizspac
More menu stuff! * Center level selection. * Re-work Record Attack screen. * Re-order MP Main menu, hide in NONET. * Combined yeeeah on vote screen. * Colour gametype on tab and tally. * (unrelated) Don't show "CHECK" if exiting.
2018-07-02 00:55:01 +00:00
}
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
More menu stuff! * Center level selection. * Re-work Record Attack screen. * Re-order MP Main menu, hide in NONET. * Combined yeeeah on vote screen. * Colour gametype on tab and tally. * (unrelated) Don't show "CHECK" if exiting.
2018-07-02 00:55:01 +00:00
static void M_DrawServerMenu(void)
{
`[22:03] TehRealSalt: Not organized code-wise, figured toaster would want to help with that since she's the Menu Queen and she probably has better ideas on how to do it` The Menu Queen is in the house~ :sparkles: * Magical, single-page player select and general netgamey stuff, while still remaining both pretty and functional. * Death to NOFOURPLAYER, now that the cat's out the bag. * Clean up NONET, assuming people try to make DD builds on release. * Minor tweaks across the board, mostly places where I wanted to pilfer minor code from and realised it wasn't done optimally originally.
2018-10-16 21:11:47 +00:00
M_DrawLevelSelectOnly(false, false);
Futureproofing mserv address conveyance
2022-05-24 23:25:18 +00:00
if (currentMenu == &MP_ServerDef && cv_advertise.value) // Remind players where they're hosting.
{
int mservflags = V_ALLOWLOWERCASE;
if (CV_IsSetToDefault(&cv_masterserver))
mservflags = mservflags|highlightflags|V_30TRANS;
else
mservflags = mservflags|warningflags;
Clearly mark MS reminder + formatting touchup
2022-05-24 23:44:49 +00:00
V_DrawCenteredThinString(BASEVIDWIDTH/2, BASEVIDHEIGHT-12, mservflags, va("Master Server: %s", cv_masterserver.string));
Futureproofing mserv address conveyance
2022-05-24 23:25:18 +00:00
}
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
M_DrawGenericMenu();
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
static void M_MapChange(INT32 choice)
{
(void)choice;
levellistmode = LLM_CREATESERVER;
CV_SetValue(&cv_newgametype, gametype);
CV_SetValue(&cv_nextmap, gamemap);
M_PrepareLevelSelect();
M_SetupNextMenu(&MISC_ChangeLevelDef);
}
Sorta messy menu to set splitscreen Now this branch is completely functional!
2018-09-30 21:09:59 +00:00
static void M_StartOfflineServerMenu(INT32 choice)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
(void)choice;
levellistmode = LLM_CREATESERVER;
M_PrepareLevelSelect();
Sorta messy menu to set splitscreen Now this branch is completely functional!
2018-09-30 21:09:59 +00:00
M_SetupNextMenu(&MP_OfflineServerDef);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
#ifndef NONET
static void M_StartServerMenu(INT32 choice)
{
(void)choice;
levellistmode = LLM_CREATESERVER;
M_PrepareLevelSelect();
M_SetupNextMenu(&MP_ServerDef);
Print and display rules from the master server Update HMS version to 2.2. Fetch the rules when master server cvar set. Print rules in console when server register. Display the rules in the menu when entering the server hosting menu or when changing the advertise cvar.
2022-07-03 05:20:52 +00:00
M_PopupMasterServerRules();
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
// ==============
// CONNECT VIA IP
// ==============
Allow letters to be used in the "Specify IPv4 Address:" field
2019-01-26 04:50:58 +00:00
static char setupm_ip[28];
`[22:03] TehRealSalt: Not organized code-wise, figured toaster would want to help with that since she's the Menu Queen and she probably has better ideas on how to do it` The Menu Queen is in the house~ :sparkles: * Magical, single-page player select and general netgamey stuff, while still remaining both pretty and functional. * Death to NOFOURPLAYER, now that the cat's out the bag. * Clean up NONET, assuming people try to make DD builds on release. * Minor tweaks across the board, mostly places where I wanted to pilfer minor code from and realised it wasn't done optimally originally.
2018-10-16 21:11:47 +00:00
#endif
static UINT8 setupm_pselect = 1;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Draw the funky Connect IP menu. Tails 11-19-2002
// So much work for such a little thing!
* Completely revamp a bunch of menu stuff! * Improve control menus significantly - a more layout-neutral, gameplay importance based order, with spacing, and less depth to get to the important stuff. * Port over the improved MP main menu from internal, including flattening the IP connect onto its level. * Allow for selecting the number of splitscreen players using a menu option, rather than three seperate menu choices. * Improve the layout of all of the level/gametype select menus slightly. * (unrelated) Make fourth player area in 3p splitscreen use the tiling background instead of a pure black area. * (unrelated) Tweak minimap ordering slightly.
2018-06-30 15:01:03 +00:00
static void M_DrawMPMainMenu(void)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
* Completely revamp a bunch of menu stuff! * Improve control menus significantly - a more layout-neutral, gameplay importance based order, with spacing, and less depth to get to the important stuff. * Port over the improved MP main menu from internal, including flattening the IP connect onto its level. * Allow for selecting the number of splitscreen players using a menu option, rather than three seperate menu choices. * Improve the layout of all of the level/gametype select menus slightly. * (unrelated) Make fourth player area in 3p splitscreen use the tiling background instead of a pure black area. * (unrelated) Tweak minimap ordering slightly.
2018-06-30 15:01:03 +00:00
INT32 x = currentMenu->x;
INT32 y = currentMenu->y;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// use generic drawer for cursor, items and title
M_DrawGenericMenu();
`[22:03] TehRealSalt: Not organized code-wise, figured toaster would want to help with that since she's the Menu Queen and she probably has better ideas on how to do it` The Menu Queen is in the house~ :sparkles: * Magical, single-page player select and general netgamey stuff, while still remaining both pretty and functional. * Death to NOFOURPLAYER, now that the cat's out the bag. * Clean up NONET, assuming people try to make DD builds on release. * Minor tweaks across the board, mostly places where I wanted to pilfer minor code from and realised it wasn't done optimally originally.
2018-10-16 21:11:47 +00:00
#ifndef NONET
#if MAXPLAYERS != 16
* Completely revamp a bunch of menu stuff! * Improve control menus significantly - a more layout-neutral, gameplay importance based order, with spacing, and less depth to get to the important stuff. * Port over the improved MP main menu from internal, including flattening the IP connect onto its level. * Allow for selecting the number of splitscreen players using a menu option, rather than three seperate menu choices. * Improve the layout of all of the level/gametype select menus slightly. * (unrelated) Make fourth player area in 3p splitscreen use the tiling background instead of a pure black area. * (unrelated) Tweak minimap ordering slightly.
2018-06-30 15:01:03 +00:00
Update the maxplayers label...
`[22:03] TehRealSalt: Not organized code-wise, figured toaster would want to help with that since she's the Menu Queen and she probably has better ideas on how to do it` The Menu Queen is in the house~ :sparkles: * Magical, single-page player select and general netgamey stuff, while still remaining both pretty and functional. * Death to NOFOURPLAYER, now that the cat's out the bag. * Clean up NONET, assuming people try to make DD builds on release. * Minor tweaks across the board, mostly places where I wanted to pilfer minor code from and realised it wasn't done optimally originally.
2018-10-16 21:11:47 +00:00
#endif
V_DrawRightAlignedString(BASEVIDWIDTH-x, y+MP_MainMenu[4].alphaKey,
((itemOn == 4) ? highlightflags : 0), "(2-16 players)");
* Completely revamp a bunch of menu stuff! * Improve control menus significantly - a more layout-neutral, gameplay importance based order, with spacing, and less depth to get to the important stuff. * Port over the improved MP main menu from internal, including flattening the IP connect onto its level. * Allow for selecting the number of splitscreen players using a menu option, rather than three seperate menu choices. * Improve the layout of all of the level/gametype select menus slightly. * (unrelated) Make fourth player area in 3p splitscreen use the tiling background instead of a pure black area. * (unrelated) Tweak minimap ordering slightly.
2018-06-30 15:01:03 +00:00
#endif
`[22:03] TehRealSalt: Not organized code-wise, figured toaster would want to help with that since she's the Menu Queen and she probably has better ideas on how to do it` The Menu Queen is in the house~ :sparkles: * Magical, single-page player select and general netgamey stuff, while still remaining both pretty and functional. * Death to NOFOURPLAYER, now that the cat's out the bag. * Clean up NONET, assuming people try to make DD builds on release. * Minor tweaks across the board, mostly places where I wanted to pilfer minor code from and realised it wasn't done optimally originally.
2018-10-16 21:11:47 +00:00
V_DrawRightAlignedString(BASEVIDWIDTH-x, y+MP_MainMenu[5].alphaKey,
((itemOn == 5) ? highlightflags : 0),
* Completely revamp a bunch of menu stuff! * Improve control menus significantly - a more layout-neutral, gameplay importance based order, with spacing, and less depth to get to the important stuff. * Port over the improved MP main menu from internal, including flattening the IP connect onto its level. * Allow for selecting the number of splitscreen players using a menu option, rather than three seperate menu choices. * Improve the layout of all of the level/gametype select menus slightly. * (unrelated) Make fourth player area in 3p splitscreen use the tiling background instead of a pure black area. * (unrelated) Tweak minimap ordering slightly.
2018-06-30 15:01:03 +00:00
"(2-4 players)"
);
`[22:03] TehRealSalt: Not organized code-wise, figured toaster would want to help with that since she's the Menu Queen and she probably has better ideas on how to do it` The Menu Queen is in the house~ :sparkles: * Magical, single-page player select and general netgamey stuff, while still remaining both pretty and functional. * Death to NOFOURPLAYER, now that the cat's out the bag. * Clean up NONET, assuming people try to make DD builds on release. * Minor tweaks across the board, mostly places where I wanted to pilfer minor code from and realised it wasn't done optimally originally.
2018-10-16 21:11:47 +00:00
#ifndef NONET
y += MP_MainMenu[8].alphaKey;
* Completely revamp a bunch of menu stuff! * Improve control menus significantly - a more layout-neutral, gameplay importance based order, with spacing, and less depth to get to the important stuff. * Port over the improved MP main menu from internal, including flattening the IP connect onto its level. * Allow for selecting the number of splitscreen players using a menu option, rather than three seperate menu choices. * Improve the layout of all of the level/gametype select menus slightly. * (unrelated) Make fourth player area in 3p splitscreen use the tiling background instead of a pure black area. * (unrelated) Tweak minimap ordering slightly.
2018-06-30 15:01:03 +00:00
V_DrawFill(x+5, y+4+5, /*16*8 + 6,*/ BASEVIDWIDTH - 2*(x+5), 8+6, 239);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// draw name string
Allow letters to be used in the "Specify IPv4 Address:" field
2019-01-26 04:50:58 +00:00
V_DrawString(x+8,y+12, V_ALLOWLOWERCASE, setupm_ip);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// draw text cursor for name
`[22:03] TehRealSalt: Not organized code-wise, figured toaster would want to help with that since she's the Menu Queen and she probably has better ideas on how to do it` The Menu Queen is in the house~ :sparkles: * Magical, single-page player select and general netgamey stuff, while still remaining both pretty and functional. * Death to NOFOURPLAYER, now that the cat's out the bag. * Clean up NONET, assuming people try to make DD builds on release. * Minor tweaks across the board, mostly places where I wanted to pilfer minor code from and realised it wasn't done optimally originally.
2018-10-16 21:11:47 +00:00
if (itemOn == 8
* Completely revamp a bunch of menu stuff! * Improve control menus significantly - a more layout-neutral, gameplay importance based order, with spacing, and less depth to get to the important stuff. * Port over the improved MP main menu from internal, including flattening the IP connect onto its level. * Allow for selecting the number of splitscreen players using a menu option, rather than three seperate menu choices. * Improve the layout of all of the level/gametype select menus slightly. * (unrelated) Make fourth player area in 3p splitscreen use the tiling background instead of a pure black area. * (unrelated) Tweak minimap ordering slightly.
2018-06-30 15:01:03 +00:00
&& skullAnimCounter < 4) //blink cursor
Allow letters to be used in the "Specify IPv4 Address:" field
2019-01-26 04:50:58 +00:00
V_DrawCharacter(x+8+V_StringWidth(setupm_ip, V_ALLOWLOWERCASE),y+12,'_',false);
`[22:03] TehRealSalt: Not organized code-wise, figured toaster would want to help with that since she's the Menu Queen and she probably has better ideas on how to do it` The Menu Queen is in the house~ :sparkles: * Magical, single-page player select and general netgamey stuff, while still remaining both pretty and functional. * Death to NOFOURPLAYER, now that the cat's out the bag. * Clean up NONET, assuming people try to make DD builds on release. * Minor tweaks across the board, mostly places where I wanted to pilfer minor code from and realised it wasn't done optimally originally.
2018-10-16 21:11:47 +00:00
#endif
// character bar, ripped off the color bar :V
{
#define iconwidth 32
#define spacingwidth 32
#define incrwidth (iconwidth + spacingwidth)
UINT8 i = 0, pskin, pcol;
// player arrangement width, but there's also a chance i'm a furry, shhhhhh
const INT32 paw = iconwidth + 3*incrwidth;
INT32 trans = 0;
UINT8 *colmap;
x = BASEVIDWIDTH/2 - paw/2;
y = currentMenu->y + 32;
while (++i <= 4)
{
switch (i)
{
default:
pskin = R_SkinAvailable(cv_skin.string);
pcol = cv_playercolor.value;
break;
case 2:
pskin = R_SkinAvailable(cv_skin2.string);
pcol = cv_playercolor2.value;
break;
case 3:
pskin = R_SkinAvailable(cv_skin3.string);
pcol = cv_playercolor3.value;
break;
case 4:
pskin = R_SkinAvailable(cv_skin4.string);
pcol = cv_playercolor4.value;
break;
}
if (pskin >= MAXSKINS)
pskin = 0;
if (!trans && i > cv_splitplayers.value)
trans = V_TRANSLUCENT;
Cache colormaps everywhere to avoid memory leaks
2019-03-16 05:39:52 +00:00
colmap = R_GetTranslationColormap(pskin, pcol, GTC_MENUCACHE);
`[22:03] TehRealSalt: Not organized code-wise, figured toaster would want to help with that since she's the Menu Queen and she probably has better ideas on how to do it` The Menu Queen is in the house~ :sparkles: * Magical, single-page player select and general netgamey stuff, while still remaining both pretty and functional. * Death to NOFOURPLAYER, now that the cat's out the bag. * Clean up NONET, assuming people try to make DD builds on release. * Minor tweaks across the board, mostly places where I wanted to pilfer minor code from and realised it wasn't done optimally originally.
2018-10-16 21:11:47 +00:00
Stupidbad-big commit, but PLEASE don't ask me to re-do this on another branch, I swear to god. I know it makes things more difficult on you, and I'm sorry for that, but I'm definitely feeling the goddamn crunch right now and I wanna take a step back from this spaghetti nightmare and clear my head. * Do that thing where the character icons are ALWAYS 1x sized, through having two seperate lumps. * Revamp the S_SKIN parameters to be `facerank` (rankings - equivalent of half-scale old face), `facewant` (WANTED - equivalent of old face), and `facemmap` (equivalent of old iconprefix). * Do that thing Oni wanted where it shows two postions above and two positions below your current ranking (and you) to the left of the screen, instead of always the top 4, with some limits to avoid drawing outside of everything. * Replace the last few shitty Mario numbers (for the left rankings) with cool, new Oni numbers. * Change a bunch of offsets and things so the tab rankings and the intermission work nicer with 9+ players.
2018-10-28 16:27:55 +00:00
V_DrawFixedPatch(x<<FRACBITS, y<<FRACBITS, FRACUNIT, trans, facewantprefix[pskin], colmap);
`[22:03] TehRealSalt: Not organized code-wise, figured toaster would want to help with that since she's the Menu Queen and she probably has better ideas on how to do it` The Menu Queen is in the house~ :sparkles: * Magical, single-page player select and general netgamey stuff, while still remaining both pretty and functional. * Death to NOFOURPLAYER, now that the cat's out the bag. * Clean up NONET, assuming people try to make DD builds on release. * Minor tweaks across the board, mostly places where I wanted to pilfer minor code from and realised it wasn't done optimally originally.
2018-10-16 21:11:47 +00:00
if (itemOn == 2 && i == setupm_pselect)
{
Make character cursor framerate-independent
2022-05-20 02:03:58 +00:00
static fixed_t cursorframe = 0;
cursorframe += renderdeltatics / 4;
Tweaks for kart v1 MR comments
2022-05-21 17:32:40 +00:00
for (; cursorframe > 7 * FRACUNIT; cursorframe -= 7 * FRACUNIT) {}
Make character cursor framerate-independent
2022-05-20 02:03:58 +00:00
V_DrawFixedPatch(x<<FRACBITS, y<<FRACBITS, FRACUNIT, 0, W_CachePatchName(va("K_BHILI%d", (cursorframe >> FRACBITS) + 1), PU_CACHE), NULL);
`[22:03] TehRealSalt: Not organized code-wise, figured toaster would want to help with that since she's the Menu Queen and she probably has better ideas on how to do it` The Menu Queen is in the house~ :sparkles: * Magical, single-page player select and general netgamey stuff, while still remaining both pretty and functional. * Death to NOFOURPLAYER, now that the cat's out the bag. * Clean up NONET, assuming people try to make DD builds on release. * Minor tweaks across the board, mostly places where I wanted to pilfer minor code from and realised it wasn't done optimally originally.
2018-10-16 21:11:47 +00:00
}
x += incrwidth;
}
#undef incrwidth
#undef spacingwidth
#undef iconwidth
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
`[22:03] TehRealSalt: Not organized code-wise, figured toaster would want to help with that since she's the Menu Queen and she probably has better ideas on how to do it` The Menu Queen is in the house~ :sparkles: * Magical, single-page player select and general netgamey stuff, while still remaining both pretty and functional. * Death to NOFOURPLAYER, now that the cat's out the bag. * Clean up NONET, assuming people try to make DD builds on release. * Minor tweaks across the board, mostly places where I wanted to pilfer minor code from and realised it wasn't done optimally originally.
2018-10-16 21:11:47 +00:00
static void Splitplayers_OnChange(void)
{
if (cv_splitplayers.value < setupm_pselect)
setupm_pselect = 1;
}
static void M_SetupMultiHandler(INT32 choice)
{
boolean exitmenu = false; // exit to previous menu and send name change
switch (choice)
{
case KEY_LEFTARROW:
if (cv_splitplayers.value > 1)
{
if (--setupm_pselect < 1)
setupm_pselect = cv_splitplayers.value;
S_StartSound(NULL,sfx_menu1); // Tails
}
break;
case KEY_RIGHTARROW:
if (cv_splitplayers.value > 1)
{
if (++setupm_pselect > cv_splitplayers.value)
setupm_pselect = 1;
S_StartSound(NULL,sfx_menu1); // Tails
}
break;
case KEY_DOWNARROW:
M_NextOpt();
S_StartSound(NULL,sfx_menu1); // Tails
break;
case KEY_UPARROW:
M_PrevOpt();
S_StartSound(NULL,sfx_menu1); // Tails
break;
case KEY_ENTER:
{
S_StartSound(NULL,sfx_menu1); // Tails
currentMenu->lastOn = itemOn;
switch (setupm_pselect)
{
case 2:
M_SetupMultiPlayer2(0);
return;
case 3:
M_SetupMultiPlayer3(0);
return;
case 4:
M_SetupMultiPlayer4(0);
return;
default:
M_SetupMultiPlayer(0);
return;
}
break;
}
case KEY_ESCAPE:
exitmenu = true;
break;
}
if (exitmenu)
{
if (currentMenu->prevMenu)
M_SetupNextMenu (currentMenu->prevMenu);
else
M_ClearMenus(true);
}
}
#ifndef NONET
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Tails 11-19-2002
static void M_ConnectIP(INT32 choice)
{
(void)choice;
Fixed "invalid pointer" error when passing "" to Command_connect().
2018-01-12 01:35:39 +00:00
if (*setupm_ip == 0)
{
M_StartMessage("You must specify an IP address.\n", NULL, MM_NOTHING);
return;
}
Make it so hitting enter on the ipv4 option doesn't close all menus with the warning, only if you start trying to connect.
2018-10-27 19:44:18 +00:00
M_ClearMenus(true);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
COM_BufAddText(va("connect \"%s\"\n", setupm_ip));
// A little "please wait" message.
M_DrawTextBox(56, BASEVIDHEIGHT/2-12, 24, 2);
V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT/2, 0, "Connecting to server...");
I_OsPolling();
I_UpdateNoBlit();
if (rendermode == render_soft)
I_FinishUpdate(); // page flip or blit buffer
}
// Tails 11-19-2002
static void M_HandleConnectIP(INT32 choice)
{
* Completely revamp a bunch of menu stuff! * Improve control menus significantly - a more layout-neutral, gameplay importance based order, with spacing, and less depth to get to the important stuff. * Port over the improved MP main menu from internal, including flattening the IP connect onto its level. * Allow for selecting the number of splitscreen players using a menu option, rather than three seperate menu choices. * Improve the layout of all of the level/gametype select menus slightly. * (unrelated) Make fourth player area in 3p splitscreen use the tiling background instead of a pure black area. * (unrelated) Tweak minimap ordering slightly.
2018-06-30 15:01:03 +00:00
size_t l;
boolean exitmenu = false; // exit to previous menu and send name change
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
switch (choice)
{
* Completely revamp a bunch of menu stuff! * Improve control menus significantly - a more layout-neutral, gameplay importance based order, with spacing, and less depth to get to the important stuff. * Port over the improved MP main menu from internal, including flattening the IP connect onto its level. * Allow for selecting the number of splitscreen players using a menu option, rather than three seperate menu choices. * Improve the layout of all of the level/gametype select menus slightly. * (unrelated) Make fourth player area in 3p splitscreen use the tiling background instead of a pure black area. * (unrelated) Tweak minimap ordering slightly.
2018-06-30 15:01:03 +00:00
case KEY_DOWNARROW:
M_NextOpt();
S_StartSound(NULL,sfx_menu1); // Tails
break;
case KEY_UPARROW:
M_PrevOpt();
S_StartSound(NULL,sfx_menu1); // Tails
break;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
case KEY_ENTER:
S_StartSound(NULL,sfx_menu1); // Tails
Bugfixes: * Use CV_NOSHOWHELP as an obstacle for CV_CompleteVar (so the hidden variables don't show up and ruin our party or anything). * Hack around the karteliminatelast thing so we don't have to hex-edit the netids, and can release with current assets (but a different executable, of course, to get the credits). * Fix M_HandleConnectIP not saving your current position on the menu if you use it while it's empty.
2018-11-14 15:28:17 +00:00
currentMenu->lastOn = itemOn;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
M_ConnectIP(1);
break;
case KEY_ESCAPE:
exitmenu = true;
break;
case KEY_BACKSPACE:
* Completely revamp a bunch of menu stuff! * Improve control menus significantly - a more layout-neutral, gameplay importance based order, with spacing, and less depth to get to the important stuff. * Port over the improved MP main menu from internal, including flattening the IP connect onto its level. * Allow for selecting the number of splitscreen players using a menu option, rather than three seperate menu choices. * Improve the layout of all of the level/gametype select menus slightly. * (unrelated) Make fourth player area in 3p splitscreen use the tiling background instead of a pure black area. * (unrelated) Tweak minimap ordering slightly.
2018-06-30 15:01:03 +00:00
if ((l = strlen(setupm_ip)) != 0)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
S_StartSound(NULL,sfx_menu1); // Tails
* Completely revamp a bunch of menu stuff! * Improve control menus significantly - a more layout-neutral, gameplay importance based order, with spacing, and less depth to get to the important stuff. * Port over the improved MP main menu from internal, including flattening the IP connect onto its level. * Allow for selecting the number of splitscreen players using a menu option, rather than three seperate menu choices. * Improve the layout of all of the level/gametype select menus slightly. * (unrelated) Make fourth player area in 3p splitscreen use the tiling background instead of a pure black area. * (unrelated) Tweak minimap ordering slightly.
2018-06-30 15:01:03 +00:00
setupm_ip[l-1] = 0;
}
break;
case KEY_DEL:
if (setupm_ip[0])
{
S_StartSound(NULL,sfx_menu1); // Tails
setupm_ip[0] = 0;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
break;
default:
I accidentally the numpad also reduced the range of usable characters
2019-01-26 09:41:05 +00:00
l = strlen(setupm_ip);
if (l >= 28-1)
* Completely revamp a bunch of menu stuff! * Improve control menus significantly - a more layout-neutral, gameplay importance based order, with spacing, and less depth to get to the important stuff. * Port over the improved MP main menu from internal, including flattening the IP connect onto its level. * Allow for selecting the number of splitscreen players using a menu option, rather than three seperate menu choices. * Improve the layout of all of the level/gametype select menus slightly. * (unrelated) Make fourth player area in 3p splitscreen use the tiling background instead of a pure black area. * (unrelated) Tweak minimap ordering slightly.
2018-06-30 15:01:03 +00:00
break;
I accidentally the numpad also reduced the range of usable characters
2019-01-26 09:41:05 +00:00
// Rudimentary number and period enforcing - also allows letters so hostnames can be used instead
Use actual characters instead of ASCII codes as per Sryder's suggestion
2019-01-26 21:15:37 +00:00
if ((choice >= '-' && choice <= ':') || (choice >= 'A' && choice <= 'Z') || (choice >= 'a' && choice <= 'z'))
I accidentally the numpad also reduced the range of usable characters
2019-01-26 09:41:05 +00:00
{
S_StartSound(NULL,sfx_menu1); // Tails
setupm_ip[l] = (char)choice;
setupm_ip[l+1] = 0;
}
else if (choice >= 199 && choice <= 211 && choice != 202 && choice != 206) //numpad too!
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
I accidentally the numpad also reduced the range of usable characters
2019-01-26 09:41:05 +00:00
char keypad_translation[] = {'7','8','9','-','4','5','6','+','1','2','3','0','.'};
choice = keypad_translation[choice - 199];
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
S_StartSound(NULL,sfx_menu1); // Tails
* Completely revamp a bunch of menu stuff! * Improve control menus significantly - a more layout-neutral, gameplay importance based order, with spacing, and less depth to get to the important stuff. * Port over the improved MP main menu from internal, including flattening the IP connect onto its level. * Allow for selecting the number of splitscreen players using a menu option, rather than three seperate menu choices. * Improve the layout of all of the level/gametype select menus slightly. * (unrelated) Make fourth player area in 3p splitscreen use the tiling background instead of a pure black area. * (unrelated) Tweak minimap ordering slightly.
2018-06-30 15:01:03 +00:00
setupm_ip[l] = (char)choice;
setupm_ip[l+1] = 0;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
break;
}
if (exitmenu)
{
if (currentMenu->prevMenu)
M_SetupNextMenu (currentMenu->prevMenu);
else
M_ClearMenus(true);
}
}
#endif //!NONET
// ========================
// MULTIPLAYER PLAYER SETUP
// ========================
// Tails 03-02-2002
Implement Uncapped (squashed) Co-Authored-By: Sally Coolatta <tehrealsalt@gmail.com> Co-Authored-By: James R <justsomejames2@gmail.com> Co-Authored-By: Monster Iestyn <iestynjealous@ntlworld.com> Co-Authored-By: katsy <katmint@live.com> Place Frame Interpolation in "Experimental" video options header This seems like an appropriate way to describe the feature for now. Add smooth level platter under interpolation, `renderdeltatics` `renderdeltatics` can be used as a standard delta time in any place, allowing for smooth menus. It will always be equal to `realtics` when frame interpolation is turned off, producing consistent framerate behavior everywhere it is used. Add smooth rendering to save select screen Add smooth rendering to Record/NiGHTS Attack, F_SkyScroll Ensure viewsector is accurate to viewx/viewy This fixes a potential crash in OpenGL when changing between levels. Ensure + commands get executed before map start Always have precise_t defined Fix misc dropshadow issues Reset view interpolation on level load Remove unnecessary precipmobj thinker hack Add reset interpolation state functions Reset precip interpolation on snap to ceil Reset mobj interp state on TeleportMove Only swap view interp state if a tick is run Run anti-lag chasecam at tic frequency Fixes jittery and unstable chasecam in high latency netgames Homogenize mobj interpolations Add sector plane level interpolations Add SectorScroll interpolator Add SideScroll interpolator Add Polyobj interpolator Intialize interpolator list at a better time Delete interpolators associated with thinkers Interpolate mobj angles and player drawangle Interpolate HWR_DrawModel Add functions to handle interpolation Much less code duplication P_InitAngle, to fix angle interpolation on spawning objects Fully fix drop shadows It used the thing's floorz / ceilingz directly -- that wouldn't account for interpolated coordinates. Do not speed up underwater/heatwave effect in OpenGL Closer OpenGL underwater/heatwave effect to Software Interpolate from time of previous tic Previously interpolated from last 35th of a second, which may be offset from game time due to connection lag. Consider this the proper fix to 54148a0dd0 too. Calculate FPS stuff even if frame is skipped I decided ultimately to actually keep the frame skip optimization disabled, because I think it is actually a little bit helpful that you can still get accurate rendering perfstats while paused, however if we decide otherwise then we can have this optimization back without making the game act like it's lagging. Keep rect in memory Feel better about this than creating one all da time Lots of FPS stuff - Disabled VSync, due to the numerous problems it has. - Instead, added an FPS cap. - Frame interpolation is now tied to fpscap != 35. - By default, the FPS cap is set to the monitor's refresh rate. - Rewrote the FPS counter. (This also consolidates several more commits ahead of this fixing various issues. -eid) Misc changes after Kart cherry-picks Fix renderdeltatics with new timing data Update mobj oldstates before all thinkers Allow FPS cap values Adjust how FPS cap is checked to improve FPS stability Fix precip crash from missing vars Improve the framerate limiter's timing for extreme stable FPS Handle the sleep at the end of D_SRB2Loop instead of the start Simplifies logic in the other parts of the loop, and fixes problems with it frequently waiting too long. Reset mobj interp state on add Add mobj interpolator on load netgame Move mobj interpolators to r_fps Dynamic slope interpolators I_GetFrameTime to try and improve frame pace (It doesn't feel that much better though.) Move I_FinishUpdate to D_SRB2Loop to sync screen updates with FPS cap, use timestamps in I_FrameCapSleep to simplify the code Fix plane interpolation light level flickering Fix flickering plane interpolation for OpenGL in the exact same way Funny OpenGL renderer being at least 50% copy-pasted Software code :) P_SetOrigin & P_MoveOrigin to replace P_TeleportMove Convert P_TeleportMove use to origin funcs Revert "P_InitAngle, to fix angle interpolation on spawning objects" This reverts commit a80c98bd164a2748cbbfad9027b34601185d93f5. Waypoint polyobjects interpolate z & children Add interpolation to more moving plane types Adds interpolation to the following: - Crumbling platforms - Mario blocks - Floatbob platforms (this one works really strangely due to two thinkers, maybe double-check this one?) Reset overlays interp states each TryRunTics Interpolate model interpolation (lol) Use interp tracer pos for GL linkdraw Papersprite angle interpolation Makes the ending signpost smooth Move intermission emerald bounce to ticker Bring back shadows on polyobjects Also optimizes the method used so rings can show their shadows too. Using just the subsector is a tad bit imprecise admittedly but any more precise methods get really laggy. Fix a bunch of ticking in hu_ drawing functions Revert "Reset overlays interp states each TryRunTics" This reverts commit a71a216faa20e8751b3bd0157354e8d748940c92. Move intro ticking out of the drawer Adjust 1up monitor icon z offsets Fixes interpolation issues with 1up monitors. Delta time choose player menu animations Add drawerlib deltaTime function Interpolate afterimages further back Use old sleep in dedicated mode Clamp cechotimer to 0 Fixes issues with cechos staying on-screen and glitching out (NiGHTS items for example). Revert "Remove unnecessary precipmobj thinker hack" This reverts commit 0e38208620d19ec2ab690740438ac2fc7862a49e. Fix frame pacing when game lags behind The frame timestamp should've been made at the start of the frame, not the end. Fix I_FrameCapSleep not respecting cpusleep Jonathan Joestar bruh Allow dedicated to use precise sleep timing again Instead of only using one old sleep, just enforce framerate cap to match TICRATE. Make Lua TeleportMove call MoveOrigin Reset Metal fume interp state on appear Add interpdebug Put interpdebug stuff in perfstats instead Add timescale cvar Slow the game down to debug animations / interpolation problems! Speed it up if you need to get somewhere quickly while mapping! Enable timescale outside of DEVELOP builds It has NETVAR, so it should be fine -- put an end to useful debugging features excluded in multiplayer! Force interpolation when timescale != 1.0 Reset old_z in MT_LOCKON think Fixes interpolation artifacting due to spawn pos. Fix cutscenes in interp Fix boss1 laser in interp Interpolate mobj scale Precalculate refresh rate Slower PCs can have issue querying mode over and over. This might kinda suck for windowed mode if you have different refresh rate displays but oh well Fix interp scaling crashing software Reset interp scale when Lua sets .scale Disable angle interp on fresh mobjs Fix interp scale crash for hires sprites Interp shadow scales Copy interp state in P_SpawnMobjFromMobj Fix multiplayer character select Don't interpolate mobj state if frac = 1.0 Fix Mario block item placement Interpolate spritescale/offset x/y Fix offset copies for SpawnMobjFromMobj THANKS SAL Add Lua HUD drawlists Buffers draw calls between tics to ensure hooks run at the originally intended rate. Rename drawerlib deltaTime to getDeltaTime Make renderisnewtic is false between tics I know what I'm doing! I swear Completely refactor timing system Time is now tracked internally in the game using I_GetPreciseTime and I_UpdateTime. I_Time now pulls from this internal timer. The system code no longer needs to keep track of time itself. This significantly improves frame and tic timing in interp mode, resulting in a much smoother image with essentially no judder at any framerate. Ensure mobj interpolators reset on level load Ensure view is not interpolated on first frame Disable sprite offset interpolation (for now) Refactor timing code even more System layer is greatly simplified and framecap logic has been moved internally. I_Sleep now takes a sleep duration and I_SleepDuration generically implements a precise sleep with spin loop.
2019-10-06 22:40:52 +00:00
static fixed_t multi_tics;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
static state_t *multi_state;
// this is set before entering the MultiPlayer setup menu,
// for either player 1 or 2
static char setupm_name[MAXPLAYERNAME+1];
static player_t *setupm_player;
static consvar_t *setupm_cvskin;
static consvar_t *setupm_cvcolor;
static consvar_t *setupm_cvname;
static INT32 setupm_fakeskin;
static INT32 setupm_fakecolor;
static void M_DrawSetupMultiPlayerMenu(void)
{
INT32 mx, my, st, flags = 0;
spritedef_t *sprdef;
spriteframe_t *sprframe;
Previous EXE: The Better Edition - Improve balloon-based items. Much more distinguished differences between the different ranks - Reverted Feather strafing. You can now just... properly move in the air, if you're using a Feather or a Bounce Pad. - Bounce pads are now stronger while using speed items. - Fixed the long standing bug about offroad & ziplines working when you're on FOFs above them. This is a tricky subject, so please report any issues you may come across related to this. - Shells should no longer travel to Mars, nor will they when using bounce pads. They should now do a gentle hop. - :WIP: new MP Player Setup screen, now shows character stats. Will later feature the list of characters in a row of icons, and a backported 2.2 color selector with toast's permission - Renamed "Match" to "Battle" :p - Yet MORE minor cases where kartspeed & kartweight were being read as fixed_t when they're freakin' UINT8's, people!
2017-11-28 06:13:23 +00:00
patch_t *statbg = W_CachePatchName("K_STATBG", PU_CACHE);
Redone stat graph
2018-09-03 04:06:17 +00:00
patch_t *statlr = W_CachePatchName("K_STATLR", PU_CACHE);
patch_t *statud = W_CachePatchName("K_STATUD", PU_CACHE);
Previous EXE: The Better Edition - Improve balloon-based items. Much more distinguished differences between the different ranks - Reverted Feather strafing. You can now just... properly move in the air, if you're using a Feather or a Bounce Pad. - Bounce pads are now stronger while using speed items. - Fixed the long standing bug about offroad & ziplines working when you're on FOFs above them. This is a tricky subject, so please report any issues you may come across related to this. - Shells should no longer travel to Mars, nor will they when using bounce pads. They should now do a gentle hop. - :WIP: new MP Player Setup screen, now shows character stats. Will later feature the list of characters in a row of icons, and a backported 2.2 color selector with toast's permission - Renamed "Match" to "Battle" :p - Yet MORE minor cases where kartspeed & kartweight were being read as fixed_t when they're freakin' UINT8's, people!
2017-11-28 06:13:23 +00:00
patch_t *statdot = W_CachePatchName("K_SDOT0", PU_CACHE);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
patch_t *patch;
UINT8 frame;
Previous EXE: The Better Edition - Improve balloon-based items. Much more distinguished differences between the different ranks - Reverted Feather strafing. You can now just... properly move in the air, if you're using a Feather or a Bounce Pad. - Bounce pads are now stronger while using speed items. - Fixed the long standing bug about offroad & ziplines working when you're on FOFs above them. This is a tricky subject, so please report any issues you may come across related to this. - Shells should no longer travel to Mars, nor will they when using bounce pads. They should now do a gentle hop. - :WIP: new MP Player Setup screen, now shows character stats. Will later feature the list of characters in a row of icons, and a backported 2.2 color selector with toast's permission - Renamed "Match" to "Battle" :p - Yet MORE minor cases where kartspeed & kartweight were being read as fixed_t when they're freakin' UINT8's, people!
2017-11-28 06:13:23 +00:00
UINT8 speed;
UINT8 weight;
UINT8 i;
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
const UINT8 *flashcol = V_GetStringColormap(highlightflags);
Redone stat graph
2018-09-03 04:06:17 +00:00
INT32 statx, staty;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
mx = MP_PlayerSetupDef.x;
my = MP_PlayerSetupDef.y;
Redone stat graph
2018-09-03 04:06:17 +00:00
statx = (BASEVIDWIDTH - mx - 118);
staty = (my+62);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// use generic drawer for cursor, items and title
M_DrawGenericMenu();
// draw name string
Further improved player setup Now has all of the features, maybe needs spacing tweaks
2017-11-28 21:57:38 +00:00
M_DrawTextBox(mx + 32, my - 8, MAXPLAYERNAME, 1);
V_DrawString(mx + 40, my, V_ALLOWLOWERCASE, setupm_name);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
// draw text cursor for name
if (!itemOn && skullAnimCounter < 4) // blink cursor
V_DrawCharacter(mx + 40 + V_StringWidth(setupm_name, V_ALLOWLOWERCASE), my, '_',false);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// draw skin string
Tweak player setup menu.
2018-07-02 13:43:52 +00:00
st = V_StringWidth(skins[setupm_fakeskin].realname, 0);
V_DrawString(BASEVIDWIDTH - mx - st, my + 16,
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
((MP_PlayerSetupMenu[2].status & IT_TYPE) == IT_SPACE ? V_TRANSLUCENT : 0)|highlightflags|V_ALLOWLOWERCASE,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
skins[setupm_fakeskin].realname);
Tweak player setup menu.
2018-07-02 13:43:52 +00:00
if (itemOn == 1)
{
V_DrawCharacter(BASEVIDWIDTH - mx - 10 - st - (skullAnimCounter/5), my + 16,
'\x1C' | highlightflags, false); // left arrow
V_DrawCharacter(BASEVIDWIDTH - mx + 2 + (skullAnimCounter/5), my + 16,
'\x1D' | highlightflags, false); // right arrow
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// draw the name of the color you have chosen
// Just so people don't go thinking that "Default" is Green.
Tweak player setup menu.
2018-07-02 13:43:52 +00:00
st = V_StringWidth(KartColor_Names[setupm_fakecolor], 0);
V_DrawString(BASEVIDWIDTH - mx - st, my + 152, highlightflags|V_ALLOWLOWERCASE, KartColor_Names[setupm_fakecolor]); // SRB2kart
if (itemOn == 2)
{
V_DrawCharacter(BASEVIDWIDTH - mx - 10 - st - (skullAnimCounter/5), my + 152,
'\x1C' | highlightflags, false); // left arrow
V_DrawCharacter(BASEVIDWIDTH - mx + 2 + (skullAnimCounter/5), my + 152,
'\x1D' | highlightflags, false); // right arrow
}
Previous EXE: The Better Edition - Improve balloon-based items. Much more distinguished differences between the different ranks - Reverted Feather strafing. You can now just... properly move in the air, if you're using a Feather or a Bounce Pad. - Bounce pads are now stronger while using speed items. - Fixed the long standing bug about offroad & ziplines working when you're on FOFs above them. This is a tricky subject, so please report any issues you may come across related to this. - Shells should no longer travel to Mars, nor will they when using bounce pads. They should now do a gentle hop. - :WIP: new MP Player Setup screen, now shows character stats. Will later feature the list of characters in a row of icons, and a backported 2.2 color selector with toast's permission - Renamed "Match" to "Battle" :p - Yet MORE minor cases where kartspeed & kartweight were being read as fixed_t when they're freakin' UINT8's, people!
2017-11-28 06:13:23 +00:00
// SRB2Kart: draw the stat backer
Redone stat graph
2018-09-03 04:06:17 +00:00
// labels
V_DrawThinString(statx+16, staty, V_6WIDTHSPACE|highlightflags, "Acceleration");
V_DrawThinString(statx+91, staty, V_6WIDTHSPACE|highlightflags, "Max Speed");
V_DrawThinString(statx, staty+12, V_6WIDTHSPACE|highlightflags, "Handling");
V_DrawThinString(statx+7, staty+77, V_6WIDTHSPACE|highlightflags, "Weight");
// label arrows
V_DrawFixedPatch((statx+64)<<FRACBITS, staty<<FRACBITS, FRACUNIT, 0, statlr, flashcol);
V_DrawFixedPatch((statx+24)<<FRACBITS, (staty+22)<<FRACBITS, FRACUNIT, 0, statud, flashcol);
// bg
V_DrawFixedPatch((statx+34)<<FRACBITS, (staty+10)<<FRACBITS, FRACUNIT, 0, statbg, 0);
Previous EXE: The Better Edition - Improve balloon-based items. Much more distinguished differences between the different ranks - Reverted Feather strafing. You can now just... properly move in the air, if you're using a Feather or a Bounce Pad. - Bounce pads are now stronger while using speed items. - Fixed the long standing bug about offroad & ziplines working when you're on FOFs above them. This is a tricky subject, so please report any issues you may come across related to this. - Shells should no longer travel to Mars, nor will they when using bounce pads. They should now do a gentle hop. - :WIP: new MP Player Setup screen, now shows character stats. Will later feature the list of characters in a row of icons, and a backported 2.2 color selector with toast's permission - Renamed "Match" to "Battle" :p - Yet MORE minor cases where kartspeed & kartweight were being read as fixed_t when they're freakin' UINT8's, people!
2017-11-28 06:13:23 +00:00
Further improved player setup Now has all of the features, maybe needs spacing tweaks
2017-11-28 21:57:38 +00:00
for (i = 0; i < numskins; i++) // draw the stat dots
Previous EXE: The Better Edition - Improve balloon-based items. Much more distinguished differences between the different ranks - Reverted Feather strafing. You can now just... properly move in the air, if you're using a Feather or a Bounce Pad. - Bounce pads are now stronger while using speed items. - Fixed the long standing bug about offroad & ziplines working when you're on FOFs above them. This is a tricky subject, so please report any issues you may come across related to this. - Shells should no longer travel to Mars, nor will they when using bounce pads. They should now do a gentle hop. - :WIP: new MP Player Setup screen, now shows character stats. Will later feature the list of characters in a row of icons, and a backported 2.2 color selector with toast's permission - Renamed "Match" to "Battle" :p - Yet MORE minor cases where kartspeed & kartweight were being read as fixed_t when they're freakin' UINT8's, people!
2017-11-28 06:13:23 +00:00
{
if (i != setupm_fakeskin && R_SkinAvailable(skins[i].name) != -1)
{
speed = skins[i].kartspeed;
weight = skins[i].kartweight;
Tweak player setup menu.
2018-07-02 13:43:52 +00:00
V_DrawFixedPatch(((BASEVIDWIDTH - mx - 80) + ((speed-1)*8))<<FRACBITS, ((my+76) + ((weight-1)*8))<<FRACBITS, FRACUNIT, 0, statdot, NULL);
Previous EXE: The Better Edition - Improve balloon-based items. Much more distinguished differences between the different ranks - Reverted Feather strafing. You can now just... properly move in the air, if you're using a Feather or a Bounce Pad. - Bounce pads are now stronger while using speed items. - Fixed the long standing bug about offroad & ziplines working when you're on FOFs above them. This is a tricky subject, so please report any issues you may come across related to this. - Shells should no longer travel to Mars, nor will they when using bounce pads. They should now do a gentle hop. - :WIP: new MP Player Setup screen, now shows character stats. Will later feature the list of characters in a row of icons, and a backported 2.2 color selector with toast's permission - Renamed "Match" to "Battle" :p - Yet MORE minor cases where kartspeed & kartweight were being read as fixed_t when they're freakin' UINT8's, people!
2017-11-28 06:13:23 +00:00
}
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
speed = skins[setupm_fakeskin].kartspeed;
weight = skins[setupm_fakeskin].kartweight;
statdot = W_CachePatchName("K_SDOT1", PU_CACHE);
if (skullAnimCounter < 4) // SRB2Kart: we draw this dot later so that it's not covered if there's multiple skins with the same stats
Tweak player setup menu.
2018-07-02 13:43:52 +00:00
V_DrawFixedPatch(((BASEVIDWIDTH - mx - 80) + ((speed-1)*8))<<FRACBITS, ((my+76) + ((weight-1)*8))<<FRACBITS, FRACUNIT, 0, statdot, flashcol);
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
else
Tweak player setup menu.
2018-07-02 13:43:52 +00:00
V_DrawFixedPatch(((BASEVIDWIDTH - mx - 80) + ((speed-1)*8))<<FRACBITS, ((my+76) + ((weight-1)*8))<<FRACBITS, FRACUNIT, 0, statdot, NULL);
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
statdot = W_CachePatchName("K_SDOT2", PU_CACHE); // coloured center
Tweak player setup menu.
2018-07-02 13:43:52 +00:00
if (setupm_fakecolor)
Cache colormaps everywhere to avoid memory leaks
2019-03-16 05:39:52 +00:00
V_DrawFixedPatch(((BASEVIDWIDTH - mx - 80) + ((speed-1)*8))<<FRACBITS, ((my+76) + ((weight-1)*8))<<FRACBITS, FRACUNIT, 0, statdot, R_GetTranslationColormap(0, setupm_fakecolor, GTC_MENUCACHE));
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
Further improved player setup Now has all of the features, maybe needs spacing tweaks
2017-11-28 21:57:38 +00:00
// 2.2 color bar backported with permission
Tweak player setup menu.
2018-07-02 13:43:52 +00:00
#define charw 72
Further improved player setup Now has all of the features, maybe needs spacing tweaks
2017-11-28 21:57:38 +00:00
#define indexwidth 8
{
Tweak player setup menu.
2018-07-02 13:43:52 +00:00
const INT32 colwidth = ((BASEVIDWIDTH-(2*mx))-charw)/(2*indexwidth);
Unified menu items, fix some compile warnings
2017-12-04 01:00:31 +00:00
INT32 j = -colwidth;
Further improved player setup Now has all of the features, maybe needs spacing tweaks
2017-11-28 21:57:38 +00:00
INT16 col = setupm_fakecolor - colwidth;
Tweak player setup menu.
2018-07-02 13:43:52 +00:00
INT32 x = mx;
Further improved player setup Now has all of the features, maybe needs spacing tweaks
2017-11-28 21:57:38 +00:00
INT32 w = indexwidth;
UINT8 h;
while (col < 1)
col += MAXSKINCOLORS-1;
Unified menu items, fix some compile warnings
2017-12-04 01:00:31 +00:00
while (j <= colwidth)
Further improved player setup Now has all of the features, maybe needs spacing tweaks
2017-11-28 21:57:38 +00:00
{
Unified menu items, fix some compile warnings
2017-12-04 01:00:31 +00:00
if (!(j++))
Further improved player setup Now has all of the features, maybe needs spacing tweaks
2017-11-28 21:57:38 +00:00
w = charw;
else
w = indexwidth;
for (h = 0; h < 16; h++)
Tweak player setup menu.
2018-07-02 13:43:52 +00:00
V_DrawFill(x, my+162+h, w, 1, colortranslations[col][h]);
Further improved player setup Now has all of the features, maybe needs spacing tweaks
2017-11-28 21:57:38 +00:00
if (++col >= MAXSKINCOLORS)
col -= MAXSKINCOLORS-1;
x += w;
}
}
#undef indexwidth
// character bar, ripped off the color bar :V
Tweak player setup menu.
2018-07-02 13:43:52 +00:00
if (setupm_fakecolor) // inverse should never happen
Further improved player setup Now has all of the features, maybe needs spacing tweaks
2017-11-28 21:57:38 +00:00
#define iconwidth 32
{
const INT32 icons = 4;
Unified menu items, fix some compile warnings
2017-12-04 01:00:31 +00:00
INT32 k = -icons;
Further improved player setup Now has all of the features, maybe needs spacing tweaks
2017-11-28 21:57:38 +00:00
INT16 col = setupm_fakeskin - icons;
INT32 x = BASEVIDWIDTH/2 - ((icons+1)*24) - 4;
fixed_t scale = FRACUNIT/2;
INT32 offx = 8, offy = 8;
Ranking face highlights
2018-11-10 05:01:44 +00:00
patch_t *cursor;
Make character cursor framerate-independent
2022-05-20 02:03:58 +00:00
static fixed_t cursorframe = 0;
Further improved player setup Now has all of the features, maybe needs spacing tweaks
2017-11-28 21:57:38 +00:00
patch_t *face;
`[22:03] TehRealSalt: Not organized code-wise, figured toaster would want to help with that since she's the Menu Queen and she probably has better ideas on how to do it` The Menu Queen is in the house~ :sparkles: * Magical, single-page player select and general netgamey stuff, while still remaining both pretty and functional. * Death to NOFOURPLAYER, now that the cat's out the bag. * Clean up NONET, assuming people try to make DD builds on release. * Minor tweaks across the board, mostly places where I wanted to pilfer minor code from and realised it wasn't done optimally originally.
2018-10-16 21:11:47 +00:00
UINT8 *colmap;
Further improved player setup Now has all of the features, maybe needs spacing tweaks
2017-11-28 21:57:38 +00:00
Make character cursor framerate-independent
2022-05-20 02:03:58 +00:00
cursorframe += renderdeltatics / 4;
Tweaks for kart v1 MR comments
2022-05-21 17:32:40 +00:00
for (; cursorframe > 7 * FRACUNIT; cursorframe -= 7 * FRACUNIT) {}
Ranking face highlights
2018-11-10 05:01:44 +00:00
Make character cursor framerate-independent
2022-05-20 02:03:58 +00:00
cursor = W_CachePatchName(va("K_BHILI%d", (cursorframe >> FRACBITS) + 1), PU_CACHE);
Ranking face highlights
2018-11-10 05:01:44 +00:00
Further improved player setup Now has all of the features, maybe needs spacing tweaks
2017-11-28 21:57:38 +00:00
if (col < 0)
col += numskins;
Unified menu items, fix some compile warnings
2017-12-04 01:00:31 +00:00
while (k <= icons)
Further improved player setup Now has all of the features, maybe needs spacing tweaks
2017-11-28 21:57:38 +00:00
{
Unified menu items, fix some compile warnings
2017-12-04 01:00:31 +00:00
if (!(k++))
Further improved player setup Now has all of the features, maybe needs spacing tweaks
2017-11-28 21:57:38 +00:00
{
scale = FRACUNIT;
Stupidbad-big commit, but PLEASE don't ask me to re-do this on another branch, I swear to god. I know it makes things more difficult on you, and I'm sorry for that, but I'm definitely feeling the goddamn crunch right now and I wanna take a step back from this spaghetti nightmare and clear my head. * Do that thing where the character icons are ALWAYS 1x sized, through having two seperate lumps. * Revamp the S_SKIN parameters to be `facerank` (rankings - equivalent of half-scale old face), `facewant` (WANTED - equivalent of old face), and `facemmap` (equivalent of old iconprefix). * Do that thing Oni wanted where it shows two postions above and two positions below your current ranking (and you) to the left of the screen, instead of always the top 4, with some limits to avoid drawing outside of everything. * Replace the last few shitty Mario numbers (for the left rankings) with cool, new Oni numbers. * Change a bunch of offsets and things so the tab rankings and the intermission work nicer with 9+ players.
2018-10-28 16:27:55 +00:00
face = facewantprefix[col];
Further improved player setup Now has all of the features, maybe needs spacing tweaks
2017-11-28 21:57:38 +00:00
offx = 12;
offy = 0;
}
else
{
scale = FRACUNIT/2;
Stupidbad-big commit, but PLEASE don't ask me to re-do this on another branch, I swear to god. I know it makes things more difficult on you, and I'm sorry for that, but I'm definitely feeling the goddamn crunch right now and I wanna take a step back from this spaghetti nightmare and clear my head. * Do that thing where the character icons are ALWAYS 1x sized, through having two seperate lumps. * Revamp the S_SKIN parameters to be `facerank` (rankings - equivalent of half-scale old face), `facewant` (WANTED - equivalent of old face), and `facemmap` (equivalent of old iconprefix). * Do that thing Oni wanted where it shows two postions above and two positions below your current ranking (and you) to the left of the screen, instead of always the top 4, with some limits to avoid drawing outside of everything. * Replace the last few shitty Mario numbers (for the left rankings) with cool, new Oni numbers. * Change a bunch of offsets and things so the tab rankings and the intermission work nicer with 9+ players.
2018-10-28 16:27:55 +00:00
face = facerankprefix[col];
Further improved player setup Now has all of the features, maybe needs spacing tweaks
2017-11-28 21:57:38 +00:00
offx = 8;
offy = 8;
}
Cache colormaps everywhere to avoid memory leaks
2019-03-16 05:39:52 +00:00
colmap = R_GetTranslationColormap(col, setupm_fakecolor, GTC_MENUCACHE);
Stupidbad-big commit, but PLEASE don't ask me to re-do this on another branch, I swear to god. I know it makes things more difficult on you, and I'm sorry for that, but I'm definitely feeling the goddamn crunch right now and I wanna take a step back from this spaghetti nightmare and clear my head. * Do that thing where the character icons are ALWAYS 1x sized, through having two seperate lumps. * Revamp the S_SKIN parameters to be `facerank` (rankings - equivalent of half-scale old face), `facewant` (WANTED - equivalent of old face), and `facemmap` (equivalent of old iconprefix). * Do that thing Oni wanted where it shows two postions above and two positions below your current ranking (and you) to the left of the screen, instead of always the top 4, with some limits to avoid drawing outside of everything. * Replace the last few shitty Mario numbers (for the left rankings) with cool, new Oni numbers. * Change a bunch of offsets and things so the tab rankings and the intermission work nicer with 9+ players.
2018-10-28 16:27:55 +00:00
V_DrawFixedPatch((x+offx)<<FRACBITS, (my+28+offy)<<FRACBITS, FRACUNIT, 0, face, colmap);
Further improved player setup Now has all of the features, maybe needs spacing tweaks
2017-11-28 21:57:38 +00:00
if (scale == FRACUNIT) // bit of a hack
Ranking face highlights
2018-11-10 05:01:44 +00:00
V_DrawFixedPatch((x+offx)<<FRACBITS, (my+28+offy)<<FRACBITS, FRACUNIT, 0, cursor, colmap);
Further improved player setup Now has all of the features, maybe needs spacing tweaks
2017-11-28 21:57:38 +00:00
if (++col >= numskins)
col -= numskins;
x += FixedMul(iconwidth<<FRACBITS, 3*scale/2)/FRACUNIT;
}
}
#undef iconwidth
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// anim the player in the box
Implement Uncapped (squashed) Co-Authored-By: Sally Coolatta <tehrealsalt@gmail.com> Co-Authored-By: James R <justsomejames2@gmail.com> Co-Authored-By: Monster Iestyn <iestynjealous@ntlworld.com> Co-Authored-By: katsy <katmint@live.com> Place Frame Interpolation in "Experimental" video options header This seems like an appropriate way to describe the feature for now. Add smooth level platter under interpolation, `renderdeltatics` `renderdeltatics` can be used as a standard delta time in any place, allowing for smooth menus. It will always be equal to `realtics` when frame interpolation is turned off, producing consistent framerate behavior everywhere it is used. Add smooth rendering to save select screen Add smooth rendering to Record/NiGHTS Attack, F_SkyScroll Ensure viewsector is accurate to viewx/viewy This fixes a potential crash in OpenGL when changing between levels. Ensure + commands get executed before map start Always have precise_t defined Fix misc dropshadow issues Reset view interpolation on level load Remove unnecessary precipmobj thinker hack Add reset interpolation state functions Reset precip interpolation on snap to ceil Reset mobj interp state on TeleportMove Only swap view interp state if a tick is run Run anti-lag chasecam at tic frequency Fixes jittery and unstable chasecam in high latency netgames Homogenize mobj interpolations Add sector plane level interpolations Add SectorScroll interpolator Add SideScroll interpolator Add Polyobj interpolator Intialize interpolator list at a better time Delete interpolators associated with thinkers Interpolate mobj angles and player drawangle Interpolate HWR_DrawModel Add functions to handle interpolation Much less code duplication P_InitAngle, to fix angle interpolation on spawning objects Fully fix drop shadows It used the thing's floorz / ceilingz directly -- that wouldn't account for interpolated coordinates. Do not speed up underwater/heatwave effect in OpenGL Closer OpenGL underwater/heatwave effect to Software Interpolate from time of previous tic Previously interpolated from last 35th of a second, which may be offset from game time due to connection lag. Consider this the proper fix to 54148a0dd0 too. Calculate FPS stuff even if frame is skipped I decided ultimately to actually keep the frame skip optimization disabled, because I think it is actually a little bit helpful that you can still get accurate rendering perfstats while paused, however if we decide otherwise then we can have this optimization back without making the game act like it's lagging. Keep rect in memory Feel better about this than creating one all da time Lots of FPS stuff - Disabled VSync, due to the numerous problems it has. - Instead, added an FPS cap. - Frame interpolation is now tied to fpscap != 35. - By default, the FPS cap is set to the monitor's refresh rate. - Rewrote the FPS counter. (This also consolidates several more commits ahead of this fixing various issues. -eid) Misc changes after Kart cherry-picks Fix renderdeltatics with new timing data Update mobj oldstates before all thinkers Allow FPS cap values Adjust how FPS cap is checked to improve FPS stability Fix precip crash from missing vars Improve the framerate limiter's timing for extreme stable FPS Handle the sleep at the end of D_SRB2Loop instead of the start Simplifies logic in the other parts of the loop, and fixes problems with it frequently waiting too long. Reset mobj interp state on add Add mobj interpolator on load netgame Move mobj interpolators to r_fps Dynamic slope interpolators I_GetFrameTime to try and improve frame pace (It doesn't feel that much better though.) Move I_FinishUpdate to D_SRB2Loop to sync screen updates with FPS cap, use timestamps in I_FrameCapSleep to simplify the code Fix plane interpolation light level flickering Fix flickering plane interpolation for OpenGL in the exact same way Funny OpenGL renderer being at least 50% copy-pasted Software code :) P_SetOrigin & P_MoveOrigin to replace P_TeleportMove Convert P_TeleportMove use to origin funcs Revert "P_InitAngle, to fix angle interpolation on spawning objects" This reverts commit a80c98bd164a2748cbbfad9027b34601185d93f5. Waypoint polyobjects interpolate z & children Add interpolation to more moving plane types Adds interpolation to the following: - Crumbling platforms - Mario blocks - Floatbob platforms (this one works really strangely due to two thinkers, maybe double-check this one?) Reset overlays interp states each TryRunTics Interpolate model interpolation (lol) Use interp tracer pos for GL linkdraw Papersprite angle interpolation Makes the ending signpost smooth Move intermission emerald bounce to ticker Bring back shadows on polyobjects Also optimizes the method used so rings can show their shadows too. Using just the subsector is a tad bit imprecise admittedly but any more precise methods get really laggy. Fix a bunch of ticking in hu_ drawing functions Revert "Reset overlays interp states each TryRunTics" This reverts commit a71a216faa20e8751b3bd0157354e8d748940c92. Move intro ticking out of the drawer Adjust 1up monitor icon z offsets Fixes interpolation issues with 1up monitors. Delta time choose player menu animations Add drawerlib deltaTime function Interpolate afterimages further back Use old sleep in dedicated mode Clamp cechotimer to 0 Fixes issues with cechos staying on-screen and glitching out (NiGHTS items for example). Revert "Remove unnecessary precipmobj thinker hack" This reverts commit 0e38208620d19ec2ab690740438ac2fc7862a49e. Fix frame pacing when game lags behind The frame timestamp should've been made at the start of the frame, not the end. Fix I_FrameCapSleep not respecting cpusleep Jonathan Joestar bruh Allow dedicated to use precise sleep timing again Instead of only using one old sleep, just enforce framerate cap to match TICRATE. Make Lua TeleportMove call MoveOrigin Reset Metal fume interp state on appear Add interpdebug Put interpdebug stuff in perfstats instead Add timescale cvar Slow the game down to debug animations / interpolation problems! Speed it up if you need to get somewhere quickly while mapping! Enable timescale outside of DEVELOP builds It has NETVAR, so it should be fine -- put an end to useful debugging features excluded in multiplayer! Force interpolation when timescale != 1.0 Reset old_z in MT_LOCKON think Fixes interpolation artifacting due to spawn pos. Fix cutscenes in interp Fix boss1 laser in interp Interpolate mobj scale Precalculate refresh rate Slower PCs can have issue querying mode over and over. This might kinda suck for windowed mode if you have different refresh rate displays but oh well Fix interp scaling crashing software Reset interp scale when Lua sets .scale Disable angle interp on fresh mobjs Fix interp scale crash for hires sprites Interp shadow scales Copy interp state in P_SpawnMobjFromMobj Fix multiplayer character select Don't interpolate mobj state if frac = 1.0 Fix Mario block item placement Interpolate spritescale/offset x/y Fix offset copies for SpawnMobjFromMobj THANKS SAL Add Lua HUD drawlists Buffers draw calls between tics to ensure hooks run at the originally intended rate. Rename drawerlib deltaTime to getDeltaTime Make renderisnewtic is false between tics I know what I'm doing! I swear Completely refactor timing system Time is now tracked internally in the game using I_GetPreciseTime and I_UpdateTime. I_Time now pulls from this internal timer. The system code no longer needs to keep track of time itself. This significantly improves frame and tic timing in interp mode, resulting in a much smoother image with essentially no judder at any framerate. Ensure mobj interpolators reset on level load Ensure view is not interpolated on first frame Disable sprite offset interpolation (for now) Refactor timing code even more System layer is greatly simplified and framecap logic has been moved internally. I_Sleep now takes a sleep duration and I_SleepDuration generically implements a precise sleep with spin loop.
2019-10-06 22:40:52 +00:00
multi_tics -= renderdeltatics;
while (multi_tics <= 0)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
st = multi_state->nextstate;
if (st != S_NULL)
multi_state = &states[st];
Tweaks for kart v1 MR comments
2022-05-21 17:32:40 +00:00
if (multi_state->tics <= -1)
Implement Uncapped (squashed) Co-Authored-By: Sally Coolatta <tehrealsalt@gmail.com> Co-Authored-By: James R <justsomejames2@gmail.com> Co-Authored-By: Monster Iestyn <iestynjealous@ntlworld.com> Co-Authored-By: katsy <katmint@live.com> Place Frame Interpolation in "Experimental" video options header This seems like an appropriate way to describe the feature for now. Add smooth level platter under interpolation, `renderdeltatics` `renderdeltatics` can be used as a standard delta time in any place, allowing for smooth menus. It will always be equal to `realtics` when frame interpolation is turned off, producing consistent framerate behavior everywhere it is used. Add smooth rendering to save select screen Add smooth rendering to Record/NiGHTS Attack, F_SkyScroll Ensure viewsector is accurate to viewx/viewy This fixes a potential crash in OpenGL when changing between levels. Ensure + commands get executed before map start Always have precise_t defined Fix misc dropshadow issues Reset view interpolation on level load Remove unnecessary precipmobj thinker hack Add reset interpolation state functions Reset precip interpolation on snap to ceil Reset mobj interp state on TeleportMove Only swap view interp state if a tick is run Run anti-lag chasecam at tic frequency Fixes jittery and unstable chasecam in high latency netgames Homogenize mobj interpolations Add sector plane level interpolations Add SectorScroll interpolator Add SideScroll interpolator Add Polyobj interpolator Intialize interpolator list at a better time Delete interpolators associated with thinkers Interpolate mobj angles and player drawangle Interpolate HWR_DrawModel Add functions to handle interpolation Much less code duplication P_InitAngle, to fix angle interpolation on spawning objects Fully fix drop shadows It used the thing's floorz / ceilingz directly -- that wouldn't account for interpolated coordinates. Do not speed up underwater/heatwave effect in OpenGL Closer OpenGL underwater/heatwave effect to Software Interpolate from time of previous tic Previously interpolated from last 35th of a second, which may be offset from game time due to connection lag. Consider this the proper fix to 54148a0dd0 too. Calculate FPS stuff even if frame is skipped I decided ultimately to actually keep the frame skip optimization disabled, because I think it is actually a little bit helpful that you can still get accurate rendering perfstats while paused, however if we decide otherwise then we can have this optimization back without making the game act like it's lagging. Keep rect in memory Feel better about this than creating one all da time Lots of FPS stuff - Disabled VSync, due to the numerous problems it has. - Instead, added an FPS cap. - Frame interpolation is now tied to fpscap != 35. - By default, the FPS cap is set to the monitor's refresh rate. - Rewrote the FPS counter. (This also consolidates several more commits ahead of this fixing various issues. -eid) Misc changes after Kart cherry-picks Fix renderdeltatics with new timing data Update mobj oldstates before all thinkers Allow FPS cap values Adjust how FPS cap is checked to improve FPS stability Fix precip crash from missing vars Improve the framerate limiter's timing for extreme stable FPS Handle the sleep at the end of D_SRB2Loop instead of the start Simplifies logic in the other parts of the loop, and fixes problems with it frequently waiting too long. Reset mobj interp state on add Add mobj interpolator on load netgame Move mobj interpolators to r_fps Dynamic slope interpolators I_GetFrameTime to try and improve frame pace (It doesn't feel that much better though.) Move I_FinishUpdate to D_SRB2Loop to sync screen updates with FPS cap, use timestamps in I_FrameCapSleep to simplify the code Fix plane interpolation light level flickering Fix flickering plane interpolation for OpenGL in the exact same way Funny OpenGL renderer being at least 50% copy-pasted Software code :) P_SetOrigin & P_MoveOrigin to replace P_TeleportMove Convert P_TeleportMove use to origin funcs Revert "P_InitAngle, to fix angle interpolation on spawning objects" This reverts commit a80c98bd164a2748cbbfad9027b34601185d93f5. Waypoint polyobjects interpolate z & children Add interpolation to more moving plane types Adds interpolation to the following: - Crumbling platforms - Mario blocks - Floatbob platforms (this one works really strangely due to two thinkers, maybe double-check this one?) Reset overlays interp states each TryRunTics Interpolate model interpolation (lol) Use interp tracer pos for GL linkdraw Papersprite angle interpolation Makes the ending signpost smooth Move intermission emerald bounce to ticker Bring back shadows on polyobjects Also optimizes the method used so rings can show their shadows too. Using just the subsector is a tad bit imprecise admittedly but any more precise methods get really laggy. Fix a bunch of ticking in hu_ drawing functions Revert "Reset overlays interp states each TryRunTics" This reverts commit a71a216faa20e8751b3bd0157354e8d748940c92. Move intro ticking out of the drawer Adjust 1up monitor icon z offsets Fixes interpolation issues with 1up monitors. Delta time choose player menu animations Add drawerlib deltaTime function Interpolate afterimages further back Use old sleep in dedicated mode Clamp cechotimer to 0 Fixes issues with cechos staying on-screen and glitching out (NiGHTS items for example). Revert "Remove unnecessary precipmobj thinker hack" This reverts commit 0e38208620d19ec2ab690740438ac2fc7862a49e. Fix frame pacing when game lags behind The frame timestamp should've been made at the start of the frame, not the end. Fix I_FrameCapSleep not respecting cpusleep Jonathan Joestar bruh Allow dedicated to use precise sleep timing again Instead of only using one old sleep, just enforce framerate cap to match TICRATE. Make Lua TeleportMove call MoveOrigin Reset Metal fume interp state on appear Add interpdebug Put interpdebug stuff in perfstats instead Add timescale cvar Slow the game down to debug animations / interpolation problems! Speed it up if you need to get somewhere quickly while mapping! Enable timescale outside of DEVELOP builds It has NETVAR, so it should be fine -- put an end to useful debugging features excluded in multiplayer! Force interpolation when timescale != 1.0 Reset old_z in MT_LOCKON think Fixes interpolation artifacting due to spawn pos. Fix cutscenes in interp Fix boss1 laser in interp Interpolate mobj scale Precalculate refresh rate Slower PCs can have issue querying mode over and over. This might kinda suck for windowed mode if you have different refresh rate displays but oh well Fix interp scaling crashing software Reset interp scale when Lua sets .scale Disable angle interp on fresh mobjs Fix interp scale crash for hires sprites Interp shadow scales Copy interp state in P_SpawnMobjFromMobj Fix multiplayer character select Don't interpolate mobj state if frac = 1.0 Fix Mario block item placement Interpolate spritescale/offset x/y Fix offset copies for SpawnMobjFromMobj THANKS SAL Add Lua HUD drawlists Buffers draw calls between tics to ensure hooks run at the originally intended rate. Rename drawerlib deltaTime to getDeltaTime Make renderisnewtic is false between tics I know what I'm doing! I swear Completely refactor timing system Time is now tracked internally in the game using I_GetPreciseTime and I_UpdateTime. I_Time now pulls from this internal timer. The system code no longer needs to keep track of time itself. This significantly improves frame and tic timing in interp mode, resulting in a much smoother image with essentially no judder at any framerate. Ensure mobj interpolators reset on level load Ensure view is not interpolated on first frame Disable sprite offset interpolation (for now) Refactor timing code even more System layer is greatly simplified and framecap logic has been moved internally. I_Sleep now takes a sleep duration and I_SleepDuration generically implements a precise sleep with spin loop.
2019-10-06 22:40:52 +00:00
multi_tics += 15*FRACUNIT;
Tweaks for kart v1 MR comments
2022-05-21 17:32:40 +00:00
else
multi_tics += multi_state->tics * FRACUNIT;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
// skin 0 is default player sprite
if (R_SkinAvailable(skins[setupm_fakeskin].name) != -1)
sprdef = &skins[R_SkinAvailable(skins[setupm_fakeskin].name)].spritedef;
else
sprdef = &skins[0].spritedef;
if (!sprdef->numframes) // No frames ??
return; // Can't render!
frame = multi_state->frame & FF_FRAMEMASK;
if (frame >= sprdef->numframes) // Walking animation missing
frame = 0; // Try to use standing frame
sprframe = &sprdef->spriteframes[frame];
Previous EXE: The Better Edition - Improve balloon-based items. Much more distinguished differences between the different ranks - Reverted Feather strafing. You can now just... properly move in the air, if you're using a Feather or a Bounce Pad. - Bounce pads are now stronger while using speed items. - Fixed the long standing bug about offroad & ziplines working when you're on FOFs above them. This is a tricky subject, so please report any issues you may come across related to this. - Shells should no longer travel to Mars, nor will they when using bounce pads. They should now do a gentle hop. - :WIP: new MP Player Setup screen, now shows character stats. Will later feature the list of characters in a row of icons, and a backported 2.2 color selector with toast's permission - Renamed "Match" to "Battle" :p - Yet MORE minor cases where kartspeed & kartweight were being read as fixed_t when they're freakin' UINT8's, people!
2017-11-28 06:13:23 +00:00
patch = W_CachePatchNum(sprframe->lumppat[1], PU_CACHE);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (sprframe->flip & 1) // Only for first sprite
flags |= V_FLIP; // This sprite is left/right flipped!
// draw box around guy
Tweak player setup menu.
2018-07-02 13:43:52 +00:00
V_DrawFill(mx + 43 - (charw/2), my+65, charw, 84, 239);
Previous EXE: The Better Edition - Improve balloon-based items. Much more distinguished differences between the different ranks - Reverted Feather strafing. You can now just... properly move in the air, if you're using a Feather or a Bounce Pad. - Bounce pads are now stronger while using speed items. - Fixed the long standing bug about offroad & ziplines working when you're on FOFs above them. This is a tricky subject, so please report any issues you may come across related to this. - Shells should no longer travel to Mars, nor will they when using bounce pads. They should now do a gentle hop. - :WIP: new MP Player Setup screen, now shows character stats. Will later feature the list of characters in a row of icons, and a backported 2.2 color selector with toast's permission - Renamed "Match" to "Battle" :p - Yet MORE minor cases where kartspeed & kartweight were being read as fixed_t when they're freakin' UINT8's, people!
2017-11-28 06:13:23 +00:00
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// draw player sprite
Tweak player setup menu.
2018-07-02 13:43:52 +00:00
if (setupm_fakecolor) // inverse should never happen
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Cache colormaps everywhere to avoid memory leaks
2019-03-16 05:39:52 +00:00
UINT8 *colormap = R_GetTranslationColormap(setupm_fakeskin, setupm_fakecolor, GTC_MENUCACHE);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
SRB2 2.1.9 release
2014-08-04 03:49:33 +00:00
if (skins[setupm_fakeskin].flags & SF_HIRES)
{
Tweak player setup menu.
2018-07-02 13:43:52 +00:00
V_DrawFixedPatch((mx+43)<<FRACBITS,
(my+131)<<FRACBITS,
SRB2 2.1.9 release
2014-08-04 03:49:33 +00:00
skins[setupm_fakeskin].highresscale,
flags, patch, colormap);
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
else
Tweak player setup menu.
2018-07-02 13:43:52 +00:00
V_DrawMappedPatch(mx+43, my+131, flags, patch, colormap);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
Further improved player setup Now has all of the features, maybe needs spacing tweaks
2017-11-28 21:57:38 +00:00
#undef charw
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
// Handle 1P/2P MP Setup
static void M_HandleSetupMultiPlayer(INT32 choice)
{
size_t l;
boolean exitmenu = false; // exit to previous menu and send name change
whoops Fixes stupid obvious mistakes and changes the prefcolor reset to item.
2019-05-12 09:22:34 +00:00
if ((choice == gamecontrol[gc_fire][0] || choice == gamecontrol[gc_fire][1]) && itemOn == 2)
choice = KEY_BACKSPACE; // Hack to allow resetting prefcolor on controllers
Have Look Back reset your color to prefcolor
2019-05-12 08:21:46 +00:00
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
switch (choice)
{
case KEY_DOWNARROW:
M_NextOpt();
S_StartSound(NULL,sfx_menu1); // Tails
break;
case KEY_UPARROW:
M_PrevOpt();
S_StartSound(NULL,sfx_menu1); // Tails
break;
case KEY_LEFTARROW:
Previous EXE: The Better Edition - Improve balloon-based items. Much more distinguished differences between the different ranks - Reverted Feather strafing. You can now just... properly move in the air, if you're using a Feather or a Bounce Pad. - Bounce pads are now stronger while using speed items. - Fixed the long standing bug about offroad & ziplines working when you're on FOFs above them. This is a tricky subject, so please report any issues you may come across related to this. - Shells should no longer travel to Mars, nor will they when using bounce pads. They should now do a gentle hop. - :WIP: new MP Player Setup screen, now shows character stats. Will later feature the list of characters in a row of icons, and a backported 2.2 color selector with toast's permission - Renamed "Match" to "Battle" :p - Yet MORE minor cases where kartspeed & kartweight were being read as fixed_t when they're freakin' UINT8's, people!
2017-11-28 06:13:23 +00:00
if (itemOn == 1) //player skin
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
S_StartSound(NULL,sfx_menu1); // Tails
setupm_fakeskin--;
}
Previous EXE: The Better Edition - Improve balloon-based items. Much more distinguished differences between the different ranks - Reverted Feather strafing. You can now just... properly move in the air, if you're using a Feather or a Bounce Pad. - Bounce pads are now stronger while using speed items. - Fixed the long standing bug about offroad & ziplines working when you're on FOFs above them. This is a tricky subject, so please report any issues you may come across related to this. - Shells should no longer travel to Mars, nor will they when using bounce pads. They should now do a gentle hop. - :WIP: new MP Player Setup screen, now shows character stats. Will later feature the list of characters in a row of icons, and a backported 2.2 color selector with toast's permission - Renamed "Match" to "Battle" :p - Yet MORE minor cases where kartspeed & kartweight were being read as fixed_t when they're freakin' UINT8's, people!
2017-11-28 06:13:23 +00:00
else if (itemOn == 2) // player color
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
S_StartSound(NULL,sfx_menu1); // Tails
setupm_fakecolor--;
}
break;
case KEY_RIGHTARROW:
Previous EXE: The Better Edition - Improve balloon-based items. Much more distinguished differences between the different ranks - Reverted Feather strafing. You can now just... properly move in the air, if you're using a Feather or a Bounce Pad. - Bounce pads are now stronger while using speed items. - Fixed the long standing bug about offroad & ziplines working when you're on FOFs above them. This is a tricky subject, so please report any issues you may come across related to this. - Shells should no longer travel to Mars, nor will they when using bounce pads. They should now do a gentle hop. - :WIP: new MP Player Setup screen, now shows character stats. Will later feature the list of characters in a row of icons, and a backported 2.2 color selector with toast's permission - Renamed "Match" to "Battle" :p - Yet MORE minor cases where kartspeed & kartweight were being read as fixed_t when they're freakin' UINT8's, people!
2017-11-28 06:13:23 +00:00
if (itemOn == 1) //player skin
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
S_StartSound(NULL,sfx_menu1); // Tails
setupm_fakeskin++;
}
Previous EXE: The Better Edition - Improve balloon-based items. Much more distinguished differences between the different ranks - Reverted Feather strafing. You can now just... properly move in the air, if you're using a Feather or a Bounce Pad. - Bounce pads are now stronger while using speed items. - Fixed the long standing bug about offroad & ziplines working when you're on FOFs above them. This is a tricky subject, so please report any issues you may come across related to this. - Shells should no longer travel to Mars, nor will they when using bounce pads. They should now do a gentle hop. - :WIP: new MP Player Setup screen, now shows character stats. Will later feature the list of characters in a row of icons, and a backported 2.2 color selector with toast's permission - Renamed "Match" to "Battle" :p - Yet MORE minor cases where kartspeed & kartweight were being read as fixed_t when they're freakin' UINT8's, people!
2017-11-28 06:13:23 +00:00
else if (itemOn == 2) // player color
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
S_StartSound(NULL,sfx_menu1); // Tails
setupm_fakecolor++;
}
break;
case KEY_ESCAPE:
exitmenu = true;
break;
case KEY_BACKSPACE:
Fix a bunch of issues with record attack! * Fixed the issue where your runs would be saved as belonging to the wrong character. * Make the Ghost menu always visible. This isn't PERFECT, but it's better than hiding the option to toggle ghosts just because you're doing your first run as a new character. * Fix the number of laps carrying over from MP(!!!!!!!!! plugged a huge security hole for the authenticity of replays...) Other stuff! * Hide map hell maps in the statistics. * Clean up some nonet stuff in the menu. * Put player setup last again, and tweaked its wording. * Disable the special Kart waiting for players behaviour when not playing a netgame - seeing a double gamestate transition in record attack is weird.
2018-07-06 17:08:35 +00:00
if (itemOn == 0)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Fix a bunch of issues with record attack! * Fixed the issue where your runs would be saved as belonging to the wrong character. * Make the Ghost menu always visible. This isn't PERFECT, but it's better than hiding the option to toggle ghosts just because you're doing your first run as a new character. * Fix the number of laps carrying over from MP(!!!!!!!!! plugged a huge security hole for the authenticity of replays...) Other stuff! * Hide map hell maps in the statistics. * Clean up some nonet stuff in the menu. * Put player setup last again, and tweaked its wording. * Disable the special Kart waiting for players behaviour when not playing a netgame - seeing a double gamestate transition in record attack is weird.
2018-07-06 17:08:35 +00:00
if ((l = strlen(setupm_name))!=0)
{
S_StartSound(NULL,sfx_menu1); // Tails
setupm_name[l-1] =0;
}
}
else if (itemOn == 2)
{
UINT8 col = skins[setupm_fakeskin].prefcolor;
if (setupm_fakecolor != col)
{
S_StartSound(NULL,sfx_menu1); // Tails
setupm_fakecolor = col;
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
break;
Don't look at this commit too closely until after netgame, I want to surprise yalls!! * Lots of menu changes! * Little arrows next to changeable cvars! * Show default value for sliders! * Pretty pretty pretty. * I don't know how to describe some of these changes. * Effectively nuke MIDI music support! * Skiddown at the start of a race is more interesting! * Spinning in waterslides! * Tiny bugfix in voting, plus a little celebration...
2018-06-30 22:18:13 +00:00
case KEY_DEL:
if (itemOn == 0 && (l = strlen(setupm_name))!=0)
{
S_StartSound(NULL,sfx_menu1); // Tails
setupm_name[0] = 0;
}
break;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
default:
if (choice < 32 || choice > 127 || itemOn != 0)
break;
l = strlen(setupm_name);
fix the multiplayer menu not allowing the full max length for player names unlike the "name" console command
2018-06-26 16:46:04 +00:00
if (l < MAXPLAYERNAME)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
S_StartSound(NULL,sfx_menu1); // Tails
setupm_name[l] =(char)choice;
setupm_name[l+1] =0;
}
break;
}
// check skin
if (setupm_fakeskin < 0)
setupm_fakeskin = numskins-1;
if (setupm_fakeskin > numskins-1)
setupm_fakeskin = 0;
// check color
if (setupm_fakecolor < 1)
setupm_fakecolor = MAXSKINCOLORS-1;
if (setupm_fakecolor > MAXSKINCOLORS-1)
setupm_fakecolor = 1;
if (exitmenu)
{
if (currentMenu->prevMenu)
M_SetupNextMenu (currentMenu->prevMenu);
else
M_ClearMenus(true);
}
}
// start the multiplayer setup menu
static void M_SetupMultiPlayer(INT32 choice)
{
(void)choice;
multi_state = &states[mobjinfo[MT_PLAYER].seestate];
Implement Uncapped (squashed) Co-Authored-By: Sally Coolatta <tehrealsalt@gmail.com> Co-Authored-By: James R <justsomejames2@gmail.com> Co-Authored-By: Monster Iestyn <iestynjealous@ntlworld.com> Co-Authored-By: katsy <katmint@live.com> Place Frame Interpolation in "Experimental" video options header This seems like an appropriate way to describe the feature for now. Add smooth level platter under interpolation, `renderdeltatics` `renderdeltatics` can be used as a standard delta time in any place, allowing for smooth menus. It will always be equal to `realtics` when frame interpolation is turned off, producing consistent framerate behavior everywhere it is used. Add smooth rendering to save select screen Add smooth rendering to Record/NiGHTS Attack, F_SkyScroll Ensure viewsector is accurate to viewx/viewy This fixes a potential crash in OpenGL when changing between levels. Ensure + commands get executed before map start Always have precise_t defined Fix misc dropshadow issues Reset view interpolation on level load Remove unnecessary precipmobj thinker hack Add reset interpolation state functions Reset precip interpolation on snap to ceil Reset mobj interp state on TeleportMove Only swap view interp state if a tick is run Run anti-lag chasecam at tic frequency Fixes jittery and unstable chasecam in high latency netgames Homogenize mobj interpolations Add sector plane level interpolations Add SectorScroll interpolator Add SideScroll interpolator Add Polyobj interpolator Intialize interpolator list at a better time Delete interpolators associated with thinkers Interpolate mobj angles and player drawangle Interpolate HWR_DrawModel Add functions to handle interpolation Much less code duplication P_InitAngle, to fix angle interpolation on spawning objects Fully fix drop shadows It used the thing's floorz / ceilingz directly -- that wouldn't account for interpolated coordinates. Do not speed up underwater/heatwave effect in OpenGL Closer OpenGL underwater/heatwave effect to Software Interpolate from time of previous tic Previously interpolated from last 35th of a second, which may be offset from game time due to connection lag. Consider this the proper fix to 54148a0dd0 too. Calculate FPS stuff even if frame is skipped I decided ultimately to actually keep the frame skip optimization disabled, because I think it is actually a little bit helpful that you can still get accurate rendering perfstats while paused, however if we decide otherwise then we can have this optimization back without making the game act like it's lagging. Keep rect in memory Feel better about this than creating one all da time Lots of FPS stuff - Disabled VSync, due to the numerous problems it has. - Instead, added an FPS cap. - Frame interpolation is now tied to fpscap != 35. - By default, the FPS cap is set to the monitor's refresh rate. - Rewrote the FPS counter. (This also consolidates several more commits ahead of this fixing various issues. -eid) Misc changes after Kart cherry-picks Fix renderdeltatics with new timing data Update mobj oldstates before all thinkers Allow FPS cap values Adjust how FPS cap is checked to improve FPS stability Fix precip crash from missing vars Improve the framerate limiter's timing for extreme stable FPS Handle the sleep at the end of D_SRB2Loop instead of the start Simplifies logic in the other parts of the loop, and fixes problems with it frequently waiting too long. Reset mobj interp state on add Add mobj interpolator on load netgame Move mobj interpolators to r_fps Dynamic slope interpolators I_GetFrameTime to try and improve frame pace (It doesn't feel that much better though.) Move I_FinishUpdate to D_SRB2Loop to sync screen updates with FPS cap, use timestamps in I_FrameCapSleep to simplify the code Fix plane interpolation light level flickering Fix flickering plane interpolation for OpenGL in the exact same way Funny OpenGL renderer being at least 50% copy-pasted Software code :) P_SetOrigin & P_MoveOrigin to replace P_TeleportMove Convert P_TeleportMove use to origin funcs Revert "P_InitAngle, to fix angle interpolation on spawning objects" This reverts commit a80c98bd164a2748cbbfad9027b34601185d93f5. Waypoint polyobjects interpolate z & children Add interpolation to more moving plane types Adds interpolation to the following: - Crumbling platforms - Mario blocks - Floatbob platforms (this one works really strangely due to two thinkers, maybe double-check this one?) Reset overlays interp states each TryRunTics Interpolate model interpolation (lol) Use interp tracer pos for GL linkdraw Papersprite angle interpolation Makes the ending signpost smooth Move intermission emerald bounce to ticker Bring back shadows on polyobjects Also optimizes the method used so rings can show their shadows too. Using just the subsector is a tad bit imprecise admittedly but any more precise methods get really laggy. Fix a bunch of ticking in hu_ drawing functions Revert "Reset overlays interp states each TryRunTics" This reverts commit a71a216faa20e8751b3bd0157354e8d748940c92. Move intro ticking out of the drawer Adjust 1up monitor icon z offsets Fixes interpolation issues with 1up monitors. Delta time choose player menu animations Add drawerlib deltaTime function Interpolate afterimages further back Use old sleep in dedicated mode Clamp cechotimer to 0 Fixes issues with cechos staying on-screen and glitching out (NiGHTS items for example). Revert "Remove unnecessary precipmobj thinker hack" This reverts commit 0e38208620d19ec2ab690740438ac2fc7862a49e. Fix frame pacing when game lags behind The frame timestamp should've been made at the start of the frame, not the end. Fix I_FrameCapSleep not respecting cpusleep Jonathan Joestar bruh Allow dedicated to use precise sleep timing again Instead of only using one old sleep, just enforce framerate cap to match TICRATE. Make Lua TeleportMove call MoveOrigin Reset Metal fume interp state on appear Add interpdebug Put interpdebug stuff in perfstats instead Add timescale cvar Slow the game down to debug animations / interpolation problems! Speed it up if you need to get somewhere quickly while mapping! Enable timescale outside of DEVELOP builds It has NETVAR, so it should be fine -- put an end to useful debugging features excluded in multiplayer! Force interpolation when timescale != 1.0 Reset old_z in MT_LOCKON think Fixes interpolation artifacting due to spawn pos. Fix cutscenes in interp Fix boss1 laser in interp Interpolate mobj scale Precalculate refresh rate Slower PCs can have issue querying mode over and over. This might kinda suck for windowed mode if you have different refresh rate displays but oh well Fix interp scaling crashing software Reset interp scale when Lua sets .scale Disable angle interp on fresh mobjs Fix interp scale crash for hires sprites Interp shadow scales Copy interp state in P_SpawnMobjFromMobj Fix multiplayer character select Don't interpolate mobj state if frac = 1.0 Fix Mario block item placement Interpolate spritescale/offset x/y Fix offset copies for SpawnMobjFromMobj THANKS SAL Add Lua HUD drawlists Buffers draw calls between tics to ensure hooks run at the originally intended rate. Rename drawerlib deltaTime to getDeltaTime Make renderisnewtic is false between tics I know what I'm doing! I swear Completely refactor timing system Time is now tracked internally in the game using I_GetPreciseTime and I_UpdateTime. I_Time now pulls from this internal timer. The system code no longer needs to keep track of time itself. This significantly improves frame and tic timing in interp mode, resulting in a much smoother image with essentially no judder at any framerate. Ensure mobj interpolators reset on level load Ensure view is not interpolated on first frame Disable sprite offset interpolation (for now) Refactor timing code even more System layer is greatly simplified and framecap logic has been moved internally. I_Sleep now takes a sleep duration and I_SleepDuration generically implements a precise sleep with spin loop.
2019-10-06 22:40:52 +00:00
multi_tics = multi_state->tics*FRACUNIT;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
strcpy(setupm_name, cv_playername.string);
// set for player 1
setupm_player = &players[consoleplayer];
setupm_cvskin = &cv_skin;
setupm_cvcolor = &cv_playercolor;
setupm_cvname = &cv_playername;
// For whatever reason this doesn't work right if you just use ->value
setupm_fakeskin = R_SkinAvailable(setupm_cvskin->string);
if (setupm_fakeskin == -1)
setupm_fakeskin = 0;
setupm_fakecolor = setupm_cvcolor->value;
// disable skin changes if we can't actually change skins
if (!CanChangeSkin(consoleplayer))
MP_PlayerSetupMenu[2].status = (IT_GRAYEDOUT);
else
MP_PlayerSetupMenu[2].status = (IT_KEYHANDLER|IT_STRING);
MP_PlayerSetupDef.prevMenu = currentMenu;
M_SetupNextMenu(&MP_PlayerSetupDef);
}
// start the multiplayer setup menu, for secondary player (splitscreen mode)
static void M_SetupMultiPlayer2(INT32 choice)
{
(void)choice;
multi_state = &states[mobjinfo[MT_PLAYER].seestate];
Implement Uncapped (squashed) Co-Authored-By: Sally Coolatta <tehrealsalt@gmail.com> Co-Authored-By: James R <justsomejames2@gmail.com> Co-Authored-By: Monster Iestyn <iestynjealous@ntlworld.com> Co-Authored-By: katsy <katmint@live.com> Place Frame Interpolation in "Experimental" video options header This seems like an appropriate way to describe the feature for now. Add smooth level platter under interpolation, `renderdeltatics` `renderdeltatics` can be used as a standard delta time in any place, allowing for smooth menus. It will always be equal to `realtics` when frame interpolation is turned off, producing consistent framerate behavior everywhere it is used. Add smooth rendering to save select screen Add smooth rendering to Record/NiGHTS Attack, F_SkyScroll Ensure viewsector is accurate to viewx/viewy This fixes a potential crash in OpenGL when changing between levels. Ensure + commands get executed before map start Always have precise_t defined Fix misc dropshadow issues Reset view interpolation on level load Remove unnecessary precipmobj thinker hack Add reset interpolation state functions Reset precip interpolation on snap to ceil Reset mobj interp state on TeleportMove Only swap view interp state if a tick is run Run anti-lag chasecam at tic frequency Fixes jittery and unstable chasecam in high latency netgames Homogenize mobj interpolations Add sector plane level interpolations Add SectorScroll interpolator Add SideScroll interpolator Add Polyobj interpolator Intialize interpolator list at a better time Delete interpolators associated with thinkers Interpolate mobj angles and player drawangle Interpolate HWR_DrawModel Add functions to handle interpolation Much less code duplication P_InitAngle, to fix angle interpolation on spawning objects Fully fix drop shadows It used the thing's floorz / ceilingz directly -- that wouldn't account for interpolated coordinates. Do not speed up underwater/heatwave effect in OpenGL Closer OpenGL underwater/heatwave effect to Software Interpolate from time of previous tic Previously interpolated from last 35th of a second, which may be offset from game time due to connection lag. Consider this the proper fix to 54148a0dd0 too. Calculate FPS stuff even if frame is skipped I decided ultimately to actually keep the frame skip optimization disabled, because I think it is actually a little bit helpful that you can still get accurate rendering perfstats while paused, however if we decide otherwise then we can have this optimization back without making the game act like it's lagging. Keep rect in memory Feel better about this than creating one all da time Lots of FPS stuff - Disabled VSync, due to the numerous problems it has. - Instead, added an FPS cap. - Frame interpolation is now tied to fpscap != 35. - By default, the FPS cap is set to the monitor's refresh rate. - Rewrote the FPS counter. (This also consolidates several more commits ahead of this fixing various issues. -eid) Misc changes after Kart cherry-picks Fix renderdeltatics with new timing data Update mobj oldstates before all thinkers Allow FPS cap values Adjust how FPS cap is checked to improve FPS stability Fix precip crash from missing vars Improve the framerate limiter's timing for extreme stable FPS Handle the sleep at the end of D_SRB2Loop instead of the start Simplifies logic in the other parts of the loop, and fixes problems with it frequently waiting too long. Reset mobj interp state on add Add mobj interpolator on load netgame Move mobj interpolators to r_fps Dynamic slope interpolators I_GetFrameTime to try and improve frame pace (It doesn't feel that much better though.) Move I_FinishUpdate to D_SRB2Loop to sync screen updates with FPS cap, use timestamps in I_FrameCapSleep to simplify the code Fix plane interpolation light level flickering Fix flickering plane interpolation for OpenGL in the exact same way Funny OpenGL renderer being at least 50% copy-pasted Software code :) P_SetOrigin & P_MoveOrigin to replace P_TeleportMove Convert P_TeleportMove use to origin funcs Revert "P_InitAngle, to fix angle interpolation on spawning objects" This reverts commit a80c98bd164a2748cbbfad9027b34601185d93f5. Waypoint polyobjects interpolate z & children Add interpolation to more moving plane types Adds interpolation to the following: - Crumbling platforms - Mario blocks - Floatbob platforms (this one works really strangely due to two thinkers, maybe double-check this one?) Reset overlays interp states each TryRunTics Interpolate model interpolation (lol) Use interp tracer pos for GL linkdraw Papersprite angle interpolation Makes the ending signpost smooth Move intermission emerald bounce to ticker Bring back shadows on polyobjects Also optimizes the method used so rings can show their shadows too. Using just the subsector is a tad bit imprecise admittedly but any more precise methods get really laggy. Fix a bunch of ticking in hu_ drawing functions Revert "Reset overlays interp states each TryRunTics" This reverts commit a71a216faa20e8751b3bd0157354e8d748940c92. Move intro ticking out of the drawer Adjust 1up monitor icon z offsets Fixes interpolation issues with 1up monitors. Delta time choose player menu animations Add drawerlib deltaTime function Interpolate afterimages further back Use old sleep in dedicated mode Clamp cechotimer to 0 Fixes issues with cechos staying on-screen and glitching out (NiGHTS items for example). Revert "Remove unnecessary precipmobj thinker hack" This reverts commit 0e38208620d19ec2ab690740438ac2fc7862a49e. Fix frame pacing when game lags behind The frame timestamp should've been made at the start of the frame, not the end. Fix I_FrameCapSleep not respecting cpusleep Jonathan Joestar bruh Allow dedicated to use precise sleep timing again Instead of only using one old sleep, just enforce framerate cap to match TICRATE. Make Lua TeleportMove call MoveOrigin Reset Metal fume interp state on appear Add interpdebug Put interpdebug stuff in perfstats instead Add timescale cvar Slow the game down to debug animations / interpolation problems! Speed it up if you need to get somewhere quickly while mapping! Enable timescale outside of DEVELOP builds It has NETVAR, so it should be fine -- put an end to useful debugging features excluded in multiplayer! Force interpolation when timescale != 1.0 Reset old_z in MT_LOCKON think Fixes interpolation artifacting due to spawn pos. Fix cutscenes in interp Fix boss1 laser in interp Interpolate mobj scale Precalculate refresh rate Slower PCs can have issue querying mode over and over. This might kinda suck for windowed mode if you have different refresh rate displays but oh well Fix interp scaling crashing software Reset interp scale when Lua sets .scale Disable angle interp on fresh mobjs Fix interp scale crash for hires sprites Interp shadow scales Copy interp state in P_SpawnMobjFromMobj Fix multiplayer character select Don't interpolate mobj state if frac = 1.0 Fix Mario block item placement Interpolate spritescale/offset x/y Fix offset copies for SpawnMobjFromMobj THANKS SAL Add Lua HUD drawlists Buffers draw calls between tics to ensure hooks run at the originally intended rate. Rename drawerlib deltaTime to getDeltaTime Make renderisnewtic is false between tics I know what I'm doing! I swear Completely refactor timing system Time is now tracked internally in the game using I_GetPreciseTime and I_UpdateTime. I_Time now pulls from this internal timer. The system code no longer needs to keep track of time itself. This significantly improves frame and tic timing in interp mode, resulting in a much smoother image with essentially no judder at any framerate. Ensure mobj interpolators reset on level load Ensure view is not interpolated on first frame Disable sprite offset interpolation (for now) Refactor timing code even more System layer is greatly simplified and framecap logic has been moved internally. I_Sleep now takes a sleep duration and I_SleepDuration generically implements a precise sleep with spin loop.
2019-10-06 22:40:52 +00:00
multi_tics = multi_state->tics*FRACUNIT;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
strcpy (setupm_name, cv_playername2.string);
// set for splitscreen secondary player
Huge splitscreen refactor Did not get to finish all refactoring or even compile this, I'll continue later
2019-04-18 07:08:11 +00:00
setupm_player = &players[displayplayers[1]];
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
setupm_cvskin = &cv_skin2;
setupm_cvcolor = &cv_playercolor2;
setupm_cvname = &cv_playername2;
// For whatever reason this doesn't work right if you just use ->value
setupm_fakeskin = R_SkinAvailable(setupm_cvskin->string);
if (setupm_fakeskin == -1)
setupm_fakeskin = 0;
setupm_fakecolor = setupm_cvcolor->value;
// disable skin changes if we can't actually change skins
Huge splitscreen refactor Did not get to finish all refactoring or even compile this, I'll continue later
2019-04-18 07:08:11 +00:00
if (splitscreen && !CanChangeSkin(displayplayers[1]))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
MP_PlayerSetupMenu[2].status = (IT_GRAYEDOUT);
else
MP_PlayerSetupMenu[2].status = (IT_KEYHANDLER | IT_STRING);
MP_PlayerSetupDef.prevMenu = currentMenu;
M_SetupNextMenu(&MP_PlayerSetupDef);
}
initial quad stuff (does not work)
2017-12-08 07:29:01 +00:00
// start the multiplayer setup menu, for third player (splitscreen mode)
static void M_SetupMultiPlayer3(INT32 choice)
{
(void)choice;
multi_state = &states[mobjinfo[MT_PLAYER].seestate];
multi_tics = multi_state->tics;
strcpy(setupm_name, cv_playername3.string);
// set for splitscreen third player
Huge splitscreen refactor Did not get to finish all refactoring or even compile this, I'll continue later
2019-04-18 07:08:11 +00:00
setupm_player = &players[displayplayers[2]];
initial quad stuff (does not work)
2017-12-08 07:29:01 +00:00
setupm_cvskin = &cv_skin3;
setupm_cvcolor = &cv_playercolor3;
setupm_cvname = &cv_playername3;
// For whatever reason this doesn't work right if you just use ->value
setupm_fakeskin = R_SkinAvailable(setupm_cvskin->string);
if (setupm_fakeskin == -1)
setupm_fakeskin = 0;
setupm_fakecolor = setupm_cvcolor->value;
// disable skin changes if we can't actually change skins
Huge splitscreen refactor Did not get to finish all refactoring or even compile this, I'll continue later
2019-04-18 07:08:11 +00:00
if (splitscreen > 1 && !CanChangeSkin(displayplayers[2]))
initial quad stuff (does not work)
2017-12-08 07:29:01 +00:00
MP_PlayerSetupMenu[2].status = (IT_GRAYEDOUT);
else
MP_PlayerSetupMenu[2].status = (IT_KEYHANDLER | IT_STRING);
MP_PlayerSetupDef.prevMenu = currentMenu;
M_SetupNextMenu(&MP_PlayerSetupDef);
}
// start the multiplayer setup menu, for third player (splitscreen mode)
static void M_SetupMultiPlayer4(INT32 choice)
{
(void)choice;
multi_state = &states[mobjinfo[MT_PLAYER].seestate];
multi_tics = multi_state->tics;
strcpy(setupm_name, cv_playername4.string);
// set for splitscreen fourth player
Huge splitscreen refactor Did not get to finish all refactoring or even compile this, I'll continue later
2019-04-18 07:08:11 +00:00
setupm_player = &players[displayplayers[3]];
initial quad stuff (does not work)
2017-12-08 07:29:01 +00:00
setupm_cvskin = &cv_skin4;
setupm_cvcolor = &cv_playercolor4;
setupm_cvname = &cv_playername4;
// For whatever reason this doesn't work right if you just use ->value
setupm_fakeskin = R_SkinAvailable(setupm_cvskin->string);
if (setupm_fakeskin == -1)
setupm_fakeskin = 0;
setupm_fakecolor = setupm_cvcolor->value;
// disable skin changes if we can't actually change skins
Huge splitscreen refactor Did not get to finish all refactoring or even compile this, I'll continue later
2019-04-18 07:08:11 +00:00
if (splitscreen > 2 && !CanChangeSkin(displayplayers[3]))
initial quad stuff (does not work)
2017-12-08 07:29:01 +00:00
MP_PlayerSetupMenu[2].status = (IT_GRAYEDOUT);
else
MP_PlayerSetupMenu[2].status = (IT_KEYHANDLER | IT_STRING);
MP_PlayerSetupDef.prevMenu = currentMenu;
M_SetupNextMenu(&MP_PlayerSetupDef);
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
static boolean M_QuitMultiPlayerMenu(void)
{
size_t l;
// send name if changed
if (strcmp(setupm_name, setupm_cvname->string))
{
// remove trailing whitespaces
for (l= strlen(setupm_name)-1;
(signed)l >= 0 && setupm_name[l] ==' '; l--)
setupm_name[l] =0;
COM_BufAddText (va("%s \"%s\"\n",setupm_cvname->name,setupm_name));
}
// you know what? always putting these in the buffer won't hurt anything.
COM_BufAddText (va("%s \"%s\"\n",setupm_cvskin->name,skins[setupm_fakeskin].name));
COM_BufAddText (va("%s %d\n",setupm_cvcolor->name,setupm_fakecolor));
return true;
}
// =================
// DATA OPTIONS MENU
// =================
static UINT8 erasecontext = 0;
static void M_EraseDataResponse(INT32 ch)
{
if (ch != 'y' && ch != KEY_ENTER)
return;
final menu tweaks before i fall asleep in my chair
2018-11-14 01:27:01 +00:00
S_StartSound(NULL, sfx_itrole); // bweh heh heh
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Delete the data
if (erasecontext == 2)
{
Some tweaking - Swap order of Silver & Gold, for menu appearances & bug fixing - Ensure that totalplaytime and matchesplayed aren't kept when M_ClearSecrets getss called in M_EraseDataResponse - Set sensible defaults for emblem sprite/color
2018-11-12 22:09:37 +00:00
// SRB2Kart: This actually needs to be done FIRST, so that you don't immediately regain playtime/matches secrets
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
totalplaytime = 0;
Lots of changes - Menus now have all of the Kart cvars - Removed any cvars that aren't useful for Kart from the menu (they still exist in the console, though) - Removed SP and NiGHTS Mode options from the main menu - "kartcc" is renamed "kartspeed", uses values 0-2 instead of multiples of 50, or the terms "Relaxed", "Standard", and "Turbo" - Many gametype options (game speed, frantic, mirror, & karma comeback) are now changed on map load instead of instantly - New cvar, "kartminimap", for disabling the minimap - The maxplayers cvar now actually matches up with our 16 player limit - Game now keeps track of matches played. Has a condition type associated with it, as well. - Game checks for unlocks and saves gamedata when finishing a match, even in MP - Removed most of the normal emblems, added a single emblem for Green Hills. Didn't know what to do with extra emblems and such so I just left them (FOR NOW c:<)
2018-01-16 03:31:14 +00:00
matchesplayed = 0;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
F_StartIntro();
}
Some tweaking - Swap order of Silver & Gold, for menu appearances & bug fixing - Ensure that totalplaytime and matchesplayed aren't kept when M_ClearSecrets getss called in M_EraseDataResponse - Set sensible defaults for emblem sprite/color
2018-11-12 22:09:37 +00:00
if (erasecontext != 1)
G_ClearRecords();
if (erasecontext != 0)
M_ClearSecrets();
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
M_ClearMenus(true);
}
static void M_EraseData(INT32 choice)
{
const char *eschoice, *esstr = M_GetText("Are you sure you want to erase\n%s?\n\n(Press 'Y' to confirm)\n");
erasecontext = (UINT8)choice;
if (choice == 0)
eschoice = M_GetText("Record Attack data");
else if (choice == 1)
eschoice = M_GetText("Secrets data");
else
eschoice = M_GetText("ALL game data");
M_StartMessage(va(esstr, eschoice),M_EraseDataResponse,MM_YESNO);
}
static void M_ScreenshotOptions(INT32 choice)
{
(void)choice;
Screenshot_option_Onchange();
Moviemode_mode_Onchange();
M_SetupNextMenu(&OP_ScreenshotOptionsDef);
}
// =============
// JOYSTICK MENU
// =============
// Start the controls menu, setting it up for either the console player,
// or the secondary splitscreen player
static void M_DrawJoystick(void)
{
Merge remote-tracking branch 'remotes/SRB2/vanilla-hotplug-stableid' into gamepad-tweaks # Conflicts: # src/command.c # src/command.h # src/g_game.c # src/m_menu.c # src/sdl/i_system.c # src/sdl/i_video.c # src/sdl/sdlmain.h This is NOT just a normal merge commit. I have adjusted the hotplugging code from stableid to account for the last two players, and also removed new 2.1 additions that were deemed irrelevant to Kart.
2018-12-27 22:21:51 +00:00
INT32 i, compareval4, compareval3, compareval2, compareval;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
M_DrawGenericMenu();
Fix joystick menu drawing (also it was impossible to pick the 8th joystick, what's up with that?!)
2018-07-03 20:18:17 +00:00
for (i = 0; i < 8; i++)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Fix up controller menu support
2018-12-02 01:13:14 +00:00
M_DrawTextBox(OP_JoystickSetDef.x-8, OP_JoystickSetDef.y+LINEHEIGHT*i-12, 28, 1);
//M_DrawSaveLoadBorder(OP_JoystickSetDef.x, OP_JoystickSetDef.y+LINEHEIGHT*i);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Display "joystick used" prompt correctly if setting use_joystick from an old value > I_NumJoys()
2018-12-14 10:31:47 +00:00
#ifdef JOYSTICK_HOTPLUG
Merge remote-tracking branch 'remotes/SRB2/vanilla-hotplug-stableid' into gamepad-tweaks # Conflicts: # src/command.c # src/command.h # src/g_game.c # src/m_menu.c # src/sdl/i_system.c # src/sdl/i_video.c # src/sdl/sdlmain.h This is NOT just a normal merge commit. I have adjusted the hotplugging code from stableid to account for the last two players, and also removed new 2.1 additions that were deemed irrelevant to Kart.
2018-12-27 22:21:51 +00:00
if (atoi(cv_usejoystick4.string) > I_NumJoys())
compareval4 = atoi(cv_usejoystick4.string);
else
compareval4 = cv_usejoystick4.value;
if (atoi(cv_usejoystick3.string) > I_NumJoys())
compareval3 = atoi(cv_usejoystick3.string);
else
compareval3 = cv_usejoystick3.value;
Display "joystick used" prompt correctly if setting use_joystick from an old value > I_NumJoys()
2018-12-14 10:31:47 +00:00
if (atoi(cv_usejoystick2.string) > I_NumJoys())
compareval2 = atoi(cv_usejoystick2.string);
else
compareval2 = cv_usejoystick2.value;
if (atoi(cv_usejoystick.string) > I_NumJoys())
compareval = atoi(cv_usejoystick.string);
else
compareval = cv_usejoystick.value;
#else
Merge remote-tracking branch 'remotes/SRB2/vanilla-hotplug-stableid' into gamepad-tweaks # Conflicts: # src/command.c # src/command.h # src/g_game.c # src/m_menu.c # src/sdl/i_system.c # src/sdl/i_video.c # src/sdl/sdlmain.h This is NOT just a normal merge commit. I have adjusted the hotplugging code from stableid to account for the last two players, and also removed new 2.1 additions that were deemed irrelevant to Kart.
2018-12-27 22:21:51 +00:00
compareval4 = cv_usejoystick4.value;
compareval3 = cv_usejoystick3.value;
Display "joystick used" prompt correctly if setting use_joystick from an old value > I_NumJoys()
2018-12-14 10:31:47 +00:00
compareval2 = cv_usejoystick2.value;
compareval = cv_usejoystick.value
#endif
Merge remote-tracking branch 'remotes/SRB2/vanilla-hotplug-stableid' into gamepad-tweaks # Conflicts: # src/command.c # src/command.h # src/g_game.c # src/m_menu.c # src/sdl/i_system.c # src/sdl/i_video.c # src/sdl/sdlmain.h This is NOT just a normal merge commit. I have adjusted the hotplugging code from stableid to account for the last two players, and also removed new 2.1 additions that were deemed irrelevant to Kart.
2018-12-27 22:21:51 +00:00
if ((setupcontrolplayer == 4 && (i == compareval4))
|| (setupcontrolplayer == 3 && (i == compareval3))
|| (setupcontrolplayer == 2 && (i == compareval2))
|| (setupcontrolplayer == 1 && (i == compareval)))
Fix up controller menu support
2018-12-02 01:13:14 +00:00
V_DrawString(OP_JoystickSetDef.x, OP_JoystickSetDef.y+LINEHEIGHT*i-4,V_GREENMAP,joystickInfo[i]);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
else
Fix up controller menu support
2018-12-02 01:13:14 +00:00
V_DrawString(OP_JoystickSetDef.x, OP_JoystickSetDef.y+LINEHEIGHT*i-4,0,joystickInfo[i]);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
}
Controller hotplugging by always keeping joy subsystem on (thanks WOLFS) (with log messages)
2018-12-06 15:54:58 +00:00
void M_SetupJoystickMenu(INT32 choice)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
INT32 i = 0;
const char *joyNA = "Unavailable";
INT32 n = I_NumJoys();
(void)choice;
One small change
2018-12-03 18:32:24 +00:00
strcpy(joystickInfo[i], "None");
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
for (i = 1; i < 8; i++)
{
Fix up controller menu support
2018-12-02 01:13:14 +00:00
if (i <= n && (I_GetJoyName(i)) != NULL)
strncpy(joystickInfo[i], I_GetJoyName(i), 28);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
else
strcpy(joystickInfo[i], joyNA);
Lots of changes to better support hotplugging and unstable device indexes * Don't save cv_usejoystick/2 because hotplugging changes can be made invalid by next run * Properly set cv_usejoystick/2 for menu toggling * Force-disable a player's joystick if setting another player's joystick to the same device * Properly set cv_usejoystick/2 value of BOTH target player AND other players when hotplugging and unplugging
2018-12-14 08:58:07 +00:00
#ifdef JOYSTICK_HOTPLUG
// We use cv_usejoystick.string as the USER-SET var
// and cv_usejoystick.value as the INTERNAL var
//
// In practice, if cv_usejoystick.string == 0, this overrides
// cv_usejoystick.value and always disables
//
// Update cv_usejoystick.string here so that the user can
// properly change this value.
if (i == cv_usejoystick.value)
CV_SetValue(&cv_usejoystick, i);
if (i == cv_usejoystick2.value)
CV_SetValue(&cv_usejoystick2, i);
Merge remote-tracking branch 'remotes/SRB2/vanilla-hotplug-stableid' into gamepad-tweaks # Conflicts: # src/command.c # src/command.h # src/g_game.c # src/m_menu.c # src/sdl/i_system.c # src/sdl/i_video.c # src/sdl/sdlmain.h This is NOT just a normal merge commit. I have adjusted the hotplugging code from stableid to account for the last two players, and also removed new 2.1 additions that were deemed irrelevant to Kart.
2018-12-27 22:21:51 +00:00
if (i == cv_usejoystick3.value)
CV_SetValue(&cv_usejoystick3, i);
if (i == cv_usejoystick4.value)
CV_SetValue(&cv_usejoystick4, i);
Lots of changes to better support hotplugging and unstable device indexes * Don't save cv_usejoystick/2 because hotplugging changes can be made invalid by next run * Properly set cv_usejoystick/2 for menu toggling * Force-disable a player's joystick if setting another player's joystick to the same device * Properly set cv_usejoystick/2 value of BOTH target player AND other players when hotplugging and unplugging
2018-12-14 08:58:07 +00:00
#endif
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
M_SetupNextMenu(&OP_JoystickSetDef);
}
static void M_Setup1PJoystickMenu(INT32 choice)
{
Reset to defaults option in controls
2018-11-23 03:50:40 +00:00
setupcontrolplayer = 1;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
OP_JoystickSetDef.prevMenu = &OP_Joystick1Def;
M_SetupJoystickMenu(choice);
}
static void M_Setup2PJoystickMenu(INT32 choice)
{
Reset to defaults option in controls
2018-11-23 03:50:40 +00:00
setupcontrolplayer = 2;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
OP_JoystickSetDef.prevMenu = &OP_Joystick2Def;
M_SetupJoystickMenu(choice);
}
initial quad stuff (does not work)
2017-12-08 07:29:01 +00:00
static void M_Setup3PJoystickMenu(INT32 choice)
{
Reset to defaults option in controls
2018-11-23 03:50:40 +00:00
setupcontrolplayer = 3;
initial quad stuff (does not work)
2017-12-08 07:29:01 +00:00
OP_JoystickSetDef.prevMenu = &OP_Joystick3Def;
M_SetupJoystickMenu(choice);
}
static void M_Setup4PJoystickMenu(INT32 choice)
{
Fix an issue where gamepad options for player 4 ended up binding settings for player 3 instead.
2018-12-28 00:13:13 +00:00
setupcontrolplayer = 4;
initial quad stuff (does not work)
2017-12-08 07:29:01 +00:00
OP_JoystickSetDef.prevMenu = &OP_Joystick4Def;
M_SetupJoystickMenu(choice);
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
static void M_AssignJoystick(INT32 choice)
{
Don't override an already-active controller * Menu improvements to tell the user that they can't set a controller if it's already active
2018-12-14 10:02:41 +00:00
#ifdef JOYSTICK_HOTPLUG
Fix cv_usejoystick being reset to None when cv_usejoystick was > NumJoys and changing to already-used joystick
2018-12-14 11:05:31 +00:00
INT32 oldchoice, oldstringchoice;
Fix menu where cv_usejoystick.value > I_JoyNum and selecting an unused controller and the "used!" prompt pops up erroneously
2018-12-14 10:57:10 +00:00
INT32 numjoys = I_NumJoys();
Don't override an already-active controller * Menu improvements to tell the user that they can't set a controller if it's already active
2018-12-14 10:02:41 +00:00
Reset to defaults option in controls
2018-11-23 03:50:40 +00:00
if (setupcontrolplayer == 4)
Merge remote-tracking branch 'remotes/SRB2/vanilla-hotplug-stableid' into gamepad-tweaks # Conflicts: # src/command.c # src/command.h # src/g_game.c # src/m_menu.c # src/sdl/i_system.c # src/sdl/i_video.c # src/sdl/sdlmain.h This is NOT just a normal merge commit. I have adjusted the hotplugging code from stableid to account for the last two players, and also removed new 2.1 additions that were deemed irrelevant to Kart.
2018-12-27 22:21:51 +00:00
{
oldchoice = oldstringchoice = atoi(cv_usejoystick4.string) > numjoys ? atoi(cv_usejoystick4.string) : cv_usejoystick4.value;
some joystick fixes Turns out P3/P4 controllers are broken (and still are)
2017-12-24 13:20:58 +00:00
CV_SetValue(&cv_usejoystick4, choice);
Merge remote-tracking branch 'remotes/SRB2/vanilla-hotplug-stableid' into gamepad-tweaks # Conflicts: # src/command.c # src/command.h # src/g_game.c # src/m_menu.c # src/sdl/i_system.c # src/sdl/i_video.c # src/sdl/sdlmain.h This is NOT just a normal merge commit. I have adjusted the hotplugging code from stableid to account for the last two players, and also removed new 2.1 additions that were deemed irrelevant to Kart.
2018-12-27 22:21:51 +00:00
// Just in case last-minute changes were made to cv_usejoystick.value,
// update the string too
// But don't do this if we're intentionally setting higher than numjoys
if (choice <= numjoys)
{
CV_SetValue(&cv_usejoystick4, cv_usejoystick4.value);
// reset this so the comparison is valid
if (oldchoice > numjoys)
oldchoice = cv_usejoystick4.value;
if (oldchoice != choice)
{
if (choice && oldstringchoice > numjoys) // if we did not select "None", we likely selected a used device
CV_SetValue(&cv_usejoystick4, (oldstringchoice > numjoys ? oldstringchoice : oldchoice));
if (oldstringchoice ==
(atoi(cv_usejoystick4.string) > numjoys ? atoi(cv_usejoystick4.string) : cv_usejoystick4.value))
M_StartMessage("This joystick is used by another\n"
"player. Reset the joystick\n"
"for that player first.\n\n"
"(Press a key)\n", NULL, MM_NOTHING);
}
}
}
Reset to defaults option in controls
2018-11-23 03:50:40 +00:00
else if (setupcontrolplayer == 3)
Merge remote-tracking branch 'remotes/SRB2/vanilla-hotplug-stableid' into gamepad-tweaks # Conflicts: # src/command.c # src/command.h # src/g_game.c # src/m_menu.c # src/sdl/i_system.c # src/sdl/i_video.c # src/sdl/sdlmain.h This is NOT just a normal merge commit. I have adjusted the hotplugging code from stableid to account for the last two players, and also removed new 2.1 additions that were deemed irrelevant to Kart.
2018-12-27 22:21:51 +00:00
{
oldchoice = oldstringchoice = atoi(cv_usejoystick3.string) > numjoys ? atoi(cv_usejoystick3.string) : cv_usejoystick3.value;
some joystick fixes Turns out P3/P4 controllers are broken (and still are)
2017-12-24 13:20:58 +00:00
CV_SetValue(&cv_usejoystick3, choice);
Merge remote-tracking branch 'remotes/SRB2/vanilla-hotplug-stableid' into gamepad-tweaks # Conflicts: # src/command.c # src/command.h # src/g_game.c # src/m_menu.c # src/sdl/i_system.c # src/sdl/i_video.c # src/sdl/sdlmain.h This is NOT just a normal merge commit. I have adjusted the hotplugging code from stableid to account for the last two players, and also removed new 2.1 additions that were deemed irrelevant to Kart.
2018-12-27 22:21:51 +00:00
// Just in case last-minute changes were made to cv_usejoystick.value,
// update the string too
// But don't do this if we're intentionally setting higher than numjoys
if (choice <= numjoys)
{
CV_SetValue(&cv_usejoystick3, cv_usejoystick3.value);
// reset this so the comparison is valid
if (oldchoice > numjoys)
oldchoice = cv_usejoystick3.value;
if (oldchoice != choice)
{
if (choice && oldstringchoice > numjoys) // if we did not select "None", we likely selected a used device
CV_SetValue(&cv_usejoystick3, (oldstringchoice > numjoys ? oldstringchoice : oldchoice));
if (oldstringchoice ==
(atoi(cv_usejoystick3.string) > numjoys ? atoi(cv_usejoystick3.string) : cv_usejoystick3.value))
M_StartMessage("This joystick is used by another\n"
"player. Reset the joystick\n"
"for that player first.\n\n"
"(Press a key)\n", NULL, MM_NOTHING);
}
}
}
Reset to defaults option in controls
2018-11-23 03:50:40 +00:00
else if (setupcontrolplayer == 2)
Don't override an already-active controller * Menu improvements to tell the user that they can't set a controller if it's already active
2018-12-14 10:02:41 +00:00
{
Fix cv_usejoystick being reset to None when cv_usejoystick was > NumJoys and changing to already-used joystick
2018-12-14 11:05:31 +00:00
oldchoice = oldstringchoice = atoi(cv_usejoystick2.string) > numjoys ? atoi(cv_usejoystick2.string) : cv_usejoystick2.value;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
CV_SetValue(&cv_usejoystick2, choice);
Don't override an already-active controller * Menu improvements to tell the user that they can't set a controller if it's already active
2018-12-14 10:02:41 +00:00
// Just in case last-minute changes were made to cv_usejoystick.value,
// update the string too
Fix menu where cv_usejoystick.value > I_JoyNum and selecting an unused controller and the "used!" prompt pops up erroneously
2018-12-14 10:57:10 +00:00
// But don't do this if we're intentionally setting higher than numjoys
if (choice <= numjoys)
Don't override an already-active controller * Menu improvements to tell the user that they can't set a controller if it's already active
2018-12-14 10:02:41 +00:00
{
Fix menu where cv_usejoystick.value > I_JoyNum and selecting an unused controller and the "used!" prompt pops up erroneously
2018-12-14 10:57:10 +00:00
CV_SetValue(&cv_usejoystick2, cv_usejoystick2.value);
// reset this so the comparison is valid
if (oldchoice > numjoys)
oldchoice = cv_usejoystick2.value;
if (oldchoice != choice)
{
Fix cv_usejoystick being reset to None when cv_usejoystick was > NumJoys and changing to already-used joystick
2018-12-14 11:05:31 +00:00
if (choice && oldstringchoice > numjoys) // if we did not select "None", we likely selected a used device
CV_SetValue(&cv_usejoystick2, (oldstringchoice > numjoys ? oldstringchoice : oldchoice));
Fix menu where cv_usejoystick.value > I_JoyNum and selecting an unused controller and the "used!" prompt pops up erroneously
2018-12-14 10:57:10 +00:00
Fix cv_usejoystick being reset to None when cv_usejoystick was > NumJoys and changing to already-used joystick
2018-12-14 11:05:31 +00:00
if (oldstringchoice ==
Fix menu where cv_usejoystick.value > I_JoyNum and selecting an unused controller and the "used!" prompt pops up erroneously
2018-12-14 10:57:10 +00:00
(atoi(cv_usejoystick2.string) > numjoys ? atoi(cv_usejoystick2.string) : cv_usejoystick2.value))
M_StartMessage("This joystick is used by another\n"
"player. Reset the joystick\n"
"for that player first.\n\n"
"(Press a key)\n", NULL, MM_NOTHING);
}
Don't override an already-active controller * Menu improvements to tell the user that they can't set a controller if it's already active
2018-12-14 10:02:41 +00:00
}
}
Merge remote-tracking branch 'remotes/SRB2/vanilla-hotplug-stableid' into gamepad-tweaks # Conflicts: # src/command.c # src/command.h # src/g_game.c # src/m_menu.c # src/sdl/i_system.c # src/sdl/i_video.c # src/sdl/sdlmain.h This is NOT just a normal merge commit. I have adjusted the hotplugging code from stableid to account for the last two players, and also removed new 2.1 additions that were deemed irrelevant to Kart.
2018-12-27 22:21:51 +00:00
else if (setupcontrolplayer == 1)
Don't override an already-active controller * Menu improvements to tell the user that they can't set a controller if it's already active
2018-12-14 10:02:41 +00:00
{
Fix cv_usejoystick being reset to None when cv_usejoystick was > NumJoys and changing to already-used joystick
2018-12-14 11:05:31 +00:00
oldchoice = oldstringchoice = atoi(cv_usejoystick.string) > numjoys ? atoi(cv_usejoystick.string) : cv_usejoystick.value;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
CV_SetValue(&cv_usejoystick, choice);
Don't override an already-active controller * Menu improvements to tell the user that they can't set a controller if it's already active
2018-12-14 10:02:41 +00:00
// Just in case last-minute changes were made to cv_usejoystick.value,
// update the string too
Fix menu where cv_usejoystick.value > I_JoyNum and selecting an unused controller and the "used!" prompt pops up erroneously
2018-12-14 10:57:10 +00:00
// But don't do this if we're intentionally setting higher than numjoys
if (choice <= numjoys)
Don't override an already-active controller * Menu improvements to tell the user that they can't set a controller if it's already active
2018-12-14 10:02:41 +00:00
{
Fix menu where cv_usejoystick.value > I_JoyNum and selecting an unused controller and the "used!" prompt pops up erroneously
2018-12-14 10:57:10 +00:00
CV_SetValue(&cv_usejoystick, cv_usejoystick.value);
// reset this so the comparison is valid
if (oldchoice > numjoys)
oldchoice = cv_usejoystick.value;
if (oldchoice != choice)
{
Fix cv_usejoystick being reset to None when cv_usejoystick was > NumJoys and changing to already-used joystick
2018-12-14 11:05:31 +00:00
if (choice && oldstringchoice > numjoys) // if we did not select "None", we likely selected a used device
CV_SetValue(&cv_usejoystick, (oldstringchoice > numjoys ? oldstringchoice : oldchoice));
Fix menu where cv_usejoystick.value > I_JoyNum and selecting an unused controller and the "used!" prompt pops up erroneously
2018-12-14 10:57:10 +00:00
Fix cv_usejoystick being reset to None when cv_usejoystick was > NumJoys and changing to already-used joystick
2018-12-14 11:05:31 +00:00
if (oldstringchoice ==
Fix menu where cv_usejoystick.value > I_JoyNum and selecting an unused controller and the "used!" prompt pops up erroneously
2018-12-14 10:57:10 +00:00
(atoi(cv_usejoystick.string) > numjoys ? atoi(cv_usejoystick.string) : cv_usejoystick.value))
M_StartMessage("This joystick is used by another\n"
"player. Reset the joystick\n"
"for that player first.\n\n"
"(Press a key)\n", NULL, MM_NOTHING);
}
Don't override an already-active controller * Menu improvements to tell the user that they can't set a controller if it's already active
2018-12-14 10:02:41 +00:00
}
}
#else
Merge remote-tracking branch 'remotes/SRB2/vanilla-hotplug-stableid' into gamepad-tweaks # Conflicts: # src/command.c # src/command.h # src/g_game.c # src/m_menu.c # src/sdl/i_system.c # src/sdl/i_video.c # src/sdl/sdlmain.h This is NOT just a normal merge commit. I have adjusted the hotplugging code from stableid to account for the last two players, and also removed new 2.1 additions that were deemed irrelevant to Kart.
2018-12-27 22:21:51 +00:00
if (setupcontrolplayer == 4)
CV_SetValue(&cv_usejoystick4, choice);
else if (setupcontrolplayer == 3)
CV_SetValue(&cv_usejoystick3, choice);
else if (setupcontrolplayer == 2)
Don't override an already-active controller * Menu improvements to tell the user that they can't set a controller if it's already active
2018-12-14 10:02:41 +00:00
CV_SetValue(&cv_usejoystick2, choice);
Merge remote-tracking branch 'remotes/SRB2/vanilla-hotplug-stableid' into gamepad-tweaks # Conflicts: # src/command.c # src/command.h # src/g_game.c # src/m_menu.c # src/sdl/i_system.c # src/sdl/i_video.c # src/sdl/sdlmain.h This is NOT just a normal merge commit. I have adjusted the hotplugging code from stableid to account for the last two players, and also removed new 2.1 additions that were deemed irrelevant to Kart.
2018-12-27 22:21:51 +00:00
else if (setupcontrolplayer == 1)
Don't override an already-active controller * Menu improvements to tell the user that they can't set a controller if it's already active
2018-12-14 10:02:41 +00:00
CV_SetValue(&cv_usejoystick, choice);
#endif
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
// =============
// CONTROLS MENU
// =============
static void M_Setup1PControlsMenu(INT32 choice)
{
(void)choice;
Reset to defaults option in controls
2018-11-23 03:50:40 +00:00
setupcontrolplayer = 1;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
setupcontrols = gamecontrol; // was called from main Options (for console player, then)
currentMenu->lastOn = itemOn;
New bindable keys You can now remap Change Viewpoint, Screenshot, and Toggle GIF Recording to other keys, mainly for gamepads They also pushed me to my breaking point and I couldn't tolerate the control menu anymore, thanks to toaster for the scrolling backport
2018-09-27 20:55:21 +00:00
// Set proper gamepad options
Add confirmation to reset controls
2018-11-26 08:12:22 +00:00
OP_AllControlsMenu[0].itemaction = &OP_Joystick1Def;
* Completely revamp a bunch of menu stuff! * Improve control menus significantly - a more layout-neutral, gameplay importance based order, with spacing, and less depth to get to the important stuff. * Port over the improved MP main menu from internal, including flattening the IP connect onto its level. * Allow for selecting the number of splitscreen players using a menu option, rather than three seperate menu choices. * Improve the layout of all of the level/gametype select menus slightly. * (unrelated) Make fourth player area in 3p splitscreen use the tiling background instead of a pure black area. * (unrelated) Tweak minimap ordering slightly.
2018-06-30 15:01:03 +00:00
New bindable keys You can now remap Change Viewpoint, Screenshot, and Toggle GIF Recording to other keys, mainly for gamepads They also pushed me to my breaking point and I couldn't tolerate the control menu anymore, thanks to toaster for the scrolling backport
2018-09-27 20:55:21 +00:00
// Unhide P1-only controls
Reset to defaults option in controls
2018-11-23 03:50:40 +00:00
OP_AllControlsMenu[15].status = IT_CONTROL; // Chat
//OP_AllControlsMenu[16].status = IT_CONTROL; // Team-chat
OP_AllControlsMenu[16].status = IT_CONTROL; // Rankings
Allow changing all players' viewpoints in replays
2019-02-02 01:53:52 +00:00
//OP_AllControlsMenu[17].status = IT_CONTROL; // Viewpoint
Reset to defaults option in controls
2018-11-23 03:50:40 +00:00
// 18 is Reset Camera, 19 is Toggle Chasecam
OP_AllControlsMenu[20].status = IT_CONTROL; // Pause
OP_AllControlsMenu[21].status = IT_CONTROL; // Screenshot
OP_AllControlsMenu[22].status = IT_CONTROL; // GIF
OP_AllControlsMenu[23].status = IT_CONTROL; // System Menu
OP_AllControlsMenu[24].status = IT_CONTROL; // Console
/*OP_AllControlsMenu[25].status = IT_HEADER; // Spectator Controls header
OP_AllControlsMenu[26].status = IT_SPACE; // Spectator Controls space
OP_AllControlsMenu[27].status = IT_CONTROL; // Spectate
OP_AllControlsMenu[28].status = IT_CONTROL; // Look Up
OP_AllControlsMenu[29].status = IT_CONTROL; // Look Down
OP_AllControlsMenu[30].status = IT_CONTROL; // Center View
Show Spectator controls for P2-P3 again
2018-10-16 00:31:26 +00:00
*/
New bindable keys You can now remap Change Viewpoint, Screenshot, and Toggle GIF Recording to other keys, mainly for gamepads They also pushed me to my breaking point and I couldn't tolerate the control menu anymore, thanks to toaster for the scrolling backport
2018-09-27 20:55:21 +00:00
M_SetupNextMenu(&OP_AllControlsDef);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
static void M_Setup2PControlsMenu(INT32 choice)
{
(void)choice;
Reset to defaults option in controls
2018-11-23 03:50:40 +00:00
setupcontrolplayer = 2;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
setupcontrols = gamecontrolbis;
currentMenu->lastOn = itemOn;
New bindable keys You can now remap Change Viewpoint, Screenshot, and Toggle GIF Recording to other keys, mainly for gamepads They also pushed me to my breaking point and I couldn't tolerate the control menu anymore, thanks to toaster for the scrolling backport
2018-09-27 20:55:21 +00:00
// Set proper gamepad options
Add confirmation to reset controls
2018-11-26 08:12:22 +00:00
OP_AllControlsMenu[0].itemaction = &OP_Joystick2Def;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
New bindable keys You can now remap Change Viewpoint, Screenshot, and Toggle GIF Recording to other keys, mainly for gamepads They also pushed me to my breaking point and I couldn't tolerate the control menu anymore, thanks to toaster for the scrolling backport
2018-09-27 20:55:21 +00:00
// Hide P1-only controls
Reset to defaults option in controls
2018-11-23 03:50:40 +00:00
OP_AllControlsMenu[15].status = IT_GRAYEDOUT2; // Chat
//OP_AllControlsMenu[16].status = IT_GRAYEDOUT2; // Team-chat
OP_AllControlsMenu[16].status = IT_GRAYEDOUT2; // Rankings
Allow changing all players' viewpoints in replays
2019-02-02 01:53:52 +00:00
//OP_AllControlsMenu[17].status = IT_GRAYEDOUT2; // Viewpoint
Reset to defaults option in controls
2018-11-23 03:50:40 +00:00
// 18 is Reset Camera, 19 is Toggle Chasecam
OP_AllControlsMenu[20].status = IT_GRAYEDOUT2; // Pause
OP_AllControlsMenu[21].status = IT_GRAYEDOUT2; // Screenshot
OP_AllControlsMenu[22].status = IT_GRAYEDOUT2; // GIF
OP_AllControlsMenu[23].status = IT_GRAYEDOUT2; // System Menu
OP_AllControlsMenu[24].status = IT_GRAYEDOUT2; // Console
/*OP_AllControlsMenu[25].status = IT_GRAYEDOUT2; // Spectator Controls header
OP_AllControlsMenu[26].status = IT_GRAYEDOUT2; // Spectator Controls space
OP_AllControlsMenu[27].status = IT_GRAYEDOUT2; // Spectate
OP_AllControlsMenu[28].status = IT_GRAYEDOUT2; // Look Up
OP_AllControlsMenu[29].status = IT_GRAYEDOUT2; // Look Down
OP_AllControlsMenu[30].status = IT_GRAYEDOUT2; // Center View
Show Spectator controls for P2-P3 again
2018-10-16 00:31:26 +00:00
*/
New bindable keys You can now remap Change Viewpoint, Screenshot, and Toggle GIF Recording to other keys, mainly for gamepads They also pushed me to my breaking point and I couldn't tolerate the control menu anymore, thanks to toaster for the scrolling backport
2018-09-27 20:55:21 +00:00
M_SetupNextMenu(&OP_AllControlsDef);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
initial quad stuff (does not work)
2017-12-08 07:29:01 +00:00
static void M_Setup3PControlsMenu(INT32 choice)
{
(void)choice;
Reset to defaults option in controls
2018-11-23 03:50:40 +00:00
setupcontrolplayer = 3;
more quad stuff
2017-12-11 06:12:38 +00:00
setupcontrols = gamecontrol3;
initial quad stuff (does not work)
2017-12-08 07:29:01 +00:00
currentMenu->lastOn = itemOn;
New bindable keys You can now remap Change Viewpoint, Screenshot, and Toggle GIF Recording to other keys, mainly for gamepads They also pushed me to my breaking point and I couldn't tolerate the control menu anymore, thanks to toaster for the scrolling backport
2018-09-27 20:55:21 +00:00
// Set proper gamepad options
Add confirmation to reset controls
2018-11-26 08:12:22 +00:00
OP_AllControlsMenu[0].itemaction = &OP_Joystick3Def;
initial quad stuff (does not work)
2017-12-08 07:29:01 +00:00
New bindable keys You can now remap Change Viewpoint, Screenshot, and Toggle GIF Recording to other keys, mainly for gamepads They also pushed me to my breaking point and I couldn't tolerate the control menu anymore, thanks to toaster for the scrolling backport
2018-09-27 20:55:21 +00:00
// Hide P1-only controls
Reset to defaults option in controls
2018-11-23 03:50:40 +00:00
OP_AllControlsMenu[15].status = IT_GRAYEDOUT2; // Chat
//OP_AllControlsMenu[16].status = IT_GRAYEDOUT2; // Team-chat
OP_AllControlsMenu[16].status = IT_GRAYEDOUT2; // Rankings
Allow changing all players' viewpoints in replays
2019-02-02 01:53:52 +00:00
//OP_AllControlsMenu[17].status = IT_GRAYEDOUT2; // Viewpoint
Reset to defaults option in controls
2018-11-23 03:50:40 +00:00
// 18 is Reset Camera, 19 is Toggle Chasecam
OP_AllControlsMenu[20].status = IT_GRAYEDOUT2; // Pause
OP_AllControlsMenu[21].status = IT_GRAYEDOUT2; // Screenshot
OP_AllControlsMenu[22].status = IT_GRAYEDOUT2; // GIF
OP_AllControlsMenu[23].status = IT_GRAYEDOUT2; // System Menu
OP_AllControlsMenu[24].status = IT_GRAYEDOUT2; // Console
/*OP_AllControlsMenu[25].status = IT_GRAYEDOUT2; // Spectator Controls header
OP_AllControlsMenu[26].status = IT_GRAYEDOUT2; // Spectator Controls space
OP_AllControlsMenu[27].status = IT_GRAYEDOUT2; // Spectate
OP_AllControlsMenu[28].status = IT_GRAYEDOUT2; // Look Up
OP_AllControlsMenu[29].status = IT_GRAYEDOUT2; // Look Down
OP_AllControlsMenu[30].status = IT_GRAYEDOUT2; // Center View
Show Spectator controls for P2-P3 again
2018-10-16 00:31:26 +00:00
*/
New bindable keys You can now remap Change Viewpoint, Screenshot, and Toggle GIF Recording to other keys, mainly for gamepads They also pushed me to my breaking point and I couldn't tolerate the control menu anymore, thanks to toaster for the scrolling backport
2018-09-27 20:55:21 +00:00
M_SetupNextMenu(&OP_AllControlsDef);
initial quad stuff (does not work)
2017-12-08 07:29:01 +00:00
}
static void M_Setup4PControlsMenu(INT32 choice)
{
(void)choice;
Reset to defaults option in controls
2018-11-23 03:50:40 +00:00
setupcontrolplayer = 4;
more quad stuff
2017-12-11 06:12:38 +00:00
setupcontrols = gamecontrol4;
initial quad stuff (does not work)
2017-12-08 07:29:01 +00:00
currentMenu->lastOn = itemOn;
New bindable keys You can now remap Change Viewpoint, Screenshot, and Toggle GIF Recording to other keys, mainly for gamepads They also pushed me to my breaking point and I couldn't tolerate the control menu anymore, thanks to toaster for the scrolling backport
2018-09-27 20:55:21 +00:00
// Set proper gamepad options
Add confirmation to reset controls
2018-11-26 08:12:22 +00:00
OP_AllControlsMenu[0].itemaction = &OP_Joystick4Def;
* Completely revamp a bunch of menu stuff! * Improve control menus significantly - a more layout-neutral, gameplay importance based order, with spacing, and less depth to get to the important stuff. * Port over the improved MP main menu from internal, including flattening the IP connect onto its level. * Allow for selecting the number of splitscreen players using a menu option, rather than three seperate menu choices. * Improve the layout of all of the level/gametype select menus slightly. * (unrelated) Make fourth player area in 3p splitscreen use the tiling background instead of a pure black area. * (unrelated) Tweak minimap ordering slightly.
2018-06-30 15:01:03 +00:00
New bindable keys You can now remap Change Viewpoint, Screenshot, and Toggle GIF Recording to other keys, mainly for gamepads They also pushed me to my breaking point and I couldn't tolerate the control menu anymore, thanks to toaster for the scrolling backport
2018-09-27 20:55:21 +00:00
// Hide P1-only controls
Reset to defaults option in controls
2018-11-23 03:50:40 +00:00
OP_AllControlsMenu[15].status = IT_GRAYEDOUT2; // Chat
//OP_AllControlsMenu[16].status = IT_GRAYEDOUT2; // Team-chat
OP_AllControlsMenu[16].status = IT_GRAYEDOUT2; // Rankings
Allow changing all players' viewpoints in replays
2019-02-02 01:53:52 +00:00
//OP_AllControlsMenu[17].status = IT_GRAYEDOUT2; // Viewpoint
Reset to defaults option in controls
2018-11-23 03:50:40 +00:00
// 18 is Reset Camera, 19 is Toggle Chasecam
OP_AllControlsMenu[20].status = IT_GRAYEDOUT2; // Pause
OP_AllControlsMenu[21].status = IT_GRAYEDOUT2; // Screenshot
OP_AllControlsMenu[22].status = IT_GRAYEDOUT2; // GIF
OP_AllControlsMenu[23].status = IT_GRAYEDOUT2; // System Menu
OP_AllControlsMenu[24].status = IT_GRAYEDOUT2; // Console
/*OP_AllControlsMenu[25].status = IT_GRAYEDOUT2; // Spectator Controls header
OP_AllControlsMenu[26].status = IT_GRAYEDOUT2; // Spectator Controls space
OP_AllControlsMenu[27].status = IT_GRAYEDOUT2; // Spectate
OP_AllControlsMenu[28].status = IT_GRAYEDOUT2; // Look Up
OP_AllControlsMenu[29].status = IT_GRAYEDOUT2; // Look Down
OP_AllControlsMenu[30].status = IT_GRAYEDOUT2; // Center View
Show Spectator controls for P2-P3 again
2018-10-16 00:31:26 +00:00
*/
New bindable keys You can now remap Change Viewpoint, Screenshot, and Toggle GIF Recording to other keys, mainly for gamepads They also pushed me to my breaking point and I couldn't tolerate the control menu anymore, thanks to toaster for the scrolling backport
2018-09-27 20:55:21 +00:00
M_SetupNextMenu(&OP_AllControlsDef);
initial quad stuff (does not work)
2017-12-08 07:29:01 +00:00
}
New bindable keys You can now remap Change Viewpoint, Screenshot, and Toggle GIF Recording to other keys, mainly for gamepads They also pushed me to my breaking point and I couldn't tolerate the control menu anymore, thanks to toaster for the scrolling backport
2018-09-27 20:55:21 +00:00
#define controlheight 18
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Draws the Customise Controls menu
static void M_DrawControl(void)
{
Fix tabbing
2018-10-09 19:28:52 +00:00
char tmp[50];
INT32 x, y, i, max, cursory = 0, iter;
INT32 keys[2];
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Fix tabbing
2018-10-09 19:28:52 +00:00
x = currentMenu->x;
y = currentMenu->y;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Fix tabbing
2018-10-09 19:28:52 +00:00
/*i = itemOn - (controlheight/2);
if (i < 0)
i = 0;
*/
* Completely revamp a bunch of menu stuff! * Improve control menus significantly - a more layout-neutral, gameplay importance based order, with spacing, and less depth to get to the important stuff. * Port over the improved MP main menu from internal, including flattening the IP connect onto its level. * Allow for selecting the number of splitscreen players using a menu option, rather than three seperate menu choices. * Improve the layout of all of the level/gametype select menus slightly. * (unrelated) Make fourth player area in 3p splitscreen use the tiling background instead of a pure black area. * (unrelated) Tweak minimap ordering slightly.
2018-06-30 15:01:03 +00:00
Fix tabbing
2018-10-09 19:28:52 +00:00
iter = (controlheight/2);
for (i = itemOn; ((iter || currentMenu->menuitems[i].status == IT_GRAYEDOUT2) && i > 0); i--)
{
if (currentMenu->menuitems[i].status != IT_GRAYEDOUT2)
iter--;
}
if (currentMenu->menuitems[i].status == IT_GRAYEDOUT2)
i--;
Fix 3P and 4P configuration screens They don't crash anymore!
2017-12-18 10:56:38 +00:00
Fix tabbing
2018-10-09 19:28:52 +00:00
iter += (controlheight/2);
for (max = itemOn; (iter && max < currentMenu->numitems); max++)
{
if (currentMenu->menuitems[max].status != IT_GRAYEDOUT2)
iter--;
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Fix tabbing
2018-10-09 19:28:52 +00:00
if (iter)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Fix tabbing
2018-10-09 19:28:52 +00:00
iter += (controlheight/2);
for (i = itemOn; ((iter || currentMenu->menuitems[i].status == IT_GRAYEDOUT2) && i > 0); i--)
* Completely revamp a bunch of menu stuff! * Improve control menus significantly - a more layout-neutral, gameplay importance based order, with spacing, and less depth to get to the important stuff. * Port over the improved MP main menu from internal, including flattening the IP connect onto its level. * Allow for selecting the number of splitscreen players using a menu option, rather than three seperate menu choices. * Improve the layout of all of the level/gametype select menus slightly. * (unrelated) Make fourth player area in 3p splitscreen use the tiling background instead of a pure black area. * (unrelated) Tweak minimap ordering slightly.
2018-06-30 15:01:03 +00:00
{
Fix tabbing
2018-10-09 19:28:52 +00:00
if (currentMenu->menuitems[i].status != IT_GRAYEDOUT2)
iter--;
* Completely revamp a bunch of menu stuff! * Improve control menus significantly - a more layout-neutral, gameplay importance based order, with spacing, and less depth to get to the important stuff. * Port over the improved MP main menu from internal, including flattening the IP connect onto its level. * Allow for selecting the number of splitscreen players using a menu option, rather than three seperate menu choices. * Improve the layout of all of the level/gametype select menus slightly. * (unrelated) Make fourth player area in 3p splitscreen use the tiling background instead of a pure black area. * (unrelated) Tweak minimap ordering slightly.
2018-06-30 15:01:03 +00:00
}
Fix tabbing
2018-10-09 19:28:52 +00:00
}
/*max = i + controlheight;
if (max > currentMenu->numitems)
{
max = currentMenu->numitems;
if (max < controlheight)
i = 0;
else
i = max - controlheight;
}*/
// draw title (or big pic)
M_DrawMenuTitle();
M_CentreText(28,
Add confirmation to reset controls
2018-11-26 08:12:22 +00:00
(setupcontrolplayer > 1 ? va("\x86""Set controls for ""\x82""Player %d", setupcontrolplayer) :
"\x86""Press ""\x82""ENTER""\x86"" to change, ""\x82""BACKSPACE""\x86"" to clear"));
Fix tabbing
2018-10-09 19:28:52 +00:00
if (i)
`[22:03] TehRealSalt: Not organized code-wise, figured toaster would want to help with that since she's the Menu Queen and she probably has better ideas on how to do it` The Menu Queen is in the house~ :sparkles: * Magical, single-page player select and general netgamey stuff, while still remaining both pretty and functional. * Death to NOFOURPLAYER, now that the cat's out the bag. * Clean up NONET, assuming people try to make DD builds on release. * Minor tweaks across the board, mostly places where I wanted to pilfer minor code from and realised it wasn't done optimally originally.
2018-10-16 21:11:47 +00:00
V_DrawCharacter(currentMenu->x - 16, y-(skullAnimCounter/5),
'\x1A' | highlightflags, false); // up arrow
Fix tabbing
2018-10-09 19:28:52 +00:00
if (max != currentMenu->numitems)
`[22:03] TehRealSalt: Not organized code-wise, figured toaster would want to help with that since she's the Menu Queen and she probably has better ideas on how to do it` The Menu Queen is in the house~ :sparkles: * Magical, single-page player select and general netgamey stuff, while still remaining both pretty and functional. * Death to NOFOURPLAYER, now that the cat's out the bag. * Clean up NONET, assuming people try to make DD builds on release. * Minor tweaks across the board, mostly places where I wanted to pilfer minor code from and realised it wasn't done optimally originally.
2018-10-16 21:11:47 +00:00
V_DrawCharacter(currentMenu->x - 16, y+(SMALLLINEHEIGHT*(controlheight-1))+(skullAnimCounter/5) + (skullAnimCounter/5),
'\x1B' | highlightflags, false); // down arrow
Fix tabbing
2018-10-09 19:28:52 +00:00
for (; i < max; i++)
{
if (currentMenu->menuitems[i].status == IT_GRAYEDOUT2)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
continue;
Fix tabbing
2018-10-09 19:28:52 +00:00
if (i == itemOn)
cursory = y;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Fix tabbing
2018-10-09 19:28:52 +00:00
if (currentMenu->menuitems[i].status == IT_CONTROL)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Fix tabbing
2018-10-09 19:28:52 +00:00
V_DrawString(x, y, ((i == itemOn) ? highlightflags : 0), currentMenu->menuitems[i].text);
keys[0] = setupcontrols[currentMenu->menuitems[i].alphaKey][0];
keys[1] = setupcontrols[currentMenu->menuitems[i].alphaKey][1];
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Fix tabbing
2018-10-09 19:28:52 +00:00
tmp[0] ='\0';
if (keys[0] == KEY_NULL && keys[1] == KEY_NULL)
{
strcpy(tmp, "---");
}
else
{
if (keys[0] != KEY_NULL)
strcat (tmp, G_KeynumToString (keys[0]));
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Fix tabbing
2018-10-09 19:28:52 +00:00
if (keys[0] != KEY_NULL && keys[1] != KEY_NULL)
strcat(tmp,", ");
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Fix tabbing
2018-10-09 19:28:52 +00:00
if (keys[1] != KEY_NULL)
strcat (tmp, G_KeynumToString (keys[1]));
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Fix tabbing
2018-10-09 19:28:52 +00:00
}
V_DrawRightAlignedString(BASEVIDWIDTH-currentMenu->x, y, highlightflags, tmp);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
Fix tabbing
2018-10-09 19:28:52 +00:00
/*else if (currentMenu->menuitems[i].status == IT_GRAYEDOUT2)
V_DrawString(x, y, V_TRANSLUCENT, currentMenu->menuitems[i].text);*/
else if ((currentMenu->menuitems[i].status == IT_HEADER) && (i != max-1))
New bindable keys You can now remap Change Viewpoint, Screenshot, and Toggle GIF Recording to other keys, mainly for gamepads They also pushed me to my breaking point and I couldn't tolerate the control menu anymore, thanks to toaster for the scrolling backport
2018-09-27 20:55:21 +00:00
V_DrawString(19, y+6, highlightflags, currentMenu->menuitems[i].text);
else if (currentMenu->menuitems[i].status & IT_STRING)
V_DrawString(x, y, ((i == itemOn) ? highlightflags : 0), currentMenu->menuitems[i].text);
* Completely revamp a bunch of menu stuff! * Improve control menus significantly - a more layout-neutral, gameplay importance based order, with spacing, and less depth to get to the important stuff. * Port over the improved MP main menu from internal, including flattening the IP connect onto its level. * Allow for selecting the number of splitscreen players using a menu option, rather than three seperate menu choices. * Improve the layout of all of the level/gametype select menus slightly. * (unrelated) Make fourth player area in 3p splitscreen use the tiling background instead of a pure black area. * (unrelated) Tweak minimap ordering slightly.
2018-06-30 15:01:03 +00:00
y += SMALLLINEHEIGHT;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
New bindable keys You can now remap Change Viewpoint, Screenshot, and Toggle GIF Recording to other keys, mainly for gamepads They also pushed me to my breaking point and I couldn't tolerate the control menu anymore, thanks to toaster for the scrolling backport
2018-09-27 20:55:21 +00:00
Fix tabbing
2018-10-09 19:28:52 +00:00
V_DrawScaledPatch(currentMenu->x - 20, cursory, 0,
W_CachePatchName("M_CURSOR", PU_CACHE));
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
Scale fixes
2018-09-27 21:17:04 +00:00
#undef controlheight
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
static INT32 controltochange;
Increase ChangeControl text buffer to resolve buffer overflow with System Menu/GIF control config
2018-12-31 06:26:25 +00:00
static char controltochangetext[33];
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
static void M_ChangecontrolResponse(event_t *ev)
{
INT32 control;
INT32 found;
INT32 ch = ev->data1;
Hardcode Pause/Break key and change Pause default; show prompt in menu about Pause key
2018-11-21 04:43:05 +00:00
// ESCAPE cancels; dummy out PAUSE
if (ch != KEY_ESCAPE && ch != KEY_PAUSE)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
switch (ev->type)
{
// ignore mouse/joy movements, just get buttons
case ev_mouse:
case ev_mouse2:
case ev_joystick:
case ev_joystick2:
some joystick fixes Turns out P3/P4 controllers are broken (and still are)
2017-12-24 13:20:58 +00:00
case ev_joystick3:
case ev_joystick4:
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
ch = KEY_NULL; // no key
break;
// keypad arrows are converted for the menu in cursor arrows
// so use the event instead of ch
case ev_keydown:
ch = ev->data1;
break;
default:
break;
}
control = controltochange;
// check if we already entered this key
found = -1;
if (setupcontrols[control][0] ==ch)
found = 0;
else if (setupcontrols[control][1] ==ch)
found = 1;
if (found >= 0)
{
// replace mouse and joy clicks by double clicks
if (ch >= KEY_MOUSE1 && ch <= KEY_MOUSE1+MOUSEBUTTONS)
setupcontrols[control][found] = ch-KEY_MOUSE1+KEY_DBLMOUSE1;
else if (ch >= KEY_JOY1 && ch <= KEY_JOY1+JOYBUTTONS)
setupcontrols[control][found] = ch-KEY_JOY1+KEY_DBLJOY1;
else if (ch >= KEY_2MOUSE1 && ch <= KEY_2MOUSE1+MOUSEBUTTONS)
setupcontrols[control][found] = ch-KEY_2MOUSE1+KEY_DBL2MOUSE1;
else if (ch >= KEY_2JOY1 && ch <= KEY_2JOY1+JOYBUTTONS)
setupcontrols[control][found] = ch-KEY_2JOY1+KEY_DBL2JOY1;
A lot lol The importants: - Fixed compiling - Combined G_BuildTiccmd for all players, no more need for a function for each - You can actually start 3p/4p mode
2017-12-17 03:32:43 +00:00
else if (ch >= KEY_3JOY1 && ch <= KEY_3JOY1+JOYBUTTONS)
setupcontrols[control][found] = ch-KEY_3JOY1+KEY_DBL3JOY1;
else if (ch >= KEY_4JOY1 && ch <= KEY_4JOY1+JOYBUTTONS)
setupcontrols[control][found] = ch-KEY_4JOY1+KEY_DBL4JOY1;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
else
{
// check if change key1 or key2, or replace the two by the new
found = 0;
if (setupcontrols[control][0] == KEY_NULL)
found++;
if (setupcontrols[control][1] == KEY_NULL)
found++;
if (found == 2)
{
found = 0;
setupcontrols[control][1] = KEY_NULL; //replace key 1,clear key2
}
Add G_FilterKeyByVersion() to setcontrol
2018-12-20 09:04:49 +00:00
(void)G_CheckDoubleUsage(ch, true);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
setupcontrols[control][found] = ch;
}
final menu tweaks before i fall asleep in my chair
2018-11-14 01:27:01 +00:00
S_StartSound(NULL, sfx_s221);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
Hardcode Pause/Break key and change Pause default; show prompt in menu about Pause key
2018-11-21 04:43:05 +00:00
else if (ch == KEY_PAUSE)
{
Increase M_ChangecontrolResponse message buffer by 25 chars
2019-01-05 00:38:36 +00:00
// This buffer assumes a 125-character message plus a 32-character control name (per controltochangetext buffer size)
static char tmp[158];
Hardcode Pause/Break key and change Pause default; show prompt in menu about Pause key
2018-11-21 04:43:05 +00:00
menu_t *prev = currentMenu->prevMenu;
if (controltochange == gc_pause)
sprintf(tmp, M_GetText("The \x82Pause Key \x80is enabled, but \nyou may select another key. \n\nHit another key for\n%s\nESC for Cancel"),
controltochangetext);
else
sprintf(tmp, M_GetText("The \x82Pause Key \x80is enabled, but \nit is not configurable. \n\nHit another key for\n%s\nESC for Cancel"),
controltochangetext);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Hardcode Pause/Break key and change Pause default; show prompt in menu about Pause key
2018-11-21 04:43:05 +00:00
M_StartMessage(tmp, M_ChangecontrolResponse, MM_EVENTHANDLER);
currentMenu->prevMenu = prev;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Hardcode Pause/Break key and change Pause default; show prompt in menu about Pause key
2018-11-21 04:43:05 +00:00
S_StartSound(NULL, sfx_s3k42);
return;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
Correct that thing Lat` found where sometimes the controls menus'd get "stuck" replacing the second key every time, effectively only allowing one key until you clear it and try again. Also, sounds.
2018-09-29 15:18:16 +00:00
else
final menu tweaks before i fall asleep in my chair
2018-11-14 01:27:01 +00:00
S_StartSound(NULL, sfx_s224);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
M_StopMessage(0);
}
static void M_ChangeControl(INT32 choice)
{
Increase ChangeControl text buffer to resolve buffer overflow with System Menu/GIF control config
2018-12-31 06:26:25 +00:00
// This buffer assumes a 35-character message (per below) plus a max control name limit of 32 chars (per controltochangetext)
// If you change the below message, then change the size of this buffer!
static char tmp[68];
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
controltochange = currentMenu->menuitems[choice].alphaKey;
sprintf(tmp, M_GetText("Hit the new key for\n%s\nESC for Cancel"),
currentMenu->menuitems[choice].text);
Increase ChangeControl text buffer to resolve buffer overflow with System Menu/GIF control config
2018-12-31 06:26:25 +00:00
strlcpy(controltochangetext, currentMenu->menuitems[choice].text, 33);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
M_StartMessage(tmp, M_ChangecontrolResponse, MM_EVENTHANDLER);
}
Add confirmation to reset controls
2018-11-26 08:12:22 +00:00
static void M_ResetControlsResponse(INT32 ch)
Reset to defaults option in controls
2018-11-23 03:50:40 +00:00
{
INT32 i;
Add confirmation to reset controls
2018-11-26 08:12:22 +00:00
if (ch != 'y' && ch != KEY_ENTER)
return;
Reset to defaults option in controls
2018-11-23 03:50:40 +00:00
// clear all controls
for (i = 0; i < num_gamecontrols; i++)
{
switch (setupcontrolplayer)
{
case 4:
G_ClearControlKeys(gamecontrol4, i);
break;
case 3:
G_ClearControlKeys(gamecontrol3, i);
break;
case 2:
G_ClearControlKeys(gamecontrolbis, i);
break;
case 1:
default:
G_ClearControlKeys(gamecontrol, i);
break;
}
}
// Setup original defaults
G_Controldefault(setupcontrolplayer);
// Setup gamepad option defaults (yucky)
switch (setupcontrolplayer)
{
case 4:
CV_StealthSet(&cv_usejoystick4, cv_usejoystick4.defaultvalue);
CV_StealthSet(&cv_turnaxis4, cv_turnaxis4.defaultvalue);
CV_StealthSet(&cv_moveaxis4, cv_moveaxis4.defaultvalue);
CV_StealthSet(&cv_brakeaxis4, cv_brakeaxis4.defaultvalue);
CV_StealthSet(&cv_aimaxis4, cv_aimaxis4.defaultvalue);
CV_StealthSet(&cv_lookaxis4, cv_lookaxis4.defaultvalue);
CV_StealthSet(&cv_fireaxis4, cv_fireaxis4.defaultvalue);
CV_StealthSet(&cv_driftaxis4, cv_driftaxis4.defaultvalue);
break;
case 3:
CV_StealthSet(&cv_usejoystick3, cv_usejoystick3.defaultvalue);
CV_StealthSet(&cv_turnaxis3, cv_turnaxis3.defaultvalue);
CV_StealthSet(&cv_moveaxis3, cv_moveaxis3.defaultvalue);
CV_StealthSet(&cv_brakeaxis3, cv_brakeaxis3.defaultvalue);
CV_StealthSet(&cv_aimaxis3, cv_aimaxis3.defaultvalue);
CV_StealthSet(&cv_lookaxis3, cv_lookaxis3.defaultvalue);
CV_StealthSet(&cv_fireaxis3, cv_fireaxis3.defaultvalue);
CV_StealthSet(&cv_driftaxis3, cv_driftaxis3.defaultvalue);
break;
case 2:
CV_StealthSet(&cv_usejoystick2, cv_usejoystick2.defaultvalue);
CV_StealthSet(&cv_turnaxis2, cv_turnaxis2.defaultvalue);
CV_StealthSet(&cv_moveaxis2, cv_moveaxis2.defaultvalue);
CV_StealthSet(&cv_brakeaxis2, cv_brakeaxis2.defaultvalue);
CV_StealthSet(&cv_aimaxis2, cv_aimaxis2.defaultvalue);
CV_StealthSet(&cv_lookaxis2, cv_lookaxis2.defaultvalue);
CV_StealthSet(&cv_fireaxis2, cv_fireaxis2.defaultvalue);
CV_StealthSet(&cv_driftaxis2, cv_driftaxis2.defaultvalue);
break;
case 1:
default:
CV_StealthSet(&cv_usejoystick, cv_usejoystick.defaultvalue);
CV_StealthSet(&cv_turnaxis, cv_turnaxis.defaultvalue);
CV_StealthSet(&cv_moveaxis, cv_moveaxis.defaultvalue);
CV_StealthSet(&cv_brakeaxis, cv_brakeaxis.defaultvalue);
CV_StealthSet(&cv_aimaxis, cv_aimaxis.defaultvalue);
CV_StealthSet(&cv_lookaxis, cv_lookaxis.defaultvalue);
CV_StealthSet(&cv_fireaxis, cv_fireaxis.defaultvalue);
CV_StealthSet(&cv_driftaxis, cv_driftaxis.defaultvalue);
break;
}
S_StartSound(NULL, sfx_s224);
}
Add confirmation to reset controls
2018-11-26 08:12:22 +00:00
static void M_ResetControls(INT32 choice)
{
(void)choice;
M_StartMessage(va(M_GetText("Reset Player %d's controls to defaults?\n\n(Press 'Y' to confirm)\n"), setupcontrolplayer), M_ResetControlsResponse, MM_YESNO);
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// =====
// SOUND
// =====
Minor mistakes on my part
2018-10-22 21:24:58 +00:00
/*static void M_RestartAudio(void)
Better menus
2018-06-15 00:18:29 +00:00
{
Use COM_ImmedExecute("restartaudio") instead of duplicated code
2018-10-22 20:32:06 +00:00
COM_ImmedExecute("restartaudio");
Minor mistakes on my part
2018-10-22 21:24:58 +00:00
}*/
Better menus
2018-06-15 00:18:29 +00:00
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// ===============
// VIDEO MODE MENU
// ===============
//added : 30-01-98:
#define MAXCOLUMNMODES 12 //max modes displayed in one column
#define MAXMODEDESCS (MAXCOLUMNMODES*3)
static modedesc_t modedescs[MAXMODEDESCS];
static void M_VideoModeMenu(INT32 choice)
{
INT32 i, j, vdup, nummodes, width, height;
const char *desc;
(void)choice;
memset(modedescs, 0, sizeof(modedescs));
change SDL into HAVE_SDL
2014-07-25 23:10:24 +00:00
#if (defined (__unix__) && !defined (MSDOS)) || defined (UNIXCOMMON) || defined (HAVE_SDL)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
VID_PrepareModeList(); // FIXME: hack
#endif
vidm_nummodes = 0;
vidm_selected = 0;
nummodes = VID_NumModes();
#ifdef _WINDOWS
// clean that later: skip windowed mode 0, video modes menu only shows FULL SCREEN modes
if (nummodes <= NUMSPECIALMODES)
i = 0; // unless we have nothing
else
i = NUMSPECIALMODES;
#else
// DOS does not skip mode 0, because mode 0 is ALWAYS present
i = 0;
#endif
for (; i < nummodes && vidm_nummodes < MAXMODEDESCS; i++)
{
desc = VID_GetModeName(i);
if (desc)
{
vdup = 0;
// when a resolution exists both under VGA and VESA, keep the
// VESA mode, which is always a higher modenum
for (j = 0; j < vidm_nummodes; j++)
{
if (!strcmp(modedescs[j].desc, desc))
{
// mode(0): 320x200 is always standard VGA, not vesa
if (modedescs[j].modenum)
{
modedescs[j].modenum = i;
vdup = 1;
if (i == vid.modenum)
vidm_selected = j;
}
else
vdup = 1;
break;
}
}
if (!vdup)
{
modedescs[vidm_nummodes].modenum = i;
modedescs[vidm_nummodes].desc = desc;
if (i == vid.modenum)
vidm_selected = vidm_nummodes;
// Pull out the width and height
sscanf(desc, "%u%*c%u", &width, &height);
// Show multiples of 320x200 as green.
if (SCR_IsAspectCorrect(width, height))
modedescs[vidm_nummodes].goodratio = 1;
vidm_nummodes++;
}
}
}
vidm_column_size = (vidm_nummodes+2) / 3;
M_SetupNextMenu(&OP_VideoModeDef);
}
Don't look at this commit too closely until after netgame, I want to surprise yalls!! * Lots of menu changes! * Little arrows next to changeable cvars! * Show default value for sliders! * Pretty pretty pretty. * I don't know how to describe some of these changes. * Effectively nuke MIDI music support! * Skiddown at the start of a race is more interesting! * Spinning in waterslides! * Tiny bugfix in voting, plus a little celebration...
2018-06-30 22:18:13 +00:00
static void M_DrawVideoMenu(void)
Fix all actionable comments in my review of sonicitems.
2018-08-09 21:59:52 +00:00
{
M_DrawGenericMenu();
V_DrawRightAlignedString(BASEVIDWIDTH - currentMenu->x, currentMenu->y + OP_VideoOptionsMenu[0].alphaKey,
(SCR_IsAspectCorrect(vid.width, vid.height) ? recommendedflags : highlightflags),
va("%dx%d", vid.width, vid.height));
}
static void M_DrawHUDOptions(void)
Don't look at this commit too closely until after netgame, I want to surprise yalls!! * Lots of menu changes! * Little arrows next to changeable cvars! * Show default value for sliders! * Pretty pretty pretty. * I don't know how to describe some of these changes. * Effectively nuke MIDI music support! * Skiddown at the start of a race is more interesting! * Spinning in waterslides! * Tiny bugfix in voting, plus a little celebration...
2018-06-30 22:18:13 +00:00
{
* Tint, not Teint. * Update/rearrange menus a tad, to be more appealing and correct some categorisation in general.
2018-08-05 15:34:51 +00:00
const char *str0 = ")";
const char *str1 = " Warning highlight";
const char *str2 = ",";
const char *str3 = "Good highlight";
Fix all actionable comments in my review of sonicitems.
2018-08-09 21:59:52 +00:00
INT32 x = BASEVIDWIDTH - currentMenu->x + 2, y = currentMenu->y + 105;
* Tint, not Teint. * Update/rearrange menus a tad, to be more appealing and correct some categorisation in general.
2018-08-05 15:34:51 +00:00
INT32 w0 = V_StringWidth(str0, 0), w1 = V_StringWidth(str1, 0), w2 = V_StringWidth(str2, 0), w3 = V_StringWidth(str3, 0);
Don't look at this commit too closely until after netgame, I want to surprise yalls!! * Lots of menu changes! * Little arrows next to changeable cvars! * Show default value for sliders! * Pretty pretty pretty. * I don't know how to describe some of these changes. * Effectively nuke MIDI music support! * Skiddown at the start of a race is more interesting! * Spinning in waterslides! * Tiny bugfix in voting, plus a little celebration...
2018-06-30 22:18:13 +00:00
M_DrawGenericMenu();
* Tint, not Teint. * Update/rearrange menus a tad, to be more appealing and correct some categorisation in general.
2018-08-05 15:34:51 +00:00
x -= w0;
V_DrawString(x, y, highlightflags, str0);
x -= w1;
V_DrawString(x, y, warningflags, str1);
x -= w2;
V_DrawString(x, y, highlightflags, str2);
x -= w3;
V_DrawString(x, y, recommendedflags, str3);
V_DrawRightAlignedString(x, y, highlightflags, "(");
Don't look at this commit too closely until after netgame, I want to surprise yalls!! * Lots of menu changes! * Little arrows next to changeable cvars! * Show default value for sliders! * Pretty pretty pretty. * I don't know how to describe some of these changes. * Effectively nuke MIDI music support! * Skiddown at the start of a race is more interesting! * Spinning in waterslides! * Tiny bugfix in voting, plus a little celebration...
2018-06-30 22:18:13 +00:00
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Draw the video modes list, a-la-Quake
static void M_DrawVideoMode(void)
{
INT32 i, j, row, col;
// draw title
M_DrawMenuTitle();
V_DrawCenteredString(BASEVIDWIDTH/2, OP_VideoModeDef.y,
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
highlightflags, "Choose mode, reselect to change default");
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
row = 41;
col = OP_VideoModeDef.y + 14;
for (i = 0; i < vidm_nummodes; i++)
{
if (i == vidm_selected)
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
V_DrawString(row, col, highlightflags, modedescs[i].desc);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Show multiples of 320x200 as green.
else
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
V_DrawString(row, col, (modedescs[i].goodratio) ? recommendedflags : 0, modedescs[i].desc);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
col += 8;
if ((i % vidm_column_size) == (vidm_column_size-1))
{
row += 7*13;
col = OP_VideoModeDef.y + 14;
}
}
if (vidm_testingmode > 0)
{
INT32 testtime = (vidm_testingmode/TICRATE) + 1;
M_CentreText(OP_VideoModeDef.y + 116,
va("Previewing mode %c%dx%d",
(SCR_IsAspectCorrect(vid.width, vid.height)) ? 0x83 : 0x80,
vid.width, vid.height));
M_CentreText(OP_VideoModeDef.y + 138,
"Press ENTER again to keep this mode");
M_CentreText(OP_VideoModeDef.y + 150,
va("Wait %d second%s", testtime, (testtime > 1) ? "s" : ""));
M_CentreText(OP_VideoModeDef.y + 158,
"or press ESC to return");
}
else
{
M_CentreText(OP_VideoModeDef.y + 116,
va("Current mode is %c%dx%d",
(SCR_IsAspectCorrect(vid.width, vid.height)) ? 0x83 : 0x80,
vid.width, vid.height));
M_CentreText(OP_VideoModeDef.y + 124,
va("Default mode is %c%dx%d",
(SCR_IsAspectCorrect(cv_scr_width.value, cv_scr_height.value)) ? 0x83 : 0x80,
cv_scr_width.value, cv_scr_height.value));
V_DrawCenteredString(BASEVIDWIDTH/2, OP_VideoModeDef.y + 138,
Correct outdated text.
2018-07-01 19:01:02 +00:00
recommendedflags, "Marked modes are recommended.");
Don't look at this commit too closely until after netgame, I want to surprise yalls!! * Lots of menu changes! * Little arrows next to changeable cvars! * Show default value for sliders! * Pretty pretty pretty. * I don't know how to describe some of these changes. * Effectively nuke MIDI music support! * Skiddown at the start of a race is more interesting! * Spinning in waterslides! * Tiny bugfix in voting, plus a little celebration...
2018-06-30 22:18:13 +00:00
V_DrawCenteredString(BASEVIDWIDTH/2, OP_VideoModeDef.y + 146,
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
highlightflags, "Other modes may have visual errors.");
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
V_DrawCenteredString(BASEVIDWIDTH/2, OP_VideoModeDef.y + 158,
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
highlightflags, "Larger modes may have performance issues.");
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
// Draw the cursor for the VidMode menu
i = 41 - 10 + ((vidm_selected / vidm_column_size)*7*13);
j = OP_VideoModeDef.y + 14 + ((vidm_selected % vidm_column_size)*8);
V_DrawScaledPatch(i - 8, j, 0,
W_CachePatchName("M_CURSOR", PU_CACHE));
}
// special menuitem key handler for video mode list
static void M_HandleVideoMode(INT32 ch)
{
if (vidm_testingmode > 0) switch (ch)
{
// change back to the previous mode quickly
case KEY_ESCAPE:
setmodeneeded = vidm_previousmode + 1;
vidm_testingmode = 0;
break;
case KEY_ENTER:
S_StartSound(NULL, sfx_menu1);
vidm_testingmode = 0; // stop testing
}
else switch (ch)
{
case KEY_DOWNARROW:
S_StartSound(NULL, sfx_menu1);
if (++vidm_selected >= vidm_nummodes)
vidm_selected = 0;
break;
case KEY_UPARROW:
S_StartSound(NULL, sfx_menu1);
if (--vidm_selected < 0)
vidm_selected = vidm_nummodes - 1;
break;
case KEY_LEFTARROW:
S_StartSound(NULL, sfx_menu1);
vidm_selected -= vidm_column_size;
if (vidm_selected < 0)
vidm_selected = (vidm_column_size*3) + vidm_selected;
if (vidm_selected >= vidm_nummodes)
vidm_selected = vidm_nummodes - 1;
break;
case KEY_RIGHTARROW:
S_StartSound(NULL, sfx_menu1);
vidm_selected += vidm_column_size;
if (vidm_selected >= (vidm_column_size*3))
vidm_selected %= vidm_column_size;
if (vidm_selected >= vidm_nummodes)
vidm_selected = vidm_nummodes - 1;
break;
case KEY_ENTER:
S_StartSound(NULL, sfx_menu1);
if (vid.modenum == modedescs[vidm_selected].modenum)
SCR_SetDefaultMode();
else
{
vidm_testingmode = 15*TICRATE;
vidm_previousmode = vid.modenum;
if (!setmodeneeded) // in case the previous setmode was not finished
setmodeneeded = modedescs[vidm_selected].modenum + 1;
}
break;
case KEY_ESCAPE: // this one same as M_Responder
if (currentMenu->prevMenu)
M_SetupNextMenu(currentMenu->prevMenu);
else
M_ClearMenus(true);
break;
default:
break;
}
}
// ===============
// Monitor Toggles
// ===============
Toggles for kitchen sink, ten banana, & quad orbinaut, and a screen that they can fit on
2018-08-31 17:18:19 +00:00
static consvar_t *kartitemcvs[NUMKARTRESULTS-1] = {
&cv_sneaker,
&cv_rocketsneaker,
&cv_invincibility,
&cv_banana,
&cv_eggmanmonitor,
&cv_orbinaut,
&cv_jawz,
&cv_mine,
&cv_ballhog,
&cv_selfpropelledbomb,
&cv_grow,
&cv_shrink,
&cv_thundershield,
&cv_hyudoro,
&cv_pogospring,
&cv_kitchensink,
&cv_triplesneaker,
&cv_triplebanana,
&cv_decabanana,
&cv_tripleorbinaut,
&cv_quadorbinaut,
&cv_dualjawz
};
:shitsfree:
2018-09-20 16:45:09 +00:00
static tic_t shitsfree = 0;
Toggles for kitchen sink, ten banana, & quad orbinaut, and a screen that they can fit on
2018-08-31 17:18:19 +00:00
static void M_DrawMonitorToggles(void)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Toggles for kitchen sink, ten banana, & quad orbinaut, and a screen that they can fit on
2018-08-31 17:18:19 +00:00
const INT32 edges = 4;
const INT32 height = 4;
const INT32 spacing = 35;
const INT32 column = itemOn/height;
//const INT32 row = itemOn%height;
INT32 leftdraw, rightdraw, totaldraw;
INT32 x = currentMenu->x, y = currentMenu->y+(spacing/4);
* User manual! * Some visual ordering fixes for the item menu, plus a #define-toggleable option for the bottom right slot to be traversable for ease-of-use purposes (even if it doesn't do anything).
2018-09-08 16:02:03 +00:00
INT32 onx = 0, ony = 0;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
consvar_t *cv;
* User manual! * Some visual ordering fixes for the item menu, plus a #define-toggleable option for the bottom right slot to be traversable for ease-of-use purposes (even if it doesn't do anything).
2018-09-08 16:02:03 +00:00
INT32 i, translucent, drawnum;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Toggles for kitchen sink, ten banana, & quad orbinaut, and a screen that they can fit on
2018-08-31 17:18:19 +00:00
M_DrawMenuTitle();
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Toggles for kitchen sink, ten banana, & quad orbinaut, and a screen that they can fit on
2018-08-31 17:18:19 +00:00
// Find the available space around column
leftdraw = rightdraw = column;
totaldraw = 0;
for (i = 0; (totaldraw < edges*2 && i < edges*4); i++)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Toggles for kitchen sink, ten banana, & quad orbinaut, and a screen that they can fit on
2018-08-31 17:18:19 +00:00
if (rightdraw+1 < (currentMenu->numitems/height)+1)
{
rightdraw++;
totaldraw++;
}
if (leftdraw-1 >= 0)
{
leftdraw--;
totaldraw++;
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
Toggles for kitchen sink, ten banana, & quad orbinaut, and a screen that they can fit on
2018-08-31 17:18:19 +00:00
for (i = leftdraw; i <= rightdraw; i++)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Toggles for kitchen sink, ten banana, & quad orbinaut, and a screen that they can fit on
2018-08-31 17:18:19 +00:00
INT32 j;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Toggles for kitchen sink, ten banana, & quad orbinaut, and a screen that they can fit on
2018-08-31 17:18:19 +00:00
for (j = 0; j < height; j++)
{
const INT32 thisitem = (i*height)+j;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Toggles for kitchen sink, ten banana, & quad orbinaut, and a screen that they can fit on
2018-08-31 17:18:19 +00:00
if (thisitem >= currentMenu->numitems)
continue;
* User manual! * Some visual ordering fixes for the item menu, plus a #define-toggleable option for the bottom right slot to be traversable for ease-of-use purposes (even if it doesn't do anything).
2018-09-08 16:02:03 +00:00
if (thisitem == itemOn)
{
onx = x;
ony = y;
y += spacing;
continue;
}
#ifdef ITEMTOGGLEBOTTOMRIGHT
if (currentMenu->menuitems[thisitem].alphaKey == 255)
{
V_DrawScaledPatch(x, y, V_TRANSLUCENT, W_CachePatchName("K_ISBG", PU_CACHE));
continue;
}
#endif
Toggle All option
2018-08-31 18:41:37 +00:00
if (currentMenu->menuitems[thisitem].alphaKey == 0)
{
* User manual! * Some visual ordering fixes for the item menu, plus a #define-toggleable option for the bottom right slot to be traversable for ease-of-use purposes (even if it doesn't do anything).
2018-09-08 16:02:03 +00:00
V_DrawScaledPatch(x, y, 0, W_CachePatchName("K_ISBG", PU_CACHE));
V_DrawScaledPatch(x, y, 0, W_CachePatchName("K_ISTOGL", PU_CACHE));
Toggle All option
2018-08-31 18:41:37 +00:00
continue;
}
Toggles for kitchen sink, ten banana, & quad orbinaut, and a screen that they can fit on
2018-08-31 17:18:19 +00:00
cv = kartitemcvs[currentMenu->menuitems[thisitem].alphaKey-1];
translucent = (cv->value ? 0 : V_TRANSLUCENT);
switch (currentMenu->menuitems[thisitem].alphaKey)
{
case KRITEM_DUALJAWZ:
drawnum = 2;
break;
case KRITEM_TRIPLESNEAKER:
case KRITEM_TRIPLEBANANA:
case KRITEM_TRIPLEORBINAUT:
* User manual! * Some visual ordering fixes for the item menu, plus a #define-toggleable option for the bottom right slot to be traversable for ease-of-use purposes (even if it doesn't do anything).
2018-09-08 16:02:03 +00:00
drawnum = 3;
Toggles for kitchen sink, ten banana, & quad orbinaut, and a screen that they can fit on
2018-08-31 17:18:19 +00:00
break;
case KRITEM_QUADORBINAUT:
* User manual! * Some visual ordering fixes for the item menu, plus a #define-toggleable option for the bottom right slot to be traversable for ease-of-use purposes (even if it doesn't do anything).
2018-09-08 16:02:03 +00:00
drawnum = 4;
Toggles for kitchen sink, ten banana, & quad orbinaut, and a screen that they can fit on
2018-08-31 17:18:19 +00:00
break;
case KRITEM_TENFOLDBANANA:
drawnum = 10;
break;
default:
* User manual! * Some visual ordering fixes for the item menu, plus a #define-toggleable option for the bottom right slot to be traversable for ease-of-use purposes (even if it doesn't do anything).
2018-09-08 16:02:03 +00:00
drawnum = 0;
Toggles for kitchen sink, ten banana, & quad orbinaut, and a screen that they can fit on
2018-08-31 17:18:19 +00:00
break;
}
* User manual! * Some visual ordering fixes for the item menu, plus a #define-toggleable option for the bottom right slot to be traversable for ease-of-use purposes (even if it doesn't do anything).
2018-09-08 16:02:03 +00:00
if (cv->value)
V_DrawScaledPatch(x, y, 0, W_CachePatchName("K_ISBG", PU_CACHE));
Toggles for kitchen sink, ten banana, & quad orbinaut, and a screen that they can fit on
2018-08-31 17:18:19 +00:00
else
* User manual! * Some visual ordering fixes for the item menu, plus a #define-toggleable option for the bottom right slot to be traversable for ease-of-use purposes (even if it doesn't do anything).
2018-09-08 16:02:03 +00:00
V_DrawScaledPatch(x, y, 0, W_CachePatchName("K_ISBGD", PU_CACHE));
Toggles for kitchen sink, ten banana, & quad orbinaut, and a screen that they can fit on
2018-08-31 17:18:19 +00:00
* User manual! * Some visual ordering fixes for the item menu, plus a #define-toggleable option for the bottom right slot to be traversable for ease-of-use purposes (even if it doesn't do anything).
2018-09-08 16:02:03 +00:00
if (drawnum != 0)
{
V_DrawScaledPatch(x, y, 0, W_CachePatchName("K_ISMUL", PU_CACHE));
V_DrawScaledPatch(x, y, translucent, W_CachePatchName(K_GetItemPatch(currentMenu->menuitems[thisitem].alphaKey, true), PU_CACHE));
V_DrawString(x+24, y+31, V_ALLOWLOWERCASE|translucent, va("x%d", drawnum));
Toggles for kitchen sink, ten banana, & quad orbinaut, and a screen that they can fit on
2018-08-31 17:18:19 +00:00
}
* User manual! * Some visual ordering fixes for the item menu, plus a #define-toggleable option for the bottom right slot to be traversable for ease-of-use purposes (even if it doesn't do anything).
2018-09-08 16:02:03 +00:00
else
V_DrawScaledPatch(x, y, translucent, W_CachePatchName(K_GetItemPatch(currentMenu->menuitems[thisitem].alphaKey, true), PU_CACHE));
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Toggles for kitchen sink, ten banana, & quad orbinaut, and a screen that they can fit on
2018-08-31 17:18:19 +00:00
y += spacing;
}
x += spacing;
y = currentMenu->y+(spacing/4);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
* User manual! * Some visual ordering fixes for the item menu, plus a #define-toggleable option for the bottom right slot to be traversable for ease-of-use purposes (even if it doesn't do anything).
2018-09-08 16:02:03 +00:00
{
#ifdef ITEMTOGGLEBOTTOMRIGHT
if (currentMenu->menuitems[itemOn].alphaKey == 255)
:shitsfree:
2018-09-20 16:45:09 +00:00
{
* User manual! * Some visual ordering fixes for the item menu, plus a #define-toggleable option for the bottom right slot to be traversable for ease-of-use purposes (even if it doesn't do anything).
2018-09-08 16:02:03 +00:00
V_DrawScaledPatch(onx-1, ony-2, V_TRANSLUCENT, W_CachePatchName("K_ITBG", PU_CACHE));
:shitsfree:
2018-09-20 16:45:09 +00:00
if (shitsfree)
{
INT32 trans = V_TRANSLUCENT;
if (shitsfree-1 > TICRATE-5)
trans = ((10-TICRATE)+shitsfree-1)<<V_ALPHASHIFT;
else if (shitsfree < 5)
trans = (10-shitsfree)<<V_ALPHASHIFT;
V_DrawScaledPatch(onx-1, ony-2, trans, W_CachePatchName("K_ITFREE", PU_CACHE));
}
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
else
* User manual! * Some visual ordering fixes for the item menu, plus a #define-toggleable option for the bottom right slot to be traversable for ease-of-use purposes (even if it doesn't do anything).
2018-09-08 16:02:03 +00:00
#endif
if (currentMenu->menuitems[itemOn].alphaKey == 0)
{
V_DrawScaledPatch(onx-1, ony-2, 0, W_CachePatchName("K_ITBG", PU_CACHE));
V_DrawScaledPatch(onx-1, ony-2, 0, W_CachePatchName("K_ITTOGL", PU_CACHE));
}
else
{
cv = kartitemcvs[currentMenu->menuitems[itemOn].alphaKey-1];
translucent = (cv->value ? 0 : V_TRANSLUCENT);
switch (currentMenu->menuitems[itemOn].alphaKey)
{
case KRITEM_DUALJAWZ:
drawnum = 2;
break;
case KRITEM_TRIPLESNEAKER:
case KRITEM_TRIPLEBANANA:
drawnum = 3;
break;
case KRITEM_TENFOLDBANANA:
drawnum = 10;
break;
default:
drawnum = 0;
break;
}
if (cv->value)
V_DrawScaledPatch(onx-1, ony-2, 0, W_CachePatchName("K_ITBG", PU_CACHE));
else
V_DrawScaledPatch(onx-1, ony-2, 0, W_CachePatchName("K_ITBGD", PU_CACHE));
if (drawnum != 0)
{
V_DrawScaledPatch(onx-1, ony-2, 0, W_CachePatchName("K_ITMUL", PU_CACHE));
V_DrawScaledPatch(onx-1, ony-2, translucent, W_CachePatchName(K_GetItemPatch(currentMenu->menuitems[itemOn].alphaKey, false), PU_CACHE));
V_DrawScaledPatch(onx+27, ony+39, translucent, W_CachePatchName("K_ITX", PU_CACHE));
V_DrawKartString(onx+37, ony+34, translucent, va("%d", drawnum));
}
else
V_DrawScaledPatch(onx-1, ony-2, translucent, W_CachePatchName(K_GetItemPatch(currentMenu->menuitems[itemOn].alphaKey, false), PU_CACHE));
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
:shitsfree:
2018-09-20 16:45:09 +00:00
if (shitsfree)
shitsfree--;
Toggles for kitchen sink, ten banana, & quad orbinaut, and a screen that they can fit on
2018-08-31 17:18:19 +00:00
V_DrawCenteredString(BASEVIDWIDTH/2, currentMenu->y, highlightflags, va("* %s *", currentMenu->menuitems[itemOn].text));
}
static void M_HandleMonitorToggles(INT32 choice)
{
const INT32 width = 6, height = 4;
INT32 column = itemOn/height, row = itemOn%height;
INT16 next;
Toggle All option
2018-08-31 18:41:37 +00:00
UINT8 i;
* User manual! * Some visual ordering fixes for the item menu, plus a #define-toggleable option for the bottom right slot to be traversable for ease-of-use purposes (even if it doesn't do anything).
2018-09-08 16:02:03 +00:00
boolean exitmenu = false;
Toggles for kitchen sink, ten banana, & quad orbinaut, and a screen that they can fit on
2018-08-31 17:18:19 +00:00
switch (choice)
{
case KEY_RIGHTARROW:
S_StartSound(NULL, sfx_menu1);
column++;
if (((column*height)+row) >= currentMenu->numitems)
column = 0;
next = min(((column*height)+row), currentMenu->numitems-1);
itemOn = next;
break;
case KEY_LEFTARROW:
S_StartSound(NULL, sfx_menu1);
column--;
if (column < 0)
column = width-1;
if (((column*height)+row) >= currentMenu->numitems)
column--;
next = max(((column*height)+row), 0);
if (next >= currentMenu->numitems)
next = currentMenu->numitems-1;
itemOn = next;
break;
case KEY_DOWNARROW:
S_StartSound(NULL, sfx_menu1);
row = (row+1) % height;
if (((column*height)+row) >= currentMenu->numitems)
row = 0;
next = min(((column*height)+row), currentMenu->numitems-1);
itemOn = next;
break;
case KEY_UPARROW:
S_StartSound(NULL, sfx_menu1);
row = (row-1) % height;
if (row < 0)
row = height-1;
if (((column*height)+row) >= currentMenu->numitems)
row--;
next = max(((column*height)+row), 0);
if (next >= currentMenu->numitems)
next = currentMenu->numitems-1;
itemOn = next;
break;
case KEY_ENTER:
* User manual! * Some visual ordering fixes for the item menu, plus a #define-toggleable option for the bottom right slot to be traversable for ease-of-use purposes (even if it doesn't do anything).
2018-09-08 16:02:03 +00:00
#ifdef ITEMTOGGLEBOTTOMRIGHT
if (currentMenu->menuitems[itemOn].alphaKey == 255)
:shitsfree:
2018-09-20 16:45:09 +00:00
{
final menu tweaks before i fall asleep in my chair
2018-11-14 01:27:01 +00:00
//S_StartSound(NULL, sfx_s26d);
:shitsfree:
2018-09-20 16:45:09 +00:00
if (!shitsfree)
{
shitsfree = TICRATE;
S_StartSound(NULL, sfx_itfree);
}
}
* User manual! * Some visual ordering fixes for the item menu, plus a #define-toggleable option for the bottom right slot to be traversable for ease-of-use purposes (even if it doesn't do anything).
2018-09-08 16:02:03 +00:00
else
#endif
Toggle All option
2018-08-31 18:41:37 +00:00
if (currentMenu->menuitems[itemOn].alphaKey == 0)
{
INT32 v = cv_sneaker.value;
S_StartSound(NULL, sfx_s1b4);
for (i = 0; i < NUMKARTRESULTS-1; i++)
{
if (kartitemcvs[i]->value == v)
CV_AddValue(kartitemcvs[i], 1);
}
}
else
{
S_StartSound(NULL, sfx_s1ba);
CV_AddValue(kartitemcvs[currentMenu->menuitems[itemOn].alphaKey-1], 1);
}
Toggles for kitchen sink, ten banana, & quad orbinaut, and a screen that they can fit on
2018-08-31 17:18:19 +00:00
break;
case KEY_ESCAPE:
* User manual! * Some visual ordering fixes for the item menu, plus a #define-toggleable option for the bottom right slot to be traversable for ease-of-use purposes (even if it doesn't do anything).
2018-09-08 16:02:03 +00:00
exitmenu = true;
Toggles for kitchen sink, ten banana, & quad orbinaut, and a screen that they can fit on
2018-08-31 17:18:19 +00:00
break;
}
* User manual! * Some visual ordering fixes for the item menu, plus a #define-toggleable option for the bottom right slot to be traversable for ease-of-use purposes (even if it doesn't do anything).
2018-09-08 16:02:03 +00:00
if (exitmenu)
{
if (currentMenu->prevMenu)
M_SetupNextMenu(currentMenu->prevMenu);
else
M_ClearMenus(true);
}
Toggles for kitchen sink, ten banana, & quad orbinaut, and a screen that they can fit on
2018-08-31 17:18:19 +00:00
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// =========
// Quit Game
// =========
static INT32 quitsounds[] =
{
// holy shit we're changing things up!
replacement quit sounds per sal
2018-11-14 01:30:26 +00:00
// srb2kart: you ain't seen nothing yet
sfx_kc2e,
sfx_kc2f,
sfx_cdfm01,
sfx_ddash,
sfx_s3ka2,
sfx_s3k49,
sfx_slip,
sfx_tossed,
sfx_s3k7b,
sfx_itrolf,
sfx_itrole,
sfx_cdpcm9,
sfx_s3k4e,
sfx_s259,
sfx_3db06,
sfx_s3k3a,
sfx_peel,
sfx_cdfm28,
sfx_s3k96,
sfx_s3kc0s,
sfx_cdfm39,
sfx_hogbom,
sfx_kc5a,
sfx_kc46,
sfx_s3k92,
sfx_s3k42,
sfx_kpogos,
sfx_screec
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
};
void M_QuitResponse(INT32 ch)
{
tic_t ptime;
INT32 mrand;
if (ch != 'y' && ch != KEY_ENTER)
return;
if (!(netgame || cv_debug))
{
mrand = M_RandomKey(sizeof(quitsounds)/sizeof(INT32));
if (quitsounds[mrand]) S_StartSound(NULL, quitsounds[mrand]);
//added : 12-02-98: do that instead of I_WaitVbl which does not work
ptime = I_GetTime() + NEWTICRATE*2; // Shortened the quit time, used to be 2 seconds Tails 03-26-2001
while (ptime > I_GetTime())
{
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
V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 31);
Our quit screen is 640x400 There's a small fix for V_DrawFixedPatch that makes it account for scale when blacking out the rest of the screen, for when scale is 50% or 25%, but can theoretically work with any scale
2018-01-15 21:02:33 +00:00
V_DrawSmallScaledPatch(0, 0, 0, W_CachePatchName("GAMEQUIT", PU_CACHE)); // Demo 3 Quit Screen Tails 06-16-2001
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
I_FinishUpdate(); // Update the screen with the image Tails 06-19-2001
Implement Uncapped (squashed) Co-Authored-By: Sally Coolatta <tehrealsalt@gmail.com> Co-Authored-By: James R <justsomejames2@gmail.com> Co-Authored-By: Monster Iestyn <iestynjealous@ntlworld.com> Co-Authored-By: katsy <katmint@live.com> Place Frame Interpolation in "Experimental" video options header This seems like an appropriate way to describe the feature for now. Add smooth level platter under interpolation, `renderdeltatics` `renderdeltatics` can be used as a standard delta time in any place, allowing for smooth menus. It will always be equal to `realtics` when frame interpolation is turned off, producing consistent framerate behavior everywhere it is used. Add smooth rendering to save select screen Add smooth rendering to Record/NiGHTS Attack, F_SkyScroll Ensure viewsector is accurate to viewx/viewy This fixes a potential crash in OpenGL when changing between levels. Ensure + commands get executed before map start Always have precise_t defined Fix misc dropshadow issues Reset view interpolation on level load Remove unnecessary precipmobj thinker hack Add reset interpolation state functions Reset precip interpolation on snap to ceil Reset mobj interp state on TeleportMove Only swap view interp state if a tick is run Run anti-lag chasecam at tic frequency Fixes jittery and unstable chasecam in high latency netgames Homogenize mobj interpolations Add sector plane level interpolations Add SectorScroll interpolator Add SideScroll interpolator Add Polyobj interpolator Intialize interpolator list at a better time Delete interpolators associated with thinkers Interpolate mobj angles and player drawangle Interpolate HWR_DrawModel Add functions to handle interpolation Much less code duplication P_InitAngle, to fix angle interpolation on spawning objects Fully fix drop shadows It used the thing's floorz / ceilingz directly -- that wouldn't account for interpolated coordinates. Do not speed up underwater/heatwave effect in OpenGL Closer OpenGL underwater/heatwave effect to Software Interpolate from time of previous tic Previously interpolated from last 35th of a second, which may be offset from game time due to connection lag. Consider this the proper fix to 54148a0dd0 too. Calculate FPS stuff even if frame is skipped I decided ultimately to actually keep the frame skip optimization disabled, because I think it is actually a little bit helpful that you can still get accurate rendering perfstats while paused, however if we decide otherwise then we can have this optimization back without making the game act like it's lagging. Keep rect in memory Feel better about this than creating one all da time Lots of FPS stuff - Disabled VSync, due to the numerous problems it has. - Instead, added an FPS cap. - Frame interpolation is now tied to fpscap != 35. - By default, the FPS cap is set to the monitor's refresh rate. - Rewrote the FPS counter. (This also consolidates several more commits ahead of this fixing various issues. -eid) Misc changes after Kart cherry-picks Fix renderdeltatics with new timing data Update mobj oldstates before all thinkers Allow FPS cap values Adjust how FPS cap is checked to improve FPS stability Fix precip crash from missing vars Improve the framerate limiter's timing for extreme stable FPS Handle the sleep at the end of D_SRB2Loop instead of the start Simplifies logic in the other parts of the loop, and fixes problems with it frequently waiting too long. Reset mobj interp state on add Add mobj interpolator on load netgame Move mobj interpolators to r_fps Dynamic slope interpolators I_GetFrameTime to try and improve frame pace (It doesn't feel that much better though.) Move I_FinishUpdate to D_SRB2Loop to sync screen updates with FPS cap, use timestamps in I_FrameCapSleep to simplify the code Fix plane interpolation light level flickering Fix flickering plane interpolation for OpenGL in the exact same way Funny OpenGL renderer being at least 50% copy-pasted Software code :) P_SetOrigin & P_MoveOrigin to replace P_TeleportMove Convert P_TeleportMove use to origin funcs Revert "P_InitAngle, to fix angle interpolation on spawning objects" This reverts commit a80c98bd164a2748cbbfad9027b34601185d93f5. Waypoint polyobjects interpolate z & children Add interpolation to more moving plane types Adds interpolation to the following: - Crumbling platforms - Mario blocks - Floatbob platforms (this one works really strangely due to two thinkers, maybe double-check this one?) Reset overlays interp states each TryRunTics Interpolate model interpolation (lol) Use interp tracer pos for GL linkdraw Papersprite angle interpolation Makes the ending signpost smooth Move intermission emerald bounce to ticker Bring back shadows on polyobjects Also optimizes the method used so rings can show their shadows too. Using just the subsector is a tad bit imprecise admittedly but any more precise methods get really laggy. Fix a bunch of ticking in hu_ drawing functions Revert "Reset overlays interp states each TryRunTics" This reverts commit a71a216faa20e8751b3bd0157354e8d748940c92. Move intro ticking out of the drawer Adjust 1up monitor icon z offsets Fixes interpolation issues with 1up monitors. Delta time choose player menu animations Add drawerlib deltaTime function Interpolate afterimages further back Use old sleep in dedicated mode Clamp cechotimer to 0 Fixes issues with cechos staying on-screen and glitching out (NiGHTS items for example). Revert "Remove unnecessary precipmobj thinker hack" This reverts commit 0e38208620d19ec2ab690740438ac2fc7862a49e. Fix frame pacing when game lags behind The frame timestamp should've been made at the start of the frame, not the end. Fix I_FrameCapSleep not respecting cpusleep Jonathan Joestar bruh Allow dedicated to use precise sleep timing again Instead of only using one old sleep, just enforce framerate cap to match TICRATE. Make Lua TeleportMove call MoveOrigin Reset Metal fume interp state on appear Add interpdebug Put interpdebug stuff in perfstats instead Add timescale cvar Slow the game down to debug animations / interpolation problems! Speed it up if you need to get somewhere quickly while mapping! Enable timescale outside of DEVELOP builds It has NETVAR, so it should be fine -- put an end to useful debugging features excluded in multiplayer! Force interpolation when timescale != 1.0 Reset old_z in MT_LOCKON think Fixes interpolation artifacting due to spawn pos. Fix cutscenes in interp Fix boss1 laser in interp Interpolate mobj scale Precalculate refresh rate Slower PCs can have issue querying mode over and over. This might kinda suck for windowed mode if you have different refresh rate displays but oh well Fix interp scaling crashing software Reset interp scale when Lua sets .scale Disable angle interp on fresh mobjs Fix interp scale crash for hires sprites Interp shadow scales Copy interp state in P_SpawnMobjFromMobj Fix multiplayer character select Don't interpolate mobj state if frac = 1.0 Fix Mario block item placement Interpolate spritescale/offset x/y Fix offset copies for SpawnMobjFromMobj THANKS SAL Add Lua HUD drawlists Buffers draw calls between tics to ensure hooks run at the originally intended rate. Rename drawerlib deltaTime to getDeltaTime Make renderisnewtic is false between tics I know what I'm doing! I swear Completely refactor timing system Time is now tracked internally in the game using I_GetPreciseTime and I_UpdateTime. I_Time now pulls from this internal timer. The system code no longer needs to keep track of time itself. This significantly improves frame and tic timing in interp mode, resulting in a much smoother image with essentially no judder at any framerate. Ensure mobj interpolators reset on level load Ensure view is not interpolated on first frame Disable sprite offset interpolation (for now) Refactor timing code even more System layer is greatly simplified and framecap logic has been moved internally. I_Sleep now takes a sleep duration and I_SleepDuration generically implements a precise sleep with spin loop.
2019-10-06 22:40:52 +00:00
I_Sleep(cv_sleep.value);
I_UpdateTime(cv_timescale.value);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
}
I_Quit();
}
static void M_QuitSRB2(INT32 choice)
{
// We pick index 0 which is language sensitive, or one at random,
// between 1 and maximum number.
(void)choice;
M_StartMessage(quitmsg[M_RandomKey(NUM_QUITMESSAGES)], M_QuitResponse, MM_YESNO);
}
#ifdef HWRENDER
// =====================================================================
// OpenGL specific options
// =====================================================================
// =====================
// M_OGL_DrawColorMenu()
// =====================
static void M_OGL_DrawColorMenu(void)
{
INT32 mx, my;
mx = currentMenu->x;
my = currentMenu->y;
M_DrawGenericMenu(); // use generic drawer for cursor, items and title
V_DrawString(mx, my + currentMenu->menuitems[0].alphaKey - 10,
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
highlightflags, "Gamma correction");
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
#endif
Invite menu started Functions! Is not pretty yet!
2020-08-21 08:14:33 +00:00
#ifdef HAVE_DISCORDRPC
Menu is pretty now
2020-08-22 07:52:07 +00:00
static const tic_t confirmLength = 3*TICRATE/4;
static tic_t confirmDelay = 0;
static boolean confirmAccept = false;
Invite menu started Functions! Is not pretty yet!
2020-08-21 08:14:33 +00:00
static void M_HandleDiscordRequests(INT32 choice)
{
Add envelope icon, add sounds
2020-08-22 08:54:08 +00:00
if (confirmDelay > 0)
return;
Invite menu started Functions! Is not pretty yet!
2020-08-21 08:14:33 +00:00
switch (choice)
{
case KEY_ENTER:
Menu is pretty now
2020-08-22 07:52:07 +00:00
Discord_Respond(discordRequestList->userID, DISCORD_REPLY_YES);
confirmAccept = true;
confirmDelay = confirmLength;
Add envelope icon, add sounds
2020-08-22 08:54:08 +00:00
S_StartSound(NULL, sfx_s3k63);
break;
case KEY_ESCAPE:
Discord_Respond(discordRequestList->userID, DISCORD_REPLY_NO);
confirmAccept = false;
confirmDelay = confirmLength;
S_StartSound(NULL, sfx_s3kb2);
Invite menu started Functions! Is not pretty yet!
2020-08-21 08:14:33 +00:00
break;
}
Menu is pretty now
2020-08-22 07:52:07 +00:00
}
Invite menu started Functions! Is not pretty yet!
2020-08-21 08:14:33 +00:00
Menu is pretty now
2020-08-22 07:52:07 +00:00
static const char *M_GetDiscordName(discordRequest_t *r)
{
if (r == NULL)
return "";
if (cv_discordstreamer.value)
return r->username;
return va("%s#%s", r->username, r->discriminator);
}
// (this goes in k_hud.c when merged into v2)
Rename the "small" variable to "isSmall" Reported by MK, apparently "small" is considered a data type for some systems. After a little bit of research, apparently it can happen when including <windows.h>... whatever, just rename the variable :p
2020-09-14 16:47:55 +00:00
static void M_DrawSticker(INT32 x, INT32 y, INT32 width, INT32 flags, boolean isSmall)
Menu is pretty now
2020-08-22 07:52:07 +00:00
{
patch_t *stickerEnd;
INT32 height;
Rename the "small" variable to "isSmall" Reported by MK, apparently "small" is considered a data type for some systems. After a little bit of research, apparently it can happen when including <windows.h>... whatever, just rename the variable :p
2020-09-14 16:47:55 +00:00
if (isSmall == true)
Invite menu started Functions! Is not pretty yet!
2020-08-21 08:14:33 +00:00
{
Menu is pretty now
2020-08-22 07:52:07 +00:00
stickerEnd = W_CachePatchName("K_STIKE2", PU_CACHE);
height = 6;
}
else
{
stickerEnd = W_CachePatchName("K_STIKEN", PU_CACHE);
height = 11;
Invite menu started Functions! Is not pretty yet!
2020-08-21 08:14:33 +00:00
}
Menu is pretty now
2020-08-22 07:52:07 +00:00
V_DrawFixedPatch(x*FRACUNIT, y*FRACUNIT, FRACUNIT, flags, stickerEnd, NULL);
V_DrawFill(x, y, width, height, 24|flags);
V_DrawFixedPatch((x + width)*FRACUNIT, y*FRACUNIT, FRACUNIT, flags|V_FLIP, stickerEnd, NULL);
Invite menu started Functions! Is not pretty yet!
2020-08-21 08:14:33 +00:00
}
static void M_DrawDiscordRequests(void)
{
discordRequest_t *curRequest = discordRequestList;
Menu is pretty now
2020-08-22 07:52:07 +00:00
UINT8 *colormap;
patch_t *hand = NULL;
boolean removeRequest = false;
const char *wantText = "...would like to join!";
Use ENTER and ESC A and B are v2 terminology
2020-08-31 01:42:04 +00:00
const char *controlText = "\x82" "ENTER" "\x80" " - Accept " "\x82" "ESC" "\x80" " - Decline";
Invite menu started Functions! Is not pretty yet!
2020-08-21 08:14:33 +00:00
Menu is pretty now
2020-08-22 07:52:07 +00:00
INT32 x = 100;
INT32 y = 133;
Invite menu started Functions! Is not pretty yet!
2020-08-21 08:14:33 +00:00
Menu is pretty now
2020-08-22 07:52:07 +00:00
INT32 slide = 0;
INT32 maxYSlide = 18;
if (confirmDelay > 0)
Invite menu started Functions! Is not pretty yet!
2020-08-21 08:14:33 +00:00
{
Menu is pretty now
2020-08-22 07:52:07 +00:00
if (confirmAccept == true)
{
colormap = R_GetTranslationColormap(TC_DEFAULT, SKINCOLOR_GREEN, GTC_MENUCACHE);
hand = W_CachePatchName("K_LAPH02", PU_CACHE);
}
else
{
colormap = R_GetTranslationColormap(TC_DEFAULT, SKINCOLOR_RED, GTC_MENUCACHE);
hand = W_CachePatchName("K_LAPH03", PU_CACHE);
}
slide = confirmLength - confirmDelay;
confirmDelay--;
if (confirmDelay == 0)
removeRequest = true;
}
else
{
colormap = R_GetTranslationColormap(TC_DEFAULT, SKINCOLOR_GREY, GTC_MENUCACHE);
Invite menu started Functions! Is not pretty yet!
2020-08-21 08:14:33 +00:00
}
Menu is pretty now
2020-08-22 07:52:07 +00:00
V_DrawFixedPatch(56*FRACUNIT, 150*FRACUNIT, FRACUNIT, 0, W_CachePatchName("K_LAPE01", PU_CACHE), colormap);
if (hand != NULL)
{
fixed_t handoffset = (4 - abs((signed)(skullAnimCounter - 4))) * FRACUNIT;
V_DrawFixedPatch(56*FRACUNIT, 150*FRACUNIT + handoffset, FRACUNIT, 0, hand, NULL);
}
M_DrawSticker(x + (slide * 32), y - 1, V_ThinStringWidth(M_GetDiscordName(curRequest), V_ALLOWLOWERCASE|V_6WIDTHSPACE), 0, false);
V_DrawThinString(x + (slide * 32), y, V_ALLOWLOWERCASE|V_6WIDTHSPACE|V_YELLOWMAP, M_GetDiscordName(curRequest));
M_DrawSticker(x, y + 12, V_ThinStringWidth(wantText, V_ALLOWLOWERCASE|V_6WIDTHSPACE), 0, true);
V_DrawThinString(x, y + 10, V_ALLOWLOWERCASE|V_6WIDTHSPACE, wantText);
M_DrawSticker(x, y + 26, V_ThinStringWidth(controlText, V_ALLOWLOWERCASE|V_6WIDTHSPACE), 0, true);
V_DrawThinString(x, y + 24, V_ALLOWLOWERCASE|V_6WIDTHSPACE, controlText);
y -= 18;
Invite menu started Functions! Is not pretty yet!
2020-08-21 08:14:33 +00:00
while (curRequest->next != NULL)
{
Menu is pretty now
2020-08-22 07:52:07 +00:00
INT32 ySlide = min(slide * 4, maxYSlide);
Invite menu started Functions! Is not pretty yet!
2020-08-21 08:14:33 +00:00
curRequest = curRequest->next;
Menu is pretty now
2020-08-22 07:52:07 +00:00
M_DrawSticker(x, y - 1 + ySlide, V_ThinStringWidth(M_GetDiscordName(curRequest), V_ALLOWLOWERCASE|V_6WIDTHSPACE), 0, false);
V_DrawThinString(x, y + ySlide, V_ALLOWLOWERCASE|V_6WIDTHSPACE, M_GetDiscordName(curRequest));
y -= 12;
maxYSlide = 12;
}
if (removeRequest == true)
{
DRPC_RemoveRequest(discordRequestList);
if (discordRequestList == NULL)
{
// No other requests
Ask to join is a menu option, rather than trying to replace your menu temporarily.
2020-08-22 11:16:52 +00:00
MPauseMenu[mpause_discordrequests].status = IT_GRAYEDOUT;
Menu is pretty now
2020-08-22 07:52:07 +00:00
if (currentMenu->prevMenu)
Ask to join is a menu option, rather than trying to replace your menu temporarily.
2020-08-22 11:16:52 +00:00
{
Menu is pretty now
2020-08-22 07:52:07 +00:00
M_SetupNextMenu(currentMenu->prevMenu);
Ask to join is a menu option, rather than trying to replace your menu temporarily.
2020-08-22 11:16:52 +00:00
if (currentMenu == &MPauseDef)
itemOn = mpause_continue;
}
Menu is pretty now
2020-08-22 07:52:07 +00:00
else
M_ClearMenus(true);
return;
}
Invite menu started Functions! Is not pretty yet!
2020-08-21 08:14:33 +00:00
}
}
#endif
Reference in a new issue Copy permalink