stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-25 05:41:42 +00:00
Code Issues Projects Releases Packages Wiki Activity
SRB2/src/g_game.c

5216 lines
136 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.
Update copyright year to 2020
2020-02-19 22:08:45 +00:00
// Copyright (C) 1999-2020 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 g_game.c
/// \brief game loop functions, events handling
#include "doomdef.h"
#include "console.h"
#include "d_main.h"
#include "d_player.h"
Prevent just anyone from skipping credits but allow admins exitlevel works too
2019-03-25 23:17:02 +00:00
#include "d_clisrv.h"
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
#include "f_finale.h"
#include "p_setup.h"
#include "p_saveg.h"
#include "i_system.h"
#include "am_map.h"
#include "m_random.h"
#include "p_local.h"
#include "r_draw.h"
#include "r_main.h"
#include "s_sound.h"
#include "g_game.h"
Created g_demo.c/.h, for the demo recording and playback code that formerly lived in g_game.c
2020-03-19 20:09:55 +00:00
#include "g_demo.h"
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
#include "m_cheat.h"
#include "m_misc.h"
#include "m_menu.h"
#include "m_argv.h"
#include "hu_stuff.h"
#include "st_stuff.h"
#include "z_zone.h"
#include "i_video.h"
#include "byteptr.h"
#include "i_joy.h"
#include "r_local.h"
Include r_skins.h instead of r_things.h in many files where all they wanted from it was skins stuff (oddly enough, this actually revealed some secret file dependencies previously included via r_things.h! I also needed to include d_player.h in r_skins.h itself it seems)
2020-03-09 13:54:56 +00:00
#include "r_skins.h"
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
#include "y_inter.h"
#include "v_video.h"
#include "lua_hook.h"
#include "b_bot.h"
#include "m_cond.h" // condition sets
lua
2019-11-18 16:50:44 +00:00
#include "lua_hud.h"
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
gameaction_t gameaction;
gamestate_t gamestate = GS_NULL;
UINT8 ultimatemode = false;
boolean botingame;
UINT8 botskin;
Make colors UINT16, increase color freeslots to 1024
2020-05-24 00:29:07 +00:00
UINT16 botcolor;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
JoyType_t Joystick;
JoyType_t Joystick2;
// 1024 bytes is plenty for a savegame
#define SAVEGAMESIZE (1024)
char gamedatafilename[64] = "gamedata.dat";
char timeattackfolder[64] = "main";
char customversionstring[32] = "\0";
static void G_DoCompleted(void);
static void G_DoStartContinue(void);
static void G_DoContinued(void);
static void G_DoWorldDone(void);
The concept of "music slots" doesn't exist anymore. Use whatever names you want for your music. So long as you prefix the lumps with O_ or D_, it doesn't matter anymore. DISCLAIMER: Linedef type 413 (change music) and Lua scripting is not tested. (cherry picked from commit 025ca413a2a01a8ec7c104748c2f510e350aa457) # Conflicts: # src/p_user.c
2016-01-08 03:48:20 +00:00
char mapmusname[7]; // Music name
UINT16 mapmusflags; // Track and reset bit
MusicPlus Core (positioning and fading) 2.2 -> 2.1 backport
2018-09-18 14:22:17 +00:00
UINT32 mapmusposition; // Position to jump to
The concept of "music slots" doesn't exist anymore. Use whatever names you want for your music. So long as you prefix the lumps with O_ or D_, it doesn't matter anymore. DISCLAIMER: Linedef type 413 (change music) and Lua scripting is not tested. (cherry picked from commit 025ca413a2a01a8ec7c104748c2f510e350aa457) # Conflicts: # src/p_user.c
2016-01-08 03:48:20 +00:00
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
INT16 gamemap = 1;
TOL/Level platter stuff
2019-12-18 16:24:10 +00:00
UINT32 maptol;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
UINT8 globalweather = 0;
INT32 curWeather = PRECIP_NONE;
* New, pretty save select! Requires patch.dta to really appreciate. * Changed the save format a little more, since I had free reign over it. * Modified the string drawing functions to not awkwardly clip at the very edges of the screen, considering the relevant patch drawing functions avoid out-of-range memory writes.
2017-08-20 22:18:47 +00:00
INT32 cursaveslot = 0; // Auto-save 1p savegame slot
Commenting out lastmapsaved
2017-08-04 17:57:47 +00:00
//INT16 lastmapsaved = 0; // Last map we auto-saved at
Added lastmaploaded to replace the lastmapsaved check This allows saving in special cases where you can go to a map that doesn't save, and then back to the map you saved on (see: SUBARASHII special stages), while still preventing you from killing your lives by repeatedly retrying in said map. Kept lastmapsaved just in case. Can be removed if deemed unnecessary.
2017-08-04 00:27:31 +00:00
INT16 lastmaploaded = 0; // Last map the game loaded
Introducing Marathon Run. (I was going to call it Marathon Mode, but NiGHTS Mode being right next to it on the menu looked terrible.) Basically a dedicated Record Attack-like experience for speedrunning the game as a continuous chunk rather than ILs. Has several quality of life features. Benefits include: * An unambiguous real-time bar across the bottom of the screen, always displaying the current time, ticking up until you reach the ending. * Disable the console (pausing is still allowed, but the timer will still increment). * Automatically skip intermissions as if you're holding down the spin button. * Show centiseconds on HUD automatically, like record attack. * "Live Event Backups" - a category of run fit for major events like GDQ, where recovery from crashes or chokes makes for better entertainment. Essentially a modified SP savefile, down to using the same basic functions, but has its own filename and tweaked internal layout. * "spmarathon_start" MainCfg block parameter and "marathonnext" mapheader parameter, allowing for a customised flow (makes this fit for purpose for an eventual SUGOI port). * Disabling inter-level custom cutscenes by default with a menu option to toggle this (won't show up if the mod doesn't *have* any custom cutscenes), although either way ending cutscenes (vanilla or custom) remain intact since is time is called before them. * Won't show up if you have a mod that consists of only one level (determined by spmarathon_start's nextlevel; this won't trip if you manually set its marathonnext). * Unconditional gratitude on the evaluation screen, instead of a negging "Try again..." if you didn't get all the emeralds (which you may not have been aiming for). * Gorgeous new menu (no new assets required, unless you wanna give it a header later). Changes which were required for the above but affect other areas of the game include: * "useBlackRock" MainCFG block parameter, which can be used to disable the presence of the Black Rock or Egg Rock in both the Evaluation screen and the Marathon Run menu (for total conversions with different stories). * Disabling Continues in NiGHTS mode, to match the most common singleplayer experience post 2.2.4's release (is reverted if useContinues is set to true). * Hiding the exitmove "powerup" outside of multiplayer. (Okay, this isn't really related, I just saw this bug in action a lot while doing test runs and got annoyed enough to fix it here.) * The ability to use V_DrawPromptBack (in hardcode only at the moment, but) to draw in terms of pixels rather than rows of text, by providing negative instead of positive inputs). * A refactoring of redundant game saves smattered across the ending, credits, and evaluation - in addition to saving the game slightly earlier. * Minor m_menu.c touchups and refactorings here and there. Built using feedback from the official server's #speedruns channel, among other places.
2020-05-14 22:10:00 +00:00
UINT8 gamecomplete = 0;
marathonmode_t marathonmode = 0;
tic_t marathontime = 0;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Starting lives revamp, per the 2.2 priorities topic list! * Each time you die, the number of game overs you've had is counted. * Your save file updates to record this. * The number of startinglives is determined by the number of times you'ved game-overed, with the maximum being infinity lives (thereby providing a cap on the number of game overs you can go through in a typical game). Requires a new patch.dta, but I'm not uploading that yet because not happy with the icon we've got going for infinity lives on the save select menu.
2017-08-17 23:58:16 +00:00
UINT8 numgameovers = 0; // for startinglives balance
SINT8 startinglivesbalance[maxgameovers+1] = {3, 5, 7, 9, 12, 15, 20, 25, 30, 40, 50, 75, 99, 0x7F};
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
UINT16 mainwads = 0;
boolean modifiedgame; // Set if homebrew PWAD stuff has been added.
boolean savemoddata = false;
UINT8 paused;
UINT8 modeattacking = ATTACKING_NONE;
boolean disableSpeedAdjust = false;
boolean imcontinuing = false;
boolean runemeraldmanager = false;
Add emeraldspawndelay for Match "super" Emeralds will not spawn while players are still enjoying their victory dance now.
2015-05-27 08:01:58 +00:00
UINT16 emeraldspawndelay = 60*TICRATE;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// menu demo things
tweak the defaults for titlescrollxspeed and numDemos
2019-08-11 21:28:32 +00:00
UINT8 numDemos = 0;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
UINT32 demoDelayTime = 15*TICRATE;
UINT32 demoIdleTime = 3*TICRATE;
boolean netgame; // only true if packets are broadcast
boolean multiplayer;
boolean playeringame[MAXPLAYERS];
boolean addedtogame;
player_t players[MAXPLAYERS];
INT32 consoleplayer; // player taking events and displaying
INT32 displayplayer; // view being displayed
INT32 secondarydisplayplayer; // for splitscreen
tic_t gametic;
tic_t levelstarttic; // gametic at level start
MONSTER COMMIT. OLD SPECIAL STAGES: * Spheres in old special stages instead of rings! * Individual timers in old special stages instead of a global one! * Old special stages use a variant of the NiGHTS HUD now! * Special stage damage in old special stages loses 5 seconds of time instead of 10 rings/spheres! * All damage gained through old special stages is converted to special stage damage! As a consequence, the special spikeball has no need to be special anymore. * Made emerald gaining function be based on special stage number rather than gained emeralds! * Consistency with... NiGHTS SPECIAL STAGES: * Spheres now flash in bonus time. https://cdn.discordapp.com/attachments/400761370800422922/452590553100713984/srb20032.gif * Sphere and ring mapthingnums are now less fucked up in 'em. (Rings are 300, same as usual, while Spheres are now 1706 replacing NiGHTS Wings.) SPECIAL STAGES IN GENERAL: * useNightsSS is now dead. Each individual special stage is now assessed for NiGHTS-mode behaviour based on maptol & TOL_NIGHTS. * CRAWLA HONCHO\n CAN NOW BE\n SUPER CRAWLA HONCHO end tally modification now also includes a mini-tutorial on turning super. https://cdn.discordapp.com/attachments/400761370800422922/452844894113759233/srb20036.gif * SONIC GOT A CHAOS EMERALD? https://cdn.discordapp.com/attachments/400761370800422922/452623869497573386/srb20034.gif NiGHTS NON-SPECIAL STAGES: * Colour Chips and Star Chips! Replaces Spheres and Rings of NiGHTS Special Stages. * Colour Chips turn yellow in bonus time. * Ideya! * Its own "drowning" music! * All of the object types for Dream Hill. * GIF: https://cdn.discordapp.com/attachments/400761370800422922/452844894113759233/srb20036.gif RANDOM BS: * Turn super with the spin button instead of the jump button! * Followmobj now correctly set with P_SetTarget instead of pointer assignment. * Emerald hunt uses new sprites! * Made unlock noise different from emblem gain noise! (It's the CRAWLA HONCHO CAN NOW TURN yadda yadda sound from S3K now.)
2018-06-03 21:41:54 +00:00
UINT32 ssspheres; // old special stage
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
INT16 lastmap; // last level you were at (returning from special stages)
tic_t timeinmap; // Ticker for time spent in level (used for levelcard display)
Introducing Marathon Run. (I was going to call it Marathon Mode, but NiGHTS Mode being right next to it on the menu looked terrible.) Basically a dedicated Record Attack-like experience for speedrunning the game as a continuous chunk rather than ILs. Has several quality of life features. Benefits include: * An unambiguous real-time bar across the bottom of the screen, always displaying the current time, ticking up until you reach the ending. * Disable the console (pausing is still allowed, but the timer will still increment). * Automatically skip intermissions as if you're holding down the spin button. * Show centiseconds on HUD automatically, like record attack. * "Live Event Backups" - a category of run fit for major events like GDQ, where recovery from crashes or chokes makes for better entertainment. Essentially a modified SP savefile, down to using the same basic functions, but has its own filename and tweaked internal layout. * "spmarathon_start" MainCfg block parameter and "marathonnext" mapheader parameter, allowing for a customised flow (makes this fit for purpose for an eventual SUGOI port). * Disabling inter-level custom cutscenes by default with a menu option to toggle this (won't show up if the mod doesn't *have* any custom cutscenes), although either way ending cutscenes (vanilla or custom) remain intact since is time is called before them. * Won't show up if you have a mod that consists of only one level (determined by spmarathon_start's nextlevel; this won't trip if you manually set its marathonnext). * Unconditional gratitude on the evaluation screen, instead of a negging "Try again..." if you didn't get all the emeralds (which you may not have been aiming for). * Gorgeous new menu (no new assets required, unless you wanna give it a header later). Changes which were required for the above but affect other areas of the game include: * "useBlackRock" MainCFG block parameter, which can be used to disable the presence of the Black Rock or Egg Rock in both the Evaluation screen and the Marathon Run menu (for total conversions with different stories). * Disabling Continues in NiGHTS mode, to match the most common singleplayer experience post 2.2.4's release (is reverted if useContinues is set to true). * Hiding the exitmove "powerup" outside of multiplayer. (Okay, this isn't really related, I just saw this bug in action a lot while doing test runs and got annoyed enough to fix it here.) * The ability to use V_DrawPromptBack (in hardcode only at the moment, but) to draw in terms of pixels rather than rows of text, by providing negative instead of positive inputs). * A refactoring of redundant game saves smattered across the ending, credits, and evaluation - in addition to saving the game slightly earlier. * Minor m_menu.c touchups and refactorings here and there. Built using feedback from the official server's #speedruns channel, among other places.
2020-05-14 22:10:00 +00:00
INT16 spstage_start, spmarathon_start;
FINAL CHANGE, I PROMISE, I THINK * MainCfg property smpstage_start - controls the special stage multiplayer games go to.
2018-06-06 15:07:14 +00:00
INT16 sstage_start, sstage_end, smpstage_start, smpstage_end;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
miru asked me for help and im a smelly toast * Fix Crashes With Respect To Switching Between The Normal Title And Her Magic One * Clean Up A Bit Of Code
2017-04-18 21:45:43 +00:00
INT16 titlemap = 0;
Titlemap - Maincfg variables, unplayability crash fixes
2017-04-18 21:36:54 +00:00
boolean hidetitlepics = false;
no idea why this was stashed while the last commit before this one was made..
2017-05-13 00:54:06 +00:00
INT16 bootmap; //bootmap for loading a map on startup
Titlemap - Maincfg variables, unplayability crash fixes
2017-04-18 21:36:54 +00:00
Added page tags and find page by tag * Added tutorial mode defines to this branch
2018-11-10 14:32:53 +00:00
INT16 tutorialmap = 0; // map to load for tutorial
boolean tutorialmode = false; // are we in a tutorial right now?
Uncomment gcs_platform defaults
2018-11-12 21:51:43 +00:00
INT32 tutorialgcs = gcs_custom; // which control scheme is loaded?
Change mouse cv vars temporarily alongside control scheme
2018-11-12 22:24:46 +00:00
INT32 tutorialusemouse = 0; // store cv_usemouse user value
INT32 tutorialfreelook = 0; // store cv_alwaysfreelook user value
INT32 tutorialmousemove = 0; // store cv_mousemove user value
Convert analog/directionchar cvars into 2-long arrays
2019-12-30 20:01:14 +00:00
INT32 tutorialanalog = 0; // store cv_analog[0] user value
Added page tags and find page by tag * Added tutorial mode defines to this branch
2018-11-10 14:32:53 +00:00
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
boolean looptitle = false;
Make colors UINT16, increase color freeslots to 1024
2020-05-24 00:29:07 +00:00
UINT16 skincolor_redteam = SKINCOLOR_RED;
UINT16 skincolor_blueteam = SKINCOLOR_BLUE;
UINT16 skincolor_redring = SKINCOLOR_SALMON;
UINT16 skincolor_bluering = SKINCOLOR_CORNFLOWER;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
tic_t countdowntimer = 0;
boolean countdowntimeup = false;
Declare exitfadestarted properly
2019-03-15 15:01:41 +00:00
boolean exitfadestarted = false;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
cutscene_t *cutscenes[128];
Hardcode tutorial prompt offset index
2018-11-10 15:06:51 +00:00
textprompt_t *textprompts[MAX_PROMPTS];
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
INT16 nextmapoverride;
* Made the evaluation screen even more attractive. * Fixed an unused variable warning in lua_skinlib.c. - fixed post-level cutscenes playing when you get game over in MP (still kinda on-topic) Also with apologies to MI: - golden egg statue mode for tutorial, since the grey doesn't contrast enough with the blue and lime green - fixed closed captions for replaced player sounds being incorrect - fixed closed captions overlapping tutorial text
2019-07-29 13:55:36 +00:00
UINT8 skipstats;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Pointers to each CTF flag
mobj_t *redflag;
mobj_t *blueflag;
// Pointers to CTF spawn location
mapthing_t *rflagpoint;
mapthing_t *bflagpoint;
struct quake quake;
// Map Header Information
mapheader_t* mapheaderinfo[NUMMAPS] = {NULL};
static boolean exitgame = false;
static boolean retrying = false;
fix RA fade
2019-11-23 21:15:09 +00:00
static boolean retryingmodeattack = false;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
UINT8 stagefailed; // Used for GEMS BONUS? Also to see if you beat the stage.
UINT16 emeralds;
Use HAVE_BLUA as fuel for my fireplace
2020-03-19 17:36:14 +00:00
INT32 luabanks[NUM_LUABANKS];
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
UINT32 token; // Number of tokens collected in a level
UINT32 tokenlist; // List of tokens collected
Emerald tokens being used as actual game tokens on the end-of-act screen! https://gfycat.com/PlumpShowyBream https://gfycat.com/AlarmingLoathsomeBelugawhale
2017-04-24 20:56:17 +00:00
boolean gottoken; // Did you get a token? Used for end of act
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
INT32 tokenbits; // Used for setting token bits
// Old Special Stage
INT32 sstimer; // Time allotted in the special stage
tic_t totalplaytime;
boolean gamedataloaded = false;
// Time attack data for levels
// These are dynamically allocated for space reasons now
recorddata_t *mainrecords[NUMMAPS] = {NULL};
nightsdata_t *nightsrecords[NUMMAPS] = {NULL};
UINT8 mapvisited[NUMMAPS];
// Temporary holding place for nights data for the current map
nightsdata_t ntemprecords;
UINT32 bluescore, redscore; // CTF and Team Match team scores
// ring count... for PERFECT!
INT32 nummaprings = 0;
// Elminates unnecessary searching.
boolean CheckForBustableBlocks;
boolean CheckForBouncySector;
boolean CheckForQuicksand;
boolean CheckForMarioBlocks;
boolean CheckForFloatBob;
boolean CheckForReverseGravity;
// Powerup durations
UINT16 invulntics = 20*TICRATE;
UINT16 sneakertics = 20*TICRATE;
UINT16 flashingtics = 3*TICRATE;
UINT16 tailsflytics = 8*TICRATE;
UINT16 underwatertics = 30*TICRATE;
UINT16 spacetimetics = 11*TICRATE + (TICRATE/2);
UINT16 extralifetics = 4*TICRATE;
Standardize NiGHTS link timer w/ NightsLinkTics MAINCFG option
2018-08-10 03:14:14 +00:00
UINT16 nightslinktics = 2*TICRATE;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Tweak gameovertics slightly to avoid having no sound for too long.
2019-09-11 12:30:24 +00:00
INT32 gameovertics = 11*TICRATE;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Show a negative number to indicate ammo penalty
2019-08-26 23:07:17 +00:00
UINT8 ammoremovaltics = 2*TICRATE;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
UINT8 use1upSound = 0;
UINT8 maxXtraLife = 2; // Max extra lives from rings
Disable continues outside of no-save/Ultimate by default, but allow SOC to re-enable them globally. Please look at the merge request description for a full explanation, since I know the vanilla team has been hashing this out and I don't want to add fuel to the fire without at least presenting a solid case.
2020-03-26 20:16:44 +00:00
UINT8 useContinues = 0; // Set to 1 to enable continues outside of no-save scenarioes
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
UINT8 introtoplay;
UINT8 creditscutscene;
Introducing Marathon Run. (I was going to call it Marathon Mode, but NiGHTS Mode being right next to it on the menu looked terrible.) Basically a dedicated Record Attack-like experience for speedrunning the game as a continuous chunk rather than ILs. Has several quality of life features. Benefits include: * An unambiguous real-time bar across the bottom of the screen, always displaying the current time, ticking up until you reach the ending. * Disable the console (pausing is still allowed, but the timer will still increment). * Automatically skip intermissions as if you're holding down the spin button. * Show centiseconds on HUD automatically, like record attack. * "Live Event Backups" - a category of run fit for major events like GDQ, where recovery from crashes or chokes makes for better entertainment. Essentially a modified SP savefile, down to using the same basic functions, but has its own filename and tweaked internal layout. * "spmarathon_start" MainCfg block parameter and "marathonnext" mapheader parameter, allowing for a customised flow (makes this fit for purpose for an eventual SUGOI port). * Disabling inter-level custom cutscenes by default with a menu option to toggle this (won't show up if the mod doesn't *have* any custom cutscenes), although either way ending cutscenes (vanilla or custom) remain intact since is time is called before them. * Won't show up if you have a mod that consists of only one level (determined by spmarathon_start's nextlevel; this won't trip if you manually set its marathonnext). * Unconditional gratitude on the evaluation screen, instead of a negging "Try again..." if you didn't get all the emeralds (which you may not have been aiming for). * Gorgeous new menu (no new assets required, unless you wanna give it a header later). Changes which were required for the above but affect other areas of the game include: * "useBlackRock" MainCFG block parameter, which can be used to disable the presence of the Black Rock or Egg Rock in both the Evaluation screen and the Marathon Run menu (for total conversions with different stories). * Disabling Continues in NiGHTS mode, to match the most common singleplayer experience post 2.2.4's release (is reverted if useContinues is set to true). * Hiding the exitmove "powerup" outside of multiplayer. (Okay, this isn't really related, I just saw this bug in action a lot while doing test runs and got annoyed enough to fix it here.) * The ability to use V_DrawPromptBack (in hardcode only at the moment, but) to draw in terms of pixels rather than rows of text, by providing negative instead of positive inputs). * A refactoring of redundant game saves smattered across the ending, credits, and evaluation - in addition to saving the game slightly earlier. * Minor m_menu.c touchups and refactorings here and there. Built using feedback from the official server's #speedruns channel, among other places.
2020-05-14 22:10:00 +00:00
UINT8 useBlackRock = 1;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Emerald locations
mobj_t *hunt1;
mobj_t *hunt2;
mobj_t *hunt3;
UINT32 countdown, countdown2; // for racing
fixed_t gravity;
INT16 autobalance; //for CTF team balance
INT16 teamscramble; //for CTF team scramble
INT16 scrambleplayers[MAXPLAYERS]; //for CTF team scramble
INT16 scrambleteams[MAXPLAYERS]; //for CTF team scramble
INT16 scrambletotal; //for CTF team scramble
INT16 scramblecount; //for CTF team scramble
INT32 cheats; //for multiplayer cheat commands
tic_t hidetime;
// Grading
UINT32 timesBeaten;
UINT32 timesBeatenWithEmeralds;
UINT32 timesBeatenUltimate;
Use Scaled Radial Deadzones, instead of Axial deadzones. Additionally fixes some weird padscale 0 stuff that was flipped. This does have gameplay implications in both NiGHTS and regular gameplay. Notably you won't feel like you're locked into up/down left/right when you want to turn, but this can make running perfectly straight a little bit more tricky.
2019-12-15 14:37:30 +00:00
typedef struct joystickvector2_s
{
INT32 xaxis;
INT32 yaxis;
} joystickvector2_t;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
boolean precache = true; // if true, load all graphics at start
INT16 prevmap, nextmap;
static UINT8 *savebuffer;
// Analog Control
static void UserAnalog_OnChange(void);
static void UserAnalog2_OnChange(void);
static void Analog_OnChange(void);
static void Analog2_OnChange(void);
* cv_directionchar and cv_autobrake, and their secondplayer versions (both on by default) now exist. * cv_useranalog is now hidden from the menu. * Directionchar now attempts to face the camera direction when you're standing still, and handles a few other states with more decorum. * Tailsbot is now slightly more capable of keeping up with Sonic. * pflags rearranged/adjusted, combining a few non-simulstaneous ones and turning PF_NIGHTSFALL into CR_NIGHTSFALL. * [unrelated to branch] all ground-impact based abilities now happen more consistently with quicksand.
2017-09-15 19:34:46 +00:00
static void DirectionChar_OnChange(void);
static void DirectionChar2_OnChange(void);
static void AutoBrake_OnChange(void);
static void AutoBrake2_OnChange(void);
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
void SendWeaponPref(void);
void SendWeaponPref2(void);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
static CV_PossibleValue_t crosshair_cons_t[] = {{0, "Off"}, {1, "Cross"}, {2, "Angle"}, {3, "Point"}, {0, NULL}};
static CV_PossibleValue_t joyaxis_cons_t[] = {{0, "None"},
{1, "X-Axis"}, {2, "Y-Axis"}, {-1, "X-Axis-"}, {-2, "Y-Axis-"},
#if JOYAXISSET > 1
{3, "Z-Axis"}, {4, "X-Rudder"}, {-3, "Z-Axis-"}, {-4, "X-Rudder-"},
#endif
#if JOYAXISSET > 2
{5, "Y-Rudder"}, {6, "Z-Rudder"}, {-5, "Y-Rudder-"}, {-6, "Z-Rudder-"},
#endif
#if JOYAXISSET > 3
{7, "U-Axis"}, {8, "V-Axis"}, {-7, "U-Axis-"}, {-8, "V-Axis-"},
#endif
{0, NULL}};
#if JOYAXISSET > 4
"More Axis Sets"
#endif
SRB2chat test rework
2018-07-31 09:10:02 +00:00
// don't mind me putting these here, I was lazy to figure out where else I could put those without blowing up the compiler.
// it automatically becomes compact with 20+ players, but if you like it, I guess you can turn that on!
Replace C90's junk with a modest macro
2020-10-07 06:04:23 +00:00
consvar_t cv_compactscoreboard= CVAR_INIT ("compactscoreboard", "Off", CV_SAVE, CV_OnOff, NULL);
SRB2chat test rework
2018-07-31 09:10:02 +00:00
// chat timer thingy
static CV_PossibleValue_t chattime_cons_t[] = {{5, "MIN"}, {999, "MAX"}, {0, NULL}};
Replace C90's junk with a modest macro
2020-10-07 06:04:23 +00:00
consvar_t cv_chattime = CVAR_INIT ("chattime", "8", CV_SAVE, chattime_cons_t, NULL);
SRB2chat test rework
2018-07-31 09:10:02 +00:00
// chatwidth
Increase maximum and default chat width
2020-01-15 14:36:11 +00:00
static CV_PossibleValue_t chatwidth_cons_t[] = {{64, "MIN"}, {300, "MAX"}, {0, NULL}};
Replace C90's junk with a modest macro
2020-10-07 06:04:23 +00:00
consvar_t cv_chatwidth = CVAR_INIT ("chatwidth", "150", CV_SAVE, chatwidth_cons_t, NULL);
SRB2chat test rework
2018-07-31 09:10:02 +00:00
// chatheight
static CV_PossibleValue_t chatheight_cons_t[] = {{6, "MIN"}, {22, "MAX"}, {0, NULL}};
Replace C90's junk with a modest macro
2020-10-07 06:04:23 +00:00
consvar_t cv_chatheight= CVAR_INIT ("chatheight", "8", CV_SAVE, chatheight_cons_t, NULL);
SRB2chat test rework
2018-07-31 09:10:02 +00:00
// chat notifications (do you want to hear beeps? I'd understand if you didn't.)
Replace C90's junk with a modest macro
2020-10-07 06:04:23 +00:00
consvar_t cv_chatnotifications= CVAR_INIT ("chatnotifications", "On", CV_SAVE, CV_OnOff, NULL);
SRB2chat test rework
2018-07-31 09:10:02 +00:00
// chat spam protection (why would you want to disable that???)
Replace C90's junk with a modest macro
2020-10-07 06:04:23 +00:00
consvar_t cv_chatspamprotection= CVAR_INIT ("chatspamprotection", "On", CV_SAVE, CV_OnOff, NULL);
SRB2chat test rework
2018-07-31 09:10:02 +00:00
Changed chat position, Added chat back tint Fixed word wrapping glitches
2018-08-19 08:58:29 +00:00
// minichat text background
Replace C90's junk with a modest macro
2020-10-07 06:04:23 +00:00
consvar_t cv_chatbacktint = CVAR_INIT ("chatbacktint", "On", CV_SAVE, CV_OnOff, NULL);
Changed chat position, Added chat back tint Fixed word wrapping glitches
2018-08-19 08:58:29 +00:00
SRB2chat test rework
2018-07-31 09:10:02 +00:00
// old shit console chat. (mostly exists for stuff like terminal, not because I cared if anyone liked the old chat.)
2.1.21 and all of the kart additions. Woo.
2018-12-17 19:43:59 +00:00
static CV_PossibleValue_t consolechat_cons_t[] = {{0, "Window"}, {1, "Console"}, {2, "Window (Hidden)"}, {0, NULL}};
Replace C90's junk with a modest macro
2020-10-07 06:04:23 +00:00
consvar_t cv_consolechat = CVAR_INIT ("chatmode", "Window", CV_SAVE, consolechat_cons_t, NULL);
2.1.21 and all of the kart additions. Woo.
2018-12-17 19:43:59 +00:00
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
// Pause game upon window losing focus
Replace C90's junk with a modest macro
2020-10-07 06:04:23 +00:00
consvar_t cv_pauseifunfocused = CVAR_INIT ("pauseifunfocused", "Yes", CV_SAVE, CV_YesNo, NULL);
consvar_t cv_crosshair = CVAR_INIT ("crosshair", "Cross", CV_SAVE, crosshair_cons_t, NULL);
consvar_t cv_crosshair2 = CVAR_INIT ("crosshair2", "Cross", CV_SAVE, crosshair_cons_t, NULL);
consvar_t cv_invertmouse = CVAR_INIT ("invertmouse", "Off", CV_SAVE, CV_OnOff, NULL);
consvar_t cv_alwaysfreelook = CVAR_INIT ("alwaysmlook", "On", CV_SAVE, CV_OnOff, NULL);
consvar_t cv_invertmouse2 = CVAR_INIT ("invertmouse2", "Off", CV_SAVE, CV_OnOff, NULL);
consvar_t cv_alwaysfreelook2 = CVAR_INIT ("alwaysmlook2", "On", CV_SAVE, CV_OnOff, NULL);
consvar_t cv_chasefreelook = CVAR_INIT ("chasemlook", "Off", CV_SAVE, CV_OnOff, NULL);
consvar_t cv_chasefreelook2 = CVAR_INIT ("chasemlook2", "Off", CV_SAVE, CV_OnOff, NULL);
consvar_t cv_mousemove = CVAR_INIT ("mousemove", "Off", CV_SAVE, CV_OnOff, NULL);
consvar_t cv_mousemove2 = CVAR_INIT ("mousemove2", "Off", CV_SAVE, CV_OnOff, NULL);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Some cvar fudging. * Turn off mlook and mousemove by default, as requested by Prime/Mystic. * Change all the analog cvar names (and hide them from the help function so they aren't so easily rediscovered) to invalidate 2.1-era copies of config.cfg, given I've seen a common sentiment is that they won't try the new controls at all and will just copy their old ones across, and I'd like to sabotage the deprecated feature.
2018-06-18 16:39:34 +00:00
// previously "analog", "analog2", "useranalog", and "useranalog2", invalidating 2.1-era copies of config.cfg
// changed because it'd be nice to see people try out our actually good controls with gamepads now autobrake exists
Convert analog/directionchar cvars into 2-long arrays
2019-12-30 20:01:14 +00:00
consvar_t cv_analog[2] = {
Replace C90's junk with a modest macro
2020-10-07 06:04:23 +00:00
CVAR_INIT ("sessionanalog", "Off", CV_CALL|CV_NOSHOWHELP, CV_OnOff, Analog_OnChange),
CVAR_INIT ("sessionanalog2", "Off", CV_CALL|CV_NOSHOWHELP, CV_OnOff, Analog2_OnChange),
Convert analog/directionchar cvars into 2-long arrays
2019-12-30 20:01:14 +00:00
};
consvar_t cv_useranalog[2] = {
Replace C90's junk with a modest macro
2020-10-07 06:04:23 +00:00
CVAR_INIT ("configanalog", "Off", CV_SAVE|CV_CALL|CV_NOSHOWHELP, CV_OnOff, UserAnalog_OnChange),
CVAR_INIT ("configanalog2", "Off", CV_SAVE|CV_CALL|CV_NOSHOWHELP, CV_OnOff, UserAnalog2_OnChange),
Convert analog/directionchar cvars into 2-long arrays
2019-12-30 20:01:14 +00:00
};
* cv_directionchar and cv_autobrake, and their secondplayer versions (both on by default) now exist. * cv_useranalog is now hidden from the menu. * Directionchar now attempts to face the camera direction when you're standing still, and handles a few other states with more decorum. * Tailsbot is now slightly more capable of keeping up with Sonic. * pflags rearranged/adjusted, combining a few non-simulstaneous ones and turning PF_NIGHTSFALL into CR_NIGHTSFALL. * [unrelated to branch] all ground-impact based abilities now happen more consistently with quicksand.
2017-09-15 19:34:46 +00:00
// deez New User eXperiences
Fix camera reset button
2019-12-30 21:34:43 +00:00
static CV_PossibleValue_t directionchar_cons_t[] = {{0, "Camera"}, {1, "Movement"}, {2, "Simple Locked"}, {0, NULL}};
Convert analog/directionchar cvars into 2-long arrays
2019-12-30 20:01:14 +00:00
consvar_t cv_directionchar[2] = {
Replace C90's junk with a modest macro
2020-10-07 06:04:23 +00:00
CVAR_INIT ("directionchar", "Movement", CV_SAVE|CV_CALL, directionchar_cons_t, DirectionChar_OnChange),
CVAR_INIT ("directionchar2", "Movement", CV_SAVE|CV_CALL, directionchar_cons_t, DirectionChar2_OnChange),
Convert analog/directionchar cvars into 2-long arrays
2019-12-30 20:01:14 +00:00
};
Replace C90's junk with a modest macro
2020-10-07 06:04:23 +00:00
consvar_t cv_autobrake = CVAR_INIT ("autobrake", "On", CV_SAVE|CV_CALL, CV_OnOff, AutoBrake_OnChange);
consvar_t cv_autobrake2 = CVAR_INIT ("autobrake2", "On", CV_SAVE|CV_CALL, CV_OnOff, AutoBrake2_OnChange);
* cv_directionchar and cv_autobrake, and their secondplayer versions (both on by default) now exist. * cv_useranalog is now hidden from the menu. * Directionchar now attempts to face the camera direction when you're standing still, and handles a few other states with more decorum. * Tailsbot is now slightly more capable of keeping up with Sonic. * pflags rearranged/adjusted, combining a few non-simulstaneous ones and turning PF_NIGHTSFALL into CR_NIGHTSFALL. * [unrelated to branch] all ground-impact based abilities now happen more consistently with quicksand.
2017-09-15 19:34:46 +00:00
Add cvar to use abilities in input direction
2019-12-08 20:17:48 +00:00
// hi here's some new controls
Automatically rotate camera to reflect player actions
2019-12-08 20:35:50 +00:00
static CV_PossibleValue_t zerotoone_cons_t[] = {{0, "MIN"}, {FRACUNIT, "MAX"}, {0, NULL}};
Shift camera sideways toward player angle
2019-12-08 21:54:16 +00:00
consvar_t cv_cam_shiftfacing[2] = {
Replace C90's junk with a modest macro
2020-10-07 06:04:23 +00:00
CVAR_INIT ("cam_shiftfacingchar", "0.33", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL),
CVAR_INIT ("cam2_shiftfacingchar", "0.33", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL),
Shift camera sideways toward player angle
2019-12-08 21:54:16 +00:00
};
Automatically rotate camera to reflect player actions
2019-12-08 20:35:50 +00:00
consvar_t cv_cam_turnfacing[2] = {
Replace C90's junk with a modest macro
2020-10-07 06:04:23 +00:00
CVAR_INIT ("cam_turnfacingchar", "0.25", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL),
CVAR_INIT ("cam2_turnfacingchar", "0.25", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL),
Automatically rotate camera to reflect player actions
2019-12-08 20:35:50 +00:00
};
consvar_t cv_cam_turnfacingability[2] = {
Replace C90's junk with a modest macro
2020-10-07 06:04:23 +00:00
CVAR_INIT ("cam_turnfacingability", "0.125", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL),
CVAR_INIT ("cam2_turnfacingability", "0.125", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL),
Automatically rotate camera to reflect player actions
2019-12-08 20:35:50 +00:00
};
Give spindash turn a separate slider
2019-12-10 14:07:41 +00:00
consvar_t cv_cam_turnfacingspindash[2] = {
Replace C90's junk with a modest macro
2020-10-07 06:04:23 +00:00
CVAR_INIT ("cam_turnfacingspindash", "0.5", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL),
CVAR_INIT ("cam2_turnfacingspindash", "0.5", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL),
Give spindash turn a separate slider
2019-12-10 14:07:41 +00:00
};
Automatically rotate camera to reflect player actions
2019-12-08 20:35:50 +00:00
consvar_t cv_cam_turnfacinginput[2] = {
Replace C90's junk with a modest macro
2020-10-07 06:04:23 +00:00
CVAR_INIT ("cam_turnfacinginput", "0.25", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL),
CVAR_INIT ("cam2_turnfacinginput", "0.25", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL),
Automatically rotate camera to reflect player actions
2019-12-08 20:35:50 +00:00
};
Add cvar to use abilities in input direction
2019-12-08 20:17:48 +00:00
Change defaults to match my personal settings
2019-12-30 17:36:40 +00:00
static CV_PossibleValue_t centertoggle_cons_t[] = {{0, "Hold"}, {1, "Toggle"}, {2, "Sticky Hold"}, {0, NULL}};
Allow setting center view to a toggle
2019-12-15 01:17:41 +00:00
consvar_t cv_cam_centertoggle[2] = {
Replace C90's junk with a modest macro
2020-10-07 06:04:23 +00:00
CVAR_INIT ("cam_centertoggle", "Hold", CV_SAVE, centertoggle_cons_t, NULL),
CVAR_INIT ("cam2_centertoggle", "Hold", CV_SAVE, centertoggle_cons_t, NULL),
Allow setting center view to a toggle
2019-12-15 01:17:41 +00:00
};
Add option to always turn with input while locked Uhhh also camera options scrolls now.
2019-12-11 04:01:17 +00:00
Allow setting center view to a toggle
2019-12-15 01:17:41 +00:00
static CV_PossibleValue_t lockedinput_cons_t[] = {{0, "Strafe"}, {1, "Turn"}, {0, NULL}};
Add option to always turn with input while locked Uhhh also camera options scrolls now.
2019-12-11 04:01:17 +00:00
consvar_t cv_cam_lockedinput[2] = {
Replace C90's junk with a modest macro
2020-10-07 06:04:23 +00:00
CVAR_INIT ("cam_lockedinput", "Strafe", CV_SAVE, lockedinput_cons_t, NULL),
CVAR_INIT ("cam2_lockedinput", "Strafe", CV_SAVE, lockedinput_cons_t, NULL),
Add option to always turn with input while locked Uhhh also camera options scrolls now.
2019-12-11 04:01:17 +00:00
};
Expand options for aim assist This will need a lot of testing to ensure each type works properly.
2019-12-13 05:03:51 +00:00
static CV_PossibleValue_t lockedassist_cons_t[] = {
{0, "Off"},
{LOCK_BOSS, "Bosses"},
{LOCK_BOSS|LOCK_ENEMY, "Enemies"},
{LOCK_BOSS|LOCK_INTERESTS, "Interests"},
{LOCK_BOSS|LOCK_ENEMY|LOCK_INTERESTS, "Full"},
{0, NULL}
};
Add boss target assist and finally organize camera options
2019-12-12 06:48:15 +00:00
consvar_t cv_cam_lockonboss[2] = {
Replace C90's junk with a modest macro
2020-10-07 06:04:23 +00:00
CVAR_INIT ("cam_lockaimassist", "Bosses", CV_SAVE, lockedassist_cons_t, NULL),
CVAR_INIT ("cam2_lockaimassist", "Bosses", CV_SAVE, lockedassist_cons_t, NULL),
Add boss target assist and finally organize camera options
2019-12-12 06:48:15 +00:00
};
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
typedef enum
{
AXISNONE = 0,
AXISTURN,
AXISMOVE,
AXISLOOK,
AXISSTRAFE,
Fix compilation errors
2019-12-30 17:01:56 +00:00
AXISDIGITAL, // axes below this use digital deadzone
Add jump & spin joystick axis Lets you set jump/spin to Xbox controller triggers, like you can with fire/nfire
2017-09-18 02:30:48 +00:00
AXISJUMP,
AXISSPIN,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
AXISFIRE,
AXISFIRENORMAL,
} axis_input_e;
Replace C90's junk with a modest macro
2020-10-07 06:04:23 +00:00
consvar_t cv_turnaxis = CVAR_INIT ("joyaxis_turn", "X-Rudder", CV_SAVE, joyaxis_cons_t, NULL);
consvar_t cv_moveaxis = CVAR_INIT ("joyaxis_move", "Y-Axis", CV_SAVE, joyaxis_cons_t, NULL);
consvar_t cv_sideaxis = CVAR_INIT ("joyaxis_side", "X-Axis", CV_SAVE, joyaxis_cons_t, NULL);
consvar_t cv_lookaxis = CVAR_INIT ("joyaxis_look", "Y-Rudder-", CV_SAVE, joyaxis_cons_t, NULL);
consvar_t cv_jumpaxis = CVAR_INIT ("joyaxis_jump", "None", CV_SAVE, joyaxis_cons_t, NULL);
consvar_t cv_spinaxis = CVAR_INIT ("joyaxis_spin", "None", CV_SAVE, joyaxis_cons_t, NULL);
consvar_t cv_fireaxis = CVAR_INIT ("joyaxis_fire", "Z-Axis-", CV_SAVE, joyaxis_cons_t, NULL);
consvar_t cv_firenaxis = CVAR_INIT ("joyaxis_firenormal", "Z-Axis", CV_SAVE, joyaxis_cons_t, NULL);
consvar_t cv_deadzone = CVAR_INIT ("joy_deadzone", "0.125", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL);
consvar_t cv_digitaldeadzone = CVAR_INIT ("joy_digdeadzone", "0.25", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL);
consvar_t cv_turnaxis2 = CVAR_INIT ("joyaxis2_turn", "X-Rudder", CV_SAVE, joyaxis_cons_t, NULL);
consvar_t cv_moveaxis2 = CVAR_INIT ("joyaxis2_move", "Y-Axis", CV_SAVE, joyaxis_cons_t, NULL);
consvar_t cv_sideaxis2 = CVAR_INIT ("joyaxis2_side", "X-Axis", CV_SAVE, joyaxis_cons_t, NULL);
consvar_t cv_lookaxis2 = CVAR_INIT ("joyaxis2_look", "Y-Rudder-", CV_SAVE, joyaxis_cons_t, NULL);
consvar_t cv_jumpaxis2 = CVAR_INIT ("joyaxis2_jump", "None", CV_SAVE, joyaxis_cons_t, NULL);
consvar_t cv_spinaxis2 = CVAR_INIT ("joyaxis2_spin", "None", CV_SAVE, joyaxis_cons_t, NULL);
consvar_t cv_fireaxis2 = CVAR_INIT ("joyaxis2_fire", "Z-Axis-", CV_SAVE, joyaxis_cons_t, NULL);
consvar_t cv_firenaxis2 = CVAR_INIT ("joyaxis2_firenormal", "Z-Axis", CV_SAVE, joyaxis_cons_t, NULL);
consvar_t cv_deadzone2 = CVAR_INIT ("joy_deadzone2", "0.125", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL);
consvar_t cv_digitaldeadzone2 = CVAR_INIT ("joy_digdeadzone2", "0.25", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
player_t *seenplayer; // player we're aiming at right now
Initialise player_names[] in D_RegisterClientCommands such that we don't need to have to manually update it if MAXPLAYERS ever changed
2019-08-12 14:18:36 +00:00
// now automatically allocated in D_RegisterClientCommands
// so that it doesn't have to be updated depending on the value of MAXPLAYERS
char player_names[MAXPLAYERS][MAXPLAYERNAME+1];
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Don't let players change their name more than five times per minute (ported 17f75903b029bbf01217153dc98009d305137c8f and 11ddcfa9a1f2311ec67377b76ed1160ef14b7f60)
2020-09-01 03:08:22 +00:00
INT32 player_name_changes[MAXPLAYERS];
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
INT16 rw_maximums[NUM_WEAPONS] =
{
800, // MAX_INFINITY
400, // MAX_AUTOMATIC
100, // MAX_BOUNCE
50, // MAX_SCATTER
100, // MAX_GRENADE
50, // MAX_EXPLOSION
50 // MAX_RAIL
};
// Allocation for time and nights data
void G_AllocMainRecordData(INT16 i)
{
if (!mainrecords[i])
mainrecords[i] = Z_Malloc(sizeof(recorddata_t), PU_STATIC, NULL);
memset(mainrecords[i], 0, sizeof(recorddata_t));
}
void G_AllocNightsRecordData(INT16 i)
{
if (!nightsrecords[i])
nightsrecords[i] = Z_Malloc(sizeof(nightsdata_t), PU_STATIC, NULL);
memset(nightsrecords[i], 0, sizeof(nightsdata_t));
}
// MAKE SURE YOU SAVE DATA BEFORE CALLING THIS
void G_ClearRecords(void)
{
INT16 i;
for (i = 0; i < NUMMAPS; ++i)
{
if (mainrecords[i])
{
Z_Free(mainrecords[i]);
mainrecords[i] = NULL;
}
if (nightsrecords[i])
{
Z_Free(nightsrecords[i]);
nightsrecords[i] = NULL;
}
}
}
// For easy retrieval of records
UINT32 G_GetBestScore(INT16 map)
{
if (!mainrecords[map-1])
return 0;
return mainrecords[map-1]->score;
}
tic_t G_GetBestTime(INT16 map)
{
if (!mainrecords[map-1] || mainrecords[map-1]->time <= 0)
return (tic_t)UINT32_MAX;
return mainrecords[map-1]->time;
}
UINT16 G_GetBestRings(INT16 map)
{
if (!mainrecords[map-1])
return 0;
return mainrecords[map-1]->rings;
}
UINT32 G_GetBestNightsScore(INT16 map, UINT8 mare)
{
if (!nightsrecords[map-1])
return 0;
return nightsrecords[map-1]->score[mare];
}
tic_t G_GetBestNightsTime(INT16 map, UINT8 mare)
{
if (!nightsrecords[map-1] || nightsrecords[map-1]->time[mare] <= 0)
return (tic_t)UINT32_MAX;
return nightsrecords[map-1]->time[mare];
}
UINT8 G_GetBestNightsGrade(INT16 map, UINT8 mare)
{
if (!nightsrecords[map-1])
return 0;
return nightsrecords[map-1]->grade[mare];
}
// For easy adding of NiGHTS records
void G_AddTempNightsRecords(UINT32 pscore, tic_t ptime, UINT8 mare)
{
ntemprecords.score[mare] = pscore;
ntemprecords.grade[mare] = P_GetGrade(pscore, gamemap, mare - 1);
ntemprecords.time[mare] = ptime;
// Update nummares
// Note that mare "0" is overall, mare "1" is the first real mare
if (ntemprecords.nummares < mare)
ntemprecords.nummares = mare;
}
Do a whole bunch of cleanup for mapvisited and intermission related things. * Move the visitation flags, Record Attack/NiGHTS Attack data, and emblem checking to outside of Y_StartIntermission. * Y_CleanupScreenBuffer never got called for maps which skip the intermission, leading to a small memory leak; this is now fixed by moving it to G_AfterIntermission. * Y_FollowIntermission was just G_AfterIntermission with modeattacking specific behaviour, but this is desired for all places where G_AfterIntermission is called, so just merge this into G_AfterIntermission. Notably, these changes are necessary because there are now three maps in the main SP campaign which do not end with traditional intermissions. As a result, this fixes an issue where Black Core's tracks are not available in the Sound Test (due to MV_BEATEN never being applied). Also, since I was here: Remove "gotperfect" from recorddata_t. This is a duplicate of `mapvisited[gamemap-1] & MV_PERFECT` which uses more memory. I have kept the new spacing in the gamedata for compatibility with RC1 savedatas, but moved it across to the original method everywhere else.
2019-11-21 16:10:28 +00:00
//
// G_UpdateRecordReplays
//
// Update replay files/data, etc. for Record Attack
// See G_SetNightsRecords for NiGHTS Attack.
//
static void G_UpdateRecordReplays(void)
{
const size_t glen = strlen(srb2home)+1+strlen("replay")+1+strlen(timeattackfolder)+1+strlen("MAPXX")+1;
char *gpath;
char lastdemo[256], bestdemo[256];
UINT8 earnedEmblems;
// Record new best time
if (!mainrecords[gamemap-1])
G_AllocMainRecordData(gamemap-1);
if (players[consoleplayer].score > mainrecords[gamemap-1]->score)
mainrecords[gamemap-1]->score = players[consoleplayer].score;
if ((mainrecords[gamemap-1]->time == 0) || (players[consoleplayer].realtime < mainrecords[gamemap-1]->time))
mainrecords[gamemap-1]->time = players[consoleplayer].realtime;
if ((UINT16)(players[consoleplayer].rings) > mainrecords[gamemap-1]->rings)
mainrecords[gamemap-1]->rings = (UINT16)(players[consoleplayer].rings);
// Save demo!
bestdemo[255] = '\0';
lastdemo[255] = '\0';
G_SetDemoTime(players[consoleplayer].realtime, players[consoleplayer].score, (UINT16)(players[consoleplayer].rings));
G_CheckDemoStatus();
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,"%s"PATHSEP"replay"PATHSEP"%s"PATHSEP"%s", srb2home, timeattackfolder, G_BuildMapName(gamemap));
snprintf(lastdemo, 255, "%s-%s-last.lmp", gpath, skins[cv_chooseskin.value-1].name);
if (FIL_FileExists(lastdemo))
{
UINT8 *buf;
size_t len = FIL_ReadFile(lastdemo, &buf);
snprintf(bestdemo, 255, "%s-%s-time-best.lmp", gpath, skins[cv_chooseskin.value-1].name);
if (!FIL_FileExists(bestdemo) || G_CmpDemoTime(bestdemo, lastdemo) & 1)
{ // Better time, save this demo.
if (FIL_FileExists(bestdemo))
remove(bestdemo);
FIL_WriteFile(bestdemo, buf, len);
CONS_Printf("\x83%s\x80 %s '%s'\n", M_GetText("NEW RECORD TIME!"), M_GetText("Saved replay as"), bestdemo);
}
snprintf(bestdemo, 255, "%s-%s-score-best.lmp", gpath, skins[cv_chooseskin.value-1].name);
if (!FIL_FileExists(bestdemo) || (G_CmpDemoTime(bestdemo, lastdemo) & (1<<1)))
{ // Better score, save this demo.
if (FIL_FileExists(bestdemo))
remove(bestdemo);
FIL_WriteFile(bestdemo, buf, len);
CONS_Printf("\x83%s\x80 %s '%s'\n", M_GetText("NEW HIGH SCORE!"), M_GetText("Saved replay as"), bestdemo);
}
snprintf(bestdemo, 255, "%s-%s-rings-best.lmp", gpath, skins[cv_chooseskin.value-1].name);
if (!FIL_FileExists(bestdemo) || (G_CmpDemoTime(bestdemo, lastdemo) & (1<<2)))
{ // Better rings, save this demo.
if (FIL_FileExists(bestdemo))
remove(bestdemo);
FIL_WriteFile(bestdemo, buf, len);
CONS_Printf("\x83%s\x80 %s '%s'\n", M_GetText("NEW MOST RINGS!"), M_GetText("Saved replay as"), bestdemo);
}
//CONS_Printf("%s '%s'\n", M_GetText("Saved replay as"), lastdemo);
Z_Free(buf);
}
free(gpath);
// Check emblems when level data is updated
if ((earnedEmblems = M_CheckLevelEmblems()))
CONS_Printf(M_GetText("\x82" "Earned %hu emblem%s for Record Attack records.\n"), (UINT16)earnedEmblems, earnedEmblems > 1 ? "s" : "");
// Update timeattack menu's replay availability.
Nextmap_OnChange();
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
void G_SetNightsRecords(void)
{
INT32 i;
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
UINT32 totalscore = 0;
tic_t totaltime = 0;
Do a whole bunch of cleanup for mapvisited and intermission related things. * Move the visitation flags, Record Attack/NiGHTS Attack data, and emblem checking to outside of Y_StartIntermission. * Y_CleanupScreenBuffer never got called for maps which skip the intermission, leading to a small memory leak; this is now fixed by moving it to G_AfterIntermission. * Y_FollowIntermission was just G_AfterIntermission with modeattacking specific behaviour, but this is desired for all places where G_AfterIntermission is called, so just merge this into G_AfterIntermission. Notably, these changes are necessary because there are now three maps in the main SP campaign which do not end with traditional intermissions. As a result, this fixes an issue where Black Core's tracks are not available in the Sound Test (due to MV_BEATEN never being applied). Also, since I was here: Remove "gotperfect" from recorddata_t. This is a duplicate of `mapvisited[gamemap-1] & MV_PERFECT` which uses more memory. I have kept the new spacing in the gamedata for compatibility with RC1 savedatas, but moved it across to the original method everywhere else.
2019-11-21 16:10:28 +00:00
UINT8 earnedEmblems;
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
const size_t glen = strlen(srb2home)+1+strlen("replay")+1+strlen(timeattackfolder)+1+strlen("MAPXX")+1;
char *gpath;
char lastdemo[256], bestdemo[256];
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (!ntemprecords.nummares)
return;
// Set overall
{
UINT8 totalrank = 0, realrank = 0;
for (i = 1; i <= ntemprecords.nummares; ++i)
{
totalscore += ntemprecords.score[i];
totalrank += ntemprecords.grade[i];
totaltime += ntemprecords.time[i];
}
// Determine overall grade
realrank = (UINT8)((FixedDiv((fixed_t)totalrank << FRACBITS, ntemprecords.nummares << FRACBITS) + (FRACUNIT/2)) >> FRACBITS);
// You need ALL rainbow As to get a rainbow A overall
if (realrank == GRADE_S && (totalrank / ntemprecords.nummares) != GRADE_S)
realrank = GRADE_A;
ntemprecords.score[0] = totalscore;
ntemprecords.grade[0] = realrank;
ntemprecords.time[0] = totaltime;
}
// Now take all temp records and put them in the actual records
{
nightsdata_t *maprecords;
if (!nightsrecords[gamemap-1])
G_AllocNightsRecordData(gamemap-1);
maprecords = nightsrecords[gamemap-1];
if (maprecords->nummares != ntemprecords.nummares)
maprecords->nummares = ntemprecords.nummares;
for (i = 0; i < ntemprecords.nummares + 1; ++i)
{
if (maprecords->score[i] < ntemprecords.score[i])
maprecords->score[i] = ntemprecords.score[i];
if (maprecords->grade[i] < ntemprecords.grade[i])
maprecords->grade[i] = ntemprecords.grade[i];
if (!maprecords->time[i] || maprecords->time[i] > ntemprecords.time[i])
maprecords->time[i] = ntemprecords.time[i];
}
}
memset(&ntemprecords, 0, sizeof(nightsdata_t));
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
// Save demo!
bestdemo[255] = '\0';
lastdemo[255] = '\0';
G_SetDemoTime(totaltime, totalscore, 0);
G_CheckDemoStatus();
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,"%s"PATHSEP"replay"PATHSEP"%s"PATHSEP"%s", srb2home, timeattackfolder, G_BuildMapName(gamemap));
Add support for saving/loading per-skin NiGHTS replays
2020-06-28 20:59:36 +00:00
snprintf(lastdemo, 255, "%s-%s-last.lmp", gpath, skins[cv_chooseskin.value-1].name);
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
if (FIL_FileExists(lastdemo))
{
UINT8 *buf;
size_t len = FIL_ReadFile(lastdemo, &buf);
Add support for saving/loading per-skin NiGHTS replays
2020-06-28 20:59:36 +00:00
snprintf(bestdemo, 255, "%s-%s-time-best.lmp", gpath, skins[cv_chooseskin.value-1].name);;
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
if (!FIL_FileExists(bestdemo) || G_CmpDemoTime(bestdemo, lastdemo) & 1)
{ // Better time, save this demo.
if (FIL_FileExists(bestdemo))
remove(bestdemo);
FIL_WriteFile(bestdemo, buf, len);
CONS_Printf("\x83%s\x80 %s '%s'\n", M_GetText("NEW RECORD TIME!"), M_GetText("Saved replay as"), bestdemo);
}
Add support for saving/loading per-skin NiGHTS replays
2020-06-28 20:59:36 +00:00
snprintf(bestdemo, 255, "%s-%s-score-best.lmp", gpath, skins[cv_chooseskin.value-1].name);
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
if (!FIL_FileExists(bestdemo) || (G_CmpDemoTime(bestdemo, lastdemo) & (1<<1)))
{ // Better score, save this demo.
if (FIL_FileExists(bestdemo))
remove(bestdemo);
FIL_WriteFile(bestdemo, buf, len);
CONS_Printf("\x83%s\x80 %s '%s'\n", M_GetText("NEW HIGH SCORE!"), M_GetText("Saved replay as"), bestdemo);
}
//CONS_Printf("%s '%s'\n", M_GetText("Saved replay as"), lastdemo);
Z_Free(buf);
}
free(gpath);
Do a whole bunch of cleanup for mapvisited and intermission related things. * Move the visitation flags, Record Attack/NiGHTS Attack data, and emblem checking to outside of Y_StartIntermission. * Y_CleanupScreenBuffer never got called for maps which skip the intermission, leading to a small memory leak; this is now fixed by moving it to G_AfterIntermission. * Y_FollowIntermission was just G_AfterIntermission with modeattacking specific behaviour, but this is desired for all places where G_AfterIntermission is called, so just merge this into G_AfterIntermission. Notably, these changes are necessary because there are now three maps in the main SP campaign which do not end with traditional intermissions. As a result, this fixes an issue where Black Core's tracks are not available in the Sound Test (due to MV_BEATEN never being applied). Also, since I was here: Remove "gotperfect" from recorddata_t. This is a duplicate of `mapvisited[gamemap-1] & MV_PERFECT` which uses more memory. I have kept the new spacing in the gamedata for compatibility with RC1 savedatas, but moved it across to the original method everywhere else.
2019-11-21 16:10:28 +00:00
if ((earnedEmblems = M_CheckLevelEmblems()))
CONS_Printf(M_GetText("\x82" "Earned %hu emblem%s for NiGHTS records.\n"), (UINT16)earnedEmblems, earnedEmblems > 1 ? "s" : "");
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// If the mare count changed, this will update the score display
* Fixed the Mode Attack cv_nextmap issue Salt found. * Improved the defaulting system to work cross-gametype. * Cleaned up the code. Less hacks!
2017-02-05 21:20:32 +00:00
Nextmap_OnChange();
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
// for consistency among messages: this modifies the game and removes savemoddata.
void G_SetGameModified(boolean silent)
{
if (modifiedgame && !savemoddata)
return;
modifiedgame = true;
savemoddata = false;
if (!silent)
CONS_Alert(CONS_NOTICE, M_GetText("Game must be restarted to record statistics.\n"));
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
// If in record attack recording, cancel it.
if (modeattacking)
M_EndModeAttackRun();
Introducing Marathon Run. (I was going to call it Marathon Mode, but NiGHTS Mode being right next to it on the menu looked terrible.) Basically a dedicated Record Attack-like experience for speedrunning the game as a continuous chunk rather than ILs. Has several quality of life features. Benefits include: * An unambiguous real-time bar across the bottom of the screen, always displaying the current time, ticking up until you reach the ending. * Disable the console (pausing is still allowed, but the timer will still increment). * Automatically skip intermissions as if you're holding down the spin button. * Show centiseconds on HUD automatically, like record attack. * "Live Event Backups" - a category of run fit for major events like GDQ, where recovery from crashes or chokes makes for better entertainment. Essentially a modified SP savefile, down to using the same basic functions, but has its own filename and tweaked internal layout. * "spmarathon_start" MainCfg block parameter and "marathonnext" mapheader parameter, allowing for a customised flow (makes this fit for purpose for an eventual SUGOI port). * Disabling inter-level custom cutscenes by default with a menu option to toggle this (won't show up if the mod doesn't *have* any custom cutscenes), although either way ending cutscenes (vanilla or custom) remain intact since is time is called before them. * Won't show up if you have a mod that consists of only one level (determined by spmarathon_start's nextlevel; this won't trip if you manually set its marathonnext). * Unconditional gratitude on the evaluation screen, instead of a negging "Try again..." if you didn't get all the emeralds (which you may not have been aiming for). * Gorgeous new menu (no new assets required, unless you wanna give it a header later). Changes which were required for the above but affect other areas of the game include: * "useBlackRock" MainCFG block parameter, which can be used to disable the presence of the Black Rock or Egg Rock in both the Evaluation screen and the Marathon Run menu (for total conversions with different stories). * Disabling Continues in NiGHTS mode, to match the most common singleplayer experience post 2.2.4's release (is reverted if useContinues is set to true). * Hiding the exitmove "powerup" outside of multiplayer. (Okay, this isn't really related, I just saw this bug in action a lot while doing test runs and got annoyed enough to fix it here.) * The ability to use V_DrawPromptBack (in hardcode only at the moment, but) to draw in terms of pixels rather than rows of text, by providing negative instead of positive inputs). * A refactoring of redundant game saves smattered across the ending, credits, and evaluation - in addition to saving the game slightly earlier. * Minor m_menu.c touchups and refactorings here and there. Built using feedback from the official server's #speedruns channel, among other places.
2020-05-14 22:10:00 +00:00
else if (marathonmode)
Command_ExitGame_f();
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
/** Builds an original game map name from a map number.
* The complexity is due to MAPA0-MAPZZ.
*
* \param map Map number.
* \return Pointer to a static buffer containing the desired map name.
* \sa M_MapNumber
*/
const char *G_BuildMapName(INT32 map)
{
Build: kill GCC 7's format-overflow warnings
2017-09-28 13:13:46 +00:00
static char mapname[10] = "MAPXX"; // internal map name (wad resource name)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
I_Assert(map > 0);
I_Assert(map <= NUMMAPS);
if (map < 100)
sprintf(&mapname[3], "%.2d", map);
else
{
mapname[3] = (char)('A' + (char)((map - 100) / 36));
if ((map - 100) % 36 < 10)
mapname[4] = (char)('0' + (char)((map - 100) % 36));
else
mapname[4] = (char)('A' + (char)((map - 100) % 36) - 10);
mapname[5] = '\0';
}
return mapname;
}
/** Clips the console player's mouse aiming to the current view.
* Used whenever the player view is changed manually.
*
* \param aiming Pointer to the vertical angle to clip.
* \return Short version of the clipped angle for building a ticcmd.
*/
INT16 G_ClipAimingPitch(INT32 *aiming)
{
INT32 limitangle;
limitangle = ANGLE_90 - 1;
if (*aiming > limitangle)
*aiming = limitangle;
else if (*aiming < -limitangle)
*aiming = -limitangle;
return (INT16)((*aiming)>>16);
}
INT16 G_SoftwareClipAimingPitch(INT32 *aiming)
{
INT32 limitangle;
// note: the current software mode implementation doesn't have true perspective
limitangle = ANGLE_90 - ANG10; // Some viewing fun, but not too far down...
if (*aiming > limitangle)
*aiming = limitangle;
else if (*aiming < -limitangle)
*aiming = -limitangle;
return (INT16)((*aiming)>>16);
}
static INT32 JoyAxis(axis_input_e axissel)
{
INT32 retaxis;
INT32 axisval;
boolean flp = false;
//find what axis to get
switch (axissel)
{
case AXISTURN:
axisval = cv_turnaxis.value;
break;
case AXISMOVE:
axisval = cv_moveaxis.value;
break;
case AXISLOOK:
axisval = cv_lookaxis.value;
break;
case AXISSTRAFE:
axisval = cv_sideaxis.value;
break;
Add jump & spin joystick axis Lets you set jump/spin to Xbox controller triggers, like you can with fire/nfire
2017-09-18 02:30:48 +00:00
case AXISJUMP:
axisval = cv_jumpaxis.value;
break;
case AXISSPIN:
axisval = cv_spinaxis.value;
break;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
case AXISFIRE:
axisval = cv_fireaxis.value;
break;
case AXISFIRENORMAL:
axisval = cv_firenaxis.value;
break;
default:
return 0;
}
if (axisval < 0) //odd -axises
{
axisval = -axisval;
flp = true;
}
if (axisval > JOYAXISSET*2 || axisval == 0) //not there in array or None
return 0;
if (axisval%2)
{
axisval /= 2;
retaxis = joyxmove[axisval];
}
else
{
axisval--;
axisval /= 2;
retaxis = joyymove[axisval];
}
if (retaxis < (-JOYAXISRANGE))
retaxis = -JOYAXISRANGE;
if (retaxis > (+JOYAXISRANGE))
retaxis = +JOYAXISRANGE;
Merge branch 'master' into newcontrols # Conflicts: # src/d_netcmd.c # src/g_game.c # src/g_game.h # src/m_menu.c
2019-12-30 16:47:09 +00:00
if (!Joystick.bGamepadStyle && axissel > AXISDIGITAL)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Merge branch 'master' into newcontrols # Conflicts: # src/d_netcmd.c # src/g_game.c # src/g_game.h # src/m_menu.c
2019-12-30 16:47:09 +00:00
const INT32 jdeadzone = ((JOYAXISRANGE-1) * cv_digitaldeadzone.value) >> FRACBITS;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (-jdeadzone < retaxis && retaxis < jdeadzone)
return 0;
}
Merge branch 'master' into newcontrols # Conflicts: # src/d_netcmd.c # src/g_game.c # src/g_game.h # src/m_menu.c
2019-12-30 16:47:09 +00:00
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (flp) retaxis = -retaxis; //flip it around
return retaxis;
}
static INT32 Joy2Axis(axis_input_e axissel)
{
INT32 retaxis;
INT32 axisval;
boolean flp = false;
//find what axis to get
switch (axissel)
{
case AXISTURN:
axisval = cv_turnaxis2.value;
break;
case AXISMOVE:
axisval = cv_moveaxis2.value;
break;
case AXISLOOK:
axisval = cv_lookaxis2.value;
break;
case AXISSTRAFE:
axisval = cv_sideaxis2.value;
break;
Add jump & spin joystick axis Lets you set jump/spin to Xbox controller triggers, like you can with fire/nfire
2017-09-18 02:30:48 +00:00
case AXISJUMP:
axisval = cv_jumpaxis2.value;
break;
case AXISSPIN:
axisval = cv_spinaxis2.value;
break;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
case AXISFIRE:
axisval = cv_fireaxis2.value;
break;
case AXISFIRENORMAL:
axisval = cv_firenaxis2.value;
break;
default:
return 0;
}
if (axisval < 0) //odd -axises
{
axisval = -axisval;
flp = true;
}
Burned Dreamcast port at the stake
2017-09-29 17:19:34 +00:00
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (axisval > JOYAXISSET*2 || axisval == 0) //not there in array or None
return 0;
if (axisval%2)
{
axisval /= 2;
retaxis = joy2xmove[axisval];
}
else
{
axisval--;
axisval /= 2;
retaxis = joy2ymove[axisval];
}
if (retaxis < (-JOYAXISRANGE))
retaxis = -JOYAXISRANGE;
if (retaxis > (+JOYAXISRANGE))
retaxis = +JOYAXISRANGE;
Merge branch 'master' into newcontrols # Conflicts: # src/d_netcmd.c # src/g_game.c # src/g_game.h # src/m_menu.c
2019-12-30 16:47:09 +00:00
if (!Joystick2.bGamepadStyle && axissel > AXISDIGITAL)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Merge branch 'master' into newcontrols # Conflicts: # src/d_netcmd.c # src/g_game.c # src/g_game.h # src/m_menu.c
2019-12-30 16:47:09 +00:00
const INT32 jdeadzone = ((JOYAXISRANGE-1) * cv_digitaldeadzone2.value) >> FRACBITS;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (-jdeadzone < retaxis && retaxis < jdeadzone)
return 0;
}
Merge branch 'master' into newcontrols # Conflicts: # src/d_netcmd.c # src/g_game.c # src/g_game.h # src/m_menu.c
2019-12-30 16:47:09 +00:00
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (flp) retaxis = -retaxis; //flip it around
return retaxis;
}
Merge branch 'master' into newcontrols # Conflicts: # src/d_netcmd.c # src/g_game.c # src/g_game.h # src/m_menu.c
2019-12-30 16:47:09 +00:00
Consolidate G_BuildTiccmd
2019-12-08 19:27:11 +00:00
#define PlayerJoyAxis(p, ax) ((p) == 1 ? JoyAxis(ax) : Joy2Axis(ax))
Use Scaled Radial Deadzones, instead of Axial deadzones. Additionally fixes some weird padscale 0 stuff that was flipped. This does have gameplay implications in both NiGHTS and regular gameplay. Notably you won't feel like you're locked into up/down left/right when you want to turn, but this can make running perfectly straight a little bit more tricky.
2019-12-15 14:37:30 +00:00
// Take a magnitude of two axes, and adjust it to take out the deadzone
// Will return a value between 0 and JOYAXISRANGE
Port the deadzone cvar stuff from kart. Add menu items for deadzone.
2019-12-15 15:36:13 +00:00
static INT32 G_BasicDeadZoneCalculation(INT32 magnitude, fixed_t deadZone)
Use Scaled Radial Deadzones, instead of Axial deadzones. Additionally fixes some weird padscale 0 stuff that was flipped. This does have gameplay implications in both NiGHTS and regular gameplay. Notably you won't feel like you're locked into up/down left/right when you want to turn, but this can make running perfectly straight a little bit more tricky.
2019-12-15 14:37:30 +00:00
{
Port the deadzone cvar stuff from kart. Add menu items for deadzone.
2019-12-15 15:36:13 +00:00
const INT32 jdeadzone = (JOYAXISRANGE * deadZone) / FRACUNIT;
Use Scaled Radial Deadzones, instead of Axial deadzones. Additionally fixes some weird padscale 0 stuff that was flipped. This does have gameplay implications in both NiGHTS and regular gameplay. Notably you won't feel like you're locked into up/down left/right when you want to turn, but this can make running perfectly straight a little bit more tricky.
2019-12-15 14:37:30 +00:00
INT32 deadzoneAppliedValue = 0;
More gamepad deadzone tweakage
2020-03-04 20:44:57 +00:00
INT32 adjustedMagnitude = abs(magnitude);
Use Scaled Radial Deadzones, instead of Axial deadzones. Additionally fixes some weird padscale 0 stuff that was flipped. This does have gameplay implications in both NiGHTS and regular gameplay. Notably you won't feel like you're locked into up/down left/right when you want to turn, but this can make running perfectly straight a little bit more tricky.
2019-12-15 14:37:30 +00:00
More gamepad deadzone tweakage
2020-03-04 20:44:57 +00:00
if (jdeadzone >= JOYAXISRANGE && adjustedMagnitude >= JOYAXISRANGE) // If the deadzone and magnitude are both 100%...
return JOYAXISRANGE; // ...return 100% input directly, to avoid dividing by 0
else if (adjustedMagnitude > jdeadzone) // Otherwise, calculate how much the magnitude exceeds the deadzone
Use Scaled Radial Deadzones, instead of Axial deadzones. Additionally fixes some weird padscale 0 stuff that was flipped. This does have gameplay implications in both NiGHTS and regular gameplay. Notably you won't feel like you're locked into up/down left/right when you want to turn, but this can make running perfectly straight a little bit more tricky.
2019-12-15 14:37:30 +00:00
{
More gamepad deadzone tweakage
2020-03-04 20:44:57 +00:00
adjustedMagnitude = min(adjustedMagnitude, JOYAXISRANGE);
Use Scaled Radial Deadzones, instead of Axial deadzones. Additionally fixes some weird padscale 0 stuff that was flipped. This does have gameplay implications in both NiGHTS and regular gameplay. Notably you won't feel like you're locked into up/down left/right when you want to turn, but this can make running perfectly straight a little bit more tricky.
2019-12-15 14:37:30 +00:00
More gamepad deadzone tweakage
2020-03-04 20:44:57 +00:00
adjustedMagnitude -= jdeadzone;
Use Scaled Radial Deadzones, instead of Axial deadzones. Additionally fixes some weird padscale 0 stuff that was flipped. This does have gameplay implications in both NiGHTS and regular gameplay. Notably you won't feel like you're locked into up/down left/right when you want to turn, but this can make running perfectly straight a little bit more tricky.
2019-12-15 14:37:30 +00:00
More gamepad deadzone tweakage
2020-03-04 20:44:57 +00:00
deadzoneAppliedValue = (adjustedMagnitude * JOYAXISRANGE) / (JOYAXISRANGE - jdeadzone);
Use Scaled Radial Deadzones, instead of Axial deadzones. Additionally fixes some weird padscale 0 stuff that was flipped. This does have gameplay implications in both NiGHTS and regular gameplay. Notably you won't feel like you're locked into up/down left/right when you want to turn, but this can make running perfectly straight a little bit more tricky.
2019-12-15 14:37:30 +00:00
}
return deadzoneAppliedValue;
}
// Get the actual sensible radial value for a joystick axis when accounting for a deadzone
static void G_HandleAxisDeadZone(UINT8 splitnum, joystickvector2_t *joystickvector)
{
INT32 gamepadStyle = Joystick.bGamepadStyle;
Port the deadzone cvar stuff from kart. Add menu items for deadzone.
2019-12-15 15:36:13 +00:00
fixed_t deadZone = cv_deadzone.value;
Use Scaled Radial Deadzones, instead of Axial deadzones. Additionally fixes some weird padscale 0 stuff that was flipped. This does have gameplay implications in both NiGHTS and regular gameplay. Notably you won't feel like you're locked into up/down left/right when you want to turn, but this can make running perfectly straight a little bit more tricky.
2019-12-15 14:37:30 +00:00
if (splitnum == 1)
{
gamepadStyle = Joystick2.bGamepadStyle;
Port the deadzone cvar stuff from kart. Add menu items for deadzone.
2019-12-15 15:36:13 +00:00
deadZone = cv_deadzone2.value;
Use Scaled Radial Deadzones, instead of Axial deadzones. Additionally fixes some weird padscale 0 stuff that was flipped. This does have gameplay implications in both NiGHTS and regular gameplay. Notably you won't feel like you're locked into up/down left/right when you want to turn, but this can make running perfectly straight a little bit more tricky.
2019-12-15 14:37:30 +00:00
}
// When gamepadstyle is "true" the values are just -1, 0, or 1. This is done in the interface code.
if (!gamepadStyle)
{
// Get the total magnitude of the 2 axes
INT32 magnitude = (joystickvector->xaxis * joystickvector->xaxis) + (joystickvector->yaxis * joystickvector->yaxis);
Port the deadzone cvar stuff from kart. Add menu items for deadzone.
2019-12-15 15:36:13 +00:00
INT32 normalisedXAxis;
INT32 normalisedYAxis;
Use Scaled Radial Deadzones, instead of Axial deadzones. Additionally fixes some weird padscale 0 stuff that was flipped. This does have gameplay implications in both NiGHTS and regular gameplay. Notably you won't feel like you're locked into up/down left/right when you want to turn, but this can make running perfectly straight a little bit more tricky.
2019-12-15 14:37:30 +00:00
INT32 normalisedMagnitude;
double dMagnitude = sqrt((double)magnitude);
magnitude = (INT32)dMagnitude;
// Get the normalised xy values from the magnitude
Port the deadzone cvar stuff from kart. Add menu items for deadzone.
2019-12-15 15:36:13 +00:00
normalisedXAxis = (joystickvector->xaxis * magnitude) / JOYAXISRANGE;
normalisedYAxis = (joystickvector->yaxis * magnitude) / JOYAXISRANGE;
Use Scaled Radial Deadzones, instead of Axial deadzones. Additionally fixes some weird padscale 0 stuff that was flipped. This does have gameplay implications in both NiGHTS and regular gameplay. Notably you won't feel like you're locked into up/down left/right when you want to turn, but this can make running perfectly straight a little bit more tricky.
2019-12-15 14:37:30 +00:00
// Apply the deadzone to the magnitude to give a correct value between 0 and JOYAXISRANGE
Port the deadzone cvar stuff from kart. Add menu items for deadzone.
2019-12-15 15:36:13 +00:00
normalisedMagnitude = G_BasicDeadZoneCalculation(magnitude, deadZone);
Use Scaled Radial Deadzones, instead of Axial deadzones. Additionally fixes some weird padscale 0 stuff that was flipped. This does have gameplay implications in both NiGHTS and regular gameplay. Notably you won't feel like you're locked into up/down left/right when you want to turn, but this can make running perfectly straight a little bit more tricky.
2019-12-15 14:37:30 +00:00
// Apply the deadzone to the xy axes
Port the deadzone cvar stuff from kart. Add menu items for deadzone.
2019-12-15 15:36:13 +00:00
joystickvector->xaxis = (normalisedXAxis * normalisedMagnitude) / JOYAXISRANGE;
joystickvector->yaxis = (normalisedYAxis * normalisedMagnitude) / JOYAXISRANGE;
Use Scaled Radial Deadzones, instead of Axial deadzones. Additionally fixes some weird padscale 0 stuff that was flipped. This does have gameplay implications in both NiGHTS and regular gameplay. Notably you won't feel like you're locked into up/down left/right when you want to turn, but this can make running perfectly straight a little bit more tricky.
2019-12-15 14:37:30 +00:00
// Cap the values so they don't go above the correct maximum
joystickvector->xaxis = min(joystickvector->xaxis, JOYAXISRANGE);
joystickvector->xaxis = max(joystickvector->xaxis, -JOYAXISRANGE);
joystickvector->yaxis = min(joystickvector->yaxis, JOYAXISRANGE);
joystickvector->yaxis = max(joystickvector->yaxis, -JOYAXISRANGE);
}
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
//
// G_BuildTiccmd
// Builds a ticcmd from all of the available inputs
// or reads it from the demo buffer.
// If recording a demo, write it out
//
// set secondaryplayer true to build player 2's ticcmd in splitscreen mode
//
INT32 localaiming, localaiming2;
angle_t localangle, localangle2;
static fixed_t forwardmove[2] = {25<<FRACBITS>>16, 50<<FRACBITS>>16};
static fixed_t sidemove[2] = {25<<FRACBITS>>16, 50<<FRACBITS>>16}; // faster!
static fixed_t angleturn[3] = {640, 1280, 320}; // + slow turn
Fix potential desynch when a player spawns
2020-05-28 09:03:35 +00:00
INT16 ticcmd_oldangleturn[2];
Move Z-targeting behavior to Center View
2019-12-12 03:09:23 +00:00
boolean ticcmd_centerviewdown[2]; // For simple controls, lock the camera behind the player
Add boss target assist and finally organize camera options
2019-12-12 06:48:15 +00:00
mobj_t *ticcmd_ztargetfocus[2]; // Locking onto an object?
Consolidate G_BuildTiccmd
2019-12-08 19:27:11 +00:00
void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
boolean forcestrafe = false;
Trigonometric input capping
2019-09-24 19:12:56 +00:00
boolean forcefullinput = false;
Use Scaled Radial Deadzones, instead of Axial deadzones. Additionally fixes some weird padscale 0 stuff that was flipped. This does have gameplay implications in both NiGHTS and regular gameplay. Notably you won't feel like you're locked into up/down left/right when you want to turn, but this can make running perfectly straight a little bit more tricky.
2019-12-15 14:37:30 +00:00
INT32 tspeed, forward, side, axis, strafeaxis, moveaxis, turnaxis, lookaxis, i;
Merge branch 'master' into newcontrols # Conflicts: # src/d_netcmd.c # src/g_game.c # src/g_game.h # src/m_menu.c
2019-12-30 16:47:09 +00:00
joystickvector2_t movejoystickvector, lookjoystickvector;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
const INT32 speed = 1;
// these ones used for multiple conditions
WIP 20190101 merge d_netcmd.c filesrch.c m_menu.c p_setup.c p_spec.c r_data.c r_main.c r_things.c w_wad.c w_wad.h
2019-01-02 06:09:15 +00:00
boolean turnleft, turnright, strafelkey, straferkey, movefkey, movebkey, mouseaiming, analogjoystickmove, gamepadjoystickmove, thisjoyaiming;
Make locked input turn act the same as normal turning
2019-12-12 03:34:32 +00:00
boolean strafeisturn; // Simple controls only
Consolidate G_BuildTiccmd
2019-12-08 19:27:11 +00:00
player_t *player = &players[ssplayer == 2 ? secondarydisplayplayer : consoleplayer];
camera_t *thiscam = ((ssplayer == 1 || player->bot == 2) ? &camera : &camera2);
angle_t *myangle = (ssplayer == 1 ? &localangle : &localangle2);
INT32 *myaiming = (ssplayer == 1 ? &localaiming : &localaiming2);
Fix RVZ camera stuff
2019-12-11 07:26:43 +00:00
angle_t drawangleoffset = (player->powers[pw_carry] == CR_ROLLOUT) ? ANGLE_180 : 0;
Separate "turnmultiplier"s for splitscreen players This fixes player 2 using player 1's "cam_turnmultiplier" instead of player 2's "cam2_turnmultiplier"
2020-01-21 13:53:05 +00:00
INT32 chasecam, chasefreelook, alwaysfreelook, usejoystick, invertmouse, turnmultiplier, mousemove;
Convert simple movement to directionchar+analog Analog + no directionchar is old analog (now known as CS_LMAOGALOG because lmao if you still use it).
2019-12-30 21:05:24 +00:00
controlstyle_e controlstyle = G_ControlStyle(ssplayer);
Consolidate G_BuildTiccmd
2019-12-08 19:27:11 +00:00
INT32 *mx; INT32 *my; INT32 *mly;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Consolidate G_BuildTiccmd
2019-12-08 19:27:11 +00:00
static INT32 turnheld[2]; // for accelerative turning
static boolean keyboard_look[2]; // true if lookup/down using keyboard
Move Z-targeting behavior to Center View
2019-12-12 03:09:23 +00:00
static boolean resetdown[2]; // don't cam reset every frame
Consolidate G_BuildTiccmd
2019-12-08 19:27:11 +00:00
static boolean joyaiming[2]; // check the last frame's value if we need to reset the camera
Allow setting center view to a toggle
2019-12-15 01:17:41 +00:00
// simple mode vars
Allow switching lockon targets with turn buttons
2019-12-13 05:52:13 +00:00
static boolean zchange[2]; // only switch z targets once per press
Suspend turn-to-angle when rotating the camera
2019-12-13 06:52:48 +00:00
static fixed_t tta_factor[2] = {FRACUNIT, FRACUNIT}; // disables turn-to-angle when manually turning camera until movement happens
Allow setting center view to a toggle
2019-12-15 01:17:41 +00:00
boolean centerviewdown = false;
Consolidate G_BuildTiccmd
2019-12-08 19:27:11 +00:00
UINT8 forplayer = ssplayer-1;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Consolidate G_BuildTiccmd
2019-12-08 19:27:11 +00:00
if (ssplayer == 1)
{
chasecam = cv_chasecam.value;
chasefreelook = cv_chasefreelook.value;
alwaysfreelook = cv_alwaysfreelook.value;
usejoystick = cv_usejoystick.value;
invertmouse = cv_invertmouse.value;
Separate "turnmultiplier"s for splitscreen players This fixes player 2 using player 1's "cam_turnmultiplier" instead of player 2's "cam2_turnmultiplier"
2020-01-21 13:53:05 +00:00
turnmultiplier = cv_cam_turnmultiplier.value;
Consolidate G_BuildTiccmd
2019-12-08 19:27:11 +00:00
mousemove = cv_mousemove.value;
mx = &mousex;
my = &mousey;
mly = &mlooky;
G_CopyTiccmd(cmd, I_BaseTiccmd(), 1); // empty, or external driver
}
else
{
chasecam = cv_chasecam2.value;
chasefreelook = cv_chasefreelook2.value;
alwaysfreelook = cv_alwaysfreelook2.value;
usejoystick = cv_usejoystick2.value;
invertmouse = cv_invertmouse2.value;
Separate "turnmultiplier"s for splitscreen players This fixes player 2 using player 1's "cam_turnmultiplier" instead of player 2's "cam2_turnmultiplier"
2020-01-21 13:53:05 +00:00
turnmultiplier = cv_cam2_turnmultiplier.value;
Consolidate G_BuildTiccmd
2019-12-08 19:27:11 +00:00
mousemove = cv_mousemove2.value;
mx = &mouse2x;
my = &mouse2y;
mly = &mlook2y;
G_CopyTiccmd(cmd, I_BaseTiccmd2(), 1); // empty, or external driver
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Convert simple movement to directionchar+analog Analog + no directionchar is old analog (now known as CS_LMAOGALOG because lmao if you still use it).
2019-12-30 21:05:24 +00:00
strafeisturn = controlstyle == CS_SIMPLE && ticcmd_centerviewdown[forplayer] &&
Don't turn strafe keys into turn when locked onto something
2019-12-13 04:13:44 +00:00
((cv_cam_lockedinput[forplayer].value && !ticcmd_ztargetfocus[forplayer]) || (player->pflags & PF_STARTDASH)) &&
Make locked input turn act the same as normal turning
2019-12-12 03:34:32 +00:00
!player->climbing && player->powers[pw_carry] != CR_MINECART;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// why build a ticcmd if we're paused?
// Or, for that matter, if we're being reborn.
* Incorporate (almost) all of Mystic's feedback. * Prevent ANY input when blindfolded. * Make CECHOs always perplayer'd. (A little hacky; quads will need work here.) * Make NiGHTS link timer bounces not a mess, and only when the colour changes.
2018-03-30 15:39:59 +00:00
// ...OR if we're blindfolded. No looking into the floor.
More gametype rules yay!!
2019-12-18 04:54:45 +00:00
if (paused || P_AutoPause() || (gamestate == GS_LEVEL && (player->playerstate == PST_REBORN || ((gametyperules & GTR_TAG)
* Incorporate (almost) all of Mystic's feedback. * Prevent ANY input when blindfolded. * Make CECHOs always perplayer'd. (A little hacky; quads will need work here.) * Make NiGHTS link timer bounces not a mess, and only when the colour changes.
2018-03-30 15:39:59 +00:00
&& (leveltime < hidetime * TICRATE) && (player->pflags & PF_TAGIT)))))
Consolidate G_BuildTiccmd
2019-12-08 19:27:11 +00:00
{//@TODO splitscreen player
Fix potential desynch when a player spawns
2020-05-28 09:03:35 +00:00
cmd->angleturn = ticcmd_oldangleturn[forplayer];
Consolidate G_BuildTiccmd
2019-12-08 19:27:11 +00:00
cmd->aiming = G_ClipAimingPitch(myaiming);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return;
}
Consolidate G_BuildTiccmd
2019-12-08 19:27:11 +00:00
turnright = PLAYERINPUTDOWN(ssplayer, gc_turnright);
turnleft = PLAYERINPUTDOWN(ssplayer, gc_turnleft);
whitespace cleanup
2017-11-03 03:13:13 +00:00
Consolidate G_BuildTiccmd
2019-12-08 19:27:11 +00:00
straferkey = PLAYERINPUTDOWN(ssplayer, gc_straferight);
strafelkey = PLAYERINPUTDOWN(ssplayer, gc_strafeleft);
movefkey = PLAYERINPUTDOWN(ssplayer, gc_forward);
movebkey = PLAYERINPUTDOWN(ssplayer, gc_backward);
whitespace cleanup
2017-11-03 03:13:13 +00:00
Make locked input turn act the same as normal turning
2019-12-12 03:34:32 +00:00
if (strafeisturn)
{
turnright |= straferkey;
turnleft |= strafelkey;
straferkey = strafelkey = false;
}
Consolidate G_BuildTiccmd
2019-12-08 19:27:11 +00:00
mouseaiming = (PLAYERINPUTDOWN(ssplayer, gc_mouseaiming)) ^
((chasecam && !player->spectator) ? chasefreelook : alwaysfreelook);
analogjoystickmove = usejoystick && !Joystick.bGamepadStyle;
gamepadjoystickmove = usejoystick && Joystick.bGamepadStyle;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Consolidate G_BuildTiccmd
2019-12-08 19:27:11 +00:00
thisjoyaiming = (chasecam && !player->spectator) ? chasefreelook : alwaysfreelook;
Reset vertical look when toggling joyaiming
2018-12-03 11:32:26 +00:00
// Reset the vertical look if we're no longer joyaiming
Consolidate G_BuildTiccmd
2019-12-08 19:27:11 +00:00
if (!thisjoyaiming && joyaiming[forplayer])
*myaiming = 0;
joyaiming[forplayer] = thisjoyaiming;
Reset vertical look when toggling joyaiming
2018-12-03 11:32:26 +00:00
Fix compilation errors
2019-12-30 17:01:56 +00:00
turnaxis = PlayerJoyAxis(ssplayer, AXISTURN);
Make locked input turn act the same as normal turning
2019-12-12 03:34:32 +00:00
if (strafeisturn)
Merge branch 'master' into newcontrols # Conflicts: # src/d_netcmd.c # src/g_game.c # src/g_game.h # src/m_menu.c
2019-12-30 16:47:09 +00:00
turnaxis += PlayerJoyAxis(ssplayer, AXISSTRAFE);
lookaxis = PlayerJoyAxis(ssplayer, AXISLOOK);
Use Scaled Radial Deadzones, instead of Axial deadzones. Additionally fixes some weird padscale 0 stuff that was flipped. This does have gameplay implications in both NiGHTS and regular gameplay. Notably you won't feel like you're locked into up/down left/right when you want to turn, but this can make running perfectly straight a little bit more tricky.
2019-12-15 14:37:30 +00:00
lookjoystickvector.xaxis = turnaxis;
lookjoystickvector.yaxis = lookaxis;
Merge branch 'master' into newcontrols # Conflicts: # src/d_netcmd.c # src/g_game.c # src/g_game.h # src/m_menu.c
2019-12-30 16:47:09 +00:00
G_HandleAxisDeadZone(forplayer, &lookjoystickvector);
Use Scaled Radial Deadzones, instead of Axial deadzones. Additionally fixes some weird padscale 0 stuff that was flipped. This does have gameplay implications in both NiGHTS and regular gameplay. Notably you won't feel like you're locked into up/down left/right when you want to turn, but this can make running perfectly straight a little bit more tricky.
2019-12-15 14:37:30 +00:00
if (gamepadjoystickmove && lookjoystickvector.xaxis != 0)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Use Scaled Radial Deadzones, instead of Axial deadzones. Additionally fixes some weird padscale 0 stuff that was flipped. This does have gameplay implications in both NiGHTS and regular gameplay. Notably you won't feel like you're locked into up/down left/right when you want to turn, but this can make running perfectly straight a little bit more tricky.
2019-12-15 14:37:30 +00:00
turnright = turnright || (lookjoystickvector.xaxis > 0);
turnleft = turnleft || (lookjoystickvector.xaxis < 0);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
forward = side = 0;
// use two stage accelerative turning
// on the keyboard and joystick
if (turnleft || turnright)
Consolidate G_BuildTiccmd
2019-12-08 19:27:11 +00:00
turnheld[forplayer] += realtics;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
else
Consolidate G_BuildTiccmd
2019-12-08 19:27:11 +00:00
turnheld[forplayer] = 0;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Consolidate G_BuildTiccmd
2019-12-08 19:27:11 +00:00
if (turnheld[forplayer] < SLOWTURNTICS)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
tspeed = 2; // slow turn
else
tspeed = speed;
// let movement keys cancel each other out
Convert simple movement to directionchar+analog Analog + no directionchar is old analog (now known as CS_LMAOGALOG because lmao if you still use it).
2019-12-30 21:05:24 +00:00
if (controlstyle == CS_LMAOGALOG) // Analog
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
if (turnright)
cmd->angleturn = (INT16)(cmd->angleturn - angleturn[tspeed]);
if (turnleft)
cmd->angleturn = (INT16)(cmd->angleturn + angleturn[tspeed]);
}
Trigonometric input capping
2019-09-24 19:12:56 +00:00
if (twodlevel
|| (player->mo && (player->mo->flags2 & MF2_TWOD))
|| (!demoplayback && (player->pflags & PF_SLIDING)))
forcefullinput = true;
First part of revamp: Removing Camera Rotate L/R keys, and giving the two situations where they had any unique functionality (Analog mode and NiGHTS objectplace) suitable replacements.
2017-04-14 19:29:08 +00:00
if (twodlevel
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
|| (player->mo && (player->mo->flags2 & MF2_TWOD))
Allow camera movement while climbing; allow sliding while landing from a glide
2019-09-30 06:38:58 +00:00
|| (!demoplayback && ((player->powers[pw_carry] == CR_NIGHTSMODE)
Increased space in pflags (because we were getting VERY close to full capacity), which I will re-organise when this branch is closer to completion. * PF_NIGHTSMODE is now CR_NIGHTSMODE as part of player->powers[pw_carry]. This is because it's mutually exclusive to every other "carry" type. * PF_SUPERREADY is dead because it literally just checked for all 7 emeralds and 50 rings. That's it. You couldn't even appreciably alter its presence with Lua. That logic has been placed back in P_SuperReady.
2017-03-14 18:11:17 +00:00
|| (player->pflags & (PF_SLIDING|PF_FORCESTRAFE))))) // Analog
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
forcestrafe = true;
First part of revamp: Removing Camera Rotate L/R keys, and giving the two situations where they had any unique functionality (Analog mode and NiGHTS objectplace) suitable replacements.
2017-04-14 19:29:08 +00:00
if (forcestrafe)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
if (turnright)
side += sidemove[speed];
if (turnleft)
side -= sidemove[speed];
Use Scaled Radial Deadzones, instead of Axial deadzones. Additionally fixes some weird padscale 0 stuff that was flipped. This does have gameplay implications in both NiGHTS and regular gameplay. Notably you won't feel like you're locked into up/down left/right when you want to turn, but this can make running perfectly straight a little bit more tricky.
2019-12-15 14:37:30 +00:00
if (analogjoystickmove && lookjoystickvector.xaxis != 0)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
// JOYAXISRANGE is supposed to be 1023 (divide by 1024)
Use Scaled Radial Deadzones, instead of Axial deadzones. Additionally fixes some weird padscale 0 stuff that was flipped. This does have gameplay implications in both NiGHTS and regular gameplay. Notably you won't feel like you're locked into up/down left/right when you want to turn, but this can make running perfectly straight a little bit more tricky.
2019-12-15 14:37:30 +00:00
side += ((lookjoystickvector.xaxis * sidemove[1]) >> 10);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
}
Convert simple movement to directionchar+analog Analog + no directionchar is old analog (now known as CS_LMAOGALOG because lmao if you still use it).
2019-12-30 21:05:24 +00:00
else if (controlstyle == CS_LMAOGALOG) // Analog
First part of revamp: Removing Camera Rotate L/R keys, and giving the two situations where they had any unique functionality (Analog mode and NiGHTS objectplace) suitable replacements.
2017-04-14 19:29:08 +00:00
{
if (turnright)
cmd->buttons |= BT_CAMRIGHT;
if (turnleft)
cmd->buttons |= BT_CAMLEFT;
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
else
{
Make holding both turn keys freeze camera direction (broke in merge)
2020-01-04 05:26:31 +00:00
if (turnright && turnleft);
else if (turnright)
Separate "turnmultiplier"s for splitscreen players This fixes player 2 using player 1's "cam_turnmultiplier" instead of player 2's "cam2_turnmultiplier"
2020-01-21 13:53:05 +00:00
cmd->angleturn = (INT16)(cmd->angleturn - ((angleturn[tspeed] * turnmultiplier)>>FRACBITS));
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
else if (turnleft)
Separate "turnmultiplier"s for splitscreen players This fixes player 2 using player 1's "cam_turnmultiplier" instead of player 2's "cam2_turnmultiplier"
2020-01-21 13:53:05 +00:00
cmd->angleturn = (INT16)(cmd->angleturn + ((angleturn[tspeed] * turnmultiplier)>>FRACBITS));
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Use Scaled Radial Deadzones, instead of Axial deadzones. Additionally fixes some weird padscale 0 stuff that was flipped. This does have gameplay implications in both NiGHTS and regular gameplay. Notably you won't feel like you're locked into up/down left/right when you want to turn, but this can make running perfectly straight a little bit more tricky.
2019-12-15 14:37:30 +00:00
if (analogjoystickmove && lookjoystickvector.xaxis != 0)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
// JOYAXISRANGE should be 1023 (divide by 1024)
Separate "turnmultiplier"s for splitscreen players This fixes player 2 using player 1's "cam_turnmultiplier" instead of player 2's "cam2_turnmultiplier"
2020-01-21 13:53:05 +00:00
cmd->angleturn = (INT16)(cmd->angleturn - ((((lookjoystickvector.xaxis * angleturn[1]) >> 10) * turnmultiplier)>>FRACBITS)); // ANALOG!
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
Make cam_rotspeed affect non-mouse turn speed 10 remains the default and is vanilla behavior.
2019-12-08 21:17:46 +00:00
LMAO right stick checking used the wrong value
2019-12-13 23:35:48 +00:00
if (turnright || turnleft || abs(cmd->angleturn) > angleturn[2])
Suspend turn-to-angle when rotating the camera
2019-12-13 06:52:48 +00:00
tta_factor[forplayer] = 0; // suspend turn to angle
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
Merge branch 'master' into newcontrols # Conflicts: # src/d_netcmd.c # src/g_game.c # src/g_game.h # src/m_menu.c
2019-12-30 16:47:09 +00:00
strafeaxis = strafeisturn ? 0 : PlayerJoyAxis(ssplayer, AXISSTRAFE);
moveaxis = PlayerJoyAxis(ssplayer, AXISMOVE);
Use Scaled Radial Deadzones, instead of Axial deadzones. Additionally fixes some weird padscale 0 stuff that was flipped. This does have gameplay implications in both NiGHTS and regular gameplay. Notably you won't feel like you're locked into up/down left/right when you want to turn, but this can make running perfectly straight a little bit more tricky.
2019-12-15 14:37:30 +00:00
movejoystickvector.xaxis = strafeaxis;
movejoystickvector.yaxis = moveaxis;
Merge branch 'master' into newcontrols # Conflicts: # src/d_netcmd.c # src/g_game.c # src/g_game.h # src/m_menu.c
2019-12-30 16:47:09 +00:00
G_HandleAxisDeadZone(forplayer, &movejoystickvector);
Use Scaled Radial Deadzones, instead of Axial deadzones. Additionally fixes some weird padscale 0 stuff that was flipped. This does have gameplay implications in both NiGHTS and regular gameplay. Notably you won't feel like you're locked into up/down left/right when you want to turn, but this can make running perfectly straight a little bit more tricky.
2019-12-15 14:37:30 +00:00
if (gamepadjoystickmove && movejoystickvector.xaxis != 0)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Use Scaled Radial Deadzones, instead of Axial deadzones. Additionally fixes some weird padscale 0 stuff that was flipped. This does have gameplay implications in both NiGHTS and regular gameplay. Notably you won't feel like you're locked into up/down left/right when you want to turn, but this can make running perfectly straight a little bit more tricky.
2019-12-15 14:37:30 +00:00
if (movejoystickvector.xaxis > 0)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
side += sidemove[speed];
Use Scaled Radial Deadzones, instead of Axial deadzones. Additionally fixes some weird padscale 0 stuff that was flipped. This does have gameplay implications in both NiGHTS and regular gameplay. Notably you won't feel like you're locked into up/down left/right when you want to turn, but this can make running perfectly straight a little bit more tricky.
2019-12-15 14:37:30 +00:00
else if (movejoystickvector.xaxis < 0)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
side -= sidemove[speed];
}
Use Scaled Radial Deadzones, instead of Axial deadzones. Additionally fixes some weird padscale 0 stuff that was flipped. This does have gameplay implications in both NiGHTS and regular gameplay. Notably you won't feel like you're locked into up/down left/right when you want to turn, but this can make running perfectly straight a little bit more tricky.
2019-12-15 14:37:30 +00:00
else if (analogjoystickmove && movejoystickvector.xaxis != 0)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
// JOYAXISRANGE is supposed to be 1023 (divide by 1024)
Use Scaled Radial Deadzones, instead of Axial deadzones. Additionally fixes some weird padscale 0 stuff that was flipped. This does have gameplay implications in both NiGHTS and regular gameplay. Notably you won't feel like you're locked into up/down left/right when you want to turn, but this can make running perfectly straight a little bit more tricky.
2019-12-15 14:37:30 +00:00
side += ((movejoystickvector.xaxis * sidemove[1]) >> 10);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
// forward with key or button
Use Scaled Radial Deadzones, instead of Axial deadzones. Additionally fixes some weird padscale 0 stuff that was flipped. This does have gameplay implications in both NiGHTS and regular gameplay. Notably you won't feel like you're locked into up/down left/right when you want to turn, but this can make running perfectly straight a little bit more tricky.
2019-12-15 14:37:30 +00:00
if (movefkey || (gamepadjoystickmove && movejoystickvector.yaxis < 0)
Merge errors for compile
2019-01-07 20:43:58 +00:00
|| ((player->powers[pw_carry] == CR_NIGHTSMODE)
Merge branch 'master' into newcontrols # Conflicts: # src/d_netcmd.c # src/g_game.c # src/g_game.h # src/m_menu.c
2019-12-30 16:47:09 +00:00
&& (PLAYERINPUTDOWN(ssplayer, gc_lookup) || (gamepadjoystickmove && lookjoystickvector.yaxis > 0))))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
forward = forwardmove[speed];
Use Scaled Radial Deadzones, instead of Axial deadzones. Additionally fixes some weird padscale 0 stuff that was flipped. This does have gameplay implications in both NiGHTS and regular gameplay. Notably you won't feel like you're locked into up/down left/right when you want to turn, but this can make running perfectly straight a little bit more tricky.
2019-12-15 14:37:30 +00:00
if (movebkey || (gamepadjoystickmove && movejoystickvector.yaxis > 0)
Merge errors for compile
2019-01-07 20:43:58 +00:00
|| ((player->powers[pw_carry] == CR_NIGHTSMODE)
Merge branch 'master' into newcontrols # Conflicts: # src/d_netcmd.c # src/g_game.c # src/g_game.h # src/m_menu.c
2019-12-30 16:47:09 +00:00
&& (PLAYERINPUTDOWN(ssplayer, gc_lookdown) || (gamepadjoystickmove && lookjoystickvector.yaxis < 0))))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
forward -= forwardmove[speed];
Use Scaled Radial Deadzones, instead of Axial deadzones. Additionally fixes some weird padscale 0 stuff that was flipped. This does have gameplay implications in both NiGHTS and regular gameplay. Notably you won't feel like you're locked into up/down left/right when you want to turn, but this can make running perfectly straight a little bit more tricky.
2019-12-15 14:37:30 +00:00
if (analogjoystickmove && movejoystickvector.yaxis != 0)
forward -= ((movejoystickvector.yaxis * forwardmove[1]) >> 10); // ANALOG!
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// some people strafe left & right with mouse buttons
// those people are weird
Fixed diagonal analog input being weakened Using a keyboard and an analog stick should now give you similar acceleration in all directions.
2017-09-19 04:26:05 +00:00
if (straferkey)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
side += sidemove[speed];
Fixed diagonal analog input being weakened Using a keyboard and an analog stick should now give you similar acceleration in all directions.
2017-09-19 04:26:05 +00:00
if (strafelkey)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
side -= sidemove[speed];
Consolidate G_BuildTiccmd
2019-12-08 19:27:11 +00:00
if (PLAYERINPUTDOWN(ssplayer, gc_weaponnext))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
cmd->buttons |= BT_WEAPONNEXT; // Next Weapon
Consolidate G_BuildTiccmd
2019-12-08 19:27:11 +00:00
if (PLAYERINPUTDOWN(ssplayer, gc_weaponprev))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
cmd->buttons |= BT_WEAPONPREV; // Previous Weapon
#if NUM_WEAPONS > 10
"Add extra inputs to g_input.h/gamecontrols_e"
#endif
//use the four avaliable bits to determine the weapon.
cmd->buttons &= ~BT_WEAPONMASK;
for (i = 0; i < NUM_WEAPONS; ++i)
Consolidate G_BuildTiccmd
2019-12-08 19:27:11 +00:00
if (PLAYERINPUTDOWN(ssplayer, gc_wepslot1 + i))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
cmd->buttons |= (UINT16)(i + 1);
break;
}
// fire with any button/key
Consolidate G_BuildTiccmd
2019-12-08 19:27:11 +00:00
axis = PlayerJoyAxis(ssplayer, AXISFIRE);
if (PLAYERINPUTDOWN(ssplayer, gc_fire) || (usejoystick && axis > 0))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
cmd->buttons |= BT_ATTACK;
// fire normal with any button/key
Consolidate G_BuildTiccmd
2019-12-08 19:27:11 +00:00
axis = PlayerJoyAxis(ssplayer, AXISFIRENORMAL);
if (PLAYERINPUTDOWN(ssplayer, gc_firenormal) || (usejoystick && axis > 0))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
cmd->buttons |= BT_FIRENORMAL;
Consolidate G_BuildTiccmd
2019-12-08 19:27:11 +00:00
if (PLAYERINPUTDOWN(ssplayer, gc_tossflag))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
cmd->buttons |= BT_TOSSFLAG;
SRB2 2.1.5 release
2014-03-23 16:00:29 +00:00
// Lua scriptable buttons
Consolidate G_BuildTiccmd
2019-12-08 19:27:11 +00:00
if (PLAYERINPUTDOWN(ssplayer, gc_custom1))
SRB2 2.1.5 release
2014-03-23 16:00:29 +00:00
cmd->buttons |= BT_CUSTOM1;
Consolidate G_BuildTiccmd
2019-12-08 19:27:11 +00:00
if (PLAYERINPUTDOWN(ssplayer, gc_custom2))
SRB2 2.1.5 release
2014-03-23 16:00:29 +00:00
cmd->buttons |= BT_CUSTOM2;
Consolidate G_BuildTiccmd
2019-12-08 19:27:11 +00:00
if (PLAYERINPUTDOWN(ssplayer, gc_custom3))
SRB2 2.1.5 release
2014-03-23 16:00:29 +00:00
cmd->buttons |= BT_CUSTOM3;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// use with any button/key
Consolidate G_BuildTiccmd
2019-12-08 19:27:11 +00:00
axis = PlayerJoyAxis(ssplayer, AXISSPIN);
Oops! Missed a couple...
2020-06-06 10:57:32 +00:00
if (PLAYERINPUTDOWN(ssplayer, gc_spin) || (usejoystick && axis > 0))
Replace all occurances of BT_USE with BT_SPIN (2.3?) I'd use `next-major` but it doesn't exist lol
2020-06-06 09:36:34 +00:00
cmd->buttons |= BT_SPIN;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Allow setting center view to a toggle
2019-12-15 01:17:41 +00:00
// Centerview can be a toggle in simple mode!
{
static boolean last_centerviewdown[2], centerviewhold[2]; // detect taps for toggle behavior
boolean down = PLAYERINPUTDOWN(ssplayer, gc_centerview);
Convert simple movement to directionchar+analog Analog + no directionchar is old analog (now known as CS_LMAOGALOG because lmao if you still use it).
2019-12-30 21:05:24 +00:00
if (!(controlstyle == CS_SIMPLE && cv_cam_centertoggle[forplayer].value))
Allow setting center view to a toggle
2019-12-15 01:17:41 +00:00
centerviewdown = down;
else
{
if (down && !last_centerviewdown[forplayer])
centerviewhold[forplayer] = !centerviewhold[forplayer];
last_centerviewdown[forplayer] = down;
Somehow miss committing the ACTUAL stickyhold part
2019-12-30 17:36:59 +00:00
if (cv_cam_centertoggle[forplayer].value == 2 && !down && !ticcmd_ztargetfocus[forplayer])
centerviewhold[forplayer] = false;
Allow setting center view to a toggle
2019-12-15 01:17:41 +00:00
centerviewdown = centerviewhold[forplayer];
}
}
if (centerviewdown)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Convert simple movement to directionchar+analog Analog + no directionchar is old analog (now known as CS_LMAOGALOG because lmao if you still use it).
2019-12-30 21:05:24 +00:00
if (controlstyle == CS_SIMPLE && !ticcmd_centerviewdown[forplayer] && !G_RingSlingerGametype())
Lock camera behind player when holding cam reset This also disables abilitydirection movement temporarily.
2019-12-10 02:21:32 +00:00
{
Fix camera reset button
2019-12-30 21:34:43 +00:00
CV_SetValue(&cv_directionchar[forplayer], 2);
Fix potential desynch when a player spawns
2020-05-28 09:03:35 +00:00
cmd->angleturn = (INT16)((player->mo->angle - *myangle) >> 16);
Move Z-targeting behavior to Center View
2019-12-12 03:09:23 +00:00
*myaiming = 0;
Add boss target assist and finally organize camera options
2019-12-12 06:48:15 +00:00
if (cv_cam_lockonboss[forplayer].value)
Expand options for aim assist This will need a lot of testing to ensure each type works properly.
2019-12-13 05:03:51 +00:00
P_SetTarget(&ticcmd_ztargetfocus[forplayer], P_LookForFocusTarget(player, NULL, 0, cv_cam_lockonboss[forplayer].value));
Lock camera behind player when holding cam reset This also disables abilitydirection movement temporarily.
2019-12-10 02:21:32 +00:00
}
Move Z-targeting behavior to Center View
2019-12-12 03:09:23 +00:00
ticcmd_centerviewdown[forplayer] = true;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
Fix the console spam issue AGAIN
2019-12-12 03:20:07 +00:00
else if (ticcmd_centerviewdown[forplayer])
Suspend directionchar while holding cam reset This should make it completely clear that thok will face the camera while it's held.
2019-12-10 13:58:50 +00:00
{
Convert simple movement to directionchar+analog Analog + no directionchar is old analog (now known as CS_LMAOGALOG because lmao if you still use it).
2019-12-30 21:05:24 +00:00
if (controlstyle == CS_SIMPLE)
Add boss target assist and finally organize camera options
2019-12-12 06:48:15 +00:00
{
P_SetTarget(&ticcmd_ztargetfocus[forplayer], NULL);
Convert simple movement to directionchar+analog Analog + no directionchar is old analog (now known as CS_LMAOGALOG because lmao if you still use it).
2019-12-30 21:05:24 +00:00
CV_SetValue(&cv_directionchar[forplayer], 1);
Add boss target assist and finally organize camera options
2019-12-12 06:48:15 +00:00
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Move Z-targeting behavior to Center View
2019-12-12 03:09:23 +00:00
ticcmd_centerviewdown[forplayer] = false;
Suspend directionchar while holding cam reset This should make it completely clear that thok will face the camera while it's held.
2019-12-10 13:58:50 +00:00
}
Add boss target assist and finally organize camera options
2019-12-12 06:48:15 +00:00
if (ticcmd_ztargetfocus[forplayer])
{
if (
P_MobjWasRemoved(ticcmd_ztargetfocus[forplayer]) ||
!ticcmd_ztargetfocus[forplayer]->health ||
(ticcmd_ztargetfocus[forplayer]->flags2 & MF2_FRET) ||
(ticcmd_ztargetfocus[forplayer]->type == MT_EGGMOBILE3 && !ticcmd_ztargetfocus[forplayer]->movecount) // Sea Egg is moving around underground and shouldn't be tracked
)
P_SetTarget(&ticcmd_ztargetfocus[forplayer], NULL);
else
{
Allow switching lockon targets with turn buttons
2019-12-13 05:52:13 +00:00
mobj_t *newtarget = NULL;
if (zchange[forplayer])
{
if (!turnleft && !turnright && abs(cmd->angleturn) < angleturn[0])
zchange[forplayer] = false;
}
else if (turnleft || cmd->angleturn > angleturn[0])
{
zchange[forplayer] = true;
newtarget = P_LookForFocusTarget(player, ticcmd_ztargetfocus[forplayer], 1, cv_cam_lockonboss[forplayer].value);
}
else if (turnright || cmd->angleturn < -angleturn[0])
{
zchange[forplayer] = true;
newtarget = P_LookForFocusTarget(player, ticcmd_ztargetfocus[forplayer], -1, cv_cam_lockonboss[forplayer].value);
}
if (newtarget)
P_SetTarget(&ticcmd_ztargetfocus[forplayer], newtarget);
[POTENTIALLY RISKY] Show target arrow above lock-on target My judgement on "is this netgame-safe" is "Gunslinger's targeting spawns this only for the local player, so maybe".
2019-12-15 01:21:11 +00:00
// I assume this is netgame-safe because gunslinger spawns this for only the local player...... *sweats intensely*
newtarget = P_SpawnMobj(ticcmd_ztargetfocus[forplayer]->x, ticcmd_ztargetfocus[forplayer]->y, ticcmd_ztargetfocus[forplayer]->z, MT_LOCKON); // positioning, flip handled in P_SceneryThinker
P_SetTarget(&newtarget->target, ticcmd_ztargetfocus[forplayer]);
Revert "Replace all instances of P_AproxDistance with FixedHypot" This reverts commit 75633bde5039106c5f916ca2b4d1bde11d274be9.
2021-02-13 16:45:20 +00:00
if (P_AproxDistance(
Add boss target assist and finally organize camera options
2019-12-12 06:48:15 +00:00
player->mo->x - ticcmd_ztargetfocus[forplayer]->x,
player->mo->y - ticcmd_ztargetfocus[forplayer]->y
) > 50*player->mo->scale)
{
INT32 anglediff = R_PointToAngle2(player->mo->x, player->mo->y, ticcmd_ztargetfocus[forplayer]->x, ticcmd_ztargetfocus[forplayer]->y) - *myangle;
const INT32 maxturn = ANG10/2;
anglediff /= 4;
if (anglediff > maxturn)
anglediff = maxturn;
else if (anglediff < -maxturn)
anglediff = -maxturn;
Fix potential desynch when a player spawns
2020-05-28 09:03:35 +00:00
cmd->angleturn = (INT16)(cmd->angleturn + (anglediff >> 16));
Add boss target assist and finally organize camera options
2019-12-12 06:48:15 +00:00
}
}
}
Fix camera reset button
2019-12-30 21:34:43 +00:00
if (ticcmd_centerviewdown[forplayer] && controlstyle == CS_SIMPLE)
controlstyle = CS_LEGACY;
Move Z-targeting behavior to Center View
2019-12-12 03:09:23 +00:00
if (PLAYERINPUTDOWN(ssplayer, gc_camreset))
{
Fix camera stuff in splitscreen
2020-01-04 15:54:56 +00:00
if (thiscam->chase && !resetdown[forplayer])
P_ResetCamera(&players[ssplayer == 1 ? displayplayer : secondarydisplayplayer], thiscam);
Move Z-targeting behavior to Center View
2019-12-12 03:09:23 +00:00
resetdown[forplayer] = true;
}
else
resetdown[forplayer] = false;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// jump button
Consolidate G_BuildTiccmd
2019-12-08 19:27:11 +00:00
axis = PlayerJoyAxis(ssplayer, AXISJUMP);
if (PLAYERINPUTDOWN(ssplayer, gc_jump) || (usejoystick && axis > 0))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
cmd->buttons |= BT_JUMP;
// player aiming shit, ahhhh...
{
Consolidate G_BuildTiccmd
2019-12-08 19:27:11 +00:00
INT32 player_invert = invertmouse ? -1 : 1;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
INT32 screen_invert =
(player->mo && (player->mo->eflags & MFE_VERTICALFLIP)
Fix camera stuff in splitscreen
2020-01-04 15:54:56 +00:00
&& (!thiscam->chase || player->pflags & PF_FLIPCAM)) //because chasecam's not inverted
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
? -1 : 1; // set to -1 or 1 to multiply
oh god I forget why this is here but let's not remove it now
2020-01-08 06:21:03 +00:00
INT32 configlookaxis = ssplayer == 1 ? cv_lookaxis.value : cv_lookaxis2.value;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// mouse look stuff (mouse look is not the same as mouse aim)
if (mouseaiming)
{
Consolidate G_BuildTiccmd
2019-12-08 19:27:11 +00:00
keyboard_look[forplayer] = false;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// looking up/down
Consolidate G_BuildTiccmd
2019-12-08 19:27:11 +00:00
*myaiming += (*mly<<19)*player_invert*screen_invert;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
oh god I forget why this is here but let's not remove it now
2020-01-08 06:21:03 +00:00
if (analogjoystickmove && joyaiming[forplayer] && lookjoystickvector.yaxis != 0 && configlookaxis != 0)
Merge branch 'master' into newcontrols # Conflicts: # src/d_netcmd.c # src/g_game.c # src/g_game.h # src/m_menu.c
2019-12-30 16:47:09 +00:00
*myaiming += (lookjoystickvector.yaxis<<16) * screen_invert;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// spring back if not using keyboard neither mouselookin'
oh god I forget why this is here but let's not remove it now
2020-01-08 06:21:03 +00:00
if (!keyboard_look[forplayer] && configlookaxis == 0 && !joyaiming[forplayer] && !mouseaiming)
Consolidate G_BuildTiccmd
2019-12-08 19:27:11 +00:00
*myaiming = 0;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Merge errors for compile
2019-01-07 20:43:58 +00:00
if (!(player->powers[pw_carry] == CR_NIGHTSMODE))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Merge branch 'master' into newcontrols # Conflicts: # src/d_netcmd.c # src/g_game.c # src/g_game.h # src/m_menu.c
2019-12-30 16:47:09 +00:00
if (PLAYERINPUTDOWN(ssplayer, gc_lookup) || (gamepadjoystickmove && lookjoystickvector.yaxis < 0))
Support Look Up/Down keys for NiGHTS movement
2018-12-25 04:43:24 +00:00
{
Consolidate G_BuildTiccmd
2019-12-08 19:27:11 +00:00
*myaiming += KB_LOOKSPEED * screen_invert;
keyboard_look[forplayer] = true;
Support Look Up/Down keys for NiGHTS movement
2018-12-25 04:43:24 +00:00
}
Merge branch 'master' into newcontrols # Conflicts: # src/d_netcmd.c # src/g_game.c # src/g_game.h # src/m_menu.c
2019-12-30 16:47:09 +00:00
else if (PLAYERINPUTDOWN(ssplayer, gc_lookdown) || (gamepadjoystickmove && lookjoystickvector.yaxis > 0))
Support Look Up/Down keys for NiGHTS movement
2018-12-25 04:43:24 +00:00
{
Consolidate G_BuildTiccmd
2019-12-08 19:27:11 +00:00
*myaiming -= KB_LOOKSPEED * screen_invert;
keyboard_look[forplayer] = true;
Support Look Up/Down keys for NiGHTS movement
2018-12-25 04:43:24 +00:00
}
Move Z-targeting behavior to Center View
2019-12-12 03:09:23 +00:00
else if (ticcmd_centerviewdown[forplayer])
Consolidate G_BuildTiccmd
2019-12-08 19:27:11 +00:00
*myaiming = 0;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
// accept no mlook for network games
if (!cv_allowmlook.value)
Consolidate G_BuildTiccmd
2019-12-08 19:27:11 +00:00
*myaiming = 0;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Consolidate G_BuildTiccmd
2019-12-08 19:27:11 +00:00
cmd->aiming = G_ClipAimingPitch(myaiming);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
Consolidate G_BuildTiccmd
2019-12-08 19:27:11 +00:00
if (!mouseaiming && mousemove)
forward += *my;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Allow camera movement while climbing; allow sliding while landing from a glide
2019-09-30 06:38:58 +00:00
if ((!demoplayback && (player->pflags & PF_SLIDING))) // Analog for mouse
Consolidate G_BuildTiccmd
2019-12-08 19:27:11 +00:00
side += *mx*2;
Convert simple movement to directionchar+analog Analog + no directionchar is old analog (now known as CS_LMAOGALOG because lmao if you still use it).
2019-12-30 21:05:24 +00:00
else if (controlstyle == CS_LMAOGALOG)
Change analog mouse to apply turning buttons, because aa.
2017-04-14 20:01:45 +00:00
{
Consolidate G_BuildTiccmd
2019-12-08 19:27:11 +00:00
if (*mx)
Change analog mouse to apply turning buttons, because aa.
2017-04-14 20:01:45 +00:00
{
Consolidate G_BuildTiccmd
2019-12-08 19:27:11 +00:00
if (*mx > 0)
Change analog mouse to apply turning buttons, because aa.
2017-04-14 20:01:45 +00:00
cmd->buttons |= BT_CAMRIGHT;
else
cmd->buttons |= BT_CAMLEFT;
}
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
else
Consolidate G_BuildTiccmd
2019-12-08 19:27:11 +00:00
cmd->angleturn = (INT16)(cmd->angleturn - (*mx*8));
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Consolidate G_BuildTiccmd
2019-12-08 19:27:11 +00:00
*mx = *my = *mly = 0;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (forward > MAXPLMOVE)
forward = MAXPLMOVE;
else if (forward < -MAXPLMOVE)
forward = -MAXPLMOVE;
if (side > MAXPLMOVE)
side = MAXPLMOVE;
else if (side < -MAXPLMOVE)
side = -MAXPLMOVE;
// No additional acceleration when moving forward/backward and strafing simultaneously.
// do this AFTER we cap to MAXPLMOVE so people can't find ways to cheese around this.
Trigonometric input capping
2019-09-24 19:12:56 +00:00
if (!forcefullinput && forward && side)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Trigonometric input capping
2019-09-24 19:12:56 +00:00
angle_t angle = R_PointToAngle2(0, 0, side << FRACBITS, forward << FRACBITS);
INT32 maxforward = abs(P_ReturnThrustY(NULL, angle, MAXPLMOVE));
INT32 maxside = abs(P_ReturnThrustX(NULL, angle, MAXPLMOVE));
forward = max(min(forward, maxforward), -maxforward);
side = max(min(side, maxside), -maxside);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
//Silly hack to make 2d mode *somewhat* playable with no chasecam.
Fix camera stuff in splitscreen
2020-01-04 15:54:56 +00:00
if ((twodlevel || (player->mo && player->mo->flags2 & MF2_TWOD)) && !thiscam->chase)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
INT32 temp = forward;
forward = side;
side = temp;
}
cmd->forwardmove = (SINT8)(cmd->forwardmove + forward);
cmd->sidemove = (SINT8)(cmd->sidemove + side);
Consolidate G_BuildTiccmd
2019-12-08 19:27:11 +00:00
if (player->bot == 1) { // Tailsbot for P2
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (!player->powers[pw_tailsfly] && (cmd->forwardmove || cmd->sidemove || cmd->buttons))
{
player->bot = 2; // A player-controlled bot. Returns to AI when it respawns.
Convert analog/directionchar cvars into 2-long arrays
2019-12-30 20:01:14 +00:00
CV_SetValue(&cv_analog[1], true);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
else
{
G_CopyTiccmd(cmd, I_BaseTiccmd2(), 1); // empty, or external driver
B_BuildTiccmd(player, cmd);
}
Remove flight indicator when AI Tails is taken over by second player
2019-12-31 08:48:29 +00:00
B_HandleFlightIndicator(player);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
Fix tailsbot behavior that broke with Simple mode
2019-12-31 05:58:58 +00:00
else if (player->bot == 2)
Fix potential desynch when a player spawns
2020-05-28 09:03:35 +00:00
// Fix offset angle for P2-controlled Tailsbot when P2's controls are set to non-Legacy
cmd->angleturn = (INT16)((localangle - *myangle) >> 16);
*myangle += (cmd->angleturn<<16);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Convert simple movement to directionchar+analog Analog + no directionchar is old analog (now known as CS_LMAOGALOG because lmao if you still use it).
2019-12-30 21:05:24 +00:00
if (controlstyle == CS_LMAOGALOG) {
Fix potential desynch when a player spawns
2020-05-28 09:03:35 +00:00
angle_t angle;
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
if (player->awayviewtics)
Fix potential desynch when a player spawns
2020-05-28 09:03:35 +00:00
angle = player->awayviewmobj->angle;
First part of revamp: Removing Camera Rotate L/R keys, and giving the two situations where they had any unique functionality (Analog mode and NiGHTS objectplace) suitable replacements.
2017-04-14 19:29:08 +00:00
else
Fix potential desynch when a player spawns
2020-05-28 09:03:35 +00:00
angle = thiscam->angle;
cmd->angleturn = (INT16)((angle - (ticcmd_oldangleturn[forplayer] << 16)) >> 16);
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
}
else
{
Automatically rotate camera to reflect player actions
2019-12-08 20:35:50 +00:00
// Adjust camera angle by player input
Merge branch 'newcontrols' into next-newcontrols
2020-01-04 15:56:24 +00:00
if (controlstyle == CS_SIMPLE && !forcestrafe && thiscam->chase && !turnheld[forplayer] && !ticcmd_centerviewdown[forplayer] && !player->climbing && player->powers[pw_carry] != CR_MINECART)
Automatically rotate camera to reflect player actions
2019-12-08 20:35:50 +00:00
{
Double sensitivity and halve default of turn to input
2019-12-14 04:55:34 +00:00
fixed_t camadjustfactor = cv_cam_turnfacinginput[forplayer].value;
Automatically rotate camera to reflect player actions
2019-12-08 20:35:50 +00:00
if (camadjustfactor)
Make input turn speed tween by lateral momentum, not total
2019-12-11 03:14:50 +00:00
{
fixed_t sine = FINESINE((R_PointToAngle2(0, 0, player->rmomx, player->rmomy) - localangle)>>ANGLETOFINESHIFT);
Mixed code and declaration stuff
2020-01-08 06:22:17 +00:00
fixed_t factor;
Fix potential desynch when a player spawns
2020-05-28 09:03:35 +00:00
INT16 camadjust;
Fix turn-to-input jerk when braking sideways
2019-12-15 01:04:29 +00:00
if ((sine > 0) == (cmd->sidemove > 0))
sine = 0; // Prevent jerking right when braking from going left, or vice versa
Mixed code and declaration stuff
2020-01-08 06:22:17 +00:00
factor = min(40, FixedMul(player->speed, abs(sine))*2 / FRACUNIT);
Turn camera with strafe keys in camlock while charging spindash
2019-12-11 03:34:57 +00:00
Fix potential desynch when a player spawns
2020-05-28 09:03:35 +00:00
camadjust = (cmd->sidemove * factor * camadjustfactor) >> 16;
*myangle -= camadjust << 16;
cmd->angleturn = (INT16)(cmd->angleturn - camadjust);
Make input turn speed tween by lateral momentum, not total
2019-12-11 03:14:50 +00:00
}
Turn camera with strafe keys in camlock while charging spindash
2019-12-11 03:34:57 +00:00
Move Z-targeting behavior to Center View
2019-12-12 03:09:23 +00:00
if (ticcmd_centerviewdown[forplayer] && (cv_cam_lockedinput[forplayer].value || (player->pflags & PF_STARTDASH)))
Turn camera with strafe keys in camlock while charging spindash
2019-12-11 03:34:57 +00:00
cmd->sidemove = 0;
Automatically rotate camera to reflect player actions
2019-12-08 20:35:50 +00:00
}
// Adjust camera angle to face player direction, depending on circumstances
// Nothing happens if cam left/right are held, so you can hold both to lock the camera in one direction
Merge branch 'newcontrols' into next-newcontrols
2020-01-04 15:56:24 +00:00
if (controlstyle == CS_SIMPLE && !forcestrafe && thiscam->chase && !turnheld[forplayer] && !ticcmd_centerviewdown[forplayer] && player->powers[pw_carry] != CR_MINECART)
Automatically rotate camera to reflect player actions
2019-12-08 20:35:50 +00:00
{
fixed_t camadjustfactor;
Adjust how turn-to-angle tweens
2019-12-13 06:34:34 +00:00
boolean alt = false; // Reduce intensity on diagonals and prevent backwards movement from turning the camera
Automatically rotate camera to reflect player actions
2019-12-08 20:35:50 +00:00
Don't turn-to-ability while climbing
2019-12-14 01:49:56 +00:00
if (player->pflags & PF_GLIDING)
Change defaults and factors of simplecam options
2019-12-11 03:24:43 +00:00
camadjustfactor = cv_cam_turnfacingability[forplayer].value/4;
Give spindash turn a separate slider
2019-12-10 14:07:41 +00:00
else if (player->pflags & PF_STARTDASH)
Change defaults and factors of simplecam options
2019-12-11 03:24:43 +00:00
camadjustfactor = cv_cam_turnfacingspindash[forplayer].value/4;
Automatically rotate camera to reflect player actions
2019-12-08 20:35:50 +00:00
else
Adjust how turn-to-angle tweens
2019-12-13 06:34:34 +00:00
{
alt = true;
Even MORE tta changes: - All automatic turning is suspended upon manual rotation - Dest angle uses drawangle again for rolling only
2019-12-14 02:30:56 +00:00
camadjustfactor = cv_cam_turnfacing[forplayer].value/8;
Adjust how turn-to-angle tweens
2019-12-13 06:34:34 +00:00
}
Automatically rotate camera to reflect player actions
2019-12-08 20:35:50 +00:00
Scale angle-related camera turns by player speed They also operate at full when idle, too.
2019-12-14 04:30:04 +00:00
camadjustfactor = FixedMul(camadjustfactor, max(FRACUNIT - player->speed, min(player->speed/18, FRACUNIT)));
Even MORE tta changes: - All automatic turning is suspended upon manual rotation - Dest angle uses drawangle again for rolling only
2019-12-14 02:30:56 +00:00
camadjustfactor = FixedMul(camadjustfactor, tta_factor[forplayer]);
if (tta_factor[forplayer] < FRACUNIT && (cmd->forwardmove || cmd->sidemove || tta_factor[forplayer] >= FRACUNIT/3))
Suspend turn-to-angle when rotating the camera
2019-12-13 06:52:48 +00:00
tta_factor[forplayer] += FRACUNIT>>5;
else if (tta_factor[forplayer] && tta_factor[forplayer] < FRACUNIT/3)
tta_factor[forplayer] -= FRACUNIT>>5;
Automatically rotate camera to reflect player actions
2019-12-08 20:35:50 +00:00
if (camadjustfactor)
{
Convert simple movement to directionchar+analog Analog + no directionchar is old analog (now known as CS_LMAOGALOG because lmao if you still use it).
2019-12-30 21:05:24 +00:00
angle_t controlangle;
INT32 anglediff;
Fix potential desynch when a player spawns
2020-05-28 09:03:35 +00:00
INT16 camadjust;
Convert simple movement to directionchar+analog Analog + no directionchar is old analog (now known as CS_LMAOGALOG because lmao if you still use it).
2019-12-30 21:05:24 +00:00
if ((cmd->forwardmove || cmd->sidemove) && !(player->pflags & PF_SPINNING))
Fix potential desynch when a player spawns
2020-05-28 09:03:35 +00:00
controlangle = *myangle + R_PointToAngle2(0, 0, cmd->forwardmove << FRACBITS, -cmd->sidemove << FRACBITS);
Convert simple movement to directionchar+analog Analog + no directionchar is old analog (now known as CS_LMAOGALOG because lmao if you still use it).
2019-12-30 21:05:24 +00:00
else
controlangle = player->drawangle + drawangleoffset;
anglediff = controlangle - *myangle;
Automatically rotate camera to reflect player actions
2019-12-08 20:35:50 +00:00
Adjust how turn-to-angle tweens
2019-12-13 06:34:34 +00:00
if (alt)
{
fixed_t sine = FINESINE((angle_t) (anglediff)>>ANGLETOFINESHIFT);
sine = abs(sine);
if (abs(anglediff) > ANGLE_90)
sine = max(0, sine*3 - 2*FRACUNIT); // At about 135 degrees, this will stop turning
anglediff = FixedMul(anglediff, sine);
}
Fix potential desynch when a player spawns
2020-05-28 09:03:35 +00:00
camadjust = FixedMul(anglediff, camadjustfactor) >> 16;
*myangle += camadjust << 16;
cmd->angleturn = (INT16)(cmd->angleturn + camadjust);
Automatically rotate camera to reflect player actions
2019-12-08 20:35:50 +00:00
}
}
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
}
Consolidate G_BuildTiccmd
2019-12-08 19:27:11 +00:00
Fix PlayerCmd not handling angle and aiming correctly
2020-11-23 00:23:34 +00:00
// At this point, cmd doesn't contain the final angle yet,
// So we need to temporarily transform it so Lua scripters
// don't need to handle it differently than in other hooks.
Only call PlayerCmd hooks if added to game
2021-02-10 23:24:42 +00:00
if (addedtogame && gamestate == GS_LEVEL)
Fix PlayerCmd not handling angle and aiming correctly
2020-11-23 00:23:34 +00:00
{
INT16 extra = ticcmd_oldangleturn[forplayer] - player->oldrelangleturn;
INT16 origangle = cmd->angleturn;
INT16 orighookangle = (INT16)(origangle + player->angleturn + extra);
INT16 origaiming = cmd->aiming;
cmd->angleturn = orighookangle;
Ported Lat's PlayerCmd hook to vanilla SRB2
2020-07-17 05:08:38 +00:00
LUAh_PlayerCmd(player, cmd);
Fix PlayerCmd not handling angle and aiming correctly
2020-11-23 00:23:34 +00:00
extra = cmd->angleturn - orighookangle;
cmd->angleturn = origangle + extra;
*myangle += extra << 16;
*myaiming += (cmd->aiming - origaiming) << 16;
}
Consolidate G_BuildTiccmd
2019-12-08 19:27:11 +00:00
//Reset away view if a command is given.
if (ssplayer == 1 && (cmd->forwardmove || cmd->sidemove || cmd->buttons)
&& displayplayer != consoleplayer)
Merge branch 'next' into next-newcontrols # Conflicts: # src/g_game.c # src/p_setup.c
2019-12-31 18:58:36 +00:00
{
// Call ViewpointSwitch hooks here.
// The viewpoint was forcibly changed.
Fix incorrect newdisplayplayer in forced ViewpointSwitch
2020-02-23 15:14:52 +00:00
LUAh_ViewpointSwitch(player, &players[consoleplayer], true);
Consolidate G_BuildTiccmd
2019-12-08 19:27:11 +00:00
displayplayer = consoleplayer;
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
}
Fix potential desynch when a player spawns
2020-05-28 09:03:35 +00:00
cmd->angleturn = (INT16)(cmd->angleturn + ticcmd_oldangleturn[forplayer]);
ticcmd_oldangleturn[forplayer] = cmd->angleturn;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
Created g_demo.c/.h, for the demo recording and playback code that formerly lived in g_game.c
2020-03-19 20:09:55 +00:00
ticcmd_t *G_CopyTiccmd(ticcmd_t* dest, const ticcmd_t* src, const size_t n)
{
return M_Memcpy(dest, src, n*sizeof(*src));
}
ticcmd_t *G_MoveTiccmd(ticcmd_t* dest, const ticcmd_t* src, const size_t n)
{
size_t i;
for (i = 0; i < n; i++)
{
dest[i].forwardmove = src[i].forwardmove;
dest[i].sidemove = src[i].sidemove;
dest[i].angleturn = SHORT(src[i].angleturn);
dest[i].aiming = (INT16)SHORT(src[i].aiming);
dest[i].buttons = (UINT16)SHORT(src[i].buttons);
}
return dest;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
// User has designated that they want
// analog ON, so tell the game to stop
// fudging with it.
static void UserAnalog_OnChange(void)
{
Convert analog/directionchar cvars into 2-long arrays
2019-12-30 20:01:14 +00:00
if (cv_useranalog[0].value)
CV_SetValue(&cv_analog[0], 1);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
else
Convert analog/directionchar cvars into 2-long arrays
2019-12-30 20:01:14 +00:00
CV_SetValue(&cv_analog[0], 0);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
static void UserAnalog2_OnChange(void)
{
if (botingame)
return;
Convert analog/directionchar cvars into 2-long arrays
2019-12-30 20:01:14 +00:00
if (cv_useranalog[1].value)
CV_SetValue(&cv_analog[1], 1);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
else
Convert analog/directionchar cvars into 2-long arrays
2019-12-30 20:01:14 +00:00
CV_SetValue(&cv_analog[1], 0);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
static void Analog_OnChange(void)
{
if (!cv_cam_dist.string)
return;
SRB2 2.1.4 release
2014-03-21 18:42:55 +00:00
// cameras are not initialized at this point
Convert analog/directionchar cvars into 2-long arrays
2019-12-30 20:01:14 +00:00
if (!cv_chasecam.value && cv_analog[0].value) {
CV_SetValue(&cv_analog[0], 0);
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
return;
}
SendWeaponPref();
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
static void Analog2_OnChange(void)
{
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
if (!(splitscreen || botingame) || !cv_cam2_dist.string)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return;
SRB2 2.1.4 release
2014-03-21 18:42:55 +00:00
// cameras are not initialized at this point
Convert analog/directionchar cvars into 2-long arrays
2019-12-30 20:01:14 +00:00
if (!cv_chasecam2.value && cv_analog[1].value) {
CV_SetValue(&cv_analog[1], 0);
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
return;
}
SendWeaponPref2();
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
* cv_directionchar and cv_autobrake, and their secondplayer versions (both on by default) now exist. * cv_useranalog is now hidden from the menu. * Directionchar now attempts to face the camera direction when you're standing still, and handles a few other states with more decorum. * Tailsbot is now slightly more capable of keeping up with Sonic. * pflags rearranged/adjusted, combining a few non-simulstaneous ones and turning PF_NIGHTSFALL into CR_NIGHTSFALL. * [unrelated to branch] all ground-impact based abilities now happen more consistently with quicksand.
2017-09-15 19:34:46 +00:00
static void DirectionChar_OnChange(void)
{
SendWeaponPref();
}
static void DirectionChar2_OnChange(void)
{
SendWeaponPref2();
}
static void AutoBrake_OnChange(void)
{
SendWeaponPref();
}
static void AutoBrake2_OnChange(void)
{
SendWeaponPref2();
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
//
// G_DoLoadLevel
//
void G_DoLoadLevel(boolean resetplayer)
{
INT32 i;
// Make sure objectplace is OFF when you first start the level!
OP_ResetObjectplace();
* "BAD DEMO!!" and "ANALOG" attachments to the input viewer * Minor refactor
2017-10-18 12:22:57 +00:00
demosynced = true;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
levelstarttic = gametic; // for time calculation
if (wipegamestate == GS_LEVEL)
wipegamestate = -1; // force a wipe
if (gamestate == GS_INTERMISSION)
Y_EndIntermission();
* Fix titlemap music change bug reported by Larztard * Clean up titlemapinaction so that it isn't true when you're playing * Don't print "SPEEDING OFF TO [ZONE] [ACT 1]..." on screen if it's a titlemap - keep a nice and pretty black screen
2017-05-08 23:48:07 +00:00
// cleanup
* Prevent crash if you go to a map and it doesn't exist. * Handle music fix in smarter way. * Enums!
2017-05-09 10:09:58 +00:00
if (titlemapinaction == TITLEMAP_LOADING)
{
if (W_CheckNumForName(G_BuildMapName(gamemap)) == LUMPERROR)
{
titlemap = 0; // let's not infinite recursion ok
Command_ExitGame_f();
return;
}
titlemapinaction = TITLEMAP_RUNNING;
}
* Fix titlemap music change bug reported by Larztard * Clean up titlemapinaction so that it isn't true when you're playing * Don't print "SPEEDING OFF TO [ZONE] [ACT 1]..." on screen if it's a titlemap - keep a nice and pretty black screen
2017-05-08 23:48:07 +00:00
else
* Prevent crash if you go to a map and it doesn't exist. * Handle music fix in smarter way. * Enums!
2017-05-09 10:09:58 +00:00
titlemapinaction = TITLEMAP_OFF;
* Fix titlemap music change bug reported by Larztard * Clean up titlemapinaction so that it isn't true when you're playing * Don't print "SPEEDING OFF TO [ZONE] [ACT 1]..." on screen if it's a titlemap - keep a nice and pretty black screen
2017-05-08 23:48:07 +00:00
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
G_SetGamestate(GS_LEVEL);
Grab mouse again when closing menu, unpausing, etc
2020-01-01 23:45:28 +00:00
I_UpdateMouseGrab();
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
for (i = 0; i < MAXPLAYERS; i++)
{
if (resetplayer || (playeringame[i] && players[i].playerstate == PST_DEAD))
players[i].playerstate = PST_REBORN;
}
// Setup the level.
Add "resendgamestate" command
2020-01-31 14:57:04 +00:00
if (!P_LoadLevel(false, false)) // this never returns false?
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
// fail so reset game stuff
Command_ExitGame_f();
return;
}
Fix emerald hunt not working properly
2019-12-29 02:57:29 +00:00
P_FindEmerald();
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
displayplayer = consoleplayer; // view the guy you are playing
if (!splitscreen && !botingame)
secondarydisplayplayer = consoleplayer;
gameaction = ga_nothing;
#ifdef PARANOIA
Z_CheckHeap(-2);
#endif
if (camera.chase)
P_ResetCamera(&players[displayplayer], &camera);
if (camera2.chase && splitscreen)
P_ResetCamera(&players[secondarydisplayplayer], &camera2);
// clear cmd building stuff
memset(gamekeydown, 0, sizeof (gamekeydown));
for (i = 0;i < JOYAXISSET; i++)
{
joyxmove[i] = joyymove[i] = 0;
joy2xmove[i] = joy2ymove[i] = 0;
}
mousex = mousey = 0;
mouse2x = mouse2y = 0;
// clear hud messages remains (usually from game startup)
CON_ClearHUD();
}
Organize
2019-11-18 15:56:41 +00:00
//
// Start the title card.
//
void G_StartTitleCard(void)
{
map header option
2019-11-18 17:08:47 +00:00
// The title card has been disabled for this map.
// Oh well.
Title card fixes.
2019-12-24 19:22:25 +00:00
if (!G_IsTitleCardAvailable())
map header option
2019-11-18 17:08:47 +00:00
{
WipeStageTitle = false;
return;
}
Organize
2019-11-18 15:56:41 +00:00
// clear the hud
CON_ClearHUD();
// prepare status bar
ST_startTitleCard();
// start the title card
WipeStageTitle = (!titlemapinaction);
}
//
// Run the title card before fading in to the level.
//
Remove unnecessary function parameters from title card code
2019-12-05 04:58:19 +00:00
void G_PreLevelTitleCard(void)
Organize
2019-11-18 15:56:41 +00:00
{
Fix NOWIPE bugs with colormap fade and title card
2020-05-24 02:47:30 +00:00
#ifndef NOWIPE
Organize
2019-11-18 15:56:41 +00:00
tic_t starttime = I_GetTime();
tic_t endtime = starttime + (PRELEVELTIME*NEWTICRATERATIO);
tic_t nowtime = starttime;
tic_t lasttime = starttime;
while (nowtime < endtime)
{
// draw loop
while (!((nowtime = I_GetTime()) - lasttime))
I_Sleep();
lasttime = nowtime;
ST_runTitleCard();
Remove unnecessary function parameters from title card code
2019-12-05 04:58:19 +00:00
ST_preLevelTitleCardDrawer();
I_FinishUpdate(); // page flip or blit buffer
Organize
2019-11-18 15:56:41 +00:00
if (moviemode)
M_SaveFrame();
if (takescreenshot) // Only take screenshots after drawing.
M_DoScreenShot();
}
Change st_overlay to cv_showhud.value
2019-12-05 19:25:19 +00:00
if (!cv_showhud.value)
Slap colormap fades everywhere
2019-12-04 22:25:39 +00:00
wipestyleflags = WSF_CROSSFADE;
Fix NOWIPE bugs with colormap fade and title card
2020-05-24 02:47:30 +00:00
#endif
Organize
2019-11-18 15:56:41 +00:00
}
Allow more options for when the titlecard shows up
2020-02-08 17:13:20 +00:00
static boolean titlecardforreload = false;
Title card fixes.
2019-12-24 19:22:25 +00:00
//
// Returns true if the current level has a title card.
//
boolean G_IsTitleCardAvailable(void)
{
// The current level header explicitly disabled the title card.
Allow more options for when the titlecard shows up
2020-02-08 17:13:20 +00:00
UINT16 titleflag = LF_NOTITLECARDFIRST;
More fixes for titlecard option stuff
2020-02-09 23:53:13 +00:00
if (modeattacking != ATTACKING_NONE)
Allow more options for when the titlecard shows up
2020-02-08 17:13:20 +00:00
titleflag = LF_NOTITLECARDRECORDATTACK;
else if (titlecardforreload)
titleflag = LF_NOTITLECARDRESPAWN;
if (mapheaderinfo[gamemap-1]->levelflags & titleflag)
Title card fixes.
2019-12-24 19:22:25 +00:00
return false;
// The current gametype doesn't have a title card.
if (gametyperules & GTR_NOTITLECARD)
return false;
Remove redundancy
2020-01-27 02:46:07 +00:00
// The current level has no name.
if (!mapheaderinfo[gamemap-1]->lvlttl[0])
return false;
Title card fixes.
2019-12-24 19:22:25 +00:00
// The title card is available.
return true;
}
* Hold the pause button to restart a record attack run! * Obligatory GIF: https://cdn.discordapp.com/attachments/400761370800422922/456586705424875520/srb20047.gif * Show powerup display in singleplayer even while holding Game Status button.
2018-06-13 23:58:28 +00:00
INT32 pausedelay = 0;
Dont show Hold to Retry HUD when using Pause/Break key
2018-11-21 16:10:18 +00:00
boolean pausebreakkey = false;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
static INT32 camtoggledelay, camtoggledelay2 = 0;
//
// G_Responder
// Get info needed to make ticcmd_ts for the players.
//
boolean G_Responder(event_t *ev)
{
// any other key pops up menu if in demos
if (gameaction == ga_nothing && !singledemo &&
((demoplayback && !modeattacking && !titledemo) || gamestate == GS_TITLESCREEN))
{
Disable menu input on the title screen for the first second (ie, before the flash), to guarantee people won't start the menu the very first tic after the fade and ruin the animation. (Console and gif/screenshot recording still works, for the impatient.)
2019-11-14 12:52:34 +00:00
if (ev->type == ev_keydown && ev->data1 != 301 && !(gamestate == GS_TITLESCREEN && finalecount < TICRATE))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
M_StartControlPanel();
return true;
}
return false;
}
else if (demoplayback && titledemo)
{
// Title demo uses intro responder
if (F_IntroResponder(ev))
{
// stop the title demo
G_CheckDemoStatus();
return true;
}
return false;
}
if (gamestate == GS_LEVEL)
{
if (HU_Responder(ev))
return true; // chat ate the event
if (AM_Responder(ev))
return true; // automap ate it
// map the event (key/mouse/joy) to a gamecontrol
}
// Intro
else if (gamestate == GS_INTRO)
{
if (F_IntroResponder(ev))
{
D_StartTitle();
return true;
}
}
else if (gamestate == GS_CUTSCENE)
{
if (HU_Responder(ev))
return true; // chat ate the event
if (F_CutsceneResponder(ev))
{
D_StartTitle();
return true;
}
}
A good and bad ending cutscene now exist. Also: * SPR2_XTRA - instead of defining lumpnames in S_SKIN, those kinds of assets can just be bundled into the spriteset. Required for ending cutscene stuff, I guess, but also done for HUD life icon and character select image (aside from Sonic&Tails, still SOC'd in). * Minor oversights in SPR2 support corrected. * Better evaluation, featuring ending assets. * Intro has warping-in blackrock, reusing ending assets. * Cutscene text now supports lowercase (intro and custom). * Disable the asset-fucking "gamma correction" I put in over two years ago when implementing colour cube. (This is the only thing I could move into another branch if you MUST, but it's basically invisble in the diff so w/e.) * Don't blank the screen if the top left pixel of a screen-covering patch is transparent. (Checked via nonzero topdelta for first column) Bugs: * OPENGL ONLY: The first ~20 frames of both endings are fucked. A little help here? Might be HWR_DrawFadeFill's fault, which I just created. OR it could be in f_finale, but I doubt it, since it doesn't appear in Software.
2019-07-27 23:32:57 +00:00
else if (gamestate == GS_CREDITS || gamestate == GS_ENDING) // todo: keep ending here?
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
if (HU_Responder(ev))
return true; // chat ate the event
if (F_CreditResponder(ev))
{
Prevent just anyone from skipping credits but allow admins exitlevel works too
2019-03-25 23:17:02 +00:00
// Skip credits for everyone
Oops, go straight to evaluation if not in a netgame serverrunning means that you are actually the server.
2020-10-09 20:16:56 +00:00
if (! netgame)
Fix Credits sequence from Extras being unskippable This is because a server is not started before going to the credits. I'm way too stupid/lazy to try starting a server, so have a special case!
2020-07-24 10:58:38 +00:00
F_StartGameEvaluation();
else if (server || IsPlayerAdmin(consoleplayer))
Prevent just anyone from skipping credits but allow admins exitlevel works too
2019-03-25 23:17:02 +00:00
SendNetXCmd(XD_EXITLEVEL, NULL, 0);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return true;
}
}
else if (gamestate == GS_CONTINUING)
{
if (F_ContinueResponder(ev))
return true;
}
// Demo End
Make chat visible in the evaluation gamestate.
2017-09-15 19:34:46 +00:00
else if (gamestate == GS_GAMEEND)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return true;
Make chat visible in the evaluation gamestate.
2017-09-15 19:34:46 +00:00
else if (gamestate == GS_INTERMISSION || gamestate == GS_EVALUATION)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (HU_Responder(ev))
return true; // chat ate the event
Move change viewpoint control checking so it doesn't take precedence Notably over chat.
2019-03-16 22:42:18 +00:00
// allow spy mode changes even during the demo
if (gamestate == GS_LEVEL && ev->type == ev_keydown
&& (ev->data1 == KEY_F12 || ev->data1 == gamecontrol[gc_viewpoint][0] || ev->data1 == gamecontrol[gc_viewpoint][1]))
{
ViewpointSwitch improvements.
2019-12-23 23:22:57 +00:00
// ViewpointSwitch Lua hook.
UINT8 canSwitchView = 0;
Move change viewpoint control checking so it doesn't take precedence Notably over chat.
2019-03-16 22:42:18 +00:00
if (splitscreen || !netgame)
displayplayer = consoleplayer;
else
{
// spy mode
do
{
displayplayer++;
if (displayplayer == MAXPLAYERS)
displayplayer = 0;
if (!playeringame[displayplayer])
continue;
ViewpointSwitch improvements.
2019-12-23 23:22:57 +00:00
// Call ViewpointSwitch hooks here.
canSwitchView = LUAh_ViewpointSwitch(&players[consoleplayer], &players[displayplayer], false);
if (canSwitchView == 1) // Set viewpoint to this player
break;
else if (canSwitchView == 2) // Skip this player
continue;
ViewpointSwitch hook for Lua
2019-12-18 23:43:54 +00:00
Move change viewpoint control checking so it doesn't take precedence Notably over chat.
2019-03-16 22:42:18 +00:00
if (players[displayplayer].spectator)
continue;
if (G_GametypeHasTeams())
{
if (players[consoleplayer].ctfteam
&& players[displayplayer].ctfteam != players[consoleplayer].ctfteam)
continue;
}
Consider hide-and-seek as GTR_HIDEFROZEN
2020-02-29 02:52:33 +00:00
else if (gametyperules & GTR_HIDEFROZEN)
Move change viewpoint control checking so it doesn't take precedence Notably over chat.
2019-03-16 22:42:18 +00:00
{
if (players[consoleplayer].pflags & PF_TAGIT)
continue;
}
// Other Tag-based gametypes?
else if (G_TagGametype())
{
if (!players[consoleplayer].spectator
&& (players[consoleplayer].pflags & PF_TAGIT) != (players[displayplayer].pflags & PF_TAGIT))
continue;
}
else if (G_GametypeHasSpectators() && G_RingSlingerGametype())
{
if (!players[consoleplayer].spectator)
continue;
}
break;
} while (displayplayer != consoleplayer);
// change statusbar also if playing back demo
if (singledemo)
ST_changeDemoView();
// tell who's the view
CONS_Printf(M_GetText("Viewpoint: %s\n"), player_names[displayplayer]);
return true;
}
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// update keys current state
G_MapEventsToControls(ev);
switch (ev->type)
{
case ev_keydown:
if (ev->data1 == gamecontrol[gc_pause][0]
Hardcode Pause/Break key and change Pause default; show prompt in menu about Pause key
2018-11-21 04:43:05 +00:00
|| ev->data1 == gamecontrol[gc_pause][1]
|| ev->data1 == KEY_PAUSE)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
* Hold the pause button to restart a record attack run! * Obligatory GIF: https://cdn.discordapp.com/attachments/400761370800422922/456586705424875520/srb20047.gif * Show powerup display in singleplayer even while holding Game Status button.
2018-06-13 23:58:28 +00:00
if (modeattacking && !demoplayback && (gamestate == GS_LEVEL))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Dont show Hold to Retry HUD when using Pause/Break key
2018-11-21 16:10:18 +00:00
pausebreakkey = (ev->data1 == KEY_PAUSE);
* Hold the pause button to restart a record attack run! * Obligatory GIF: https://cdn.discordapp.com/attachments/400761370800422922/456586705424875520/srb20047.gif * Show powerup display in singleplayer even while holding Game Status button.
2018-06-13 23:58:28 +00:00
if (menuactive || pausedelay < 0 || leveltime < 2)
return true;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Improve retrying text presentation. * Now reads "HOLD TO RETRY...". * Behind the white flash. * Shows on button tap for about half a second.
2018-06-14 13:41:14 +00:00
if (pausedelay < 1+(NEWTICRATE/2))
pausedelay = 1+(NEWTICRATE/2);
else if (++pausedelay > 1+(NEWTICRATE/2)+(NEWTICRATE/3))
* Hold the pause button to restart a record attack run! * Obligatory GIF: https://cdn.discordapp.com/attachments/400761370800422922/456586705424875520/srb20047.gif * Show powerup display in singleplayer even while holding Game Status button.
2018-06-13 23:58:28 +00:00
{
fix RA fade
2019-11-23 21:15:09 +00:00
G_SetModeAttackRetryFlag();
* Hold the pause button to restart a record attack run! * Obligatory GIF: https://cdn.discordapp.com/attachments/400761370800422922/456586705424875520/srb20047.gif * Show powerup display in singleplayer even while holding Game Status button.
2018-06-13 23:58:28 +00:00
return true;
}
pausedelay++; // counteract subsequent subtraction this frame
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
else
* Hold the pause button to restart a record attack run! * Obligatory GIF: https://cdn.discordapp.com/attachments/400761370800422922/456586705424875520/srb20047.gif * Show powerup display in singleplayer even while holding Game Status button.
2018-06-13 23:58:28 +00:00
{
INT32 oldpausedelay = pausedelay;
pausedelay = (NEWTICRATE/7);
if (!oldpausedelay)
{
// command will handle all the checks for us
COM_ImmedExecute("pause");
return true;
}
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
if (ev->data1 == gamecontrol[gc_camtoggle][0]
|| ev->data1 == gamecontrol[gc_camtoggle][1])
{
if (!camtoggledelay)
{
camtoggledelay = NEWTICRATE / 7;
CV_SetValue(&cv_chasecam, cv_chasecam.value ? 0 : 1);
}
}
if (ev->data1 == gamecontrolbis[gc_camtoggle][0]
|| ev->data1 == gamecontrolbis[gc_camtoggle][1])
{
if (!camtoggledelay2)
{
camtoggledelay2 = NEWTICRATE / 7;
CV_SetValue(&cv_chasecam2, cv_chasecam2.value ? 0 : 1);
}
}
return true;
case ev_keyup:
return false; // always let key up events filter down
case ev_mouse:
return true; // eat events
case ev_joystick:
return true; // eat events
case ev_joystick2:
return true; // eat events
default:
break;
}
return false;
}
//
// G_Ticker
// Make ticcmd_ts for the players.
//
void G_Ticker(boolean run)
{
UINT32 i;
INT32 buf;
* In-game timer option! Doesn't tick in intermission or in lag, only when a frame is actually run. Realtime option remains default. * Tweak retry behaviour to restart timer and not subtract life if you're on the first level and haven't hit a checkpoint yet.
2020-05-15 15:33:20 +00:00
// see also SCR_DisplayMarathonInfo
if ((marathonmode & (MA_INIT|MA_INGAME)) == MA_INGAME && gamestate == GS_LEVEL)
marathontime++;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
P_MapStart();
// do player reborns if needed
if (gamestate == GS_LEVEL)
{
// Or, alternatively, retry.
if (!(netgame || multiplayer) && G_GetRetryFlag())
{
G_ClearRetryFlag();
* Hold the pause button to restart a record attack run! * Obligatory GIF: https://cdn.discordapp.com/attachments/400761370800422922/456586705424875520/srb20047.gif * Show powerup display in singleplayer even while holding Game Status button.
2018-06-13 23:58:28 +00:00
if (modeattacking)
Correct some minor deficiencies in the hold-for-retry system in record attack.
2018-06-15 20:42:36 +00:00
{
pausedelay = INT32_MIN;
* Hold the pause button to restart a record attack run! * Obligatory GIF: https://cdn.discordapp.com/attachments/400761370800422922/456586705424875520/srb20047.gif * Show powerup display in singleplayer even while holding Game Status button.
2018-06-13 23:58:28 +00:00
M_ModeAttackRetry(0);
Correct some minor deficiencies in the hold-for-retry system in record attack.
2018-06-15 20:42:36 +00:00
}
* Hold the pause button to restart a record attack run! * Obligatory GIF: https://cdn.discordapp.com/attachments/400761370800422922/456586705424875520/srb20047.gif * Show powerup display in singleplayer even while holding Game Status button.
2018-06-13 23:58:28 +00:00
else
{
* In-game timer option! Doesn't tick in intermission or in lag, only when a frame is actually run. Realtime option remains default. * Tweak retry behaviour to restart timer and not subtract life if you're on the first level and haven't hit a checkpoint yet.
2020-05-15 15:33:20 +00:00
// Costs a life to retry ... unless the player in question is dead already, or you haven't even touched the first starpost in marathon run.
if (marathonmode && gamemap == spmarathon_start && !players[consoleplayer].starposttime)
{
Reset a couple of other variables while we're at it
2020-11-14 18:17:35 +00:00
player_t *p = &players[consoleplayer];
* In-game timer option! Doesn't tick in intermission or in lag, only when a frame is actually run. Realtime option remains default. * Tweak retry behaviour to restart timer and not subtract life if you're on the first level and haven't hit a checkpoint yet.
2020-05-15 15:33:20 +00:00
marathonmode |= MA_INIT;
marathontime = 0;
Emeralds and tokens now reset when restarting marathon mode in first level
2020-11-14 17:18:36 +00:00
Reset a couple of other variables while we're at it
2020-11-14 18:17:35 +00:00
numgameovers = tokenlist = token = 0;
countdown = countdown2 = exitfadestarted = 0;
p->playerstate = PST_REBORN;
p->starpostx = p->starposty = p->starpostz = 0;
p->lives = startinglivesbalance[0];
p->continues = 1;
p->score = 0;
// The latter two should clear by themselves, but just in case
p->pflags &= ~(PF_TAGIT|PF_GAMETYPEOVER|PF_FULLSTASIS);
// Clear cheatcodes too, just in case.
p->pflags &= ~(PF_GODMODE|PF_NOCLIP|PF_INVIS);
p->xtralife = 0;
// Reset unlockable triggers
unlocktriggers = 0;
Now the fix actually does what the MR says... +lua banks
2020-11-22 21:19:24 +00:00
emeralds = 0;
memset(&luabanks, 0, sizeof(luabanks));
* In-game timer option! Doesn't tick in intermission or in lag, only when a frame is actually run. Realtime option remains default. * Tweak retry behaviour to restart timer and not subtract life if you're on the first level and haven't hit a checkpoint yet.
2020-05-15 15:33:20 +00:00
}
else if (G_GametypeUsesLives() && players[consoleplayer].playerstate == PST_LIVE && players[consoleplayer].lives != INFLIVES)
* Hold the pause button to restart a record attack run! * Obligatory GIF: https://cdn.discordapp.com/attachments/400761370800422922/456586705424875520/srb20047.gif * Show powerup display in singleplayer even while holding Game Status button.
2018-06-13 23:58:28 +00:00
players[consoleplayer].lives -= 1;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
* Hold the pause button to restart a record attack run! * Obligatory GIF: https://cdn.discordapp.com/attachments/400761370800422922/456586705424875520/srb20047.gif * Show powerup display in singleplayer even while holding Game Status button.
2018-06-13 23:58:28 +00:00
G_DoReborn(consoleplayer);
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
for (i = 0; i < MAXPLAYERS; i++)
SRB2 2.1.3 release
2014-03-18 17:56:54 +00:00
if (playeringame[i] && players[i].playerstate == PST_REBORN)
G_DoReborn(i);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
P_MapEnd();
// do things to change the game state
while (gameaction != ga_nothing)
switch (gameaction)
{
case ga_completed: G_DoCompleted(); break;
case ga_startcont: G_DoStartContinue(); break;
case ga_continued: G_DoContinued(); break;
case ga_worlddone: G_DoWorldDone(); break;
case ga_nothing: break;
default: I_Error("gameaction = %d\n", gameaction);
}
buf = gametic % BACKUPTICS;
for (i = 0; i < MAXPLAYERS; i++)
{
if (playeringame[i])
Fix potential desynch when a player spawns
2020-05-28 09:03:35 +00:00
{
Fix TICCMD_RECEIVED being overridden by gamelogic
2020-12-16 16:35:39 +00:00
INT16 received;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
G_CopyTiccmd(&players[i].cmd, &netcmds[buf][i], 1);
Fix potential desynch when a player spawns
2020-05-28 09:03:35 +00:00
Fix TICCMD_RECEIVED being overridden by gamelogic
2020-12-16 16:35:39 +00:00
received = (players[i].cmd.angleturn & TICCMD_RECEIVED);
Fix potential desynch when a player spawns
2020-05-28 09:03:35 +00:00
players[i].angleturn += players[i].cmd.angleturn - players[i].oldrelangleturn;
players[i].oldrelangleturn = players[i].cmd.angleturn;
Make old analog functional again
2020-07-30 10:22:15 +00:00
if (P_ControlStyle(&players[i]) == CS_LMAOGALOG)
P_ForceLocalAngle(&players[i], players[i].angleturn << 16);
else
players[i].cmd.angleturn = players[i].angleturn;
Fix TICCMD_RECEIVED being overridden by gamelogic
2020-12-16 16:35:39 +00:00
players[i].cmd.angleturn &= ~TICCMD_RECEIVED;
players[i].cmd.angleturn |= received;
Fix potential desynch when a player spawns
2020-05-28 09:03:35 +00:00
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
// do main actions
switch (gamestate)
{
case GS_LEVEL:
if (titledemo)
F_TitleDemoTicker();
P_Ticker(run); // tic the game
stuff
2019-11-18 14:39:54 +00:00
ST_Ticker(run);
Moved TextPrompt logic to f_finale.c * Added basic TextPrompt ticker and drawer functions * Added chevron animation
2018-11-03 14:54:30 +00:00
F_TextPromptTicker();
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
AM_Ticker();
HU_Ticker();
break;
case GS_INTERMISSION:
if (run)
Y_Ticker();
HU_Ticker();
break;
case GS_TIMEATTACK:
Rearranged menu presentation methods * Menu parameter retrieval and hierarchy in m_menu * Presentation logic (background display) in f_finale
2018-11-25 20:08:12 +00:00
F_MenuPresTicker(run);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
break;
case GS_INTRO:
if (run)
F_IntroTicker();
break;
A good and bad ending cutscene now exist. Also: * SPR2_XTRA - instead of defining lumpnames in S_SKIN, those kinds of assets can just be bundled into the spriteset. Required for ending cutscene stuff, I guess, but also done for HUD life icon and character select image (aside from Sonic&Tails, still SOC'd in). * Minor oversights in SPR2 support corrected. * Better evaluation, featuring ending assets. * Intro has warping-in blackrock, reusing ending assets. * Cutscene text now supports lowercase (intro and custom). * Disable the asset-fucking "gamma correction" I put in over two years ago when implementing colour cube. (This is the only thing I could move into another branch if you MUST, but it's basically invisble in the diff so w/e.) * Don't blank the screen if the top left pixel of a screen-covering patch is transparent. (Checked via nonzero topdelta for first column) Bugs: * OPENGL ONLY: The first ~20 frames of both endings are fucked. A little help here? Might be HWR_DrawFadeFill's fault, which I just created. OR it could be in f_finale, but I doubt it, since it doesn't appear in Software.
2019-07-27 23:32:57 +00:00
case GS_ENDING:
if (run)
F_EndingTicker();
HU_Ticker();
break;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
case GS_CUTSCENE:
if (run)
F_CutsceneTicker();
HU_Ticker();
break;
case GS_GAMEEND:
if (run)
F_GameEndTicker();
break;
case GS_EVALUATION:
if (run)
F_GameEvaluationTicker();
Make chat visible in the evaluation gamestate.
2017-09-15 19:34:46 +00:00
HU_Ticker();
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
break;
case GS_CONTINUING:
if (run)
F_ContinueTicker();
break;
case GS_CREDITS:
if (run)
F_CreditTicker();
HU_Ticker();
break;
case GS_TITLESCREEN:
miru asked me for help and im a smelly toast * Fix Crashes With Respect To Switching Between The Normal Title And Her Magic One * Clean Up A Bit Of Code
2017-04-18 21:45:43 +00:00
if (titlemapinaction) P_Ticker(run); // then intentionally fall through
Merge branch 'public_next' into master
2017-09-28 21:29:02 +00:00
/* FALLTHRU */
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
case GS_WAITINGPLAYERS:
Rearranged menu presentation methods * Menu parameter retrieval and hierarchy in m_menu * Presentation logic (background display) in f_finale
2018-11-25 20:08:12 +00:00
F_MenuPresTicker(run);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
F_TitleScreenTicker(run);
break;
case GS_DEDICATEDSERVER:
case GS_NULL:
break; // do nothing
}
if (run)
{
* Hold the pause button to restart a record attack run! * Obligatory GIF: https://cdn.discordapp.com/attachments/400761370800422922/456586705424875520/srb20047.gif * Show powerup display in singleplayer even while holding Game Status button.
2018-06-13 23:58:28 +00:00
if (pausedelay && pausedelay != INT32_MIN)
{
if (pausedelay > 0)
pausedelay--;
else
pausedelay++;
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (camtoggledelay)
camtoggledelay--;
if (camtoggledelay2)
camtoggledelay2--;
Don't let players change their name more than five times per minute (ported 17f75903b029bbf01217153dc98009d305137c8f and 11ddcfa9a1f2311ec67377b76ed1160ef14b7f60)
2020-09-01 03:08:22 +00:00
if (gametic % NAMECHANGERATE == 0)
{
memset(player_name_changes, 0, sizeof player_name_changes);
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
}
//
// PLAYER STRUCTURE FUNCTIONS
// also see P_SpawnPlayer in P_Things
//
//
// G_PlayerFinishLevel
// Called when a player completes a level.
//
static inline void G_PlayerFinishLevel(INT32 player)
{
player_t *p;
p = &players[player];
memset(p->powers, 0, sizeof (p->powers));
p->ringweapons = 0;
p->mo->flags2 &= ~MF2_SHADOW; // cancel invisibility
P_FlashPal(p, 0, 0); // Resets
* Store gravflip (resolves #206) and destscale in starposts. (Using the same field, taking advantage of the fact that object scale will always be positive!) * Update the function signature of P_MixUp to accomodate both it and drawangle instead of doing it outside of the function. * If the player is spawning from the start of the stage and it's from the ceiling, be in fall frames as requested (resolves #191).
2019-09-07 21:11:33 +00:00
p->starpostscale = 0;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
p->starpostangle = 0;
p->starposttime = 0;
p->starpostx = 0;
p->starposty = 0;
p->starpostz = 0;
p->starpostnum = 0;
if (rendermode == render_soft)
V_SetPaletteLump(GetPalette()); // Reset the palette
}
//
// G_PlayerReborn
// Called after a player dies. Almost everything is cleared and initialized.
//
Properly scrub the player struct clean between level transitions. (Good chance this fixes our new bug where the player gets stuck in their standing pose when the map begins..?)
2019-09-18 15:06:13 +00:00
void G_PlayerReborn(INT32 player, boolean betweenmaps)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
player_t *p;
INT32 score;
INT32 lives;
INT32 continues;
* Skin-controlled radius is no longer set each tic, only on skin change and player spawn. * Camerascale, shieldscale, height and spinheight are now player attributes which are set to the skin attribute on skin change, not read directly from the skin. * P_GetPlayerHeight and P_GetPlayerSpinHeight are now macros instead of functions. * Extra protection against switching to a locked skin.
2016-09-25 17:21:52 +00:00
fixed_t camerascale;
fixed_t shieldscale;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
UINT8 charability;
UINT8 charability2;
fixed_t normalspeed;
fixed_t runspeed;
UINT8 thrustfactor;
UINT8 accelstart;
UINT8 acceleration;
INT32 charflags;
INT32 pflags;
UINT32 thokitem;
UINT32 spinitem;
UINT32 revitem;
Smiles follow-mobj initial support! Still using a Lua hook to follow closely behind, but now it doesn't need to be a generic thinkframe. Woo!
2017-10-02 13:08:58 +00:00
UINT32 followitem;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
fixed_t actionspd;
fixed_t mindash;
fixed_t maxdash;
INT32 ctfteam;
INT32 starposttime;
INT16 starpostx;
INT16 starposty;
INT16 starpostz;
INT32 starpostnum;
INT32 starpostangle;
* Store gravflip (resolves #206) and destscale in starposts. (Using the same field, taking advantage of the fact that object scale will always be positive!) * Update the function signature of P_MixUp to accomodate both it and drawangle instead of doing it outside of the function. * If the player is spawning from the start of the stage and it's from the ceiling, be in fall frames as requested (resolves #191).
2019-09-07 21:11:33 +00:00
fixed_t starpostscale;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
fixed_t jumpfactor;
* Skin-controlled radius is no longer set each tic, only on skin change and player spawn. * Camerascale, shieldscale, height and spinheight are now player attributes which are set to the skin attribute on skin change, not read directly from the skin. * P_GetPlayerHeight and P_GetPlayerSpinHeight are now macros instead of functions. * Extra protection against switching to a locked skin.
2016-09-25 17:21:52 +00:00
fixed_t height;
fixed_t spinheight;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
INT32 exiting;
Dashmode fixes: - Don't force the player's default normalspeed and jumpfactor while not in dashmode - Properly trim the fuse for followmobj ghosts spawned during dashmode - Add deliberate dashmode ghosts for Metal's jet fume
2020-05-01 00:26:23 +00:00
tic_t dashmode;
SRB2 2.1.4 release
2014-03-21 18:42:55 +00:00
INT16 numboxes;
INT16 totalring;
UINT8 laps;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
UINT8 mare;
Make colors UINT16, increase color freeslots to 1024
2020-05-24 00:29:07 +00:00
UINT16 skincolor;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
INT32 skin;
First attempt at making skin availabilities netgame-synchronised. However, I am completely unable to test this right now, since I'm on uni internet which is super locked down; in order to have it not get tangled up with anything else, I'm committing it now in a potentially broken state so that it can be reverted at a later date if necessary.
2017-03-16 18:57:42 +00:00
UINT32 availabilities;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
tic_t jointime;
Let clients rejoin the server without losing their status This is accomplished by simply preserving the player's body after disconnecting. Bodies will despawn after the number of minutes specified by the "rejointimeout" console variable (float). A value of 0 disables the feature completely. Clients rejoining are identified by their IP address, and may rejoin even if the server is full or joins are disabled, for as long as their body remains. From a technical standpoint, when the user disconnects, the player they were controlling does not leave, the underlying player_t just keeps working normally, except it does not receive any input anymore. When the user reconnects, they are simply "relinked" to their player_t. Those "soulless" players can be identified through their "quittime" field, which is the number of tics elapsed since the user disconnected, or zero if still connected. "quittime" is exposed to Lua.
2020-01-22 02:05:08 +00:00
tic_t quittime;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
boolean spectator;
Fix weird visual artifacting caused by restarting the level in co-op, which was a direct result of my code being messy. This is significantly better to deal with, anyways.
2017-07-03 14:43:29 +00:00
boolean outofcoop;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
INT16 bot;
SINT8 pity;
Lots of death stuff. * Genesis-style love and attention to the death event. * Only visibly decrement lives/rings when you're respawning (or game over, see below). * Faster no-button-press respawn. * Game Over specific love. * Animation of Level Title font coming in from the sides. * https://cdn.discordapp.com/attachments/428262628893261828/617692325438554132/srb20067.gif * Change gameovertics to 10 seconds instead of 15. * Make the minimum time before you can force going to the Continue screen longer. * Accomodate death in MP special stages as a form of exit. * Don't have your rings or spheres reset when you die in a special stage, so that the stage isn't softlocked with the new harder limits. * Fix a bug with CoopLives_OnChange where changing to infinite lives didn't force a game-overed player to respawn. Also, two not-quite death things which nonetheless were relevant to change: * Fix quitting a special stage having some of the shared spheres/rings disappear into the aether. * Fix a warning during compilation for the Ring Penalty print.
2019-09-01 14:55:23 +00:00
INT16 rings;
INT16 spheres;
Fix potential desynch when a player spawns
2020-05-28 09:03:35 +00:00
INT16 playerangleturn;
INT16 oldrelangleturn;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
score = players[player].score;
lives = players[player].lives;
continues = players[player].continues;
ctfteam = players[player].ctfteam;
exiting = players[player].exiting;
jointime = players[player].jointime;
Let clients rejoin the server without losing their status This is accomplished by simply preserving the player's body after disconnecting. Bodies will despawn after the number of minutes specified by the "rejointimeout" console variable (float). A value of 0 disables the feature completely. Clients rejoining are identified by their IP address, and may rejoin even if the server is full or joins are disabled, for as long as their body remains. From a technical standpoint, when the user disconnects, the player they were controlling does not leave, the underlying player_t just keeps working normally, except it does not receive any input anymore. When the user reconnects, they are simply "relinked" to their player_t. Those "soulless" players can be identified through their "quittime" field, which is the number of tics elapsed since the user disconnected, or zero if still connected. "quittime" is exposed to Lua.
2020-01-22 02:05:08 +00:00
quittime = players[player].quittime;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
spectator = players[player].spectator;
Fix weird visual artifacting caused by restarting the level in co-op, which was a direct result of my code being messy. This is significantly better to deal with, anyways.
2017-07-03 14:43:29 +00:00
outofcoop = players[player].outofcoop;
* cv_directionchar and cv_autobrake, and their secondplayer versions (both on by default) now exist. * cv_useranalog is now hidden from the menu. * Directionchar now attempts to face the camera direction when you're standing still, and handles a few other states with more decorum. * Tailsbot is now slightly more capable of keeping up with Sonic. * pflags rearranged/adjusted, combining a few non-simulstaneous ones and turning PF_NIGHTSFALL into CR_NIGHTSFALL. * [unrelated to branch] all ground-impact based abilities now happen more consistently with quicksand.
2017-09-15 19:34:46 +00:00
pflags = (players[player].pflags & (PF_FLIPCAM|PF_ANALOGMODE|PF_DIRECTIONCHAR|PF_AUTOBRAKE|PF_TAGIT|PF_GAMETYPEOVER));
Fix potential desynch when a player spawns
2020-05-28 09:03:35 +00:00
playerangleturn = players[player].angleturn;
oldrelangleturn = players[player].oldrelangleturn;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Keep counting players as finished even after dying
2019-11-27 16:32:02 +00:00
if (!betweenmaps)
pflags |= (players[player].pflags & PF_FINISHED);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// As long as we're not in multiplayer, carry over cheatcodes from map to map
if (!(netgame || multiplayer))
pflags |= (players[player].pflags & (PF_GODMODE|PF_NOCLIP|PF_INVIS));
Dashmode fixes: - Don't force the player's default normalspeed and jumpfactor while not in dashmode - Properly trim the fuse for followmobj ghosts spawned during dashmode - Add deliberate dashmode ghosts for Metal's jet fume
2020-05-01 00:26:23 +00:00
dashmode = players[player].dashmode;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
numboxes = players[player].numboxes;
laps = players[player].laps;
totalring = players[player].totalring;
skincolor = players[player].skincolor;
skin = players[player].skin;
First attempt at making skin availabilities netgame-synchronised. However, I am completely unable to test this right now, since I'm on uni internet which is super locked down; in order to have it not get tangled up with anything else, I'm committing it now in a potentially broken state so that it can be reverted at a later date if necessary.
2017-03-16 18:57:42 +00:00
availabilities = players[player].availabilities;
* Skin-controlled radius is no longer set each tic, only on skin change and player spawn. * Camerascale, shieldscale, height and spinheight are now player attributes which are set to the skin attribute on skin change, not read directly from the skin. * P_GetPlayerHeight and P_GetPlayerSpinHeight are now macros instead of functions. * Extra protection against switching to a locked skin.
2016-09-25 17:21:52 +00:00
camerascale = players[player].camerascale;
shieldscale = players[player].shieldscale;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
charability = players[player].charability;
charability2 = players[player].charability2;
normalspeed = players[player].normalspeed;
runspeed = players[player].runspeed;
thrustfactor = players[player].thrustfactor;
accelstart = players[player].accelstart;
acceleration = players[player].acceleration;
charflags = players[player].charflags;
starposttime = players[player].starposttime;
starpostx = players[player].starpostx;
starposty = players[player].starposty;
starpostz = players[player].starpostz;
starpostnum = players[player].starpostnum;
starpostangle = players[player].starpostangle;
* Store gravflip (resolves #206) and destscale in starposts. (Using the same field, taking advantage of the fact that object scale will always be positive!) * Update the function signature of P_MixUp to accomodate both it and drawangle instead of doing it outside of the function. * If the player is spawning from the start of the stage and it's from the ceiling, be in fall frames as requested (resolves #191).
2019-09-07 21:11:33 +00:00
starpostscale = players[player].starpostscale;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
jumpfactor = players[player].jumpfactor;
* Skin-controlled radius is no longer set each tic, only on skin change and player spawn. * Camerascale, shieldscale, height and spinheight are now player attributes which are set to the skin attribute on skin change, not read directly from the skin. * P_GetPlayerHeight and P_GetPlayerSpinHeight are now macros instead of functions. * Extra protection against switching to a locked skin.
2016-09-25 17:21:52 +00:00
height = players[player].height;
spinheight = players[player].spinheight;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
thokitem = players[player].thokitem;
spinitem = players[player].spinitem;
revitem = players[player].revitem;
Smiles follow-mobj initial support! Still using a Lua hook to follow closely behind, but now it doesn't need to be a generic thinkframe. Woo!
2017-10-02 13:08:58 +00:00
followitem = players[player].followitem;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
actionspd = players[player].actionspd;
mindash = players[player].mindash;
maxdash = players[player].maxdash;
mare = players[player].mare;
bot = players[player].bot;
pity = players[player].pity;
Properly scrub the player struct clean between level transitions. (Good chance this fixes our new bug where the player gets stuck in their standing pose when the map begins..?)
2019-09-18 15:06:13 +00:00
if (betweenmaps || !G_IsSpecialStage(gamemap))
Lots of death stuff. * Genesis-style love and attention to the death event. * Only visibly decrement lives/rings when you're respawning (or game over, see below). * Faster no-button-press respawn. * Game Over specific love. * Animation of Level Title font coming in from the sides. * https://cdn.discordapp.com/attachments/428262628893261828/617692325438554132/srb20067.gif * Change gameovertics to 10 seconds instead of 15. * Make the minimum time before you can force going to the Continue screen longer. * Accomodate death in MP special stages as a form of exit. * Don't have your rings or spheres reset when you die in a special stage, so that the stage isn't softlocked with the new harder limits. * Fix a bug with CoopLives_OnChange where changing to infinite lives didn't force a game-overed player to respawn. Also, two not-quite death things which nonetheless were relevant to change: * Fix quitting a special stage having some of the shared spheres/rings disappear into the aether. * Fix a warning during compilation for the Ring Penalty print.
2019-09-01 14:55:23 +00:00
{
rings = (ultimatemode ? 0 : mapheaderinfo[gamemap-1]->startrings);
spheres = 0;
}
else
{
rings = players[player].rings;
spheres = players[player].spheres;
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
p = &players[player];
memset(p, 0, sizeof (*p));
p->score = score;
p->lives = lives;
p->continues = continues;
p->pflags = pflags;
p->ctfteam = ctfteam;
p->jointime = jointime;
Let clients rejoin the server without losing their status This is accomplished by simply preserving the player's body after disconnecting. Bodies will despawn after the number of minutes specified by the "rejointimeout" console variable (float). A value of 0 disables the feature completely. Clients rejoining are identified by their IP address, and may rejoin even if the server is full or joins are disabled, for as long as their body remains. From a technical standpoint, when the user disconnects, the player they were controlling does not leave, the underlying player_t just keeps working normally, except it does not receive any input anymore. When the user reconnects, they are simply "relinked" to their player_t. Those "soulless" players can be identified through their "quittime" field, which is the number of tics elapsed since the user disconnected, or zero if still connected. "quittime" is exposed to Lua.
2020-01-22 02:05:08 +00:00
p->quittime = quittime;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
p->spectator = spectator;
Fix weird visual artifacting caused by restarting the level in co-op, which was a direct result of my code being messy. This is significantly better to deal with, anyways.
2017-07-03 14:43:29 +00:00
p->outofcoop = outofcoop;
Fix potential desynch when a player spawns
2020-05-28 09:03:35 +00:00
p->angleturn = playerangleturn;
p->oldrelangleturn = oldrelangleturn;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// save player config truth reborn
p->skincolor = skincolor;
p->skin = skin;
First attempt at making skin availabilities netgame-synchronised. However, I am completely unable to test this right now, since I'm on uni internet which is super locked down; in order to have it not get tangled up with anything else, I'm committing it now in a potentially broken state so that it can be reverted at a later date if necessary.
2017-03-16 18:57:42 +00:00
p->availabilities = availabilities;
* Skin-controlled radius is no longer set each tic, only on skin change and player spawn. * Camerascale, shieldscale, height and spinheight are now player attributes which are set to the skin attribute on skin change, not read directly from the skin. * P_GetPlayerHeight and P_GetPlayerSpinHeight are now macros instead of functions. * Extra protection against switching to a locked skin.
2016-09-25 17:21:52 +00:00
p->camerascale = camerascale;
p->shieldscale = shieldscale;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
p->charability = charability;
p->charability2 = charability2;
p->normalspeed = normalspeed;
p->runspeed = runspeed;
p->thrustfactor = thrustfactor;
p->accelstart = accelstart;
p->acceleration = acceleration;
p->charflags = charflags;
p->thokitem = thokitem;
p->spinitem = spinitem;
p->revitem = revitem;
Smiles follow-mobj initial support! Still using a Lua hook to follow closely behind, but now it doesn't need to be a generic thinkframe. Woo!
2017-10-02 13:08:58 +00:00
p->followitem = followitem;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
p->actionspd = actionspd;
p->mindash = mindash;
p->maxdash = maxdash;
p->starposttime = starposttime;
p->starpostx = starpostx;
p->starposty = starposty;
p->starpostz = starpostz;
p->starpostnum = starpostnum;
p->starpostangle = starpostangle;
* Store gravflip (resolves #206) and destscale in starposts. (Using the same field, taking advantage of the fact that object scale will always be positive!) * Update the function signature of P_MixUp to accomodate both it and drawangle instead of doing it outside of the function. * If the player is spawning from the start of the stage and it's from the ceiling, be in fall frames as requested (resolves #191).
2019-09-07 21:11:33 +00:00
p->starpostscale = starpostscale;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
p->jumpfactor = jumpfactor;
* Skin-controlled radius is no longer set each tic, only on skin change and player spawn. * Camerascale, shieldscale, height and spinheight are now player attributes which are set to the skin attribute on skin change, not read directly from the skin. * P_GetPlayerHeight and P_GetPlayerSpinHeight are now macros instead of functions. * Extra protection against switching to a locked skin.
2016-09-25 17:21:52 +00:00
p->height = height;
p->spinheight = spinheight;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
p->exiting = exiting;
Dashmode fixes: - Don't force the player's default normalspeed and jumpfactor while not in dashmode - Properly trim the fuse for followmobj ghosts spawned during dashmode - Add deliberate dashmode ghosts for Metal's jet fume
2020-05-01 00:26:23 +00:00
p->dashmode = dashmode;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
p->numboxes = numboxes;
p->laps = laps;
p->totalring = totalring;
p->mare = mare;
if (bot)
p->bot = 1; // reset to AI-controlled
p->pity = pity;
Lots of death stuff. * Genesis-style love and attention to the death event. * Only visibly decrement lives/rings when you're respawning (or game over, see below). * Faster no-button-press respawn. * Game Over specific love. * Animation of Level Title font coming in from the sides. * https://cdn.discordapp.com/attachments/428262628893261828/617692325438554132/srb20067.gif * Change gameovertics to 10 seconds instead of 15. * Make the minimum time before you can force going to the Continue screen longer. * Accomodate death in MP special stages as a form of exit. * Don't have your rings or spheres reset when you die in a special stage, so that the stage isn't softlocked with the new harder limits. * Fix a bug with CoopLives_OnChange where changing to infinite lives didn't force a game-overed player to respawn. Also, two not-quite death things which nonetheless were relevant to change: * Fix quitting a special stage having some of the shared spheres/rings disappear into the aether. * Fix a warning during compilation for the Ring Penalty print.
2019-09-01 14:55:23 +00:00
p->rings = rings;
p->spheres = spheres;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Don't do anything immediately
Replace PF_USEDOWN with PF_SPINDOWN
2020-06-06 11:16:28 +00:00
p->pflags |= PF_SPINDOWN;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
p->pflags |= PF_ATTACKDOWN;
p->pflags |= PF_JUMPDOWN;
p->playerstate = PST_LIVE;
p->panim = PA_IDLE; // standing animation
Spectators in new Coop instead of staring at a dead screen all the time! Needs a bunch of changes to HUD rendering, especially in splitscreen, which doesn't try to show spectator stuff whatsoever. Also, if you're the player whose respawn determines when the map reloads, you'll see the spectator text during the front half of the fade. Unless, of course, it's 2-player mode.
2017-05-29 20:23:00 +00:00
//if ((netgame || multiplayer) && !p->spectator) -- moved into P_SpawnPlayer to account for forced changes there
//p->powers[pw_flashing] = flashingtics-1; // Babysitting deterrent
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Properly scrub the player struct clean between level transitions. (Good chance this fixes our new bug where the player gets stuck in their standing pose when the map begins..?)
2019-09-18 15:06:13 +00:00
// Check to make sure their color didn't change somehow...
if (G_GametypeHasTeams())
{
if (p->ctfteam == 1 && p->skincolor != skincolor_redteam)
{
if (p == &players[consoleplayer])
CV_SetValue(&cv_playercolor, skincolor_redteam);
else if (p == &players[secondarydisplayplayer])
CV_SetValue(&cv_playercolor2, skincolor_redteam);
}
else if (p->ctfteam == 2 && p->skincolor != skincolor_blueteam)
{
if (p == &players[consoleplayer])
CV_SetValue(&cv_playercolor, skincolor_blueteam);
else if (p == &players[secondarydisplayplayer])
CV_SetValue(&cv_playercolor2, skincolor_blueteam);
}
}
if (betweenmaps)
return;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (p-players == consoleplayer)
{
The concept of "music slots" doesn't exist anymore. Use whatever names you want for your music. So long as you prefix the lumps with O_ or D_, it doesn't matter anymore. DISCLAIMER: Linedef type 413 (change music) and Lua scripting is not tested. (cherry picked from commit 025ca413a2a01a8ec7c104748c2f510e350aa457) # Conflicts: # src/p_user.c
2016-01-08 03:48:20 +00:00
if (mapmusflags & MUSIC_RELOADRESET)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
The concept of "music slots" doesn't exist anymore. Use whatever names you want for your music. So long as you prefix the lumps with O_ or D_, it doesn't matter anymore. DISCLAIMER: Linedef type 413 (change music) and Lua scripting is not tested. (cherry picked from commit 025ca413a2a01a8ec7c104748c2f510e350aa457) # Conflicts: # src/p_user.c
2016-01-08 03:48:20 +00:00
strncpy(mapmusname, mapheaderinfo[gamemap-1]->musname, 7);
mapmusname[6] = 0;
Restore MUSIC_RELOADRESET if block in g_game
2019-03-14 01:18:23 +00:00
mapmusflags = (mapheaderinfo[gamemap-1]->mustrack & MUSIC_TRACKMASK);
mapmusposition = mapheaderinfo[gamemap-1]->muspos;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
Restore MUSIC_RELOADRESET if block in g_game
2019-03-14 01:18:23 +00:00
// This is in S_Start, but this was not here previously.
* Added FORCERESETMUSIC level header * cv_resetmusicbyheader toggle to disable said override * Never reset music during time attack * Change cv_resetmusic default back to off
2019-08-05 00:02:38 +00:00
// if (RESETMUSIC)
Restore MUSIC_RELOADRESET if block in g_game
2019-03-14 01:18:23 +00:00
// S_StopMusic();
S_ChangeMusicEx(mapmusname, mapmusflags, true, mapmusposition, 0, 0);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
Scan for emeralds in gametypes with Emerald Hunt
2020-02-23 19:41:39 +00:00
if (gametyperules & GTR_EMERALDHUNT)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
P_FindEmerald(); // scan for emeralds to hunt for
// If NiGHTS, find lowest mare to start with.
p->mare = P_FindLowestMare();
CONS_Debug(DBG_NIGHTS, M_GetText("Current mare is %d\n"), p->mare);
if (p->mare == 255)
p->mare = 0;
}
//
// G_CheckSpot
// Returns false if the player cannot be respawned
// at the given mapthing_t spot
// because something is occupying it
//
static boolean G_CheckSpot(INT32 playernum, mapthing_t *mthing)
{
fixed_t x;
fixed_t y;
INT32 i;
// maybe there is no player start
if (!mthing)
return false;
if (!players[playernum].mo)
{
// first spawn of level
for (i = 0; i < playernum; i++)
if (playeringame[i] && players[i].mo
&& players[i].mo->x == mthing->x << FRACBITS
&& players[i].mo->y == mthing->y << FRACBITS)
{
return false;
}
return true;
}
x = mthing->x << FRACBITS;
y = mthing->y << FRACBITS;
if (!P_CheckPosition(players[playernum].mo, x, y))
return false;
return true;
}
//
// G_SpawnPlayer
// Spawn a player in a spot appropriate for the gametype --
// or a not-so-appropriate spot, if it initially fails
// due to a lack of starts open or something.
//
Refactor player spawning code a little
2020-01-22 02:19:15 +00:00
void G_SpawnPlayer(INT32 playernum)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
if (!playeringame[playernum])
return;
P_SpawnPlayer(playernum);
Refactor player spawning code a little
2020-01-22 02:19:15 +00:00
G_MovePlayerToSpawnOrStarpost(playernum);
Don't mix declarations and code
2016-02-26 04:47:52 +00:00
LUAh_PlayerSpawn(&players[playernum]); // Lua hook for player spawning :)
Refactor player spawning code a little
2020-01-22 02:19:15 +00:00
}
Move hook into G_SpawnPlayer
2016-02-26 04:28:19 +00:00
Refactor player spawning code a little
2020-01-22 02:19:15 +00:00
void G_MovePlayerToSpawnOrStarpost(INT32 playernum)
{
if (players[playernum].starposttime)
P_MovePlayerToStarpost(playernum);
else
P_MovePlayerToSpawn(playernum, G_FindMapStart(playernum));
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
mapthing_t *G_FindCTFStart(INT32 playernum)
{
INT32 i,j;
if (!numredctfstarts && !numbluectfstarts) //why even bother, eh?
{
Don't warn about missing CTF starts if the gametype doesn't have team flags.
2019-12-24 19:12:05 +00:00
if ((gametyperules & GTR_TEAMFLAGS) && (playernum == consoleplayer || (splitscreen && playernum == secondarydisplayplayer)))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
CONS_Alert(CONS_WARNING, M_GetText("No CTF starts in this map!\n"));
return NULL;
}
*_Random is now *_RandomByte. P_RandomChance is now a macro for something that should happen a certain percentage of time. P_SignedRandom was moved to a macro. Nobody cared. # Conflicts: # src/p_inter.c
2016-03-27 14:33:15 +00:00
if ((!players[playernum].ctfteam && numredctfstarts && (!numbluectfstarts || P_RandomChance(FRACUNIT/2))) || players[playernum].ctfteam == 1) //red
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
if (!numredctfstarts)
{
if (playernum == consoleplayer || (splitscreen && playernum == secondarydisplayplayer))
CONS_Alert(CONS_WARNING, M_GetText("No Red Team starts in this map!\n"));
return NULL;
}
for (j = 0; j < 32; j++)
{
i = P_RandomKey(numredctfstarts);
if (G_CheckSpot(playernum, redctfstarts[i]))
return redctfstarts[i];
}
if (playernum == consoleplayer || (splitscreen && playernum == secondarydisplayplayer))
CONS_Alert(CONS_WARNING, M_GetText("Could not spawn at any Red Team starts!\n"));
return NULL;
}
else if (!players[playernum].ctfteam || players[playernum].ctfteam == 2) //blue
{
if (!numbluectfstarts)
{
if (playernum == consoleplayer || (splitscreen && playernum == secondarydisplayplayer))
CONS_Alert(CONS_WARNING, M_GetText("No Blue Team starts in this map!\n"));
return NULL;
}
for (j = 0; j < 32; j++)
{
i = P_RandomKey(numbluectfstarts);
if (G_CheckSpot(playernum, bluectfstarts[i]))
return bluectfstarts[i];
}
if (playernum == consoleplayer || (splitscreen && playernum == secondarydisplayplayer))
CONS_Alert(CONS_WARNING, M_GetText("Could not spawn at any Blue Team starts!\n"));
return NULL;
}
//should never be reached but it gets stuff to shut up
return NULL;
}
mapthing_t *G_FindMatchStart(INT32 playernum)
{
INT32 i, j;
if (numdmstarts)
{
for (j = 0; j < 64; j++)
{
i = P_RandomKey(numdmstarts);
if (G_CheckSpot(playernum, deathmatchstarts[i]))
return deathmatchstarts[i];
}
if (playernum == consoleplayer || (splitscreen && playernum == secondarydisplayplayer))
CONS_Alert(CONS_WARNING, M_GetText("Could not spawn at any Deathmatch starts!\n"));
return NULL;
}
if (playernum == consoleplayer || (splitscreen && playernum == secondarydisplayplayer))
CONS_Alert(CONS_WARNING, M_GetText("No Deathmatch starts in this map!\n"));
return NULL;
}
mapthing_t *G_FindCoopStart(INT32 playernum)
{
if (numcoopstarts)
{
//if there's 6 players in a map with 3 player starts, this spawns them 1/2/3/1/2/3.
if (G_CheckSpot(playernum, playerstarts[playernum % numcoopstarts]))
return playerstarts[playernum % numcoopstarts];
//Don't bother checking to see if the player 1 start is open.
//Just spawn there.
return playerstarts[0];
}
if (playernum == consoleplayer || (splitscreen && playernum == secondarydisplayplayer))
CONS_Alert(CONS_WARNING, M_GetText("No Co-op starts in this map!\n"));
return NULL;
}
Let spectators decide where they spawn Also fixes some issues with tag gametypes
2020-02-23 22:23:00 +00:00
// Find a Co-op start, or fallback into other types of starts.
static inline mapthing_t *G_FindCoopStartOrFallback(INT32 playernum)
{
mapthing_t *spawnpoint = NULL;
if (!(spawnpoint = G_FindCoopStart(playernum)) // find a Co-op start
&& !(spawnpoint = G_FindMatchStart(playernum))) // find a DM start
spawnpoint = G_FindCTFStart(playernum); // fallback
return spawnpoint;
}
// Find a Match start, or fallback into other types of starts.
static inline mapthing_t *G_FindMatchStartOrFallback(INT32 playernum)
{
mapthing_t *spawnpoint = NULL;
if (!(spawnpoint = G_FindMatchStart(playernum)) // find a DM start
&& !(spawnpoint = G_FindCTFStart(playernum))) // find a CTF start
spawnpoint = G_FindCoopStart(playernum); // fallback
return spawnpoint;
}
Refactor player spawning code a little
2020-01-22 02:19:15 +00:00
mapthing_t *G_FindMapStart(INT32 playernum)
{
mapthing_t *spawnpoint;
if (!playeringame[playernum])
return NULL;
Let spectators decide where they spawn Also fixes some issues with tag gametypes
2020-02-23 22:23:00 +00:00
// -- Spectators --
// Order in platform gametypes: Coop->DM->CTF
// And, with deathmatch starts: DM->CTF->Coop
if (players[playernum].spectator)
{
// In platform gametypes, spawn in Co-op starts first
// Overriden by GTR_DEATHMATCHSTARTS.
if (G_PlatformGametype() && !(gametyperules & GTR_DEATHMATCHSTARTS))
spawnpoint = G_FindCoopStartOrFallback(playernum);
else
spawnpoint = G_FindMatchStartOrFallback(playernum);
}
Refactor player spawning code a little
2020-01-22 02:19:15 +00:00
// -- CTF --
// Order: CTF->DM->Coop
Let spectators decide where they spawn Also fixes some issues with tag gametypes
2020-02-23 22:23:00 +00:00
else if ((gametyperules & (GTR_TEAMFLAGS|GTR_TEAMS)) && players[playernum].ctfteam)
Refactor player spawning code a little
2020-01-22 02:19:15 +00:00
{
if (!(spawnpoint = G_FindCTFStart(playernum)) // find a CTF start
&& !(spawnpoint = G_FindMatchStart(playernum))) // find a DM start
spawnpoint = G_FindCoopStart(playernum); // fallback
}
// -- DM/Tag/CTF-spectator/etc --
// Order: DM->CTF->Coop
Let spectators decide where they spawn Also fixes some issues with tag gametypes
2020-02-23 22:23:00 +00:00
else if (G_TagGametype() ? (!(players[playernum].pflags & PF_TAGIT)) : (gametyperules & GTR_DEATHMATCHSTARTS))
spawnpoint = G_FindMatchStartOrFallback(playernum);
Refactor player spawning code a little
2020-01-22 02:19:15 +00:00
// -- Other game modes --
// Order: Coop->DM->CTF
else
Let spectators decide where they spawn Also fixes some issues with tag gametypes
2020-02-23 22:23:00 +00:00
spawnpoint = G_FindCoopStartOrFallback(playernum);
Refactor player spawning code a little
2020-01-22 02:19:15 +00:00
//No spawns found. ANYWHERE.
if (!spawnpoint)
{
if (nummapthings)
{
if (playernum == consoleplayer || (splitscreen && playernum == secondarydisplayplayer))
CONS_Alert(CONS_ERROR, M_GetText("No player spawns found, spawning at the first mapthing!\n"));
spawnpoint = &mapthings[0];
}
else
{
if (playernum == consoleplayer || (splitscreen && playernum == secondarydisplayplayer))
CONS_Alert(CONS_ERROR, M_GetText("No player spawns found, spawning at the origin!\n"));
}
}
return spawnpoint;
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Go back through all the projectiles and remove all references to the old
// player mobj, replacing them with the new one.
void G_ChangePlayerReferences(mobj_t *oldmo, mobj_t *newmo)
{
thinker_t *th;
mobj_t *mo2;
I_Assert((oldmo != NULL) && (newmo != NULL));
// scan all thinkers
Fix mobj list iteration oversights. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-21 10:58:22 +00:00
for (th = thlist[THINK_MOBJ].next; th != &thlist[THINK_MOBJ]; th = th->next)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Fixed the thinkerlist issues by removing THINK_LIMBO. Delay-removed thinkers now stay in their list. Also includes toaster's assorted fixes and improvements from target_painted_on_your_ass.
2019-07-12 23:42:03 +00:00
if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
continue;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
mo2 = (mobj_t *)th;
if (!(mo2->flags & MF_MISSILE))
continue;
if (mo2->target == oldmo)
{
P_SetTarget(&mo2->target, newmo);
mo2->flags2 |= MF2_BEYONDTHEGRAVE; // this mobj belongs to a player who has reborn
}
}
}
//
// G_DoReborn
//
void G_DoReborn(INT32 playernum)
{
player_t *player = &players[playernum];
Fix weird visual artifacting caused by restarting the level in co-op, which was a direct result of my code being messy. This is significantly better to deal with, anyways.
2017-07-03 14:43:29 +00:00
boolean resetlevel = false;
Some minor tweaks to make countdown not COMPLETELY broken.
2017-07-04 13:58:58 +00:00
INT32 i;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (modeattacking)
{
M_EndModeAttackRun();
return;
}
// Make sure objectplace is OFF when you first start the level!
OP_ResetObjectplace();
if (player->bot && playernum != consoleplayer)
{ // Bots respawn next to their master.
mobj_t *oldmo = NULL;
// first dissasociate the corpse
if (player->mo)
{
oldmo = player->mo;
// Don't leave your carcass stuck 10-billion feet in the ground!
P_RemoveMobj(player->mo);
}
B_RespawnBot(playernum);
if (oldmo)
G_ChangePlayerReferences(oldmo, players[playernum].mo);
Fix weird visual artifacting caused by restarting the level in co-op, which was a direct result of my code being messy. This is significantly better to deal with, anyways.
2017-07-03 14:43:29 +00:00
return;
}
Allow countdown time-up in any campaign gametype
2020-02-23 19:50:36 +00:00
if (countdowntimeup || (!(netgame || multiplayer) && (gametyperules & GTR_CAMPAIGN)))
Fix weird visual artifacting caused by restarting the level in co-op, which was a direct result of my code being messy. This is significantly better to deal with, anyways.
2017-07-03 14:43:29 +00:00
resetlevel = true;
Same deal, but for starposts.
2019-12-27 20:14:56 +00:00
else if ((G_GametypeUsesCoopLives() || G_GametypeUsesCoopStarposts()) && (netgame || multiplayer) && !G_IsSpecialStage(gamemap))
Fix weird visual artifacting caused by restarting the level in co-op, which was a direct result of my code being messy. This is significantly better to deal with, anyways.
2017-07-03 14:43:29 +00:00
{
Fix a bug in a testing netgame where we were able to game over and yet ended up just resetting the map normally.
2017-07-08 10:41:20 +00:00
boolean notgameover = true;
Same deal, but for starposts.
2019-12-27 20:14:56 +00:00
if (G_GametypeUsesCoopLives() && (cv_cooplives.value != 0 && player->lives <= 0)) // consider game over first
Fix weird visual artifacting caused by restarting the level in co-op, which was a direct result of my code being messy. This is significantly better to deal with, anyways.
2017-07-03 14:43:29 +00:00
{
for (i = 0; i < MAXPLAYERS; i++)
{
if (!playeringame[i])
continue;
if (players[i].exiting || players[i].lives > 0)
break;
}
Fix a bug in a testing netgame where we were able to game over and yet ended up just resetting the map normally.
2017-07-08 10:41:20 +00:00
if (i == MAXPLAYERS)
Fix weird visual artifacting caused by restarting the level in co-op, which was a direct result of my code being messy. This is significantly better to deal with, anyways.
2017-07-03 14:43:29 +00:00
{
Fix a bug in a testing netgame where we were able to game over and yet ended up just resetting the map normally.
2017-07-08 10:41:20 +00:00
notgameover = false;
if (!countdown2)
Fix weird visual artifacting caused by restarting the level in co-op, which was a direct result of my code being messy. This is significantly better to deal with, anyways.
2017-07-03 14:43:29 +00:00
{
Fix a bug in a testing netgame where we were able to game over and yet ended up just resetting the map normally.
2017-07-08 10:41:20 +00:00
// They're dead, Jim.
//nextmapoverride = spstage_start;
nextmapoverride = gamemap;
countdown2 = TICRATE;
* Made the evaluation screen even more attractive. * Fixed an unused variable warning in lua_skinlib.c. - fixed post-level cutscenes playing when you get game over in MP (still kinda on-topic) Also with apologies to MI: - golden egg statue mode for tutorial, since the grey doesn't contrast enough with the blue and lime green - fixed closed captions for replaced player sounds being incorrect - fixed closed captions overlapping tutorial text
2019-07-29 13:55:36 +00:00
skipstats = 2;
Fix a bug in a testing netgame where we were able to game over and yet ended up just resetting the map normally.
2017-07-08 10:41:20 +00:00
for (i = 0; i < MAXPLAYERS; i++)
{
if (playeringame[i])
players[i].score = 0;
}
//emeralds = 0;
tokenbits = 0;
tokenlist = 0;
token = 0;
Fix weird visual artifacting caused by restarting the level in co-op, which was a direct result of my code being messy. This is significantly better to deal with, anyways.
2017-07-03 14:43:29 +00:00
}
}
}
Fix a bug in a testing netgame where we were able to game over and yet ended up just resetting the map normally.
2017-07-08 10:41:20 +00:00
Same deal, but for starposts.
2019-12-27 20:14:56 +00:00
if (G_GametypeUsesCoopStarposts() && (notgameover && cv_coopstarposts.value == 2))
Fix weird visual artifacting caused by restarting the level in co-op, which was a direct result of my code being messy. This is significantly better to deal with, anyways.
2017-07-03 14:43:29 +00:00
{
for (i = 0; i < MAXPLAYERS; i++)
{
if (!playeringame[i])
continue;
if (players[i].playerstate != PST_DEAD && !players[i].spectator && players[i].mo && players[i].mo->health)
break;
}
if (i == MAXPLAYERS)
resetlevel = true;
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
Fix weird visual artifacting caused by restarting the level in co-op, which was a direct result of my code being messy. This is significantly better to deal with, anyways.
2017-07-03 14:43:29 +00:00
if (resetlevel)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
// reload the level from scratch
if (countdowntimeup)
{
Some minor tweaks to make countdown not COMPLETELY broken.
2017-07-04 13:58:58 +00:00
for (i = 0; i < MAXPLAYERS; i++)
{
Make timer reset work in LF_NORELOAD as well.
2017-08-05 21:13:35 +00:00
if (!playeringame[i])
continue;
* Store gravflip (resolves #206) and destscale in starposts. (Using the same field, taking advantage of the fact that object scale will always be positive!) * Update the function signature of P_MixUp to accomodate both it and drawangle instead of doing it outside of the function. * If the player is spawning from the start of the stage and it's from the ceiling, be in fall frames as requested (resolves #191).
2019-09-07 21:11:33 +00:00
players[i].starpostscale = 0;
Some minor tweaks to make countdown not COMPLETELY broken.
2017-07-04 13:58:58 +00:00
players[i].starpostangle = 0;
players[i].starposttime = 0;
players[i].starpostx = 0;
players[i].starposty = 0;
players[i].starpostz = 0;
players[i].starpostnum = 0;
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
Correctly reset map/timer for retries where the first map in Marathon Run is LF_NORELOAD (by forcing a reload when the retry option is used).
2020-05-15 20:17:57 +00:00
if (!countdowntimeup && (mapheaderinfo[gamemap-1]->levelflags & LF_NORELOAD) && !(marathonmode & MA_INIT))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Rename P_LoadThingsOnly to P_RespawnThings to make it clearer that it doesn't actually reload the things from the file, it just respawns them.
2019-12-28 13:13:26 +00:00
P_RespawnThings();
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Make timer reset work in LF_NORELOAD as well.
2017-08-05 21:13:35 +00:00
for (i = 0; i < MAXPLAYERS; i++)
{
if (!playeringame[i])
continue;
players[i].playerstate = PST_REBORN;
P_ClearStarPost(players[i].starpostnum);
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Do a wipe
wipegamestate = -1;
Fix crossfades Fixes NoReload using the wrong wipestyle. Also fixes non-titlemap title screen wipes using the wrong wipestyle.
2019-11-22 20:44:42 +00:00
wipestyleflags = WSF_CROSSFADE;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (camera.chase)
P_ResetCamera(&players[displayplayer], &camera);
if (camera2.chase && splitscreen)
P_ResetCamera(&players[secondarydisplayplayer], &camera2);
// clear cmd building stuff
memset(gamekeydown, 0, sizeof (gamekeydown));
LF2_NORELOAD support
2017-05-28 15:05:55 +00:00
for (i = 0; i < JOYAXISSET; i++)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
joyxmove[i] = joyymove[i] = 0;
joy2xmove[i] = joy2ymove[i] = 0;
}
mousex = mousey = 0;
mouse2x = mouse2y = 0;
// clear hud messages remains (usually from game startup)
CON_ClearHUD();
// Starpost support
Make timer reset work in LF_NORELOAD as well.
2017-08-05 21:13:35 +00:00
for (i = 0; i < MAXPLAYERS; i++)
{
if (!playeringame[i])
continue;
Refactor player spawning code a little
2020-01-22 02:19:15 +00:00
G_SpawnPlayer(i);
Make timer reset work in LF_NORELOAD as well.
2017-08-05 21:13:35 +00:00
}
SRB2 2.1.9 release
2014-08-04 03:49:33 +00:00
Make timer reset work in LF_NORELOAD as well.
2017-08-05 21:13:35 +00:00
// restore time in netgame (see also p_setup.c)
Same deal, but for starposts.
2019-12-27 20:14:56 +00:00
if ((netgame || multiplayer) && G_GametypeUsesCoopStarposts() && cv_coopstarposts.value == 2)
Make timer reset work in LF_NORELOAD as well.
2017-08-05 21:13:35 +00:00
{
// is this a hack? maybe
tic_t maxstarposttime = 0;
for (i = 0; i < MAXPLAYERS; i++)
{
if (playeringame[i] && players[i].starposttime > maxstarposttime)
maxstarposttime = players[i].starposttime;
}
leveltime = maxstarposttime;
SRB2 2.1.9 release
2014-08-04 03:49:33 +00:00
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
else
{
Change MapChange so Lua returns the map number you change
2018-11-30 17:01:40 +00:00
LUAh_MapChange(gamemap);
Allow more options for when the titlecard shows up
2020-02-08 17:13:20 +00:00
titlecardforreload = true;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
G_DoLoadLevel(true);
Allow more options for when the titlecard shows up
2020-02-08 17:13:20 +00:00
titlecardforreload = false;
* Restart Metal recording from beginning if retry is used. * Disable lives when Metal recording (and have a big flashing REC instead, because I'm a riot). * Correct some minor directionchar issues (some introduced in this branch, some not).
2019-11-02 11:56:51 +00:00
if (metalrecording)
G_BeginMetal();
Fix weird visual artifacting caused by restarting the level in co-op, which was a direct result of my code being messy. This is significantly better to deal with, anyways.
2017-07-03 14:43:29 +00:00
return;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
}
else
{
// respawn at the start
mobj_t *oldmo = NULL;
* Renamed "steallives" to "lifedistribution". * Gave lifedistribution a "Sharing" option to go along with its previous individual and stealing options. * Made the game over graphic and music only happen if everyone's out of lives if you're sharing or stealing lives. * Fixed a bug where game over wouldn't come to fruition because it kept on happening each tic of the countdown2. * Made spectator stuff display in Co-op splitscreen.
2017-06-03 11:26:42 +00:00
// Not resetting map, so return to level music
if (!countdown2
&& player->lives <= 0
Whoops, I did some menu stuff in here. Oh well. NEW COOP BASED: * Add "Infinite" option to cv_cooplives, inspired by SUBARASHII. Lives still exist, but are hidden from the player's view, and are prevented from falling below 1 at any cost. As a result, made the variable CV_CHEAT. OTHER MULTIPLAYER BASED (semi-related): * Made cv_autobalance an on/off switch which determines the allowed difference based on the number of people in the server, instead of a weird and opaque number from 0-4. MENU BASED (not related): * Add horizontal arrows to menu options which respond to the arrow keys. * Make the menu arrows bob. * Switch out the seperate arrows for combination arrows on the joystick menus. * Minor cvar description tweaks.
2017-07-04 12:17:29 +00:00
&& cv_cooplives.value == 1) // not allowed for life steal because no way to come back from zero group lives without addons, which should call this anyways
* Renamed "steallives" to "lifedistribution". * Gave lifedistribution a "Sharing" option to go along with its previous individual and stealing options. * Made the game over graphic and music only happen if everyone's out of lives if you're sharing or stealing lives. * Fixed a bug where game over wouldn't come to fruition because it kept on happening each tic of the countdown2. * Made spectator stuff display in Co-op splitscreen.
2017-06-03 11:26:42 +00:00
P_RestoreMultiMusic(player);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// first dissasociate the corpse
if (player->mo)
{
oldmo = player->mo;
// Don't leave your carcass stuck 10-billion feet in the ground!
P_RemoveMobj(player->mo);
}
Refactor player spawning code a little
2020-01-22 02:19:15 +00:00
G_SpawnPlayer(playernum);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (oldmo)
G_ChangePlayerReferences(oldmo, players[playernum].mo);
}
}
void G_AddPlayer(INT32 playernum)
{
The start of the Co-Op revamp! Not tested over netplay yet, but uses TD's implementation of various Co-op friendly things as a reference (or in one place an outright code steal, thanks Sryder!) * cv_sharedstarposts - Makes everyone share starposts, defaults to "On" * cv_respawntype - Defaults to "Starpost". If set to that, people respawn at the starpost you just hit (assuming cv_sharedstarposts is on - may have to combine the two variables later, but seperate for testing for now). The other option is the old, unrestricted spawning. We COULD add TD bubble spawning at a later time using this variable, though. The level DOES reset if everyone dies, but not in a way which allows for Mystic Realm style non-resetting resets. I'll handle that later.
2017-05-28 14:33:35 +00:00
INT32 countplayers = 0, notexiting = 0;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
player_t *p = &players[playernum];
The start of the Co-Op revamp! Not tested over netplay yet, but uses TD's implementation of various Co-op friendly things as a reference (or in one place an outright code steal, thanks Sryder!) * cv_sharedstarposts - Makes everyone share starposts, defaults to "On" * cv_respawntype - Defaults to "Starpost". If set to that, people respawn at the starpost you just hit (assuming cv_sharedstarposts is on - may have to combine the two variables later, but seperate for testing for now). The other option is the old, unrestricted spawning. We COULD add TD bubble spawning at a later time using this variable, though. The level DOES reset if everyone dies, but not in a way which allows for Mystic Realm style non-resetting resets. I'll handle that later.
2017-05-28 14:33:35 +00:00
// Go through the current players and make sure you have the latest starpost set
if (G_PlatformGametype() && (netgame || multiplayer))
{
INT32 i;
for (i = 0; i < MAXPLAYERS; i++)
{
if (!playeringame[i])
continue;
if (players[i].bot) // ignore dumb, stupid tails
continue;
countplayers++;
Shut up
2019-11-09 16:24:10 +00:00
if (!players[i].exiting)
The start of the Co-Op revamp! Not tested over netplay yet, but uses TD's implementation of various Co-op friendly things as a reference (or in one place an outright code steal, thanks Sryder!) * cv_sharedstarposts - Makes everyone share starposts, defaults to "On" * cv_respawntype - Defaults to "Starpost". If set to that, people respawn at the starpost you just hit (assuming cv_sharedstarposts is on - may have to combine the two variables later, but seperate for testing for now). The other option is the old, unrestricted spawning. We COULD add TD bubble spawning at a later time using this variable, though. The level DOES reset if everyone dies, but not in a way which allows for Mystic Realm style non-resetting resets. I'll handle that later.
2017-05-28 14:33:35 +00:00
notexiting++;
Same deal, but for starposts.
2019-12-27 20:14:56 +00:00
if (!(cv_coopstarposts.value && G_GametypeUsesCoopStarposts() && (p->starpostnum < players[i].starpostnum)))
The start of the Co-Op revamp! Not tested over netplay yet, but uses TD's implementation of various Co-op friendly things as a reference (or in one place an outright code steal, thanks Sryder!) * cv_sharedstarposts - Makes everyone share starposts, defaults to "On" * cv_respawntype - Defaults to "Starpost". If set to that, people respawn at the starpost you just hit (assuming cv_sharedstarposts is on - may have to combine the two variables later, but seperate for testing for now). The other option is the old, unrestricted spawning. We COULD add TD bubble spawning at a later time using this variable, though. The level DOES reset if everyone dies, but not in a way which allows for Mystic Realm style non-resetting resets. I'll handle that later.
2017-05-28 14:33:35 +00:00
continue;
* Store gravflip (resolves #206) and destscale in starposts. (Using the same field, taking advantage of the fact that object scale will always be positive!) * Update the function signature of P_MixUp to accomodate both it and drawangle instead of doing it outside of the function. * If the player is spawning from the start of the stage and it's from the ceiling, be in fall frames as requested (resolves #191).
2019-09-07 21:11:33 +00:00
p->starpostscale = players[i].starpostscale;
The start of the Co-Op revamp! Not tested over netplay yet, but uses TD's implementation of various Co-op friendly things as a reference (or in one place an outright code steal, thanks Sryder!) * cv_sharedstarposts - Makes everyone share starposts, defaults to "On" * cv_respawntype - Defaults to "Starpost". If set to that, people respawn at the starpost you just hit (assuming cv_sharedstarposts is on - may have to combine the two variables later, but seperate for testing for now). The other option is the old, unrestricted spawning. We COULD add TD bubble spawning at a later time using this variable, though. The level DOES reset if everyone dies, but not in a way which allows for Mystic Realm style non-resetting resets. I'll handle that later.
2017-05-28 14:33:35 +00:00
p->starposttime = players[i].starposttime;
p->starpostx = players[i].starpostx;
p->starposty = players[i].starposty;
p->starpostz = players[i].starpostz;
p->starpostangle = players[i].starpostangle;
p->starpostnum = players[i].starpostnum;
}
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
p->playerstate = PST_REBORN;
The start of the Co-Op revamp! Not tested over netplay yet, but uses TD's implementation of various Co-op friendly things as a reference (or in one place an outright code steal, thanks Sryder!) * cv_sharedstarposts - Makes everyone share starposts, defaults to "On" * cv_respawntype - Defaults to "Starpost". If set to that, people respawn at the starpost you just hit (assuming cv_sharedstarposts is on - may have to combine the two variables later, but seperate for testing for now). The other option is the old, unrestricted spawning. We COULD add TD bubble spawning at a later time using this variable, though. The level DOES reset if everyone dies, but not in a way which allows for Mystic Realm style non-resetting resets. I'll handle that later.
2017-05-28 14:33:35 +00:00
Fixed that issue with spectators not being able to go above FOFs. I guess it just wasn't getting initialised properly on first join!
2017-06-03 23:43:34 +00:00
p->height = mobjinfo[MT_PLAYER].height;
G_CoopGametype, for all the GT_COOP cases
2020-02-29 03:57:22 +00:00
if (G_GametypeUsesLives() || ((netgame || multiplayer) && (gametyperules & GTR_FRIENDLY)))
I'm starting to actually test this via netgame instead of just in splitscreen! * Fixed oversight where late joiners may not actually get lives. * Fixed oversight where zero-livers could spawn in. * Reinstated flashing because a crawla walked onto one of the spawnpoints and we immediately got a game over. * Rejiggered the overlay drawer so the printing was consistent between normal spectatorship and game overness.
2017-06-03 21:14:20 +00:00
p->lives = cv_startinglives.value;
Fix a bunch of shit with MP special stages! * Prevent an infinite quantity of Emeralds being spawned when P_GiveEmerald is called while a MP Special Stage is in session (resolves #347). * Fix FuriousFox's ridiculous timer on special stage spawn (mentioned in the comments of the previous issue) by correctly marking spectator players in special stages as finished, and preventing the underflow.
2019-11-25 14:33:15 +00:00
if ((countplayers && !notexiting) || G_IsSpecialStage(gamemap))
The start of the Co-Op revamp! Not tested over netplay yet, but uses TD's implementation of various Co-op friendly things as a reference (or in one place an outright code steal, thanks Sryder!) * cv_sharedstarposts - Makes everyone share starposts, defaults to "On" * cv_respawntype - Defaults to "Starpost". If set to that, people respawn at the starpost you just hit (assuming cv_sharedstarposts is on - may have to combine the two variables later, but seperate for testing for now). The other option is the old, unrestricted spawning. We COULD add TD bubble spawning at a later time using this variable, though. The level DOES reset if everyone dies, but not in a way which allows for Mystic Realm style non-resetting resets. I'll handle that later.
2017-05-28 14:33:35 +00:00
P_DoPlayerExit(p);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
Let players move after completing the level This only takes effect in co-op, and can be disabled with "exitmove off"
2019-11-15 14:35:28 +00:00
boolean G_EnoughPlayersFinished(void)
{
UINT8 numneeded = (G_IsSpecialStage(gamemap) ? 4 : cv_playersforexit.value);
INT32 total = 0;
INT32 exiting = 0;
INT32 i;
for (i = 0; i < MAXPLAYERS; i++)
{
if (!playeringame[i] || players[i].spectator || players[i].bot)
continue;
Ignore players towards exit count 30 seconds after their disconnection
2020-01-22 02:11:05 +00:00
if (players[i].quittime > 30 * TICRATE)
continue;
Let players move after completing the level This only takes effect in co-op, and can be disabled with "exitmove off"
2019-11-15 14:35:28 +00:00
if (players[i].lives <= 0)
continue;
total++;
Account for exiting but non-finished players in G_EnoughPlayersFinished
2019-11-24 22:40:40 +00:00
if ((players[i].pflags & PF_FINISHED) || players[i].exiting)
Let players move after completing the level This only takes effect in co-op, and can be disabled with "exitmove off"
2019-11-15 14:35:28 +00:00
exiting++;
}
if (exiting)
return exiting * 4 / total >= numneeded;
else
return false;
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
void G_ExitLevel(void)
{
if (gamestate == GS_LEVEL)
{
gameaction = ga_completed;
lastdraw = true;
// If you want your teams scrambled on map change, start the process now.
// The teams will scramble at the start of the next round.
if (cv_scrambleonchange.value && G_GametypeHasTeams())
{
if (server)
CV_SetValue(&cv_teamscramble, cv_scrambleonchange.value);
}
Make exitmove friendly, don't start empty intermission screens
2020-02-29 04:51:45 +00:00
if (!(gametyperules & (GTR_FRIENDLY|GTR_CAMPAIGN)))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
CONS_Printf(M_GetText("The round has ended.\n"));
SRB2 2.1.3 release
2014-03-18 17:56:54 +00:00
// Remove CEcho text on round end.
G_ExitLevel tweak: Use HU_ClearCEcho() instead of HU_DoCEcho(""), the latter causes an empty line to appear in log.txt
2017-05-18 16:10:44 +00:00
HU_ClearCEcho();
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
A good and bad ending cutscene now exist. Also: * SPR2_XTRA - instead of defining lumpnames in S_SKIN, those kinds of assets can just be bundled into the spriteset. Required for ending cutscene stuff, I guess, but also done for HUD life icon and character select image (aside from Sonic&Tails, still SOC'd in). * Minor oversights in SPR2 support corrected. * Better evaluation, featuring ending assets. * Intro has warping-in blackrock, reusing ending assets. * Cutscene text now supports lowercase (intro and custom). * Disable the asset-fucking "gamma correction" I put in over two years ago when implementing colour cube. (This is the only thing I could move into another branch if you MUST, but it's basically invisble in the diff so w/e.) * Don't blank the screen if the top left pixel of a screen-covering patch is transparent. (Checked via nonzero topdelta for first column) Bugs: * OPENGL ONLY: The first ~20 frames of both endings are fucked. A little help here? Might be HWR_DrawFadeFill's fault, which I just created. OR it could be in f_finale, but I doubt it, since it doesn't appear in Software.
2019-07-27 23:32:57 +00:00
else if (gamestate == GS_ENDING)
{
F_StartCredits();
}
Prevent just anyone from skipping credits but allow admins exitlevel works too
2019-03-25 23:17:02 +00:00
else if (gamestate == GS_CREDITS)
{
F_StartGameEvaluation();
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
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
2017-06-25 16:28:07 +00:00
// See also the enum GameType in doomstat.h
const char *Gametype_Names[NUMGAMETYPES] =
{
"Co-op", // GT_COOP
"Competition", // GT_COMPETITION
"Race", // GT_RACE
"Match", // GT_MATCH
"Team Match", // GT_TEAMMATCH
"Tag", // GT_TAG
"Hide & Seek", // GT_HIDEANDSEEK
"CTF" // GT_CTF
};
SOC stuff
2019-12-18 17:37:48 +00:00
// For dehacked
const char *Gametype_ConstantNames[NUMGAMETYPES] =
{
"GT_COOP", // GT_COOP
"GT_COMPETITION", // GT_COMPETITION
"GT_RACE", // GT_RACE
"GT_MATCH", // GT_MATCH
"GT_TEAMMATCH", // GT_TEAMMATCH
"GT_TAG", // GT_TAG
"GT_HIDEANDSEEK", // GT_HIDEANDSEEK
"GT_CTF" // GT_CTF
};
Custom gametype rankings
2019-12-19 01:02:37 +00:00
// Gametype rules
GTR_EMERALDHUNT and GTR_SPAWNENEMIES
2019-12-18 17:57:42 +00:00
UINT32 gametypedefaultrules[NUMGAMETYPES] =
Gametype rules draft, mind the debug command
2019-12-18 04:25:57 +00:00
{
More gametype rules yay!!
2019-12-18 04:54:45 +00:00
// Co-op
Add GTR_CUTSCENES. And I ran out of rule slots. Cool.
2019-12-28 23:33:28 +00:00
GTR_CAMPAIGN|GTR_LIVES|GTR_FRIENDLY|GTR_SPAWNENEMIES|GTR_ALLOWEXIT|GTR_EMERALDHUNT|GTR_EMERALDTOKENS|GTR_SPECIALSTAGES|GTR_CUTSCENES,
More gametype rules yay!!
2019-12-18 04:54:45 +00:00
// Competition
Turn the babysitting deterrent into its own rule.
2019-12-24 19:30:18 +00:00
GTR_RACE|GTR_LIVES|GTR_SPAWNENEMIES|GTR_EMERALDTOKENS|GTR_SPAWNINVUL|GTR_ALLOWEXIT,
More gametype rules yay!!
2019-12-18 04:54:45 +00:00
// Race
Turn the babysitting deterrent into its own rule.
2019-12-24 19:30:18 +00:00
GTR_RACE|GTR_SPAWNENEMIES|GTR_SPAWNINVUL|GTR_ALLOWEXIT,
More gametype rules yay!!
2019-12-18 04:54:45 +00:00
// Match
Fix overtime not working
2020-02-15 16:07:53 +00:00
GTR_RINGSLINGER|GTR_FIRSTPERSON|GTR_SPECTATORS|GTR_POINTLIMIT|GTR_TIMELIMIT|GTR_OVERTIME|GTR_POWERSTONES|GTR_DEATHMATCHSTARTS|GTR_SPAWNINVUL|GTR_RESPAWNDELAY|GTR_PITYSHIELD|GTR_DEATHPENALTY,
More gametype rules yay!!
2019-12-18 04:54:45 +00:00
// Team Match
Fix overtime not working
2020-02-15 16:07:53 +00:00
GTR_RINGSLINGER|GTR_FIRSTPERSON|GTR_SPECTATORS|GTR_TEAMS|GTR_POINTLIMIT|GTR_TIMELIMIT|GTR_OVERTIME|GTR_DEATHMATCHSTARTS|GTR_SPAWNINVUL|GTR_RESPAWNDELAY|GTR_PITYSHIELD,
More gametype rules yay!!
2019-12-18 04:54:45 +00:00
// Tag
Fix overtime not working
2020-02-15 16:07:53 +00:00
GTR_RINGSLINGER|GTR_FIRSTPERSON|GTR_TAG|GTR_SPECTATORS|GTR_POINTLIMIT|GTR_TIMELIMIT|GTR_OVERTIME|GTR_STARTCOUNTDOWN|GTR_BLINDFOLDED|GTR_DEATHMATCHSTARTS|GTR_SPAWNINVUL|GTR_RESPAWNDELAY,
More gametype rules yay!!
2019-12-18 04:54:45 +00:00
// Hide and Seek
Turn players IT if they join the game after the hide time in tag gametypes Except in gametypes with hide time stasis, because they can't change team.
2020-02-23 20:02:50 +00:00
GTR_RINGSLINGER|GTR_FIRSTPERSON|GTR_TAG|GTR_SPECTATORS|GTR_POINTLIMIT|GTR_TIMELIMIT|GTR_OVERTIME|GTR_STARTCOUNTDOWN|GTR_HIDEFROZEN|GTR_BLINDFOLDED|GTR_DEATHMATCHSTARTS|GTR_SPAWNINVUL|GTR_RESPAWNDELAY,
More gametype rules yay!!
2019-12-18 04:54:45 +00:00
// CTF
Fix overtime not working
2020-02-15 16:07:53 +00:00
GTR_RINGSLINGER|GTR_FIRSTPERSON|GTR_SPECTATORS|GTR_TEAMS|GTR_TEAMFLAGS|GTR_POINTLIMIT|GTR_TIMELIMIT|GTR_OVERTIME|GTR_POWERSTONES|GTR_DEATHMATCHSTARTS|GTR_SPAWNINVUL|GTR_RESPAWNDELAY|GTR_PITYSHIELD,
Gametype rules draft, mind the debug command
2019-12-18 04:25:57 +00:00
};
//
// G_SetGametype
//
// Set a new gametype, also setting gametype rules accordingly. Yay!
//
void G_SetGametype(INT16 gtype)
{
gametype = gtype;
gametyperules = gametypedefaultrules[gametype];
}
G_NewGametype
2019-12-18 15:23:42 +00:00
//
TOL/Level platter stuff
2019-12-18 16:24:10 +00:00
// G_AddGametype
G_NewGametype
2019-12-18 15:23:42 +00:00
//
TOL/Level platter stuff
2019-12-18 16:24:10 +00:00
// Add a gametype. Returns the new gametype number.
G_NewGametype
2019-12-18 15:23:42 +00:00
//
TOL/Level platter stuff
2019-12-18 16:24:10 +00:00
INT16 G_AddGametype(UINT32 rules)
G_NewGametype
2019-12-18 15:23:42 +00:00
{
NUMGAMETYPES vs gametypecount
2019-12-18 15:30:01 +00:00
INT16 newgtype = gametypecount;
gametypecount++;
G_NewGametype
2019-12-18 15:23:42 +00:00
// Set gametype rules.
How did I mess this up?
2019-12-18 18:23:41 +00:00
gametypedefaultrules[newgtype] = rules;
G_NewGametype
2019-12-18 15:23:42 +00:00
Gametype_Names[newgtype] = "???";
// Update gametype_cons_t accordingly.
SOC stuff
2019-12-18 17:37:48 +00:00
G_UpdateGametypeSelections();
return newgtype;
}
Lua! Lua! Lua! Expecting the buildbot to complain
2019-12-19 05:13:09 +00:00
//
// G_AddGametypeConstant
//
// Self-explanatory. Filters out "bad" characters.
//
void G_AddGametypeConstant(INT16 gtype, const char *newgtconst)
{
Remove characters that will not be allowed in the constant string.
2019-12-28 23:54:22 +00:00
size_t r = 0; // read
size_t w = 0; // write
Fix broken GT_ constants with custom gametypes
2020-02-09 00:40:30 +00:00
char *gtconst = Z_Calloc(strlen(newgtconst) + 4, PU_STATIC, NULL);
char *tmpconst = Z_Calloc(strlen(newgtconst) + 1, PU_STATIC, NULL);
Remove characters that will not be allowed in the constant string.
2019-12-28 23:54:22 +00:00
// Copy the gametype name.
strcpy(tmpconst, newgtconst);
Lua! Lua! Lua! Expecting the buildbot to complain
2019-12-19 05:13:09 +00:00
// Make uppercase.
Remove characters that will not be allowed in the constant string.
2019-12-28 23:54:22 +00:00
strupr(tmpconst);
// Prepare to write the new constant string now.
strcpy(gtconst, "GT_");
// Remove characters that will not be allowed in the constant string.
for (; r < strlen(tmpconst); r++)
{
boolean writechar = true;
char rc = tmpconst[r];
switch (rc)
{
Disallow few more characters.
2019-12-29 00:05:42 +00:00
// Space, at sign and question mark
Remove characters that will not be allowed in the constant string.
2019-12-28 23:54:22 +00:00
case ' ':
Disallow few more characters.
2019-12-29 00:05:42 +00:00
case '@':
case '?':
Remove characters that will not be allowed in the constant string.
2019-12-28 23:54:22 +00:00
// Used for operations
case '+':
case '-':
case '*':
case '/':
case '%':
case '^':
Disallow few more characters.
2019-12-29 00:05:42 +00:00
case '&':
case '!':
Remove characters that will not be allowed in the constant string.
2019-12-28 23:54:22 +00:00
// Part of Lua's syntax
case '#':
case '=':
case '~':
case '<':
case '>':
case '(':
case ')':
case '{':
case '}':
case '[':
case ']':
case ':':
case ';':
case ',':
case '.':
writechar = false;
break;
}
if (writechar)
{
gtconst[3 + w] = rc;
w++;
}
}
// Free the temporary string.
Z_Free(tmpconst);
Lua! Lua! Lua! Expecting the buildbot to complain
2019-12-19 05:13:09 +00:00
// Finally, set the constant string.
Gametype_ConstantNames[gtype] = gtconst;
}
SOC stuff
2019-12-18 17:37:48 +00:00
//
// G_UpdateGametypeSelections
//
// Updates gametype_cons_t.
//
void G_UpdateGametypeSelections(void)
{
INT32 i;
NUMGAMETYPES vs gametypecount
2019-12-18 15:30:01 +00:00
for (i = 0; i < gametypecount; i++)
G_NewGametype
2019-12-18 15:23:42 +00:00
{
gametype_cons_t[i].value = i;
gametype_cons_t[i].strvalue = Gametype_Names[i];
}
gametype_cons_t[NUMGAMETYPES].value = 0;
gametype_cons_t[NUMGAMETYPES].strvalue = NULL;
}
TOL/Level platter stuff
2019-12-18 16:24:10 +00:00
//
// G_SetGametypeDescription
//
// Set a description for the specified gametype.
// (Level platter)
//
Fix warnings
2019-12-18 18:41:03 +00:00
void G_SetGametypeDescription(INT16 gtype, char *descriptiontext, UINT8 leftcolor, UINT8 rightcolor)
TOL/Level platter stuff
2019-12-18 16:24:10 +00:00
{
fix warnings
2019-12-19 05:20:49 +00:00
if (descriptiontext != NULL)
strncpy(gametypedesc[gtype].notes, descriptiontext, 441);
TOL/Level platter stuff
2019-12-18 16:24:10 +00:00
gametypedesc[gtype].col[0] = leftcolor;
gametypedesc[gtype].col[1] = rightcolor;
}
Custom gametype rankings
2019-12-19 01:02:37 +00:00
// Gametype rankings
INT16 gametyperankings[NUMGAMETYPES] =
{
GT_COOP,
GT_COMPETITION,
GT_RACE,
GT_MATCH,
GT_TEAMMATCH,
GT_TAG,
GT_HIDEANDSEEK,
GT_CTF,
};
// Gametype to TOL (Type Of Level)
TOL/Level platter stuff
2019-12-18 16:24:10 +00:00
UINT32 gametypetol[NUMGAMETYPES] =
{
TOL_COOP, // Co-op
TOL_COMPETITION, // Competition
TOL_RACE, // Race
TOL_MATCH, // Match
TOL_MATCH, // Team Match
TOL_TAG, // Tag
TOL_TAG, // Hide and Seek
TOL_CTF, // CTF
};
Add MAXTOL
2020-02-12 16:41:30 +00:00
tolinfo_t TYPEOFLEVEL[NUMTOLNAMES] = {
{"SOLO",TOL_SP},
{"SP",TOL_SP},
{"SINGLEPLAYER",TOL_SP},
{"SINGLE",TOL_SP},
{"COOP",TOL_COOP},
{"CO-OP",TOL_COOP},
{"COMPETITION",TOL_COMPETITION},
{"RACE",TOL_RACE},
{"MATCH",TOL_MATCH},
{"TAG",TOL_TAG},
{"CTF",TOL_CTF},
{"2D",TOL_2D},
{"MARIO",TOL_MARIO},
{"NIGHTS",TOL_NIGHTS},
Compatibility with the current identifier
2021-04-22 01:22:37 +00:00
{"OLDBRAK",TOL_ERZ3},
Change TOL_ERZ3 identifier
2021-04-22 01:14:37 +00:00
{"ERZ3",TOL_ERZ3},
Add MAXTOL
2020-02-12 16:41:30 +00:00
{"XMAS",TOL_XMAS},
{"CHRISTMAS",TOL_XMAS},
{"WINTER",TOL_XMAS},
{NULL, 0}
};
UINT32 lastcustomtol = (TOL_XMAS<<1);
TOL/Level platter stuff
2019-12-18 16:24:10 +00:00
//
// G_AddTOL
//
// Adds a type of level.
//
void G_AddTOL(UINT32 newtol, const char *tolname)
{
Add MAXTOL
2020-02-12 16:41:30 +00:00
INT32 i;
for (i = 0; TYPEOFLEVEL[i].name; i++)
;
TOL/Level platter stuff
2019-12-18 16:24:10 +00:00
Add MAXTOL
2020-02-12 16:41:30 +00:00
TYPEOFLEVEL[i].name = Z_StrDup(tolname);
TYPEOFLEVEL[i].flag = newtol;
TOL/Level platter stuff
2019-12-18 16:24:10 +00:00
}
//
Add MAXTOL
2020-02-12 16:41:30 +00:00
// G_AddGametypeTOL
TOL/Level platter stuff
2019-12-18 16:24:10 +00:00
//
// Assigns a type of level to a gametype.
//
Fix warnings
2019-12-18 18:41:03 +00:00
void G_AddGametypeTOL(INT16 gtype, UINT32 newtol)
TOL/Level platter stuff
2019-12-18 16:24:10 +00:00
{
Fix warnings
2019-12-18 18:41:03 +00:00
gametypetol[gtype] = newtol;
TOL/Level platter stuff
2019-12-18 16:24:10 +00:00
}
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
2017-06-25 16:28:07 +00:00
//
// G_GetGametypeByName
//
// Returns the number for the given gametype name string, or -1 if not valid.
//
INT32 G_GetGametypeByName(const char *gametypestr)
{
INT32 i;
Use gametypecount in G_GetGametypeByName
2019-12-31 01:57:18 +00:00
for (i = 0; i < gametypecount; i++)
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
2017-06-25 16:28:07 +00:00
if (!stricmp(gametypestr, Gametype_Names[i]))
return i;
return -1; // unknown gametype
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
//
// G_IsSpecialStage
//
// Returns TRUE if
// the given map is a special stage.
//
boolean G_IsSpecialStage(INT32 mapnum)
{
A special stage is a special stage, even outside of coop.
2020-10-08 16:45:20 +00:00
if (modeattacking == ATTACKING_RECORD)
FINAL CHANGE, I PROMISE, I THINK * MainCfg property smpstage_start - controls the special stage multiplayer games go to.
2018-06-06 15:07:14 +00:00
return false;
if (mapnum >= sstage_start && mapnum <= sstage_end)
return true;
if (mapnum >= smpstage_start && mapnum <= smpstage_end)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return true;
return false;
}
//
// G_GametypeUsesLives
//
// Returns true if the current gametype uses
// the lives system. False otherwise.
//
boolean G_GametypeUsesLives(void)
{
Removing commented out code
2019-12-19 19:22:55 +00:00
// Coop, Competitive
Gametype rules draft, mind the debug command
2019-12-18 04:25:57 +00:00
if ((gametyperules & GTR_LIVES)
* Restart Metal recording from beginning if retry is used. * Disable lives when Metal recording (and have a big flashing REC instead, because I'm a riot). * Correct some minor directionchar issues (some introduced in this branch, some not).
2019-11-02 11:56:51 +00:00
&& !(modeattacking || metalrecording) // No lives in Time Attack
Instead of making conditions which check for death individually check for special stages to prevent lives loss, just set G_GametypeUsesLives to false in a special stage.
2019-11-26 12:30:32 +00:00
&& !G_IsSpecialStage(gamemap)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
&& !(maptol & TOL_NIGHTS)) // No lives in NiGHTS
return true;
return false;
}
Preparing for the inevitable gametype rule that will handle cooplives...
2019-12-27 20:08:20 +00:00
//
// G_GametypeUsesCoopLives
//
// Returns true if the current gametype uses
// the cooplives CVAR. False otherwise.
//
boolean G_GametypeUsesCoopLives(void)
{
Add GTR_FRIENDLY.
2019-12-28 22:56:18 +00:00
return (gametyperules & (GTR_LIVES|GTR_FRIENDLY)) == (GTR_LIVES|GTR_FRIENDLY);
Preparing for the inevitable gametype rule that will handle cooplives...
2019-12-27 20:08:20 +00:00
}
Same deal, but for starposts.
2019-12-27 20:14:56 +00:00
//
// G_GametypeUsesCoopStarposts
//
// Returns true if the current gametype uses
// the coopstarposts CVAR. False otherwise.
//
boolean G_GametypeUsesCoopStarposts(void)
{
Add GTR_FRIENDLY.
2019-12-28 22:56:18 +00:00
return (gametyperules & GTR_FRIENDLY);
Same deal, but for starposts.
2019-12-27 20:14:56 +00:00
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
//
// G_GametypeHasTeams
//
// Returns true if the current gametype uses
// Red/Blue teams. False otherwise.
//
boolean G_GametypeHasTeams(void)
{
Gametype rules draft, mind the debug command
2019-12-18 04:25:57 +00:00
return (gametyperules & GTR_TEAMS);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
//
// G_GametypeHasSpectators
//
// Returns true if the current gametype supports
// spectators. False otherwise.
//
boolean G_GametypeHasSpectators(void)
{
Gametype rules draft, mind the debug command
2019-12-18 04:25:57 +00:00
return (gametyperules & GTR_SPECTATORS);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
//
// G_RingSlingerGametype
//
// Returns true if the current gametype supports firing rings.
// ANY gametype can be a ringslinger gametype, just flick a switch.
//
boolean G_RingSlingerGametype(void)
{
Gametype rules draft, mind the debug command
2019-12-18 04:25:57 +00:00
return ((gametyperules & GTR_RINGSLINGER) || (cv_ringslinger.value));
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
//
// G_PlatformGametype
//
// Returns true if a gametype is a more traditional platforming-type.
//
boolean G_PlatformGametype(void)
{
Make G_PlatformGametype only check the gametype rules, to avoid unintended side effects
2019-12-19 19:31:38 +00:00
return (!(gametyperules & GTR_RINGSLINGER));
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
G_CoopGametype, for all the GT_COOP cases
2020-02-29 03:57:22 +00:00
//
// G_CoopGametype
//
// Returns true if a gametype is a Co-op gametype.
//
boolean G_CoopGametype(void)
{
return ((gametyperules & (GTR_FRIENDLY|GTR_CAMPAIGN)) == (GTR_FRIENDLY|GTR_CAMPAIGN));
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
//
// G_TagGametype
//
// For Jazz's Tag/HnS modes that have a lot of special cases..
//
boolean G_TagGametype(void)
{
Gametype rules draft, mind the debug command
2019-12-18 04:25:57 +00:00
return (gametyperules & GTR_TAG);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
add G_CompetitionGametype(void)
2019-12-27 15:28:00 +00:00
//
// G_CompetitionGametype
//
// For gametypes that are race gametypes, and have lives.
//
boolean G_CompetitionGametype(void)
{
return ((gametyperules & GTR_RACE) && (gametyperules & GTR_LIVES));
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
/** Get the typeoflevel flag needed to indicate support of a gametype.
* In single-player, this always returns TOL_SP.
* \param gametype The gametype for which support is desired.
* \return The typeoflevel flag to check for that gametype.
* \author Graue <graue@oceanbase.org>
*/
Fix G_TOLFlag returning the wrong type
2020-03-02 03:20:53 +00:00
UINT32 G_TOLFlag(INT32 pgametype)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Removing commented out code
2019-12-19 19:22:55 +00:00
if (!multiplayer)
return TOL_SP;
TOL/Level platter stuff
2019-12-18 16:24:10 +00:00
return gametypetol[pgametype];
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
/** Select a random map with the given typeoflevel flags.
* If no map has those flags, this arbitrarily gives you map 1.
* \param tolflags The typeoflevel flags to insist on. Other bits may
* be on too, but all of these must be on.
* \return A random map with those flags, 1-based, or 1 if no map
* has those flags.
* \author Graue <graue@oceanbase.org>
*/
Fix warnings
2019-12-18 18:41:03 +00:00
static INT16 RandMap(UINT32 tolflags, INT16 pprevmap)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
INT16 *okmaps = Z_Malloc(NUMMAPS * sizeof(INT16), PU_STATIC, NULL);
INT32 numokmaps = 0;
INT16 ix;
// Find all the maps that are ok and and put them in an array.
for (ix = 0; ix < NUMMAPS; ix++)
if (mapheaderinfo[ix] && (mapheaderinfo[ix]->typeoflevel & tolflags) == tolflags
&& ix != pprevmap // Don't pick the same map.
&& (dedicated || !M_MapLocked(ix+1)) // Don't pick locked maps.
)
okmaps[numokmaps++] = ix;
if (numokmaps == 0)
ix = 0; // Sorry, none match. You get MAP01.
else
ix = okmaps[M_RandomKey(numokmaps)];
Z_Free(okmaps);
return ix;
}
Move all the visitation/emblems/record attack update stuff into a single function, and call that function in two different places depending on whether the tally screen is visited or not.
2019-11-21 23:38:33 +00:00
//
// G_UpdateVisited
//
static void G_UpdateVisited(void)
{
boolean spec = G_IsSpecialStage(gamemap);
// Update visitation flags?
if ((!modifiedgame || savemoddata) // Not modified
&& !multiplayer && !demoplayback && (gametype == GT_COOP) // SP/RA/NiGHTS mode
&& !(spec && stagefailed)) // Not failed the special stage
{
UINT8 earnedEmblems;
// Update visitation flags
mapvisited[gamemap-1] |= MV_BEATEN;
// eh, what the hell
if (ultimatemode)
mapvisited[gamemap-1] |= MV_ULTIMATE;
Fix #457 and another bug I just realised in one fell swoop. That is to say, MV_PERFECT can be applied in singleplayer, but that doesn't update your best rings on the map in record attack, so the thing being yellow doesn't make sense if your rings are (none). Therefore, make it a two-flag, two-bit process.
2019-12-05 09:47:29 +00:00
// may seem incorrect but IS possible in what the main game uses as mp special stages, and nummaprings will be -1 in NiGHTS
Move all the visitation/emblems/record attack update stuff into a single function, and call that function in two different places depending on whether the tally screen is visited or not.
2019-11-21 23:38:33 +00:00
if (nummaprings > 0 && players[consoleplayer].rings >= nummaprings)
Fix #457 and another bug I just realised in one fell swoop. That is to say, MV_PERFECT can be applied in singleplayer, but that doesn't update your best rings on the map in record attack, so the thing being yellow doesn't make sense if your rings are (none). Therefore, make it a two-flag, two-bit process.
2019-12-05 09:47:29 +00:00
{
Move all the visitation/emblems/record attack update stuff into a single function, and call that function in two different places depending on whether the tally screen is visited or not.
2019-11-21 23:38:33 +00:00
mapvisited[gamemap-1] |= MV_PERFECT;
Fix #457 and another bug I just realised in one fell swoop. That is to say, MV_PERFECT can be applied in singleplayer, but that doesn't update your best rings on the map in record attack, so the thing being yellow doesn't make sense if your rings are (none). Therefore, make it a two-flag, two-bit process.
2019-12-05 09:47:29 +00:00
if (modeattacking)
mapvisited[gamemap-1] |= MV_PERFECTRA;
}
Move all the visitation/emblems/record attack update stuff into a single function, and call that function in two different places depending on whether the tally screen is visited or not.
2019-11-21 23:38:33 +00:00
if (!spec)
{
// not available to special stages because they can only really be done in one order in an unmodified game, so impossible for first six and trivial for seventh
if (ALL7EMERALDS(emeralds))
mapvisited[gamemap-1] |= MV_ALLEMERALDS;
}
if (modeattacking == ATTACKING_RECORD)
G_UpdateRecordReplays();
else if (modeattacking == ATTACKING_NIGHTS)
G_SetNightsRecords();
if ((earnedEmblems = M_CompletionEmblems()))
CONS_Printf(M_GetText("\x82" "Earned %hu emblem%s for level completion.\n"), (UINT16)earnedEmblems, earnedEmblems > 1 ? "s" : "");
}
}
Special saves! All this refactoring, just to resolve #162. Specifically, it engages savegame events not at level load (except for savefile start) but on level completion, just after you've gotten all the intermission bonuses but before the intermission actually starts. Also fixes a never-before-discovered bug where if the titlemap has LF_SAVEGAME, your save file will be overwritten upon returning to the title screen. This game is a mess of hacks, I swear... One unintended side effect: It may actually be faster in some speedrun circumstances in mods with cutscenes to complete the map, exit back to the title screen, and reload the file. It's a common feature of optimal runs in games with cutscenes, though, and Marathon Run has a toggle for cutscenes, so I'm not particularly bothered.
2020-06-22 18:00:47 +00:00
static boolean CanSaveLevel(INT32 mapnum)
{
// You can never save in a special stage.
if (G_IsSpecialStage(mapnum))
return false;
// If the game is complete for this save slot, then any level can save!
if (gamecomplete)
return true;
// Be kind with Marathon Mode live event backups.
if (marathonmode)
return true;
// Any levels that have the savegame flag can save normally.
return (mapheaderinfo[mapnum-1] && (mapheaderinfo[mapnum-1]->levelflags & LF_SAVEGAME));
}
Fix the issue where custom exits with skipped intermission screens (notably, Black Core Zone 2 and 3) would cause the game to softlock when playing on a save file, or with a live event backup.
2020-07-10 19:30:16 +00:00
static void G_HandleSaveLevel(void)
{
// do this before running the intermission or custom cutscene, mostly for the sake of marathon mode but it also massively reduces redundant file save events in f_finale.c
if (nextmap >= 1100-1)
{
if (!gamecomplete)
gamecomplete = 2; // special temporary mode to prevent using SP level select in pause menu until the intermission is over without restricting it in every intermission
if (cursaveslot > 0)
{
if (marathonmode)
{
// don't keep a backup around when the run is done!
if (FIL_FileExists(liveeventbackup))
remove(liveeventbackup);
cursaveslot = 0;
}
else if ((!modifiedgame || savemoddata) && !(netgame || multiplayer || ultimatemode || demorecording || metalrecording || modeattacking))
G_SaveGame((UINT32)cursaveslot, spstage_start);
}
}
// and doing THIS here means you don't lose your progress if you close the game mid-intermission
else if (!(ultimatemode || netgame || multiplayer || demoplayback || demorecording || metalrecording || modeattacking)
&& (!modifiedgame || savemoddata) && cursaveslot > 0 && CanSaveLevel(lastmap+1))
G_SaveGame((UINT32)cursaveslot, lastmap+1); // not nextmap+1 to route around special stages
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
//
// G_DoCompleted
//
static void G_DoCompleted(void)
{
INT32 i;
Do a whole bunch of cleanup for mapvisited and intermission related things. * Move the visitation flags, Record Attack/NiGHTS Attack data, and emblem checking to outside of Y_StartIntermission. * Y_CleanupScreenBuffer never got called for maps which skip the intermission, leading to a small memory leak; this is now fixed by moving it to G_AfterIntermission. * Y_FollowIntermission was just G_AfterIntermission with modeattacking specific behaviour, but this is desired for all places where G_AfterIntermission is called, so just merge this into G_AfterIntermission. Notably, these changes are necessary because there are now three maps in the main SP campaign which do not end with traditional intermissions. As a result, this fixes an issue where Black Core's tracks are not available in the Sound Test (due to MV_BEATEN never being applied). Also, since I was here: Remove "gotperfect" from recorddata_t. This is a duplicate of `mapvisited[gamemap-1] & MV_PERFECT` which uses more memory. I have kept the new spacing in the gamedata for compatibility with RC1 savedatas, but moved it across to the original method everywhere else.
2019-11-21 16:10:28 +00:00
boolean spec = G_IsSpecialStage(gamemap);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
tokenlist = 0; // Reset the list
* Hold the pause button to restart a record attack run! * Obligatory GIF: https://cdn.discordapp.com/attachments/400761370800422922/456586705424875520/srb20047.gif * Show powerup display in singleplayer even while holding Game Status button.
2018-06-13 23:58:28 +00:00
if (modeattacking && pausedelay)
pausedelay = 0;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
gameaction = ga_nothing;
SRB2 2.1.5 release
2014-03-23 16:00:29 +00:00
if (metalplayback)
G_StopMetalDemo();
if (metalrecording)
* Add a death animation for killing the Metal object, in case somebody wants to Lua up a Sonic CD style race finish for the Metal object, or in case of the following... * Add an alternate DEMOMARKER for ending the Metal Recording on death, which kills the Metal object as well. * Add some more relevant exceptions to the "most objects are removed when touching a deathpit" thing, primarily for the sake of ghosts and Metal playback.
2019-10-29 17:38:14 +00:00
G_StopMetalRecording(false);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
for (i = 0; i < MAXPLAYERS; i++)
if (playeringame[i])
G_PlayerFinishLevel(i); // take away cards and stuff
if (automapactive)
AM_Stop();
S_StopSounds();
prevmap = (INT16)(gamemap-1);
// go to next level
// nextmap is 0-based, unlike gamemap
if (nextmapoverride != 0)
nextmap = (INT16)(nextmapoverride-1);
Introducing Marathon Run. (I was going to call it Marathon Mode, but NiGHTS Mode being right next to it on the menu looked terrible.) Basically a dedicated Record Attack-like experience for speedrunning the game as a continuous chunk rather than ILs. Has several quality of life features. Benefits include: * An unambiguous real-time bar across the bottom of the screen, always displaying the current time, ticking up until you reach the ending. * Disable the console (pausing is still allowed, but the timer will still increment). * Automatically skip intermissions as if you're holding down the spin button. * Show centiseconds on HUD automatically, like record attack. * "Live Event Backups" - a category of run fit for major events like GDQ, where recovery from crashes or chokes makes for better entertainment. Essentially a modified SP savefile, down to using the same basic functions, but has its own filename and tweaked internal layout. * "spmarathon_start" MainCfg block parameter and "marathonnext" mapheader parameter, allowing for a customised flow (makes this fit for purpose for an eventual SUGOI port). * Disabling inter-level custom cutscenes by default with a menu option to toggle this (won't show up if the mod doesn't *have* any custom cutscenes), although either way ending cutscenes (vanilla or custom) remain intact since is time is called before them. * Won't show up if you have a mod that consists of only one level (determined by spmarathon_start's nextlevel; this won't trip if you manually set its marathonnext). * Unconditional gratitude on the evaluation screen, instead of a negging "Try again..." if you didn't get all the emeralds (which you may not have been aiming for). * Gorgeous new menu (no new assets required, unless you wanna give it a header later). Changes which were required for the above but affect other areas of the game include: * "useBlackRock" MainCFG block parameter, which can be used to disable the presence of the Black Rock or Egg Rock in both the Evaluation screen and the Marathon Run menu (for total conversions with different stories). * Disabling Continues in NiGHTS mode, to match the most common singleplayer experience post 2.2.4's release (is reverted if useContinues is set to true). * Hiding the exitmove "powerup" outside of multiplayer. (Okay, this isn't really related, I just saw this bug in action a lot while doing test runs and got annoyed enough to fix it here.) * The ability to use V_DrawPromptBack (in hardcode only at the moment, but) to draw in terms of pixels rather than rows of text, by providing negative instead of positive inputs). * A refactoring of redundant game saves smattered across the ending, credits, and evaluation - in addition to saving the game slightly earlier. * Minor m_menu.c touchups and refactorings here and there. Built using feedback from the official server's #speedruns channel, among other places.
2020-05-14 22:10:00 +00:00
else if (marathonmode && mapheaderinfo[gamemap-1]->marathonnext)
nextmap = (INT16)(mapheaderinfo[gamemap-1]->marathonnext-1);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
else
Introducing Marathon Run. (I was going to call it Marathon Mode, but NiGHTS Mode being right next to it on the menu looked terrible.) Basically a dedicated Record Attack-like experience for speedrunning the game as a continuous chunk rather than ILs. Has several quality of life features. Benefits include: * An unambiguous real-time bar across the bottom of the screen, always displaying the current time, ticking up until you reach the ending. * Disable the console (pausing is still allowed, but the timer will still increment). * Automatically skip intermissions as if you're holding down the spin button. * Show centiseconds on HUD automatically, like record attack. * "Live Event Backups" - a category of run fit for major events like GDQ, where recovery from crashes or chokes makes for better entertainment. Essentially a modified SP savefile, down to using the same basic functions, but has its own filename and tweaked internal layout. * "spmarathon_start" MainCfg block parameter and "marathonnext" mapheader parameter, allowing for a customised flow (makes this fit for purpose for an eventual SUGOI port). * Disabling inter-level custom cutscenes by default with a menu option to toggle this (won't show up if the mod doesn't *have* any custom cutscenes), although either way ending cutscenes (vanilla or custom) remain intact since is time is called before them. * Won't show up if you have a mod that consists of only one level (determined by spmarathon_start's nextlevel; this won't trip if you manually set its marathonnext). * Unconditional gratitude on the evaluation screen, instead of a negging "Try again..." if you didn't get all the emeralds (which you may not have been aiming for). * Gorgeous new menu (no new assets required, unless you wanna give it a header later). Changes which were required for the above but affect other areas of the game include: * "useBlackRock" MainCFG block parameter, which can be used to disable the presence of the Black Rock or Egg Rock in both the Evaluation screen and the Marathon Run menu (for total conversions with different stories). * Disabling Continues in NiGHTS mode, to match the most common singleplayer experience post 2.2.4's release (is reverted if useContinues is set to true). * Hiding the exitmove "powerup" outside of multiplayer. (Okay, this isn't really related, I just saw this bug in action a lot while doing test runs and got annoyed enough to fix it here.) * The ability to use V_DrawPromptBack (in hardcode only at the moment, but) to draw in terms of pixels rather than rows of text, by providing negative instead of positive inputs). * A refactoring of redundant game saves smattered across the ending, credits, and evaluation - in addition to saving the game slightly earlier. * Minor m_menu.c touchups and refactorings here and there. Built using feedback from the official server's #speedruns channel, among other places.
2020-05-14 22:10:00 +00:00
{
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
nextmap = (INT16)(mapheaderinfo[gamemap-1]->nextlevel-1);
Introducing Marathon Run. (I was going to call it Marathon Mode, but NiGHTS Mode being right next to it on the menu looked terrible.) Basically a dedicated Record Attack-like experience for speedrunning the game as a continuous chunk rather than ILs. Has several quality of life features. Benefits include: * An unambiguous real-time bar across the bottom of the screen, always displaying the current time, ticking up until you reach the ending. * Disable the console (pausing is still allowed, but the timer will still increment). * Automatically skip intermissions as if you're holding down the spin button. * Show centiseconds on HUD automatically, like record attack. * "Live Event Backups" - a category of run fit for major events like GDQ, where recovery from crashes or chokes makes for better entertainment. Essentially a modified SP savefile, down to using the same basic functions, but has its own filename and tweaked internal layout. * "spmarathon_start" MainCfg block parameter and "marathonnext" mapheader parameter, allowing for a customised flow (makes this fit for purpose for an eventual SUGOI port). * Disabling inter-level custom cutscenes by default with a menu option to toggle this (won't show up if the mod doesn't *have* any custom cutscenes), although either way ending cutscenes (vanilla or custom) remain intact since is time is called before them. * Won't show up if you have a mod that consists of only one level (determined by spmarathon_start's nextlevel; this won't trip if you manually set its marathonnext). * Unconditional gratitude on the evaluation screen, instead of a negging "Try again..." if you didn't get all the emeralds (which you may not have been aiming for). * Gorgeous new menu (no new assets required, unless you wanna give it a header later). Changes which were required for the above but affect other areas of the game include: * "useBlackRock" MainCFG block parameter, which can be used to disable the presence of the Black Rock or Egg Rock in both the Evaluation screen and the Marathon Run menu (for total conversions with different stories). * Disabling Continues in NiGHTS mode, to match the most common singleplayer experience post 2.2.4's release (is reverted if useContinues is set to true). * Hiding the exitmove "powerup" outside of multiplayer. (Okay, this isn't really related, I just saw this bug in action a lot while doing test runs and got annoyed enough to fix it here.) * The ability to use V_DrawPromptBack (in hardcode only at the moment, but) to draw in terms of pixels rather than rows of text, by providing negative instead of positive inputs). * A refactoring of redundant game saves smattered across the ending, credits, and evaluation - in addition to saving the game slightly earlier. * Minor m_menu.c touchups and refactorings here and there. Built using feedback from the official server's #speedruns channel, among other places.
2020-05-14 22:10:00 +00:00
if (marathonmode && nextmap == spmarathon_start-1)
nextmap = 1100-1; // No infinite loop for you
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// If nextmap is actually going to get used, make sure it points to
// a map of the proper gametype -- skip levels that don't support
// the current gametype. (Helps avoid playing boss levels in Race,
// for instance).
Make Special Stage map transitions respect nextmapoverride. In other words: lets Luas set the next map of Special Stages via G_SetCustomExitVars. It's otherwise impossible to do so via Lua.
2020-08-27 04:22:53 +00:00
if (!spec || nextmapoverride)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Special saves! All this refactoring, just to resolve #162. Specifically, it engages savegame events not at level load (except for savefile start) but on level completion, just after you've gotten all the intermission bonuses but before the intermission actually starts. Also fixes a never-before-discovered bug where if the titlemap has LF_SAVEGAME, your save file will be overwritten upon returning to the title screen. This game is a mess of hacks, I swear... One unintended side effect: It may actually be faster in some speedrun circumstances in mods with cutscenes to complete the map, exit back to the title screen, and reload the file. It's a common feature of optimal runs in games with cutscenes, though, and Marathon Run has a toggle for cutscenes, so I'm not particularly bothered.
2020-06-22 18:00:47 +00:00
if (nextmap >= 0 && nextmap < NUMMAPS)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Special saves! All this refactoring, just to resolve #162. Specifically, it engages savegame events not at level load (except for savefile start) but on level completion, just after you've gotten all the intermission bonuses but before the intermission actually starts. Also fixes a never-before-discovered bug where if the titlemap has LF_SAVEGAME, your save file will be overwritten upon returning to the title screen. This game is a mess of hacks, I swear... One unintended side effect: It may actually be faster in some speedrun circumstances in mods with cutscenes to complete the map, exit back to the title screen, and reload the file. It's a common feature of optimal runs in games with cutscenes, though, and Marathon Run has a toggle for cutscenes, so I'm not particularly bothered.
2020-06-22 18:00:47 +00:00
register INT16 cm = nextmap;
UINT32 tolflag = G_TOLFlag(gametype);
UINT8 visitedmap[(NUMMAPS+7)/8];
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Special saves! All this refactoring, just to resolve #162. Specifically, it engages savegame events not at level load (except for savefile start) but on level completion, just after you've gotten all the intermission bonuses but before the intermission actually starts. Also fixes a never-before-discovered bug where if the titlemap has LF_SAVEGAME, your save file will be overwritten upon returning to the title screen. This game is a mess of hacks, I swear... One unintended side effect: It may actually be faster in some speedrun circumstances in mods with cutscenes to complete the map, exit back to the title screen, and reload the file. It's a common feature of optimal runs in games with cutscenes, though, and Marathon Run has a toggle for cutscenes, so I'm not particularly bothered.
2020-06-22 18:00:47 +00:00
memset(visitedmap, 0, sizeof (visitedmap));
while (!mapheaderinfo[cm] || !(mapheaderinfo[cm]->typeoflevel & tolflag))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Special saves! All this refactoring, just to resolve #162. Specifically, it engages savegame events not at level load (except for savefile start) but on level completion, just after you've gotten all the intermission bonuses but before the intermission actually starts. Also fixes a never-before-discovered bug where if the titlemap has LF_SAVEGAME, your save file will be overwritten upon returning to the title screen. This game is a mess of hacks, I swear... One unintended side effect: It may actually be faster in some speedrun circumstances in mods with cutscenes to complete the map, exit back to the title screen, and reload the file. It's a common feature of optimal runs in games with cutscenes, though, and Marathon Run has a toggle for cutscenes, so I'm not particularly bothered.
2020-06-22 18:00:47 +00:00
visitedmap[cm/8] |= (1<<(cm&7));
if (!mapheaderinfo[cm])
cm = -1; // guarantee error execution
else if (marathonmode && mapheaderinfo[cm]->marathonnext)
cm = (INT16)(mapheaderinfo[cm]->marathonnext-1);
else
cm = (INT16)(mapheaderinfo[cm]->nextlevel-1);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Special saves! All this refactoring, just to resolve #162. Specifically, it engages savegame events not at level load (except for savefile start) but on level completion, just after you've gotten all the intermission bonuses but before the intermission actually starts. Also fixes a never-before-discovered bug where if the titlemap has LF_SAVEGAME, your save file will be overwritten upon returning to the title screen. This game is a mess of hacks, I swear... One unintended side effect: It may actually be faster in some speedrun circumstances in mods with cutscenes to complete the map, exit back to the title screen, and reload the file. It's a common feature of optimal runs in games with cutscenes, though, and Marathon Run has a toggle for cutscenes, so I'm not particularly bothered.
2020-06-22 18:00:47 +00:00
if (cm >= NUMMAPS || cm < 0) // out of range (either 1100ish or error)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Special saves! All this refactoring, just to resolve #162. Specifically, it engages savegame events not at level load (except for savefile start) but on level completion, just after you've gotten all the intermission bonuses but before the intermission actually starts. Also fixes a never-before-discovered bug where if the titlemap has LF_SAVEGAME, your save file will be overwritten upon returning to the title screen. This game is a mess of hacks, I swear... One unintended side effect: It may actually be faster in some speedrun circumstances in mods with cutscenes to complete the map, exit back to the title screen, and reload the file. It's a common feature of optimal runs in games with cutscenes, though, and Marathon Run has a toggle for cutscenes, so I'm not particularly bothered.
2020-06-22 18:00:47 +00:00
cm = nextmap; //Start the loop again so that the error checking below is executed.
//Make sure the map actually exists before you try to go to it!
if ((W_CheckNumForName(G_BuildMapName(cm + 1)) == LUMPERROR))
{
CONS_Alert(CONS_ERROR, M_GetText("Next map given (MAP %d) doesn't exist! Reverting to MAP01.\n"), cm+1);
cm = 0;
break;
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
Special saves! All this refactoring, just to resolve #162. Specifically, it engages savegame events not at level load (except for savefile start) but on level completion, just after you've gotten all the intermission bonuses but before the intermission actually starts. Also fixes a never-before-discovered bug where if the titlemap has LF_SAVEGAME, your save file will be overwritten upon returning to the title screen. This game is a mess of hacks, I swear... One unintended side effect: It may actually be faster in some speedrun circumstances in mods with cutscenes to complete the map, exit back to the title screen, and reload the file. It's a common feature of optimal runs in games with cutscenes, though, and Marathon Run has a toggle for cutscenes, so I'm not particularly bothered.
2020-06-22 18:00:47 +00:00
if (visitedmap[cm/8] & (1<<(cm&7))) // smells familiar
{
// We got stuck in a loop, came back to the map we started on
// without finding one supporting the current gametype.
// Thus, print a warning, and just use this map anyways.
CONS_Alert(CONS_WARNING, M_GetText("Can't find a compatible map after map %d; using map %d anyway\n"), prevmap+1, cm+1);
break;
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
Special saves! All this refactoring, just to resolve #162. Specifically, it engages savegame events not at level load (except for savefile start) but on level completion, just after you've gotten all the intermission bonuses but before the intermission actually starts. Also fixes a never-before-discovered bug where if the titlemap has LF_SAVEGAME, your save file will be overwritten upon returning to the title screen. This game is a mess of hacks, I swear... One unintended side effect: It may actually be faster in some speedrun circumstances in mods with cutscenes to complete the map, exit back to the title screen, and reload the file. It's a common feature of optimal runs in games with cutscenes, though, and Marathon Run has a toggle for cutscenes, so I'm not particularly bothered.
2020-06-22 18:00:47 +00:00
nextmap = cm;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
Special saves! All this refactoring, just to resolve #162. Specifically, it engages savegame events not at level load (except for savefile start) but on level completion, just after you've gotten all the intermission bonuses but before the intermission actually starts. Also fixes a never-before-discovered bug where if the titlemap has LF_SAVEGAME, your save file will be overwritten upon returning to the title screen. This game is a mess of hacks, I swear... One unintended side effect: It may actually be faster in some speedrun circumstances in mods with cutscenes to complete the map, exit back to the title screen, and reload the file. It's a common feature of optimal runs in games with cutscenes, though, and Marathon Run has a toggle for cutscenes, so I'm not particularly bothered.
2020-06-22 18:00:47 +00:00
// wrap around in race
if (nextmap >= 1100-1 && nextmap <= 1102-1 && !(gametyperules & GTR_CAMPAIGN))
nextmap = (INT16)(spstage_start-1);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Special saves! All this refactoring, just to resolve #162. Specifically, it engages savegame events not at level load (except for savefile start) but on level completion, just after you've gotten all the intermission bonuses but before the intermission actually starts. Also fixes a never-before-discovered bug where if the titlemap has LF_SAVEGAME, your save file will be overwritten upon returning to the title screen. This game is a mess of hacks, I swear... One unintended side effect: It may actually be faster in some speedrun circumstances in mods with cutscenes to complete the map, exit back to the title screen, and reload the file. It's a common feature of optimal runs in games with cutscenes, though, and Marathon Run has a toggle for cutscenes, so I'm not particularly bothered.
2020-06-22 18:00:47 +00:00
if (nextmap < 0 || (nextmap >= NUMMAPS && nextmap < 1100-1) || nextmap > 1103-1)
I_Error("Followed map %d to invalid map %d\n", prevmap + 1, nextmap + 1);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Make Special Stage map transitions respect nextmapoverride. In other words: lets Luas set the next map of Special Stages via G_SetCustomExitVars. It's otherwise impossible to do so via Lua.
2020-08-27 04:22:53 +00:00
if (!spec)
lastmap = nextmap; // Remember last map for when you come out of the special stage.
Special saves! All this refactoring, just to resolve #162. Specifically, it engages savegame events not at level load (except for savefile start) but on level completion, just after you've gotten all the intermission bonuses but before the intermission actually starts. Also fixes a never-before-discovered bug where if the titlemap has LF_SAVEGAME, your save file will be overwritten upon returning to the title screen. This game is a mess of hacks, I swear... One unintended side effect: It may actually be faster in some speedrun circumstances in mods with cutscenes to complete the map, exit back to the title screen, and reload the file. It's a common feature of optimal runs in games with cutscenes, though, and Marathon Run has a toggle for cutscenes, so I'm not particularly bothered.
2020-06-22 18:00:47 +00:00
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Special Stages/token stuff
2019-12-19 01:46:17 +00:00
if ((gottoken = ((gametyperules & GTR_SPECIALSTAGES) && token)))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
token--;
FINAL CHANGE, I PROMISE, I THINK * MainCfg property smpstage_start - controls the special stage multiplayer games go to.
2018-06-06 15:07:14 +00:00
for (i = 0; i < 7; i++)
Fix all the Floral Fieldsing pv2 discovered.
2018-06-12 00:08:03 +00:00
if (!(emeralds & (1<<i)))
FINAL CHANGE, I PROMISE, I THINK * MainCfg property smpstage_start - controls the special stage multiplayer games go to.
2018-06-06 15:07:14 +00:00
{
nextmap = ((netgame || multiplayer) ? smpstage_start : sstage_start) + i - 1; // to special stage!
break;
}
if (i == 7)
Remove extra tokens if we got all 7 emeroods
2020-02-12 03:36:09 +00:00
{
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
gottoken = false;
Remove extra tokens if we got all 7 emeroods
2020-02-12 03:36:09 +00:00
token = 0;
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
Make Special Stage map transitions respect nextmapoverride. In other words: lets Luas set the next map of Special Stages via G_SetCustomExitVars. It's otherwise impossible to do so via Lua.
2020-08-27 04:22:53 +00:00
if (spec && !gottoken && !nextmapoverride)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
nextmap = lastmap; // Exiting from a special stage? Go back to the game. Tails 08-11-2001
automapactive = false;
GTR_CAMPAIGN and GTR_NOGAMEEND
2019-12-19 01:50:49 +00:00
if (!(gametyperules & GTR_CAMPAIGN))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
if (cv_advancemap.value == 0) // Stay on same map.
nextmap = prevmap;
else if (cv_advancemap.value == 2) // Go to random map.
nextmap = RandMap(G_TOLFlag(gametype), prevmap);
}
// We are committed to this map now.
// We may as well allocate its header if it doesn't exist
Fix crash on game clear (No, game, you can't allocate a map header for the credits, why were you doing that before and how did it not break anything??) (cherry picked from commit e1f9a012297d5220dcdd9395265467621a170e32)
2016-01-08 07:48:19 +00:00
// (That is, if it's a real map)
if (nextmap < NUMMAPS && !mapheaderinfo[nextmap])
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
P_AllocMapHeader(nextmap);
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into special_save # Conflicts: # src/g_game.c
2020-06-25 09:48:36 +00:00
// If the current gametype has no intermission screen set, then don't start it.
Y_DetermineIntermissionType();
if ((skipstats && !modeattacking) || (spec && modeattacking && stagefailed) || (intertype == int_none))
Move all the visitation/emblems/record attack update stuff into a single function, and call that function in two different places depending on whether the tally screen is visited or not.
2019-11-21 23:38:33 +00:00
{
G_UpdateVisited();
Fix the issue where custom exits with skipped intermission screens (notably, Black Core Zone 2 and 3) would cause the game to softlock when playing on a save file, or with a live event backup.
2020-07-10 19:30:16 +00:00
G_HandleSaveLevel();
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
G_AfterIntermission();
Move all the visitation/emblems/record attack update stuff into a single function, and call that function in two different places depending on whether the tally screen is visited or not.
2019-11-21 23:38:33 +00:00
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
else
{
G_SetGamestate(GS_INTERMISSION);
Y_StartIntermission();
bruh
2021-04-06 02:50:22 +00:00
Y_LoadIntermissionData();
Move all the visitation/emblems/record attack update stuff into a single function, and call that function in two different places depending on whether the tally screen is visited or not.
2019-11-21 23:38:33 +00:00
G_UpdateVisited();
Fix the issue where custom exits with skipped intermission screens (notably, Black Core Zone 2 and 3) would cause the game to softlock when playing on a save file, or with a live event backup.
2020-07-10 19:30:16 +00:00
G_HandleSaveLevel();
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
}
Introducing Marathon Run. (I was going to call it Marathon Mode, but NiGHTS Mode being right next to it on the menu looked terrible.) Basically a dedicated Record Attack-like experience for speedrunning the game as a continuous chunk rather than ILs. Has several quality of life features. Benefits include: * An unambiguous real-time bar across the bottom of the screen, always displaying the current time, ticking up until you reach the ending. * Disable the console (pausing is still allowed, but the timer will still increment). * Automatically skip intermissions as if you're holding down the spin button. * Show centiseconds on HUD automatically, like record attack. * "Live Event Backups" - a category of run fit for major events like GDQ, where recovery from crashes or chokes makes for better entertainment. Essentially a modified SP savefile, down to using the same basic functions, but has its own filename and tweaked internal layout. * "spmarathon_start" MainCfg block parameter and "marathonnext" mapheader parameter, allowing for a customised flow (makes this fit for purpose for an eventual SUGOI port). * Disabling inter-level custom cutscenes by default with a menu option to toggle this (won't show up if the mod doesn't *have* any custom cutscenes), although either way ending cutscenes (vanilla or custom) remain intact since is time is called before them. * Won't show up if you have a mod that consists of only one level (determined by spmarathon_start's nextlevel; this won't trip if you manually set its marathonnext). * Unconditional gratitude on the evaluation screen, instead of a negging "Try again..." if you didn't get all the emeralds (which you may not have been aiming for). * Gorgeous new menu (no new assets required, unless you wanna give it a header later). Changes which were required for the above but affect other areas of the game include: * "useBlackRock" MainCFG block parameter, which can be used to disable the presence of the Black Rock or Egg Rock in both the Evaluation screen and the Marathon Run menu (for total conversions with different stories). * Disabling Continues in NiGHTS mode, to match the most common singleplayer experience post 2.2.4's release (is reverted if useContinues is set to true). * Hiding the exitmove "powerup" outside of multiplayer. (Okay, this isn't really related, I just saw this bug in action a lot while doing test runs and got annoyed enough to fix it here.) * The ability to use V_DrawPromptBack (in hardcode only at the moment, but) to draw in terms of pixels rather than rows of text, by providing negative instead of positive inputs). * A refactoring of redundant game saves smattered across the ending, credits, and evaluation - in addition to saving the game slightly earlier. * Minor m_menu.c touchups and refactorings here and there. Built using feedback from the official server's #speedruns channel, among other places.
2020-05-14 22:10:00 +00:00
// See also F_EndCutscene, the only other place which handles intra-map/ending transitions
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
void G_AfterIntermission(void)
{
Do a whole bunch of cleanup for mapvisited and intermission related things. * Move the visitation flags, Record Attack/NiGHTS Attack data, and emblem checking to outside of Y_StartIntermission. * Y_CleanupScreenBuffer never got called for maps which skip the intermission, leading to a small memory leak; this is now fixed by moving it to G_AfterIntermission. * Y_FollowIntermission was just G_AfterIntermission with modeattacking specific behaviour, but this is desired for all places where G_AfterIntermission is called, so just merge this into G_AfterIntermission. Notably, these changes are necessary because there are now three maps in the main SP campaign which do not end with traditional intermissions. As a result, this fixes an issue where Black Core's tracks are not available in the Sound Test (due to MV_BEATEN never being applied). Also, since I was here: Remove "gotperfect" from recorddata_t. This is a duplicate of `mapvisited[gamemap-1] & MV_PERFECT` which uses more memory. I have kept the new spacing in the gamedata for compatibility with RC1 savedatas, but moved it across to the original method everywhere else.
2019-11-21 16:10:28 +00:00
Y_CleanupScreenBuffer();
if (modeattacking)
{
M_EndModeAttackRun();
return;
}
Introducing Marathon Run. (I was going to call it Marathon Mode, but NiGHTS Mode being right next to it on the menu looked terrible.) Basically a dedicated Record Attack-like experience for speedrunning the game as a continuous chunk rather than ILs. Has several quality of life features. Benefits include: * An unambiguous real-time bar across the bottom of the screen, always displaying the current time, ticking up until you reach the ending. * Disable the console (pausing is still allowed, but the timer will still increment). * Automatically skip intermissions as if you're holding down the spin button. * Show centiseconds on HUD automatically, like record attack. * "Live Event Backups" - a category of run fit for major events like GDQ, where recovery from crashes or chokes makes for better entertainment. Essentially a modified SP savefile, down to using the same basic functions, but has its own filename and tweaked internal layout. * "spmarathon_start" MainCfg block parameter and "marathonnext" mapheader parameter, allowing for a customised flow (makes this fit for purpose for an eventual SUGOI port). * Disabling inter-level custom cutscenes by default with a menu option to toggle this (won't show up if the mod doesn't *have* any custom cutscenes), although either way ending cutscenes (vanilla or custom) remain intact since is time is called before them. * Won't show up if you have a mod that consists of only one level (determined by spmarathon_start's nextlevel; this won't trip if you manually set its marathonnext). * Unconditional gratitude on the evaluation screen, instead of a negging "Try again..." if you didn't get all the emeralds (which you may not have been aiming for). * Gorgeous new menu (no new assets required, unless you wanna give it a header later). Changes which were required for the above but affect other areas of the game include: * "useBlackRock" MainCFG block parameter, which can be used to disable the presence of the Black Rock or Egg Rock in both the Evaluation screen and the Marathon Run menu (for total conversions with different stories). * Disabling Continues in NiGHTS mode, to match the most common singleplayer experience post 2.2.4's release (is reverted if useContinues is set to true). * Hiding the exitmove "powerup" outside of multiplayer. (Okay, this isn't really related, I just saw this bug in action a lot while doing test runs and got annoyed enough to fix it here.) * The ability to use V_DrawPromptBack (in hardcode only at the moment, but) to draw in terms of pixels rather than rows of text, by providing negative instead of positive inputs). * A refactoring of redundant game saves smattered across the ending, credits, and evaluation - in addition to saving the game slightly earlier. * Minor m_menu.c touchups and refactorings here and there. Built using feedback from the official server's #speedruns channel, among other places.
2020-05-14 22:10:00 +00:00
if (gamecomplete == 2) // special temporary mode to prevent using SP level select in pause menu until the intermission is over without restricting it in every intermission
gamecomplete = 1;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
HU_ClearCEcho();
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into special_save # Conflicts: # src/g_game.c
2020-06-25 09:48:36 +00:00
if ((gametyperules & GTR_CUTSCENES) && mapheaderinfo[gamemap-1]->cutscenenum && !modeattacking && skipstats <= 1 && (gamecomplete || !(marathonmode & MA_NOCUTSCENES))) // Start a custom cutscene.
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
F_StartCustomCutscene(mapheaderinfo[gamemap-1]->cutscenenum-1, false, false);
else
{
if (nextmap < 1100-1)
G_NextLevel();
else
Moved Y_EndGame from y_inter.c/h to g_game.c/h, renamed it to G_EndGame
2017-05-18 15:54:58 +00:00
G_EndGame();
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
}
//
// G_NextLevel (WorldDone)
//
// init next level or go to the final scene
// called by end of intermission screen (y_inter)
//
void G_NextLevel(void)
{
gameaction = ga_worlddone;
}
static void G_DoWorldDone(void)
{
if (server)
{
Don't reset player between maps in campaign gametypes
2020-02-23 19:40:16 +00:00
if (gametyperules & GTR_CAMPAIGN)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// don't reset player between maps
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
D_MapChange(nextmap+1, gametype, ultimatemode, false, 0, false, false);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
else
// resetplayer in match/chaos/tag/CTF/race for more equality
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
D_MapChange(nextmap+1, gametype, ultimatemode, true, 0, false, false);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
gameaction = ga_nothing;
}
//
// G_UseContinue
//
void G_UseContinue(void)
{
if (gamestate == GS_LEVEL && !netgame && !multiplayer)
{
gameaction = ga_startcont;
lastdraw = true;
}
}
static void G_DoStartContinue(void)
{
I_Assert(!netgame && !multiplayer);
G_PlayerFinishLevel(consoleplayer); // take away cards and stuff
F_StartContinue();
gameaction = ga_nothing;
}
//
// G_Continue
//
// re-init level, used by continue and possibly countdowntimeup
//
void G_Continue(void)
{
if (!netgame && !multiplayer)
gameaction = ga_continued;
}
static void G_DoContinued(void)
{
player_t *pl = &players[consoleplayer];
I_Assert(!netgame && !multiplayer);
I_Assert(pl->continues > 0);
Disable continues outside of no-save/Ultimate by default, but allow SOC to re-enable them globally. Please look at the merge request description for a full explanation, since I know the vanilla team has been hashing this out and I don't want to add fuel to the fire without at least presenting a solid case.
2020-03-26 20:16:44 +00:00
if (pl->continues)
pl->continues--;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Reset score
pl->score = 0;
// Allow tokens to come back
tokenlist = 0;
token = 0;
* New, pretty save select! Requires patch.dta to really appreciate. * Changed the save format a little more, since I had free reign over it. * Modified the string drawing functions to not awkwardly clip at the very edges of the screen, considering the relevant patch drawing functions avoid out-of-range memory writes.
2017-08-20 22:18:47 +00:00
if (!(netgame || multiplayer || demoplayback || demorecording || metalrecording || modeattacking) && (!modifiedgame || savemoddata) && cursaveslot > 0)
* Per Mystic's request, only set the number of lives in the save file if you actually use a continue, or completely wipe out your lives and continues. * Fix a bug where I got emeralds and mapnumbers mixed up when checking for the "there's a tailsbot" flag. * Consider a save with an invalid skin an invalid save, rather than allowing its continued presence.
2017-08-20 12:14:17 +00:00
G_SaveGameOver((UINT32)cursaveslot, true);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Reset # of lives
Starting lives revamp, per the 2.2 priorities topic list! * Each time you die, the number of game overs you've had is counted. * Your save file updates to record this. * The number of startinglives is determined by the number of times you'ved game-overed, with the maximum being infinity lives (thereby providing a cap on the number of game overs you can go through in a typical game). Requires a new patch.dta, but I'm not uploading that yet because not happy with the icon we've got going for infinity lives on the save select menu.
2017-08-17 23:58:16 +00:00
pl->lives = (ultimatemode) ? 1 : startinglivesbalance[numgameovers];
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
D_MapChange(gamemap, gametype, ultimatemode, false, 0, false, false);
gameaction = ga_nothing;
}
Moved Y_EndGame from y_inter.c/h to g_game.c/h, renamed it to G_EndGame
2017-05-18 15:54:58 +00:00
//
// G_EndGame (formerly Y_EndGame)
Removed all code in Y_FollowIntermission that's already handled in G_AfterIntermission Only real difference here is that CEcho messages will always be cleared when going to credits/evaluation, but that's hardly a loss tbh.
2017-05-18 16:23:19 +00:00
// Frankly this function fits better in g_game.c than it does in y_inter.c
Moved Y_EndGame from y_inter.c/h to g_game.c/h, renamed it to G_EndGame
2017-05-18 15:54:58 +00:00
//
// ...Gee, (why) end the game?
Removed all code in Y_FollowIntermission that's already handled in G_AfterIntermission Only real difference here is that CEcho messages will always be cleared when going to credits/evaluation, but that's hardly a loss tbh.
2017-05-18 16:23:19 +00:00
// Because G_AfterIntermission and F_EndCutscene would
Moved Y_EndGame from y_inter.c/h to g_game.c/h, renamed it to G_EndGame
2017-05-18 15:54:58 +00:00
// both do this exact same thing *in different ways* otherwise,
// which made it so that you could only unlock Ultimate mode
// if you had a cutscene after the final level and crap like that.
// This function simplifies it so only one place has to be updated
// when something new is added.
void G_EndGame(void)
{
// Only do evaluation and credits in coop games.
Add GTR_CUTSCENES. And I ran out of rule slots. Cool.
2019-12-28 23:33:28 +00:00
if (gametyperules & GTR_CUTSCENES)
Moved Y_EndGame from y_inter.c/h to g_game.c/h, renamed it to G_EndGame
2017-05-18 15:54:58 +00:00
{
A good and bad ending cutscene now exist. Also: * SPR2_XTRA - instead of defining lumpnames in S_SKIN, those kinds of assets can just be bundled into the spriteset. Required for ending cutscene stuff, I guess, but also done for HUD life icon and character select image (aside from Sonic&Tails, still SOC'd in). * Minor oversights in SPR2 support corrected. * Better evaluation, featuring ending assets. * Intro has warping-in blackrock, reusing ending assets. * Cutscene text now supports lowercase (intro and custom). * Disable the asset-fucking "gamma correction" I put in over two years ago when implementing colour cube. (This is the only thing I could move into another branch if you MUST, but it's basically invisble in the diff so w/e.) * Don't blank the screen if the top left pixel of a screen-covering patch is transparent. (Checked via nonzero topdelta for first column) Bugs: * OPENGL ONLY: The first ~20 frames of both endings are fucked. A little help here? Might be HWR_DrawFadeFill's fault, which I just created. OR it could be in f_finale, but I doubt it, since it doesn't appear in Software.
2019-07-27 23:32:57 +00:00
if (nextmap == 1103-1) // end game with ending
{
F_StartEnding();
return;
}
Moved Y_EndGame from y_inter.c/h to g_game.c/h, renamed it to G_EndGame
2017-05-18 15:54:58 +00:00
if (nextmap == 1102-1) // end game with credits
{
F_StartCredits();
return;
}
if (nextmap == 1101-1) // end game with evaluation
{
F_StartGameEvaluation();
return;
}
}
// 1100 or competitive multiplayer, so go back to title screen.
D_StartTitle();
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
//
// G_LoadGameSettings
//
// Sets a tad of default info we need.
void G_LoadGameSettings(void)
{
// defaults
Introducing Marathon Run. (I was going to call it Marathon Mode, but NiGHTS Mode being right next to it on the menu looked terrible.) Basically a dedicated Record Attack-like experience for speedrunning the game as a continuous chunk rather than ILs. Has several quality of life features. Benefits include: * An unambiguous real-time bar across the bottom of the screen, always displaying the current time, ticking up until you reach the ending. * Disable the console (pausing is still allowed, but the timer will still increment). * Automatically skip intermissions as if you're holding down the spin button. * Show centiseconds on HUD automatically, like record attack. * "Live Event Backups" - a category of run fit for major events like GDQ, where recovery from crashes or chokes makes for better entertainment. Essentially a modified SP savefile, down to using the same basic functions, but has its own filename and tweaked internal layout. * "spmarathon_start" MainCfg block parameter and "marathonnext" mapheader parameter, allowing for a customised flow (makes this fit for purpose for an eventual SUGOI port). * Disabling inter-level custom cutscenes by default with a menu option to toggle this (won't show up if the mod doesn't *have* any custom cutscenes), although either way ending cutscenes (vanilla or custom) remain intact since is time is called before them. * Won't show up if you have a mod that consists of only one level (determined by spmarathon_start's nextlevel; this won't trip if you manually set its marathonnext). * Unconditional gratitude on the evaluation screen, instead of a negging "Try again..." if you didn't get all the emeralds (which you may not have been aiming for). * Gorgeous new menu (no new assets required, unless you wanna give it a header later). Changes which were required for the above but affect other areas of the game include: * "useBlackRock" MainCFG block parameter, which can be used to disable the presence of the Black Rock or Egg Rock in both the Evaluation screen and the Marathon Run menu (for total conversions with different stories). * Disabling Continues in NiGHTS mode, to match the most common singleplayer experience post 2.2.4's release (is reverted if useContinues is set to true). * Hiding the exitmove "powerup" outside of multiplayer. (Okay, this isn't really related, I just saw this bug in action a lot while doing test runs and got annoyed enough to fix it here.) * The ability to use V_DrawPromptBack (in hardcode only at the moment, but) to draw in terms of pixels rather than rows of text, by providing negative instead of positive inputs). * A refactoring of redundant game saves smattered across the ending, credits, and evaluation - in addition to saving the game slightly earlier. * Minor m_menu.c touchups and refactorings here and there. Built using feedback from the official server's #speedruns channel, among other places.
2020-05-14 22:10:00 +00:00
spstage_start = spmarathon_start = 1;
Modify defaults for smpstage_start and smpstage_end to 60 and 66 respectively
2019-08-25 21:24:08 +00:00
sstage_start = 50;
sstage_end = 56; // 7 special stages in vanilla SRB2
FINAL CHANGE, I PROMISE, I THINK * MainCfg property smpstage_start - controls the special stage multiplayer games go to.
2018-06-06 15:07:14 +00:00
sstage_end++; // plus one weirdo
Modify defaults for smpstage_start and smpstage_end to 60 and 66 respectively
2019-08-25 21:24:08 +00:00
smpstage_start = 60;
smpstage_end = 66; // 7 multiplayer special stages too
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// initialize free sfx slots for skin sounds
S_InitRuntimeSounds();
}
// G_LoadGameData
// Loads the main data file, which stores information such as emblems found, etc.
void G_LoadGameData(void)
{
size_t length;
INT32 i, j;
UINT8 modded = false;
UINT8 rtemp;
//For records
UINT32 recscore;
tic_t rectime;
UINT16 recrings;
UINT8 recmares;
INT32 curmare;
// Clear things so previously read gamedata doesn't transfer
// to new gamedata
G_ClearRecords(); // main and nights records
M_ClearSecrets(); // emblems, unlocks, maps visited, etc
totalplaytime = 0; // total play time (separate from all)
if (M_CheckParm("-nodata"))
return; // Don't load.
// Allow saving of gamedata beyond this point
gamedataloaded = true;
Custom gamedata parameter
2019-10-05 20:15:36 +00:00
if (M_CheckParm("-gamedata") && M_IsNextParm())
{
strlcpy(gamedatafilename, M_GetNextParm(), sizeof gamedatafilename);
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (M_CheckParm("-resetdata"))
return; // Don't load (essentially, reset).
length = FIL_ReadFile(va(pandf, srb2home, gamedatafilename), &savebuffer);
if (!length) // Aw, no game data. Their loss!
return;
save_p = savebuffer;
// Version check
if (READUINT32(save_p) != 0xFCAFE211)
{
const char *gdfolder = "the SRB2 folder";
if (strcmp(srb2home,"."))
gdfolder = srb2home;
Z_Free(savebuffer);
save_p = NULL;
I_Error("Game data is from another version of SRB2.\nDelete %s(maybe in %s) and try again.", gamedatafilename, gdfolder);
}
totalplaytime = READUINT32(save_p);
modded = READUINT8(save_p);
// Aha! Someone's been screwing with the save file!
if ((modded && !savemoddata))
goto datacorrupt;
else if (modded != true && modded != false)
goto datacorrupt;
// TODO put another cipher on these things? meh, I don't care...
for (i = 0; i < NUMMAPS; i++)
if ((mapvisited[i] = READUINT8(save_p)) > MV_MAX)
goto datacorrupt;
// To save space, use one bit per collected/achieved/unlocked flag
for (i = 0; i < MAXEMBLEMS;)
{
rtemp = READUINT8(save_p);
for (j = 0; j < 8 && j+i < MAXEMBLEMS; ++j)
emblemlocations[j+i].collected = ((rtemp >> j) & 1);
i += j;
}
for (i = 0; i < MAXEXTRAEMBLEMS;)
{
rtemp = READUINT8(save_p);
for (j = 0; j < 8 && j+i < MAXEXTRAEMBLEMS; ++j)
extraemblems[j+i].collected = ((rtemp >> j) & 1);
i += j;
}
for (i = 0; i < MAXUNLOCKABLES;)
{
rtemp = READUINT8(save_p);
for (j = 0; j < 8 && j+i < MAXUNLOCKABLES; ++j)
unlockables[j+i].unlocked = ((rtemp >> j) & 1);
i += j;
}
for (i = 0; i < MAXCONDITIONSETS;)
{
rtemp = READUINT8(save_p);
for (j = 0; j < 8 && j+i < MAXCONDITIONSETS; ++j)
conditionSets[j+i].achieved = ((rtemp >> j) & 1);
i += j;
}
timesBeaten = READUINT32(save_p);
timesBeatenWithEmeralds = READUINT32(save_p);
timesBeatenUltimate = READUINT32(save_p);
// Main records
for (i = 0; i < NUMMAPS; ++i)
{
recscore = READUINT32(save_p);
rectime = (tic_t)READUINT32(save_p);
recrings = READUINT16(save_p);
Do a whole bunch of cleanup for mapvisited and intermission related things. * Move the visitation flags, Record Attack/NiGHTS Attack data, and emblem checking to outside of Y_StartIntermission. * Y_CleanupScreenBuffer never got called for maps which skip the intermission, leading to a small memory leak; this is now fixed by moving it to G_AfterIntermission. * Y_FollowIntermission was just G_AfterIntermission with modeattacking specific behaviour, but this is desired for all places where G_AfterIntermission is called, so just merge this into G_AfterIntermission. Notably, these changes are necessary because there are now three maps in the main SP campaign which do not end with traditional intermissions. As a result, this fixes an issue where Black Core's tracks are not available in the Sound Test (due to MV_BEATEN never being applied). Also, since I was here: Remove "gotperfect" from recorddata_t. This is a duplicate of `mapvisited[gamemap-1] & MV_PERFECT` which uses more memory. I have kept the new spacing in the gamedata for compatibility with RC1 savedatas, but moved it across to the original method everywhere else.
2019-11-21 16:10:28 +00:00
save_p++; // compat
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (recrings > 10000 || recscore > MAXSCORE)
goto datacorrupt;
if (recscore || rectime || recrings)
{
G_AllocMainRecordData((INT16)i);
mainrecords[i]->score = recscore;
mainrecords[i]->time = rectime;
mainrecords[i]->rings = recrings;
}
}
// Nights records
for (i = 0; i < NUMMAPS; ++i)
{
if ((recmares = READUINT8(save_p)) == 0)
continue;
G_AllocNightsRecordData((INT16)i);
for (curmare = 0; curmare < (recmares+1); ++curmare)
{
nightsrecords[i]->score[curmare] = READUINT32(save_p);
nightsrecords[i]->grade[curmare] = READUINT8(save_p);
nightsrecords[i]->time[curmare] = (tic_t)READUINT32(save_p);
if (nightsrecords[i]->grade[curmare] > GRADE_S)
goto datacorrupt;
}
nightsrecords[i]->nummares = recmares;
}
// done
Z_Free(savebuffer);
save_p = NULL;
// Silent update unlockables in case they're out of sync with conditions
M_SilentUpdateUnlockablesAndEmblems();
return;
// Landing point for corrupt gamedata
datacorrupt:
{
const char *gdfolder = "the SRB2 folder";
if (strcmp(srb2home,"."))
gdfolder = srb2home;
Z_Free(savebuffer);
save_p = NULL;
I_Error("Corrupt game data file.\nDelete %s(maybe in %s) and try again.", gamedatafilename, gdfolder);
}
}
// G_SaveGameData
// Saves the main data file, which stores information such as emblems found, etc.
void G_SaveGameData(void)
{
size_t length;
INT32 i, j;
UINT8 btemp;
INT32 curmare;
if (!gamedataloaded)
return; // If never loaded (-nodata), don't save
save_p = savebuffer = (UINT8 *)malloc(GAMEDATASIZE);
if (!save_p)
{
CONS_Alert(CONS_ERROR, M_GetText("No more free memory for saving game data\n"));
return;
}
if (modifiedgame && !savemoddata)
{
free(savebuffer);
save_p = savebuffer = NULL;
return;
}
// Version test
WRITEUINT32(save_p, 0xFCAFE211);
WRITEUINT32(save_p, totalplaytime);
btemp = (UINT8)(savemoddata || modifiedgame);
WRITEUINT8(save_p, btemp);
// TODO put another cipher on these things? meh, I don't care...
for (i = 0; i < NUMMAPS; i++)
Redid that ridiculous lastcoop thing as an MV_MP thing, which also means it gets properly cleared when you load mods with new save data.
2017-09-15 19:34:46 +00:00
WRITEUINT8(save_p, (mapvisited[i] & MV_MAX));
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// To save space, use one bit per collected/achieved/unlocked flag
for (i = 0; i < MAXEMBLEMS;)
{
btemp = 0;
for (j = 0; j < 8 && j+i < MAXEMBLEMS; ++j)
btemp |= (emblemlocations[j+i].collected << j);
WRITEUINT8(save_p, btemp);
i += j;
}
for (i = 0; i < MAXEXTRAEMBLEMS;)
{
btemp = 0;
for (j = 0; j < 8 && j+i < MAXEXTRAEMBLEMS; ++j)
btemp |= (extraemblems[j+i].collected << j);
WRITEUINT8(save_p, btemp);
i += j;
}
for (i = 0; i < MAXUNLOCKABLES;)
{
btemp = 0;
for (j = 0; j < 8 && j+i < MAXUNLOCKABLES; ++j)
btemp |= (unlockables[j+i].unlocked << j);
WRITEUINT8(save_p, btemp);
i += j;
}
for (i = 0; i < MAXCONDITIONSETS;)
{
btemp = 0;
for (j = 0; j < 8 && j+i < MAXCONDITIONSETS; ++j)
btemp |= (conditionSets[j+i].achieved << j);
WRITEUINT8(save_p, btemp);
i += j;
}
WRITEUINT32(save_p, timesBeaten);
WRITEUINT32(save_p, timesBeatenWithEmeralds);
WRITEUINT32(save_p, timesBeatenUltimate);
// Main records
for (i = 0; i < NUMMAPS; i++)
{
if (mainrecords[i])
{
WRITEUINT32(save_p, mainrecords[i]->score);
WRITEUINT32(save_p, mainrecords[i]->time);
WRITEUINT16(save_p, mainrecords[i]->rings);
}
else
{
WRITEUINT32(save_p, 0);
WRITEUINT32(save_p, 0);
WRITEUINT16(save_p, 0);
}
Do a whole bunch of cleanup for mapvisited and intermission related things. * Move the visitation flags, Record Attack/NiGHTS Attack data, and emblem checking to outside of Y_StartIntermission. * Y_CleanupScreenBuffer never got called for maps which skip the intermission, leading to a small memory leak; this is now fixed by moving it to G_AfterIntermission. * Y_FollowIntermission was just G_AfterIntermission with modeattacking specific behaviour, but this is desired for all places where G_AfterIntermission is called, so just merge this into G_AfterIntermission. Notably, these changes are necessary because there are now three maps in the main SP campaign which do not end with traditional intermissions. As a result, this fixes an issue where Black Core's tracks are not available in the Sound Test (due to MV_BEATEN never being applied). Also, since I was here: Remove "gotperfect" from recorddata_t. This is a duplicate of `mapvisited[gamemap-1] & MV_PERFECT` which uses more memory. I have kept the new spacing in the gamedata for compatibility with RC1 savedatas, but moved it across to the original method everywhere else.
2019-11-21 16:10:28 +00:00
WRITEUINT8(save_p, 0); // compat
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
// NiGHTS records
for (i = 0; i < NUMMAPS; i++)
{
if (!nightsrecords[i] || !nightsrecords[i]->nummares)
{
WRITEUINT8(save_p, 0);
continue;
}
WRITEUINT8(save_p, nightsrecords[i]->nummares);
for (curmare = 0; curmare < (nightsrecords[i]->nummares + 1); ++curmare)
{
WRITEUINT32(save_p, nightsrecords[i]->score[curmare]);
WRITEUINT8(save_p, nightsrecords[i]->grade[curmare]);
WRITEUINT32(save_p, nightsrecords[i]->time[curmare]);
}
}
length = save_p - savebuffer;
FIL_WriteFile(va(pandf, srb2home, gamedatafilename), savebuffer, length);
free(savebuffer);
save_p = savebuffer = NULL;
}
#define VERSIONSIZE 16
//
// G_InitFromSavegame
// Can be called by the startup code or the menu task.
//
void G_LoadGame(UINT32 slot, INT16 mapoverride)
{
size_t length;
char vcheck[VERSIONSIZE];
char savename[255];
// memset savedata to all 0, fixes calling perfectly valid saves corrupt because of bots
memset(&savedata, 0, sizeof(savedata));
#ifdef SAVEGAME_OTHERVERSIONS
//Oh christ. The force load response needs access to mapoverride too...
startonmapnum = mapoverride;
#endif
Introducing Marathon Run. (I was going to call it Marathon Mode, but NiGHTS Mode being right next to it on the menu looked terrible.) Basically a dedicated Record Attack-like experience for speedrunning the game as a continuous chunk rather than ILs. Has several quality of life features. Benefits include: * An unambiguous real-time bar across the bottom of the screen, always displaying the current time, ticking up until you reach the ending. * Disable the console (pausing is still allowed, but the timer will still increment). * Automatically skip intermissions as if you're holding down the spin button. * Show centiseconds on HUD automatically, like record attack. * "Live Event Backups" - a category of run fit for major events like GDQ, where recovery from crashes or chokes makes for better entertainment. Essentially a modified SP savefile, down to using the same basic functions, but has its own filename and tweaked internal layout. * "spmarathon_start" MainCfg block parameter and "marathonnext" mapheader parameter, allowing for a customised flow (makes this fit for purpose for an eventual SUGOI port). * Disabling inter-level custom cutscenes by default with a menu option to toggle this (won't show up if the mod doesn't *have* any custom cutscenes), although either way ending cutscenes (vanilla or custom) remain intact since is time is called before them. * Won't show up if you have a mod that consists of only one level (determined by spmarathon_start's nextlevel; this won't trip if you manually set its marathonnext). * Unconditional gratitude on the evaluation screen, instead of a negging "Try again..." if you didn't get all the emeralds (which you may not have been aiming for). * Gorgeous new menu (no new assets required, unless you wanna give it a header later). Changes which were required for the above but affect other areas of the game include: * "useBlackRock" MainCFG block parameter, which can be used to disable the presence of the Black Rock or Egg Rock in both the Evaluation screen and the Marathon Run menu (for total conversions with different stories). * Disabling Continues in NiGHTS mode, to match the most common singleplayer experience post 2.2.4's release (is reverted if useContinues is set to true). * Hiding the exitmove "powerup" outside of multiplayer. (Okay, this isn't really related, I just saw this bug in action a lot while doing test runs and got annoyed enough to fix it here.) * The ability to use V_DrawPromptBack (in hardcode only at the moment, but) to draw in terms of pixels rather than rows of text, by providing negative instead of positive inputs). * A refactoring of redundant game saves smattered across the ending, credits, and evaluation - in addition to saving the game slightly earlier. * Minor m_menu.c touchups and refactorings here and there. Built using feedback from the official server's #speedruns channel, among other places.
2020-05-14 22:10:00 +00:00
if (marathonmode)
strcpy(savename, liveeventbackup);
else
sprintf(savename, savegamename, slot);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
length = FIL_ReadFile(savename, &savebuffer);
if (!length)
{
CONS_Printf(M_GetText("Couldn't read file %s\n"), savename);
return;
}
save_p = savebuffer;
memset(vcheck, 0, sizeof (vcheck));
Introducing Marathon Run. (I was going to call it Marathon Mode, but NiGHTS Mode being right next to it on the menu looked terrible.) Basically a dedicated Record Attack-like experience for speedrunning the game as a continuous chunk rather than ILs. Has several quality of life features. Benefits include: * An unambiguous real-time bar across the bottom of the screen, always displaying the current time, ticking up until you reach the ending. * Disable the console (pausing is still allowed, but the timer will still increment). * Automatically skip intermissions as if you're holding down the spin button. * Show centiseconds on HUD automatically, like record attack. * "Live Event Backups" - a category of run fit for major events like GDQ, where recovery from crashes or chokes makes for better entertainment. Essentially a modified SP savefile, down to using the same basic functions, but has its own filename and tweaked internal layout. * "spmarathon_start" MainCfg block parameter and "marathonnext" mapheader parameter, allowing for a customised flow (makes this fit for purpose for an eventual SUGOI port). * Disabling inter-level custom cutscenes by default with a menu option to toggle this (won't show up if the mod doesn't *have* any custom cutscenes), although either way ending cutscenes (vanilla or custom) remain intact since is time is called before them. * Won't show up if you have a mod that consists of only one level (determined by spmarathon_start's nextlevel; this won't trip if you manually set its marathonnext). * Unconditional gratitude on the evaluation screen, instead of a negging "Try again..." if you didn't get all the emeralds (which you may not have been aiming for). * Gorgeous new menu (no new assets required, unless you wanna give it a header later). Changes which were required for the above but affect other areas of the game include: * "useBlackRock" MainCFG block parameter, which can be used to disable the presence of the Black Rock or Egg Rock in both the Evaluation screen and the Marathon Run menu (for total conversions with different stories). * Disabling Continues in NiGHTS mode, to match the most common singleplayer experience post 2.2.4's release (is reverted if useContinues is set to true). * Hiding the exitmove "powerup" outside of multiplayer. (Okay, this isn't really related, I just saw this bug in action a lot while doing test runs and got annoyed enough to fix it here.) * The ability to use V_DrawPromptBack (in hardcode only at the moment, but) to draw in terms of pixels rather than rows of text, by providing negative instead of positive inputs). * A refactoring of redundant game saves smattered across the ending, credits, and evaluation - in addition to saving the game slightly earlier. * Minor m_menu.c touchups and refactorings here and there. Built using feedback from the official server's #speedruns channel, among other places.
2020-05-14 22:10:00 +00:00
sprintf(vcheck, (marathonmode ? "back-up %d" : "version %d"), VERSION);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (strcmp((const char *)save_p, (const char *)vcheck))
{
#ifdef SAVEGAME_OTHERVERSIONS
M_StartMessage(M_GetText("Save game from different version.\nYou can load this savegame, but\nsaving afterwards will be disabled.\n\nDo you want to continue anyway?\n\n(Press 'Y' to confirm)\n"),
M_ForceLoadGameResponse, MM_YESNO);
//Freeing done by the callback function of the above message
#else
M_ClearMenus(true); // so ESC backs out to title
M_StartMessage(M_GetText("Save game from different version\n\nPress ESC\n"), NULL, MM_NOTHING);
Command_ExitGame_f();
Z_Free(savebuffer);
save_p = savebuffer = NULL;
// no cheating!
memset(&savedata, 0, sizeof(savedata));
#endif
return; // bad version
}
save_p += VERSIONSIZE;
// if (demoplayback) // reset game engine
// G_StopDemo();
// paused = false;
// automapactive = false;
// dearchive all the modifications
if (!P_LoadGame(mapoverride))
{
M_ClearMenus(true); // so ESC backs out to title
M_StartMessage(M_GetText("Savegame file corrupted\n\nPress ESC\n"), NULL, MM_NOTHING);
Command_ExitGame_f();
Z_Free(savebuffer);
save_p = savebuffer = NULL;
// no cheating!
memset(&savedata, 0, sizeof(savedata));
return;
}
Introducing Marathon Run. (I was going to call it Marathon Mode, but NiGHTS Mode being right next to it on the menu looked terrible.) Basically a dedicated Record Attack-like experience for speedrunning the game as a continuous chunk rather than ILs. Has several quality of life features. Benefits include: * An unambiguous real-time bar across the bottom of the screen, always displaying the current time, ticking up until you reach the ending. * Disable the console (pausing is still allowed, but the timer will still increment). * Automatically skip intermissions as if you're holding down the spin button. * Show centiseconds on HUD automatically, like record attack. * "Live Event Backups" - a category of run fit for major events like GDQ, where recovery from crashes or chokes makes for better entertainment. Essentially a modified SP savefile, down to using the same basic functions, but has its own filename and tweaked internal layout. * "spmarathon_start" MainCfg block parameter and "marathonnext" mapheader parameter, allowing for a customised flow (makes this fit for purpose for an eventual SUGOI port). * Disabling inter-level custom cutscenes by default with a menu option to toggle this (won't show up if the mod doesn't *have* any custom cutscenes), although either way ending cutscenes (vanilla or custom) remain intact since is time is called before them. * Won't show up if you have a mod that consists of only one level (determined by spmarathon_start's nextlevel; this won't trip if you manually set its marathonnext). * Unconditional gratitude on the evaluation screen, instead of a negging "Try again..." if you didn't get all the emeralds (which you may not have been aiming for). * Gorgeous new menu (no new assets required, unless you wanna give it a header later). Changes which were required for the above but affect other areas of the game include: * "useBlackRock" MainCFG block parameter, which can be used to disable the presence of the Black Rock or Egg Rock in both the Evaluation screen and the Marathon Run menu (for total conversions with different stories). * Disabling Continues in NiGHTS mode, to match the most common singleplayer experience post 2.2.4's release (is reverted if useContinues is set to true). * Hiding the exitmove "powerup" outside of multiplayer. (Okay, this isn't really related, I just saw this bug in action a lot while doing test runs and got annoyed enough to fix it here.) * The ability to use V_DrawPromptBack (in hardcode only at the moment, but) to draw in terms of pixels rather than rows of text, by providing negative instead of positive inputs). * A refactoring of redundant game saves smattered across the ending, credits, and evaluation - in addition to saving the game slightly earlier. * Minor m_menu.c touchups and refactorings here and there. Built using feedback from the official server's #speedruns channel, among other places.
2020-05-14 22:10:00 +00:00
if (marathonmode)
{
marathontime = READUINT32(save_p);
marathonmode |= READUINT8(save_p);
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// done
Z_Free(savebuffer);
save_p = savebuffer = NULL;
// gameaction = ga_nothing;
// G_SetGamestate(GS_LEVEL);
displayplayer = consoleplayer;
multiplayer = splitscreen = false;
// G_DeferedInitNew(sk_medium, G_BuildMapName(1), 0, 0, 1);
if (setsizeneeded)
R_ExecuteSetViewSize();
M_ClearMenus(true);
CON_ToggleOff();
}
//
// G_SaveGame
// Saves your game.
//
Special saves! All this refactoring, just to resolve #162. Specifically, it engages savegame events not at level load (except for savefile start) but on level completion, just after you've gotten all the intermission bonuses but before the intermission actually starts. Also fixes a never-before-discovered bug where if the titlemap has LF_SAVEGAME, your save file will be overwritten upon returning to the title screen. This game is a mess of hacks, I swear... One unintended side effect: It may actually be faster in some speedrun circumstances in mods with cutscenes to complete the map, exit back to the title screen, and reload the file. It's a common feature of optimal runs in games with cutscenes, though, and Marathon Run has a toggle for cutscenes, so I'm not particularly bothered.
2020-06-22 18:00:47 +00:00
void G_SaveGame(UINT32 slot, INT16 mapnum)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
boolean saved;
char savename[256] = "";
const char *backup;
Introducing Marathon Run. (I was going to call it Marathon Mode, but NiGHTS Mode being right next to it on the menu looked terrible.) Basically a dedicated Record Attack-like experience for speedrunning the game as a continuous chunk rather than ILs. Has several quality of life features. Benefits include: * An unambiguous real-time bar across the bottom of the screen, always displaying the current time, ticking up until you reach the ending. * Disable the console (pausing is still allowed, but the timer will still increment). * Automatically skip intermissions as if you're holding down the spin button. * Show centiseconds on HUD automatically, like record attack. * "Live Event Backups" - a category of run fit for major events like GDQ, where recovery from crashes or chokes makes for better entertainment. Essentially a modified SP savefile, down to using the same basic functions, but has its own filename and tweaked internal layout. * "spmarathon_start" MainCfg block parameter and "marathonnext" mapheader parameter, allowing for a customised flow (makes this fit for purpose for an eventual SUGOI port). * Disabling inter-level custom cutscenes by default with a menu option to toggle this (won't show up if the mod doesn't *have* any custom cutscenes), although either way ending cutscenes (vanilla or custom) remain intact since is time is called before them. * Won't show up if you have a mod that consists of only one level (determined by spmarathon_start's nextlevel; this won't trip if you manually set its marathonnext). * Unconditional gratitude on the evaluation screen, instead of a negging "Try again..." if you didn't get all the emeralds (which you may not have been aiming for). * Gorgeous new menu (no new assets required, unless you wanna give it a header later). Changes which were required for the above but affect other areas of the game include: * "useBlackRock" MainCFG block parameter, which can be used to disable the presence of the Black Rock or Egg Rock in both the Evaluation screen and the Marathon Run menu (for total conversions with different stories). * Disabling Continues in NiGHTS mode, to match the most common singleplayer experience post 2.2.4's release (is reverted if useContinues is set to true). * Hiding the exitmove "powerup" outside of multiplayer. (Okay, this isn't really related, I just saw this bug in action a lot while doing test runs and got annoyed enough to fix it here.) * The ability to use V_DrawPromptBack (in hardcode only at the moment, but) to draw in terms of pixels rather than rows of text, by providing negative instead of positive inputs). * A refactoring of redundant game saves smattered across the ending, credits, and evaluation - in addition to saving the game slightly earlier. * Minor m_menu.c touchups and refactorings here and there. Built using feedback from the official server's #speedruns channel, among other places.
2020-05-14 22:10:00 +00:00
if (marathonmode)
strcpy(savename, liveeventbackup);
else
sprintf(savename, savegamename, slot);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
backup = va("%s",savename);
gameaction = ga_nothing;
{
char name[VERSIONSIZE];
size_t length;
save_p = savebuffer = (UINT8 *)malloc(SAVEGAMESIZE);
if (!save_p)
{
CONS_Alert(CONS_ERROR, M_GetText("No more free memory for saving game data\n"));
return;
}
memset(name, 0, sizeof (name));
Introducing Marathon Run. (I was going to call it Marathon Mode, but NiGHTS Mode being right next to it on the menu looked terrible.) Basically a dedicated Record Attack-like experience for speedrunning the game as a continuous chunk rather than ILs. Has several quality of life features. Benefits include: * An unambiguous real-time bar across the bottom of the screen, always displaying the current time, ticking up until you reach the ending. * Disable the console (pausing is still allowed, but the timer will still increment). * Automatically skip intermissions as if you're holding down the spin button. * Show centiseconds on HUD automatically, like record attack. * "Live Event Backups" - a category of run fit for major events like GDQ, where recovery from crashes or chokes makes for better entertainment. Essentially a modified SP savefile, down to using the same basic functions, but has its own filename and tweaked internal layout. * "spmarathon_start" MainCfg block parameter and "marathonnext" mapheader parameter, allowing for a customised flow (makes this fit for purpose for an eventual SUGOI port). * Disabling inter-level custom cutscenes by default with a menu option to toggle this (won't show up if the mod doesn't *have* any custom cutscenes), although either way ending cutscenes (vanilla or custom) remain intact since is time is called before them. * Won't show up if you have a mod that consists of only one level (determined by spmarathon_start's nextlevel; this won't trip if you manually set its marathonnext). * Unconditional gratitude on the evaluation screen, instead of a negging "Try again..." if you didn't get all the emeralds (which you may not have been aiming for). * Gorgeous new menu (no new assets required, unless you wanna give it a header later). Changes which were required for the above but affect other areas of the game include: * "useBlackRock" MainCFG block parameter, which can be used to disable the presence of the Black Rock or Egg Rock in both the Evaluation screen and the Marathon Run menu (for total conversions with different stories). * Disabling Continues in NiGHTS mode, to match the most common singleplayer experience post 2.2.4's release (is reverted if useContinues is set to true). * Hiding the exitmove "powerup" outside of multiplayer. (Okay, this isn't really related, I just saw this bug in action a lot while doing test runs and got annoyed enough to fix it here.) * The ability to use V_DrawPromptBack (in hardcode only at the moment, but) to draw in terms of pixels rather than rows of text, by providing negative instead of positive inputs). * A refactoring of redundant game saves smattered across the ending, credits, and evaluation - in addition to saving the game slightly earlier. * Minor m_menu.c touchups and refactorings here and there. Built using feedback from the official server's #speedruns channel, among other places.
2020-05-14 22:10:00 +00:00
sprintf(name, (marathonmode ? "back-up %d" : "version %d"), VERSION);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
WRITEMEM(save_p, name, VERSIONSIZE);
Special saves! All this refactoring, just to resolve #162. Specifically, it engages savegame events not at level load (except for savefile start) but on level completion, just after you've gotten all the intermission bonuses but before the intermission actually starts. Also fixes a never-before-discovered bug where if the titlemap has LF_SAVEGAME, your save file will be overwritten upon returning to the title screen. This game is a mess of hacks, I swear... One unintended side effect: It may actually be faster in some speedrun circumstances in mods with cutscenes to complete the map, exit back to the title screen, and reload the file. It's a common feature of optimal runs in games with cutscenes, though, and Marathon Run has a toggle for cutscenes, so I'm not particularly bothered.
2020-06-22 18:00:47 +00:00
P_SaveGame(mapnum);
Introducing Marathon Run. (I was going to call it Marathon Mode, but NiGHTS Mode being right next to it on the menu looked terrible.) Basically a dedicated Record Attack-like experience for speedrunning the game as a continuous chunk rather than ILs. Has several quality of life features. Benefits include: * An unambiguous real-time bar across the bottom of the screen, always displaying the current time, ticking up until you reach the ending. * Disable the console (pausing is still allowed, but the timer will still increment). * Automatically skip intermissions as if you're holding down the spin button. * Show centiseconds on HUD automatically, like record attack. * "Live Event Backups" - a category of run fit for major events like GDQ, where recovery from crashes or chokes makes for better entertainment. Essentially a modified SP savefile, down to using the same basic functions, but has its own filename and tweaked internal layout. * "spmarathon_start" MainCfg block parameter and "marathonnext" mapheader parameter, allowing for a customised flow (makes this fit for purpose for an eventual SUGOI port). * Disabling inter-level custom cutscenes by default with a menu option to toggle this (won't show up if the mod doesn't *have* any custom cutscenes), although either way ending cutscenes (vanilla or custom) remain intact since is time is called before them. * Won't show up if you have a mod that consists of only one level (determined by spmarathon_start's nextlevel; this won't trip if you manually set its marathonnext). * Unconditional gratitude on the evaluation screen, instead of a negging "Try again..." if you didn't get all the emeralds (which you may not have been aiming for). * Gorgeous new menu (no new assets required, unless you wanna give it a header later). Changes which were required for the above but affect other areas of the game include: * "useBlackRock" MainCFG block parameter, which can be used to disable the presence of the Black Rock or Egg Rock in both the Evaluation screen and the Marathon Run menu (for total conversions with different stories). * Disabling Continues in NiGHTS mode, to match the most common singleplayer experience post 2.2.4's release (is reverted if useContinues is set to true). * Hiding the exitmove "powerup" outside of multiplayer. (Okay, this isn't really related, I just saw this bug in action a lot while doing test runs and got annoyed enough to fix it here.) * The ability to use V_DrawPromptBack (in hardcode only at the moment, but) to draw in terms of pixels rather than rows of text, by providing negative instead of positive inputs). * A refactoring of redundant game saves smattered across the ending, credits, and evaluation - in addition to saving the game slightly earlier. * Minor m_menu.c touchups and refactorings here and there. Built using feedback from the official server's #speedruns channel, among other places.
2020-05-14 22:10:00 +00:00
if (marathonmode)
{
Introduce a live event backup penalty for non MA_INGAME runs, since the change to saving time causes problems for this.
2020-07-10 20:36:37 +00:00
UINT32 writetime = marathontime;
if (!(marathonmode & MA_INGAME))
Two minor fixes for Marathon Mode. * Apply the RTA penalty to the live event backup rather than the current timer. (Resolves #184) * Snap the character name and timer mode text to the bottom of the screen, just above the bar.
2020-07-12 12:00:08 +00:00
writetime += TICRATE*5; // live event backup penalty because we don't know how long it takes to get to the next map
Introduce a live event backup penalty for non MA_INGAME runs, since the change to saving time causes problems for this.
2020-07-10 20:36:37 +00:00
WRITEUINT32(save_p, writetime);
Introducing Marathon Run. (I was going to call it Marathon Mode, but NiGHTS Mode being right next to it on the menu looked terrible.) Basically a dedicated Record Attack-like experience for speedrunning the game as a continuous chunk rather than ILs. Has several quality of life features. Benefits include: * An unambiguous real-time bar across the bottom of the screen, always displaying the current time, ticking up until you reach the ending. * Disable the console (pausing is still allowed, but the timer will still increment). * Automatically skip intermissions as if you're holding down the spin button. * Show centiseconds on HUD automatically, like record attack. * "Live Event Backups" - a category of run fit for major events like GDQ, where recovery from crashes or chokes makes for better entertainment. Essentially a modified SP savefile, down to using the same basic functions, but has its own filename and tweaked internal layout. * "spmarathon_start" MainCfg block parameter and "marathonnext" mapheader parameter, allowing for a customised flow (makes this fit for purpose for an eventual SUGOI port). * Disabling inter-level custom cutscenes by default with a menu option to toggle this (won't show up if the mod doesn't *have* any custom cutscenes), although either way ending cutscenes (vanilla or custom) remain intact since is time is called before them. * Won't show up if you have a mod that consists of only one level (determined by spmarathon_start's nextlevel; this won't trip if you manually set its marathonnext). * Unconditional gratitude on the evaluation screen, instead of a negging "Try again..." if you didn't get all the emeralds (which you may not have been aiming for). * Gorgeous new menu (no new assets required, unless you wanna give it a header later). Changes which were required for the above but affect other areas of the game include: * "useBlackRock" MainCFG block parameter, which can be used to disable the presence of the Black Rock or Egg Rock in both the Evaluation screen and the Marathon Run menu (for total conversions with different stories). * Disabling Continues in NiGHTS mode, to match the most common singleplayer experience post 2.2.4's release (is reverted if useContinues is set to true). * Hiding the exitmove "powerup" outside of multiplayer. (Okay, this isn't really related, I just saw this bug in action a lot while doing test runs and got annoyed enough to fix it here.) * The ability to use V_DrawPromptBack (in hardcode only at the moment, but) to draw in terms of pixels rather than rows of text, by providing negative instead of positive inputs). * A refactoring of redundant game saves smattered across the ending, credits, and evaluation - in addition to saving the game slightly earlier. * Minor m_menu.c touchups and refactorings here and there. Built using feedback from the official server's #speedruns channel, among other places.
2020-05-14 22:10:00 +00:00
WRITEUINT8(save_p, (marathonmode & ~MA_INIT));
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
length = save_p - savebuffer;
saved = FIL_WriteFile(backup, savebuffer, length);
free(savebuffer);
save_p = savebuffer = NULL;
}
gameaction = ga_nothing;
if (cv_debug && saved)
CONS_Printf(M_GetText("Game saved.\n"));
else if (!saved)
Introducing Marathon Run. (I was going to call it Marathon Mode, but NiGHTS Mode being right next to it on the menu looked terrible.) Basically a dedicated Record Attack-like experience for speedrunning the game as a continuous chunk rather than ILs. Has several quality of life features. Benefits include: * An unambiguous real-time bar across the bottom of the screen, always displaying the current time, ticking up until you reach the ending. * Disable the console (pausing is still allowed, but the timer will still increment). * Automatically skip intermissions as if you're holding down the spin button. * Show centiseconds on HUD automatically, like record attack. * "Live Event Backups" - a category of run fit for major events like GDQ, where recovery from crashes or chokes makes for better entertainment. Essentially a modified SP savefile, down to using the same basic functions, but has its own filename and tweaked internal layout. * "spmarathon_start" MainCfg block parameter and "marathonnext" mapheader parameter, allowing for a customised flow (makes this fit for purpose for an eventual SUGOI port). * Disabling inter-level custom cutscenes by default with a menu option to toggle this (won't show up if the mod doesn't *have* any custom cutscenes), although either way ending cutscenes (vanilla or custom) remain intact since is time is called before them. * Won't show up if you have a mod that consists of only one level (determined by spmarathon_start's nextlevel; this won't trip if you manually set its marathonnext). * Unconditional gratitude on the evaluation screen, instead of a negging "Try again..." if you didn't get all the emeralds (which you may not have been aiming for). * Gorgeous new menu (no new assets required, unless you wanna give it a header later). Changes which were required for the above but affect other areas of the game include: * "useBlackRock" MainCFG block parameter, which can be used to disable the presence of the Black Rock or Egg Rock in both the Evaluation screen and the Marathon Run menu (for total conversions with different stories). * Disabling Continues in NiGHTS mode, to match the most common singleplayer experience post 2.2.4's release (is reverted if useContinues is set to true). * Hiding the exitmove "powerup" outside of multiplayer. (Okay, this isn't really related, I just saw this bug in action a lot while doing test runs and got annoyed enough to fix it here.) * The ability to use V_DrawPromptBack (in hardcode only at the moment, but) to draw in terms of pixels rather than rows of text, by providing negative instead of positive inputs). * A refactoring of redundant game saves smattered across the ending, credits, and evaluation - in addition to saving the game slightly earlier. * Minor m_menu.c touchups and refactorings here and there. Built using feedback from the official server's #speedruns channel, among other places.
2020-05-14 22:10:00 +00:00
CONS_Alert(CONS_ERROR, M_GetText("Error while writing to %s for save slot %u, base: %s\n"), backup, slot, (marathonmode ? liveeventbackup : savegamename));
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
Starting lives revamp, per the 2.2 priorities topic list! * Each time you die, the number of game overs you've had is counted. * Your save file updates to record this. * The number of startinglives is determined by the number of times you'ved game-overed, with the maximum being infinity lives (thereby providing a cap on the number of game overs you can go through in a typical game). Requires a new patch.dta, but I'm not uploading that yet because not happy with the icon we've got going for infinity lives on the save select menu.
2017-08-17 23:58:16 +00:00
#define BADSAVE goto cleanup;
#define CHECKPOS if (save_p >= end_p) BADSAVE
* Per Mystic's request, only set the number of lives in the save file if you actually use a continue, or completely wipe out your lives and continues. * Fix a bug where I got emeralds and mapnumbers mixed up when checking for the "there's a tailsbot" flag. * Consider a save with an invalid skin an invalid save, rather than allowing its continued presence.
2017-08-20 12:14:17 +00:00
void G_SaveGameOver(UINT32 slot, boolean modifylives)
Starting lives revamp, per the 2.2 priorities topic list! * Each time you die, the number of game overs you've had is counted. * Your save file updates to record this. * The number of startinglives is determined by the number of times you'ved game-overed, with the maximum being infinity lives (thereby providing a cap on the number of game overs you can go through in a typical game). Requires a new patch.dta, but I'm not uploading that yet because not happy with the icon we've got going for infinity lives on the save select menu.
2017-08-17 23:58:16 +00:00
{
boolean saved = false;
size_t length;
char vcheck[VERSIONSIZE];
char savename[255];
const char *backup;
Introducing Marathon Run. (I was going to call it Marathon Mode, but NiGHTS Mode being right next to it on the menu looked terrible.) Basically a dedicated Record Attack-like experience for speedrunning the game as a continuous chunk rather than ILs. Has several quality of life features. Benefits include: * An unambiguous real-time bar across the bottom of the screen, always displaying the current time, ticking up until you reach the ending. * Disable the console (pausing is still allowed, but the timer will still increment). * Automatically skip intermissions as if you're holding down the spin button. * Show centiseconds on HUD automatically, like record attack. * "Live Event Backups" - a category of run fit for major events like GDQ, where recovery from crashes or chokes makes for better entertainment. Essentially a modified SP savefile, down to using the same basic functions, but has its own filename and tweaked internal layout. * "spmarathon_start" MainCfg block parameter and "marathonnext" mapheader parameter, allowing for a customised flow (makes this fit for purpose for an eventual SUGOI port). * Disabling inter-level custom cutscenes by default with a menu option to toggle this (won't show up if the mod doesn't *have* any custom cutscenes), although either way ending cutscenes (vanilla or custom) remain intact since is time is called before them. * Won't show up if you have a mod that consists of only one level (determined by spmarathon_start's nextlevel; this won't trip if you manually set its marathonnext). * Unconditional gratitude on the evaluation screen, instead of a negging "Try again..." if you didn't get all the emeralds (which you may not have been aiming for). * Gorgeous new menu (no new assets required, unless you wanna give it a header later). Changes which were required for the above but affect other areas of the game include: * "useBlackRock" MainCFG block parameter, which can be used to disable the presence of the Black Rock or Egg Rock in both the Evaluation screen and the Marathon Run menu (for total conversions with different stories). * Disabling Continues in NiGHTS mode, to match the most common singleplayer experience post 2.2.4's release (is reverted if useContinues is set to true). * Hiding the exitmove "powerup" outside of multiplayer. (Okay, this isn't really related, I just saw this bug in action a lot while doing test runs and got annoyed enough to fix it here.) * The ability to use V_DrawPromptBack (in hardcode only at the moment, but) to draw in terms of pixels rather than rows of text, by providing negative instead of positive inputs). * A refactoring of redundant game saves smattered across the ending, credits, and evaluation - in addition to saving the game slightly earlier. * Minor m_menu.c touchups and refactorings here and there. Built using feedback from the official server's #speedruns channel, among other places.
2020-05-14 22:10:00 +00:00
if (marathonmode)
strcpy(savename, liveeventbackup);
else
sprintf(savename, savegamename, slot);
Starting lives revamp, per the 2.2 priorities topic list! * Each time you die, the number of game overs you've had is counted. * Your save file updates to record this. * The number of startinglives is determined by the number of times you'ved game-overed, with the maximum being infinity lives (thereby providing a cap on the number of game overs you can go through in a typical game). Requires a new patch.dta, but I'm not uploading that yet because not happy with the icon we've got going for infinity lives on the save select menu.
2017-08-17 23:58:16 +00:00
backup = va("%s",savename);
length = FIL_ReadFile(savename, &savebuffer);
if (!length)
{
CONS_Printf(M_GetText("Couldn't read file %s\n"), savename);
return;
}
{
char temp[sizeof(timeattackfolder)];
UINT8 *end_p = savebuffer + length;
UINT8 *lives_p;
SINT8 pllives;
save_p = savebuffer;
// Version check
memset(vcheck, 0, sizeof (vcheck));
Introducing Marathon Run. (I was going to call it Marathon Mode, but NiGHTS Mode being right next to it on the menu looked terrible.) Basically a dedicated Record Attack-like experience for speedrunning the game as a continuous chunk rather than ILs. Has several quality of life features. Benefits include: * An unambiguous real-time bar across the bottom of the screen, always displaying the current time, ticking up until you reach the ending. * Disable the console (pausing is still allowed, but the timer will still increment). * Automatically skip intermissions as if you're holding down the spin button. * Show centiseconds on HUD automatically, like record attack. * "Live Event Backups" - a category of run fit for major events like GDQ, where recovery from crashes or chokes makes for better entertainment. Essentially a modified SP savefile, down to using the same basic functions, but has its own filename and tweaked internal layout. * "spmarathon_start" MainCfg block parameter and "marathonnext" mapheader parameter, allowing for a customised flow (makes this fit for purpose for an eventual SUGOI port). * Disabling inter-level custom cutscenes by default with a menu option to toggle this (won't show up if the mod doesn't *have* any custom cutscenes), although either way ending cutscenes (vanilla or custom) remain intact since is time is called before them. * Won't show up if you have a mod that consists of only one level (determined by spmarathon_start's nextlevel; this won't trip if you manually set its marathonnext). * Unconditional gratitude on the evaluation screen, instead of a negging "Try again..." if you didn't get all the emeralds (which you may not have been aiming for). * Gorgeous new menu (no new assets required, unless you wanna give it a header later). Changes which were required for the above but affect other areas of the game include: * "useBlackRock" MainCFG block parameter, which can be used to disable the presence of the Black Rock or Egg Rock in both the Evaluation screen and the Marathon Run menu (for total conversions with different stories). * Disabling Continues in NiGHTS mode, to match the most common singleplayer experience post 2.2.4's release (is reverted if useContinues is set to true). * Hiding the exitmove "powerup" outside of multiplayer. (Okay, this isn't really related, I just saw this bug in action a lot while doing test runs and got annoyed enough to fix it here.) * The ability to use V_DrawPromptBack (in hardcode only at the moment, but) to draw in terms of pixels rather than rows of text, by providing negative instead of positive inputs). * A refactoring of redundant game saves smattered across the ending, credits, and evaluation - in addition to saving the game slightly earlier. * Minor m_menu.c touchups and refactorings here and there. Built using feedback from the official server's #speedruns channel, among other places.
2020-05-14 22:10:00 +00:00
sprintf(vcheck, (marathonmode ? "back-up %d" : "version %d"), VERSION);
* New, pretty save select! Requires patch.dta to really appreciate. * Changed the save format a little more, since I had free reign over it. * Modified the string drawing functions to not awkwardly clip at the very edges of the screen, considering the relevant patch drawing functions avoid out-of-range memory writes.
2017-08-20 22:18:47 +00:00
if (strcmp((const char *)save_p, (const char *)vcheck)) BADSAVE
Starting lives revamp, per the 2.2 priorities topic list! * Each time you die, the number of game overs you've had is counted. * Your save file updates to record this. * The number of startinglives is determined by the number of times you'ved game-overed, with the maximum being infinity lives (thereby providing a cap on the number of game overs you can go through in a typical game). Requires a new patch.dta, but I'm not uploading that yet because not happy with the icon we've got going for infinity lives on the save select menu.
2017-08-17 23:58:16 +00:00
save_p += VERSIONSIZE;
// P_UnArchiveMisc()
* Per Mystic's request, only set the number of lives in the save file if you actually use a continue, or completely wipe out your lives and continues. * Fix a bug where I got emeralds and mapnumbers mixed up when checking for the "there's a tailsbot" flag. * Consider a save with an invalid skin an invalid save, rather than allowing its continued presence.
2017-08-20 12:14:17 +00:00
(void)READINT16(save_p);
Starting lives revamp, per the 2.2 priorities topic list! * Each time you die, the number of game overs you've had is counted. * Your save file updates to record this. * The number of startinglives is determined by the number of times you'ved game-overed, with the maximum being infinity lives (thereby providing a cap on the number of game overs you can go through in a typical game). Requires a new patch.dta, but I'm not uploading that yet because not happy with the icon we've got going for infinity lives on the save select menu.
2017-08-17 23:58:16 +00:00
CHECKPOS
* New, pretty save select! Requires patch.dta to really appreciate. * Changed the save format a little more, since I had free reign over it. * Modified the string drawing functions to not awkwardly clip at the very edges of the screen, considering the relevant patch drawing functions avoid out-of-range memory writes.
2017-08-20 22:18:47 +00:00
(void)READUINT16(save_p); // emeralds
Starting lives revamp, per the 2.2 priorities topic list! * Each time you die, the number of game overs you've had is counted. * Your save file updates to record this. * The number of startinglives is determined by the number of times you'ved game-overed, with the maximum being infinity lives (thereby providing a cap on the number of game overs you can go through in a typical game). Requires a new patch.dta, but I'm not uploading that yet because not happy with the icon we've got going for infinity lives on the save select menu.
2017-08-17 23:58:16 +00:00
CHECKPOS
READSTRINGN(save_p, temp, sizeof(temp)); // mod it belongs to
if (strcmp(temp, timeattackfolder)) BADSAVE
* Per Mystic's request, only set the number of lives in the save file if you actually use a continue, or completely wipe out your lives and continues. * Fix a bug where I got emeralds and mapnumbers mixed up when checking for the "there's a tailsbot" flag. * Consider a save with an invalid skin an invalid save, rather than allowing its continued presence.
2017-08-20 12:14:17 +00:00
// P_UnArchivePlayer()
Starting lives revamp, per the 2.2 priorities topic list! * Each time you die, the number of game overs you've had is counted. * Your save file updates to record this. * The number of startinglives is determined by the number of times you'ved game-overed, with the maximum being infinity lives (thereby providing a cap on the number of game overs you can go through in a typical game). Requires a new patch.dta, but I'm not uploading that yet because not happy with the icon we've got going for infinity lives on the save select menu.
2017-08-17 23:58:16 +00:00
CHECKPOS
* New, pretty save select! Requires patch.dta to really appreciate. * Changed the save format a little more, since I had free reign over it. * Modified the string drawing functions to not awkwardly clip at the very edges of the screen, considering the relevant patch drawing functions avoid out-of-range memory writes.
2017-08-20 22:18:47 +00:00
(void)READUINT16(save_p);
Starting lives revamp, per the 2.2 priorities topic list! * Each time you die, the number of game overs you've had is counted. * Your save file updates to record this. * The number of startinglives is determined by the number of times you'ved game-overed, with the maximum being infinity lives (thereby providing a cap on the number of game overs you can go through in a typical game). Requires a new patch.dta, but I'm not uploading that yet because not happy with the icon we've got going for infinity lives on the save select menu.
2017-08-17 23:58:16 +00:00
CHECKPOS
WRITEUINT8(save_p, numgameovers);
CHECKPOS
lives_p = save_p;
pllives = READSINT8(save_p); // lives
CHECKPOS
* Per Mystic's request, only set the number of lives in the save file if you actually use a continue, or completely wipe out your lives and continues. * Fix a bug where I got emeralds and mapnumbers mixed up when checking for the "there's a tailsbot" flag. * Consider a save with an invalid skin an invalid save, rather than allowing its continued presence.
2017-08-20 12:14:17 +00:00
if (modifylives && pllives < startinglivesbalance[numgameovers])
Starting lives revamp, per the 2.2 priorities topic list! * Each time you die, the number of game overs you've had is counted. * Your save file updates to record this. * The number of startinglives is determined by the number of times you'ved game-overed, with the maximum being infinity lives (thereby providing a cap on the number of game overs you can go through in a typical game). Requires a new patch.dta, but I'm not uploading that yet because not happy with the icon we've got going for infinity lives on the save select menu.
2017-08-17 23:58:16 +00:00
{
pllives = startinglivesbalance[numgameovers];
WRITESINT8(lives_p, pllives);
}
(void)READINT32(save_p); // Score
CHECKPOS
(void)READINT32(save_p); // continues
// File end marker check
CHECKPOS
Lua save-banks! * Array of 8 INT32's natively embedded into savedata (net and SP)! * Initialised to zero whenever a new save (or equivalent) is started, otherwise untouched by the base game. * Requires reservation to avoid clobber-conflicts. * Access via `reserveLuabanks()` - returns a read-write userdata. * Assign userdata to local variable or global rawset to use later. Mostly for future SUGOIlikes, but I'm sure someone could figure out an unrelated usage eventually.
2019-08-24 17:25:27 +00:00
switch (READUINT8(save_p))
{
case 0xb7:
{
UINT8 i, banksinuse;
CHECKPOS
banksinuse = READUINT8(save_p);
CHECKPOS
if (banksinuse > NUM_LUABANKS)
BADSAVE
for (i = 0; i < banksinuse; i++)
{
(void)READINT32(save_p);
CHECKPOS
}
if (READUINT8(save_p) != 0x1d)
BADSAVE
}
case 0x1d:
break;
default:
BADSAVE
}
Starting lives revamp, per the 2.2 priorities topic list! * Each time you die, the number of game overs you've had is counted. * Your save file updates to record this. * The number of startinglives is determined by the number of times you'ved game-overed, with the maximum being infinity lives (thereby providing a cap on the number of game overs you can go through in a typical game). Requires a new patch.dta, but I'm not uploading that yet because not happy with the icon we've got going for infinity lives on the save select menu.
2017-08-17 23:58:16 +00:00
// done
saved = FIL_WriteFile(backup, savebuffer, length);
}
cleanup:
if (cv_debug && saved)
CONS_Printf(M_GetText("Game saved.\n"));
else if (!saved)
Introducing Marathon Run. (I was going to call it Marathon Mode, but NiGHTS Mode being right next to it on the menu looked terrible.) Basically a dedicated Record Attack-like experience for speedrunning the game as a continuous chunk rather than ILs. Has several quality of life features. Benefits include: * An unambiguous real-time bar across the bottom of the screen, always displaying the current time, ticking up until you reach the ending. * Disable the console (pausing is still allowed, but the timer will still increment). * Automatically skip intermissions as if you're holding down the spin button. * Show centiseconds on HUD automatically, like record attack. * "Live Event Backups" - a category of run fit for major events like GDQ, where recovery from crashes or chokes makes for better entertainment. Essentially a modified SP savefile, down to using the same basic functions, but has its own filename and tweaked internal layout. * "spmarathon_start" MainCfg block parameter and "marathonnext" mapheader parameter, allowing for a customised flow (makes this fit for purpose for an eventual SUGOI port). * Disabling inter-level custom cutscenes by default with a menu option to toggle this (won't show up if the mod doesn't *have* any custom cutscenes), although either way ending cutscenes (vanilla or custom) remain intact since is time is called before them. * Won't show up if you have a mod that consists of only one level (determined by spmarathon_start's nextlevel; this won't trip if you manually set its marathonnext). * Unconditional gratitude on the evaluation screen, instead of a negging "Try again..." if you didn't get all the emeralds (which you may not have been aiming for). * Gorgeous new menu (no new assets required, unless you wanna give it a header later). Changes which were required for the above but affect other areas of the game include: * "useBlackRock" MainCFG block parameter, which can be used to disable the presence of the Black Rock or Egg Rock in both the Evaluation screen and the Marathon Run menu (for total conversions with different stories). * Disabling Continues in NiGHTS mode, to match the most common singleplayer experience post 2.2.4's release (is reverted if useContinues is set to true). * Hiding the exitmove "powerup" outside of multiplayer. (Okay, this isn't really related, I just saw this bug in action a lot while doing test runs and got annoyed enough to fix it here.) * The ability to use V_DrawPromptBack (in hardcode only at the moment, but) to draw in terms of pixels rather than rows of text, by providing negative instead of positive inputs). * A refactoring of redundant game saves smattered across the ending, credits, and evaluation - in addition to saving the game slightly earlier. * Minor m_menu.c touchups and refactorings here and there. Built using feedback from the official server's #speedruns channel, among other places.
2020-05-14 22:10:00 +00:00
CONS_Alert(CONS_ERROR, M_GetText("Error while writing to %s for save slot %u, base: %s\n"), backup, slot, (marathonmode ? liveeventbackup : savegamename));
Starting lives revamp, per the 2.2 priorities topic list! * Each time you die, the number of game overs you've had is counted. * Your save file updates to record this. * The number of startinglives is determined by the number of times you'ved game-overed, with the maximum being infinity lives (thereby providing a cap on the number of game overs you can go through in a typical game). Requires a new patch.dta, but I'm not uploading that yet because not happy with the icon we've got going for infinity lives on the save select menu.
2017-08-17 23:58:16 +00:00
Z_Free(savebuffer);
save_p = savebuffer = NULL;
}
#undef CHECKPOS
#undef BADSAVE
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
//
// G_DeferedInitNew
// Can be called by the startup code or the menu task,
// consoleplayer, displayplayer, playeringame[] should be set.
//
void G_DeferedInitNew(boolean pultmode, const char *mapname, INT32 pickedchar, boolean SSSG, boolean FLS)
{
Make colors UINT16, increase color freeslots to 1024
2020-05-24 00:29:07 +00:00
UINT16 color = skins[pickedchar].prefcolor;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
paused = false;
if (demoplayback)
COM_BufAddText("stopdemo\n");
Create G_FreeGhosts, for the benefit of G_DeferedInitNew (assuming it actually needs to do `ghosts = NULL;` at all)
2020-03-19 20:42:51 +00:00
G_FreeGhosts(); // TODO: do we actually need to do this?
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// this leave the actual game if needed
SV_StartSinglePlayerServer();
if (savedata.lives > 0)
{
* New, pretty save select! Requires patch.dta to really appreciate. * Changed the save format a little more, since I had free reign over it. * Modified the string drawing functions to not awkwardly clip at the very edges of the screen, considering the relevant patch drawing functions avoid out-of-range memory writes.
2017-08-20 22:18:47 +00:00
if ((botingame = ((botskin = savedata.botskin) != 0)))
botcolor = skins[botskin-1].prefcolor;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
else if (splitscreen != SSSG)
{
splitscreen = SSSG;
SplitScreen_OnChange();
}
* New, pretty save select! Requires patch.dta to really appreciate. * Changed the save format a little more, since I had free reign over it. * Modified the string drawing functions to not awkwardly clip at the very edges of the screen, considering the relevant patch drawing functions avoid out-of-range memory writes.
2017-08-20 22:18:47 +00:00
color = skins[pickedchar].prefcolor;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
SetPlayerSkinByNum(consoleplayer, pickedchar);
CV_StealthSet(&cv_skin, skins[pickedchar].name);
CV_StealthSetValue(&cv_playercolor, color);
if (mapname)
D_MapChange(M_MapNumber(mapname[3], mapname[4]), gametype, pultmode, true, 1, false, FLS);
}
//
// This is the map command interpretation something like Command_Map_f
//
// called at: map cmd execution, doloadgame, doplaydemo
After discussion with Mystic and Rob, you now keep your lives, score and emerald count when changing maps in Co-op mode. Reset when you declare -force.
2017-02-01 21:31:35 +00:00
void G_InitNew(UINT8 pultmode, const char *mapname, boolean resetplayer, boolean skipprecutscene, boolean FLS)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
INT32 i;
Fix screen buffer not being cleared if a map command is used during the intermission.
2019-11-29 15:25:55 +00:00
Y_CleanupScreenBuffer();
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (paused)
{
paused = false;
The concept of "music slots" doesn't exist anymore. Use whatever names you want for your music. So long as you prefix the lumps with O_ or D_, it doesn't matter anymore. DISCLAIMER: Linedef type 413 (change music) and Lua scripting is not tested. (cherry picked from commit 025ca413a2a01a8ec7c104748c2f510e350aa457) # Conflicts: # src/p_user.c
2016-01-08 03:48:20 +00:00
S_ResumeAudio();
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
if (netgame || multiplayer) // Nice try, haxor.
Secret stuff. (I intend to keep candid discussion of this outside of any commits; you'll see me write up a comment describing what's going on here soon.)
2019-11-01 15:48:50 +00:00
pultmode = false;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (!demoplayback && !netgame) // Netgame sets random seed elsewhere, demo playback sets seed just before us!
P_SetRandSeed(M_RandomizedSeed()); // Use a more "Random" random seed
if (resetplayer)
{
// Clear a bunch of variables
Starting lives revamp, per the 2.2 priorities topic list! * Each time you die, the number of game overs you've had is counted. * Your save file updates to record this. * The number of startinglives is determined by the number of times you'ved game-overed, with the maximum being infinity lives (thereby providing a cap on the number of game overs you can go through in a typical game). Requires a new patch.dta, but I'm not uploading that yet because not happy with the icon we've got going for infinity lives on the save select menu.
2017-08-17 23:58:16 +00:00
numgameovers = tokenlist = token = sstimer = redscore = bluescore = lastmap = 0;
musicplus-feature-endoflevel 2.2 -> 2.1 backport
2018-09-18 19:50:12 +00:00
countdown = countdown2 = exitfadestarted = 0;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
for (i = 0; i < MAXPLAYERS; i++)
{
players[i].playerstate = PST_REBORN;
* Store gravflip (resolves #206) and destscale in starposts. (Using the same field, taking advantage of the fact that object scale will always be positive!) * Update the function signature of P_MixUp to accomodate both it and drawangle instead of doing it outside of the function. * If the player is spawning from the start of the stage and it's from the ceiling, be in fall frames as requested (resolves #191).
2019-09-07 21:11:33 +00:00
players[i].starpostscale = players[i].starpostangle = players[i].starpostnum = players[i].starposttime = 0;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
players[i].starpostx = players[i].starposty = players[i].starpostz = 0;
if (netgame || multiplayer)
{
Fix a few things noted during a test netgame with Salt and FuriousFox. * Hide the individual lives on the tab menu whenever they're irrelevant. * Make co-op spectators appear on the tab menu. * Hide one frame of spectatorhood stuff in splitscreen. * Fix joining netgames whilst in a special stage not giving the startinglives. * Make monitors that don't appear to do anything play the failure sound. * Only make players flash if they're REspawning, rather than spawning into a fresh level - unless it's a NiGHTS level, in which case never.
2017-07-07 12:35:48 +00:00
if (!FLS || (players[i].lives < 1))
After discussion with Mystic and Rob, you now keep your lives, score and emerald count when changing maps in Co-op mode. Reset when you declare -force.
2017-02-01 21:31:35 +00:00
players[i].lives = cv_startinglives.value;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
players[i].continues = 0;
}
else
{
Starting lives revamp, per the 2.2 priorities topic list! * Each time you die, the number of game overs you've had is counted. * Your save file updates to record this. * The number of startinglives is determined by the number of times you'ved game-overed, with the maximum being infinity lives (thereby providing a cap on the number of game overs you can go through in a typical game). Requires a new patch.dta, but I'm not uploading that yet because not happy with the icon we've got going for infinity lives on the save select menu.
2017-08-17 23:58:16 +00:00
players[i].lives = (pultmode) ? 1 : startinglivesbalance[0];
players[i].continues = (pultmode) ? 0 : 1;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
After discussion with Mystic and Rob, you now keep your lives, score and emerald count when changing maps in Co-op mode. Reset when you declare -force.
2017-02-01 21:31:35 +00:00
if (!((netgame || multiplayer) && (FLS)))
players[i].score = 0;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// The latter two should clear by themselves, but just in case
* cv_directionchar and cv_autobrake, and their secondplayer versions (both on by default) now exist. * cv_useranalog is now hidden from the menu. * Directionchar now attempts to face the camera direction when you're standing still, and handles a few other states with more decorum. * Tailsbot is now slightly more capable of keeping up with Sonic. * pflags rearranged/adjusted, combining a few non-simulstaneous ones and turning PF_NIGHTSFALL into CR_NIGHTSFALL. * [unrelated to branch] all ground-impact based abilities now happen more consistently with quicksand.
2017-09-15 19:34:46 +00:00
players[i].pflags &= ~(PF_TAGIT|PF_GAMETYPEOVER|PF_FULLSTASIS);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Clear cheatcodes too, just in case.
players[i].pflags &= ~(PF_GODMODE|PF_NOCLIP|PF_INVIS);
After discussion with Mystic and Rob, you now keep your lives, score and emerald count when changing maps in Co-op mode. Reset when you declare -force.
2017-02-01 21:31:35 +00:00
players[i].xtralife = 0;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
// Reset unlockable triggers
unlocktriggers = 0;
// clear itemfinder, just in case
Fixed various issues: added some free()s, lua_optboolean, other things, and also made sure chat can't send empty messages.
2018-12-22 11:34:17 +00:00
if (!dedicated) // except in dedicated servers, where it is not registered and can actually I_Error debug builds
Don't use CV_StealthSetValue on cv_itemfinder if running the game in dedicated mode
2018-04-15 18:59:57 +00:00
CV_StealthSetValue(&cv_itemfinder, 0);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
// internal game map
// well this check is useless because it is done before (d_netcmd.c::command_map_f)
// but in case of for demos....
if (W_CheckNumForName(mapname) == LUMPERROR)
{
I_Error("Internal game map '%s' not found\n", mapname);
Command_ExitGame_f();
return;
}
gamemap = (INT16)M_MapNumber(mapname[3], mapname[4]); // get xx out of MAPxx
// gamemap changed; we assume that its map header is always valid,
// so make it so
if(!mapheaderinfo[gamemap-1])
P_AllocMapHeader(gamemap-1);
maptol = mapheaderinfo[gamemap-1]->typeoflevel;
globalweather = mapheaderinfo[gamemap-1]->weather;
// Don't carry over custom music change to another map.
The concept of "music slots" doesn't exist anymore. Use whatever names you want for your music. So long as you prefix the lumps with O_ or D_, it doesn't matter anymore. DISCLAIMER: Linedef type 413 (change music) and Lua scripting is not tested. (cherry picked from commit 025ca413a2a01a8ec7c104748c2f510e350aa457) # Conflicts: # src/p_user.c
2016-01-08 03:48:20 +00:00
mapmusflags |= MUSIC_RELOADRESET;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
ultimatemode = pultmode;
automapactive = false;
imcontinuing = false;
Introducing Marathon Run. (I was going to call it Marathon Mode, but NiGHTS Mode being right next to it on the menu looked terrible.) Basically a dedicated Record Attack-like experience for speedrunning the game as a continuous chunk rather than ILs. Has several quality of life features. Benefits include: * An unambiguous real-time bar across the bottom of the screen, always displaying the current time, ticking up until you reach the ending. * Disable the console (pausing is still allowed, but the timer will still increment). * Automatically skip intermissions as if you're holding down the spin button. * Show centiseconds on HUD automatically, like record attack. * "Live Event Backups" - a category of run fit for major events like GDQ, where recovery from crashes or chokes makes for better entertainment. Essentially a modified SP savefile, down to using the same basic functions, but has its own filename and tweaked internal layout. * "spmarathon_start" MainCfg block parameter and "marathonnext" mapheader parameter, allowing for a customised flow (makes this fit for purpose for an eventual SUGOI port). * Disabling inter-level custom cutscenes by default with a menu option to toggle this (won't show up if the mod doesn't *have* any custom cutscenes), although either way ending cutscenes (vanilla or custom) remain intact since is time is called before them. * Won't show up if you have a mod that consists of only one level (determined by spmarathon_start's nextlevel; this won't trip if you manually set its marathonnext). * Unconditional gratitude on the evaluation screen, instead of a negging "Try again..." if you didn't get all the emeralds (which you may not have been aiming for). * Gorgeous new menu (no new assets required, unless you wanna give it a header later). Changes which were required for the above but affect other areas of the game include: * "useBlackRock" MainCFG block parameter, which can be used to disable the presence of the Black Rock or Egg Rock in both the Evaluation screen and the Marathon Run menu (for total conversions with different stories). * Disabling Continues in NiGHTS mode, to match the most common singleplayer experience post 2.2.4's release (is reverted if useContinues is set to true). * Hiding the exitmove "powerup" outside of multiplayer. (Okay, this isn't really related, I just saw this bug in action a lot while doing test runs and got annoyed enough to fix it here.) * The ability to use V_DrawPromptBack (in hardcode only at the moment, but) to draw in terms of pixels rather than rows of text, by providing negative instead of positive inputs). * A refactoring of redundant game saves smattered across the ending, credits, and evaluation - in addition to saving the game slightly earlier. * Minor m_menu.c touchups and refactorings here and there. Built using feedback from the official server's #speedruns channel, among other places.
2020-05-14 22:10:00 +00:00
if ((gametyperules & GTR_CUTSCENES) && !skipprecutscene && mapheaderinfo[gamemap-1]->precutscenenum && !modeattacking && !(marathonmode & MA_NOCUTSCENES)) // Start a custom cutscene.
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
F_StartCustomCutscene(mapheaderinfo[gamemap-1]->precutscenenum-1, true, resetplayer);
else
G_DoLoadLevel(resetplayer);
if (netgame)
{
char *title = G_BuildMapTitle(gamemap);
CONS_Printf(M_GetText("Map is now \"%s"), G_BuildMapName(gamemap));
if (title)
{
CONS_Printf(": %s", title);
Z_Free(title);
}
CONS_Printf("\"\n");
}
}
char *G_BuildMapTitle(INT32 mapnum)
{
char *title = NULL;
Fix crash on loading level without a header.
2017-04-21 22:37:14 +00:00
if (!mapheaderinfo[mapnum-1])
P_AllocMapHeader(mapnum-1);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (strcmp(mapheaderinfo[mapnum-1]->lvlttl, ""))
{
size_t len = 1;
const char *zonetext = NULL;
Fix some errors and add some comments. Also, actnum is not an INT32.
2020-04-30 15:12:52 +00:00
const UINT8 actnum = mapheaderinfo[mapnum-1]->actnum;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
len += strlen(mapheaderinfo[mapnum-1]->lvlttl);
if (!(mapheaderinfo[mapnum-1]->levelflags & LF_NOZONE))
{
Mapname lowercase support (#146) * Moved levelname parsing to before where uppercase conversion occurs. * Extended titlecard font range. * Replaced misc. "ZONE" strings with "Zone" for titlecard purposes. * Don't convert to uppercase when rendering the titlecard name. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-03-17 20:44:24 +00:00
zonetext = M_GetText("Zone");
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
len += strlen(zonetext) + 1; // ' ' + zonetext
}
if (actnum > 0)
len += 1 + 11; // ' ' + INT32
title = Z_Malloc(len, PU_STATIC, NULL);
sprintf(title, "%s", mapheaderinfo[mapnum-1]->lvlttl);
if (zonetext) sprintf(title + strlen(title), " %s", zonetext);
if (actnum > 0) sprintf(title + strlen(title), " %d", actnum);
}
return title;
}
Extend map name text matching code into a function
2019-02-24 05:25:53 +00:00
static void measurekeywords(mapsearchfreq_t *fr,
struct searchdim **dimp, UINT8 *cuntp,
const char *s, const char *q, boolean wanttable)
{
char *qp;
char *sp;
if (wanttable)
(*dimp) = Z_Realloc((*dimp), 255 * sizeof (struct searchdim),
PU_STATIC, NULL);
for (qp = strtok(va("%s", q), " ");
qp && fr->total < 255;
qp = strtok(0, " "))
{
if (( sp = strcasestr(s, qp) ))
{
if (wanttable)
{
(*dimp)[(*cuntp)].pos = sp - s;
(*dimp)[(*cuntp)].siz = strlen(qp);
}
(*cuntp)++;
fr->total++;
}
}
if (wanttable)
(*dimp) = Z_Realloc((*dimp), (*cuntp) * sizeof (struct searchdim),
PU_STATIC, NULL);
}
Fix compiler warnings
2019-04-22 06:19:20 +00:00
static void writesimplefreq(mapsearchfreq_t *fr, INT32 *frc,
Extend map name text matching code into a function
2019-02-24 05:25:53 +00:00
INT32 mapnum, UINT8 pos, UINT8 siz)
{
fr[(*frc)].mapnum = mapnum;
fr[(*frc)].matchd = ZZ_Alloc(sizeof (struct searchdim));
fr[(*frc)].matchd[0].pos = pos;
fr[(*frc)].matchd[0].siz = siz;
fr[(*frc)].matchc = 1;
fr[(*frc)].total = 1;
(*frc)++;
}
INT32 G_FindMap(const char *mapname, char **foundmapnamep,
mapsearchfreq_t **freqp, INT32 *freqcp)
{
INT32 newmapnum = 0;
INT32 mapnum;
INT32 apromapnum = 0;
size_t mapnamelen;
char *realmapname = NULL;
char *newmapname = NULL;
char *apromapname = NULL;
char *aprop = NULL;
mapsearchfreq_t *freq;
boolean wanttable;
INT32 freqc;
UINT8 frequ;
INT32 i;
mapnamelen = strlen(mapname);
/* Count available maps; how ugly. */
for (i = 0, freqc = 0; i < NUMMAPS; ++i)
{
if (mapheaderinfo[i])
freqc++;
}
freq = ZZ_Calloc(freqc * sizeof (mapsearchfreq_t));
wanttable = !!( freqp );
freqc = 0;
for (i = 0, mapnum = 1; i < NUMMAPS; ++i, ++mapnum)
if (mapheaderinfo[i])
{
if (!( realmapname = G_BuildMapTitle(mapnum) ))
continue;
aprop = realmapname;
/* Now that we found a perfect match no need to fucking guess. */
if (strnicmp(realmapname, mapname, mapnamelen) == 0)
{
if (wanttable)
{
writesimplefreq(freq, &freqc, mapnum, 0, mapnamelen);
}
if (newmapnum == 0)
{
newmapnum = mapnum;
newmapname = realmapname;
realmapname = 0;
Z_Free(apromapname);
if (!wanttable)
break;
}
}
else
if (apromapnum == 0 || wanttable)
{
/* LEVEL 1--match keywords verbatim */
if (( aprop = strcasestr(realmapname, mapname) ))
{
if (wanttable)
{
writesimplefreq(freq, &freqc,
mapnum, aprop - realmapname, mapnamelen);
}
if (apromapnum == 0)
{
apromapnum = mapnum;
apromapname = realmapname;
realmapname = 0;
}
}
else/* ...match individual keywords */
{
freq[freqc].mapnum = mapnum;
measurekeywords(&freq[freqc],
&freq[freqc].matchd, &freq[freqc].matchc,
realmapname, mapname, wanttable);
Revert "Oh right, the keywords..." This reverts commit a00dfcf4205f88cd6149daf73fec4831a7d7c2e5.
2020-01-08 22:26:47 +00:00
measurekeywords(&freq[freqc],
&freq[freqc].keywhd, &freq[freqc].keywhc,
Call it KEYWORDS
2020-01-08 22:41:38 +00:00
mapheaderinfo[i]->keywords, mapname, wanttable);
Extend map name text matching code into a function
2019-02-24 05:25:53 +00:00
if (freq[freqc].total)
freqc++;
}
}
Z_Free(realmapname);/* leftover old name */
}
if (newmapnum == 0)/* no perfect match--try a substring */
{
newmapnum = apromapnum;
newmapname = apromapname;
}
if (newmapnum == 0)/* calculate most queries met! */
{
frequ = 0;
for (i = 0; i < freqc; ++i)
{
if (freq[i].total > frequ)
{
frequ = freq[i].total;
newmapnum = freq[i].mapnum;
}
}
if (newmapnum)
{
newmapname = G_BuildMapTitle(newmapnum);
}
}
if (freqp)
(*freqp) = freq;
else
Z_Free(freq);
if (freqcp)
(*freqcp) = freqc;
if (foundmapnamep)
(*foundmapnamep) = newmapname;
else
Z_Free(newmapname);
return newmapnum;
}
void G_FreeMapSearch(mapsearchfreq_t *freq, INT32 freqc)
{
INT32 i;
for (i = 0; i < freqc; ++i)
{
Z_Free(freq[i].matchd);
}
Z_Free(freq);
}
Split map code checking from Command_Map_f
2019-12-29 10:14:02 +00:00
INT32 G_FindMapByNameOrCode(const char *mapname, char **realmapnamep)
{
boolean usemapcode = false;
INT32 newmapnum;
size_t mapnamelen;
char *p;
mapnamelen = strlen(mapname);
if (mapnamelen == 2)/* maybe two digit code */
{
if (( newmapnum = M_MapNumber(mapname[0], mapname[1]) ))
usemapcode = true;
}
else if (mapnamelen == 5 && strnicmp(mapname, "MAP", 3) == 0)
{
Who cares?
2019-12-29 10:15:48 +00:00
if (( newmapnum = M_MapNumber(mapname[3], mapname[4]) ))
usemapcode = true;
Split map code checking from Command_Map_f
2019-12-29 10:14:02 +00:00
}
if (!usemapcode)
{
/* Now detect map number in base 10, which no one asked for. */
newmapnum = strtol(mapname, &p, 10);
if (*p == '\0')/* we got it */
{
if (newmapnum < 1 || newmapnum > NUMMAPS)
{
CONS_Alert(CONS_ERROR, M_GetText("Invalid map number %d.\n"), newmapnum);
return 0;
}
usemapcode = true;
}
else
{
newmapnum = G_FindMap(mapname, realmapnamep, NULL, NULL);
}
}
if (usemapcode)
{
Don't let us warp to a map that doesn't exist (really!) Okay so 6464df9876e472d1210aabce4237d02af38377e1, I WAS mistaken! Except that's not how you check for a map's existence, at least not how the old map command did it.
2019-12-29 10:44:27 +00:00
/* we can't check mapheaderinfo for this hahahaha */
if (W_CheckNumForName(G_BuildMapName(newmapnum)) == LUMPERROR)
return 0;
I'm still an idiot
2019-12-29 10:16:37 +00:00
if (realmapnamep)
(*realmapnamep) = G_BuildMapTitle(newmapnum);
Split map code checking from Command_Map_f
2019-12-29 10:14:02 +00:00
}
return newmapnum;
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
//
// G_SetGamestate
//
// Use this to set the gamestate, please.
//
void G_SetGamestate(gamestate_t newstate)
{
gamestate = newstate;
}
/* These functions handle the exitgame flag. Before, when the user
chose to end a game, it happened immediately, which could cause
crashes if the game was in the middle of something. Now, a flag
is set, and the game can then be stopped when it's safe to do
so.
*/
// Used as a callback function.
void G_SetExitGameFlag(void)
{
exitgame = true;
}
void G_ClearExitGameFlag(void)
{
exitgame = false;
}
boolean G_GetExitGameFlag(void)
{
return exitgame;
}
// Same deal with retrying.
void G_SetRetryFlag(void)
{
retrying = true;
}
void G_ClearRetryFlag(void)
{
retrying = false;
}
boolean G_GetRetryFlag(void)
{
return retrying;
}
fix RA fade
2019-11-23 21:15:09 +00:00
void G_SetModeAttackRetryFlag(void)
{
retryingmodeattack = true;
G_SetRetryFlag();
}
void G_ClearModeAttackRetryFlag(void)
{
retryingmodeattack = false;
}
boolean G_GetModeAttackRetryFlag(void)
{
return retryingmodeattack;
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Time utility functions
INT32 G_TicsToHours(tic_t tics)
{
return tics/(3600*TICRATE);
}
INT32 G_TicsToMinutes(tic_t tics, boolean full)
{
if (full)
return tics/(60*TICRATE);
else
return tics/(60*TICRATE)%60;
}
INT32 G_TicsToSeconds(tic_t tics)
{
return (tics/TICRATE)%60;
}
INT32 G_TicsToCentiseconds(tic_t tics)
{
return (INT32)((tics%TICRATE) * (100.00f/TICRATE));
}
INT32 G_TicsToMilliseconds(tic_t tics)
{
return (INT32)((tics%TICRATE) * (1000.00f/TICRATE));
}
Hopefully added the newline back?
2019-09-25 09:06:04 +00:00
Reference in a new issue Copy permalink