stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-12-29 13:51:24 +00:00
Code Issues Projects Releases Packages Wiki Activity
Kart-Public/src/g_game.c

6635 lines
166 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 source copyrights to 2018
2018-11-25 12:35:38 +00:00
// Copyright (C) 1999-2018 by Sonic Team Junior.
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
// See the 'LICENSE' file for more details.
//-----------------------------------------------------------------------------
/// \file g_game.c
/// \brief game loop functions, events handling
#include "doomdef.h"
#include "console.h"
#include "d_main.h"
#include "d_player.h"
#include "f_finale.h"
* Refactor all instances of `majormods = true;` to route through G_SetGameModified, and catch a few spots I missed in the process. * Make G_SetGameModified only console-print for major mods. * Add amnesty to "major mod" detection while loading files with custom savedatas. * Improved the console prints for command `isgamemodified`.
2019-01-17 22:01:28 +00:00
#include "filesrch.h" // for refreshdirmenu
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
#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"
#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_things.h"
#include "y_inter.h"
#include "v_video.h"
#include "dehacked.h" // get_number (for ghost thok)
#include "lua_hook.h"
#include "b_bot.h"
#include "m_cond.h" // condition sets
#include "md5.h" // demo checksums
Some Color code, Kart powers
2016-08-12 01:42:11 +00:00
#include "k_kart.h" // SRB2kart
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;
UINT8 botcolor;
JoyType_t Joystick;
JoyType_t Joystick2;
more quad stuff
2017-12-11 06:12:38 +00:00
JoyType_t Joystick3;
JoyType_t Joystick4;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// 1024 bytes is plenty for a savegame
#define SAVEGAMESIZE (1024)
Added Accelcode, start boosting, reverted drifting, etc.
2017-02-07 22:19:04 +00:00
// SRB2kart
char gamedatafilename[64] = "kartdata.dat";
char timeattackfolder[64] = "kart";
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
char customversionstring[32] = "\0";
static void G_DoCompleted(void);
static void G_DoStartContinue(void);
static void G_DoContinued(void);
static void G_DoWorldDone(void);
Getting there. Should *theoretically* be functional... if it didn't crash on vote end. I'm like 90% sure I'm missing a patch unload somewhere...
2018-01-28 01:59:29 +00:00
static void G_DoStartVote(void);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Starting from scratch. SRB2 v2.1.15
2016-07-06 04:09:17 +00:00
char mapmusname[7]; // Music name
UINT16 mapmusflags; // Track and reset bit
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
INT16 gamemap = 1;
INT16 maptol;
UINT8 globalweather = 0;
INT32 curWeather = PRECIP_NONE;
INT32 cursaveslot = -1; // Auto-save 1p savegame slot
INT16 lastmapsaved = 0; // Last map we auto-saved at
boolean gamecomplete = false;
UINT16 mainwads = 0;
First steps at implementing a mechanism that allows you to load non-cheaty good-faith mods such as custom characters with no Lua scripting, and play record attack with them. Features a few bad hacks and a few more areas of improvement; I'll try to iron them out before they hit `next` or `master`.
2019-01-15 19:01:55 +00:00
boolean modifiedgame = false; // Set if homebrew PWAD stuff has been added.
boolean majormods = false; // Set if Lua/Gameplay SOC/replacement map has been added.
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
boolean savemoddata = false;
UINT8 paused;
UINT8 modeattacking = ATTACKING_NONE;
Slow and Fast states use 1 tic duration animation Disable adjusting of frame speed (can be re-enabled through MAINCFG if people want it for whatever reason)
2017-11-04 17:49:14 +00:00
boolean disableSpeedAdjust = true;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
boolean imcontinuing = false;
boolean runemeraldmanager = false;
// menu demo things
* FREE PLAY! The necessary corollary to HERE COMES A NEW CHALLENGER... * Activates when there are less than two non-spectators in a netgame. * Shows flashing text at the bottom of the screen. * Prevents drawing several UI elements that only make sense with multiple players. * Prevents matchesplayed being increased. * Improve the mapreset timer's behaviour. * Now you get to see the HERE COMES A NEW CHALLENGER screen as the starting frame of the relevant map transition, since it happens on mapreset being 1 rather than 0. * Make a bunch of normal gameplay stuff that might've activated unnecessarily during mapreset now not able to. * Hide some other stuff that might've been visible for no good reason. * Improve Mirror mode. * First person now works with it! * Tweaked the minimap player heads. Although the main section of the automap is mirrored, it feels... wrong to mirror the player head? IDK, you may wish to revert this, but given that everything else is the right way around except for the level itself...* Disable the titlescreen demos, at least until we actually gear up for release and make real ones. * Disable the titlescreen demos, at least until we actually gear up for release and make real ones.
2018-07-22 15:16:03 +00:00
UINT8 numDemos = 0; //3; -- i'm FED UP of losing my skincolour to a broken demo. change this back when we make new ones
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
UINT32 demoDelayTime = 15*TICRATE;
UINT32 demoIdleTime = 3*TICRATE;
boolean timingdemo; // if true, exit with report on completion
boolean nodrawers; // for comparative timing purposes
boolean noblit; // for comparative timing purposes
static tic_t demostarttime; // for comparative timing purposes
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
initial quad stuff (does not work)
2017-12-08 07:29:01 +00:00
INT32 thirddisplayplayer;
INT32 fourthdisplayplayer;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
tic_t gametic;
tic_t levelstarttic; // gametic at level start
UINT32 totalrings; // for intermission
INT16 lastmap; // last level you were at (returning from special stages)
tic_t timeinmap; // Ticker for time spent in level (used for levelcard display)
INT16 spstage_start;
INT16 sstage_start;
INT16 sstage_end;
Loop the title screen music
2018-01-15 16:39:59 +00:00
boolean looptitle = true;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
boolean useNightsSS = false;
UINT8 skincolor_redteam = SKINCOLOR_RED;
UINT8 skincolor_blueteam = SKINCOLOR_BLUE;
UINT8 skincolor_redring = SKINCOLOR_RED;
Revamped colors - The majority of all colors have been tweaked in some capacity to have higher contrast, to either make character highlights or lineart pop out more - Two new "on trial" colors that may or may not stay: Tangerine, and Dusk. Tangerine is a yellow-orange color to fill the void of yellows. Dusk is a previously removed color that looked freakin' sweet after some cleanup, why wasn't this kept?! - Turquoise & Frost have been merged. My clean up of Frost ended up looking like a combination of the two. - Caramel has been removed, Shiny Caramel takes its place. - Unleashed my inner dream as wanting to have the job of whoever gets to name crayons, and changed all two-word names. - Todo: reorganize by hue then lum for a nicer invincibility effect, redo and throughly test ColorOpposite table, double check to make sure there aren't any duplicate blendcolors for OGL
2018-07-02 07:30:33 +00:00
UINT8 skincolor_bluering = SKINCOLOR_STEEL;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
tic_t countdowntimer = 0;
boolean countdowntimeup = false;
cutscene_t *cutscenes[128];
INT16 nextmapoverride;
boolean skipstats;
// 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;
UINT8 stagefailed; // Used for GEMS BONUS? Also to see if you beat the stage.
UINT16 emeralds;
UINT32 token; // Number of tokens collected in a level
UINT32 tokenlist; // List of tokens collected
INT32 tokenbits; // Used for setting token bits
// Old Special Stage
INT32 sstimer; // Time allotted in the special stage
tic_t totalplaytime;
Lots of changes - Menus now have all of the Kart cvars - Removed any cvars that aren't useful for Kart from the menu (they still exist in the console, though) - Removed SP and NiGHTS Mode options from the main menu - "kartcc" is renamed "kartspeed", uses values 0-2 instead of multiples of 50, or the terms "Relaxed", "Standard", and "Turbo" - Many gametype options (game speed, frantic, mirror, & karma comeback) are now changed on map load instead of instantly - New cvar, "kartminimap", for disabling the minimap - The maxplayers cvar now actually matches up with our 16 player limit - Game now keeps track of matches played. Has a condition type associated with it, as well. - Game checks for unlocks and saves gamedata when finishing a match, even in MP - Removed most of the normal emblems, added a single emblem for Green Hills. Didn't know what to do with extra emblems and such so I just left them (FOR NOW c:<)
2018-01-16 03:31:14 +00:00
UINT32 matchesplayed; // SRB2Kart
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
boolean gamedataloaded = false;
// Time attack data for levels
// These are dynamically allocated for space reasons now
recorddata_t *mainrecords[NUMMAPS] = {NULL};
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
//nightsdata_t *nightsrecords[NUMMAPS] = {NULL};
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
UINT8 mapvisited[NUMMAPS];
// Temporary holding place for nights data for the current map
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
//nightsdata_t ntemprecords;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
UINT32 bluescore, redscore; // CTF and Team Match team scores
// ring count... for PERFECT!
INT32 nummaprings = 0;
Battle Mode item respawning
2017-10-24 21:04:22 +00:00
// box respawning in battle mode
INT32 nummapboxes = 0;
INT32 numgotboxes = 0;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// 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;
Added Accelcode, start boosting, reverted drifting, etc.
2017-02-07 22:19:04 +00:00
UINT16 flashingtics = 3*TICRATE/2; // SRB2kart
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
UINT16 tailsflytics = 8*TICRATE;
UINT16 underwatertics = 30*TICRATE;
UINT16 spacetimetics = 11*TICRATE + (TICRATE/2);
UINT16 extralifetics = 4*TICRATE;
Some drift code, some control code
2016-08-21 21:55:35 +00:00
// SRB2kart
Fade-in intro Also made flashing not-local, again.
2018-06-26 14:14:59 +00:00
tic_t introtime = 108+5; // plus 5 for white fade
Lakitu murder & countdown improvements (I'm not SevenethSentienel! I just don't feel like logging out!)
2018-06-25 02:15:22 +00:00
tic_t starttime = 6*TICRATE + (3*TICRATE/4);
raceexittime var
2018-09-22 22:59:26 +00:00
tic_t raceexittime = 5*TICRATE + (2*TICRATE/3);
tic_t battleexittime = 8*TICRATE;
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
INT32 hyudorotime = 7*TICRATE;
INT32 stealtime = TICRATE/2;
INT32 sneakertime = TICRATE + (TICRATE/3);
Fix warnings Possibly fix some whitespace problems
2017-03-04 22:13:19 +00:00
INT32 itemtime = 8*TICRATE;
More adjustments - Comeback timer gets higher the more you get hit - Your ghost appears over the bomb - Speed & accel is set to worst while a bomb - CHECK range scales with kartcc
2017-11-06 04:18:58 +00:00
INT32 comebacktime = 10*TICRATE;
Tweeeeeaks - MT_FALLINGROCK bumps you instead of spinning you out! RIP annoying af apples - Made some Battle-related messages only happen in netgames - Messed with the timing on the intro
2017-12-28 23:37:25 +00:00
INT32 bumptime = 6;
Wipeout bumps - You can bump other people during spinout. - Bumping during spinout activates a "slow down" timer, which increases your friction after a few tics. - You have a Smash-style dust effect after a spinout bump, indicating clearly if you'll slow down or not.
2018-07-20 02:37:32 +00:00
INT32 wipeoutslowtime = 20;
WANTED
2018-07-01 08:36:09 +00:00
INT32 wantedreduce = 5*TICRATE;
INT32 wantedfrequency = 10*TICRATE;
Some drift code, some control code
2016-08-21 21:55:35 +00:00
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
INT32 gameovertics = 15*TICRATE;
UINT8 use1upSound = 0;
UINT8 maxXtraLife = 2; // Max extra lives from rings
UINT8 introtoplay;
UINT8 creditscutscene;
// Emerald locations
mobj_t *hunt1;
mobj_t *hunt2;
mobj_t *hunt3;
UINT32 countdown, countdown2; // for racing
fixed_t gravity;
Add a mapobjectscale global Should be no different than it was before, now it's just less tedious to type :V
2018-12-13 02:55:59 +00:00
fixed_t mapobjectscale;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
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
Lots of changes - Menus now have all of the Kart cvars - Removed any cvars that aren't useful for Kart from the menu (they still exist in the console, though) - Removed SP and NiGHTS Mode options from the main menu - "kartcc" is renamed "kartspeed", uses values 0-2 instead of multiples of 50, or the terms "Relaxed", "Standard", and "Turbo" - Many gametype options (game speed, frantic, mirror, & karma comeback) are now changed on map load instead of instantly - New cvar, "kartminimap", for disabling the minimap - The maxplayers cvar now actually matches up with our 16 player limit - Game now keeps track of matches played. Has a condition type associated with it, as well. - Game checks for unlocks and saves gamedata when finishing a match, even in MP - Removed most of the normal emblems, added a single emblem for Green Hills. Didn't know what to do with extra emblems and such so I just left them (FOR NOW c:<)
2018-01-16 03:31:14 +00:00
// SRB2Kart
Minor adjustments in hopes that I fixed the resynch bomb on gametype switch?
2018-02-08 22:13:06 +00:00
// Cvars that we don't want changed mid-game
Changing from Relaxed Standard Turbo to the typical Easy Normal Hard Reception to the naming convention has been either "don't care" or "too hard to remember"
2018-05-30 21:29:40 +00:00
UINT8 gamespeed; // Game's current speed (or difficulty, or cc, or etc); 0 for easy, 1 for normal, 2 for hard
* Encore on the voting screen! Appears randomly once unlocked in the same slot as that which sometimes represents a gametype change (odds inflated for testing purposes). * A better representation of an Encore level, now with inverted graphics (a special remapping we can now use elsewhere whenever if we want!) and a floating Ruby! * Decouple encore's setting from cv_kartencore on mapload. Instead, bake it into D_MapChange and related, which will only some of the time be fed by cv_kartencore's value. * Encore mode now has a special mapheader palette setting, "encorepal", rather than using the same one as non-encore.
2018-08-11 21:23:40 +00:00
boolean encoremode = false; // Encore Mode currently enabled?
boolean prevencoremode;
Lots of changes - Menus now have all of the Kart cvars - Removed any cvars that aren't useful for Kart from the menu (they still exist in the console, though) - Removed SP and NiGHTS Mode options from the main menu - "kartcc" is renamed "kartspeed", uses values 0-2 instead of multiples of 50, or the terms "Relaxed", "Standard", and "Turbo" - Many gametype options (game speed, frantic, mirror, & karma comeback) are now changed on map load instead of instantly - New cvar, "kartminimap", for disabling the minimap - The maxplayers cvar now actually matches up with our 16 player limit - Game now keeps track of matches played. Has a condition type associated with it, as well. - Game checks for unlocks and saves gamedata when finishing a match, even in MP - Removed most of the normal emblems, added a single emblem for Green Hills. Didn't know what to do with extra emblems and such so I just left them (FOR NOW c:<)
2018-01-16 03:31:14 +00:00
boolean franticitems; // Frantic items currently enabled?
boolean comeback; // Battle Mode's karma comeback is on/off
Double-check legitimacy on match completion
2018-01-29 00:57:38 +00:00
Everything Been a while since I synced :V
2018-02-04 04:47:47 +00:00
// Voting system
MAP HELL IS REAL * Force map hell if there are two or more non-spectators (ie, same condition as to not be in FREE PLAY) and everyone has selected the RANDOM level slot. * Unique gasp-and-Shulk-based sounds for both forced and non-forced map hell occourances.
2018-07-22 20:02:31 +00:00
INT16 votelevels[5][2]; // Levels that were rolled by the host
It's SINT8 not INT8
2018-02-23 01:04:52 +00:00
SINT8 votes[MAXPLAYERS]; // Each player's vote
SINT8 pickedvote; // What vote the host rolls
Everything Been a while since I synced :V
2018-02-04 04:47:47 +00:00
Map reset timer
2018-07-21 19:54:05 +00:00
// Server-sided, synched variables
WANTED
2018-07-01 08:36:09 +00:00
SINT8 battlewanted[4]; // WANTED players in battle, worth x2 points
WANTED recalculates on hit, tons of spectator changes
2018-07-04 01:12:25 +00:00
tic_t wantedcalcdelay; // Time before it recalculates WANTED
SPB fixes Shrink also plays its sound, and Shrink/Grow have slower scaling speeds
2018-06-11 05:51:50 +00:00
tic_t indirectitemcooldown; // Cooldown before any more Shrink, SPB, or any other item that works indirectly is awarded
Map reset timer
2018-07-21 19:54:05 +00:00
tic_t mapreset; // Map reset delay when enough players have joined an empty game
Prevent spectate griefing If the player count dips below what was stored on the start of the last lap, then don't do time over so that someone can't just spectate at the end of a race out of rage. Y'all are assholes :V
2018-10-15 22:41:34 +00:00
UINT8 nospectategrief; // How many players need to be in-game to eliminate last; for preventing spectate griefing
The motherload: all of my Lua is hardcoded This took like 6 straight hours of work, never ask me for anything ever again
2018-10-29 09:00:08 +00:00
boolean thwompsactive; // Thwomps activate on lap 2
Keep track of the place SPB is following This makes it so that if the SPB'd person is passed, then the person who's getting SPB'd won't get the increased item odds for the weird feedback loop.
2018-11-25 01:41:17 +00:00
SINT8 spbplace; // SPB exists, give the person behind better items
The Lightning Update - 30 sec cooldown on all lightning types - Delay before Blue Lightning hits, based off of distance - Blue Lightning can swap targets if 1st place is passed - Blue Lightning can only be handed out if 2nd is far away enough from first
2018-06-06 01:36:48 +00:00
Map reset timer
2018-07-21 19:54:05 +00:00
// Client-sided, unsynched variables (NEVER use in anything that needs to be synced with other players)
Minor adjustments in hopes that I fixed the resynch bomb on gametype switch?
2018-02-08 22:13:06 +00:00
boolean legitimateexit; // Did this client actually finish the match?
boolean comebackshowninfo; // Have you already seen the "ATTACK OR PROTECT" message?
tic_t curlap; // Current lap time
tic_t bestlap; // Best lap time
* AN OPPORTUNITY FOR GAMETYPE CHANGES ON THE VOTE SCREEN! * Super important to allow dedicated servers to continue forever without needing to add Terminal. * To facilitate understanding, add gametype dog-ears to the vote screen! * To do the above, add V_DrawDiag! Works in GL, too!! * Unrelated shit! * Fix a buffer overrun in the randmapbuffer! * Disable spectating in splitscreen... Not 100% sure, but in 2p battle, if you spectate, you just lose one balloon and respawn... * Improve all the string drawing functions' behaviour - both with being SLIGHTLY clipped by the edge of the screen, and when confronted with drawing off the base 320*200 internal area
2018-06-28 14:47:56 +00:00
static INT16 randmapbuffer[NUMMAPS+1]; // Buffer for maps RandMap is allowed to roll
Lots of changes - Menus now have all of the Kart cvars - Removed any cvars that aren't useful for Kart from the menu (they still exist in the console, though) - Removed SP and NiGHTS Mode options from the main menu - "kartcc" is renamed "kartspeed", uses values 0-2 instead of multiples of 50, or the terms "Relaxed", "Standard", and "Turbo" - Many gametype options (game speed, frantic, mirror, & karma comeback) are now changed on map load instead of instantly - New cvar, "kartminimap", for disabling the minimap - The maxplayers cvar now actually matches up with our 16 player limit - Game now keeps track of matches played. Has a condition type associated with it, as well. - Game checks for unlocks and saves gamedata when finishing a match, even in MP - Removed most of the normal emblems, added a single emblem for Green Hills. Didn't know what to do with extra emblems and such so I just left them (FOR NOW c:<)
2018-01-16 03:31:14 +00:00
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
tic_t hidetime;
// Grading
UINT32 timesBeaten;
UINT32 timesBeatenWithEmeralds;
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
//UINT32 timesBeatenUltimate;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
static char demoname[64];
boolean demorecording;
boolean demoplayback;
boolean titledemo; // Title Screen demo can be cancelled by any key
Title demos don't interrupt the music
2018-11-14 02:01:59 +00:00
boolean fromtitledemo; // SRB2Kart: Don't stop the music
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
static UINT8 *demobuffer = NULL;
SRB2 2.1.5 release
2014-03-23 16:00:29 +00:00
static UINT8 *demo_p, *demotime_p;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
static UINT8 *demoend;
static UINT8 demoflags;
SRB2 2.1.7 release
2014-04-14 05:14:58 +00:00
static UINT16 demoversion;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
boolean singledemo; // quit after playing a demo from cmdline
SRB2 2.1.5 release
2014-03-23 16:00:29 +00:00
boolean demo_start; // don't start playing demo right away
SRB2 2.1.7 release
2014-04-14 05:14:58 +00:00
static boolean demosynced = true; // console warning message
SRB2 2.1.5 release
2014-03-23 16:00:29 +00:00
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
boolean metalrecording; // recording as metal sonic
mobj_t *metalplayback;
SRB2 2.1.5 release
2014-03-23 16:00:29 +00:00
static UINT8 *metalbuffer = NULL;
static UINT8 *metal_p;
SRB2 2.1.7 release
2014-04-14 05:14:58 +00:00
static UINT16 metalversion;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// extra data stuff (events registered this frame while recording)
static struct {
UINT8 flags; // EZT flags
// EZT_COLOR
UINT8 color, lastcolor;
// EZT_SCALE
fixed_t scale, lastscale;
// EZT_HIT
UINT16 hits;
mobj_t **hitlist;
} ghostext;
// Your naming conventions are stupid and useless.
// There is no conflict here.
demoghost *ghosts = NULL;
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);
initial quad stuff (does not work)
2017-12-08 07:29:01 +00:00
static void UserAnalog3_OnChange(void);
static void UserAnalog4_OnChange(void);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
static void Analog_OnChange(void);
static void Analog2_OnChange(void);
initial quad stuff (does not work)
2017-12-08 07:29:01 +00:00
static void Analog3_OnChange(void);
static void Analog4_OnChange(void);
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
void SendWeaponPref(void);
void SendWeaponPref2(void);
initial quad stuff (does not work)
2017-12-08 07:29:01 +00:00
void SendWeaponPref3(void);
void SendWeaponPref4(void);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
DrawFill supports splitscreen offset flags
2018-10-01 12:41:44 +00:00
//static CV_PossibleValue_t crosshair_cons_t[] = {{0, "Off"}, {1, "Cross"}, {2, "Angle"}, {3, "Point"}, {0, NULL}};
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
static CV_PossibleValue_t joyaxis_cons_t[] = {{0, "None"},
#ifdef _WII
{1, "LStick.X"}, {2, "LStick.Y"}, {-1, "LStick.X-"}, {-2, "LStick.Y-"},
#if JOYAXISSET > 1
{3, "RStick.X"}, {4, "RStick.Y"}, {-3, "RStick.X-"}, {-4, "RStick.Y-"},
#endif
#if JOYAXISSET > 2
{5, "RTrigger"}, {6, "LTrigger"}, {-5, "RTrigger-"}, {-6, "LTrigger-"},
#endif
#if JOYAXISSET > 3
{7, "Pitch"}, {8, "Roll"}, {-7, "Pitch-"}, {-8, "Roll-"},
#endif
#if JOYAXISSET > 4
{7, "Yaw"}, {8, "Dummy"}, {-7, "Yaw-"}, {-8, "Dummy-"},
#endif
#if JOYAXISSET > 4
{9, "LAnalog"}, {10, "RAnalog"}, {-9, "LAnalog-"}, {-10, "RAnalog-"},
#endif
#elif defined (WMINPUT)
{1, "LStick.X"}, {2, "LStick.Y"}, {-1, "LStick.X-"}, {-2, "LStick.Y-"},
#if JOYAXISSET > 1
{3, "RStick.X"}, {4, "RStick.Y"}, {-3, "RStick.X-"}, {-4, "RStick.Y-"},
#endif
#if JOYAXISSET > 2
{5, "NStick.X"}, {6, "NStick.Y"}, {-5, "NStick.X-"}, {-6, "NStick.Y-"},
#endif
#if JOYAXISSET > 3
{7, "LAnalog"}, {8, "RAnalog"}, {-7, "LAnalog-"}, {-8, "RAnalog-"},
#endif
#else
{1, "X-Axis"}, {2, "Y-Axis"}, {-1, "X-Axis-"}, {-2, "Y-Axis-"},
#ifdef _arch_dreamcast
{3, "R-Trig"}, {4, "L-Trig"}, {-3, "R-Trig-"}, {-4, "L-Trig-"},
{5, "Alt X-Axis"}, {6, "Alt Y-Axis"}, {-5, "Alt X-Axis-"}, {-6, "Alt Y-Axis-"},
{7, "Triggers"}, {-7,"Triggers-"},
#elif defined (_XBOX)
{3, "Alt X-Axis"}, {4, "Alt Y-Axis"}, {-3, "Alt X-Axis-"}, {-4, "Alt Y-Axis-"},
#else
#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
#endif
#endif
{0, NULL}};
#ifdef _WII
#if JOYAXISSET > 5
"More Axis Sets"
#endif
#else
#if JOYAXISSET > 4
"More Axis Sets"
#endif
#endif
Chat Manager
2018-06-15 10:20:01 +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.
SRB2chat test rework
2018-07-31 09:10:02 +00:00
// it automatically becomes compact with 20+ players, but if you like it, I guess you can turn that on!
merge srb2 next
2019-01-05 20:59:23 +00:00
// SRB2Kart: irrelevant for us.
//consvar_t cv_compactscoreboard= {"compactscoreboard", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
SRB2chat test rework
2018-07-31 09:10:02 +00:00
Chat Manager
2018-06-15 10:20:01 +00:00
// chat timer thingy
static CV_PossibleValue_t chattime_cons_t[] = {{5, "MIN"}, {999, "MAX"}, {0, NULL}};
consvar_t cv_chattime = {"chattime", "8", CV_SAVE, chattime_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
// chatwidth
static CV_PossibleValue_t chatwidth_cons_t[] = {{64, "MIN"}, {150, "MAX"}, {0, NULL}};
consvar_t cv_chatwidth = {"chatwidth", "150", CV_SAVE, chatwidth_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
// chatheight
static CV_PossibleValue_t chatheight_cons_t[] = {{6, "MIN"}, {22, "MAX"}, {0, NULL}};
* Get chat to compile with errormode on. * Add chat options to the HUD and Sound Option menus.
2018-08-02 22:52:07 +00:00
consvar_t cv_chatheight = {"chatheight", "8", CV_SAVE, chatheight_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
Chat Manager
2018-06-15 10:20:01 +00:00
// chat notifications (do you want to hear beeps? I'd understand if you didn't.)
* Get chat to compile with errormode on. * Add chat options to the HUD and Sound Option menus.
2018-08-02 22:52:07 +00:00
consvar_t cv_chatnotifications = {"chatnotifications", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
Chat Manager
2018-06-15 10:20:01 +00:00
// chat spam protection (why would you want to disable that???)
* Get chat to compile with errormode on. * Add chat options to the HUD and Sound Option menus.
2018-08-02 22:52:07 +00:00
consvar_t cv_chatspamprotection = {"chatspamprotection", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
Chat Manager
2018-06-15 10:20:01 +00:00
Chat wordwrap fix + Minichat bg highlight
2018-08-05 11:08:27 +00:00
// minichat text background
Fix cvar bugs - karteliminatelast uses CV_YesNo instead of CV_OnOff - chatbacktint defaults to on - soniccd defaults to off
2018-11-18 01:47:11 +00:00
consvar_t cv_chatbacktint = {"chatbacktint", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
Chat wordwrap fix + Minichat bg highlight
2018-08-05 11:08:27 +00:00
Chat Manager
2018-06-15 10:20:01 +00:00
// old shit console chat. (mostly exists for stuff like terminal, not because I cared if anyone liked the old chat.)
HU_AddChatText cleanup for future use + chat mode Window (Hidden) added.
2018-10-10 19:24:55 +00:00
static CV_PossibleValue_t consolechat_cons_t[] = {{0, "Window"}, {1, "Console"}, {2, "Window (Hidden)"}, {0, NULL}};
Fix all actionable comments in my review of sonicitems.
2018-08-09 21:59:52 +00:00
consvar_t cv_consolechat = {"chatmode", "Window", CV_SAVE, consolechat_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
Chat Manager
2018-06-15 10:20:01 +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
consvar_t cv_pauseifunfocused = {"pauseifunfocused", "Yes", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
In-game music credits
2019-01-04 09:44:55 +00:00
// Display song credits
consvar_t cv_songcredits = {"songcredits", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
Goodbye cvar
2018-10-01 11:21:02 +00:00
/*consvar_t cv_crosshair = {"crosshair", "Off", CV_SAVE, crosshair_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
New bindable keys You can now remap Change Viewpoint, Screenshot, and Toggle GIF Recording to other keys, mainly for gamepads They also pushed me to my breaking point and I couldn't tolerate the control menu anymore, thanks to toaster for the scrolling backport
2018-09-27 20:55:21 +00:00
consvar_t cv_crosshair2 = {"crosshair2", "Off", CV_SAVE, crosshair_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_crosshair3 = {"crosshair3", "Off", CV_SAVE, crosshair_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
Goodbye cvar
2018-10-01 11:21:02 +00:00
consvar_t cv_crosshair4 = {"crosshair4", "Off", CV_SAVE, crosshair_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};*/
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
consvar_t cv_invertmouse = {"invertmouse", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_invertmouse2 = {"invertmouse2", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 13:49:50 +00:00
/*consvar_t cv_alwaysfreelook = {"alwaysmlook", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
consvar_t cv_alwaysfreelook2 = {"alwaysmlook2", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
Add chasefreelook to separate third and first person mouselook
2018-11-22 22:04:24 +00:00
consvar_t cv_chasefreelook = {"chasemlook", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_chasefreelook2 = {"chasemlook2", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
Restructured some ticcmd stuff, temporary keyboard defaults, commented out mouse options menu No more weapon number buttons, button constants reordered, and BT_JUMP renamed to BT_DRIFT, and removed a lot of commented out stuff or stuff we didn't need. Spectator-only support for looking up/down soon. Keyboard defaults are just what I use, plan on adjusting it further after more feedback
2018-01-24 07:45:06 +00:00
consvar_t cv_mousemove = {"mousemove", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 13:49:50 +00:00
consvar_t cv_mousemove2 = {"mousemove2", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};*/
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
consvar_t cv_analog = {"analog", "Off", CV_CALL, CV_OnOff, Analog_OnChange, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_analog2 = {"analog2", "Off", CV_CALL, CV_OnOff, Analog2_OnChange, 0, NULL, NULL, 0, 0, NULL};
initial quad stuff (does not work)
2017-12-08 07:29:01 +00:00
consvar_t cv_analog3 = {"analog3", "Off", CV_CALL, CV_OnOff, Analog3_OnChange, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_analog4 = {"analog4", "Off", CV_CALL, CV_OnOff, Analog4_OnChange, 0, NULL, NULL, 0, 0, NULL};
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
#ifdef DC
consvar_t cv_useranalog = {"useranalog", "On", CV_SAVE|CV_CALL, CV_OnOff, UserAnalog_OnChange, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_useranalog2 = {"useranalog2", "On", CV_SAVE|CV_CALL, CV_OnOff, UserAnalog2_OnChange, 0, NULL, NULL, 0, 0, NULL};
#else
consvar_t cv_useranalog = {"useranalog", "Off", CV_SAVE|CV_CALL, CV_OnOff, UserAnalog_OnChange, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_useranalog2 = {"useranalog2", "Off", CV_SAVE|CV_CALL, CV_OnOff, UserAnalog2_OnChange, 0, NULL, NULL, 0, 0, NULL};
initial quad stuff (does not work)
2017-12-08 07:29:01 +00:00
consvar_t cv_useranalog3 = {"useranalog3", "Off", CV_SAVE|CV_CALL, CV_OnOff, UserAnalog3_OnChange, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_useranalog4 = {"useranalog4", "Off", CV_SAVE|CV_CALL, CV_OnOff, UserAnalog4_OnChange, 0, NULL, NULL, 0, 0, NULL};
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
#endif
consvar_t cv_turnaxis = {"joyaxis_turn", "X-Axis", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_moveaxis = {"joyaxis_move", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
Better gamepad axis support
2018-03-11 22:07:28 +00:00
consvar_t cv_brakeaxis = {"joyaxis_brake", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_aimaxis = {"joyaxis_aim", "Y-Axis", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
consvar_t cv_lookaxis = {"joyaxis_look", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
Better gamepad axis support
2018-03-11 22:07:28 +00:00
consvar_t cv_fireaxis = {"joyaxis_fire", "Z-Axis", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
Print GameController info when detected, use proper 360 controller defaults for triggers
2018-12-14 17:50:53 +00:00
consvar_t cv_driftaxis = {"joyaxis_drift", "Z-Rudder", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
consvar_t cv_turnaxis2 = {"joyaxis2_turn", "X-Axis", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
Better gamepad axis support
2018-03-11 22:07:28 +00:00
consvar_t cv_moveaxis2 = {"joyaxis2_move", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_brakeaxis2 = {"joyaxis2_brake", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_aimaxis2 = {"joyaxis2_aim", "Y-Axis", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
consvar_t cv_lookaxis2 = {"joyaxis2_look", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
Better gamepad axis support
2018-03-11 22:07:28 +00:00
consvar_t cv_fireaxis2 = {"joyaxis2_fire", "Z-Axis", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
Print GameController info when detected, use proper 360 controller defaults for triggers
2018-12-14 17:50:53 +00:00
consvar_t cv_driftaxis2 = {"joyaxis2_drift", "Z-Rudder", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
Fixed joysticks 3 & 4 fun typos
2017-12-24 20:02:41 +00:00
consvar_t cv_turnaxis3 = {"joyaxis3_turn", "X-Axis", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
Better gamepad axis support
2018-03-11 22:07:28 +00:00
consvar_t cv_moveaxis3 = {"joyaxis3_move", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_brakeaxis3 = {"joyaxis3_brake", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_aimaxis3 = {"joyaxis3_aim", "Y-Axis", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
Fixed joysticks 3 & 4 fun typos
2017-12-24 20:02:41 +00:00
consvar_t cv_lookaxis3 = {"joyaxis3_look", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
Better gamepad axis support
2018-03-11 22:07:28 +00:00
consvar_t cv_fireaxis3 = {"joyaxis3_fire", "Z-Axis", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
Print GameController info when detected, use proper 360 controller defaults for triggers
2018-12-14 17:50:53 +00:00
consvar_t cv_driftaxis3 = {"joyaxis3_drift", "Z-Rudder", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
Fixed joysticks 3 & 4 fun typos
2017-12-24 20:02:41 +00:00
consvar_t cv_turnaxis4 = {"joyaxis4_turn", "X-Axis", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
Better gamepad axis support
2018-03-11 22:07:28 +00:00
consvar_t cv_moveaxis4 = {"joyaxis4_move", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_brakeaxis4 = {"joyaxis4_brake", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_aimaxis4 = {"joyaxis4_aim", "Y-Axis", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
Fixed joysticks 3 & 4 fun typos
2017-12-24 20:02:41 +00:00
consvar_t cv_lookaxis4 = {"joyaxis4_look", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
Better gamepad axis support
2018-03-11 22:07:28 +00:00
consvar_t cv_fireaxis4 = {"joyaxis4_fire", "Z-Axis", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
Print GameController info when detected, use proper 360 controller defaults for triggers
2018-12-14 17:50:53 +00:00
consvar_t cv_driftaxis4 = {"joyaxis4_drift", "Z-Rudder", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Added Accelcode, start boosting, reverted drifting, etc.
2017-02-07 22:19:04 +00:00
#if MAXPLAYERS > 16
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
#error "please update player_name table using the new value for MAXPLAYERS"
#endif
#ifdef SEENAMES
player_t *seenplayer; // player we're aiming at right now
#endif
char player_names[MAXPLAYERS][MAXPLAYERNAME+1] =
{
"Player 1",
"Player 2",
"Player 3",
"Player 4",
"Player 5",
"Player 6",
"Player 7",
"Player 8",
"Player 9",
"Player 10",
"Player 11",
"Player 12",
"Player 13",
"Player 14",
"Player 15",
Added Accelcode, start boosting, reverted drifting, etc.
2017-02-07 22:19:04 +00:00
"Player 16"
}; // SRB2kart - removed Players 17 through 32
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));
}
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
/*void G_AllocNightsRecordData(INT16 i)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
if (!nightsrecords[i])
nightsrecords[i] = Z_Malloc(sizeof(nightsdata_t), PU_STATIC, NULL);
memset(nightsrecords[i], 0, sizeof(nightsdata_t));
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
}*/
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// 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;
}
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
/*if (nightsrecords[i])
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Z_Free(nightsrecords[i]);
nightsrecords[i] = NULL;
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
}*/
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
}
// For easy retrieval of records
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
/*UINT32 G_GetBestScore(INT16 map)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
if (!mainrecords[map-1])
return 0;
return mainrecords[map-1]->score;
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
}*/
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
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;
}
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
// Not needed
/*tic_t G_GetBestLap(INT16 map)
{
if (!mainrecords[map-1] || mainrecords[map-1]->lap <= 0)
return (tic_t)UINT32_MAX;
return mainrecords[map-1]->lap;
}*/
/*UINT16 G_GetBestRings(INT16 map)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
if (!mainrecords[map-1])
return 0;
return mainrecords[map-1]->rings;
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
}*/
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
// No NiGHTS records for SRB2Kart
/*UINT32 G_GetBestNightsScore(INT16 map, UINT8 mare)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
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;
}
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;
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';
Some cleanup No longer save score/rings, use the Race tally as a placeholder replacement for the butchered vanilla one
2017-10-17 00:23:26 +00:00
G_SetDemoTime(totaltime, totalscore);
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
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-last.lmp", gpath);
if (FIL_FileExists(lastdemo))
{
UINT8 *buf;
size_t len = FIL_ReadFile(lastdemo, &buf);
snprintf(bestdemo, 255, "%s-time-best.lmp", gpath);
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-score-best.lmp", gpath);
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);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// If the mare count changed, this will update the score display
CV_AddValue(&cv_nextmap, 1);
CV_AddValue(&cv_nextmap, -1);
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
}*/
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// for consistency among messages: this modifies the game and removes savemoddata.
* Refactor all instances of `majormods = true;` to route through G_SetGameModified, and catch a few spots I missed in the process. * Make G_SetGameModified only console-print for major mods. * Add amnesty to "major mod" detection while loading files with custom savedatas. * Improved the console prints for command `isgamemodified`.
2019-01-17 22:01:28 +00:00
void G_SetGameModified(boolean silent, boolean major)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Code cleanup as requested by Sal and Sryder. * majormods and savemoddata cannot coexist as true values, so going through and making situations that involve both only reference one. * Clean up comments in `dehacked.c`.
2019-01-26 16:58:45 +00:00
if ((majormods && modifiedgame) || !mainwads || (refreshdirmenu & REFRESHDIR_GAMEDATA)) // new gamedata amnesty?
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return;
modifiedgame = true;
* Refactor all instances of `majormods = true;` to route through G_SetGameModified, and catch a few spots I missed in the process. * Make G_SetGameModified only console-print for major mods. * Add amnesty to "major mod" detection while loading files with custom savedatas. * Improved the console prints for command `isgamemodified`.
2019-01-17 22:01:28 +00:00
if (!major)
return;
* Did some reviewing, turns out there's literally no reason to disable savemoddata when majormods gets tripped and it's just a stupid thing vanilla did for modifiedgame for some reason that we almost inherited with our new solution? * Adjusted the save system to acknowledge the new status quo. Instead of trying to save modifiedgame in the file like some sort of extremely boneheaded honour system everyone and their mothers hacks around, we just use it to determine whether the save is for a mod with savedata or not (this keeps backwards compatibility based on how we were using it, anyways, especially with the *force* parameter...) * Added a menu message for attempting to play a demo set on a map that isn't loaded, as opposed to letting it I_Error. * Minor tweaks to addons menu representing modded status.
2019-01-28 16:32:07 +00:00
//savemoddata = false; -- there is literally no reason to do this anymore.
* Refactor all instances of `majormods = true;` to route through G_SetGameModified, and catch a few spots I missed in the process. * Make G_SetGameModified only console-print for major mods. * Add amnesty to "major mod" detection while loading files with custom savedatas. * Improved the console prints for command `isgamemodified`.
2019-01-17 22:01:28 +00:00
majormods = true;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (!silent)
* Refactor all instances of `majormods = true;` to route through G_SetGameModified, and catch a few spots I missed in the process. * Make G_SetGameModified only console-print for major mods. * Add amnesty to "major mod" detection while loading files with custom savedatas. * Improved the console prints for command `isgamemodified`.
2019-01-17 22:01:28 +00:00
CONS_Alert(CONS_NOTICE, M_GetText("Game must be restarted to play record attack.\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();
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
Added "Random" to the level selection list, for those days when you know you *want* to race but don't have any idea what to do.
2018-08-15 15:12:36 +00:00
I_Assert(map >= 0);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
I_Assert(map <= NUMMAPS);
Added "Random" to the level selection list, for those days when you know you *want* to race but don't have any idea what to do.
2018-08-15 15:12:36 +00:00
if (map == 0) // hack???
{
if (gamestate == GS_TITLESCREEN)
map = -1;
else if (gamestate == GS_LEVEL)
Correct minor issue with random map name selection.
2018-08-15 15:56:26 +00:00
map = gamemap-1;
Added "Random" to the level selection list, for those days when you know you *want* to race but don't have any idea what to do.
2018-08-15 15:12:36 +00:00
else
map = prevmap;
Remove previous commit's votebuffer, allow an external optional buffer to be passed into G_RandMap I meant to fix the previous method, but I didn't even understand how it knew it was in a vote or not... so I just did it my own way :V (Shouldn't FLUSHMAPBUFFEREARLY be on now...?)
2018-11-26 09:27:31 +00:00
map = G_RandMap(G_TOLFlag(cv_newgametype.value), map, false, 0, false, NULL)+1;
Added "Random" to the level selection list, for those days when you know you *want* to race but don't have any idea what to do.
2018-08-15 15:12:36 +00:00
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
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);
}
A lot lol The importants: - Fixed compiling - Combined G_BuildTiccmd for all players, no more need for a function for each - You can actually start 3p/4p mode
2017-12-17 03:32:43 +00:00
static INT32 Joy1Axis(axis_input_e axissel)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
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;
Better gamepad axis support
2018-03-11 22:07:28 +00:00
case AXISBRAKE:
axisval = cv_brakeaxis.value;
break;
case AXISAIM:
axisval = cv_aimaxis.value;
break;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
case AXISLOOK:
axisval = cv_lookaxis.value;
break;
case AXISFIRE:
axisval = cv_fireaxis.value;
break;
Better gamepad axis support
2018-03-11 22:07:28 +00:00
case AXISDRIFT:
axisval = cv_driftaxis.value;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
break;
default:
return 0;
}
if (axisval < 0) //odd -axises
{
axisval = -axisval;
flp = true;
}
#ifdef _arch_dreamcast
if (axisval == 7) // special case
{
retaxis = joyxmove[1] - joyymove[1];
goto skipDC;
}
else
#endif
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];
}
#ifdef _arch_dreamcast
skipDC:
#endif
if (retaxis < (-JOYAXISRANGE))
retaxis = -JOYAXISRANGE;
if (retaxis > (+JOYAXISRANGE))
retaxis = +JOYAXISRANGE;
if (!Joystick.bGamepadStyle && axissel < AXISDEAD)
{
const INT32 jdeadzone = JOYAXISRANGE/4;
if (-jdeadzone < retaxis && retaxis < jdeadzone)
return 0;
}
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;
Better gamepad axis support
2018-03-11 22:07:28 +00:00
case AXISBRAKE:
axisval = cv_brakeaxis2.value;
break;
case AXISAIM:
axisval = cv_aimaxis2.value;
break;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
case AXISLOOK:
axisval = cv_lookaxis2.value;
break;
case AXISFIRE:
axisval = cv_fireaxis2.value;
break;
Better gamepad axis support
2018-03-11 22:07:28 +00:00
case AXISDRIFT:
axisval = cv_driftaxis2.value;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
break;
default:
return 0;
}
if (axisval < 0) //odd -axises
{
axisval = -axisval;
flp = true;
}
#ifdef _arch_dreamcast
if (axisval == 7) // special case
{
retaxis = joy2xmove[1] - joy2ymove[1];
goto skipDC;
}
else
#endif
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];
}
#ifdef _arch_dreamcast
skipDC:
#endif
if (retaxis < (-JOYAXISRANGE))
retaxis = -JOYAXISRANGE;
if (retaxis > (+JOYAXISRANGE))
retaxis = +JOYAXISRANGE;
if (!Joystick2.bGamepadStyle && axissel < AXISDEAD)
{
const INT32 jdeadzone = JOYAXISRANGE/4;
if (-jdeadzone < retaxis && retaxis < jdeadzone)
return 0;
}
if (flp) retaxis = -retaxis; //flip it around
return retaxis;
}
more quad stuff
2017-12-11 06:12:38 +00:00
static INT32 Joy3Axis(axis_input_e axissel)
{
INT32 retaxis;
INT32 axisval;
boolean flp = false;
//find what axis to get
switch (axissel)
{
Better gamepad axis support
2018-03-11 22:07:28 +00:00
case AXISTURN:
axisval = cv_turnaxis3.value;
break;
case AXISMOVE:
axisval = cv_moveaxis3.value;
break;
case AXISBRAKE:
axisval = cv_brakeaxis3.value;
break;
case AXISAIM:
axisval = cv_aimaxis3.value;
break;
case AXISLOOK:
axisval = cv_lookaxis3.value;
break;
case AXISFIRE:
axisval = cv_fireaxis3.value;
break;
case AXISDRIFT:
axisval = cv_driftaxis3.value;
break;
default:
return 0;
more quad stuff
2017-12-11 06:12:38 +00:00
}
if (axisval < 0) //odd -axises
{
axisval = -axisval;
flp = true;
}
#ifdef _arch_dreamcast
if (axisval == 7) // special case
{
retaxis = joy3xmove[1] - joy3ymove[1];
goto skipDC;
}
else
#endif
some joystick fixes Turns out P3/P4 controllers are broken (and still are)
2017-12-24 13:20:58 +00:00
if (axisval > JOYAXISSET*2 || axisval == 0) //not there in array or None
return 0;
more quad stuff
2017-12-11 06:12:38 +00:00
if (axisval%2)
{
axisval /= 2;
retaxis = joy3xmove[axisval];
}
else
{
axisval--;
axisval /= 2;
retaxis = joy3ymove[axisval];
}
#ifdef _arch_dreamcast
skipDC:
#endif
some joystick fixes Turns out P3/P4 controllers are broken (and still are)
2017-12-24 13:20:58 +00:00
if (retaxis < (-JOYAXISRANGE))
retaxis = -JOYAXISRANGE;
if (retaxis > (+JOYAXISRANGE))
retaxis = +JOYAXISRANGE;
if (!Joystick3.bGamepadStyle && axissel < AXISDEAD)
{
const INT32 jdeadzone = JOYAXISRANGE/4;
if (-jdeadzone < retaxis && retaxis < jdeadzone)
return 0;
}
if (flp) retaxis = -retaxis; //flip it around
return retaxis;
more quad stuff
2017-12-11 06:12:38 +00:00
}
A lot lol The importants: - Fixed compiling - Combined G_BuildTiccmd for all players, no more need for a function for each - You can actually start 3p/4p mode
2017-12-17 03:32:43 +00:00
static INT32 Joy4Axis(axis_input_e axissel)
more quad stuff
2017-12-11 06:12:38 +00:00
{
INT32 retaxis;
INT32 axisval;
boolean flp = false;
//find what axis to get
switch (axissel)
{
Better gamepad axis support
2018-03-11 22:07:28 +00:00
case AXISTURN:
axisval = cv_turnaxis4.value;
break;
case AXISMOVE:
axisval = cv_moveaxis4.value;
break;
case AXISBRAKE:
axisval = cv_brakeaxis4.value;
break;
case AXISAIM:
axisval = cv_aimaxis4.value;
break;
case AXISLOOK:
axisval = cv_lookaxis4.value;
break;
case AXISFIRE:
axisval = cv_fireaxis4.value;
break;
case AXISDRIFT:
axisval = cv_driftaxis4.value;
break;
default:
return 0;
more quad stuff
2017-12-11 06:12:38 +00:00
}
if (axisval < 0) //odd -axises
{
axisval = -axisval;
flp = true;
}
#ifdef _arch_dreamcast
if (axisval == 7) // special case
{
Fixed joysticks 3 & 4 fun typos
2017-12-24 20:02:41 +00:00
retaxis = joy4xmove[1] - joy4ymove[1];
more quad stuff
2017-12-11 06:12:38 +00:00
goto skipDC;
}
else
#endif
some joystick fixes Turns out P3/P4 controllers are broken (and still are)
2017-12-24 13:20:58 +00:00
if (axisval > JOYAXISSET*2 || axisval == 0) //not there in array or None
return 0;
more quad stuff
2017-12-11 06:12:38 +00:00
if (axisval%2)
{
axisval /= 2;
retaxis = joy4xmove[axisval];
}
else
{
axisval--;
axisval /= 2;
retaxis = joy4ymove[axisval];
}
#ifdef _arch_dreamcast
skipDC:
#endif
some joystick fixes Turns out P3/P4 controllers are broken (and still are)
2017-12-24 13:20:58 +00:00
if (retaxis < (-JOYAXISRANGE))
retaxis = -JOYAXISRANGE;
if (retaxis > (+JOYAXISRANGE))
retaxis = +JOYAXISRANGE;
if (!Joystick4.bGamepadStyle && axissel < AXISDEAD)
{
const INT32 jdeadzone = JOYAXISRANGE/4;
if (-jdeadzone < retaxis && retaxis < jdeadzone)
return 0;
}
if (flp) retaxis = -retaxis; //flip it around
return retaxis;
more quad stuff
2017-12-11 06:12:38 +00:00
}
Slight adjustment
2018-02-09 21:04:52 +00:00
boolean InputDown(INT32 gc, UINT8 p)
A lot lol The importants: - Fixed compiling - Combined G_BuildTiccmd for all players, no more need for a function for each - You can actually start 3p/4p mode
2017-12-17 03:32:43 +00:00
{
switch (p)
{
case 2:
return PLAYER2INPUTDOWN(gc);
case 3:
return PLAYER3INPUTDOWN(gc);
case 4:
return PLAYER4INPUTDOWN(gc);
default:
return PLAYER1INPUTDOWN(gc);
}
}
Added axis support
2018-02-09 02:24:44 +00:00
INT32 JoyAxis(axis_input_e axissel, UINT8 p)
A lot lol The importants: - Fixed compiling - Combined G_BuildTiccmd for all players, no more need for a function for each - You can actually start 3p/4p mode
2017-12-17 03:32:43 +00:00
{
switch (p)
{
case 2:
return Joy2Axis(axissel);
case 3:
return Joy3Axis(axissel);
case 4:
return Joy4Axis(axissel);
default:
return Joy1Axis(axissel);
}
}
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
//
initial quad stuff (does not work)
2017-12-08 07:29:01 +00:00
INT32 localaiming, localaiming2, localaiming3, localaiming4;
angle_t localangle, localangle2, localangle3, localangle4;
Camera adjustin's - Look backward button works - Increased default cam_speed, from 0.3 to 0.45. This is the highest value that I think doesn't look overly stiff. - Removed bobbing in first person I was trying to do the camera angle thing that we've been talking about for a while, but I can't get it to work well.
2018-01-22 22:08:31 +00:00
boolean camspin, camspin2, camspin3, camspin4;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
static fixed_t forwardmove[2] = {25<<FRACBITS>>16, 50<<FRACBITS>>16};
Lots of cmd restructuring. - cmd->driftturn exists now, for figuring out how far you're turning. Added to prevent analog sticks from being able to get drift sparks faster. - Feather bounce strafing moved to use cmd->sidemove, which means it also supports analog now. - Braking now waits a few tics for you to be stopped for a few tics before it lets you go in reverse, as per Sev's request. - Removed a lot of unused/redundant/commented out control code, and reorganized some of the existing code.
2018-06-05 21:12:42 +00:00
static fixed_t sidemove[2] = {2<<FRACBITS>>16, 4<<FRACBITS>>16};
Don't turn players more than they're allowed to This should account for latency properly.
2019-01-05 05:08:33 +00:00
static fixed_t angleturn[3] = {KART_FULLTURN/2, KART_FULLTURN, KART_FULLTURN/4}; // + slow turn
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
A lot lol The importants: - Fixed compiling - Combined G_BuildTiccmd for all players, no more need for a function for each - You can actually start 3p/4p mode
2017-12-17 03:32:43 +00:00
void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Restructured some ticcmd stuff, temporary keyboard defaults, commented out mouse options menu No more weapon number buttons, button constants reordered, and BT_JUMP renamed to BT_DRIFT, and removed a lot of commented out stuff or stuff we didn't need. Spectator-only support for looking up/down soon. Keyboard defaults are just what I use, plan on adjusting it further after more feedback
2018-01-24 07:45:06 +00:00
INT32 laim, th, tspeed, forward, side, axis; //i
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
const INT32 speed = 1;
// these ones used for multiple conditions
Cut this down slightly
2018-12-06 01:54:58 +00:00
boolean turnleft, turnright, mouseaiming, analogjoystickmove, gamepadjoystickmove;
boolean invertmouse, lookaxis, usejoystick, kbl, rd;
A lot lol The importants: - Fixed compiling - Combined G_BuildTiccmd for all players, no more need for a function for each - You can actually start 3p/4p mode
2017-12-17 03:32:43 +00:00
player_t *player;
camera_t *thiscam;
angle_t lang;
static INT32 turnheld, turnheld2, turnheld3, turnheld4; // for accelerative turning
static boolean keyboard_look, keyboard_look2, keyboard_look3, keyboard_look4; // true if lookup/down using keyboard
Restore gc_camrotate Sorry if this breaks everyone's configs again :V
2018-05-30 20:54:59 +00:00
static boolean resetdown, resetdown2, resetdown3, resetdown4; // don't cam reset every frame
A lot lol The importants: - Fixed compiling - Combined G_BuildTiccmd for all players, no more need for a function for each - You can actually start 3p/4p mode
2017-12-17 03:32:43 +00:00
Camera adjustin's - Look backward button works - Increased default cam_speed, from 0.3 to 0.45. This is the highest value that I think doesn't look overly stiff. - Removed bobbing in first person I was trying to do the camera angle thing that we've been talking about for a while, but I can't get it to work well.
2018-01-22 22:08:31 +00:00
switch (ssplayer)
A lot lol The importants: - Fixed compiling - Combined G_BuildTiccmd for all players, no more need for a function for each - You can actually start 3p/4p mode
2017-12-17 03:32:43 +00:00
{
Camera adjustin's - Look backward button works - Increased default cam_speed, from 0.3 to 0.45. This is the highest value that I think doesn't look overly stiff. - Removed bobbing in first person I was trying to do the camera angle thing that we've been talking about for a while, but I can't get it to work well.
2018-01-22 22:08:31 +00:00
case 2:
player = &players[secondarydisplayplayer];
thiscam = (player->bot == 2 ? &camera : &camera2);
lang = localangle2;
laim = localaiming2;
th = turnheld2;
kbl = keyboard_look2;
Restore gc_camrotate Sorry if this breaks everyone's configs again :V
2018-05-30 20:54:59 +00:00
rd = resetdown2;
Camera adjustin's - Look backward button works - Increased default cam_speed, from 0.3 to 0.45. This is the highest value that I think doesn't look overly stiff. - Removed bobbing in first person I was trying to do the camera angle thing that we've been talking about for a while, but I can't get it to work well.
2018-01-22 22:08:31 +00:00
G_CopyTiccmd(cmd, I_BaseTiccmd2(), 1);
break;
case 3:
player = &players[thirddisplayplayer];
thiscam = &camera3;
lang = localangle3;
laim = localaiming3;
th = turnheld3;
kbl = keyboard_look3;
Restore gc_camrotate Sorry if this breaks everyone's configs again :V
2018-05-30 20:54:59 +00:00
rd = resetdown3;
Camera adjustin's - Look backward button works - Increased default cam_speed, from 0.3 to 0.45. This is the highest value that I think doesn't look overly stiff. - Removed bobbing in first person I was trying to do the camera angle thing that we've been talking about for a while, but I can't get it to work well.
2018-01-22 22:08:31 +00:00
G_CopyTiccmd(cmd, I_BaseTiccmd3(), 1);
break;
case 4:
player = &players[fourthdisplayplayer];
thiscam = &camera4;
lang = localangle4;
laim = localaiming4;
th = turnheld4;
kbl = keyboard_look4;
Restore gc_camrotate Sorry if this breaks everyone's configs again :V
2018-05-30 20:54:59 +00:00
rd = resetdown4;
Camera adjustin's - Look backward button works - Increased default cam_speed, from 0.3 to 0.45. This is the highest value that I think doesn't look overly stiff. - Removed bobbing in first person I was trying to do the camera angle thing that we've been talking about for a while, but I can't get it to work well.
2018-01-22 22:08:31 +00:00
G_CopyTiccmd(cmd, I_BaseTiccmd4(), 1);
break;
case 1:
default:
player = &players[consoleplayer];
thiscam = &camera;
lang = localangle;
laim = localaiming;
th = turnheld;
kbl = keyboard_look;
Restore gc_camrotate Sorry if this breaks everyone's configs again :V
2018-05-30 20:54:59 +00:00
rd = resetdown;
Camera adjustin's - Look backward button works - Increased default cam_speed, from 0.3 to 0.45. This is the highest value that I think doesn't look overly stiff. - Removed bobbing in first person I was trying to do the camera angle thing that we've been talking about for a while, but I can't get it to work well.
2018-01-22 22:08:31 +00:00
G_CopyTiccmd(cmd, I_BaseTiccmd(), 1); // empty, or external driver
break;
A lot lol The importants: - Fixed compiling - Combined G_BuildTiccmd for all players, no more need for a function for each - You can actually start 3p/4p mode
2017-12-17 03:32:43 +00:00
}
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.
Stop players from being able to turn during any resynch, player join, or disconeccting/lag spikes. Stops us from endless drift turning or our turns being broken by lag. Also disable the lagless camera of SRB2 as lag spikes make it look a bit wonky and jerky.
2018-01-19 02:47:10 +00:00
// Kart, don't build a ticcmd if someone is resynching or the server is stopped too so we don't fly off course in bad conditions
if (paused || P_AutoPause() || (gamestate == GS_LEVEL && player->playerstate == PST_REBORN) || hu_resynching)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
A lot lol The importants: - Fixed compiling - Combined G_BuildTiccmd for all players, no more need for a function for each - You can actually start 3p/4p mode
2017-12-17 03:32:43 +00:00
cmd->angleturn = (INT16)(lang >> 16);
cmd->aiming = G_ClipAimingPitch(&laim);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return;
}
Camera adjustin's - Look backward button works - Increased default cam_speed, from 0.3 to 0.45. This is the highest value that I think doesn't look overly stiff. - Removed bobbing in first person I was trying to do the camera angle thing that we've been talking about for a while, but I can't get it to work well.
2018-01-22 22:08:31 +00:00
switch (ssplayer)
A lot lol The importants: - Fixed compiling - Combined G_BuildTiccmd for all players, no more need for a function for each - You can actually start 3p/4p mode
2017-12-17 03:32:43 +00:00
{
Camera adjustin's - Look backward button works - Increased default cam_speed, from 0.3 to 0.45. This is the highest value that I think doesn't look overly stiff. - Removed bobbing in first person I was trying to do the camera angle thing that we've been talking about for a while, but I can't get it to work well.
2018-01-22 22:08:31 +00:00
case 2:
Merge remote-tracking branch 'refs/remotes/origin/master' into menus-cvars-unlocks # Conflicts: # src/g_game.c # src/m_cheat.c # src/p_user.c
2018-01-24 21:24:36 +00:00
mouseaiming = player->spectator; //(PLAYER2INPUTDOWN(gc_mouseaiming)) ^ cv_alwaysfreelook2.value;
Camera adjustin's - Look backward button works - Increased default cam_speed, from 0.3 to 0.45. This is the highest value that I think doesn't look overly stiff. - Removed bobbing in first person I was trying to do the camera angle thing that we've been talking about for a while, but I can't get it to work well.
2018-01-22 22:08:31 +00:00
invertmouse = cv_invertmouse2.value;
lookaxis = cv_lookaxis2.value;
analogjoystickmove = cv_usejoystick2.value && !Joystick2.bGamepadStyle;
gamepadjoystickmove = cv_usejoystick2.value && Joystick2.bGamepadStyle;
break;
case 3:
mouseaiming = false;
invertmouse = false;
lookaxis = cv_lookaxis3.value;
analogjoystickmove = cv_usejoystick3.value && !Joystick3.bGamepadStyle;
gamepadjoystickmove = cv_usejoystick3.value && Joystick3.bGamepadStyle;
break;
case 4:
mouseaiming = false;
invertmouse = false;
lookaxis = cv_lookaxis4.value;
analogjoystickmove = cv_usejoystick4.value && !Joystick4.bGamepadStyle;
gamepadjoystickmove = cv_usejoystick4.value && Joystick4.bGamepadStyle;
break;
case 1:
default:
Merge remote-tracking branch 'refs/remotes/origin/master' into menus-cvars-unlocks # Conflicts: # src/g_game.c # src/m_cheat.c # src/p_user.c
2018-01-24 21:24:36 +00:00
mouseaiming = player->spectator; //(PLAYER1INPUTDOWN(gc_mouseaiming)) ^ cv_alwaysfreelook.value;
Camera adjustin's - Look backward button works - Increased default cam_speed, from 0.3 to 0.45. This is the highest value that I think doesn't look overly stiff. - Removed bobbing in first person I was trying to do the camera angle thing that we've been talking about for a while, but I can't get it to work well.
2018-01-22 22:08:31 +00:00
invertmouse = cv_invertmouse.value;
lookaxis = cv_lookaxis.value;
analogjoystickmove = cv_usejoystick.value && !Joystick.bGamepadStyle;
gamepadjoystickmove = cv_usejoystick.value && Joystick.bGamepadStyle;
break;
A lot lol The importants: - Fixed compiling - Combined G_BuildTiccmd for all players, no more need for a function for each - You can actually start 3p/4p mode
2017-12-17 03:32:43 +00:00
}
Fix splitscreen joystick
2018-07-03 19:32:26 +00:00
usejoystick = (analogjoystickmove || gamepadjoystickmove);
A lot lol The importants: - Fixed compiling - Combined G_BuildTiccmd for all players, no more need for a function for each - You can actually start 3p/4p mode
2017-12-17 03:32:43 +00:00
turnright = InputDown(gc_turnright, ssplayer);
turnleft = InputDown(gc_turnleft, ssplayer);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
A lot lol The importants: - Fixed compiling - Combined G_BuildTiccmd for all players, no more need for a function for each - You can actually start 3p/4p mode
2017-12-17 03:32:43 +00:00
axis = JoyAxis(AXISTURN, ssplayer);
Mirror Mode - Added kartmirror cvar, flips the screen & player controls. The post-processing effect is currently Software only; will need an OpenGL implementation but I don't know enough to make that happen - Moved adminplayer = -1 setting to SV_ResetServer instead of SV_StartServer
2017-12-12 05:07:14 +00:00
Encore mode - a fresh take on mirror mode! * Palette remaps. * Branding. TODO: * Doesn't work in GL. (Mostly.) I have SOME ideas on how to tackle this, but... * Transmaps are broken in Encore for some reason. * I tried to make in-level colormaps shimmy over, but it didn't quite work, so I commented it out and only semi-fixed it.
2018-07-23 22:50:41 +00:00
if (encoremode)
Mirror Mode - Added kartmirror cvar, flips the screen & player controls. The post-processing effect is currently Software only; will need an OpenGL implementation but I don't know enough to make that happen - Moved adminplayer = -1 setting to SV_ResetServer instead of SV_StartServer
2017-12-12 05:07:14 +00:00
{
Merge remote-tracking branch 'refs/remotes/origin/battle' into quads # Conflicts: # src/g_game.c # src/k_kart.c
2017-12-18 06:02:53 +00:00
turnright ^= turnleft; // swap these using three XORs
turnleft ^= turnright;
turnright ^= turnleft;
Mirror Mode - Added kartmirror cvar, flips the screen & player controls. The post-processing effect is currently Software only; will need an OpenGL implementation but I don't know enough to make that happen - Moved adminplayer = -1 setting to SV_ResetServer instead of SV_StartServer
2017-12-12 05:07:14 +00:00
axis = -axis;
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (gamepadjoystickmove && axis != 0)
{
turnright = turnright || (axis > 0);
turnleft = turnleft || (axis < 0);
}
forward = side = 0;
// use two stage accelerative turning
// on the keyboard and joystick
if (turnleft || turnright)
A lot lol The importants: - Fixed compiling - Combined G_BuildTiccmd for all players, no more need for a function for each - You can actually start 3p/4p mode
2017-12-17 03:32:43 +00:00
th += realtics;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
else
A lot lol The importants: - Fixed compiling - Combined G_BuildTiccmd for all players, no more need for a function for each - You can actually start 3p/4p mode
2017-12-17 03:32:43 +00:00
th = 0;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
A lot lol The importants: - Fixed compiling - Combined G_BuildTiccmd for all players, no more need for a function for each - You can actually start 3p/4p mode
2017-12-17 03:32:43 +00:00
if (th < SLOWTURNTICS)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
tspeed = 2; // slow turn
else
tspeed = speed;
Lots of cmd restructuring. - cmd->driftturn exists now, for figuring out how far you're turning. Added to prevent analog sticks from being able to get drift sparks faster. - Feather bounce strafing moved to use cmd->sidemove, which means it also supports analog now. - Braking now waits a few tics for you to be stopped for a few tics before it lets you go in reverse, as per Sev's request. - Removed a lot of unused/redundant/commented out control code, and reorganized some of the existing code.
2018-06-05 21:12:42 +00:00
cmd->driftturn = 0;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// let movement keys cancel each other out
Lots of cmd restructuring. - cmd->driftturn exists now, for figuring out how far you're turning. Added to prevent analog sticks from being able to get drift sparks faster. - Feather bounce strafing moved to use cmd->sidemove, which means it also supports analog now. - Braking now waits a few tics for you to be stopped for a few tics before it lets you go in reverse, as per Sev's request. - Removed a lot of unused/redundant/commented out control code, and reorganized some of the existing code.
2018-06-05 21:12:42 +00:00
if (turnright && !(turnleft))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Don't multiply driftturn by realtics (I also moved multiplying angleturn to a single spot)
2019-01-16 02:19:25 +00:00
cmd->angleturn = (INT16)(cmd->angleturn - (angleturn[tspeed]));
cmd->driftturn = (INT16)(cmd->driftturn - (angleturn[tspeed]));
Move some sidemove/forwardmove checks to playsim code rather than have them happen in ticcmd generation. pGetPlayerControlDirection has to die since it was the only other usage of sidemove, and wasn't even relevant anymore anyways.
2018-12-18 18:05:11 +00:00
side += sidemove[1];
Lots of cmd restructuring. - cmd->driftturn exists now, for figuring out how far you're turning. Added to prevent analog sticks from being able to get drift sparks faster. - Feather bounce strafing moved to use cmd->sidemove, which means it also supports analog now. - Braking now waits a few tics for you to be stopped for a few tics before it lets you go in reverse, as per Sev's request. - Removed a lot of unused/redundant/commented out control code, and reorganized some of the existing code.
2018-06-05 21:12:42 +00:00
}
else if (turnleft && !(turnright))
{
Don't multiply driftturn by realtics (I also moved multiplying angleturn to a single spot)
2019-01-16 02:19:25 +00:00
cmd->angleturn = (INT16)(cmd->angleturn + (angleturn[tspeed]));
cmd->driftturn = (INT16)(cmd->driftturn + (angleturn[tspeed]));
Move some sidemove/forwardmove checks to playsim code rather than have them happen in ticcmd generation. pGetPlayerControlDirection has to die since it was the only other usage of sidemove, and wasn't even relevant anymore anyways.
2018-12-18 18:05:11 +00:00
side -= sidemove[1];
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
Lots of cmd restructuring. - cmd->driftturn exists now, for figuring out how far you're turning. Added to prevent analog sticks from being able to get drift sparks faster. - Feather bounce strafing moved to use cmd->sidemove, which means it also supports analog now. - Braking now waits a few tics for you to be stopped for a few tics before it lets you go in reverse, as per Sev's request. - Removed a lot of unused/redundant/commented out control code, and reorganized some of the existing code.
2018-06-05 21:12:42 +00:00
if (analogjoystickmove && axis != 0)
{
// JOYAXISRANGE should be 1023 (divide by 1024)
Don't multiply driftturn by realtics (I also moved multiplying angleturn to a single spot)
2019-01-16 02:19:25 +00:00
cmd->angleturn = (INT16)(cmd->angleturn - (((axis * angleturn[1]) >> 10))); // ANALOG!
cmd->driftturn = (INT16)(cmd->driftturn - (((axis * angleturn[1]) >> 10)));
Move some sidemove/forwardmove checks to playsim code rather than have them happen in ticcmd generation. pGetPlayerControlDirection has to die since it was the only other usage of sidemove, and wasn't even relevant anymore anyways.
2018-12-18 18:05:11 +00:00
side += ((axis * sidemove[0]) >> 10);
Lots of cmd restructuring. - cmd->driftturn exists now, for figuring out how far you're turning. Added to prevent analog sticks from being able to get drift sparks faster. - Feather bounce strafing moved to use cmd->sidemove, which means it also supports analog now. - Braking now waits a few tics for you to be stopped for a few tics before it lets you go in reverse, as per Sev's request. - Removed a lot of unused/redundant/commented out control code, and reorganized some of the existing code.
2018-06-05 21:12:42 +00:00
}
A lot lol The importants: - Fixed compiling - Combined G_BuildTiccmd for all players, no more need for a function for each - You can actually start 3p/4p mode
2017-12-17 03:32:43 +00:00
Lots of cmd restructuring. - cmd->driftturn exists now, for figuring out how far you're turning. Added to prevent analog sticks from being able to get drift sparks faster. - Feather bounce strafing moved to use cmd->sidemove, which means it also supports analog now. - Braking now waits a few tics for you to be stopped for a few tics before it lets you go in reverse, as per Sev's request. - Removed a lot of unused/redundant/commented out control code, and reorganized some of the existing code.
2018-06-05 21:12:42 +00:00
// Specator mouse turning
if (player->spectator)
{
Don't multiply driftturn by realtics (I also moved multiplying angleturn to a single spot)
2019-01-16 02:19:25 +00:00
cmd->angleturn = (INT16)(cmd->angleturn - ((mousex*(encoremode ? -1 : 1)*8)));
cmd->driftturn = (INT16)(cmd->driftturn - ((mousex*(encoremode ? -1 : 1)*8)));
Lots of cmd restructuring. - cmd->driftturn exists now, for figuring out how far you're turning. Added to prevent analog sticks from being able to get drift sparks faster. - Feather bounce strafing moved to use cmd->sidemove, which means it also supports analog now. - Braking now waits a few tics for you to be stopped for a few tics before it lets you go in reverse, as per Sev's request. - Removed a lot of unused/redundant/commented out control code, and reorganized some of the existing code.
2018-06-05 21:12:42 +00:00
}
A lot lol The importants: - Fixed compiling - Combined G_BuildTiccmd for all players, no more need for a function for each - You can actually start 3p/4p mode
2017-12-17 03:32:43 +00:00
Spectating is properly implemented now - Spectate button works - Spectating & objectplace controls are usable now - New spectator HUD
2018-01-23 03:18:57 +00:00
if (player->spectator || objectplacing) // SRB2Kart: spectators need special controls
Some drift code, some control code
2016-08-21 21:55:35 +00:00
{
Potentially fix spectators floating when inputting right on the analog stick.
2018-12-02 08:01:06 +00:00
axis = JoyAxis(AXISMOVE, ssplayer);
Fix splitscreen joystick
2018-07-03 19:32:26 +00:00
if (InputDown(gc_accelerate, ssplayer) || (usejoystick && axis > 0))
Spectating is properly implemented now - Spectate button works - Spectating & objectplace controls are usable now - New spectator HUD
2018-01-23 03:18:57 +00:00
cmd->buttons |= BT_ACCELERATE;
AXISBRAKE, take out GameController stuff for now
2018-12-03 01:33:09 +00:00
axis = JoyAxis(AXISBRAKE, ssplayer);
Fix splitscreen joystick
2018-07-03 19:32:26 +00:00
if (InputDown(gc_brake, ssplayer) || (usejoystick && axis > 0))
Spectating is properly implemented now - Spectate button works - Spectating & objectplace controls are usable now - New spectator HUD
2018-01-23 03:18:57 +00:00
cmd->buttons |= BT_BRAKE;
Better gamepad axis support
2018-03-11 22:07:28 +00:00
axis = JoyAxis(AXISAIM, ssplayer);
Fix splitscreen joystick
2018-07-03 19:32:26 +00:00
if (InputDown(gc_aimforward, ssplayer) || (usejoystick && axis < 0))
Spectating is properly implemented now - Spectate button works - Spectating & objectplace controls are usable now - New spectator HUD
2018-01-23 03:18:57 +00:00
forward += forwardmove[1];
Fix splitscreen joystick
2018-07-03 19:32:26 +00:00
if (InputDown(gc_aimbackward, ssplayer) || (usejoystick && axis > 0))
Spectating is properly implemented now - Spectate button works - Spectating & objectplace controls are usable now - New spectator HUD
2018-01-23 03:18:57 +00:00
forward -= forwardmove[1];
Some drift code, some control code
2016-08-21 21:55:35 +00:00
}
Spectating is properly implemented now - Spectate button works - Spectating & objectplace controls are usable now - New spectator HUD
2018-01-23 03:18:57 +00:00
else
Some drift code, some control code
2016-08-21 21:55:35 +00:00
{
Spectating is properly implemented now - Spectate button works - Spectating & objectplace controls are usable now - New spectator HUD
2018-01-23 03:18:57 +00:00
// forward with key or button // SRB2kart - we use an accel/brake instead of forward/backward.
Better gamepad axis support
2018-03-11 22:07:28 +00:00
axis = JoyAxis(AXISMOVE, ssplayer);
Merge remote-tracking branch 'refs/remotes/origin/master' into sonicitems # Conflicts: # src/d_netcmd.c # src/g_game.c # src/k_kart.c # src/p_enemy.c # src/p_inter.c # src/p_map.c # src/p_user.c # src/sounds.c # src/sounds.h # src/y_inter.c
2018-03-12 04:58:13 +00:00
if (InputDown(gc_accelerate, ssplayer) || (gamepadjoystickmove && axis > 0) || player->kartstuff[k_sneakertimer])
Spectating is properly implemented now - Spectate button works - Spectating & objectplace controls are usable now - New spectator HUD
2018-01-23 03:18:57 +00:00
{
cmd->buttons |= BT_ACCELERATE;
forward = forwardmove[1]; // 50
}
Better gamepad axis support
2018-03-11 22:07:28 +00:00
else if (analogjoystickmove && axis > 0)
{
cmd->buttons |= BT_ACCELERATE;
// JOYAXISRANGE is supposed to be 1023 (divide by 1024)
forward += ((axis * forwardmove[1]) >> 10)*2;
}
Restructured some ticcmd stuff, temporary keyboard defaults, commented out mouse options menu No more weapon number buttons, button constants reordered, and BT_JUMP renamed to BT_DRIFT, and removed a lot of commented out stuff or stuff we didn't need. Spectator-only support for looking up/down soon. Keyboard defaults are just what I use, plan on adjusting it further after more feedback
2018-01-24 07:45:06 +00:00
Better gamepad axis support
2018-03-11 22:07:28 +00:00
axis = JoyAxis(AXISBRAKE, ssplayer);
if (InputDown(gc_brake, ssplayer) || (gamepadjoystickmove && axis > 0))
Spectating is properly implemented now - Spectate button works - Spectating & objectplace controls are usable now - New spectator HUD
2018-01-23 03:18:57 +00:00
{
cmd->buttons |= BT_BRAKE;
if (cmd->buttons & BT_ACCELERATE || cmd->forwardmove <= 0)
forward -= forwardmove[0]; // 25 - Halved value so clutching is possible
}
Better gamepad axis support
2018-03-11 22:07:28 +00:00
else if (analogjoystickmove && axis > 0)
{
cmd->buttons |= BT_BRAKE;
// JOYAXISRANGE is supposed to be 1023 (divide by 1024)
if (cmd->buttons & BT_ACCELERATE || cmd->forwardmove <= 0)
forward -= ((axis * forwardmove[0]) >> 10);
}
Restructured some ticcmd stuff, temporary keyboard defaults, commented out mouse options menu No more weapon number buttons, button constants reordered, and BT_JUMP renamed to BT_DRIFT, and removed a lot of commented out stuff or stuff we didn't need. Spectator-only support for looking up/down soon. Keyboard defaults are just what I use, plan on adjusting it further after more feedback
2018-01-24 07:45:06 +00:00
Spectating is properly implemented now - Spectate button works - Spectating & objectplace controls are usable now - New spectator HUD
2018-01-23 03:18:57 +00:00
// But forward/backward IS used for aiming.
Better gamepad axis support
2018-03-11 22:07:28 +00:00
axis = JoyAxis(AXISAIM, ssplayer);
Fix splitscreen joystick
2018-07-03 19:32:26 +00:00
if (InputDown(gc_aimforward, ssplayer) || (usejoystick && axis < 0))
Spectating is properly implemented now - Spectate button works - Spectating & objectplace controls are usable now - New spectator HUD
2018-01-23 03:18:57 +00:00
cmd->buttons |= BT_FORWARD;
Fix splitscreen joystick
2018-07-03 19:32:26 +00:00
if (InputDown(gc_aimbackward, ssplayer) || (usejoystick && axis > 0))
Spectating is properly implemented now - Spectate button works - Spectating & objectplace controls are usable now - New spectator HUD
2018-01-23 03:18:57 +00:00
cmd->buttons |= BT_BACKWARD;
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// fire with any button/key
A lot lol The importants: - Fixed compiling - Combined G_BuildTiccmd for all players, no more need for a function for each - You can actually start 3p/4p mode
2017-12-17 03:32:43 +00:00
axis = JoyAxis(AXISFIRE, ssplayer);
Fix splitscreen joystick
2018-07-03 19:32:26 +00:00
if (InputDown(gc_fire, ssplayer) || (usejoystick && axis > 0))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
cmd->buttons |= BT_ATTACK;
Lots of cmd restructuring. - cmd->driftturn exists now, for figuring out how far you're turning. Added to prevent analog sticks from being able to get drift sparks faster. - Feather bounce strafing moved to use cmd->sidemove, which means it also supports analog now. - Braking now waits a few tics for you to be stopped for a few tics before it lets you go in reverse, as per Sev's request. - Removed a lot of unused/redundant/commented out control code, and reorganized some of the existing code.
2018-06-05 21:12:42 +00:00
// drift with any button/key
Better gamepad axis support
2018-03-11 22:07:28 +00:00
axis = JoyAxis(AXISDRIFT, ssplayer);
Fix splitscreen joystick
2018-07-03 19:32:26 +00:00
if (InputDown(gc_drift, ssplayer) || (usejoystick && axis > 0))
Merge remote-tracking branch 'refs/remotes/origin/master' into menus-cvars-unlocks # Conflicts: # src/g_game.c # src/m_cheat.c # src/p_user.c
2018-01-24 21:24:36 +00:00
cmd->buttons |= BT_DRIFT;
It's SINT8 not INT8
2018-02-23 01:04:52 +00:00
SRB2 2.1.5 release
2014-03-23 16:00:29 +00:00
// Lua scriptable buttons
A lot lol The importants: - Fixed compiling - Combined G_BuildTiccmd for all players, no more need for a function for each - You can actually start 3p/4p mode
2017-12-17 03:32:43 +00:00
if (InputDown(gc_custom1, ssplayer))
SRB2 2.1.5 release
2014-03-23 16:00:29 +00:00
cmd->buttons |= BT_CUSTOM1;
A lot lol The importants: - Fixed compiling - Combined G_BuildTiccmd for all players, no more need for a function for each - You can actually start 3p/4p mode
2017-12-17 03:32:43 +00:00
if (InputDown(gc_custom2, ssplayer))
SRB2 2.1.5 release
2014-03-23 16:00:29 +00:00
cmd->buttons |= BT_CUSTOM2;
A lot lol The importants: - Fixed compiling - Combined G_BuildTiccmd for all players, no more need for a function for each - You can actually start 3p/4p mode
2017-12-17 03:32:43 +00:00
if (InputDown(gc_custom3, ssplayer))
SRB2 2.1.5 release
2014-03-23 16:00:29 +00:00
cmd->buttons |= BT_CUSTOM3;
Lots of cmd restructuring. - cmd->driftturn exists now, for figuring out how far you're turning. Added to prevent analog sticks from being able to get drift sparks faster. - Feather bounce strafing moved to use cmd->sidemove, which means it also supports analog now. - Braking now waits a few tics for you to be stopped for a few tics before it lets you go in reverse, as per Sev's request. - Removed a lot of unused/redundant/commented out control code, and reorganized some of the existing code.
2018-06-05 21:12:42 +00:00
// Reset camera
Restore gc_camrotate Sorry if this breaks everyone's configs again :V
2018-05-30 20:54:59 +00:00
if (InputDown(gc_camreset, ssplayer))
{
if (thiscam->chase && !rd)
P_ResetCamera(player, thiscam);
rd = true;
}
else
rd = false;
Lots of cmd restructuring. - cmd->driftturn exists now, for figuring out how far you're turning. Added to prevent analog sticks from being able to get drift sparks faster. - Feather bounce strafing moved to use cmd->sidemove, which means it also supports analog now. - Braking now waits a few tics for you to be stopped for a few tics before it lets you go in reverse, as per Sev's request. - Removed a lot of unused/redundant/commented out control code, and reorganized some of the existing code.
2018-06-05 21:12:42 +00:00
// spectator aiming shit, ahhhh...
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
A lot lol The importants: - Fixed compiling - Combined G_BuildTiccmd for all players, no more need for a function for each - You can actually start 3p/4p mode
2017-12-17 03:32:43 +00:00
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)
A lot lol The importants: - Fixed compiling - Combined G_BuildTiccmd for all players, no more need for a function for each - You can actually start 3p/4p mode
2017-12-17 03:32:43 +00:00
&& (!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
// mouse look stuff (mouse look is not the same as mouse aim)
Spectator-only looking, fixed crosshairs
2018-01-24 21:53:20 +00:00
if (mouseaiming && player->spectator)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
A lot lol The importants: - Fixed compiling - Combined G_BuildTiccmd for all players, no more need for a function for each - You can actually start 3p/4p mode
2017-12-17 03:32:43 +00:00
kbl = false;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// looking up/down
A lot lol The importants: - Fixed compiling - Combined G_BuildTiccmd for all players, no more need for a function for each - You can actually start 3p/4p mode
2017-12-17 03:32:43 +00:00
laim += (mlooky<<19)*player_invert*screen_invert;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
A lot lol The importants: - Fixed compiling - Combined G_BuildTiccmd for all players, no more need for a function for each - You can actually start 3p/4p mode
2017-12-17 03:32:43 +00:00
axis = JoyAxis(AXISLOOK, ssplayer);
Spectator-only looking, fixed crosshairs
2018-01-24 21:53:20 +00:00
if (analogjoystickmove && axis != 0 && lookaxis && player->spectator)
A lot lol The importants: - Fixed compiling - Combined G_BuildTiccmd for all players, no more need for a function for each - You can actually start 3p/4p mode
2017-12-17 03:32:43 +00:00
laim += (axis<<16) * screen_invert;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// spring back if not using keyboard neither mouselookin'
A lot lol The importants: - Fixed compiling - Combined G_BuildTiccmd for all players, no more need for a function for each - You can actually start 3p/4p mode
2017-12-17 03:32:43 +00:00
if (!kbl && !lookaxis && !mouseaiming)
laim = 0;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Spectator-only looking, fixed crosshairs
2018-01-24 21:53:20 +00:00
if (player->spectator)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Spectator-only looking, fixed crosshairs
2018-01-24 21:53:20 +00:00
if (InputDown(gc_lookup, ssplayer) || (gamepadjoystickmove && axis < 0))
{
laim += KB_LOOKSPEED * screen_invert;
kbl = true;
}
else if (InputDown(gc_lookdown, ssplayer) || (gamepadjoystickmove && axis > 0))
{
laim -= KB_LOOKSPEED * screen_invert;
kbl = true;
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
Spectator-only looking, fixed crosshairs
2018-01-24 21:53:20 +00:00
if (InputDown(gc_centerview, ssplayer)) // No need to put a spectator limit on this one though :V
A lot lol The importants: - Fixed compiling - Combined G_BuildTiccmd for all players, no more need for a function for each - You can actually start 3p/4p mode
2017-12-17 03:32:43 +00:00
laim = 0;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// accept no mlook for network games
if (!cv_allowmlook.value)
A lot lol The importants: - Fixed compiling - Combined G_BuildTiccmd for all players, no more need for a function for each - You can actually start 3p/4p mode
2017-12-17 03:32:43 +00:00
laim = 0;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
A lot lol The importants: - Fixed compiling - Combined G_BuildTiccmd for all players, no more need for a function for each - You can actually start 3p/4p mode
2017-12-17 03:32:43 +00:00
cmd->aiming = G_ClipAimingPitch(&laim);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
mousex = mousey = mlooky = 0;
lj dm'd me so here's a second, more sensible crack at it
2018-12-18 19:40:38 +00:00
if (forward > MAXPLMOVE)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
forward = MAXPLMOVE;
else if (forward < -MAXPLMOVE)
forward = -MAXPLMOVE;
Lots of cmd restructuring. - cmd->driftturn exists now, for figuring out how far you're turning. Added to prevent analog sticks from being able to get drift sparks faster. - Feather bounce strafing moved to use cmd->sidemove, which means it also supports analog now. - Braking now waits a few tics for you to be stopped for a few tics before it lets you go in reverse, as per Sev's request. - Removed a lot of unused/redundant/commented out control code, and reorganized some of the existing code.
2018-06-05 21:12:42 +00:00
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (side > MAXPLMOVE)
side = MAXPLMOVE;
else if (side < -MAXPLMOVE)
lj dm'd me so here's a second, more sensible crack at it
2018-12-18 19:40:38 +00:00
side = -MAXPLMOVE;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Lots of cmd restructuring. - cmd->driftturn exists now, for figuring out how far you're turning. Added to prevent analog sticks from being able to get drift sparks faster. - Feather bounce strafing moved to use cmd->sidemove, which means it also supports analog now. - Braking now waits a few tics for you to be stopped for a few tics before it lets you go in reverse, as per Sev's request. - Removed a lot of unused/redundant/commented out control code, and reorganized some of the existing code.
2018-06-05 21:12:42 +00:00
if (forward || side)
Fixed brakes
2018-01-22 23:39:53 +00:00
{
cmd->forwardmove = (SINT8)(cmd->forwardmove + forward);
Lots of cmd restructuring. - cmd->driftturn exists now, for figuring out how far you're turning. Added to prevent analog sticks from being able to get drift sparks faster. - Feather bounce strafing moved to use cmd->sidemove, which means it also supports analog now. - Braking now waits a few tics for you to be stopped for a few tics before it lets you go in reverse, as per Sev's request. - Removed a lot of unused/redundant/commented out control code, and reorganized some of the existing code.
2018-06-05 21:12:42 +00:00
cmd->sidemove = (SINT8)(cmd->sidemove + side);
Fixed brakes
2018-01-22 23:39:53 +00:00
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Hundreds of tweaks - SPB multiplier depending on 1st-2nd distance - Removed the Battle-only k_poweritemtimer (hold over from when you could easily get invuln items all of the time), replaced it with a 2 invincibility item cap in ALL modes. - Spinout is affected by boosters, *properly* - Can no longer strafe while spinning out on speed bumps - Messed with how other items interact with speed bumps, again. - Old bounce code has been ported for non-players - Fixed Karma players being able to do anything after the round has ended. - Fixed sneaker and spinout timer weirdness - Fixed Mines still being hold-use - Fixed rubber-burn turn not working - Removed redundant k_spinout and unused k_boosting variables - Filled out the Color_Opposite table with Kart's new colors. Not really relevant right now (besides some extra Lua functionality) since nothing uses it, but will be nice for if we do the signpost from the sky idea.
2018-06-20 00:20:06 +00:00
//{ SRB2kart - Drift support
// Not grouped with the rest of turn stuff because it needs to know what buttons you're pressing for rubber-burn turn
// limit turning to angleturn[1] to stop mouselook letting you look too fast
Don't multiply driftturn by realtics (I also moved multiplying angleturn to a single spot)
2019-01-16 02:19:25 +00:00
if (cmd->angleturn > (angleturn[1]))
cmd->angleturn = (angleturn[1]);
else if (cmd->angleturn < (-angleturn[1]))
cmd->angleturn = (-angleturn[1]);
Hundreds of tweaks - SPB multiplier depending on 1st-2nd distance - Removed the Battle-only k_poweritemtimer (hold over from when you could easily get invuln items all of the time), replaced it with a 2 invincibility item cap in ALL modes. - Spinout is affected by boosters, *properly* - Can no longer strafe while spinning out on speed bumps - Messed with how other items interact with speed bumps, again. - Old bounce code has been ported for non-players - Fixed Karma players being able to do anything after the round has ended. - Fixed sneaker and spinout timer weirdness - Fixed Mines still being hold-use - Fixed rubber-burn turn not working - Removed redundant k_spinout and unused k_boosting variables - Filled out the Color_Opposite table with Kart's new colors. Not really relevant right now (besides some extra Lua functionality) since nothing uses it, but will be nice for if we do the signpost from the sky idea.
2018-06-20 00:20:06 +00:00
Don't multiply driftturn by realtics (I also moved multiplying angleturn to a single spot)
2019-01-16 02:19:25 +00:00
if (cmd->driftturn > (angleturn[1]))
cmd->driftturn = (angleturn[1]);
else if (cmd->driftturn < (-angleturn[1]))
cmd->driftturn = (-angleturn[1]);
Hundreds of tweaks - SPB multiplier depending on 1st-2nd distance - Removed the Battle-only k_poweritemtimer (hold over from when you could easily get invuln items all of the time), replaced it with a 2 invincibility item cap in ALL modes. - Spinout is affected by boosters, *properly* - Can no longer strafe while spinning out on speed bumps - Messed with how other items interact with speed bumps, again. - Old bounce code has been ported for non-players - Fixed Karma players being able to do anything after the round has ended. - Fixed sneaker and spinout timer weirdness - Fixed Mines still being hold-use - Fixed rubber-burn turn not working - Removed redundant k_spinout and unused k_boosting variables - Filled out the Color_Opposite table with Kart's new colors. Not really relevant right now (besides some extra Lua functionality) since nothing uses it, but will be nice for if we do the signpost from the sky idea.
2018-06-20 00:20:06 +00:00
if (player->mo)
cmd->angleturn = K_GetKartTurnValue(player, cmd->angleturn);
Don't multiply driftturn by realtics (I also moved multiplying angleturn to a single spot)
2019-01-16 02:19:25 +00:00
cmd->angleturn *= realtics;
Hundreds of tweaks - SPB multiplier depending on 1st-2nd distance - Removed the Battle-only k_poweritemtimer (hold over from when you could easily get invuln items all of the time), replaced it with a 2 invincibility item cap in ALL modes. - Spinout is affected by boosters, *properly* - Can no longer strafe while spinning out on speed bumps - Messed with how other items interact with speed bumps, again. - Old bounce code has been ported for non-players - Fixed Karma players being able to do anything after the round has ended. - Fixed sneaker and spinout timer weirdness - Fixed Mines still being hold-use - Fixed rubber-burn turn not working - Removed redundant k_spinout and unused k_boosting variables - Filled out the Color_Opposite table with Kart's new colors. Not really relevant right now (besides some extra Lua functionality) since nothing uses it, but will be nice for if we do the signpost from the sky idea.
2018-06-20 00:20:06 +00:00
// SRB2kart - no additional angle if not moving
if (((player->mo && player->speed > 0) // Moving
Lakitu murder & countdown improvements (I'm not SevenethSentienel! I just don't feel like logging out!)
2018-06-25 02:15:22 +00:00
|| (leveltime > starttime && (cmd->buttons & BT_ACCELERATE && cmd->buttons & BT_BRAKE)) // Rubber-burn turn
Allow turning while respawning This makes rubber-burn turning even more useless, but I don't think there's a way to fix the rubber-burn turn without breaking demo playback, so let's just do the part that is needed for now. I kinda want to redo how that mechanic works anyway.
2018-11-22 01:29:21 +00:00
|| (player->kartstuff[k_respawn]) // Respawning
Hundreds of tweaks - SPB multiplier depending on 1st-2nd distance - Removed the Battle-only k_poweritemtimer (hold over from when you could easily get invuln items all of the time), replaced it with a 2 invincibility item cap in ALL modes. - Spinout is affected by boosters, *properly* - Can no longer strafe while spinning out on speed bumps - Messed with how other items interact with speed bumps, again. - Old bounce code has been ported for non-players - Fixed Karma players being able to do anything after the round has ended. - Fixed sneaker and spinout timer weirdness - Fixed Mines still being hold-use - Fixed rubber-burn turn not working - Removed redundant k_spinout and unused k_boosting variables - Filled out the Color_Opposite table with Kart's new colors. Not really relevant right now (besides some extra Lua functionality) since nothing uses it, but will be nice for if we do the signpost from the sky idea.
2018-06-20 00:20:06 +00:00
|| (player->spectator || objectplacing)) // Not a physical player
Clean-up of unused/removed sfx, replacement of the last remaining Mario sfx, and new sfx in some spots - Replaced eggitem landing sfx - Replaced banana landing sfx - Replaced item tossing sfx - Replaced item clashing sfx - Added sfx for drift spark tier changing - Added sfx for brake drifting - Reverted Mario Mode sound replacement back to vanilla
2018-11-11 22:30:30 +00:00
&& !(player->kartstuff[k_spinouttimer] && player->kartstuff[k_sneakertimer])) // Spinning and boosting cancels out turning
Hundreds of tweaks - SPB multiplier depending on 1st-2nd distance - Removed the Battle-only k_poweritemtimer (hold over from when you could easily get invuln items all of the time), replaced it with a 2 invincibility item cap in ALL modes. - Spinout is affected by boosters, *properly* - Can no longer strafe while spinning out on speed bumps - Messed with how other items interact with speed bumps, again. - Old bounce code has been ported for non-players - Fixed Karma players being able to do anything after the round has ended. - Fixed sneaker and spinout timer weirdness - Fixed Mines still being hold-use - Fixed rubber-burn turn not working - Removed redundant k_spinout and unused k_boosting variables - Filled out the Color_Opposite table with Kart's new colors. Not really relevant right now (besides some extra Lua functionality) since nothing uses it, but will be nice for if we do the signpost from the sky idea.
2018-06-20 00:20:06 +00:00
lang += (cmd->angleturn<<16);
Lots of cmd restructuring. - cmd->driftturn exists now, for figuring out how far you're turning. Added to prevent analog sticks from being able to get drift sparks faster. - Feather bounce strafing moved to use cmd->sidemove, which means it also supports analog now. - Braking now waits a few tics for you to be stopped for a few tics before it lets you go in reverse, as per Sev's request. - Removed a lot of unused/redundant/commented out control code, and reorganized some of the existing code.
2018-06-05 21:12:42 +00:00
cmd->angleturn = (INT16)(lang >> 16);
Here too
2019-01-09 15:07:41 +00:00
cmd->latency = modeattacking ? 0 : (leveltime & 0xFF); // Send leveltime when this tic was generated to the server for control lag calculations
A lot lol The importants: - Fixed compiling - Combined G_BuildTiccmd for all players, no more need for a function for each - You can actually start 3p/4p mode
2017-12-17 03:32:43 +00:00
Stop players from being able to turn during any resynch, player join, or disconeccting/lag spikes. Stops us from endless drift turning or our turns being broken by lag. Also disable the lagless camera of SRB2 as lag spikes make it look a bit wonky and jerky.
2018-01-19 02:47:10 +00:00
if (!hu_stopped)
A lot lol The importants: - Fixed compiling - Combined G_BuildTiccmd for all players, no more need for a function for each - You can actually start 3p/4p mode
2017-12-17 03:32:43 +00:00
{
Merge branch 'master' of http://git.magicalgirl.moe/KartKrew/Kart.git into gameplay-tweaks # Conflicts: # src/g_game.c
2018-02-04 20:39:53 +00:00
switch (ssplayer)
Stop players from being able to turn during any resynch, player join, or disconeccting/lag spikes. Stops us from endless drift turning or our turns being broken by lag. Also disable the lagless camera of SRB2 as lag spikes make it look a bit wonky and jerky.
2018-01-19 02:47:10 +00:00
{
Camera adjustin's - Look backward button works - Increased default cam_speed, from 0.3 to 0.45. This is the highest value that I think doesn't look overly stiff. - Removed bobbing in first person I was trying to do the camera angle thing that we've been talking about for a while, but I can't get it to work well.
2018-01-22 22:08:31 +00:00
case 2:
localangle2 = lang;
localaiming2 = laim;
keyboard_look2 = kbl;
turnheld2 = th;
Restore gc_camrotate Sorry if this breaks everyone's configs again :V
2018-05-30 20:54:59 +00:00
resetdown2 = rd;
Camera adjustin's - Look backward button works - Increased default cam_speed, from 0.3 to 0.45. This is the highest value that I think doesn't look overly stiff. - Removed bobbing in first person I was trying to do the camera angle thing that we've been talking about for a while, but I can't get it to work well.
2018-01-22 22:08:31 +00:00
camspin2 = InputDown(gc_lookback, ssplayer);
break;
case 3:
localangle3 = lang;
localaiming3 = laim;
keyboard_look3 = kbl;
turnheld3 = th;
Restore gc_camrotate Sorry if this breaks everyone's configs again :V
2018-05-30 20:54:59 +00:00
resetdown3 = rd;
Camera adjustin's - Look backward button works - Increased default cam_speed, from 0.3 to 0.45. This is the highest value that I think doesn't look overly stiff. - Removed bobbing in first person I was trying to do the camera angle thing that we've been talking about for a while, but I can't get it to work well.
2018-01-22 22:08:31 +00:00
camspin3 = InputDown(gc_lookback, ssplayer);
break;
case 4:
localangle4 = lang;
localaiming4 = laim;
keyboard_look4 = kbl;
turnheld4 = th;
Restore gc_camrotate Sorry if this breaks everyone's configs again :V
2018-05-30 20:54:59 +00:00
resetdown4 = rd;
Camera adjustin's - Look backward button works - Increased default cam_speed, from 0.3 to 0.45. This is the highest value that I think doesn't look overly stiff. - Removed bobbing in first person I was trying to do the camera angle thing that we've been talking about for a while, but I can't get it to work well.
2018-01-22 22:08:31 +00:00
camspin4 = InputDown(gc_lookback, ssplayer);
break;
case 1:
default:
localangle = lang;
localaiming = laim;
keyboard_look = kbl;
turnheld = th;
Restore gc_camrotate Sorry if this breaks everyone's configs again :V
2018-05-30 20:54:59 +00:00
resetdown = rd;
Camera adjustin's - Look backward button works - Increased default cam_speed, from 0.3 to 0.45. This is the highest value that I think doesn't look overly stiff. - Removed bobbing in first person I was trying to do the camera angle thing that we've been talking about for a while, but I can't get it to work well.
2018-01-22 22:08:31 +00:00
camspin = InputDown(gc_lookback, ssplayer);
break;
Stop players from being able to turn during any resynch, player join, or disconeccting/lag spikes. Stops us from endless drift turning or our turns being broken by lag. Also disable the lagless camera of SRB2 as lag spikes make it look a bit wonky and jerky.
2018-01-19 02:47:10 +00:00
}
A lot lol The importants: - Fixed compiling - Combined G_BuildTiccmd for all players, no more need for a function for each - You can actually start 3p/4p mode
2017-12-17 03:32:43 +00:00
}
Fixed joysticks 3 & 4 fun typos
2017-12-24 20:02:41 +00:00
No more ghetto check, and some more descriptive comments on the Hook
2019-01-26 15:55:26 +00:00
/* Lua: Allow this hook to overwrite ticcmd.
We check if we're actually in a level because for some reason this Hook would run in menus and on the titlescreen otherwise.
Be aware that within this hook, nothing but this player's cmd can be edited (otherwise we'd run in some pretty bad synching problems since this is clientsided, or something)
Possible usages for this are:
-Forcing the player to perform an action, which could otherwise require terrible, terrible hacking to replicate.
-Preventing the player to perform an action, which would ALSO require some weirdo hacks.
-Making some galaxy brain autopilot Lua if you're a masochist
-Making a Mario Kart 8 Deluxe tier baby mode that steers you away from walls and whatnot. You know what, do what you want!
*/
Expose some more Kart functions, freeplay and rankings bumpers are now hud stuff you can toggle, + experimental playercmd hook
2019-01-13 13:40:48 +00:00
#ifdef HAVE_BLUA
No more ghetto check, and some more descriptive comments on the Hook
2019-01-26 15:55:26 +00:00
if (gamestate == GS_LEVEL)
Expose some more Kart functions, freeplay and rankings bumpers are now hud stuff you can toggle, + experimental playercmd hook
2019-01-13 13:40:48 +00:00
LUAh_PlayerCmd(player, cmd);
#endif
A lot lol The importants: - Fixed compiling - Combined G_BuildTiccmd for all players, no more need for a function for each - You can actually start 3p/4p mode
2017-12-17 03:32:43 +00:00
//Reset away view if a command is given.
if ((cmd->forwardmove || cmd->sidemove || cmd->buttons)
&& displayplayer != consoleplayer && ssplayer == 1)
displayplayer = consoleplayer;
Expose some more Kart functions, freeplay and rankings bumpers are now hud stuff you can toggle, + experimental playercmd hook
2019-01-13 13:40:48 +00:00
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)
{
Comment out calls to CV_SetValue for cv_analog
2018-03-12 03:18:45 +00:00
/*if (cv_useranalog.value)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
CV_SetValue(&cv_analog, 1);
else
Comment out calls to CV_SetValue for cv_analog
2018-03-12 03:18:45 +00:00
CV_SetValue(&cv_analog, 0);*/
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
static void UserAnalog2_OnChange(void)
{
if (botingame)
return;
Comment out calls to CV_SetValue for cv_analog
2018-03-12 03:18:45 +00:00
/*if (cv_useranalog2.value)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
CV_SetValue(&cv_analog2, 1);
else
Comment out calls to CV_SetValue for cv_analog
2018-03-12 03:18:45 +00:00
CV_SetValue(&cv_analog2, 0);*/
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
more quad stuff
2017-12-11 06:12:38 +00:00
static void UserAnalog3_OnChange(void)
{
if (botingame)
return;
Comment out calls to CV_SetValue for cv_analog
2018-03-12 03:18:45 +00:00
/*if (cv_useranalog3.value)
more quad stuff
2017-12-11 06:12:38 +00:00
CV_SetValue(&cv_analog3, 1);
else
Comment out calls to CV_SetValue for cv_analog
2018-03-12 03:18:45 +00:00
CV_SetValue(&cv_analog3, 0);*/
more quad stuff
2017-12-11 06:12:38 +00:00
}
static void UserAnalog4_OnChange(void)
{
if (botingame)
return;
Comment out calls to CV_SetValue for cv_analog
2018-03-12 03:18:45 +00:00
/*if (cv_useranalog4.value)
more quad stuff
2017-12-11 06:12:38 +00:00
CV_SetValue(&cv_analog4, 1);
else
Comment out calls to CV_SetValue for cv_analog
2018-03-12 03:18:45 +00:00
CV_SetValue(&cv_analog4, 0);*/
more quad stuff
2017-12-11 06:12:38 +00:00
}
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
merge srb2 next
2019-01-05 20:59:23 +00:00
/*
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
if (!cv_chasecam.value && cv_analog.value) {
CV_SetValue(&cv_analog, 0);
return;
}
merge srb2 next
2019-01-05 20:59:23 +00:00
*/
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
SendWeaponPref();
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
static void Analog2_OnChange(void)
{
Change splitscreen into UINT8, fix HUD slightly more
2017-12-19 01:59:04 +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
merge srb2 next
2019-01-05 20:59:23 +00:00
/*
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
if (!cv_chasecam2.value && cv_analog2.value) {
CV_SetValue(&cv_analog2, 0);
return;
}
merge srb2 next
2019-01-05 20:59:23 +00:00
*/
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
SendWeaponPref2();
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
more quad stuff
2017-12-11 06:12:38 +00:00
static void Analog3_OnChange(void)
{
Change splitscreen into UINT8, fix HUD slightly more
2017-12-19 01:59:04 +00:00
if (splitscreen < 2 || !cv_cam3_dist.string)
more quad stuff
2017-12-11 06:12:38 +00:00
return;
// cameras are not initialized at this point
merge srb2 next
2019-01-05 20:59:23 +00:00
/*
if (!cv_chasecam3.value && cv_analog3.value) {
more quad stuff
2017-12-11 06:12:38 +00:00
CV_SetValue(&cv_analog3, 0);
return;
merge srb2 next
2019-01-05 20:59:23 +00:00
}
*/
more quad stuff
2017-12-11 06:12:38 +00:00
SendWeaponPref3();
}
static void Analog4_OnChange(void)
{
Change splitscreen into UINT8, fix HUD slightly more
2017-12-19 01:59:04 +00:00
if (splitscreen < 3 || !cv_cam4_dist.string)
more quad stuff
2017-12-11 06:12:38 +00:00
return;
// cameras are not initialized at this point
merge srb2 next
2019-01-05 20:59:23 +00:00
/*
if (!cv_chasecam4.value && cv_analog4.value) {
more quad stuff
2017-12-11 06:12:38 +00:00
CV_SetValue(&cv_analog4, 0);
return;
merge srb2 next
2019-01-05 20:59:23 +00:00
}
*/
more quad stuff
2017-12-11 06:12:38 +00:00
SendWeaponPref4();
}
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();
levelstarttic = gametic; // for time calculation
if (wipegamestate == GS_LEVEL)
wipegamestate = -1; // force a wipe
if (gamestate == GS_INTERMISSION)
Y_EndIntermission();
Work so far Crashes, but baseline's there
2018-01-27 06:17:08 +00:00
if (gamestate == GS_VOTING)
Y_EndVote();
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
G_SetGamestate(GS_LEVEL);
for (i = 0; i < MAXPLAYERS; i++)
{
if (resetplayer || (playeringame[i] && players[i].playerstate == PST_DEAD))
players[i].playerstate = PST_REBORN;
}
// Setup the level.
if (!P_SetupLevel(false))
{
// fail so reset game stuff
Command_ExitGame_f();
return;
}
if (!resetplayer)
P_FindEmerald();
displayplayer = consoleplayer; // view the guy you are playing
Change splitscreen into UINT8, fix HUD slightly more
2017-12-19 01:59:04 +00:00
if (!splitscreen && !botingame)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
secondarydisplayplayer = consoleplayer;
Change splitscreen into UINT8, fix HUD slightly more
2017-12-19 01:59:04 +00:00
if (splitscreen < 2)
A lot lol The importants: - Fixed compiling - Combined G_BuildTiccmd for all players, no more need for a function for each - You can actually start 3p/4p mode
2017-12-17 03:32:43 +00:00
thirddisplayplayer = consoleplayer;
Change splitscreen into UINT8, fix HUD slightly more
2017-12-19 01:59:04 +00:00
if (splitscreen < 3)
A lot lol The importants: - Fixed compiling - Combined G_BuildTiccmd for all players, no more need for a function for each - You can actually start 3p/4p mode
2017-12-17 03:32:43 +00:00
fourthdisplayplayer = consoleplayer;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
gameaction = ga_nothing;
#ifdef PARANOIA
Z_CheckHeap(-2);
#endif
if (camera.chase)
P_ResetCamera(&players[displayplayer], &camera);
Change splitscreen into UINT8, fix HUD slightly more
2017-12-19 01:59:04 +00:00
if (camera2.chase && splitscreen)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
P_ResetCamera(&players[secondarydisplayplayer], &camera2);
Change splitscreen into UINT8, fix HUD slightly more
2017-12-19 01:59:04 +00:00
if (camera3.chase && splitscreen > 1)
more quad stuff
2017-12-11 06:12:38 +00:00
P_ResetCamera(&players[thirddisplayplayer], &camera3);
Change splitscreen into UINT8, fix HUD slightly more
2017-12-19 01:59:04 +00:00
if (camera4.chase && splitscreen > 2)
more quad stuff
2017-12-11 06:12:38 +00:00
P_ResetCamera(&players[fourthdisplayplayer], &camera4);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// 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;
more quad stuff
2017-12-11 06:12:38 +00:00
joy3xmove[i] = joy3ymove[i] = 0;
joy4xmove[i] = joy4ymove[i] = 0;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
mousex = mousey = 0;
mouse2x = mouse2y = 0;
// clear hud messages remains (usually from game startup)
CON_ClearHUD();
}
static INT32 pausedelay = 0;
more quad stuff
2017-12-11 06:12:38 +00:00
static INT32 camtoggledelay, camtoggledelay2, camtoggledelay3, camtoggledelay4 = 0;
Merge remote-tracking branch 'refs/remotes/origin/master' into menus-cvars-unlocks # Conflicts: # src/g_game.c # src/m_cheat.c # src/p_user.c
2018-01-24 21:24:36 +00:00
static INT32 spectatedelay, spectatedelay2, spectatedelay3, spectatedelay4 = 0;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
//
// G_Responder
// Get info needed to make ticcmd_ts for the players.
//
boolean G_Responder(event_t *ev)
{
// allow spy mode changes even during the demo
New bindable keys You can now remap Change Viewpoint, Screenshot, and Toggle GIF Recording to other keys, mainly for gamepads They also pushed me to my breaking point and I couldn't tolerate the control menu anymore, thanks to toaster for the scrolling backport
2018-09-27 20:55:21 +00:00
if (gamestate == GS_LEVEL && ev->type == ev_keydown
Hardcode Screenshot, GIF, and Viewpoint to their F keys
2018-12-03 18:21:16 +00:00
&& (ev->data1 == KEY_F12 || ev->data1 == gamecontrol[gc_viewpoint][0] || ev->data1 == gamecontrol[gc_viewpoint][1]))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Change splitscreen into UINT8, fix HUD slightly more
2017-12-19 01:59:04 +00:00
if (splitscreen || !netgame)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
displayplayer = consoleplayer;
else
{
Foolish
2018-10-05 00:06:55 +00:00
UINT8 i = 0; // spy mode
for (i = 0; i < MAXPLAYERS; i++)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
displayplayer++;
if (displayplayer == MAXPLAYERS)
displayplayer = 0;
Address toast review - Re-add highlighting to the header text, and shift it back up slightly - Move the viewpoint loop break out of a while and into the main loop
2018-10-01 23:23:38 +00:00
if (displayplayer == consoleplayer)
break; // End loop
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (!playeringame[displayplayer])
continue;
if (players[displayplayer].spectator)
continue;
Address toast review - Re-add highlighting to the header text, and shift it back up slightly - Move the viewpoint loop break out of a while and into the main loop
2018-10-01 23:23:38 +00:00
// SRB2Kart: Only go through players who are actually playing
if (players[displayplayer].exiting)
continue;
Don't f12 time over'd players
2018-10-22 19:06:07 +00:00
if (players[displayplayer].pflags & PF_TIMEOVER)
continue;
Address toast review - Re-add highlighting to the header text, and shift it back up slightly - Move the viewpoint loop break out of a while and into the main loop
2018-10-01 23:23:38 +00:00
// I don't know if we want this actually, but I'll humor the suggestion anyway
if (G_BattleGametype())
{
if (players[displayplayer].kartstuff[k_bumper] <= 0)
continue;
}
Viewpoint key improvements - Don't cycle through exiting players - Don't cycle through karma players in Battle - Disable console print on switch, it's already got a HUD element
2018-09-27 01:35:57 +00:00
// SRB2Kart: we have no team-based modes, YET...
Battle HUD stuff
2017-11-14 01:45:57 +00:00
/*if (G_GametypeHasTeams())
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
if (players[consoleplayer].ctfteam
&& players[displayplayer].ctfteam != players[consoleplayer].ctfteam)
continue;
}
else if (gametype == GT_HIDEANDSEEK)
{
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;
}
Minor adjustments in hopes that I fixed the resynch bomb on gametype switch?
2018-02-08 22:13:06 +00:00
else if (G_GametypeHasSpectators() && G_BattleGametype())
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
if (!players[consoleplayer].spectator)
continue;
Battle HUD stuff
2017-11-14 01:45:57 +00:00
}*/
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
break;
Address toast review - Re-add highlighting to the header text, and shift it back up slightly - Move the viewpoint loop break out of a while and into the main loop
2018-10-01 23:23:38 +00:00
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// change statusbar also if playing back demo
if (singledemo)
ST_changeDemoView();
return true;
}
}
// any other key pops up menu if in demos
if (gameaction == ga_nothing && !singledemo &&
((demoplayback && !modeattacking && !titledemo) || gamestate == GS_TITLESCREEN))
{
if (ev->type == ev_keydown && ev->data1 != 301)
{
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;
}
}
else if (gamestate == GS_CREDITS)
{
if (HU_Responder(ev))
return true; // chat ate the event
if (F_CreditResponder(ev))
{
F_StartGameEvaluation();
return true;
}
}
else if (gamestate == GS_CONTINUING)
{
if (F_ContinueResponder(ev))
return true;
}
// Demo End
else if (gamestate == GS_GAMEEND || gamestate == GS_EVALUATION || gamestate == GS_CREDITS)
return true;
Chat messages in the waiting for players screen!
2018-07-03 21:30:22 +00:00
else if (gamestate == GS_INTERMISSION || gamestate == GS_VOTING || gamestate == GS_WAITINGPLAYERS)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (HU_Responder(ev))
return true; // chat ate the event
// 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
{
if (!pausedelay)
{
// don't let busy scripts prevent pausing
pausedelay = NEWTICRATE/7;
SRB2 2.1.3 release
2014-03-18 17:56:54 +00:00
// command will handle all the checks for us
COM_ImmedExecute("pause");
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return true;
}
else
pausedelay = NEWTICRATE/7;
}
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);
}
}
more quad stuff
2017-12-11 06:12:38 +00:00
if (ev->data1 == gamecontrol3[gc_camtoggle][0]
|| ev->data1 == gamecontrol3[gc_camtoggle][1])
{
if (!camtoggledelay3)
{
camtoggledelay3 = NEWTICRATE / 7;
CV_SetValue(&cv_chasecam3, cv_chasecam3.value ? 0 : 1);
}
}
if (ev->data1 == gamecontrol4[gc_camtoggle][0]
|| ev->data1 == gamecontrol4[gc_camtoggle][1])
{
if (!camtoggledelay4)
{
camtoggledelay4 = NEWTICRATE / 7;
CV_SetValue(&cv_chasecam4, cv_chasecam4.value ? 0 : 1);
}
}
Merge remote-tracking branch 'refs/remotes/origin/master' into menus-cvars-unlocks # Conflicts: # src/g_game.c # src/m_cheat.c # src/p_user.c
2018-01-24 21:24:36 +00:00
if (ev->data1 == gamecontrol[gc_spectate][0]
|| ev->data1 == gamecontrol[gc_spectate][1])
{
Fixed spectating for real, messages for changing some kart cvars, Mirror Mode disallowed in Battle
2018-01-30 00:15:25 +00:00
if (!spectatedelay)
Merge remote-tracking branch 'refs/remotes/origin/master' into menus-cvars-unlocks # Conflicts: # src/g_game.c # src/m_cheat.c # src/p_user.c
2018-01-24 21:24:36 +00:00
{
Fixed spectating for real, messages for changing some kart cvars, Mirror Mode disallowed in Battle
2018-01-30 00:15:25 +00:00
spectatedelay = NEWTICRATE / 7;
COM_ImmedExecute("changeteam spectator");
Merge remote-tracking branch 'refs/remotes/origin/master' into menus-cvars-unlocks # Conflicts: # src/g_game.c # src/m_cheat.c # src/p_user.c
2018-01-24 21:24:36 +00:00
}
}
if (ev->data1 == gamecontrolbis[gc_spectate][0]
|| ev->data1 == gamecontrolbis[gc_spectate][1])
{
Fixed spectating for real, messages for changing some kart cvars, Mirror Mode disallowed in Battle
2018-01-30 00:15:25 +00:00
if (!spectatedelay2)
Merge remote-tracking branch 'refs/remotes/origin/master' into menus-cvars-unlocks # Conflicts: # src/g_game.c # src/m_cheat.c # src/p_user.c
2018-01-24 21:24:36 +00:00
{
Fixed spectating for real, messages for changing some kart cvars, Mirror Mode disallowed in Battle
2018-01-30 00:15:25 +00:00
spectatedelay2 = NEWTICRATE / 7;
COM_ImmedExecute("changeteam2 spectator");
Merge remote-tracking branch 'refs/remotes/origin/master' into menus-cvars-unlocks # Conflicts: # src/g_game.c # src/m_cheat.c # src/p_user.c
2018-01-24 21:24:36 +00:00
}
}
if (ev->data1 == gamecontrol3[gc_spectate][0]
|| ev->data1 == gamecontrol3[gc_spectate][1])
{
Fixed spectating for real, messages for changing some kart cvars, Mirror Mode disallowed in Battle
2018-01-30 00:15:25 +00:00
if (!spectatedelay3)
Merge remote-tracking branch 'refs/remotes/origin/master' into menus-cvars-unlocks # Conflicts: # src/g_game.c # src/m_cheat.c # src/p_user.c
2018-01-24 21:24:36 +00:00
{
Fixed spectating for real, messages for changing some kart cvars, Mirror Mode disallowed in Battle
2018-01-30 00:15:25 +00:00
spectatedelay3 = NEWTICRATE / 7;
COM_ImmedExecute("changeteam3 spectator");
Merge remote-tracking branch 'refs/remotes/origin/master' into menus-cvars-unlocks # Conflicts: # src/g_game.c # src/m_cheat.c # src/p_user.c
2018-01-24 21:24:36 +00:00
}
}
if (ev->data1 == gamecontrol4[gc_spectate][0]
|| ev->data1 == gamecontrol4[gc_spectate][1])
{
Fixed spectating for real, messages for changing some kart cvars, Mirror Mode disallowed in Battle
2018-01-30 00:15:25 +00:00
if (!spectatedelay4)
Merge remote-tracking branch 'refs/remotes/origin/master' into menus-cvars-unlocks # Conflicts: # src/g_game.c # src/m_cheat.c # src/p_user.c
2018-01-24 21:24:36 +00:00
{
Fixed spectating for real, messages for changing some kart cvars, Mirror Mode disallowed in Battle
2018-01-30 00:15:25 +00:00
spectatedelay4 = NEWTICRATE / 7;
COM_ImmedExecute("changeteam4 spectator");
Merge remote-tracking branch 'refs/remotes/origin/master' into menus-cvars-unlocks # Conflicts: # src/g_game.c # src/m_cheat.c # src/p_user.c
2018-01-24 21:24:36 +00:00
}
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
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
A lot lol The importants: - Fixed compiling - Combined G_BuildTiccmd for all players, no more need for a function for each - You can actually start 3p/4p mode
2017-12-17 03:32:43 +00:00
case ev_joystick3:
return true; // eat events
case ev_joystick4:
return true; // eat events
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
default:
break;
}
return false;
}
//
// G_Ticker
// Make ticcmd_ts for the players.
//
void G_Ticker(boolean run)
{
UINT32 i;
INT32 buf;
Added Accelcode, start boosting, reverted drifting, etc.
2017-02-07 22:19:04 +00:00
ticcmd_t *cmd;
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();
// Costs a life to retry ... unless the player in question is dead already.
Some token efforts to make singleplayer mode (accessible only via `-warp` and `map mapxx -force`) not COMPLETELY broken. * Fixed the conditionals for `suicide` and `retry` commands - `suicide` is now allowed in singleplayer, and `retry` no longer checks your lives (for now). * Disable the "traditional" level reload method (which `retry` tried to use), since it was completely broken with the other changes we've made. Mapchanges only. * Made retries cause a mapchange, per the above. * Disable the last source of skincolor trampling in the game - loading a level while not netgame or record attacking.
2018-10-17 12:40:17 +00:00
/*if (G_GametypeUsesLives() && players[consoleplayer].playerstate == PST_LIVE)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
players[consoleplayer].lives -= 1;
Some token efforts to make singleplayer mode (accessible only via `-warp` and `map mapxx -force`) not COMPLETELY broken. * Fixed the conditionals for `suicide` and `retry` commands - `suicide` is now allowed in singleplayer, and `retry` no longer checks your lives (for now). * Disable the "traditional" level reload method (which `retry` tried to use), since it was completely broken with the other changes we've made. Mapchanges only. * Made retries cause a mapchange, per the above. * Disable the last source of skincolor trampling in the game - loading a level while not netgame or record attacking.
2018-10-17 12:40:17 +00:00
G_DoReborn(consoleplayer);*/
D_MapChange(gamemap, gametype, cv_kartencore.value, true, 1, false, false);
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;
Getting there. Should *theoretically* be functional... if it didn't crash on vote end. I'm like 90% sure I'm missing a patch unload somewhere...
2018-01-28 01:59:29 +00:00
case ga_startvote: G_DoStartVote(); break;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
case ga_nothing: break;
default: I_Error("gameaction = %d\n", gameaction);
}
buf = gametic % BACKUPTICS;
// read/write demo and check turbo cheat
for (i = 0; i < MAXPLAYERS; i++)
{
Added Accelcode, start boosting, reverted drifting, etc.
2017-02-07 22:19:04 +00:00
cmd = &players[i].cmd;
Fix random duplicate code from merge in hw_main.c and r_segs.c Whitespace cleanup
2017-02-18 00:25:16 +00:00
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (playeringame[i])
Updated item weights Fix attempt for thrown items
2017-10-11 01:09:35 +00:00
{
// SRB2kart
// Save the dir the player is holding
// to allow items to be thrown forward or backward.
if (cmd->buttons & BT_FORWARD)
players[i].kartstuff[k_throwdir] = 1;
else if (cmd->buttons & BT_BACKWARD)
players[i].kartstuff[k_throwdir] = -1;
else
players[i].kartstuff[k_throwdir] = 0;
Fixed local sync fail, among a bunch of other splitscreen check fixes in other files I don't know how many of the changes in d_clisrv were really necessary, I was just franticly trying to figure out the source of the local sync fail
2017-12-17 19:17:07 +00:00
G_CopyTiccmd(cmd, &netcmds[buf][i], 1);
Determine latency with leveltime BS instead of nettics
2019-01-05 07:13:16 +00:00
// Use the leveltime sent in the player's ticcmd to determine control lag
Make sure cmd.latency is always 0 in mode attack?
2019-01-09 15:05:57 +00:00
cmd->latency = modeattacking ? 0 : min((leveltime & 0xFF) - cmd->latency, MAXPREDICTTICS-1); //@TODO add a cvar to allow setting this max
Updated item weights Fix attempt for thrown items
2017-10-11 01:09: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
ST_Ticker();
AM_Ticker();
HU_Ticker();
break;
case GS_INTERMISSION:
if (run)
Y_Ticker();
HU_Ticker();
break;
Work so far Crashes, but baseline's there
2018-01-27 06:17:08 +00:00
case GS_VOTING:
if (run)
Y_VoteTicker();
HU_Ticker();
break;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
case GS_TIMEATTACK:
break;
case GS_INTRO:
if (run)
F_IntroTicker();
break;
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();
break;
case GS_CONTINUING:
if (run)
F_ContinueTicker();
break;
case GS_CREDITS:
if (run)
F_CreditTicker();
HU_Ticker();
break;
case GS_TITLESCREEN:
F_TitleScreenTicker(run);
break;
Screen for waiting during intermission after connecting
2018-07-02 21:11:03 +00:00
case GS_WAITINGPLAYERS:
Fix a bunch of issues with record attack! * Fixed the issue where your runs would be saved as belonging to the wrong character. * Make the Ghost menu always visible. This isn't PERFECT, but it's better than hiding the option to toggle ghosts just because you're doing your first run as a new character. * Fix the number of laps carrying over from MP(!!!!!!!!! plugged a huge security hole for the authenticity of replays...) Other stuff! * Hide map hell maps in the statistics. * Clean up some nonet stuff in the menu. * Put player setup last again, and tweaked its wording. * Disable the special Kart waiting for players behaviour when not playing a netgame - seeing a double gamestate transition in record attack is weird.
2018-07-06 17:08:35 +00:00
if (netgame)
F_WaitingPlayersTicker();
Chat messages in the waiting for players screen!
2018-07-03 21:30:22 +00:00
HU_Ticker();
Screen for waiting during intermission after connecting
2018-07-02 21:11:03 +00:00
break;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
case GS_DEDICATEDSERVER:
case GS_NULL:
break; // do nothing
}
if (run)
{
* Make cancelling a join work on the pause menu and console. (You need to write "changeteam spectator" to cancel a PF_WANTSTOJOIN.) * Stop respawning spectators when their PF_WANTSTOJOIN request hasn't been processed yet. * Handle PF_WANTSTOJOIN requests in GS_WAITINGPLAYERS. * Refactor K_CheckSpectateStatus, and make it so PF_WANTSTOJOIN requests are processed if there's only one player in the server, even if they're on lap 2 or up. * Make the player entry mechanism in P_SpawnPlayer use the PF_WANTSTOJOIN mechanism so that it can also take advantage of the level refresh mechanism with no extra code. * NOTE: This does a bad hack in order to not send multiple mapchanges while the joining timer is low! If you can think of a better way to do this, please let me know/commit it. * Change the timer until you can hit ITEM again when a spectator who has to wait to join shorter. * (controversial, but I think necessary) - flash the ITEM text when the above-mentioned timer is nonzero.
2018-07-21 15:45:08 +00:00
if (G_GametypeHasSpectators()
Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart into sonicitems
2018-07-21 21:45:25 +00:00
&& (gamestate == GS_LEVEL || gamestate == GS_INTERMISSION || gamestate == GS_VOTING // definitely good
|| gamestate == GS_WAITINGPLAYERS)) // definitely a problem if we don't do it at all in this gamestate, but might need more protection?
Spectator overhaul - New player flag, PF_WANTSTOJOIN, added for setting up a spectator queue. You are allowed to join as long as no one has started lap 2. - Map resets when two people have entered the game, so matches can start naturally without the need of an admin.
2018-07-20 23:11:36 +00:00
K_CheckSpectateStatus();
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (pausedelay)
pausedelay--;
if (camtoggledelay)
camtoggledelay--;
if (camtoggledelay2)
camtoggledelay2--;
Fixed spectating for real, messages for changing some kart cvars, Mirror Mode disallowed in Battle
2018-01-30 00:15:25 +00:00
if (camtoggledelay3)
camtoggledelay3--;
if (camtoggledelay4)
camtoggledelay4--;
if (spectatedelay)
spectatedelay--;
if (spectatedelay2)
spectatedelay2--;
if (spectatedelay3)
spectatedelay3--;
if (spectatedelay4)
spectatedelay4--;
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));
Friction updated. Added KARTSTUFF to lua. Added ->kartstuff to network syncing stuff (surprised it even worked before now???), also maybe items correctly reset at the end of level now.
2017-02-27 22:55:24 +00:00
memset(p->kartstuff, 0, sizeof (p->kartstuff)); // SRB2kart
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
p->ringweapons = 0;
p->mo->flags2 &= ~MF2_SHADOW; // cancel invisibility
P_FlashPal(p, 0, 0); // Resets
p->starpostangle = 0;
p->starposttime = 0;
p->starpostx = 0;
p->starposty = 0;
p->starpostz = 0;
p->starpostnum = 0;
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
// SRB2kart: Increment the "matches played" counter.
Double-check legitimacy on match completion
2018-01-29 00:57:38 +00:00
if (player == consoleplayer)
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
{
* FREE PLAY! The necessary corollary to HERE COMES A NEW CHALLENGER... * Activates when there are less than two non-spectators in a netgame. * Shows flashing text at the bottom of the screen. * Prevents drawing several UI elements that only make sense with multiple players. * Prevents matchesplayed being increased. * Improve the mapreset timer's behaviour. * Now you get to see the HERE COMES A NEW CHALLENGER screen as the starting frame of the relevant map transition, since it happens on mapreset being 1 rather than 0. * Make a bunch of normal gameplay stuff that might've activated unnecessarily during mapreset now not able to. * Hide some other stuff that might've been visible for no good reason. * Improve Mirror mode. * First person now works with it! * Tweaked the minimap player heads. Although the main section of the automap is mirrored, it feels... wrong to mirror the player head? IDK, you may wish to revert this, but given that everything else is the right way around except for the level itself...* Disable the titlescreen demos, at least until we actually gear up for release and make real ones. * Disable the titlescreen demos, at least until we actually gear up for release and make real ones.
2018-07-22 15:16:03 +00:00
if (legitimateexit && !demoplayback && !mapreset) // (yes you're allowed to unlock stuff this way when the game is modified)
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
{
Please don't punish offline practice
2018-10-01 01:46:12 +00:00
matchesplayed++;
if (M_UpdateUnlockablesAndExtraEmblems(true))
S_StartSound(NULL, sfx_ncitem);
Two tweaks to gamedata saving: * Save gamedata in Y_UpdateRecordReplays(), so that you never unfairly lose out on your spoils by setting modifiedgame before the game ends. * Always save your matchesplayed/totalplaytime increase at the successful completion of a level.
2018-11-17 20:16:27 +00:00
G_SaveGameData(true);
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
}
Double-check legitimacy on match completion
2018-01-29 00:57:38 +00:00
legitimateexit = false;
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
//
// G_PlayerReborn
// Called after a player dies. Almost everything is cleared and initialized.
//
void G_PlayerReborn(INT32 player)
{
player_t *p;
*A biggie: two-tier intermission screen! * Have the entire thing slide the fuck away a short while into the intermission. * The tab screen is modified to work off similar behaviour and presentation. * To go with it, a revamp of how Battle's scoring is handled. * It's now considered "hits", and is stored in a reuse in one of the vanilla NiGHTS variables, allowing it to use exactly the same ranking mechanisms as race. * No more resetting of score between battle rounds. * Minor, unrelated general code cleanup in places. * Disable the YEEEAH in splitscreen, otherwise you'll hear it *all the time*.
2018-07-18 19:23:46 +00:00
INT32 score, marescore;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
INT32 lives;
INT32 continues;
UINT8 charability;
UINT8 charability2;
Added Accelcode, start boosting, reverted drifting, etc.
2017-02-07 22:19:04 +00:00
// SRB2kart
UINT8 kartspeed;
UINT8 kartweight;
//
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
fixed_t normalspeed;
fixed_t runspeed;
UINT8 thrustfactor;
UINT8 accelstart;
UINT8 acceleration;
INT32 charflags;
INT32 pflags;
UINT32 thokitem;
UINT32 spinitem;
UINT32 revitem;
fixed_t actionspd;
fixed_t mindash;
fixed_t maxdash;
INT32 ctfteam;
INT32 starposttime;
INT16 starpostx;
INT16 starposty;
INT16 starpostz;
INT32 starpostnum;
INT32 starpostangle;
fixed_t jumpfactor;
INT32 exiting;
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;
UINT8 skincolor;
INT32 skin;
tic_t jointime;
boolean spectator;
INT16 bot;
SINT8 pity;
Some Color code, Kart powers
2016-08-12 01:42:11 +00:00
// SRB2kart
v1.3.17 ------- Lakitu returns from his ironically-not-pillowshaded-cloud grave Dropboosting works on respawn Players respawn "automatically after 2 seconds" instead of "*instantaneously* while accel is held"
2017-07-16 16:04:33 +00:00
INT32 starpostwp;
Item stuff - Keep items on death, as long as you haven't used them yet. - Restart the item roulette on spawn if you die during it. - Held items that take up your item box now flash, to be consistent with Rocket Sneaker and Grow.
2018-09-10 06:48:10 +00:00
INT32 itemtype;
INT32 itemamount;
INT32 itemroulette;
INT32 roulettetype;
No more cheesing Shrink by dying (If that was kept, we'd see it exploited all the time on release :V)
2018-10-22 20:22:41 +00:00
INT32 growshrinktimer;
Changed all instances of "balloon" to "bumper" Also changed "It's you!" to "Select character & color..."
2018-07-03 19:14:47 +00:00
INT32 bumper;
Lots of small tweaks & fixes, that should make Battle a LOT more bearable - Comeback timer is now always 10 seconds instead of scaling - Takes 10 seconds before exiting - Flashing tics is doubled in Battle Mode - Removed a bunch of bomb nerfs - Bombs are back to making only 1 point per hit - Exposed K_GetKartAccel & K_GetKartFlashing to Lua - Item boxes should no longer drop while going up slopes - Trading item boxes with a bomb should turn you back into a bomb - Balloons should no longer all respawn when dying in pits in 2-player games - Flashing players are able to kill *thrown* shells again (shields and trap items are still unkillable). Prevents red shells from being able to stick to a flashing player and hurt them again as soon as they're done flashing - CHECK appears at a farther distance
2017-11-17 05:48:36 +00:00
INT32 comebackpoints;
WANTED
2018-07-01 08:36:09 +00:00
INT32 wanted;
Redone credits for joiners in a less stupid way, + redone start ambience in a less stupid way
2019-01-10 06:03:53 +00:00
boolean songcredit = false;
Some Color code, Kart powers
2016-08-12 01:42:11 +00:00
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
score = players[player].score;
*A biggie: two-tier intermission screen! * Have the entire thing slide the fuck away a short while into the intermission. * The tab screen is modified to work off similar behaviour and presentation. * To go with it, a revamp of how Battle's scoring is handled. * It's now considered "hits", and is stored in a reuse in one of the vanilla NiGHTS variables, allowing it to use exactly the same ranking mechanisms as race. * No more resetting of score between battle rounds. * Minor, unrelated general code cleanup in places. * Disable the YEEEAH in splitscreen, otherwise you'll hear it *all the time*.
2018-07-18 19:23:46 +00:00
marescore = players[player].marescore;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
lives = players[player].lives;
continues = players[player].continues;
ctfteam = players[player].ctfteam;
exiting = players[player].exiting;
jointime = players[player].jointime;
spectator = players[player].spectator;
Keep specator join request on respawn
2018-10-22 20:26:24 +00:00
pflags = (players[player].pflags & (PF_TIMEOVER|PF_FLIPCAM|PF_TAGIT|PF_TAGGED|PF_ANALOGMODE|PF_WANTSTOJOIN));
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));
numboxes = players[player].numboxes;
laps = players[player].laps;
totalring = players[player].totalring;
skincolor = players[player].skincolor;
skin = players[player].skin;
charability = players[player].charability;
charability2 = players[player].charability2;
Added Accelcode, start boosting, reverted drifting, etc.
2017-02-07 22:19:04 +00:00
// SRB2kart
kartspeed = players[player].kartspeed;
kartweight = players[player].kartweight;
//
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
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;
jumpfactor = players[player].jumpfactor;
thokitem = players[player].thokitem;
spinitem = players[player].spinitem;
revitem = players[player].revitem;
actionspd = players[player].actionspd;
mindash = players[player].mindash;
maxdash = players[player].maxdash;
mare = players[player].mare;
bot = players[player].bot;
pity = players[player].pity;
Some Color code, Kart powers
2016-08-12 01:42:11 +00:00
// SRB2kart
Don't let players carry them between levels.......... (In return for not letting anyone experience this silly bug, I made spectators joining before the match starts in Battle spawn with bumpers)
2018-09-10 07:15:46 +00:00
if (leveltime <= starttime)
Item stuff - Keep items on death, as long as you haven't used them yet. - Restart the item roulette on spawn if you die during it. - Held items that take up your item box now flash, to be consistent with Rocket Sneaker and Grow.
2018-09-10 06:48:10 +00:00
{
Don't let players carry them between levels.......... (In return for not letting anyone experience this silly bug, I made spectators joining before the match starts in Battle spawn with bumpers)
2018-09-10 07:15:46 +00:00
itemroulette = 0;
roulettetype = 0;
Item stuff - Keep items on death, as long as you haven't used them yet. - Restart the item roulette on spawn if you die during it. - Held items that take up your item box now flash, to be consistent with Rocket Sneaker and Grow.
2018-09-10 06:48:10 +00:00
itemtype = 0;
itemamount = 0;
No more cheesing Shrink by dying (If that was kept, we'd see it exploited all the time on release :V)
2018-10-22 20:22:41 +00:00
growshrinktimer = 0;
Don't let players carry them between levels.......... (In return for not letting anyone experience this silly bug, I made spectators joining before the match starts in Battle spawn with bumpers)
2018-09-10 07:15:46 +00:00
bumper = (G_BattleGametype() ? cv_kartbumpers.value : 0);
comebackpoints = 0;
wanted = 0;
starpostwp = 0;
Item stuff - Keep items on death, as long as you haven't used them yet. - Restart the item roulette on spawn if you die during it. - Held items that take up your item box now flash, to be consistent with Rocket Sneaker and Grow.
2018-09-10 06:48:10 +00:00
}
else
{
Don't let players carry them between levels.......... (In return for not letting anyone experience this silly bug, I made spectators joining before the match starts in Battle spawn with bumpers)
2018-09-10 07:15:46 +00:00
starpostwp = players[player].kartstuff[k_starpostwp];
itemroulette = (players[player].kartstuff[k_itemroulette] > 0 ? 1 : 0);
roulettetype = players[player].kartstuff[k_roulettetype];
if (players[player].kartstuff[k_itemheld])
{
itemtype = 0;
itemamount = 0;
}
else
{
itemtype = players[player].kartstuff[k_itemtype];
itemamount = players[player].kartstuff[k_itemamount];
}
No more cheesing Shrink by dying (If that was kept, we'd see it exploited all the time on release :V)
2018-10-22 20:22:41 +00:00
// Keep Shrink status, remove Grow status
Actually, best of both: Let Grow/Shrink revert itself when it changes to 0, as well as add a function for removing either. Means we don't have to modify every single > 0/< 0 check, and is overall cleaner.
2018-12-06 04:28:44 +00:00
if (players[player].kartstuff[k_growshrinktimer] < 0)
growshrinktimer = players[player].kartstuff[k_growshrinktimer];
else
growshrinktimer = 0;
No more cheesing Shrink by dying (If that was kept, we'd see it exploited all the time on release :V)
2018-10-22 20:22:41 +00:00
Don't let players carry them between levels.......... (In return for not letting anyone experience this silly bug, I made spectators joining before the match starts in Battle spawn with bumpers)
2018-09-10 07:15:46 +00:00
bumper = players[player].kartstuff[k_bumper];
comebackpoints = players[player].kartstuff[k_comebackpoints];
wanted = players[player].kartstuff[k_wanted];
Item stuff - Keep items on death, as long as you haven't used them yet. - Restart the item roulette on spawn if you die during it. - Held items that take up your item box now flash, to be consistent with Rocket Sneaker and Grow.
2018-09-10 06:48:10 +00:00
}
Some Color code, Kart powers
2016-08-12 01:42:11 +00:00
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
p = &players[player];
memset(p, 0, sizeof (*p));
p->score = score;
*A biggie: two-tier intermission screen! * Have the entire thing slide the fuck away a short while into the intermission. * The tab screen is modified to work off similar behaviour and presentation. * To go with it, a revamp of how Battle's scoring is handled. * It's now considered "hits", and is stored in a reuse in one of the vanilla NiGHTS variables, allowing it to use exactly the same ranking mechanisms as race. * No more resetting of score between battle rounds. * Minor, unrelated general code cleanup in places. * Disable the YEEEAH in splitscreen, otherwise you'll hear it *all the time*.
2018-07-18 19:23:46 +00:00
p->marescore = marescore;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
p->lives = lives;
p->continues = continues;
p->pflags = pflags;
p->ctfteam = ctfteam;
p->jointime = jointime;
p->spectator = spectator;
// save player config truth reborn
p->skincolor = skincolor;
p->skin = skin;
p->charability = charability;
p->charability2 = charability2;
Added Accelcode, start boosting, reverted drifting, etc.
2017-02-07 22:19:04 +00:00
// SRB2kart
p->kartspeed = kartspeed;
p->kartweight = kartweight;
//
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
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;
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;
p->jumpfactor = jumpfactor;
p->exiting = exiting;
p->numboxes = numboxes;
p->laps = laps;
p->totalring = totalring;
p->mare = mare;
if (bot)
p->bot = 1; // reset to AI-controlled
p->pity = pity;
Some Color code, Kart powers
2016-08-12 01:42:11 +00:00
// SRB2kart
v1.3.18 ------- Fixed really poorly done netcode stuff. This should fix the kartstuff desyncing, maybe collision stuff too? Fixed Megashroom's growth animation lasting too long.
2017-08-09 22:14:14 +00:00
p->kartstuff[k_starpostwp] = starpostwp; // TODO: get these out of kartstuff, it causes desync
Item stuff - Keep items on death, as long as you haven't used them yet. - Restart the item roulette on spawn if you die during it. - Held items that take up your item box now flash, to be consistent with Rocket Sneaker and Grow.
2018-09-10 06:48:10 +00:00
p->kartstuff[k_itemroulette] = itemroulette;
p->kartstuff[k_roulettetype] = roulettetype;
p->kartstuff[k_itemtype] = itemtype;
p->kartstuff[k_itemamount] = itemamount;
No more cheesing Shrink by dying (If that was kept, we'd see it exploited all the time on release :V)
2018-10-22 20:22:41 +00:00
p->kartstuff[k_growshrinktimer] = growshrinktimer;
Changed all instances of "balloon" to "bumper" Also changed "It's you!" to "Select character & color..."
2018-07-03 19:14:47 +00:00
p->kartstuff[k_bumper] = bumper;
Lots of small tweaks & fixes, that should make Battle a LOT more bearable - Comeback timer is now always 10 seconds instead of scaling - Takes 10 seconds before exiting - Flashing tics is doubled in Battle Mode - Removed a bunch of bomb nerfs - Bombs are back to making only 1 point per hit - Exposed K_GetKartAccel & K_GetKartFlashing to Lua - Item boxes should no longer drop while going up slopes - Trading item boxes with a bomb should turn you back into a bomb - Balloons should no longer all respawn when dying in pits in 2-player games - Flashing players are able to kill *thrown* shells again (shields and trap items are still unkillable). Prevents red shells from being able to stick to a flashing player and hurt them again as soon as they're done flashing - CHECK appears at a farther distance
2017-11-17 05:48:36 +00:00
p->kartstuff[k_comebackpoints] = comebackpoints;
p->kartstuff[k_comebacktimer] = comebacktime;
WANTED
2018-07-01 08:36:09 +00:00
p->kartstuff[k_wanted] = wanted;
Karma Eggman. Does what it says on the egg. Tried very hard not to merge conflict with `frameperfectegg`. Also includes some adjustments to: * Horizontal offset of Eggman countdown in splitscreen again. It's not perfectly centered either way, but on second thought I like this better. * Sound of Lat`'s Mine/SPB explosions - now uses same sound as Karma bombing, instead of that shitty paraloop. * Correctly wipe k_eggmanblame when it is appropriate to do so.
2018-10-07 10:40:06 +00:00
p->kartstuff[k_eggmanblame] = -1;
Some Color code, Kart powers
2016-08-12 01:42:11 +00:00
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Don't do anything immediately
p->pflags |= PF_USEDOWN;
p->pflags |= PF_ATTACKDOWN;
p->pflags |= PF_JUMPDOWN;
p->playerstate = PST_LIVE;
p->health = 1; // 0 rings
p->panim = PA_IDLE; // standing animation
Starting from scratch. SRB2 v2.1.15
2016-07-06 04:09:17 +00:00
if ((netgame || multiplayer) && !p->spectator)
Flashing tics length depends on speed stat Change to speed-weight when the bump buff gets added
2018-08-11 04:12:41 +00:00
p->powers[pw_flashing] = K_GetKartFlashing(p)-1; // Babysitting deterrent
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Starting from scratch. SRB2 v2.1.15
2016-07-06 04:09:17 +00:00
if (p-players == consoleplayer)
Finished off g_game.c - Still some sketchy stuff I'm unsure of in there.
2016-03-21 01:22:16 +00:00
{
Starting from scratch. SRB2 v2.1.15
2016-07-06 04:09:17 +00:00
if (mapmusflags & MUSIC_RELOADRESET)
Finished off g_game.c - Still some sketchy stuff I'm unsure of in there.
2016-03-21 01:22:16 +00:00
{
Starting from scratch. SRB2 v2.1.15
2016-07-06 04:09:17 +00:00
strncpy(mapmusname, mapheaderinfo[gamemap-1]->musname, 7);
mapmusname[6] = 0;
mapmusflags = mapheaderinfo[gamemap-1]->mustrack & MUSIC_TRACKMASK;
Redone credits for joiners in a less stupid way, + redone start ambience in a less stupid way
2019-01-10 06:03:53 +00:00
songcredit = true;
Finished off g_game.c - Still some sketchy stuff I'm unsure of in there.
2016-03-21 01:22:16 +00:00
}
}
Fix random duplicate code from merge in hw_main.c and r_segs.c Whitespace cleanup
2017-02-18 00:25:16 +00:00
Fix Star/Mega music persisting after death for splitscreen players
2018-05-30 22:38:30 +00:00
P_RestoreMusic(p);
Redone credits for joiners in a less stupid way, + redone start ambience in a less stupid way
2019-01-10 06:03:53 +00:00
if (songcredit)
S_ShowMusicCredit();
Fix Star/Mega music persisting after death for splitscreen players
2018-05-30 22:38:30 +00:00
Lakitu murder & countdown improvements (I'm not SevenethSentienel! I just don't feel like logging out!)
2018-06-25 02:15:22 +00:00
if (leveltime > (starttime + (TICRATE/2)) && !p->spectator)
p->kartstuff[k_respawn] = 48; // Respawn effect
v1.3.19 ------- Moved the Lakitu respawn code so that it isn't console-only.
2017-08-10 03:44:29 +00:00
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (gametype == GT_COOP)
P_FindEmerald(); // scan for emeralds to hunt for
// Reset Nights score and max link to 0 on death
*A biggie: two-tier intermission screen! * Have the entire thing slide the fuck away a short while into the intermission. * The tab screen is modified to work off similar behaviour and presentation. * To go with it, a revamp of how Battle's scoring is handled. * It's now considered "hits", and is stored in a reuse in one of the vanilla NiGHTS variables, allowing it to use exactly the same ranking mechanisms as race. * No more resetting of score between battle rounds. * Minor, unrelated general code cleanup in places. * Disable the YEEEAH in splitscreen, otherwise you'll hear it *all the time*.
2018-07-18 19:23:46 +00:00
p->maxlink = 0;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// If NiGHTS, find lowest mare to start with.
Nuke a bunch of iteration things that have no purpose in SRB2Kart. A full explanation of my reasoning and what it affects is as follows. p_inter.c - Everything to do with setting states for starposts In SRB2Kart, starposts are invisble. We don't need to loop through all thinkers just to set their states when there's no visible effect of the state-setting. In addition, it has no consequences for gameplay - starposts have long been silent here, and all checking is done regarding their health, not their state. Remove extremely low-traffic conditionals (MT_FLINGEMERALD collision height extension, for example) These objects serve no functional purpose during regular SRB2Kart gameplay. Why should every other object have to pay an admittedly minor performance hit just for them? Disable all mechanisms of damaging bosses or enemies with the player's physical contact With the exception of Sapphire Coast, no MF_ENEMY objects exist in the entirety of the standard roster. In addition, the conditions for damaging the enemies were impossible to achieve, because they required vanilla SRB2 mechanics such as "jumping", "spindashing", or "super". Therefore, they can be safely commented out. Disable NiGHTS-related material (excepting bumper, hoop, and wing-emblem objects) NiGHTS is fundamentally incompatible with regular kart gameplay and I believe was already broken. Therefore, any mechanism which enters, aids, or abets it can be safely disabled. Comment out Tag mechanisms Tag is the only vanilla multiplayer gametype which has sufficient gameplay depth and complexity (HEYOOOOOOOOO) to require dedicated thinking in and of itself in order to manage. This thinking is irrelevant to Kart's functioning, and can be neutered easily. d_clisrv.c Comment out Tag mechanisms See p_inter.c d_netcmd.c Disable several devmode commands which are irrelevant to SRB2Kart gameplay When investigating for references to NiGHTS material, I discovered that these remained untouched. In order to present a more coherent game, I have hidden the ones that serve no purpose for us. Comment out Tag mechanisms See p_inter.c g_game.c Disable NiGHTS-related material See p_inter.c Disable some team-related material Teams are not present in SRB2Kart at present. Obviously we'd want to reconsider for future, but it doesn't need to be run right now. Everything to do with setting states for starposts See p_inter.c m_cheat.c Disable several devmode commands which are irrelevant to SRB2Kart gameplay See d_netcmd.c p_map.c Remove extremely low-traffic conditionals (MT_EGGSHIELD collision, for example) See p_inter.c Disable NiGHTS-related material See p_inter.c p_mobj.c Disable P_EmeraldManager Power stones, despite their relevance in vanilla Match, are not in SRB2Kart's Battle. No management of nonexistent emeralds is required. p_setup.c Everything to do with setting states for starposts See p_inter.c p_spec.c Disable NiGHTS-related material See p_inter.c Everything to do with setting states for starposts See p_inter.c p_telept.c Everything to do with setting states for starposts See p_inter.c p_tick.c Disable some team-related material See g_game.c Disable P_EmeraldManager See p_mobj.c Do not run shields Shield objects are not run under the vanilla system; the Thunder Shield is a domain-specific recreation using a standard mobjthinker. Do not run special stages SRB2Kart does not have special stages. Comment out Tag mechanisms See p_inter.c y_inter.c Disable some team-related material See g_game.c p_user.c Disable NiGHTS-related material See p_inter.c Disable 2d movement for players 2D mode? In a kart racer? :nick:
2018-10-03 16:04:41 +00:00
p->mare = 0; /*P_FindLowestMare();
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
CONS_Debug(DBG_NIGHTS, M_GetText("Current mare is %d\n"), p->mare);
if (p->mare == 255)
Nuke a bunch of iteration things that have no purpose in SRB2Kart. A full explanation of my reasoning and what it affects is as follows. p_inter.c - Everything to do with setting states for starposts In SRB2Kart, starposts are invisble. We don't need to loop through all thinkers just to set their states when there's no visible effect of the state-setting. In addition, it has no consequences for gameplay - starposts have long been silent here, and all checking is done regarding their health, not their state. Remove extremely low-traffic conditionals (MT_FLINGEMERALD collision height extension, for example) These objects serve no functional purpose during regular SRB2Kart gameplay. Why should every other object have to pay an admittedly minor performance hit just for them? Disable all mechanisms of damaging bosses or enemies with the player's physical contact With the exception of Sapphire Coast, no MF_ENEMY objects exist in the entirety of the standard roster. In addition, the conditions for damaging the enemies were impossible to achieve, because they required vanilla SRB2 mechanics such as "jumping", "spindashing", or "super". Therefore, they can be safely commented out. Disable NiGHTS-related material (excepting bumper, hoop, and wing-emblem objects) NiGHTS is fundamentally incompatible with regular kart gameplay and I believe was already broken. Therefore, any mechanism which enters, aids, or abets it can be safely disabled. Comment out Tag mechanisms Tag is the only vanilla multiplayer gametype which has sufficient gameplay depth and complexity (HEYOOOOOOOOO) to require dedicated thinking in and of itself in order to manage. This thinking is irrelevant to Kart's functioning, and can be neutered easily. d_clisrv.c Comment out Tag mechanisms See p_inter.c d_netcmd.c Disable several devmode commands which are irrelevant to SRB2Kart gameplay When investigating for references to NiGHTS material, I discovered that these remained untouched. In order to present a more coherent game, I have hidden the ones that serve no purpose for us. Comment out Tag mechanisms See p_inter.c g_game.c Disable NiGHTS-related material See p_inter.c Disable some team-related material Teams are not present in SRB2Kart at present. Obviously we'd want to reconsider for future, but it doesn't need to be run right now. Everything to do with setting states for starposts See p_inter.c m_cheat.c Disable several devmode commands which are irrelevant to SRB2Kart gameplay See d_netcmd.c p_map.c Remove extremely low-traffic conditionals (MT_EGGSHIELD collision, for example) See p_inter.c Disable NiGHTS-related material See p_inter.c p_mobj.c Disable P_EmeraldManager Power stones, despite their relevance in vanilla Match, are not in SRB2Kart's Battle. No management of nonexistent emeralds is required. p_setup.c Everything to do with setting states for starposts See p_inter.c p_spec.c Disable NiGHTS-related material See p_inter.c Everything to do with setting states for starposts See p_inter.c p_telept.c Everything to do with setting states for starposts See p_inter.c p_tick.c Disable some team-related material See g_game.c Disable P_EmeraldManager See p_mobj.c Do not run shields Shield objects are not run under the vanilla system; the Thunder Shield is a domain-specific recreation using a standard mobjthinker. Do not run special stages SRB2Kart does not have special stages. Comment out Tag mechanisms See p_inter.c y_inter.c Disable some team-related material See g_game.c p_user.c Disable NiGHTS-related material See p_inter.c Disable 2d movement for players 2D mode? In a kart racer? :nick:
2018-10-03 16:04:41 +00:00
p->mare = 0;*/
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Check to make sure their color didn't change somehow...
Nuke a bunch of iteration things that have no purpose in SRB2Kart. A full explanation of my reasoning and what it affects is as follows. p_inter.c - Everything to do with setting states for starposts In SRB2Kart, starposts are invisble. We don't need to loop through all thinkers just to set their states when there's no visible effect of the state-setting. In addition, it has no consequences for gameplay - starposts have long been silent here, and all checking is done regarding their health, not their state. Remove extremely low-traffic conditionals (MT_FLINGEMERALD collision height extension, for example) These objects serve no functional purpose during regular SRB2Kart gameplay. Why should every other object have to pay an admittedly minor performance hit just for them? Disable all mechanisms of damaging bosses or enemies with the player's physical contact With the exception of Sapphire Coast, no MF_ENEMY objects exist in the entirety of the standard roster. In addition, the conditions for damaging the enemies were impossible to achieve, because they required vanilla SRB2 mechanics such as "jumping", "spindashing", or "super". Therefore, they can be safely commented out. Disable NiGHTS-related material (excepting bumper, hoop, and wing-emblem objects) NiGHTS is fundamentally incompatible with regular kart gameplay and I believe was already broken. Therefore, any mechanism which enters, aids, or abets it can be safely disabled. Comment out Tag mechanisms Tag is the only vanilla multiplayer gametype which has sufficient gameplay depth and complexity (HEYOOOOOOOOO) to require dedicated thinking in and of itself in order to manage. This thinking is irrelevant to Kart's functioning, and can be neutered easily. d_clisrv.c Comment out Tag mechanisms See p_inter.c d_netcmd.c Disable several devmode commands which are irrelevant to SRB2Kart gameplay When investigating for references to NiGHTS material, I discovered that these remained untouched. In order to present a more coherent game, I have hidden the ones that serve no purpose for us. Comment out Tag mechanisms See p_inter.c g_game.c Disable NiGHTS-related material See p_inter.c Disable some team-related material Teams are not present in SRB2Kart at present. Obviously we'd want to reconsider for future, but it doesn't need to be run right now. Everything to do with setting states for starposts See p_inter.c m_cheat.c Disable several devmode commands which are irrelevant to SRB2Kart gameplay See d_netcmd.c p_map.c Remove extremely low-traffic conditionals (MT_EGGSHIELD collision, for example) See p_inter.c Disable NiGHTS-related material See p_inter.c p_mobj.c Disable P_EmeraldManager Power stones, despite their relevance in vanilla Match, are not in SRB2Kart's Battle. No management of nonexistent emeralds is required. p_setup.c Everything to do with setting states for starposts See p_inter.c p_spec.c Disable NiGHTS-related material See p_inter.c Everything to do with setting states for starposts See p_inter.c p_telept.c Everything to do with setting states for starposts See p_inter.c p_tick.c Disable some team-related material See g_game.c Disable P_EmeraldManager See p_mobj.c Do not run shields Shield objects are not run under the vanilla system; the Thunder Shield is a domain-specific recreation using a standard mobjthinker. Do not run special stages SRB2Kart does not have special stages. Comment out Tag mechanisms See p_inter.c y_inter.c Disable some team-related material See g_game.c p_user.c Disable NiGHTS-related material See p_inter.c Disable 2d movement for players 2D mode? In a kart racer? :nick:
2018-10-03 16:04:41 +00:00
/*if (G_GametypeHasTeams())
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
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);
More stuuuuff
2017-12-17 06:21:24 +00:00
else if (p == &players[thirddisplayplayer])
CV_SetValue(&cv_playercolor3, skincolor_redteam);
else if (p == &players[fourthdisplayplayer])
CV_SetValue(&cv_playercolor4, skincolor_redteam);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
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);
More stuuuuff
2017-12-17 06:21:24 +00:00
else if (p == &players[thirddisplayplayer])
CV_SetValue(&cv_playercolor3, skincolor_blueteam);
else if (p == &players[fourthdisplayplayer])
CV_SetValue(&cv_playercolor4, skincolor_blueteam);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
Nuke a bunch of iteration things that have no purpose in SRB2Kart. A full explanation of my reasoning and what it affects is as follows. p_inter.c - Everything to do with setting states for starposts In SRB2Kart, starposts are invisble. We don't need to loop through all thinkers just to set their states when there's no visible effect of the state-setting. In addition, it has no consequences for gameplay - starposts have long been silent here, and all checking is done regarding their health, not their state. Remove extremely low-traffic conditionals (MT_FLINGEMERALD collision height extension, for example) These objects serve no functional purpose during regular SRB2Kart gameplay. Why should every other object have to pay an admittedly minor performance hit just for them? Disable all mechanisms of damaging bosses or enemies with the player's physical contact With the exception of Sapphire Coast, no MF_ENEMY objects exist in the entirety of the standard roster. In addition, the conditions for damaging the enemies were impossible to achieve, because they required vanilla SRB2 mechanics such as "jumping", "spindashing", or "super". Therefore, they can be safely commented out. Disable NiGHTS-related material (excepting bumper, hoop, and wing-emblem objects) NiGHTS is fundamentally incompatible with regular kart gameplay and I believe was already broken. Therefore, any mechanism which enters, aids, or abets it can be safely disabled. Comment out Tag mechanisms Tag is the only vanilla multiplayer gametype which has sufficient gameplay depth and complexity (HEYOOOOOOOOO) to require dedicated thinking in and of itself in order to manage. This thinking is irrelevant to Kart's functioning, and can be neutered easily. d_clisrv.c Comment out Tag mechanisms See p_inter.c d_netcmd.c Disable several devmode commands which are irrelevant to SRB2Kart gameplay When investigating for references to NiGHTS material, I discovered that these remained untouched. In order to present a more coherent game, I have hidden the ones that serve no purpose for us. Comment out Tag mechanisms See p_inter.c g_game.c Disable NiGHTS-related material See p_inter.c Disable some team-related material Teams are not present in SRB2Kart at present. Obviously we'd want to reconsider for future, but it doesn't need to be run right now. Everything to do with setting states for starposts See p_inter.c m_cheat.c Disable several devmode commands which are irrelevant to SRB2Kart gameplay See d_netcmd.c p_map.c Remove extremely low-traffic conditionals (MT_EGGSHIELD collision, for example) See p_inter.c Disable NiGHTS-related material See p_inter.c p_mobj.c Disable P_EmeraldManager Power stones, despite their relevance in vanilla Match, are not in SRB2Kart's Battle. No management of nonexistent emeralds is required. p_setup.c Everything to do with setting states for starposts See p_inter.c p_spec.c Disable NiGHTS-related material See p_inter.c Everything to do with setting states for starposts See p_inter.c p_telept.c Everything to do with setting states for starposts See p_inter.c p_tick.c Disable some team-related material See g_game.c Disable P_EmeraldManager See p_mobj.c Do not run shields Shield objects are not run under the vanilla system; the Thunder Shield is a domain-specific recreation using a standard mobjthinker. Do not run special stages SRB2Kart does not have special stages. Comment out Tag mechanisms See p_inter.c y_inter.c Disable some team-related material See g_game.c p_user.c Disable NiGHTS-related material See p_inter.c Disable 2d movement for players 2D mode? In a kart racer? :nick:
2018-10-03 16:04:41 +00:00
}*/
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
//
// 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;
Fix startbumps. A more detailed explanation: * P_CheckPosition is the function which determines collisions. * In Vanilla, collisions do not happen between players unless tailspickup is off (which it basically never is). * Even with tailspickup off, on-spawn player collisions do not affect momentum. * However, in kart, player collisions cause the player to get bumped. * It would succeed at the P_CheckPosition call because players aren't *solid* solid, even though they cause bumps. * It would fail at the K_CheckPlayersRespawnColliding call, but that would be too late, *as the player already has been bumped.* * The player would therefore be moved to a new location, but still retain bump momentum, and the bump sound would have played for both players. * Therefore, the obvious solution is to swap P_CheckPosition and K_CheckPlayersRespawnColliding, so that it checks for players BEFORE it performs object collisions at that spot. * The reason we didn't see this MUCH before is that it can only ever happen in the case of ties. I could've easily done this into master, but obviously I figure yalls'd at least like to check this first.
2018-11-06 13:33:27 +00:00
if (!K_CheckPlayersRespawnColliding(playernum, x, y))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return false;
Don't allow the player to respawn on a mapthing if it will collide them with another player Mainly effects battle where match starts are used, race will be effected at the beginning of races though
2017-11-11 03:28:20 +00:00
Fix startbumps. A more detailed explanation: * P_CheckPosition is the function which determines collisions. * In Vanilla, collisions do not happen between players unless tailspickup is off (which it basically never is). * Even with tailspickup off, on-spawn player collisions do not affect momentum. * However, in kart, player collisions cause the player to get bumped. * It would succeed at the P_CheckPosition call because players aren't *solid* solid, even though they cause bumps. * It would fail at the K_CheckPlayersRespawnColliding call, but that would be too late, *as the player already has been bumped.* * The player would therefore be moved to a new location, but still retain bump momentum, and the bump sound would have played for both players. * Therefore, the obvious solution is to swap P_CheckPosition and K_CheckPlayersRespawnColliding, so that it checks for players BEFORE it performs object collisions at that spot. * The reason we didn't see this MUCH before is that it can only ever happen in the case of ties. I could've easily done this into master, but obviously I figure yalls'd at least like to check this first.
2018-11-06 13:33:27 +00:00
if (!P_CheckPosition(players[playernum].mo, x, y))
Don't allow the player to respawn on a mapthing if it will collide them with another player Mainly effects battle where match starts are used, race will be effected at the beginning of races though
2017-11-11 03:28:20 +00:00
return false;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
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.
//
void G_SpawnPlayer(INT32 playernum, boolean starpost)
{
mapthing_t *spawnpoint;
if (!playeringame[playernum])
return;
P_SpawnPlayer(playernum);
if (starpost) //Don't even bother with looking for a place to spawn.
{
P_MovePlayerToStarpost(playernum);
Fix PlayerSpawn hook not being called if the player is respawned at a starpost
2017-06-20 15:18:51 +00:00
#ifdef HAVE_BLUA
LUAh_PlayerSpawn(&players[playernum]); // Lua hook for player spawning :)
#endif
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return;
}
// -- CTF --
// Order: CTF->DM->Coop
if (gametype == GT_CTF && players[playernum].ctfteam)
{
if (!(spawnpoint = G_FindCTFStart(playernum)) // find a CTF start
&& !(spawnpoint = G_FindMatchStart(playernum))) // find a DM start
Actual Race starts
2018-02-28 00:53:12 +00:00
spawnpoint = G_FindRaceStart(playernum); // fallback
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
// -- DM/Tag/CTF-spectator/etc --
// Order: DM->CTF->Coop
else if (gametype == GT_MATCH || gametype == GT_TEAMMATCH || gametype == GT_CTF
SRB2 2.1.14 release
2015-01-01 19:50:31 +00:00
|| ((gametype == GT_TAG || gametype == GT_HIDEANDSEEK) && !(players[playernum].pflags & PF_TAGIT)))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
if (!(spawnpoint = G_FindMatchStart(playernum)) // find a DM start
&& !(spawnpoint = G_FindCTFStart(playernum))) // find a CTF start
Actual Race starts
2018-02-28 00:53:12 +00:00
spawnpoint = G_FindRaceStart(playernum); // fallback
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
// -- Other game modes --
// Order: Coop->DM->CTF
else
{
Actual Race starts
2018-02-28 00:53:12 +00:00
if (!(spawnpoint = G_FindRaceStart(playernum)) // find a Race start
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
&& !(spawnpoint = G_FindMatchStart(playernum))) // find a DM start
spawnpoint = G_FindCTFStart(playernum); // fallback
}
//No spawns found. ANYWHERE.
if (!spawnpoint)
{
if (nummapthings)
{
A lot lol The importants: - Fixed compiling - Combined G_BuildTiccmd for all players, no more need for a function for each - You can actually start 3p/4p mode
2017-12-17 03:32:43 +00:00
if (playernum == consoleplayer
Change splitscreen into UINT8, fix HUD slightly more
2017-12-19 01:59:04 +00:00
|| (splitscreen && playernum == secondarydisplayplayer)
|| (splitscreen > 1 && playernum == thirddisplayplayer)
|| (splitscreen > 2 && playernum == fourthdisplayplayer))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
CONS_Alert(CONS_ERROR, M_GetText("No player spawns found, spawning at the first mapthing!\n"));
spawnpoint = &mapthings[0];
}
else
{
A lot lol The importants: - Fixed compiling - Combined G_BuildTiccmd for all players, no more need for a function for each - You can actually start 3p/4p mode
2017-12-17 03:32:43 +00:00
if (playernum == consoleplayer
Change splitscreen into UINT8, fix HUD slightly more
2017-12-19 01:59:04 +00:00
|| (splitscreen && playernum == secondarydisplayplayer)
|| (splitscreen > 1 && playernum == thirddisplayplayer)
|| (splitscreen > 2 && playernum == fourthdisplayplayer))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
CONS_Alert(CONS_ERROR, M_GetText("No player spawns found, spawning at the origin!\n"));
//P_MovePlayerToSpawn handles this fine if the spawnpoint is NULL.
}
}
P_MovePlayerToSpawn(playernum, spawnpoint);
Starting from scratch. SRB2 v2.1.15
2016-07-06 04:09:17 +00:00
#ifdef HAVE_BLUA
LUAh_PlayerSpawn(&players[playernum]); // Lua hook for player spawning :)
#endif
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?
{
A lot lol The importants: - Fixed compiling - Combined G_BuildTiccmd for all players, no more need for a function for each - You can actually start 3p/4p mode
2017-12-17 03:32:43 +00:00
if (playernum == consoleplayer
Change splitscreen into UINT8, fix HUD slightly more
2017-12-19 01:59:04 +00:00
|| (splitscreen && playernum == secondarydisplayplayer)
|| (splitscreen > 1 && playernum == thirddisplayplayer)
|| (splitscreen > 2 && playernum == fourthdisplayplayer))
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;
}
Starting from scratch. SRB2 v2.1.15
2016-07-06 04:09:17 +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)
{
A lot lol The importants: - Fixed compiling - Combined G_BuildTiccmd for all players, no more need for a function for each - You can actually start 3p/4p mode
2017-12-17 03:32:43 +00:00
if (playernum == consoleplayer
Change splitscreen into UINT8, fix HUD slightly more
2017-12-19 01:59:04 +00:00
|| (splitscreen && playernum == secondarydisplayplayer)
|| (splitscreen > 1 && playernum == thirddisplayplayer)
|| (splitscreen > 2 && playernum == fourthdisplayplayer))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
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];
}
A lot lol The importants: - Fixed compiling - Combined G_BuildTiccmd for all players, no more need for a function for each - You can actually start 3p/4p mode
2017-12-17 03:32:43 +00:00
if (playernum == consoleplayer
Change splitscreen into UINT8, fix HUD slightly more
2017-12-19 01:59:04 +00:00
|| (splitscreen && playernum == secondarydisplayplayer)
|| (splitscreen > 1 && playernum == thirddisplayplayer)
|| (splitscreen > 2 && playernum == fourthdisplayplayer))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
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)
{
A lot lol The importants: - Fixed compiling - Combined G_BuildTiccmd for all players, no more need for a function for each - You can actually start 3p/4p mode
2017-12-17 03:32:43 +00:00
if (playernum == consoleplayer
Change splitscreen into UINT8, fix HUD slightly more
2017-12-19 01:59:04 +00:00
|| (splitscreen && playernum == secondarydisplayplayer)
|| (splitscreen > 1 && playernum == thirddisplayplayer)
|| (splitscreen > 2 && playernum == fourthdisplayplayer))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
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];
}
A lot lol The importants: - Fixed compiling - Combined G_BuildTiccmd for all players, no more need for a function for each - You can actually start 3p/4p mode
2017-12-17 03:32:43 +00:00
if (playernum == consoleplayer
Change splitscreen into UINT8, fix HUD slightly more
2017-12-19 01:59:04 +00:00
|| (splitscreen && playernum == secondarydisplayplayer)
|| (splitscreen > 1 && playernum == thirddisplayplayer)
|| (splitscreen > 2 && playernum == fourthdisplayplayer))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
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];
}
A lot lol The importants: - Fixed compiling - Combined G_BuildTiccmd for all players, no more need for a function for each - You can actually start 3p/4p mode
2017-12-17 03:32:43 +00:00
if (playernum == consoleplayer
Change splitscreen into UINT8, fix HUD slightly more
2017-12-19 01:59:04 +00:00
|| (splitscreen && playernum == secondarydisplayplayer)
|| (splitscreen > 1 && playernum == thirddisplayplayer)
|| (splitscreen > 2 && playernum == fourthdisplayplayer))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
CONS_Alert(CONS_WARNING, M_GetText("Could not spawn at any Deathmatch starts!\n"));
return NULL;
}
A lot lol The importants: - Fixed compiling - Combined G_BuildTiccmd for all players, no more need for a function for each - You can actually start 3p/4p mode
2017-12-17 03:32:43 +00:00
if (playernum == consoleplayer
Change splitscreen into UINT8, fix HUD slightly more
2017-12-19 01:59:04 +00:00
|| (splitscreen && playernum == secondarydisplayplayer)
|| (splitscreen > 1 && playernum == thirddisplayplayer)
|| (splitscreen > 2 && playernum == fourthdisplayplayer))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
CONS_Alert(CONS_WARNING, M_GetText("No Deathmatch starts in this map!\n"));
return NULL;
}
Actual Race starts
2018-02-28 00:53:12 +00:00
mapthing_t *G_FindRaceStart(INT32 playernum)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
if (numcoopstarts)
{
Revamped race position Should support ties for real now :V
2018-03-02 05:02:26 +00:00
UINT8 i;
UINT8 pos = 0;
Actual Race starts
2018-02-28 00:53:12 +00:00
// SRB2Kart: figure out player spawn pos from points
Race position starts
2018-02-28 01:40:06 +00:00
if (!playeringame[playernum] || players[playernum].spectator)
return playerstarts[0]; // go to first spot if you're a spectator
Actual Race starts
2018-02-28 00:53:12 +00:00
for (i = 0; i < MAXPLAYERS; i++)
{
Race position starts
2018-02-28 01:40:06 +00:00
if (!playeringame[i] || players[i].spectator)
continue;
Revamped race position Should support ties for real now :V
2018-03-02 05:02:26 +00:00
if (i == playernum)
continue;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Revamped race position Should support ties for real now :V
2018-03-02 05:02:26 +00:00
if (players[i].score < players[playernum].score)
Race position starts
2018-02-28 01:40:06 +00:00
{
Revamped race position Should support ties for real now :V
2018-03-02 05:02:26 +00:00
UINT8 j;
UINT8 num = 0;
for (j = 0; j < MAXPLAYERS; j++) // I hate similar loops inside loops... :<
Race position starts
2018-02-28 01:40:06 +00:00
{
if (!playeringame[j] || players[j].spectator)
continue;
Revamped race position Should support ties for real now :V
2018-03-02 05:02:26 +00:00
if (j == playernum)
continue;
if (j == i)
continue;
if (players[j].score == players[i].score)
num++;
Race position starts
2018-02-28 01:40:06 +00:00
}
Revamped race position Should support ties for real now :V
2018-03-02 05:02:26 +00:00
if (num > 1) // found dupes
pos++;
}
else
{
if (players[i].score > players[playernum].score || i < playernum)
pos++;
Race position starts
2018-02-28 01:40:06 +00:00
}
Actual Race starts
2018-02-28 00:53:12 +00:00
}
if (G_CheckSpot(playernum, playerstarts[pos % numcoopstarts]))
return playerstarts[pos % numcoopstarts];
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Revamped race position Should support ties for real now :V
2018-03-02 05:02:26 +00:00
// Your spot isn't available? Find whatever you can get first.
for (i = 0; i < numcoopstarts; i++)
{
if (G_CheckSpot(playernum, playerstarts[i]))
return playerstarts[i];
}
Race position starts
2018-02-28 01:40:06 +00:00
// SRB2Kart: We have solid players, so this behavior is less ideal.
// Don't bother checking to see if the player 1 start is open.
// Just spawn there.
Actual Race starts
2018-02-28 00:53:12 +00:00
//return playerstarts[0];
if (playernum == consoleplayer
|| (splitscreen && playernum == secondarydisplayplayer)
|| (splitscreen > 1 && playernum == thirddisplayplayer)
|| (splitscreen > 2 && playernum == fourthdisplayplayer))
CONS_Alert(CONS_WARNING, M_GetText("Could not spawn at any Race starts!\n"));
return NULL;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
A lot lol The importants: - Fixed compiling - Combined G_BuildTiccmd for all players, no more need for a function for each - You can actually start 3p/4p mode
2017-12-17 03:32:43 +00:00
if (playernum == consoleplayer
Change splitscreen into UINT8, fix HUD slightly more
2017-12-19 01:59:04 +00:00
|| (splitscreen && playernum == secondarydisplayplayer)
|| (splitscreen > 1 && playernum == thirddisplayplayer)
|| (splitscreen > 2 && playernum == fourthdisplayplayer))
Actual Race starts
2018-02-28 00:53:12 +00:00
CONS_Alert(CONS_WARNING, M_GetText("No Race starts in this map!\n"));
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return NULL;
}
// 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
for (th = thinkercap.next; th != &thinkercap; th = th->next)
{
if (th->function.acp1 != (actionf_p1)P_MobjThinker)
continue;
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];
boolean starpost = false;
A couple of RA-related things An unlockables/time emblems update, the stats screen shows all maps without needing to visit each one, and respawning is enabled in Record Attack now
2018-05-31 02:53:06 +00:00
/*if (modeattacking) // Not needed for SRB2Kart.
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
M_EndModeAttackRun();
return;
A couple of RA-related things An unlockables/time emblems update, the stats screen shows all maps without needing to visit each one, and respawning is enabled in Record Attack now
2018-05-31 02:53:06 +00:00
}*/
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// 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);
}
Some token efforts to make singleplayer mode (accessible only via `-warp` and `map mapxx -force`) not COMPLETELY broken. * Fixed the conditionals for `suicide` and `retry` commands - `suicide` is now allowed in singleplayer, and `retry` no longer checks your lives (for now). * Disable the "traditional" level reload method (which `retry` tried to use), since it was completely broken with the other changes we've made. Mapchanges only. * Made retries cause a mapchange, per the above. * Disable the last source of skincolor trampling in the game - loading a level while not netgame or record attacking.
2018-10-17 12:40:17 +00:00
/*else if (countdowntimeup || (!multiplayer && !modeattacking))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
// reload the level from scratch
if (countdowntimeup)
{
player->starpostangle = 0;
player->starposttime = 0;
player->starpostx = 0;
player->starposty = 0;
player->starpostz = 0;
player->starpostnum = 0;
}
if (!countdowntimeup && (mapheaderinfo[gamemap-1]->levelflags & LF_NORELOAD))
{
INT32 i;
SRB2 2.1.9 release
2014-08-04 03:49:33 +00:00
player->playerstate = PST_REBORN;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
P_LoadThingsOnly();
// Do a wipe
wipegamestate = -1;
Added Accelcode, start boosting, reverted drifting, etc.
2017-02-07 22:19:04 +00:00
if (player->starpostnum) // SRB2kart
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
starpost = true;
if (camera.chase)
P_ResetCamera(&players[displayplayer], &camera);
Change splitscreen into UINT8, fix HUD slightly more
2017-12-19 01:59:04 +00:00
if (camera2.chase && splitscreen > 0)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
P_ResetCamera(&players[secondarydisplayplayer], &camera2);
Change splitscreen into UINT8, fix HUD slightly more
2017-12-19 01:59:04 +00:00
if (camera3.chase && splitscreen > 1)
more quad stuff
2017-12-11 06:12:38 +00:00
P_ResetCamera(&players[thirddisplayplayer], &camera3);
Change splitscreen into UINT8, fix HUD slightly more
2017-12-19 01:59:04 +00:00
if (camera4.chase && splitscreen > 2)
more quad stuff
2017-12-11 06:12:38 +00:00
P_ResetCamera(&players[fourthdisplayplayer], &camera4);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// 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;
more quad stuff
2017-12-11 06:12:38 +00:00
joy3xmove[i] = joy3ymove[i] = 0;
joy4xmove[i] = joy4ymove[i] = 0;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
mousex = mousey = 0;
mouse2x = mouse2y = 0;
// clear hud messages remains (usually from game startup)
CON_ClearHUD();
// Starpost support
G_SpawnPlayer(playernum, starpost);
SRB2 2.1.9 release
2014-08-04 03:49:33 +00:00
if (botingame)
{ // Bots respawn next to their master.
players[secondarydisplayplayer].playerstate = PST_REBORN;
G_SpawnPlayer(secondarydisplayplayer, false);
}
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
#ifdef HAVE_BLUA
LUAh_MapChange(gamemap);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
#endif
G_DoLoadLevel(true);
}
Some token efforts to make singleplayer mode (accessible only via `-warp` and `map mapxx -force`) not COMPLETELY broken. * Fixed the conditionals for `suicide` and `retry` commands - `suicide` is now allowed in singleplayer, and `retry` no longer checks your lives (for now). * Disable the "traditional" level reload method (which `retry` tried to use), since it was completely broken with the other changes we've made. Mapchanges only. * Made retries cause a mapchange, per the above. * Disable the last source of skincolor trampling in the game - loading a level while not netgame or record attacking.
2018-10-17 12:40:17 +00:00
}*/
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
else
{
// respawn at the start
mobj_t *oldmo = NULL;
LF_SECTIONRACE now has a secondary function! * Sets the player respawn coords on the finish line, so dying in the short interval between crossing an intermediate finish line and hitting a checkpoint doesn't send you all the way back to the beginning.
2018-11-28 16:33:52 +00:00
if (player->starpostnum || ((mapheaderinfo[gamemap - 1]->levelflags & LF_SECTIONRACE) && player->laps)) // SRB2kart
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
starpost = true;
// 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);
}
G_SpawnPlayer(playernum, starpost);
if (oldmo)
G_ChangePlayerReferences(oldmo, players[playernum].mo);
}
}
void G_AddPlayer(INT32 playernum)
{
player_t *p = &players[playernum];
p->jointime = 0;
p->playerstate = PST_REBORN;
}
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);
}
* A bunch of intermission related stuff! * Time overs now supported, see below. * Ties now supported! * Code cleaned up. * Play more sonicy tally sounds when counting your points. * A bunch of time over related stuff! * Exitlevel time overs everyone, which means no points for you. * F-Zero-sorta-maybe style death if you're the last person on the course (and not the ONLY one) when someone crosses the finish line! (Or switches to spectator.) * A bunch of music related stuff! * Functionally reverted many of my changes to splitscreen and ending music, although the major changes to simplify music code are still kept. * P_EndingMusic is genericised across gametypes, and only switches a single letter (and looping-ness) now! * Fix exitlevel in race causing whatever you're listening to to keep playing. * Make powerups call P_RestoreMusic. * Put a call to P_EndingMusic into P_RestoreMusic. * Unrelated crap. * Make all palette swaps happen at the black point of fades, so they don't stick around awkwardly. * Huh, I thought I did more than that. Oh well!
2018-07-18 00:21:36 +00:00
if (netgame || multiplayer)
Remove most gameplay prints A couple of the extraneous ones (karma interactions, bumper stealing, lap start notifications) have been removed outright. The rest that I could think of have been changed to use CON_LogMessage, so that they still go into log.txt when rereading a fun chat session but not showing themselves in gameplay. Necessary gameplay prints, such as players being defeated or coming back in Battle, have been kept until there's a suitable replacement for them in the future.
2018-10-14 21:45:28 +00:00
CON_LogMessage(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
}
}
//
// G_IsSpecialStage
//
// Returns TRUE if
// the given map is a special stage.
//
boolean G_IsSpecialStage(INT32 mapnum)
{
Minor adjustments in hopes that I fixed the resynch bomb on gametype switch?
2018-02-08 22:13:06 +00:00
#if 0
Squash a few more errors Updated my compile setup to GCC 6.3, makes it as far as m_misc.c now with ERRORMODE and DEBUGMODE, stops at some gettext related stuff I don't know how to fix now
2018-07-07 01:53:37 +00:00
return (gametype == GT_COOP && modeattacking != ATTACKING_RECORD && mapnum >= sstage_start && mapnum <= sstage_end);
Intro camera can noclip, fix several compile errors
2018-06-25 13:18:30 +00:00
#else
(void)mapnum;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return false;
Squash a few more errors Updated my compile setup to GCC 6.3, makes it as far as m_misc.c now with ERRORMODE and DEBUGMODE, stops at some gettext related stuff I don't know how to fix now
2018-07-07 01:53:37 +00:00
#endif
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
//
// G_GametypeUsesLives
//
// Returns true if the current gametype uses
// the lives system. False otherwise.
//
boolean G_GametypeUsesLives(void)
{
Minor adjustments in hopes that I fixed the resynch bomb on gametype switch?
2018-02-08 22:13:06 +00:00
// SRB2kart NEEDS no lives
#if 0
// Coop, Competitive
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if ((gametype == GT_COOP || gametype == GT_COMPETITION)
&& !modeattacking // No lives in Time Attack
//&& !G_IsSpecialStage(gamemap)
&& !(maptol & TOL_NIGHTS)) // No lives in NiGHTS
return true;
return false;
Minor adjustments in hopes that I fixed the resynch bomb on gametype switch?
2018-02-08 22:13:06 +00:00
#else
return false;
#endif
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)
{
return (gametype == GT_TEAMMATCH || gametype == GT_CTF);
}
//
// G_GametypeHasSpectators
//
// Returns true if the current gametype supports
// spectators. False otherwise.
//
boolean G_GametypeHasSpectators(void)
{
Spectating is properly implemented now - Spectate button works - Spectating & objectplace controls are usable now - New spectator HUD
2018-01-23 03:18:57 +00:00
// SRB2Kart: We don't have any exceptions to not being able to spectate yet. Maybe when SP & bots roll around.
#if 0
return (gametype != GT_COOP && gametype != GT_COMPETITION && gametype != GT_RACE);
#else
Foolish error
2018-10-01 01:47:04 +00:00
return (netgame); //true
Spectating is properly implemented now - Spectate button works - Spectating & objectplace controls are usable now - New spectator HUD
2018-01-23 03:18:57 +00:00
#endif
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
//
Minor adjustments in hopes that I fixed the resynch bomb on gametype switch?
2018-02-08 22:13:06 +00:00
// G_BattleGametype
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
//
Minor adjustments in hopes that I fixed the resynch bomb on gametype switch?
2018-02-08 22:13:06 +00:00
// Returns true in Battle gamemodes, previously was G_RingSlingerGametype.
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
//
Minor adjustments in hopes that I fixed the resynch bomb on gametype switch?
2018-02-08 22:13:06 +00:00
boolean G_BattleGametype(void)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Minor adjustments in hopes that I fixed the resynch bomb on gametype switch?
2018-02-08 22:13:06 +00:00
return (gametype == GT_MATCH);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
* AN OPPORTUNITY FOR GAMETYPE CHANGES ON THE VOTE SCREEN! * Super important to allow dedicated servers to continue forever without needing to add Terminal. * To facilitate understanding, add gametype dog-ears to the vote screen! * To do the above, add V_DrawDiag! Works in GL, too!! * Unrelated shit! * Fix a buffer overrun in the randmapbuffer! * Disable spectating in splitscreen... Not 100% sure, but in 2p battle, if you spectate, you just lose one balloon and respawn... * Improve all the string drawing functions' behaviour - both with being SLIGHTLY clipped by the edge of the screen, and when confronted with drawing off the base 320*200 internal area
2018-06-28 14:47:56 +00:00
//
// G_SometimesGetDifferentGametype
//
* Encore on the voting screen! Appears randomly once unlocked in the same slot as that which sometimes represents a gametype change (odds inflated for testing purposes). * A better representation of an Encore level, now with inverted graphics (a special remapping we can now use elsewhere whenever if we want!) and a floating Ruby! * Decouple encore's setting from cv_kartencore on mapload. Instead, bake it into D_MapChange and related, which will only some of the time be fed by cv_kartencore's value. * Encore mode now has a special mapheader palette setting, "encorepal", rather than using the same one as non-encore.
2018-08-11 21:23:40 +00:00
// Oh, yeah, and we sometimes flip encore mode on here too.
* AN OPPORTUNITY FOR GAMETYPE CHANGES ON THE VOTE SCREEN! * Super important to allow dedicated servers to continue forever without needing to add Terminal. * To facilitate understanding, add gametype dog-ears to the vote screen! * To do the above, add V_DrawDiag! Works in GL, too!! * Unrelated shit! * Fix a buffer overrun in the randmapbuffer! * Disable spectating in splitscreen... Not 100% sure, but in 2p battle, if you spectate, you just lose one balloon and respawn... * Improve all the string drawing functions' behaviour - both with being SLIGHTLY clipped by the edge of the screen, and when confronted with drawing off the base 320*200 internal area
2018-06-28 14:47:56 +00:00
//
INT16 G_SometimesGetDifferentGametype(void)
{
Do a bunch of major modifications to the voting system's rule change system! * Add `kartvoterulechanges`, or "Voting Rule Changes" on the menu, to allow some user control over event frequency. * "Never" - does what it says on the tin. * "Sometimes" - 1/8 chance of Encore if host has unlocked it, only gametype change when buffer is full * "Frequent" - 1/2 chance of Encore if host has unlocked it, gametype change every 5 maps * "Always" - If host has unlocked Encore, alternates between Encore and Gametype. Otherwise, always a gametype change * There's probably room for a setting between "Sometimes" and "Frequent", but I didn't want to overload the host with options and these were the ones that made sense. * Better handling of buffer refreshes, to prevent two of the same map appearing next to each other in the voting unless there literally aren't that many maps. * Mostly unrelated: Minor bugfix for Y_SetupVoteFinish, preventing music changes/random sounds playing on the You Will Join Next Race screen. (Branch-appropriate, at least.)
2018-09-11 14:41:41 +00:00
boolean encorepossible = (M_SecretUnlocked(SECRET_ENCORE) && G_RaceGametype());
if (!cv_kartvoterulechanges.value) // never
return gametype;
if (randmapbuffer[NUMMAPS] > 0 && (encorepossible || cv_kartvoterulechanges.value != 3))
* Encore on the voting screen! Appears randomly once unlocked in the same slot as that which sometimes represents a gametype change (odds inflated for testing purposes). * A better representation of an Encore level, now with inverted graphics (a special remapping we can now use elsewhere whenever if we want!) and a floating Ruby! * Decouple encore's setting from cv_kartencore on mapload. Instead, bake it into D_MapChange and related, which will only some of the time be fed by cv_kartencore's value. * Encore mode now has a special mapheader palette setting, "encorepal", rather than using the same one as non-encore.
2018-08-11 21:23:40 +00:00
{
The oft-promised buffer fixes. Also, making it so the gametype switch for "Sometimes" is every 10 maps, not a full buffer round (now that it doesn't add to the buffer when you first see it). Unfortunately, the code didn't turn out nearly as nice as I'd desired, but things don't always work out. In addition: For some reason, I rolled Tinkerer's Arena twice within three hits of the Dice voting option, so something's wrong and this branch needs proper, rigorous investigative testing but I don't know what and I'm way too tired (both physically and metaphysically) to investigate any further.
2018-11-22 17:10:36 +00:00
randmapbuffer[NUMMAPS]--;
Do a bunch of major modifications to the voting system's rule change system! * Add `kartvoterulechanges`, or "Voting Rule Changes" on the menu, to allow some user control over event frequency. * "Never" - does what it says on the tin. * "Sometimes" - 1/8 chance of Encore if host has unlocked it, only gametype change when buffer is full * "Frequent" - 1/2 chance of Encore if host has unlocked it, gametype change every 5 maps * "Always" - If host has unlocked Encore, alternates between Encore and Gametype. Otherwise, always a gametype change * There's probably room for a setting between "Sometimes" and "Frequent", but I didn't want to overload the host with options and these were the ones that made sense. * Better handling of buffer refreshes, to prevent two of the same map appearing next to each other in the voting unless there literally aren't that many maps. * Mostly unrelated: Minor bugfix for Y_SetupVoteFinish, preventing music changes/random sounds playing on the You Will Join Next Race screen. (Branch-appropriate, at least.)
2018-09-11 14:41:41 +00:00
if (encorepossible)
{
switch (cv_kartvoterulechanges.value)
{
case 3: // always
randmapbuffer[NUMMAPS] = 0; // gotta prep this in case it isn't already set
break;
case 2: // frequent
encorepossible = M_RandomChance(FRACUNIT>>1);
break;
case 1: // sometimes
default:
Bump up the frequency of voting rule changes This is in our changelog, but I didn't actually get around to doing it. Would've been foolish to ship with that :V
2019-01-16 21:19:16 +00:00
encorepossible = M_RandomChance(FRACUNIT>>2);
Do a bunch of major modifications to the voting system's rule change system! * Add `kartvoterulechanges`, or "Voting Rule Changes" on the menu, to allow some user control over event frequency. * "Never" - does what it says on the tin. * "Sometimes" - 1/8 chance of Encore if host has unlocked it, only gametype change when buffer is full * "Frequent" - 1/2 chance of Encore if host has unlocked it, gametype change every 5 maps * "Always" - If host has unlocked Encore, alternates between Encore and Gametype. Otherwise, always a gametype change * There's probably room for a setting between "Sometimes" and "Frequent", but I didn't want to overload the host with options and these were the ones that made sense. * Better handling of buffer refreshes, to prevent two of the same map appearing next to each other in the voting unless there literally aren't that many maps. * Mostly unrelated: Minor bugfix for Y_SetupVoteFinish, preventing music changes/random sounds playing on the You Will Join Next Race screen. (Branch-appropriate, at least.)
2018-09-11 14:41:41 +00:00
break;
}
Sign compare fix via boolean cast
2018-09-22 10:59:07 +00:00
if (encorepossible != (boolean)cv_kartencore.value)
Do a bunch of major modifications to the voting system's rule change system! * Add `kartvoterulechanges`, or "Voting Rule Changes" on the menu, to allow some user control over event frequency. * "Never" - does what it says on the tin. * "Sometimes" - 1/8 chance of Encore if host has unlocked it, only gametype change when buffer is full * "Frequent" - 1/2 chance of Encore if host has unlocked it, gametype change every 5 maps * "Always" - If host has unlocked Encore, alternates between Encore and Gametype. Otherwise, always a gametype change * There's probably room for a setting between "Sometimes" and "Frequent", but I didn't want to overload the host with options and these were the ones that made sense. * Better handling of buffer refreshes, to prevent two of the same map appearing next to each other in the voting unless there literally aren't that many maps. * Mostly unrelated: Minor bugfix for Y_SetupVoteFinish, preventing music changes/random sounds playing on the You Will Join Next Race screen. (Branch-appropriate, at least.)
2018-09-11 14:41:41 +00:00
return (gametype|0x80);
}
* AN OPPORTUNITY FOR GAMETYPE CHANGES ON THE VOTE SCREEN! * Super important to allow dedicated servers to continue forever without needing to add Terminal. * To facilitate understanding, add gametype dog-ears to the vote screen! * To do the above, add V_DrawDiag! Works in GL, too!! * Unrelated shit! * Fix a buffer overrun in the randmapbuffer! * Disable spectating in splitscreen... Not 100% sure, but in 2p battle, if you spectate, you just lose one balloon and respawn... * Improve all the string drawing functions' behaviour - both with being SLIGHTLY clipped by the edge of the screen, and when confronted with drawing off the base 320*200 internal area
2018-06-28 14:47:56 +00:00
return gametype;
* Encore on the voting screen! Appears randomly once unlocked in the same slot as that which sometimes represents a gametype change (odds inflated for testing purposes). * A better representation of an Encore level, now with inverted graphics (a special remapping we can now use elsewhere whenever if we want!) and a floating Ruby! * Decouple encore's setting from cv_kartencore on mapload. Instead, bake it into D_MapChange and related, which will only some of the time be fed by cv_kartencore's value. * Encore mode now has a special mapheader palette setting, "encorepal", rather than using the same one as non-encore.
2018-08-11 21:23:40 +00:00
}
* AN OPPORTUNITY FOR GAMETYPE CHANGES ON THE VOTE SCREEN! * Super important to allow dedicated servers to continue forever without needing to add Terminal. * To facilitate understanding, add gametype dog-ears to the vote screen! * To do the above, add V_DrawDiag! Works in GL, too!! * Unrelated shit! * Fix a buffer overrun in the randmapbuffer! * Disable spectating in splitscreen... Not 100% sure, but in 2p battle, if you spectate, you just lose one balloon and respawn... * Improve all the string drawing functions' behaviour - both with being SLIGHTLY clipped by the edge of the screen, and when confronted with drawing off the base 320*200 internal area
2018-06-28 14:47:56 +00:00
Do a bunch of major modifications to the voting system's rule change system! * Add `kartvoterulechanges`, or "Voting Rule Changes" on the menu, to allow some user control over event frequency. * "Never" - does what it says on the tin. * "Sometimes" - 1/8 chance of Encore if host has unlocked it, only gametype change when buffer is full * "Frequent" - 1/2 chance of Encore if host has unlocked it, gametype change every 5 maps * "Always" - If host has unlocked Encore, alternates between Encore and Gametype. Otherwise, always a gametype change * There's probably room for a setting between "Sometimes" and "Frequent", but I didn't want to overload the host with options and these were the ones that made sense. * Better handling of buffer refreshes, to prevent two of the same map appearing next to each other in the voting unless there literally aren't that many maps. * Mostly unrelated: Minor bugfix for Y_SetupVoteFinish, preventing music changes/random sounds playing on the You Will Join Next Race screen. (Branch-appropriate, at least.)
2018-09-11 14:41:41 +00:00
switch (cv_kartvoterulechanges.value) // okay, we're having a gametype change! when's the next one, luv?
{
case 3: // always
randmapbuffer[NUMMAPS] = 1; // every other vote (or always if !encorepossible)
break;
case 1: // sometimes
Bump up the frequency of voting rule changes This is in our changelog, but I didn't actually get around to doing it. Would've been foolish to ship with that :V
2019-01-16 21:19:16 +00:00
randmapbuffer[NUMMAPS] = 5; // per "cup"
The oft-promised buffer fixes. Also, making it so the gametype switch for "Sometimes" is every 10 maps, not a full buffer round (now that it doesn't add to the buffer when you first see it). Unfortunately, the code didn't turn out nearly as nice as I'd desired, but things don't always work out. In addition: For some reason, I rolled Tinkerer's Arena twice within three hits of the Dice voting option, so something's wrong and this branch needs proper, rigorous investigative testing but I don't know what and I'm way too tired (both physically and metaphysically) to investigate any further.
2018-11-22 17:10:36 +00:00
break;
Do a bunch of major modifications to the voting system's rule change system! * Add `kartvoterulechanges`, or "Voting Rule Changes" on the menu, to allow some user control over event frequency. * "Never" - does what it says on the tin. * "Sometimes" - 1/8 chance of Encore if host has unlocked it, only gametype change when buffer is full * "Frequent" - 1/2 chance of Encore if host has unlocked it, gametype change every 5 maps * "Always" - If host has unlocked Encore, alternates between Encore and Gametype. Otherwise, always a gametype change * There's probably room for a setting between "Sometimes" and "Frequent", but I didn't want to overload the host with options and these were the ones that made sense. * Better handling of buffer refreshes, to prevent two of the same map appearing next to each other in the voting unless there literally aren't that many maps. * Mostly unrelated: Minor bugfix for Y_SetupVoteFinish, preventing music changes/random sounds playing on the You Will Join Next Race screen. (Branch-appropriate, at least.)
2018-09-11 14:41:41 +00:00
default:
// fallthrough - happens when clearing buffer, but needs a reasonable countdown if cvar is modified
case 2: // frequent
Final v1.0.2 commit (probably) - Update chars.kart hash, AGAIN! - Fix spectators being visible on minimap when F12ing people - Optimize how splitscreen players are drawn on top of the minimap - Remove duplicated cvar registrations - Move cv_resynchattempts and cv_netticbuffer from D_ClientServerInit to D_RegisterServerCommands and D_RegisterClientCommands respectively, so they can save to config properly - Increase "Frequent" gametype switch frequency even more - "SRB2" version dehacked warning ignores srb2.srb
2019-01-18 09:30:38 +00:00
randmapbuffer[NUMMAPS] = 2; // ...every 1/2th-ish cup?
Do a bunch of major modifications to the voting system's rule change system! * Add `kartvoterulechanges`, or "Voting Rule Changes" on the menu, to allow some user control over event frequency. * "Never" - does what it says on the tin. * "Sometimes" - 1/8 chance of Encore if host has unlocked it, only gametype change when buffer is full * "Frequent" - 1/2 chance of Encore if host has unlocked it, gametype change every 5 maps * "Always" - If host has unlocked Encore, alternates between Encore and Gametype. Otherwise, always a gametype change * There's probably room for a setting between "Sometimes" and "Frequent", but I didn't want to overload the host with options and these were the ones that made sense. * Better handling of buffer refreshes, to prevent two of the same map appearing next to each other in the voting unless there literally aren't that many maps. * Mostly unrelated: Minor bugfix for Y_SetupVoteFinish, preventing music changes/random sounds playing on the You Will Join Next Race screen. (Branch-appropriate, at least.)
2018-09-11 14:41:41 +00:00
break;
}
* AN OPPORTUNITY FOR GAMETYPE CHANGES ON THE VOTE SCREEN! * Super important to allow dedicated servers to continue forever without needing to add Terminal. * To facilitate understanding, add gametype dog-ears to the vote screen! * To do the above, add V_DrawDiag! Works in GL, too!! * Unrelated shit! * Fix a buffer overrun in the randmapbuffer! * Disable spectating in splitscreen... Not 100% sure, but in 2p battle, if you spectate, you just lose one balloon and respawn... * Improve all the string drawing functions' behaviour - both with being SLIGHTLY clipped by the edge of the screen, and when confronted with drawing off the base 320*200 internal area
2018-06-28 14:47:56 +00:00
if (gametype == GT_MATCH)
return GT_RACE;
return GT_MATCH;
}
//
// G_GetGametypeColor
//
// Pretty and consistent ^u^
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
// See also M_GetGametypeColor.
* AN OPPORTUNITY FOR GAMETYPE CHANGES ON THE VOTE SCREEN! * Super important to allow dedicated servers to continue forever without needing to add Terminal. * To facilitate understanding, add gametype dog-ears to the vote screen! * To do the above, add V_DrawDiag! Works in GL, too!! * Unrelated shit! * Fix a buffer overrun in the randmapbuffer! * Disable spectating in splitscreen... Not 100% sure, but in 2p battle, if you spectate, you just lose one balloon and respawn... * Improve all the string drawing functions' behaviour - both with being SLIGHTLY clipped by the edge of the screen, and when confronted with drawing off the base 320*200 internal area
2018-06-28 14:47:56 +00:00
//
UINT8 G_GetGametypeColor(INT16 gt)
{
Sorry, Sal! In my defense, you don't need to recompile from scratch for any of this, despite what it may look like, as the skincolour name lists are walled off from the rest of the dehacked lists... More menu/highlight things: * Rename "Default" to "Game type", to make clearer what it's doing. * Tweak race colouring slightly. * Put a highlight around the level select icon, and make it consistent with voting. * Allow setting the highlight colour to affect the intermissions. * Fix bug with gametype colour getting for record attack. A handful of skincolour things: * Rename Turqouise to Aqua, because it resembles one of my fav 2.2 colours with that name. * Fix incomplete Steel Blue -> Steel rename. * Merge the very similar Blueberry and Sapphire... * ... so Sapphire can be backported! * And Ruby too.
2018-07-02 12:20:04 +00:00
if (modeattacking // == ATTACKING_RECORD
|| gamestate == GS_TIMEATTACK)
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
return orangemap[120];
* AN OPPORTUNITY FOR GAMETYPE CHANGES ON THE VOTE SCREEN! * Super important to allow dedicated servers to continue forever without needing to add Terminal. * To facilitate understanding, add gametype dog-ears to the vote screen! * To do the above, add V_DrawDiag! Works in GL, too!! * Unrelated shit! * Fix a buffer overrun in the randmapbuffer! * Disable spectating in splitscreen... Not 100% sure, but in 2p battle, if you spectate, you just lose one balloon and respawn... * Improve all the string drawing functions' behaviour - both with being SLIGHTLY clipped by the edge of the screen, and when confronted with drawing off the base 320*200 internal area
2018-06-28 14:47:56 +00:00
if (gt == GT_MATCH)
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
return redmap[120];
* AN OPPORTUNITY FOR GAMETYPE CHANGES ON THE VOTE SCREEN! * Super important to allow dedicated servers to continue forever without needing to add Terminal. * To facilitate understanding, add gametype dog-ears to the vote screen! * To do the above, add V_DrawDiag! Works in GL, too!! * Unrelated shit! * Fix a buffer overrun in the randmapbuffer! * Disable spectating in splitscreen... Not 100% sure, but in 2p battle, if you spectate, you just lose one balloon and respawn... * Improve all the string drawing functions' behaviour - both with being SLIGHTLY clipped by the edge of the screen, and when confronted with drawing off the base 320*200 internal area
2018-06-28 14:47:56 +00:00
if (gt == GT_RACE)
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
return skymap[120];
* AN OPPORTUNITY FOR GAMETYPE CHANGES ON THE VOTE SCREEN! * Super important to allow dedicated servers to continue forever without needing to add Terminal. * To facilitate understanding, add gametype dog-ears to the vote screen! * To do the above, add V_DrawDiag! Works in GL, too!! * Unrelated shit! * Fix a buffer overrun in the randmapbuffer! * Disable spectating in splitscreen... Not 100% sure, but in 2p battle, if you spectate, you just lose one balloon and respawn... * Improve all the string drawing functions' behaviour - both with being SLIGHTLY clipped by the edge of the screen, and when confronted with drawing off the base 320*200 internal area
2018-06-28 14:47:56 +00:00
return 247; // FALLBACK
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
//
Minor adjustments in hopes that I fixed the resynch bomb on gametype switch?
2018-02-08 22:13:06 +00:00
// G_RaceGametype
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
//
Made a lot of gametype checks use either G_RaceGametype or G_BattleGametype Should make it a lot easier to add more gametypes later. Also some minor fixes: - Changed up how shell speed scales in mobjscale juuuust slightly, so it's less messy - Fixed CHECK showing spectators
2018-03-04 20:27:52 +00:00
// Returns true in Race gamemodes, previously was G_PlatformGametype.
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
//
Minor adjustments in hopes that I fixed the resynch bomb on gametype switch?
2018-02-08 22:13:06 +00:00
boolean G_RaceGametype(void)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Made a lot of gametype checks use either G_RaceGametype or G_BattleGametype Should make it a lot easier to add more gametypes later. Also some minor fixes: - Changed up how shell speed scales in mobjscale juuuust slightly, so it's less messy - Fixed CHECK showing spectators
2018-03-04 20:27:52 +00:00
return (gametype == GT_RACE);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
//
// G_TagGametype
//
Minor adjustments in hopes that I fixed the resynch bomb on gametype switch?
2018-02-08 22:13:06 +00:00
// For Jazz's Tag/HnS modes that have a lot of special cases...
// SRB2Kart: do we actually want to add Kart tag later? :V
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
//
boolean G_TagGametype(void)
{
return (gametype == GT_TAG || gametype == GT_HIDEANDSEEK);
}
/** 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>
*/
INT16 G_TOLFlag(INT32 pgametype)
{
if (!multiplayer) return TOL_SP;
Added Accelcode, start boosting, reverted drifting, etc.
2017-02-07 22:19:04 +00:00
if (pgametype == GT_COOP) return TOL_RACE; // SRB2kart
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (pgametype == GT_COMPETITION) return TOL_COMPETITION;
if (pgametype == GT_RACE) return TOL_RACE;
if (pgametype == GT_MATCH) return TOL_MATCH;
if (pgametype == GT_TEAMMATCH) return TOL_MATCH;
if (pgametype == GT_TAG) return TOL_TAG;
if (pgametype == GT_HIDEANDSEEK) return TOL_TAG;
if (pgametype == GT_CTF) return TOL_CTF;
CONS_Alert(CONS_ERROR, M_GetText("Unknown gametype! %d\n"), pgametype);
return INT16_MAX;
}
Everything Been a while since I synced :V
2018-02-04 04:47:47 +00:00
static INT32 TOLMaps(INT16 tolflags)
{
INT32 num = 0;
INT16 i;
// Find all the maps that are ok and and put them in an array.
for (i = 0; i < NUMMAPS; i++)
{
if (!mapheaderinfo[i])
continue;
Flush map buffer early, again Now it's directly in G_AddMapToBuffer
2018-11-26 11:09:26 +00:00
if (mapheaderinfo[i]->menuflags & LF2_HIDEINMENU) // Don't include Map Hell
continue;
Everything Been a while since I synced :V
2018-02-04 04:47:47 +00:00
if ((mapheaderinfo[i]->typeoflevel & tolflags) == tolflags)
num++;
}
return num;
}
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>
*/
Intermissions... * Do the gametype change stuff on the voting screen. * Make all the picking sound and setting stuff one function, rather than in two seperate places that need to be kept identical. * Have the timer at the bottom be the highlight colour. * Map hell! LF2_HIDEINMENU is craftily reused... * Less allocation and deallocation for the adjacent G_RandMaps. Other stuff... * Fix command_map_f not resetting players' score in battle. * Shiny titlescreen! * Fix a random bonus newline in one of the quit messages.
2018-07-02 22:17:30 +00:00
static INT16 *okmaps = NULL;
Remove previous commit's votebuffer, allow an external optional buffer to be passed into G_RandMap I meant to fix the previous method, but I didn't even understand how it knew it was in a vote or not... so I just did it my own way :V (Shouldn't FLUSHMAPBUFFEREARLY be on now...?)
2018-11-26 09:27:31 +00:00
INT16 G_RandMap(INT16 tolflags, INT16 pprevmap, boolean ignorebuffer, UINT8 maphell, boolean callagainsoon, INT16 *extbuffer)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
INT32 numokmaps = 0;
Everything Been a while since I synced :V
2018-02-04 04:47:47 +00:00
INT16 ix, bufx;
Calculate buffer size manually (Yes, I checked; this always outputs "3" for its current usage.)
2018-11-26 10:09:56 +00:00
UINT16 extbufsize = 0;
Make Map Hell a 1% chance
2018-11-20 04:41:15 +00:00
boolean usehellmaps; // Only consider Hell maps in this pick
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Intermissions... * Do the gametype change stuff on the voting screen. * Make all the picking sound and setting stuff one function, rather than in two seperate places that need to be kept identical. * Have the timer at the bottom be the highlight colour. * Map hell! LF2_HIDEINMENU is craftily reused... * Less allocation and deallocation for the adjacent G_RandMaps. Other stuff... * Fix command_map_f not resetting players' score in battle. * Shiny titlescreen! * Fix a random bonus newline in one of the quit messages.
2018-07-02 22:17:30 +00:00
if (!okmaps)
okmaps = Z_Malloc(NUMMAPS * sizeof(INT16), PU_STATIC, NULL);
Calculate buffer size manually (Yes, I checked; this always outputs "3" for its current usage.)
2018-11-26 10:09:56 +00:00
if (extbuffer != NULL)
{
bufx = 0;
while (extbuffer[bufx]) {
extbufsize++; bufx++;
}
}
Do a bunch of major modifications to the voting system's rule change system! * Add `kartvoterulechanges`, or "Voting Rule Changes" on the menu, to allow some user control over event frequency. * "Never" - does what it says on the tin. * "Sometimes" - 1/8 chance of Encore if host has unlocked it, only gametype change when buffer is full * "Frequent" - 1/2 chance of Encore if host has unlocked it, gametype change every 5 maps * "Always" - If host has unlocked Encore, alternates between Encore and Gametype. Otherwise, always a gametype change * There's probably room for a setting between "Sometimes" and "Frequent", but I didn't want to overload the host with options and these were the ones that made sense. * Better handling of buffer refreshes, to prevent two of the same map appearing next to each other in the voting unless there literally aren't that many maps. * Mostly unrelated: Minor bugfix for Y_SetupVoteFinish, preventing music changes/random sounds playing on the You Will Join Next Race screen. (Branch-appropriate, at least.)
2018-09-11 14:41:41 +00:00
tryagain:
Make Map Hell a 1% chance
2018-11-20 04:41:15 +00:00
usehellmaps = (maphell == 0 ? false : (maphell == 2 || M_RandomChance(FRACUNIT/100))); // 1% chance of Hell
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Find all the maps that are ok and and put them in an array.
for (ix = 0; ix < NUMMAPS; ix++)
Everything Been a while since I synced :V
2018-02-04 04:47:47 +00:00
{
boolean isokmap = true;
if (!mapheaderinfo[ix])
continue;
if ((mapheaderinfo[ix]->typeoflevel & tolflags) != tolflags
|| ix == pprevmap
Intermissions... * Do the gametype change stuff on the voting screen. * Make all the picking sound and setting stuff one function, rather than in two seperate places that need to be kept identical. * Have the timer at the bottom be the highlight colour. * Map hell! LF2_HIDEINMENU is craftily reused... * Less allocation and deallocation for the adjacent G_RandMaps. Other stuff... * Fix command_map_f not resetting players' score in battle. * Shiny titlescreen! * Fix a random bonus newline in one of the quit messages.
2018-07-02 22:17:30 +00:00
|| (!dedicated && M_MapLocked(ix+1))
Make Map Hell a 1% chance
2018-11-20 04:41:15 +00:00
|| (usehellmaps != (mapheaderinfo[ix]->menuflags & LF2_HIDEINMENU))) // this is bad
TITLE SCREEN DEMOS: Pick a random Staff Attack demo!!! Also: Fix watching a demo replay of a map with a palette not resetting your palette back to normal when you go back to the menu(/titlescreen).
2018-11-05 13:45:40 +00:00
continue; //isokmap = false;
Everything Been a while since I synced :V
2018-02-04 04:47:47 +00:00
if (!ignorebuffer)
{
Calculate buffer size manually (Yes, I checked; this always outputs "3" for its current usage.)
2018-11-26 10:09:56 +00:00
if (extbufsize > 0)
The oft-promised buffer fixes. Also, making it so the gametype switch for "Sometimes" is every 10 maps, not a full buffer round (now that it doesn't add to the buffer when you first see it). Unfortunately, the code didn't turn out nearly as nice as I'd desired, but things don't always work out. In addition: For some reason, I rolled Tinkerer's Arena twice within three hits of the Dice voting option, so something's wrong and this branch needs proper, rigorous investigative testing but I don't know what and I'm way too tired (both physically and metaphysically) to investigate any further.
2018-11-22 17:10:36 +00:00
{
Calculate buffer size manually (Yes, I checked; this always outputs "3" for its current usage.)
2018-11-26 10:09:56 +00:00
for (bufx = 0; bufx < extbufsize; bufx++)
The oft-promised buffer fixes. Also, making it so the gametype switch for "Sometimes" is every 10 maps, not a full buffer round (now that it doesn't add to the buffer when you first see it). Unfortunately, the code didn't turn out nearly as nice as I'd desired, but things don't always work out. In addition: For some reason, I rolled Tinkerer's Arena twice within three hits of the Dice voting option, so something's wrong and this branch needs proper, rigorous investigative testing but I don't know what and I'm way too tired (both physically and metaphysically) to investigate any further.
2018-11-22 17:10:36 +00:00
{
Remove previous commit's votebuffer, allow an external optional buffer to be passed into G_RandMap I meant to fix the previous method, but I didn't even understand how it knew it was in a vote or not... so I just did it my own way :V (Shouldn't FLUSHMAPBUFFEREARLY be on now...?)
2018-11-26 09:27:31 +00:00
if (extbuffer[bufx] == -1) // Rest of buffer SHOULD be empty
The oft-promised buffer fixes. Also, making it so the gametype switch for "Sometimes" is every 10 maps, not a full buffer round (now that it doesn't add to the buffer when you first see it). Unfortunately, the code didn't turn out nearly as nice as I'd desired, but things don't always work out. In addition: For some reason, I rolled Tinkerer's Arena twice within three hits of the Dice voting option, so something's wrong and this branch needs proper, rigorous investigative testing but I don't know what and I'm way too tired (both physically and metaphysically) to investigate any further.
2018-11-22 17:10:36 +00:00
break;
Remove previous commit's votebuffer, allow an external optional buffer to be passed into G_RandMap I meant to fix the previous method, but I didn't even understand how it knew it was in a vote or not... so I just did it my own way :V (Shouldn't FLUSHMAPBUFFEREARLY be on now...?)
2018-11-26 09:27:31 +00:00
if (ix == extbuffer[bufx])
The oft-promised buffer fixes. Also, making it so the gametype switch for "Sometimes" is every 10 maps, not a full buffer round (now that it doesn't add to the buffer when you first see it). Unfortunately, the code didn't turn out nearly as nice as I'd desired, but things don't always work out. In addition: For some reason, I rolled Tinkerer's Arena twice within three hits of the Dice voting option, so something's wrong and this branch needs proper, rigorous investigative testing but I don't know what and I'm way too tired (both physically and metaphysically) to investigate any further.
2018-11-22 17:10:36 +00:00
{
isokmap = false;
break;
}
}
Accidental removal
2018-11-26 09:42:14 +00:00
if (!isokmap)
continue;
The oft-promised buffer fixes. Also, making it so the gametype switch for "Sometimes" is every 10 maps, not a full buffer round (now that it doesn't add to the buffer when you first see it). Unfortunately, the code didn't turn out nearly as nice as I'd desired, but things don't always work out. In addition: For some reason, I rolled Tinkerer's Arena twice within three hits of the Dice voting option, so something's wrong and this branch needs proper, rigorous investigative testing but I don't know what and I'm way too tired (both physically and metaphysically) to investigate any further.
2018-11-22 17:10:36 +00:00
}
* Fix issue with palette not getting reset when heading to intermission. * Make map hell maps MUCH less common by ignoring all but the three most recent maps in the buffer for the random option.
2018-08-11 21:36:14 +00:00
for (bufx = 0; bufx < (maphell ? 3 : NUMMAPS); bufx++)
Everything Been a while since I synced :V
2018-02-04 04:47:47 +00:00
{
/me tears away a piece of drywall What's revealed is that democracy is actually made *entirely* out of extremely minor 1 character long typos eating away at the structural integrity of the building, and then the crack starts oozing green slime, and then a creepy hand comes out and grabs you
2018-02-08 05:45:59 +00:00
if (randmapbuffer[bufx] == -1) // Rest of buffer SHOULD be empty
Everything Been a while since I synced :V
2018-02-04 04:47:47 +00:00
break;
if (ix == randmapbuffer[bufx])
{
isokmap = false;
break;
}
}
It's SINT8 not INT8
2018-02-23 01:04:52 +00:00
The oft-promised buffer fixes. Also, making it so the gametype switch for "Sometimes" is every 10 maps, not a full buffer round (now that it doesn't add to the buffer when you first see it). Unfortunately, the code didn't turn out nearly as nice as I'd desired, but things don't always work out. In addition: For some reason, I rolled Tinkerer's Arena twice within three hits of the Dice voting option, so something's wrong and this branch needs proper, rigorous investigative testing but I don't know what and I'm way too tired (both physically and metaphysically) to investigate any further.
2018-11-22 17:10:36 +00:00
if (!isokmap)
continue;
}
TITLE SCREEN DEMOS: Pick a random Staff Attack demo!!! Also: Fix watching a demo replay of a map with a palette not resetting your palette back to normal when you go back to the menu(/titlescreen).
2018-11-05 13:45:40 +00:00
The oft-promised buffer fixes. Also, making it so the gametype switch for "Sometimes" is every 10 maps, not a full buffer round (now that it doesn't add to the buffer when you first see it). Unfortunately, the code didn't turn out nearly as nice as I'd desired, but things don't always work out. In addition: For some reason, I rolled Tinkerer's Arena twice within three hits of the Dice voting option, so something's wrong and this branch needs proper, rigorous investigative testing but I don't know what and I'm way too tired (both physically and metaphysically) to investigate any further.
2018-11-22 17:10:36 +00:00
if (pprevmap == -2) // title demo hack
TITLE SCREEN DEMOS: Pick a random Staff Attack demo!!! Also: Fix watching a demo replay of a map with a palette not resetting your palette back to normal when you go back to the menu(/titlescreen).
2018-11-05 13:45:40 +00:00
{
lumpnum_t l;
if ((l = W_CheckNumForName(va("%sS01",G_BuildMapName(ix+1)))) == LUMPERROR)
continue;
}
okmaps[numokmaps++] = ix;
Everything Been a while since I synced :V
2018-02-04 04:47:47 +00:00
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Do a bunch of major modifications to the voting system's rule change system! * Add `kartvoterulechanges`, or "Voting Rule Changes" on the menu, to allow some user control over event frequency. * "Never" - does what it says on the tin. * "Sometimes" - 1/8 chance of Encore if host has unlocked it, only gametype change when buffer is full * "Frequent" - 1/2 chance of Encore if host has unlocked it, gametype change every 5 maps * "Always" - If host has unlocked Encore, alternates between Encore and Gametype. Otherwise, always a gametype change * There's probably room for a setting between "Sometimes" and "Frequent", but I didn't want to overload the host with options and these were the ones that made sense. * Better handling of buffer refreshes, to prevent two of the same map appearing next to each other in the voting unless there literally aren't that many maps. * Mostly unrelated: Minor bugfix for Y_SetupVoteFinish, preventing music changes/random sounds playing on the You Will Join Next Race screen. (Branch-appropriate, at least.)
2018-09-11 14:41:41 +00:00
if (numokmaps == 0) // If there's no matches... (Goodbye, incredibly silly function chains :V)
Everything Been a while since I synced :V
2018-02-04 04:47:47 +00:00
{
if (!ignorebuffer)
Do a bunch of major modifications to the voting system's rule change system! * Add `kartvoterulechanges`, or "Voting Rule Changes" on the menu, to allow some user control over event frequency. * "Never" - does what it says on the tin. * "Sometimes" - 1/8 chance of Encore if host has unlocked it, only gametype change when buffer is full * "Frequent" - 1/2 chance of Encore if host has unlocked it, gametype change every 5 maps * "Always" - If host has unlocked Encore, alternates between Encore and Gametype. Otherwise, always a gametype change * There's probably room for a setting between "Sometimes" and "Frequent", but I didn't want to overload the host with options and these were the ones that made sense. * Better handling of buffer refreshes, to prevent two of the same map appearing next to each other in the voting unless there literally aren't that many maps. * Mostly unrelated: Minor bugfix for Y_SetupVoteFinish, preventing music changes/random sounds playing on the You Will Join Next Race screen. (Branch-appropriate, at least.)
2018-09-11 14:41:41 +00:00
{
if (randmapbuffer[3] == -1) // Is the buffer basically empty?
{
ignorebuffer = true; // This will probably only help in situations where there's very few maps, but it's folly not to at least try it
Remove previous commit's votebuffer, allow an external optional buffer to be passed into G_RandMap I meant to fix the previous method, but I didn't even understand how it knew it was in a vote or not... so I just did it my own way :V (Shouldn't FLUSHMAPBUFFEREARLY be on now...?)
2018-11-26 09:27:31 +00:00
goto tryagain;
Do a bunch of major modifications to the voting system's rule change system! * Add `kartvoterulechanges`, or "Voting Rule Changes" on the menu, to allow some user control over event frequency. * "Never" - does what it says on the tin. * "Sometimes" - 1/8 chance of Encore if host has unlocked it, only gametype change when buffer is full * "Frequent" - 1/2 chance of Encore if host has unlocked it, gametype change every 5 maps * "Always" - If host has unlocked Encore, alternates between Encore and Gametype. Otherwise, always a gametype change * There's probably room for a setting between "Sometimes" and "Frequent", but I didn't want to overload the host with options and these were the ones that made sense. * Better handling of buffer refreshes, to prevent two of the same map appearing next to each other in the voting unless there literally aren't that many maps. * Mostly unrelated: Minor bugfix for Y_SetupVoteFinish, preventing music changes/random sounds playing on the You Will Join Next Race screen. (Branch-appropriate, at least.)
2018-09-11 14:41:41 +00:00
}
for (bufx = 3; bufx < NUMMAPS; bufx++) // Let's clear all but the three most recent maps...
randmapbuffer[bufx] = -1;
Remove previous commit's votebuffer, allow an external optional buffer to be passed into G_RandMap I meant to fix the previous method, but I didn't even understand how it knew it was in a vote or not... so I just did it my own way :V (Shouldn't FLUSHMAPBUFFEREARLY be on now...?)
2018-11-26 09:27:31 +00:00
goto tryagain;
Do a bunch of major modifications to the voting system's rule change system! * Add `kartvoterulechanges`, or "Voting Rule Changes" on the menu, to allow some user control over event frequency. * "Never" - does what it says on the tin. * "Sometimes" - 1/8 chance of Encore if host has unlocked it, only gametype change when buffer is full * "Frequent" - 1/2 chance of Encore if host has unlocked it, gametype change every 5 maps * "Always" - If host has unlocked Encore, alternates between Encore and Gametype. Otherwise, always a gametype change * There's probably room for a setting between "Sometimes" and "Frequent", but I didn't want to overload the host with options and these were the ones that made sense. * Better handling of buffer refreshes, to prevent two of the same map appearing next to each other in the voting unless there literally aren't that many maps. * Mostly unrelated: Minor bugfix for Y_SetupVoteFinish, preventing music changes/random sounds playing on the You Will Join Next Race screen. (Branch-appropriate, at least.)
2018-09-11 14:41:41 +00:00
}
if (maphell) // Any wiggle room to loosen our restrictions here?
{
maphell--;
Remove previous commit's votebuffer, allow an external optional buffer to be passed into G_RandMap I meant to fix the previous method, but I didn't even understand how it knew it was in a vote or not... so I just did it my own way :V (Shouldn't FLUSHMAPBUFFEREARLY be on now...?)
2018-11-26 09:27:31 +00:00
goto tryagain;
Do a bunch of major modifications to the voting system's rule change system! * Add `kartvoterulechanges`, or "Voting Rule Changes" on the menu, to allow some user control over event frequency. * "Never" - does what it says on the tin. * "Sometimes" - 1/8 chance of Encore if host has unlocked it, only gametype change when buffer is full * "Frequent" - 1/2 chance of Encore if host has unlocked it, gametype change every 5 maps * "Always" - If host has unlocked Encore, alternates between Encore and Gametype. Otherwise, always a gametype change * There's probably room for a setting between "Sometimes" and "Frequent", but I didn't want to overload the host with options and these were the ones that made sense. * Better handling of buffer refreshes, to prevent two of the same map appearing next to each other in the voting unless there literally aren't that many maps. * Mostly unrelated: Minor bugfix for Y_SetupVoteFinish, preventing music changes/random sounds playing on the You Will Join Next Race screen. (Branch-appropriate, at least.)
2018-09-11 14:41:41 +00:00
}
Everything Been a while since I synced :V
2018-02-04 04:47:47 +00:00
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
ix = 0; // Sorry, none match. You get MAP01.
* AN OPPORTUNITY FOR GAMETYPE CHANGES ON THE VOTE SCREEN! * Super important to allow dedicated servers to continue forever without needing to add Terminal. * To facilitate understanding, add gametype dog-ears to the vote screen! * To do the above, add V_DrawDiag! Works in GL, too!! * Unrelated shit! * Fix a buffer overrun in the randmapbuffer! * Disable spectating in splitscreen... Not 100% sure, but in 2p battle, if you spectate, you just lose one balloon and respawn... * Improve all the string drawing functions' behaviour - both with being SLIGHTLY clipped by the edge of the screen, and when confronted with drawing off the base 320*200 internal area
2018-06-28 14:47:56 +00:00
for (bufx = 0; bufx < NUMMAPS+1; bufx++)
Everything Been a while since I synced :V
2018-02-04 04:47:47 +00:00
randmapbuffer[bufx] = -1; // if we're having trouble finding a map we should probably clear it
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
else
ix = okmaps[M_RandomKey(numokmaps)];
Intermissions... * Do the gametype change stuff on the voting screen. * Make all the picking sound and setting stuff one function, rather than in two seperate places that need to be kept identical. * Have the timer at the bottom be the highlight colour. * Map hell! LF2_HIDEINMENU is craftily reused... * Less allocation and deallocation for the adjacent G_RandMaps. Other stuff... * Fix command_map_f not resetting players' score in battle. * Shiny titlescreen! * Fix a random bonus newline in one of the quit messages.
2018-07-02 22:17:30 +00:00
if (!callagainsoon)
{
Z_Free(okmaps);
okmaps = NULL;
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return ix;
}
Random map buffer only gets added to when Needs another temporary buffer for the vote screen so that it doesn't roll dupes
2018-11-20 05:13:08 +00:00
void G_AddMapToBuffer(INT16 map)
{
Flush map buffer early, again Now it's directly in G_AddMapToBuffer
2018-11-26 11:09:26 +00:00
INT16 bufx, refreshnum = (TOLMaps(G_TOLFlag(gametype)) / 2) + 1;
// Add the map to the buffer.
Random map buffer only gets added to when Needs another temporary buffer for the vote screen so that it doesn't roll dupes
2018-11-20 05:13:08 +00:00
for (bufx = NUMMAPS-1; bufx > 0; bufx--)
randmapbuffer[bufx] = randmapbuffer[bufx-1];
randmapbuffer[0] = map;
Flush map buffer early, again Now it's directly in G_AddMapToBuffer
2018-11-26 11:09:26 +00:00
// We're getting pretty full, so lets flush this for future usage.
if (randmapbuffer[refreshnum] != -1)
{
// Clear all but the five most recent maps.
for (bufx = 5; bufx < NUMMAPS; bufx++) // bufx < refreshnum? Might not handle everything for gametype switches, though.
randmapbuffer[bufx] = -1;
//CONS_Printf("Random map buffer has been flushed.\n");
}
Random map buffer only gets added to when Needs another temporary buffer for the vote screen so that it doesn't roll dupes
2018-11-20 05:13:08 +00:00
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
//
// G_DoCompleted
//
static void G_DoCompleted(void)
{
Bugfix the exitlevel music condition to take into account all local players, rather than any player globally.
2018-07-20 12:02:34 +00:00
INT32 i, j = 0;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
boolean gottoken = false;
tokenlist = 0; // Reset the list
gameaction = ga_nothing;
SRB2 2.1.5 release
2014-03-23 16:00:29 +00:00
if (metalplayback)
G_StopMetalDemo();
if (metalrecording)
G_StopMetalRecording();
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
for (i = 0; i < MAXPLAYERS; i++)
if (playeringame[i])
Bugfix the exitlevel music condition to take into account all local players, rather than any player globally.
2018-07-20 12:02:34 +00:00
{
// SRB2Kart: exitlevel shouldn't get you the points
if (!players[i].exiting && !(players[i].pflags & PF_TIMEOVER))
{
players[i].pflags |= PF_TIMEOVER;
if (P_IsLocalPlayer(&players[i]))
j++;
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
G_PlayerFinishLevel(i); // take away cards and stuff
Bugfix the exitlevel music condition to take into account all local players, rather than any player globally.
2018-07-20 12:02:34 +00:00
}
// play some generic music if there's no win/cool/lose music going on (for exitlevel commands)
Fix all actionable comments in my review of sonicitems.
2018-08-09 21:59:52 +00:00
if (G_RaceGametype() && j == splitscreen+1 && (cv_inttime.value > 0))
Bugfix the exitlevel music condition to take into account all local players, rather than any player globally.
2018-07-20 12:02:34 +00:00
S_ChangeMusicInternal("racent", true);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
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);
Fix the earlier attempt at patching over this
2018-10-15 23:05:23 +00:00
else if (mapheaderinfo[gamemap-1]->nextlevel == 1101) // SRB2Kart: !!! WHENEVER WE GET GRAND PRIX, GO TO AWARDS MAP INSTEAD !!!
nextmap = (INT16)(mapheaderinfo[gamemap] ? gamemap : (spstage_start-1)); // (gamemap-1)+1 == gamemap :V
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
else
nextmap = (INT16)(mapheaderinfo[gamemap-1]->nextlevel-1);
// Remember last map for when you come out of the special stage.
if (!G_IsSpecialStage(gamemap))
lastmap = nextmap;
// 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).
Some cleanup No longer save score/rings, use the Race tally as a placeholder replacement for the butchered vanilla one
2017-10-17 00:23:26 +00:00
if (!token && !G_IsSpecialStage(gamemap) && !modeattacking
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
&& (nextmap >= 0 && nextmap < NUMMAPS))
{
register INT16 cm = nextmap;
INT16 tolflag = G_TOLFlag(gametype);
UINT8 visitedmap[(NUMMAPS+7)/8];
memset(visitedmap, 0, sizeof (visitedmap));
while (!mapheaderinfo[cm] || !(mapheaderinfo[cm]->typeoflevel & tolflag))
{
visitedmap[cm/8] |= (1<<(cm&7));
if (!mapheaderinfo[cm])
cm = -1; // guarantee error execution
else
cm = (INT16)(mapheaderinfo[cm]->nextlevel-1);
if (cm >= NUMMAPS || cm < 0) // out of range (either 1100-1102 or error)
{
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;
}
}
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;
}
}
nextmap = cm;
}
if (nextmap < 0 || (nextmap >= NUMMAPS && nextmap < 1100-1) || nextmap > 1102-1)
I_Error("Followed map %d to invalid map %d\n", prevmap + 1, nextmap + 1);
// wrap around in race
Made a lot of gametype checks use either G_RaceGametype or G_BattleGametype Should make it a lot easier to add more gametypes later. Also some minor fixes: - Changed up how shell speed scales in mobjscale juuuust slightly, so it's less messy - Fixed CHECK showing spectators
2018-03-04 20:27:52 +00:00
if (nextmap >= 1100-1 && nextmap <= 1102-1 && G_RaceGametype())
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
nextmap = (INT16)(spstage_start-1);
if (gametype == GT_COOP && token)
{
token--;
gottoken = true;
if (!(emeralds & EMERALD1))
nextmap = (INT16)(sstage_start - 1); // Special Stage 1
else if (!(emeralds & EMERALD2))
nextmap = (INT16)(sstage_start); // Special Stage 2
else if (!(emeralds & EMERALD3))
nextmap = (INT16)(sstage_start + 1); // Special Stage 3
else if (!(emeralds & EMERALD4))
nextmap = (INT16)(sstage_start + 2); // Special Stage 4
else if (!(emeralds & EMERALD5))
nextmap = (INT16)(sstage_start + 3); // Special Stage 5
else if (!(emeralds & EMERALD6))
nextmap = (INT16)(sstage_start + 4); // Special Stage 6
else if (!(emeralds & EMERALD7))
nextmap = (INT16)(sstage_start + 5); // Special Stage 7
else
gottoken = false;
}
if (G_IsSpecialStage(gamemap) && !gottoken)
nextmap = lastmap; // Exiting from a special stage? Go back to the game. Tails 08-11-2001
automapactive = false;
if (gametype != GT_COOP)
{
if (cv_advancemap.value == 0) // Stay on same map.
nextmap = prevmap;
else if (cv_advancemap.value == 2) // Go to random map.
Remove previous commit's votebuffer, allow an external optional buffer to be passed into G_RandMap I meant to fix the previous method, but I didn't even understand how it knew it was in a vote or not... so I just did it my own way :V (Shouldn't FLUSHMAPBUFFEREARLY be on now...?)
2018-11-26 09:27:31 +00:00
nextmap = G_RandMap(G_TOLFlag(gametype), prevmap, false, 0, false, NULL);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
// We are committed to this map now.
// We may as well allocate its header if it doesn't exist
Starting from scratch. SRB2 v2.1.15
2016-07-06 04:09:17 +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);
Don't allow skipping stats in record attack/nights attack
2017-02-05 22:04:29 +00:00
if (skipstats && !modeattacking) // Don't skip stats if we're in record attack
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
G_AfterIntermission();
else
{
G_SetGamestate(GS_INTERMISSION);
Y_StartIntermission();
}
}
void G_AfterIntermission(void)
{
HU_ClearCEcho();
Minor adjustments in hopes that I fixed the resynch bomb on gametype switch?
2018-02-08 22:13:06 +00:00
//G_NextLevel();
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Fix for the Y_FollowIntermission change hurting Record Attack Should probably be ported to vanilla
2018-11-08 19:43:06 +00:00
if (modeattacking) // End the run.
{
M_EndModeAttackRun();
return;
}
if (mapheaderinfo[gamemap-1]->cutscenenum) // 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)
{
Fix all actionable comments in my review of sonicitems.
2018-08-09 21:59:52 +00:00
if (gamestate != GS_VOTING)
A lot more safety checks on the voting screen for spectators - A new variable, voteclient.loaded, for keeping track of whenever or not voting data has been set up or not. Gets set to true in Y_StartVote, false in Y_UnloadVoteData. This is used to prevent drawing the screen in cases where it would crash, and preventing duplicate Y_EndVote calls. - The game checks for all spectator when transitioning to vote, to decide whenever or not it should skip it entirely or not. - Unrelated: made the roulette cheating much more common. Hopefully it's as cheaty as Mario Party now :p
2018-07-28 01:59:00 +00:00
{
Fix all actionable comments in my review of sonicitems.
2018-08-09 21:59:52 +00:00
if ((cv_advancemap.value == 3) && !modeattacking && !skipstats && (multiplayer || netgame))
A lot more safety checks on the voting screen for spectators - A new variable, voteclient.loaded, for keeping track of whenever or not voting data has been set up or not. Gets set to true in Y_StartVote, false in Y_UnloadVoteData. This is used to prevent drawing the screen in cases where it would crash, and preventing duplicate Y_EndVote calls. - The game checks for all spectator when transitioning to vote, to decide whenever or not it should skip it entirely or not. - Unrelated: made the roulette cheating much more common. Hopefully it's as cheaty as Mario Party now :p
2018-07-28 01:59:00 +00:00
{
Fix all actionable comments in my review of sonicitems.
2018-08-09 21:59:52 +00:00
UINT8 i;
for (i = 0; i < MAXPLAYERS; i++)
A lot more safety checks on the voting screen for spectators - A new variable, voteclient.loaded, for keeping track of whenever or not voting data has been set up or not. Gets set to true in Y_StartVote, false in Y_UnloadVoteData. This is used to prevent drawing the screen in cases where it would crash, and preventing duplicate Y_EndVote calls. - The game checks for all spectator when transitioning to vote, to decide whenever or not it should skip it entirely or not. - Unrelated: made the roulette cheating much more common. Hopefully it's as cheaty as Mario Party now :p
2018-07-28 01:59:00 +00:00
{
Fix all actionable comments in my review of sonicitems.
2018-08-09 21:59:52 +00:00
if (playeringame[i] && !players[i].spectator)
{
gameaction = ga_startvote;
return;
}
A lot more safety checks on the voting screen for spectators - A new variable, voteclient.loaded, for keeping track of whenever or not voting data has been set up or not. Gets set to true in Y_StartVote, false in Y_UnloadVoteData. This is used to prevent drawing the screen in cases where it would crash, and preventing duplicate Y_EndVote calls. - The game checks for all spectator when transitioning to vote, to decide whenever or not it should skip it entirely or not. - Unrelated: made the roulette cheating much more common. Hopefully it's as cheaty as Mario Party now :p
2018-07-28 01:59:00 +00:00
}
}
Fix all actionable comments in my review of sonicitems.
2018-08-09 21:59:52 +00:00
forceresetplayers = false;
* Encore on the voting screen! Appears randomly once unlocked in the same slot as that which sometimes represents a gametype change (odds inflated for testing purposes). * A better representation of an Encore level, now with inverted graphics (a special remapping we can now use elsewhere whenever if we want!) and a floating Ruby! * Decouple encore's setting from cv_kartencore on mapload. Instead, bake it into D_MapChange and related, which will only some of the time be fed by cv_kartencore's value. * Encore mode now has a special mapheader palette setting, "encorepal", rather than using the same one as non-encore.
2018-08-11 21:23:40 +00:00
deferencoremode = (boolean)cv_kartencore.value;
A lot more safety checks on the voting screen for spectators - A new variable, voteclient.loaded, for keeping track of whenever or not voting data has been set up or not. Gets set to true in Y_StartVote, false in Y_UnloadVoteData. This is used to prevent drawing the screen in cases where it would crash, and preventing duplicate Y_EndVote calls. - The game checks for all spectator when transitioning to vote, to decide whenever or not it should skip it entirely or not. - Unrelated: made the roulette cheating much more common. Hopefully it's as cheaty as Mario Party now :p
2018-07-28 01:59:00 +00:00
}
forgot whitespaces....
2018-11-17 21:23:23 +00:00
Fix all actionable comments in my review of sonicitems.
2018-08-09 21:59:52 +00:00
gameaction = ga_worlddone;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
static void G_DoWorldDone(void)
{
if (server)
{
Reset scores between Battle matches for now I want to tackle the two intermission screens whenever I do the same for Race
2018-07-01 03:43:45 +00:00
// SRB2Kart
Intermissions... * Do the gametype change stuff on the voting screen. * Make all the picking sound and setting stuff one function, rather than in two seperate places that need to be kept identical. * Have the timer at the bottom be the highlight colour. * Map hell! LF2_HIDEINMENU is craftily reused... * Less allocation and deallocation for the adjacent G_RandMaps. Other stuff... * Fix command_map_f not resetting players' score in battle. * Shiny titlescreen! * Fix a random bonus newline in one of the quit messages.
2018-07-02 22:17:30 +00:00
D_MapChange(nextmap+1,
gametype,
* Encore on the voting screen! Appears randomly once unlocked in the same slot as that which sometimes represents a gametype change (odds inflated for testing purposes). * A better representation of an Encore level, now with inverted graphics (a special remapping we can now use elsewhere whenever if we want!) and a floating Ruby! * Decouple encore's setting from cv_kartencore on mapload. Instead, bake it into D_MapChange and related, which will only some of the time be fed by cv_kartencore's value. * Encore mode now has a special mapheader palette setting, "encorepal", rather than using the same one as non-encore.
2018-08-11 21:23:40 +00:00
deferencoremode,
*A biggie: two-tier intermission screen! * Have the entire thing slide the fuck away a short while into the intermission. * The tab screen is modified to work off similar behaviour and presentation. * To go with it, a revamp of how Battle's scoring is handled. * It's now considered "hits", and is stored in a reuse in one of the vanilla NiGHTS variables, allowing it to use exactly the same ranking mechanisms as race. * No more resetting of score between battle rounds. * Minor, unrelated general code cleanup in places. * Disable the YEEEAH in splitscreen, otherwise you'll hear it *all the time*.
2018-07-18 19:23:46 +00:00
forceresetplayers,
Intermissions... * Do the gametype change stuff on the voting screen. * Make all the picking sound and setting stuff one function, rather than in two seperate places that need to be kept identical. * Have the timer at the bottom be the highlight colour. * Map hell! LF2_HIDEINMENU is craftily reused... * Less allocation and deallocation for the adjacent G_RandMaps. Other stuff... * Fix command_map_f not resetting players' score in battle. * Shiny titlescreen! * Fix a random bonus newline in one of the quit messages.
2018-07-02 22:17:30 +00:00
0,
false,
false);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
gameaction = ga_nothing;
}
Minor adjustments in hopes that I fixed the resynch bomb on gametype switch?
2018-02-08 22:13:06 +00:00
//
// G_DoStartVote
//
static void G_DoStartVote(void)
{
if (server)
D_SetupVote();
gameaction = ga_nothing;
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
//
// 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);
* FREE PLAY! The necessary corollary to HERE COMES A NEW CHALLENGER... * Activates when there are less than two non-spectators in a netgame. * Shows flashing text at the bottom of the screen. * Prevents drawing several UI elements that only make sense with multiple players. * Prevents matchesplayed being increased. * Improve the mapreset timer's behaviour. * Now you get to see the HERE COMES A NEW CHALLENGER screen as the starting frame of the relevant map transition, since it happens on mapreset being 1 rather than 0. * Make a bunch of normal gameplay stuff that might've activated unnecessarily during mapreset now not able to. * Hide some other stuff that might've been visible for no good reason. * Improve Mirror mode. * First person now works with it! * Tweaked the minimap player heads. Although the main section of the automap is mirrored, it feels... wrong to mirror the player head? IDK, you may wish to revert this, but given that everything else is the right way around except for the level itself...* Disable the titlescreen demos, at least until we actually gear up for release and make real ones. * Disable the titlescreen demos, at least until we actually gear up for release and make real ones.
2018-07-22 15:16:03 +00:00
legitimateexit = false;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
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);
pl->continues--;
// Reset score
pl->score = 0;
// Allow tokens to come back
tokenlist = 0;
token = 0;
// Reset # of lives
pl->lives = (ultimatemode) ? 1 : 3;
* Encore on the voting screen! Appears randomly once unlocked in the same slot as that which sometimes represents a gametype change (odds inflated for testing purposes). * A better representation of an Encore level, now with inverted graphics (a special remapping we can now use elsewhere whenever if we want!) and a floating Ruby! * Decouple encore's setting from cv_kartencore on mapload. Instead, bake it into D_MapChange and related, which will only some of the time be fed by cv_kartencore's value. * Encore mode now has a special mapheader palette setting, "encorepal", rather than using the same one as non-encore.
2018-08-11 21:23:40 +00:00
D_MapChange(gamemap, gametype, false, false, 0, false, false);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
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.
if (gametype == GT_COOP)
{
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
spstage_start = 1;
sstage_start = 50;
sstage_end = 57; // 8 special stages in vanilla SRB2
useNightsSS = false; //true;
// 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
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
tic_t rectime;
tic_t reclap;
//UINT32 recscore;
//UINT16 recrings;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
//UINT8 recmares;
//INT32 curmare;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// 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)
Lots of changes - Menus now have all of the Kart cvars - Removed any cvars that aren't useful for Kart from the menu (they still exist in the console, though) - Removed SP and NiGHTS Mode options from the main menu - "kartcc" is renamed "kartspeed", uses values 0-2 instead of multiples of 50, or the terms "Relaxed", "Standard", and "Turbo" - Many gametype options (game speed, frantic, mirror, & karma comeback) are now changed on map load instead of instantly - New cvar, "kartminimap", for disabling the minimap - The maxplayers cvar now actually matches up with our 16 player limit - Game now keeps track of matches played. Has a condition type associated with it, as well. - Game checks for unlocks and saves gamedata when finishing a match, even in MP - Removed most of the normal emblems, added a single emblem for Green Hills. Didn't know what to do with extra emblems and such so I just left them (FOR NOW c:<)
2018-01-16 03:31:14 +00:00
matchesplayed = 0; // SRB2Kart: matches played & finished
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (M_CheckParm("-nodata"))
return; // Don't load.
// Allow saving of gamedata beyond this point
gamedataloaded = true;
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)
{
Most items work (netgame needs testing), will do fireballs later.
2017-02-26 22:37:52 +00:00
const char *gdfolder = "the SRB2Kart folder";
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
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);
Lots of changes - Menus now have all of the Kart cvars - Removed any cvars that aren't useful for Kart from the menu (they still exist in the console, though) - Removed SP and NiGHTS Mode options from the main menu - "kartcc" is renamed "kartspeed", uses values 0-2 instead of multiples of 50, or the terms "Relaxed", "Standard", and "Turbo" - Many gametype options (game speed, frantic, mirror, & karma comeback) are now changed on map load instead of instantly - New cvar, "kartminimap", for disabling the minimap - The maxplayers cvar now actually matches up with our 16 player limit - Game now keeps track of matches played. Has a condition type associated with it, as well. - Game checks for unlocks and saves gamedata when finishing a match, even in MP - Removed most of the normal emblems, added a single emblem for Green Hills. Didn't know what to do with extra emblems and such so I just left them (FOR NOW c:<)
2018-01-16 03:31:14 +00:00
matchesplayed = READUINT32(save_p);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
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);
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
//timesBeatenUltimate = READUINT32(save_p);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Main records
for (i = 0; i < NUMMAPS; ++i)
{
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
rectime = (tic_t)READUINT32(save_p);
reclap = (tic_t)READUINT32(save_p);
//recscore = READUINT32(save_p);
//recrings = READUINT16(save_p);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
/*if (recrings > 10000 || recscore > MAXSCORE)
goto datacorrupt;*/
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
if (rectime || reclap)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
G_AllocMainRecordData((INT16)i);
mainrecords[i]->time = rectime;
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
mainrecords[i]->lap = reclap;
//mainrecords[i]->score = recscore;
//mainrecords[i]->rings = recrings;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
}
// Nights records
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
/*for (i = 0; i < NUMMAPS; ++i)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
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;
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
}*/
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// 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:
{
Most items work (netgame needs testing), will do fireballs later.
2017-02-26 22:37:52 +00:00
const char *gdfolder = "the SRB2Kart folder";
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
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.
Doing one more step to totally ensure that matchesplayed is unlocking stuff
2018-03-30 16:16:15 +00:00
void G_SaveGameData(boolean force)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
size_t length;
INT32 i, j;
UINT8 btemp;
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
//INT32 curmare;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
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;
}
* Did some reviewing, turns out there's literally no reason to disable savemoddata when majormods gets tripped and it's just a stupid thing vanilla did for modifiedgame for some reason that we almost inherited with our new solution? * Adjusted the save system to acknowledge the new status quo. Instead of trying to save modifiedgame in the file like some sort of extremely boneheaded honour system everyone and their mothers hacks around, we just use it to determine whether the save is for a mod with savedata or not (this keeps backwards compatibility based on how we were using it, anyways, especially with the *force* parameter...) * Added a menu message for attempting to play a demo set on a map that isn't loaded, as opposed to letting it I_Error. * Minor tweaks to addons menu representing modded status.
2019-01-28 16:32:07 +00:00
if (majormods && !force)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
free(savebuffer);
save_p = savebuffer = NULL;
return;
}
// Version test
WRITEUINT32(save_p, 0xFCAFE211);
WRITEUINT32(save_p, totalplaytime);
Lots of changes - Menus now have all of the Kart cvars - Removed any cvars that aren't useful for Kart from the menu (they still exist in the console, though) - Removed SP and NiGHTS Mode options from the main menu - "kartcc" is renamed "kartspeed", uses values 0-2 instead of multiples of 50, or the terms "Relaxed", "Standard", and "Turbo" - Many gametype options (game speed, frantic, mirror, & karma comeback) are now changed on map load instead of instantly - New cvar, "kartminimap", for disabling the minimap - The maxplayers cvar now actually matches up with our 16 player limit - Game now keeps track of matches played. Has a condition type associated with it, as well. - Game checks for unlocks and saves gamedata when finishing a match, even in MP - Removed most of the normal emblems, added a single emblem for Green Hills. Didn't know what to do with extra emblems and such so I just left them (FOR NOW c:<)
2018-01-16 03:31:14 +00:00
WRITEUINT32(save_p, matchesplayed);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
* Did some reviewing, turns out there's literally no reason to disable savemoddata when majormods gets tripped and it's just a stupid thing vanilla did for modifiedgame for some reason that we almost inherited with our new solution? * Adjusted the save system to acknowledge the new status quo. Instead of trying to save modifiedgame in the file like some sort of extremely boneheaded honour system everyone and their mothers hacks around, we just use it to determine whether the save is for a mod with savedata or not (this keeps backwards compatibility based on how we were using it, anyways, especially with the *force* parameter...) * Added a menu message for attempting to play a demo set on a map that isn't loaded, as opposed to letting it I_Error. * Minor tweaks to addons menu representing modded status.
2019-01-28 16:32:07 +00:00
btemp = (UINT8)(savemoddata); // what used to be here was profoundly dunderheaded
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
WRITEUINT8(save_p, btemp);
// TODO put another cipher on these things? meh, I don't care...
for (i = 0; i < NUMMAPS; i++)
WRITEUINT8(save_p, mapvisited[i]);
// 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);
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
//WRITEUINT32(save_p, timesBeatenUltimate);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Main records
for (i = 0; i < NUMMAPS; i++)
{
if (mainrecords[i])
{
WRITEUINT32(save_p, mainrecords[i]->time);
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
WRITEUINT32(save_p, mainrecords[i]->lap);
//WRITEUINT32(save_p, mainrecords[i]->score);
//WRITEUINT16(save_p, mainrecords[i]->rings);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
else
{
WRITEUINT32(save_p, 0);
WRITEUINT32(save_p, 0);
}
}
// NiGHTS records
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
/*for (i = 0; i < NUMMAPS; i++)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
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]);
}
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
}*/
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
length = save_p - savebuffer;
FIL_WriteFile(va(pandf, srb2home, gamedatafilename), savebuffer, length);
free(savebuffer);
save_p = savebuffer = NULL;
}
#define VERSIONSIZE 16
#ifdef SAVEGAMES_OTHERVERSIONS
static INT16 startonmapnum = 0;
//
// User wants to load a savegame from a different version?
//
static void M_ForceLoadGameResponse(INT32 ch)
{
if (ch != 'y' && ch != KEY_ENTER)
{
//refused
Z_Free(savebuffer);
save_p = savebuffer = NULL;
startonmapnum = 0;
M_SetupNextMenu(&SP_LoadDef);
return;
}
// pick up where we left off.
save_p += VERSIONSIZE;
if (!P_LoadGame(startonmapnum))
{
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;
startonmapnum = 0;
// no cheating!
memset(&savedata, 0, sizeof(savedata));
return;
}
// done
Z_Free(savebuffer);
save_p = savebuffer = NULL;
startonmapnum = 0;
//set cursaveslot to -1 so nothing gets saved.
cursaveslot = -1;
displayplayer = consoleplayer;
Change splitscreen into UINT8, fix HUD slightly more
2017-12-19 01:59:04 +00:00
multiplayer = false;
splitscreen = 0;
Camera crash fixes UNRELATED, but they made this branch a pain in the ass to test so I needed to fix this here :V
2018-10-28 21:31:59 +00:00
SplitScreen_OnChange(); // not needed?
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (setsizeneeded)
R_ExecuteSetViewSize();
M_ClearMenus(true);
CON_ToggleOff();
}
#endif
//
// 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
sprintf(savename, savegamename, slot);
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));
sprintf(vcheck, "version %d", VERSION);
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;
TITLE SCREEN DEMOS: Pick a random Staff Attack demo!!! Also: Fix watching a demo replay of a map with a palette not resetting your palette back to normal when you go back to the menu(/titlescreen).
2018-11-05 13:45:40 +00:00
if (demoplayback) // reset game engine
G_StopDemo();
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// 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;
}
// done
Z_Free(savebuffer);
save_p = savebuffer = NULL;
// gameaction = ga_nothing;
// G_SetGamestate(GS_LEVEL);
displayplayer = consoleplayer;
Change splitscreen into UINT8, fix HUD slightly more
2017-12-19 01:59:04 +00:00
multiplayer = false;
splitscreen = 0;
Camera crash fixes UNRELATED, but they made this branch a pain in the ass to test so I needed to fix this here :V
2018-10-28 21:31:59 +00:00
SplitScreen_OnChange(); // not needed?
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// G_DeferedInitNew(sk_medium, G_BuildMapName(1), 0, 0, 1);
if (setsizeneeded)
R_ExecuteSetViewSize();
M_ClearMenus(true);
CON_ToggleOff();
}
//
// G_SaveGame
// Saves your game.
//
void G_SaveGame(UINT32 savegameslot)
{
boolean saved;
char savename[256] = "";
const char *backup;
sprintf(savename, savegamename, savegameslot);
backup = va("%s",savename);
// save during evaluation or credits? game's over, folks!
if (gamestate == GS_CREDITS || gamestate == GS_EVALUATION)
gamecomplete = true;
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));
sprintf(name, "version %d", VERSION);
WRITEMEM(save_p, name, VERSIONSIZE);
P_SaveGame();
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)
CONS_Alert(CONS_ERROR, M_GetText("Error while writing to %s for save slot %u, base: %s\n"), backup, savegameslot, savegamename);
}
//
// G_DeferedInitNew
// Can be called by the startup code or the menu task,
// consoleplayer, displayplayer, playeringame[] should be set.
//
* Encore on the voting screen! Appears randomly once unlocked in the same slot as that which sometimes represents a gametype change (odds inflated for testing purposes). * A better representation of an Encore level, now with inverted graphics (a special remapping we can now use elsewhere whenever if we want!) and a floating Ruby! * Decouple encore's setting from cv_kartencore on mapload. Instead, bake it into D_MapChange and related, which will only some of the time be fed by cv_kartencore's value. * Encore mode now has a special mapheader palette setting, "encorepal", rather than using the same one as non-encore.
2018-08-11 21:23:40 +00:00
void G_DeferedInitNew(boolean pencoremode, const char *mapname, INT32 pickedchar, UINT8 ssplayers, boolean FLS)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
I'm a huge idiot
2018-03-31 04:12:26 +00:00
INT32 i;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
UINT8 color = 0;
paused = false;
if (demoplayback)
COM_BufAddText("stopdemo\n");
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
while (ghosts)
{
demoghost *next = ghosts->next;
Z_Free(ghosts);
ghosts = next;
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
ghosts = NULL;
* AN OPPORTUNITY FOR GAMETYPE CHANGES ON THE VOTE SCREEN! * Super important to allow dedicated servers to continue forever without needing to add Terminal. * To facilitate understanding, add gametype dog-ears to the vote screen! * To do the above, add V_DrawDiag! Works in GL, too!! * Unrelated shit! * Fix a buffer overrun in the randmapbuffer! * Disable spectating in splitscreen... Not 100% sure, but in 2p battle, if you spectate, you just lose one balloon and respawn... * Improve all the string drawing functions' behaviour - both with being SLIGHTLY clipped by the edge of the screen, and when confronted with drawing off the base 320*200 internal area
2018-06-28 14:47:56 +00:00
for (i = 0; i < NUMMAPS+1; i++)
I'm a huge idiot
2018-03-31 04:12:26 +00:00
randmapbuffer[i] = -1;
reset randmapbuffer in G_DeferedInitNew
2018-03-31 04:11:03 +00:00
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)
{
color = savedata.skincolor;
botskin = savedata.botskin;
botcolor = savedata.botcolor;
botingame = (botskin != 0);
}
Change splitscreen into UINT8, fix HUD slightly more
2017-12-19 01:59:04 +00:00
else if (splitscreen != ssplayers)
A lot lol The importants: - Fixed compiling - Combined G_BuildTiccmd for all players, no more need for a function for each - You can actually start 3p/4p mode
2017-12-17 03:32:43 +00:00
{
Change splitscreen into UINT8, fix HUD slightly more
2017-12-19 01:59:04 +00:00
splitscreen = ssplayers;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
SplitScreen_OnChange();
}
Change color in menu, replay support for specific staff ghosts Todo: replace the vague number with the demo's recorded player name
2017-10-21 02:01:07 +00:00
if (!color && !modeattacking)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
color = skins[pickedchar].prefcolor;
SetPlayerSkinByNum(consoleplayer, pickedchar);
CV_StealthSet(&cv_skin, skins[pickedchar].name);
Change color in menu, replay support for specific staff ghosts Todo: replace the vague number with the demo's recorded player name
2017-10-21 02:01:07 +00:00
if (color)
CV_StealthSetValue(&cv_playercolor, color);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (mapname)
* Encore on the voting screen! Appears randomly once unlocked in the same slot as that which sometimes represents a gametype change (odds inflated for testing purposes). * A better representation of an Encore level, now with inverted graphics (a special remapping we can now use elsewhere whenever if we want!) and a floating Ruby! * Decouple encore's setting from cv_kartencore on mapload. Instead, bake it into D_MapChange and related, which will only some of the time be fed by cv_kartencore's value. * Encore mode now has a special mapheader palette setting, "encorepal", rather than using the same one as non-encore.
2018-08-11 21:23:40 +00:00
D_MapChange(M_MapNumber(mapname[3], mapname[4]), gametype, pencoremode, true, 1, false, FLS);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
//
// This is the map command interpretation something like Command_Map_f
//
// called at: map cmd execution, doloadgame, doplaydemo
* Encore on the voting screen! Appears randomly once unlocked in the same slot as that which sometimes represents a gametype change (odds inflated for testing purposes). * A better representation of an Encore level, now with inverted graphics (a special remapping we can now use elsewhere whenever if we want!) and a floating Ruby! * Decouple encore's setting from cv_kartencore on mapload. Instead, bake it into D_MapChange and related, which will only some of the time be fed by cv_kartencore's value. * Encore mode now has a special mapheader palette setting, "encorepal", rather than using the same one as non-encore.
2018-08-11 21:23:40 +00:00
void G_InitNew(UINT8 pencoremode, const char *mapname, boolean resetplayer, boolean skipprecutscene)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
INT32 i;
if (paused)
{
paused = false;
Starting from scratch. SRB2 v2.1.15
2016-07-06 04:09:17 +00:00
S_ResumeAudio();
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
* Encore on the voting screen! Appears randomly once unlocked in the same slot as that which sometimes represents a gametype change (odds inflated for testing purposes). * A better representation of an Encore level, now with inverted graphics (a special remapping we can now use elsewhere whenever if we want!) and a floating Ruby! * Decouple encore's setting from cv_kartencore on mapload. Instead, bake it into D_MapChange and related, which will only some of the time be fed by cv_kartencore's value. * Encore mode now has a special mapheader palette setting, "encorepal", rather than using the same one as non-encore.
2018-08-11 21:23:40 +00:00
prevencoremode = ((gamestate == GS_TITLESCREEN) ? false : encoremode);
encoremode = pencoremode;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Double-check legitimacy on match completion
2018-01-29 00:57:38 +00:00
legitimateexit = false; // SRB2Kart
Minor adjustments in hopes that I fixed the resynch bomb on gametype switch?
2018-02-08 22:13:06 +00:00
comebackshowninfo = false;
Double-check legitimacy on match completion
2018-01-29 00:57:38 +00:00
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
* Properly handle gametype changes when a different-gametype level pops up on the voting screen. * Defer the change until you're actually modifying the map, in service of the following. * Reset score. * Call that gametype change function. * Collary of the above: Don't reset score if you're `map mapxx`ing in the console, unless it's `force`'d. * Fix the basic, obvious issues that'd prevent us shipping with the new level title system. * Correct the non-green resolution support, which was ALMOST there but which I accidentially fucked up one of the signs on. * Adjust the subttl position if it'd get overwritten. * Draw the gametype with the subttl. * Adjust the gametype constants for easier gametype_cons_t array access.
2018-06-29 13:14:24 +00:00
//SRB2Kart - Score is literally the only thing you SHOULDN'T reset at all times
//if (resetplayer)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
// Clear a bunch of variables
tokenlist = token = sstimer = redscore = bluescore = lastmap = 0;
* FREE PLAY! The necessary corollary to HERE COMES A NEW CHALLENGER... * Activates when there are less than two non-spectators in a netgame. * Shows flashing text at the bottom of the screen. * Prevents drawing several UI elements that only make sense with multiple players. * Prevents matchesplayed being increased. * Improve the mapreset timer's behaviour. * Now you get to see the HERE COMES A NEW CHALLENGER screen as the starting frame of the relevant map transition, since it happens on mapreset being 1 rather than 0. * Make a bunch of normal gameplay stuff that might've activated unnecessarily during mapreset now not able to. * Hide some other stuff that might've been visible for no good reason. * Improve Mirror mode. * First person now works with it! * Tweaked the minimap player heads. Although the main section of the automap is mirrored, it feels... wrong to mirror the player head? IDK, you may wish to revert this, but given that everything else is the right way around except for the level itself...* Disable the titlescreen demos, at least until we actually gear up for release and make real ones. * Disable the titlescreen demos, at least until we actually gear up for release and make real ones.
2018-07-22 15:16:03 +00:00
countdown = countdown2 = mapreset = 0;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
for (i = 0; i < MAXPLAYERS; i++)
{
players[i].playerstate = PST_REBORN;
players[i].starpostangle = players[i].starpostnum = players[i].starposttime = 0;
players[i].starpostx = players[i].starposty = players[i].starpostz = 0;
Mammoth commit! * Deaths in record attack no longer put you into a glitchy singleplayer game-over state that we somehow both kept around and also broke since we branched Kart off of Vanilla.. * Fix non-standard mapscales making the Death Egg respawn octagons dissasemble themselves. * Allow for MULTIPLE TIME EMBLEMS PER MAP, at least in the emblem UI on the timer. It shows all completed emblems plus the uncompleted emblem up to a total of three. * Major tweaks to the First Person HUD. * I know this was your baby, Sal, and some of the changes may prove controversial - so I've put the ones that are likely to cause the most fuss inside an ifndef block, so that you can toggle it as you please with minimal code changes. * Dontdraw-ness, transparency, and colorization match the player's object! * Moves around on the screen with respect to the direction of the player object's motion, to make drifting look nicer! * Flashes the colour of your drift sparks. * Did a WHOLE bunch of things with respect to music. I'm not sure how to describe this, so I'll go through step-by-step. * Countdowns now play the drowning music again. * Removed/disabled extraenous P_RestoreMusics. * Made map-ending music called by its own function, P_EndingMusic(player_t *player). * Made the ending music play on the LAST player crossing the finishing line in splitscreen, rather than first. * Make dead players spinout and clip through the floor, at least until we add the new death anims. * Fix prior pogo spring usage making dead players fall faster. * Make the time over countdown use the kart font when not splitscreen with 3 or 4 players. * Removed a weird bonus HWR_DrawCroppedPatch function signature in the hardware header.
2018-07-16 19:19:30 +00:00
#if 0
if (netgame || multiplayer)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
players[i].lives = cv_startinglives.value;
players[i].continues = 0;
}
else if (pultmode)
{
players[i].lives = 1;
players[i].continues = 0;
}
else
{
players[i].lives = 3;
players[i].continues = 1;
}
Mammoth commit! * Deaths in record attack no longer put you into a glitchy singleplayer game-over state that we somehow both kept around and also broke since we branched Kart off of Vanilla.. * Fix non-standard mapscales making the Death Egg respawn octagons dissasemble themselves. * Allow for MULTIPLE TIME EMBLEMS PER MAP, at least in the emblem UI on the timer. It shows all completed emblems plus the uncompleted emblem up to a total of three. * Major tweaks to the First Person HUD. * I know this was your baby, Sal, and some of the changes may prove controversial - so I've put the ones that are likely to cause the most fuss inside an ifndef block, so that you can toggle it as you please with minimal code changes. * Dontdraw-ness, transparency, and colorization match the player's object! * Moves around on the screen with respect to the direction of the player object's motion, to make drifting look nicer! * Flashes the colour of your drift sparks. * Did a WHOLE bunch of things with respect to music. I'm not sure how to describe this, so I'll go through step-by-step. * Countdowns now play the drowning music again. * Removed/disabled extraenous P_RestoreMusics. * Made map-ending music called by its own function, P_EndingMusic(player_t *player). * Made the ending music play on the LAST player crossing the finishing line in splitscreen, rather than first. * Make dead players spinout and clip through the floor, at least until we add the new death anims. * Fix prior pogo spring usage making dead players fall faster. * Make the time over countdown use the kart font when not splitscreen with 3 or 4 players. * Removed a weird bonus HWR_DrawCroppedPatch function signature in the hardware header.
2018-07-16 19:19:30 +00:00
players[i].xtralife = 0;
#else
players[i].lives = 1; // SRB2Kart
#endif
* Properly handle gametype changes when a different-gametype level pops up on the voting screen. * Defer the change until you're actually modifying the map, in service of the following. * Reset score. * Call that gametype change function. * Collary of the above: Don't reset score if you're `map mapxx`ing in the console, unless it's `force`'d. * Fix the basic, obvious issues that'd prevent us shipping with the new level title system. * Correct the non-green resolution support, which was ALMOST there but which I accidentially fucked up one of the signs on. * Adjust the subttl position if it'd get overwritten. * Draw the gametype with the subttl. * Adjust the gametype constants for easier gametype_cons_t array access.
2018-06-29 13:14:24 +00:00
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// The latter two should clear by themselves, but just in case
players[i].pflags &= ~(PF_TAGIT|PF_TAGGED|PF_FULLSTASIS);
// Clear cheatcodes too, just in case.
players[i].pflags &= ~(PF_GODMODE|PF_NOCLIP|PF_INVIS);
*A biggie: two-tier intermission screen! * Have the entire thing slide the fuck away a short while into the intermission. * The tab screen is modified to work off similar behaviour and presentation. * To go with it, a revamp of how Battle's scoring is handled. * It's now considered "hits", and is stored in a reuse in one of the vanilla NiGHTS variables, allowing it to use exactly the same ranking mechanisms as race. * No more resetting of score between battle rounds. * Minor, unrelated general code cleanup in places. * Disable the YEEEAH in splitscreen, otherwise you'll hear it *all the time*.
2018-07-18 19:23:46 +00:00
players[i].marescore = 0;
* Properly handle gametype changes when a different-gametype level pops up on the voting screen. * Defer the change until you're actually modifying the map, in service of the following. * Reset score. * Call that gametype change function. * Collary of the above: Don't reset score if you're `map mapxx`ing in the console, unless it's `force`'d. * Fix the basic, obvious issues that'd prevent us shipping with the new level title system. * Correct the non-green resolution support, which was ALMOST there but which I accidentially fucked up one of the signs on. * Adjust the subttl position if it'd get overwritten. * Draw the gametype with the subttl. * Adjust the gametype constants for easier gametype_cons_t array access.
2018-06-29 13:14:24 +00:00
if (resetplayer) // SRB2Kart
{
players[i].score = 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.
Starting from scratch. SRB2 v2.1.15
2016-07-06 04:09:17 +00:00
mapmusflags |= MUSIC_RELOADRESET;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
automapactive = false;
imcontinuing = false;
if (!skipprecutscene && mapheaderinfo[gamemap-1]->precutscenenum && !modeattacking) // Start a custom cutscene.
F_StartCustomCutscene(mapheaderinfo[gamemap-1]->precutscenenum-1, true, resetplayer);
else
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-12-03 05:31:23 +00:00
{
#ifdef HAVE_BLUA
LUAh_MapChange(gamemap);
#endif
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
G_DoLoadLevel(resetplayer);
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-12-03 05:31:23 +00:00
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (netgame)
{
char *title = G_BuildMapTitle(gamemap);
Remove most gameplay prints A couple of the extraneous ones (karma interactions, bumper stealing, lap start notifications) have been removed outright. The rest that I could think of have been changed to use CON_LogMessage, so that they still go into log.txt when rereading a fun chat session but not showing themselves in gameplay. Necessary gameplay prints, such as players being defeated or coming back in Battle, have been kept until there's a suitable replacement for them in the future.
2018-10-14 21:45:28 +00:00
CON_LogMessage(va(M_GetText("Map is now \"%s"), G_BuildMapName(gamemap)));
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (title)
{
Remove most gameplay prints A couple of the extraneous ones (karma interactions, bumper stealing, lap start notifications) have been removed outright. The rest that I could think of have been changed to use CON_LogMessage, so that they still go into log.txt when rereading a fun chat session but not showing themselves in gameplay. Necessary gameplay prints, such as players being defeated or coming back in Battle, have been kept until there's a suitable replacement for them in the future.
2018-10-14 21:45:28 +00:00
CON_LogMessage(va(": %s", title));
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Z_Free(title);
}
Remove most gameplay prints A couple of the extraneous ones (karma interactions, bumper stealing, lap start notifications) have been removed outright. The rest that I could think of have been changed to use CON_LogMessage, so that they still go into log.txt when rereading a fun chat session but not showing themselves in gameplay. Necessary gameplay prints, such as players being defeated or coming back in Battle, have been kept until there's a suitable replacement for them in the future.
2018-10-14 21:45:28 +00:00
CON_LogMessage("\"\n");
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
}
char *G_BuildMapTitle(INT32 mapnum)
{
char *title = NULL;
Added "Random" to the level selection list, for those days when you know you *want* to race but don't have any idea what to do.
2018-08-15 15:12:36 +00:00
if (mapnum == 0)
return Z_StrDup("Random");
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;
actnum is now a 2 character long string For Cloud Cradle Zone, Act K
2018-06-05 05:34:05 +00:00
const char *actnum = NULL;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
len += strlen(mapheaderinfo[mapnum-1]->lvlttl);
Use strlen for all of the valid zone title/act num checks
2018-06-05 21:28:46 +00:00
if (strlen(mapheaderinfo[mapnum-1]->zonttl) > 0)
New level tag "ZONETITLE" can be set to replace the word "ZONE" in a level. "NOZONE" overrides it and forces no display at all.
2017-09-01 17:00:53 +00:00
{
zonetext = M_GetText(mapheaderinfo[mapnum-1]->zonttl);
len += strlen(zonetext) + 1; // ' ' + zonetext
}
else if (!(mapheaderinfo[mapnum-1]->levelflags & LF_NOZONE))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
zonetext = M_GetText("ZONE");
len += strlen(zonetext) + 1; // ' ' + zonetext
}
Use strlen for all of the valid zone title/act num checks
2018-06-05 21:28:46 +00:00
if (strlen(mapheaderinfo[mapnum-1]->actnum) > 0)
actnum is now a 2 character long string For Cloud Cradle Zone, Act K
2018-06-05 05:34:05 +00:00
{
actnum = M_GetText(mapheaderinfo[mapnum-1]->actnum);
len += strlen(actnum) + 1; // ' ' + actnum
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
title = Z_Malloc(len, PU_STATIC, NULL);
sprintf(title, "%s", mapheaderinfo[mapnum-1]->lvlttl);
if (zonetext) sprintf(title + strlen(title), " %s", zonetext);
actnum is now a 2 character long string For Cloud Cradle Zone, Act K
2018-06-05 05:34:05 +00:00
if (actnum) sprintf(title + strlen(title), " %s", actnum);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
return title;
}
//
// DEMO RECORDING
//
First, minor steps to Record Attack support To-Do: - fix demo desync (desync is only super noticeable on slopes, but a message pops up when the player starts moving regardless) - fix ghosts not appearing - replace that dumb level tally - remove a bunch of things that made the assumption that race & record attack would never mix (ex: "next map x doesn't support race mode, using map y anyway" message)
2017-10-15 06:33:28 +00:00
#define DEMOVERSION 0x0001
#define DEMOHEADER "\xF0" "KartReplay" "\x0F"
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
#define DF_GHOST 0x01 // This demo contains ghost data too!
More score/rings cleanup, hide some hud elements, and most importantly: staff ghosts! Would be nice to have an option to directly replay a specific staff ghost, but this should be fine for now
2017-10-18 03:14:51 +00:00
#define DF_RECORDATTACK 0x02 // This demo is from record attack and contains its final completion time!
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
#define DF_NIGHTSATTACK 0x04 // This demo is from NiGHTS attack and contains its time left, score, and mares!
#define DF_ATTACKMASK 0x06 // This demo is from ??? attack and contains ???
#define DF_ATTACKSHIFT 1
// For demos
#define ZT_FWD 0x01
#define ZT_SIDE 0x02
#define ZT_ANGLE 0x04
#define ZT_BUTTONS 0x08
#define ZT_AIMING 0x10
Lots of cmd restructuring. - cmd->driftturn exists now, for figuring out how far you're turning. Added to prevent analog sticks from being able to get drift sparks faster. - Feather bounce strafing moved to use cmd->sidemove, which means it also supports analog now. - Braking now waits a few tics for you to be stopped for a few tics before it lets you go in reverse, as per Sev's request. - Removed a lot of unused/redundant/commented out control code, and reorganized some of the existing code.
2018-06-05 21:12:42 +00:00
#define ZT_DRIFT 0x20
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
#define DEMOMARKER 0x80 // demoend
static ticcmd_t oldcmd;
// For Metal Sonic and time attack ghosts
#define GZT_XYZ 0x01
#define GZT_MOMXY 0x02
#define GZT_MOMZ 0x04
#define GZT_ANGLE 0x08
// Not used for Metal Sonic
#define GZT_SPRITE 0x10 // Animation frame
#define GZT_EXTRA 0x20
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
#define GZT_NIGHTS 0x40 // NiGHTS Mode stuff!
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// GZT_EXTRA flags
#define EZT_THOK 0x01 // Spawned a thok object
#define EZT_SPIN 0x02 // Because one type of thok object apparently wasn't enough
SRB2 2.1.7 release
2014-04-14 05:14:58 +00:00
#define EZT_REV 0x03 // And two types wasn't enough either yet
#define EZT_THOKMASK 0x03
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
#define EZT_COLOR 0x04 // Changed color (Super transformation, Mario fireflowers/invulnerability, etc.)
#define EZT_FLIP 0x08 // Reversed gravity
#define EZT_SCALE 0x10 // Changed size
#define EZT_HIT 0x20 // Damaged a mobj
#define EZT_SPRITE 0x40 // Changed sprite set completely out of PLAY (NiGHTS, SOCs, whatever)
static mobj_t oldmetal, oldghost;
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
void G_SaveMetal(UINT8 **buffer)
{
I_Assert(buffer != NULL && *buffer != NULL);
WRITEUINT32(*buffer, metal_p - metalbuffer);
}
void G_LoadMetal(UINT8 **buffer)
{
I_Assert(buffer != NULL && *buffer != NULL);
G_DoPlayMetal();
metal_p = metalbuffer + READUINT32(*buffer);
}
SRB2 2.1 release
2014-03-15 16:59:03 +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);
Lots of cmd restructuring. - cmd->driftturn exists now, for figuring out how far you're turning. Added to prevent analog sticks from being able to get drift sparks faster. - Feather bounce strafing moved to use cmd->sidemove, which means it also supports analog now. - Braking now waits a few tics for you to be stopped for a few tics before it lets you go in reverse, as per Sev's request. - Removed a lot of unused/redundant/commented out control code, and reorganized some of the existing code.
2018-06-05 21:12:42 +00:00
dest[i].driftturn = (INT16)SHORT(src[i].driftturn);
Send latency in players' ticcmds
2019-01-05 04:27:09 +00:00
dest[i].latency = (INT16)SHORT(src[i].latency);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
return dest;
}
void G_ReadDemoTiccmd(ticcmd_t *cmd, INT32 playernum)
{
UINT8 ziptic;
(void)playernum;
if (!demo_p || !demo_start)
return;
ziptic = READUINT8(demo_p);
if (ziptic & ZT_FWD)
oldcmd.forwardmove = READSINT8(demo_p);
if (ziptic & ZT_SIDE)
oldcmd.sidemove = READSINT8(demo_p);
if (ziptic & ZT_ANGLE)
oldcmd.angleturn = READINT16(demo_p);
if (ziptic & ZT_BUTTONS)
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
oldcmd.buttons = (oldcmd.buttons & (BT_FORWARD|BT_BACKWARD)) | (READUINT16(demo_p) & ~(BT_FORWARD|BT_BACKWARD));
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (ziptic & ZT_AIMING)
oldcmd.aiming = READINT16(demo_p);
Lots of cmd restructuring. - cmd->driftturn exists now, for figuring out how far you're turning. Added to prevent analog sticks from being able to get drift sparks faster. - Feather bounce strafing moved to use cmd->sidemove, which means it also supports analog now. - Braking now waits a few tics for you to be stopped for a few tics before it lets you go in reverse, as per Sev's request. - Removed a lot of unused/redundant/commented out control code, and reorganized some of the existing code.
2018-06-05 21:12:42 +00:00
if (ziptic & ZT_DRIFT)
oldcmd.driftturn = READINT16(demo_p);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
G_CopyTiccmd(cmd, &oldcmd, 1);
No more vanilla democam, for real
2018-10-17 23:10:23 +00:00
// SRB2kart: Copy-pasted from ticcmd building, removes that crappy demo cam
if (((players[displayplayer].mo && players[displayplayer].speed > 0) // Moving
|| (leveltime > starttime && (cmd->buttons & BT_ACCELERATE && cmd->buttons & BT_BRAKE)) // Rubber-burn turn
Allow turning while respawning This makes rubber-burn turning even more useless, but I don't think there's a way to fix the rubber-burn turn without breaking demo playback, so let's just do the part that is needed for now. I kinda want to redo how that mechanic works anyway.
2018-11-22 01:29:21 +00:00
|| (players[displayplayer].kartstuff[k_respawn]) // Respawning
No more vanilla democam, for real
2018-10-17 23:10:23 +00:00
|| (players[displayplayer].spectator || objectplacing)) // Not a physical player
&& !(players[displayplayer].kartstuff[k_spinouttimer] && players[displayplayer].kartstuff[k_sneakertimer])) // Spinning and boosting cancels out spinout
localangle += (cmd->angleturn<<16);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (!(demoflags & DF_GHOST) && *demo_p == DEMOMARKER)
{
// end of demo data stream
G_CheckDemoStatus();
return;
}
}
void G_WriteDemoTiccmd(ticcmd_t *cmd, INT32 playernum)
{
char ziptic = 0;
UINT8 *ziptic_p;
(void)playernum;
if (!demo_p)
return;
ziptic_p = demo_p++; // the ziptic, written at the end of this function
if (cmd->forwardmove != oldcmd.forwardmove)
{
WRITEUINT8(demo_p,cmd->forwardmove);
oldcmd.forwardmove = cmd->forwardmove;
ziptic |= ZT_FWD;
}
if (cmd->sidemove != oldcmd.sidemove)
{
WRITEUINT8(demo_p,cmd->sidemove);
oldcmd.sidemove = cmd->sidemove;
ziptic |= ZT_SIDE;
}
if (cmd->angleturn != oldcmd.angleturn)
{
WRITEINT16(demo_p,cmd->angleturn);
oldcmd.angleturn = cmd->angleturn;
ziptic |= ZT_ANGLE;
}
if (cmd->buttons != oldcmd.buttons)
{
WRITEUINT16(demo_p,cmd->buttons);
oldcmd.buttons = cmd->buttons;
ziptic |= ZT_BUTTONS;
}
if (cmd->aiming != oldcmd.aiming)
{
WRITEINT16(demo_p,cmd->aiming);
oldcmd.aiming = cmd->aiming;
ziptic |= ZT_AIMING;
}
Lots of cmd restructuring. - cmd->driftturn exists now, for figuring out how far you're turning. Added to prevent analog sticks from being able to get drift sparks faster. - Feather bounce strafing moved to use cmd->sidemove, which means it also supports analog now. - Braking now waits a few tics for you to be stopped for a few tics before it lets you go in reverse, as per Sev's request. - Removed a lot of unused/redundant/commented out control code, and reorganized some of the existing code.
2018-06-05 21:12:42 +00:00
if (cmd->driftturn != oldcmd.driftturn)
{
WRITEINT16(demo_p,cmd->driftturn);
oldcmd.driftturn = cmd->driftturn;
ziptic |= ZT_DRIFT;
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
*ziptic_p = ziptic;
// attention here for the ticcmd size!
// latest demos with mouse aiming byte in ticcmd
if (!(demoflags & DF_GHOST) && ziptic_p > demoend - 9)
{
G_CheckDemoStatus(); // no more space
return;
}
}
void G_GhostAddThok(void)
{
if (!demorecording || !(demoflags & DF_GHOST))
return;
SRB2 2.1.7 release
2014-04-14 05:14:58 +00:00
ghostext.flags = (ghostext.flags & ~EZT_THOKMASK) | EZT_THOK;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
void G_GhostAddSpin(void)
{
if (!demorecording || !(demoflags & DF_GHOST))
return;
SRB2 2.1.7 release
2014-04-14 05:14:58 +00:00
ghostext.flags = (ghostext.flags & ~EZT_THOKMASK) | EZT_SPIN;
}
void G_GhostAddRev(void)
{
if (!demorecording || !(demoflags & DF_GHOST))
return;
ghostext.flags = (ghostext.flags & ~EZT_THOKMASK) | EZT_REV;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
void G_GhostAddFlip(void)
{
if (!demorecording || !(demoflags & DF_GHOST))
return;
ghostext.flags |= EZT_FLIP;
}
void G_GhostAddColor(ghostcolor_t color)
{
if (!demorecording || !(demoflags & DF_GHOST))
return;
if (ghostext.lastcolor == (UINT8)color)
{
ghostext.flags &= ~EZT_COLOR;
return;
}
ghostext.flags |= EZT_COLOR;
ghostext.color = (UINT8)color;
}
Ghost scale fix
2017-10-16 11:11:48 +00:00
void G_GhostAddScale(fixed_t scale)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
if (!demorecording || !(demoflags & DF_GHOST))
return;
if (ghostext.lastscale == scale)
{
ghostext.flags &= ~EZT_SCALE;
return;
}
ghostext.flags |= EZT_SCALE;
ghostext.scale = scale;
}
void G_GhostAddHit(mobj_t *victim)
{
if (!demorecording || !(demoflags & DF_GHOST))
return;
ghostext.flags |= EZT_HIT;
ghostext.hits++;
ghostext.hitlist = Z_Realloc(ghostext.hitlist, ghostext.hits * sizeof(mobj_t *), PU_LEVEL, NULL);
ghostext.hitlist[ghostext.hits-1] = victim;
}
void G_WriteGhostTic(mobj_t *ghost)
{
char ziptic = 0;
UINT8 *ziptic_p;
UINT32 i;
UINT8 sprite;
UINT8 frame;
if (!demo_p)
return;
if (!(demoflags & DF_GHOST))
return; // No ghost data to write.
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
if (ghost->player && ghost->player->pflags & PF_NIGHTSMODE && ghost->tracer)
{
// We're talking about the NiGHTS thing, not the normal platforming thing!
ziptic |= GZT_NIGHTS;
ghost = ghost->tracer;
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
ziptic_p = demo_p++; // the ziptic, written at the end of this function
#define MAXMOM (0xFFFF<<8)
// GZT_XYZ is only useful if you've moved 256 FRACUNITS or more in a single tic.
if (abs(ghost->x-oldghost.x) > MAXMOM
|| abs(ghost->y-oldghost.y) > MAXMOM
|| abs(ghost->z-oldghost.z) > MAXMOM)
{
oldghost.x = ghost->x;
oldghost.y = ghost->y;
oldghost.z = ghost->z;
ziptic |= GZT_XYZ;
WRITEFIXED(demo_p,oldghost.x);
WRITEFIXED(demo_p,oldghost.y);
WRITEFIXED(demo_p,oldghost.z);
}
else
{
// For moving normally:
// Store one full byte of movement, plus one byte of fractional movement.
INT16 momx = (INT16)((ghost->x-oldghost.x)>>8);
INT16 momy = (INT16)((ghost->y-oldghost.y)>>8);
if (momx != oldghost.momx
|| momy != oldghost.momy)
{
oldghost.momx = momx;
oldghost.momy = momy;
ziptic |= GZT_MOMXY;
WRITEINT16(demo_p,momx);
WRITEINT16(demo_p,momy);
}
momx = (INT16)((ghost->z-oldghost.z)>>8);
if (momx != oldghost.momz)
{
oldghost.momz = momx;
ziptic |= GZT_MOMZ;
WRITEINT16(demo_p,momx);
}
// This SHOULD set oldghost.x/y/z to match ghost->x/y/z
// but it keeps the fractional loss of one byte,
// so it will hopefully be made up for in future tics.
oldghost.x += oldghost.momx<<8;
oldghost.y += oldghost.momy<<8;
oldghost.z += oldghost.momz<<8;
}
#undef MAXMOM
// Only store the 8 most relevant bits of angle
// because exact values aren't too easy to discern to begin with when only 8 angles have different sprites
// and it does not affect this mode of movement at all anyway.
if (ghost->angle>>24 != oldghost.angle)
{
oldghost.angle = ghost->angle>>24;
ziptic |= GZT_ANGLE;
WRITEUINT8(demo_p,oldghost.angle);
}
// Store the sprite frame.
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
frame = ghost->frame & 0xFF;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (frame != oldghost.frame)
{
oldghost.frame = frame;
ziptic |= GZT_SPRITE;
WRITEUINT8(demo_p,oldghost.frame);
}
// Check for sprite set changes
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
sprite = ghost->sprite;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (sprite != oldghost.sprite)
{
oldghost.sprite = sprite;
ghostext.flags |= EZT_SPRITE;
}
if (ghostext.flags)
{
ziptic |= GZT_EXTRA;
if (ghostext.color == ghostext.lastcolor)
ghostext.flags &= ~EZT_COLOR;
if (ghostext.scale == ghostext.lastscale)
ghostext.flags &= ~EZT_SCALE;
WRITEUINT8(demo_p,ghostext.flags);
if (ghostext.flags & EZT_COLOR)
{
WRITEUINT8(demo_p,ghostext.color);
ghostext.lastcolor = ghostext.color;
}
if (ghostext.flags & EZT_SCALE)
{
WRITEFIXED(demo_p,ghostext.scale);
ghostext.lastscale = ghostext.scale;
}
if (ghostext.flags & EZT_HIT)
{
WRITEUINT16(demo_p,ghostext.hits);
for (i = 0; i < ghostext.hits; i++)
{
mobj_t *mo = ghostext.hitlist[i];
WRITEUINT32(demo_p,UINT32_MAX); // reserved for some method of determining exactly which mobj this is. (mobjnum doesn't work here.)
WRITEUINT32(demo_p,mo->type);
WRITEUINT16(demo_p,(UINT16)mo->health);
WRITEFIXED(demo_p,mo->x);
WRITEFIXED(demo_p,mo->y);
WRITEFIXED(demo_p,mo->z);
WRITEANGLE(demo_p,mo->angle);
}
Z_Free(ghostext.hitlist);
ghostext.hits = 0;
ghostext.hitlist = NULL;
}
if (ghostext.flags & EZT_SPRITE)
WRITEUINT8(demo_p,sprite);
ghostext.flags = 0;
}
*ziptic_p = ziptic;
// attention here for the ticcmd size!
// latest demos with mouse aiming byte in ticcmd
if (demo_p >= demoend - (13 + 9))
{
G_CheckDemoStatus(); // no more space
return;
}
}
// Uses ghost data to do consistency checks on your position.
// This fixes desynchronising demos when fighting eggman.
void G_ConsGhostTic(void)
{
UINT8 ziptic;
UINT16 px,py,pz,gx,gy,gz;
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
mobj_t *testmo;
boolean nightsfail = false;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (!demo_p || !demo_start)
return;
if (!(demoflags & DF_GHOST))
return; // No ghost data to use.
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
testmo = players[0].mo;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Grab ghost data.
ziptic = READUINT8(demo_p);
if (ziptic & GZT_XYZ)
{
oldghost.x = READFIXED(demo_p);
oldghost.y = READFIXED(demo_p);
oldghost.z = READFIXED(demo_p);
}
else
{
if (ziptic & GZT_MOMXY)
{
oldghost.momx = READINT16(demo_p)<<8;
oldghost.momy = READINT16(demo_p)<<8;
}
if (ziptic & GZT_MOMZ)
oldghost.momz = READINT16(demo_p)<<8;
oldghost.x += oldghost.momx;
oldghost.y += oldghost.momy;
oldghost.z += oldghost.momz;
}
if (ziptic & GZT_ANGLE)
demo_p++;
if (ziptic & GZT_SPRITE)
demo_p++;
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
if(ziptic & GZT_NIGHTS) {
if (!testmo->player || !(testmo->player->pflags & PF_NIGHTSMODE) || !testmo->tracer)
nightsfail = true;
else
testmo = testmo->tracer;
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (ziptic & GZT_EXTRA)
{ // But wait, there's more!
ziptic = READUINT8(demo_p);
if (ziptic & EZT_COLOR)
demo_p++;
if (ziptic & EZT_SCALE)
demo_p += sizeof(fixed_t);
if (ziptic & EZT_HIT)
{ // Resync mob damage.
UINT16 i, count = READUINT16(demo_p);
thinker_t *th;
mobj_t *mobj;
UINT32 type;
UINT16 health;
fixed_t x;
fixed_t y;
fixed_t z;
for (i = 0; i < count; i++)
{
demo_p += 4; // reserved.
type = READUINT32(demo_p);
health = READUINT16(demo_p);
x = READFIXED(demo_p);
y = READFIXED(demo_p);
z = READFIXED(demo_p);
demo_p += sizeof(angle_t); // angle, unnecessary for cons.
mobj = NULL;
for (th = thinkercap.next; th != &thinkercap; th = th->next)
{
if (th->function.acp1 != (actionf_p1)P_MobjThinker)
continue;
mobj = (mobj_t *)th;
if (mobj->type == (mobjtype_t)type && mobj->x == x && mobj->y == y && mobj->z == z)
break;
mobj = NULL; // wasn't this one, keep searching.
}
if (mobj && mobj->health != health) // Wasn't damaged?! This is desync! Fix it!
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
{
if (demosynced)
CONS_Alert(CONS_WARNING, M_GetText("Demo playback has desynced!\n"));
demosynced = false;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
P_DamageMobj(mobj, players[0].mo, players[0].mo, 1);
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
}
if (ziptic & EZT_SPRITE)
demo_p++;
}
// Re-synchronise
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
px = testmo->x>>FRACBITS;
py = testmo->y>>FRACBITS;
pz = testmo->z>>FRACBITS;
SRB2 2.1.7 release
2014-04-14 05:14:58 +00:00
gx = oldghost.x>>FRACBITS;
gy = oldghost.y>>FRACBITS;
gz = oldghost.z>>FRACBITS;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
if (nightsfail || px != gx || py != gy || pz != gz)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
if (demosynced)
CONS_Alert(CONS_WARNING, M_GetText("Demo playback has desynced!\n"));
demosynced = false;
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
P_UnsetThingPosition(testmo);
testmo->x = oldghost.x;
testmo->y = oldghost.y;
P_SetThingPosition(testmo);
testmo->z = oldghost.z;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
if (*demo_p == DEMOMARKER)
{
// end of demo data stream
G_CheckDemoStatus();
return;
}
}
void G_GhostTicker(void)
{
demoghost *g,*p;
for(g = ghosts, p = NULL; g; g = g->next)
{
// Skip normal demo data.
UINT8 ziptic = READUINT8(g->p);
if (ziptic & ZT_FWD)
g->p++;
if (ziptic & ZT_SIDE)
g->p++;
if (ziptic & ZT_ANGLE)
g->p += 2;
if (ziptic & ZT_BUTTONS)
g->p += 2;
if (ziptic & ZT_AIMING)
g->p += 2;
Lots of cmd restructuring. - cmd->driftturn exists now, for figuring out how far you're turning. Added to prevent analog sticks from being able to get drift sparks faster. - Feather bounce strafing moved to use cmd->sidemove, which means it also supports analog now. - Braking now waits a few tics for you to be stopped for a few tics before it lets you go in reverse, as per Sev's request. - Removed a lot of unused/redundant/commented out control code, and reorganized some of the existing code.
2018-06-05 21:12:42 +00:00
if (ziptic & ZT_DRIFT)
g->p += 2;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Grab ghost data.
ziptic = READUINT8(g->p);
if (ziptic & GZT_XYZ)
{
g->oldmo.x = READFIXED(g->p);
g->oldmo.y = READFIXED(g->p);
g->oldmo.z = READFIXED(g->p);
}
else
{
if (ziptic & GZT_MOMXY)
{
g->oldmo.momx = READINT16(g->p)<<8;
g->oldmo.momy = READINT16(g->p)<<8;
}
if (ziptic & GZT_MOMZ)
g->oldmo.momz = READINT16(g->p)<<8;
g->oldmo.x += g->oldmo.momx;
g->oldmo.y += g->oldmo.momy;
g->oldmo.z += g->oldmo.momz;
}
if (ziptic & GZT_ANGLE)
g->oldmo.angle = READUINT8(g->p)<<24;
if (ziptic & GZT_SPRITE)
g->oldmo.frame = READUINT8(g->p);
// Update ghost
P_UnsetThingPosition(g->mo);
g->mo->x = g->oldmo.x;
g->mo->y = g->oldmo.y;
g->mo->z = g->oldmo.z;
P_SetThingPosition(g->mo);
g->mo->angle = g->oldmo.angle;
g->mo->frame = g->oldmo.frame | tr_trans30<<FF_TRANSSHIFT;
if (ziptic & GZT_EXTRA)
{ // But wait, there's more!
ziptic = READUINT8(g->p);
if (ziptic & EZT_COLOR)
{
SRB2 2.1.7 release
2014-04-14 05:14:58 +00:00
g->color = READUINT8(g->p);
switch(g->color)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
default:
case GHC_NORMAL: // Go back to skin color
g->mo->color = g->oldmo.color;
break;
SRB2 2.1.7 release
2014-04-14 05:14:58 +00:00
// Handled below
case GHC_SUPER:
case GHC_INVINCIBLE:
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
break;
case GHC_FIREFLOWER: // Fireflower
g->mo->color = SKINCOLOR_WHITE;
break;
}
}
if (ziptic & EZT_FLIP)
g->mo->eflags ^= MFE_VERTICALFLIP;
if (ziptic & EZT_SCALE)
{
g->mo->destscale = READFIXED(g->p);
if (g->mo->destscale != g->mo->scale)
P_SetScale(g->mo, g->mo->destscale);
}
SRB2 2.1.7 release
2014-04-14 05:14:58 +00:00
if (ziptic & EZT_THOKMASK)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{ // Let's only spawn ONE of these per frame, thanks.
mobj_t *mobj;
INT32 type = -1;
if (g->mo->skin)
{
skin_t *skin = (skin_t *)g->mo->skin;
SRB2 2.1.7 release
2014-04-14 05:14:58 +00:00
switch (ziptic & EZT_THOKMASK)
{
case EZT_THOK:
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
type = skin->thokitem < 0 ? (UINT32)mobjinfo[MT_PLAYER].painchance : (UINT32)skin->thokitem;
SRB2 2.1.7 release
2014-04-14 05:14:58 +00:00
break;
case EZT_SPIN:
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
type = skin->spinitem < 0 ? (UINT32)mobjinfo[MT_PLAYER].damage : (UINT32)skin->spinitem;
SRB2 2.1.7 release
2014-04-14 05:14:58 +00:00
break;
case EZT_REV:
type = skin->revitem < 0 ? (UINT32)mobjinfo[MT_PLAYER].raisestate : (UINT32)skin->revitem;
break;
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
if (type == MT_GHOST)
{
mobj = P_SpawnGhostMobj(g->mo); // does a large portion of the work for us
mobj->frame = (mobj->frame & ~FF_FRAMEMASK)|tr_trans60<<FF_TRANSSHIFT; // P_SpawnGhostMobj sets trans50, we want trans60
}
else
{
mobj = P_SpawnMobj(g->mo->x, g->mo->y, g->mo->z - FixedDiv(FixedMul(g->mo->info->height, g->mo->scale) - g->mo->height,3*FRACUNIT), MT_THOK);
mobj->sprite = states[mobjinfo[type].spawnstate].sprite;
mobj->frame = (states[mobjinfo[type].spawnstate].frame & FF_FRAMEMASK) | tr_trans60<<FF_TRANSSHIFT;
mobj->tics = -1; // nope.
mobj->color = g->mo->color;
if (g->mo->eflags & MFE_VERTICALFLIP)
{
mobj->flags2 |= MF2_OBJECTFLIP;
mobj->eflags |= MFE_VERTICALFLIP;
}
P_SetScale(mobj, g->mo->scale);
mobj->destscale = g->mo->scale;
}
mobj->floorz = mobj->z;
mobj->ceilingz = mobj->z+mobj->height;
P_UnsetThingPosition(mobj);
mobj->flags = MF_NOBLOCKMAP|MF_NOCLIP|MF_NOCLIPHEIGHT|MF_NOGRAVITY; // make an ATTEMPT to curb crazy SOCs fucking stuff up...
P_SetThingPosition(mobj);
mobj->fuse = 8;
P_SetTarget(&mobj->target, g->mo);
}
if (ziptic & EZT_HIT)
{ // Spawn hit poofs for killing things!
UINT16 i, count = READUINT16(g->p), health;
Comment out type
2019-02-01 21:45:53 +00:00
//UINT32 type;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
fixed_t x,y,z;
angle_t angle;
mobj_t *poof;
for (i = 0; i < count; i++)
{
g->p += 4; // reserved
Skip over type CORRECTLY, this time.
2019-02-01 21:42:29 +00:00
g->p += 4; // backwards compat., type used to be here
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
health = READUINT16(g->p);
x = READFIXED(g->p);
y = READFIXED(g->p);
z = READFIXED(g->p);
angle = READANGLE(g->p);
Potentially fix 64-bit builds crashing on certain replays
2019-02-01 01:15:28 +00:00
if (health != 0 || i >= 4) // only spawn for the first 4 hits per frame, to prevent ghosts from splode-spamming too bad.
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
continue;
poof = P_SpawnMobj(x, y, z, MT_GHOST);
poof->angle = angle;
poof->flags = MF_NOBLOCKMAP|MF_NOCLIP|MF_NOCLIPHEIGHT|MF_NOGRAVITY; // make an ATTEMPT to curb crazy SOCs fucking stuff up...
poof->health = 0;
P_SetMobjStateNF(poof, S_XPLD1);
}
}
if (ziptic & EZT_SPRITE)
g->mo->sprite = READUINT8(g->p);
}
SRB2 2.1.7 release
2014-04-14 05:14:58 +00:00
// Tick ghost colors (Super and Mario Invincibility flashing)
switch(g->color)
{
case GHC_SUPER: // Super Sonic (P_DoSuperStuff)
Starting from scratch. SRB2 v2.1.15
2016-07-06 04:09:17 +00:00
g->mo->color = SKINCOLOR_SUPER1;
g->mo->color += abs( ( (signed)( (unsigned)leveltime >> 1 ) % 9) - 4);
SRB2 2.1.7 release
2014-04-14 05:14:58 +00:00
break;
case GHC_INVINCIBLE: // Mario invincibility (P_CheckInvincibilityTimer)
g->mo->color = (UINT8)(leveltime % MAXSKINCOLORS);
break;
default:
break;
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Demo ends after ghost data.
if (*g->p == DEMOMARKER)
{
g->mo->momx = g->mo->momy = g->mo->momz = 0;
if (p)
p->next = g->next;
else
ghosts = g->next;
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
Z_Free(g);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
continue;
}
p = g;
}
}
void G_ReadMetalTic(mobj_t *metal)
{
UINT8 ziptic;
UINT16 speed;
UINT8 statetype;
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
if (!metal_p)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return;
ziptic = READUINT8(metal_p);
// Read changes from the tic
if (ziptic & GZT_XYZ)
{
P_TeleportMove(metal, READFIXED(metal_p), READFIXED(metal_p), READFIXED(metal_p));
oldmetal.x = metal->x;
oldmetal.y = metal->y;
oldmetal.z = metal->z;
}
else
{
if (ziptic & GZT_MOMXY)
{
oldmetal.momx = READINT16(metal_p)<<8;
oldmetal.momy = READINT16(metal_p)<<8;
}
if (ziptic & GZT_MOMZ)
oldmetal.momz = READINT16(metal_p)<<8;
oldmetal.x += oldmetal.momx;
oldmetal.y += oldmetal.momy;
oldmetal.z += oldmetal.momz;
}
if (ziptic & GZT_ANGLE)
oldmetal.angle = READUINT8(metal_p)<<24;
if (ziptic & GZT_SPRITE)
metal_p++; // Currently unused. (Metal Sonic figures out what he's doing his own damn self.)
// Set movement, position, and angle
// oldmetal contains where you're supposed to be.
metal->momx = oldmetal.momx;
metal->momy = oldmetal.momy;
metal->momz = oldmetal.momz;
P_UnsetThingPosition(metal);
metal->x = oldmetal.x;
metal->y = oldmetal.y;
metal->z = oldmetal.z;
P_SetThingPosition(metal);
metal->angle = oldmetal.angle;
if (ziptic & GZT_EXTRA)
{ // But wait, there's more!
ziptic = READUINT8(metal_p);
if (ziptic & EZT_FLIP)
metal->eflags ^= MFE_VERTICALFLIP;
if (ziptic & EZT_SCALE)
{
metal->destscale = READFIXED(metal_p);
if (metal->destscale != metal->scale)
P_SetScale(metal, metal->destscale);
}
}
// Calculates player's speed based on distance-of-a-line formula
speed = FixedDiv(P_AproxDistance(oldmetal.momx, oldmetal.momy), metal->scale)>>FRACBITS;
// Use speed to decide an appropriate state
if (speed > 28) // default skin runspeed
statetype = 2;
else if (speed > 1) // stopspeed
statetype = 1;
else
statetype = 0;
// Set state
if (statetype != metal->threshold)
{
switch (statetype)
{
case 2: // run
P_SetMobjState(metal,metal->info->meleestate);
break;
case 1: // walk
P_SetMobjState(metal,metal->info->seestate);
break;
default: // stand
P_SetMobjState(metal,metal->info->spawnstate);
break;
}
metal->threshold = statetype;
}
// TODO: Modify state durations based on movement speed, similar to players?
if (*metal_p == DEMOMARKER)
{
// end of demo data stream
SRB2 2.1.5 release
2014-03-23 16:00:29 +00:00
G_StopMetalDemo();
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return;
}
}
void G_WriteMetalTic(mobj_t *metal)
{
UINT8 ziptic = 0;
UINT8 *ziptic_p;
if (!demo_p) // demo_p will be NULL until the race start linedef executor is triggered!
return;
ziptic_p = demo_p++; // the ziptic, written at the end of this function
#define MAXMOM (0xFFFF<<8)
// GZT_XYZ is only useful if you've moved 256 FRACUNITS or more in a single tic.
if (abs(metal->x-oldmetal.x) > MAXMOM
|| abs(metal->y-oldmetal.y) > MAXMOM
|| abs(metal->z-oldmetal.z) > MAXMOM)
{
oldmetal.x = metal->x;
oldmetal.y = metal->y;
oldmetal.z = metal->z;
WRITEFIXED(demo_p,oldmetal.x);
WRITEFIXED(demo_p,oldmetal.y);
WRITEFIXED(demo_p,oldmetal.z);
ziptic |= GZT_XYZ;
}
else
{
// For moving normally:
// Store one full byte of movement, plus one byte of fractional movement.
INT16 momx = (INT16)((metal->x-oldmetal.x)>>8);
INT16 momy = (INT16)((metal->y-oldmetal.y)>>8);
if (momx != oldmetal.momx
|| momy != oldmetal.momy)
{
oldmetal.momx = momx;
oldmetal.momy = momy;
WRITEINT16(demo_p,momx);
WRITEINT16(demo_p,momy);
ziptic |= GZT_MOMXY;
}
momx = (INT16)((metal->z-oldmetal.z)>>8);
if (momx != oldmetal.momz)
{
oldmetal.momz = momx;
WRITEINT16(demo_p,momx);
ziptic |= GZT_MOMZ;
}
// This SHOULD set oldmetal.x/y/z to match metal->x/y/z
// but it keeps the fractional loss of one byte,
// so it will hopefully be made up for in future tics.
oldmetal.x += oldmetal.momx<<8;
oldmetal.y += oldmetal.momy<<8;
oldmetal.z += oldmetal.momz<<8;
}
#undef MAXMOM
// Only store the 8 most relevant bits of angle
// because exact values aren't too easy to discern to begin with when only 8 angles have different sprites
// and it does not affect movement at all anyway.
if (metal->angle>>24 != oldmetal.angle)
{
oldmetal.angle = metal->angle>>24;
WRITEUINT8(demo_p,oldmetal.angle);
ziptic |= GZT_ANGLE;
}
// Metal Sonic does not need our state changes.
// ... currently.
{
UINT8 *exttic_p = NULL;
UINT8 exttic = 0;
if ((metal->eflags & MFE_VERTICALFLIP) != (oldmetal.eflags & MFE_VERTICALFLIP))
{
if (!exttic_p)
exttic_p = demo_p++;
exttic |= EZT_FLIP;
oldmetal.eflags ^= MFE_VERTICALFLIP;
}
if (metal->scale != oldmetal.scale)
{
if (!exttic_p)
exttic_p = demo_p++;
exttic |= EZT_SCALE;
WRITEFIXED(demo_p,metal->scale);
oldmetal.scale = metal->scale;
}
if (exttic_p)
{
*exttic_p = exttic;
ziptic |= GZT_EXTRA;
}
}
*ziptic_p = ziptic;
// attention here for the ticcmd size!
// latest demos with mouse aiming byte in ticcmd
if (demo_p >= demoend - 32)
{
SRB2 2.1.5 release
2014-03-23 16:00:29 +00:00
G_StopMetalRecording(); // no more space
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return;
}
}
//
// G_RecordDemo
//
void G_RecordDemo(const char *name)
{
INT32 maxsize;
strcpy(demoname, name);
strcat(demoname, ".lmp");
maxsize = 1024*1024;
if (M_CheckParm("-maxdemo") && M_IsNextParm())
maxsize = atoi(M_GetNextParm()) * 1024;
// if (demobuffer)
// free(demobuffer);
demo_p = NULL;
demobuffer = malloc(maxsize);
demoend = demobuffer + maxsize;
demorecording = true;
}
void G_RecordMetal(void)
{
INT32 maxsize;
maxsize = 1024*1024;
if (M_CheckParm("-maxdemo") && M_IsNextParm())
maxsize = atoi(M_GetNextParm()) * 1024;
demo_p = NULL;
demobuffer = malloc(maxsize);
demoend = demobuffer + maxsize;
metalrecording = true;
}
void G_BeginRecording(void)
{
UINT8 i;
char name[16];
player_t *player = &players[consoleplayer];
if (demo_p)
return;
memset(name,0,sizeof(name));
demo_p = demobuffer;
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
demoflags = DF_GHOST|(modeattacking<<DF_ATTACKSHIFT);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Setup header.
M_Memcpy(demo_p, DEMOHEADER, 12); demo_p += 12;
WRITEUINT8(demo_p,VERSION);
WRITEUINT8(demo_p,SUBVERSION);
WRITEUINT16(demo_p,DEMOVERSION);
// demo checksum
demo_p += 16;
// game data
M_Memcpy(demo_p, "PLAY", 4); demo_p += 4;
SRB2 2.1.7 release
2014-04-14 05:14:58 +00:00
WRITEINT16(demo_p,gamemap);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
M_Memcpy(demo_p, mapmd5, 16); demo_p += 16;
WRITEUINT8(demo_p,demoflags);
switch ((demoflags & DF_ATTACKMASK)>>DF_ATTACKSHIFT)
{
case ATTACKING_NONE: // 0
break;
case ATTACKING_RECORD: // 1
demotime_p = demo_p;
WRITEUINT32(demo_p,UINT32_MAX); // time
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
WRITEUINT32(demo_p,UINT32_MAX); // lap
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
break;
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
/*case ATTACKING_NIGHTS: // 2
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
demotime_p = demo_p;
WRITEUINT32(demo_p,UINT32_MAX); // time
WRITEUINT32(demo_p,0); // score
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
break;*/
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
default: // 3
break;
}
WRITEUINT32(demo_p,P_GetInitSeed());
// Name
for (i = 0; i < 16 && cv_playername.string[i]; i++)
name[i] = cv_playername.string[i];
for (; i < 16; i++)
name[i] = '\0';
M_Memcpy(demo_p,name,16);
demo_p += 16;
// Skin
for (i = 0; i < 16 && cv_skin.string[i]; i++)
name[i] = cv_skin.string[i];
for (; i < 16; i++)
name[i] = '\0';
M_Memcpy(demo_p,name,16);
demo_p += 16;
// Color
for (i = 0; i < 16 && cv_playercolor.string[i]; i++)
name[i] = cv_playercolor.string[i];
for (; i < 16; i++)
name[i] = '\0';
M_Memcpy(demo_p,name,16);
demo_p += 16;
// Stats
WRITEUINT8(demo_p,player->charability);
WRITEUINT8(demo_p,player->charability2);
WRITEUINT8(demo_p,player->actionspd>>FRACBITS);
WRITEUINT8(demo_p,player->mindash>>FRACBITS);
WRITEUINT8(demo_p,player->maxdash>>FRACBITS);
Added Accelcode, start boosting, reverted drifting, etc.
2017-02-07 22:19:04 +00:00
// SRB2kart
Oho, here's the problem! Too many fixed_t!
2017-10-16 21:52:42 +00:00
WRITEUINT8(demo_p,player->kartspeed);
WRITEUINT8(demo_p,player->kartweight);
Added Accelcode, start boosting, reverted drifting, etc.
2017-02-07 22:19:04 +00:00
//
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
WRITEUINT8(demo_p,player->normalspeed>>FRACBITS);
WRITEUINT8(demo_p,player->runspeed>>FRACBITS);
WRITEUINT8(demo_p,player->thrustfactor);
WRITEUINT8(demo_p,player->accelstart);
WRITEUINT8(demo_p,player->acceleration);
// Trying to convert it back to % causes demo desync due to precision loss.
// Don't do it.
WRITEFIXED(demo_p, player->jumpfactor);
// Save netvar data (SONICCD, etc)
CV_SaveNetVars(&demo_p);
memset(&oldcmd,0,sizeof(oldcmd));
memset(&oldghost,0,sizeof(oldghost));
memset(&ghostext,0,sizeof(ghostext));
ghostext.lastcolor = ghostext.color = GHC_NORMAL;
ghostext.lastscale = ghostext.scale = FRACUNIT;
if (player->mo)
{
oldghost.x = player->mo->x;
oldghost.y = player->mo->y;
oldghost.z = player->mo->z;
oldghost.angle = player->mo->angle;
SRB2 2.1.7 release
2014-04-14 05:14:58 +00:00
// preticker started us gravity flipped
if (player->mo->eflags & MFE_VERTICALFLIP)
ghostext.flags |= EZT_FLIP;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
}
void G_BeginMetal(void)
{
mobj_t *mo = players[consoleplayer].mo;
if (demo_p)
return;
demo_p = demobuffer;
// Write header.
M_Memcpy(demo_p, DEMOHEADER, 12); demo_p += 12;
WRITEUINT8(demo_p,VERSION);
WRITEUINT8(demo_p,SUBVERSION);
WRITEUINT16(demo_p,DEMOVERSION);
// demo checksum
demo_p += 16;
M_Memcpy(demo_p, "METL", 4); demo_p += 4;
// Set up our memory.
memset(&oldmetal,0,sizeof(oldmetal));
oldmetal.x = mo->x;
oldmetal.y = mo->y;
oldmetal.z = mo->z;
oldmetal.angle = mo->angle;
}
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
void G_SetDemoTime(UINT32 ptime, UINT32 plap)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
if (!demorecording || !demotime_p)
return;
if (demoflags & DF_RECORDATTACK)
{
WRITEUINT32(demotime_p, ptime);
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
WRITEUINT32(demotime_p, plap);
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
demotime_p = NULL;
}
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
/*else if (demoflags & DF_NIGHTSATTACK)
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
{
WRITEUINT32(demotime_p, ptime);
WRITEUINT32(demotime_p, pscore);
demotime_p = NULL;
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
}*/
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
// Returns bitfield:
// 1 == new demo has lower time
// 2 == new demo has higher score
// 4 == new demo has higher rings
UINT8 G_CmpDemoTime(char *oldname, char *newname)
{
UINT8 *buffer,*p;
UINT8 flags;
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
UINT32 oldtime, newtime, oldlap, newlap;
Some cleanup No longer save score/rings, use the Race tally as a placeholder replacement for the butchered vanilla one
2017-10-17 00:23:26 +00:00
UINT16 oldversion;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
size_t bufsize ATTRUNUSED;
UINT8 c;
UINT16 s ATTRUNUSED;
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
UINT8 aflags = 0;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// load the new file
FIL_DefaultExtension(newname, ".lmp");
bufsize = FIL_ReadFile(newname, &buffer);
I_Assert(bufsize != 0);
p = buffer;
// read demo header
I_Assert(!memcmp(p, DEMOHEADER, 12));
p += 12; // DEMOHEADER
c = READUINT8(p); // VERSION
I_Assert(c == VERSION);
c = READUINT8(p); // SUBVERSION
I_Assert(c == SUBVERSION);
s = READUINT16(p);
I_Assert(s == DEMOVERSION);
p += 16; // demo checksum
I_Assert(!memcmp(p, "PLAY", 4));
p += 4; // PLAY
SRB2 2.1.7 release
2014-04-14 05:14:58 +00:00
p += 2; // gamemap
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
p += 16; // map md5
flags = READUINT8(p); // demoflags
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
aflags = flags & (DF_RECORDATTACK|DF_NIGHTSATTACK);
I_Assert(aflags);
if (flags & DF_RECORDATTACK)
{
newtime = READUINT32(p);
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
newlap = READUINT32(p);
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
}
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
/*else if (flags & DF_NIGHTSATTACK)
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
{
newtime = READUINT32(p);
newscore = READUINT32(p);
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
}*/
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
else // appease compiler
return 0;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Z_Free(buffer);
// load old file
FIL_DefaultExtension(oldname, ".lmp");
if (!FIL_ReadFile(oldname, &buffer))
{
CONS_Alert(CONS_ERROR, M_GetText("Failed to read file '%s'.\n"), oldname);
return UINT8_MAX;
}
p = buffer;
// read demo header
if (memcmp(p, DEMOHEADER, 12))
{
CONS_Alert(CONS_NOTICE, M_GetText("File '%s' invalid format. It will be overwritten.\n"), oldname);
Z_Free(buffer);
return UINT8_MAX;
} p += 12; // DEMOHEADER
p++; // VERSION
p++; // SUBVERSION
SRB2 2.1.7 release
2014-04-14 05:14:58 +00:00
oldversion = READUINT16(p);
switch(oldversion) // demoversion
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
SRB2 2.1.7 release
2014-04-14 05:14:58 +00:00
case DEMOVERSION: // latest always supported
break;
// too old, cannot support.
default:
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
CONS_Alert(CONS_NOTICE, M_GetText("File '%s' invalid format. It will be overwritten.\n"), oldname);
Z_Free(buffer);
return UINT8_MAX;
}
p += 16; // demo checksum
if (memcmp(p, "PLAY", 4))
{
CONS_Alert(CONS_NOTICE, M_GetText("File '%s' invalid format. It will be overwritten.\n"), oldname);
Z_Free(buffer);
return UINT8_MAX;
} p += 4; // "PLAY"
First, minor steps to Record Attack support To-Do: - fix demo desync (desync is only super noticeable on slopes, but a message pops up when the player starts moving regardless) - fix ghosts not appearing - replace that dumb level tally - remove a bunch of things that made the assumption that race & record attack would never mix (ex: "next map x doesn't support race mode, using map y anyway" message)
2017-10-15 06:33:28 +00:00
p += 2; // gamemap
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
p += 16; // mapmd5
flags = READUINT8(p);
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
if (!(flags & aflags))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
CONS_Alert(CONS_NOTICE, M_GetText("File '%s' not from same game mode. It will be overwritten.\n"), oldname);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Z_Free(buffer);
return UINT8_MAX;
}
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
if (flags & DF_RECORDATTACK)
{
oldtime = READUINT32(p);
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
oldlap = READUINT32(p);
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
}
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
/*else if (flags & DF_NIGHTSATTACK)
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
{
oldtime = READUINT32(p);
oldscore = READUINT32(p);
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
}*/
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
else // appease compiler
return UINT8_MAX;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Z_Free(buffer);
c = 0;
if (newtime < oldtime
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
|| (newtime == oldtime && (newlap < oldlap)))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
c |= 1; // Better time
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
if (newlap < oldlap
|| (newlap == oldlap && newtime < oldtime))
c |= 1<<1; // Better lap time
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return c;
}
//
// G_PlayDemo
//
void G_DeferedPlayDemo(const char *name)
{
COM_BufAddText("playdemo \"");
COM_BufAddText(name);
COM_BufAddText("\"\n");
}
//
// Start a demo from a .LMP file or from a wad resource
//
forgot whitespaces....
2018-11-17 21:23:23 +00:00
#define SKIPERRORS
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
void G_DoPlayDemo(char *defdemoname)
{
UINT8 i;
lumpnum_t l;
char skin[17],color[17],*n,*pdemoname;
Oho, here's the problem! Too many fixed_t!
2017-10-16 21:52:42 +00:00
UINT8 version,subversion,charability,charability2,kartspeed,kartweight,thrustfactor,accelstart,acceleration;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
UINT32 randseed;
Oho, here's the problem! Too many fixed_t!
2017-10-16 21:52:42 +00:00
fixed_t actionspd,mindash,maxdash,normalspeed,runspeed,jumpfactor;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
char msg[1024];
Skip errors for staff ghosts
2018-11-14 10:20:51 +00:00
#if defined(SKIPERRORS) && !defined(DEVELOP)
boolean skiperrors = false;
#endif
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
skin[16] = '\0';
color[16] = '\0';
n = defdemoname+strlen(defdemoname);
while (*n != '/' && *n != '\\' && n != defdemoname)
n--;
if (n != defdemoname)
n++;
pdemoname = ZZ_Alloc(strlen(n)+1);
strcpy(pdemoname,n);
// Internal if no extension, external if one exists
if (FIL_CheckExtension(defdemoname))
{
//FIL_DefaultExtension(defdemoname, ".lmp");
if (!FIL_ReadFile(defdemoname, &demobuffer))
{
snprintf(msg, 1024, M_GetText("Failed to read file '%s'.\n"), defdemoname);
CONS_Alert(CONS_ERROR, "%s", msg);
gameaction = ga_nothing;
M_StartMessage(msg, NULL, MM_NOTHING);
return;
}
demo_p = demobuffer;
}
// load demo resource from WAD
else if ((l = W_CheckNumForName(defdemoname)) == LUMPERROR)
{
snprintf(msg, 1024, M_GetText("Failed to read lump '%s'.\n"), defdemoname);
CONS_Alert(CONS_ERROR, "%s", msg);
gameaction = ga_nothing;
M_StartMessage(msg, NULL, MM_NOTHING);
return;
}
else // it's an internal demo
Skip errors for staff ghosts
2018-11-14 10:20:51 +00:00
{
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
demobuffer = demo_p = W_CacheLumpNum(l, PU_STATIC);
Skip errors for staff ghosts
2018-11-14 10:20:51 +00:00
#if defined(SKIPERRORS) && !defined(DEVELOP)
skiperrors = true; // SRB2Kart: Don't print warnings for staff ghosts, since they'll inevitably happen when we make bugfixes/changes...
#endif
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// read demo header
gameaction = ga_nothing;
demoplayback = true;
if (memcmp(demo_p, DEMOHEADER, 12))
{
Most items work (netgame needs testing), will do fireballs later.
2017-02-26 22:37:52 +00:00
snprintf(msg, 1024, M_GetText("%s is not a SRB2Kart replay file.\n"), pdemoname);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
CONS_Alert(CONS_ERROR, "%s", msg);
M_StartMessage(msg, NULL, MM_NOTHING);
Z_Free(pdemoname);
Z_Free(demobuffer);
demoplayback = false;
titledemo = false;
return;
}
demo_p += 12; // DEMOHEADER
version = READUINT8(demo_p);
subversion = READUINT8(demo_p);
SRB2 2.1.7 release
2014-04-14 05:14:58 +00:00
demoversion = READUINT16(demo_p);
switch(demoversion)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
SRB2 2.1.7 release
2014-04-14 05:14:58 +00:00
case DEMOVERSION: // latest always supported
break;
// too old, cannot support.
default:
snprintf(msg, 1024, M_GetText("%s is an incompatible replay format and cannot be played.\n"), pdemoname);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
CONS_Alert(CONS_ERROR, "%s", msg);
M_StartMessage(msg, NULL, MM_NOTHING);
Z_Free(pdemoname);
Z_Free(demobuffer);
demoplayback = false;
titledemo = false;
return;
}
demo_p += 16; // demo checksum
if (memcmp(demo_p, "PLAY", 4))
{
snprintf(msg, 1024, M_GetText("%s is the wrong type of recording and cannot be played.\n"), pdemoname);
CONS_Alert(CONS_ERROR, "%s", msg);
M_StartMessage(msg, NULL, MM_NOTHING);
Z_Free(pdemoname);
Z_Free(demobuffer);
demoplayback = false;
titledemo = false;
return;
}
demo_p += 4; // "PLAY"
First, minor steps to Record Attack support To-Do: - fix demo desync (desync is only super noticeable on slopes, but a message pops up when the player starts moving regardless) - fix ghosts not appearing - replace that dumb level tally - remove a bunch of things that made the assumption that race & record attack would never mix (ex: "next map x doesn't support race mode, using map y anyway" message)
2017-10-15 06:33:28 +00:00
gamemap = READINT16(demo_p);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
demo_p += 16; // mapmd5
demoflags = READUINT8(demo_p);
modeattacking = (demoflags & DF_ATTACKMASK)>>DF_ATTACKSHIFT;
CON_ToggleOff();
hu_demotime = UINT32_MAX;
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
hu_demolap = UINT32_MAX;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
switch (modeattacking)
{
case ATTACKING_NONE: // 0
break;
case ATTACKING_RECORD: // 1
hu_demotime = READUINT32(demo_p);
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
hu_demolap = READUINT32(demo_p);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
break;
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
/*case ATTACKING_NIGHTS: // 2
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
hu_demotime = READUINT32(demo_p);
hu_demoscore = READUINT32(demo_p);
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
break;*/
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
default: // 3
modeattacking = ATTACKING_NONE;
break;
}
// Random seed
randseed = READUINT32(demo_p);
// Player name
M_Memcpy(player_names[0],demo_p,16);
demo_p += 16;
// Skin
M_Memcpy(skin,demo_p,16);
demo_p += 16;
// Color
M_Memcpy(color,demo_p,16);
demo_p += 16;
charability = READUINT8(demo_p);
charability2 = READUINT8(demo_p);
actionspd = (fixed_t)READUINT8(demo_p)<<FRACBITS;
mindash = (fixed_t)READUINT8(demo_p)<<FRACBITS;
maxdash = (fixed_t)READUINT8(demo_p)<<FRACBITS;
Added Accelcode, start boosting, reverted drifting, etc.
2017-02-07 22:19:04 +00:00
// SRB2kart
Oho, here's the problem! Too many fixed_t!
2017-10-16 21:52:42 +00:00
kartspeed = READUINT8(demo_p);
kartweight = READUINT8(demo_p);
Added Accelcode, start boosting, reverted drifting, etc.
2017-02-07 22:19:04 +00:00
//
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
normalspeed = (fixed_t)READUINT8(demo_p)<<FRACBITS;
runspeed = (fixed_t)READUINT8(demo_p)<<FRACBITS;
thrustfactor = READUINT8(demo_p);
accelstart = READUINT8(demo_p);
acceleration = READUINT8(demo_p);
jumpfactor = READFIXED(demo_p);
// net var data
CV_LoadNetVars(&demo_p);
// Sigh ... it's an empty demo.
if (*demo_p == DEMOMARKER)
{
snprintf(msg, 1024, M_GetText("%s contains no data to be played.\n"), pdemoname);
CONS_Alert(CONS_ERROR, "%s", msg);
M_StartMessage(msg, NULL, MM_NOTHING);
Z_Free(pdemoname);
Z_Free(demobuffer);
demoplayback = false;
titledemo = false;
return;
}
First steps at implementing a mechanism that allows you to load non-cheaty good-faith mods such as custom characters with no Lua scripting, and play record attack with them. Features a few bad hacks and a few more areas of improvement; I'll try to iron them out before they hit `next` or `master`.
2019-01-15 19:01:55 +00:00
// Skin not loaded?
if (!SetPlayerSkin(0, skin))
{
Woops, didn't commit the most up-to-date g_game.c originally (old one didn't compile)
2019-01-16 15:27:23 +00:00
snprintf(msg, 1024, M_GetText("%s features a character that is not currently loaded.\n"), pdemoname);
First steps at implementing a mechanism that allows you to load non-cheaty good-faith mods such as custom characters with no Lua scripting, and play record attack with them. Features a few bad hacks and a few more areas of improvement; I'll try to iron them out before they hit `next` or `master`.
2019-01-15 19:01:55 +00:00
CONS_Alert(CONS_ERROR, "%s", msg);
M_StartMessage(msg, NULL, MM_NOTHING);
Z_Free(pdemoname);
Z_Free(demobuffer);
demoplayback = false;
titledemo = false;
return;
}
* Did some reviewing, turns out there's literally no reason to disable savemoddata when majormods gets tripped and it's just a stupid thing vanilla did for modifiedgame for some reason that we almost inherited with our new solution? * Adjusted the save system to acknowledge the new status quo. Instead of trying to save modifiedgame in the file like some sort of extremely boneheaded honour system everyone and their mothers hacks around, we just use it to determine whether the save is for a mod with savedata or not (this keeps backwards compatibility based on how we were using it, anyways, especially with the *force* parameter...) * Added a menu message for attempting to play a demo set on a map that isn't loaded, as opposed to letting it I_Error. * Minor tweaks to addons menu representing modded status.
2019-01-28 16:32:07 +00:00
// ...*map* not loaded?
if (!gamemap || (gamemap > NUMMAPS) || !mapheaderinfo[gamemap-1] || !(mapheaderinfo[gamemap-1]->menuflags & LF2_EXISTSHACK))
{
snprintf(msg, 1024, M_GetText("%s features a course that is not currently loaded.\n"), pdemoname);
CONS_Alert(CONS_ERROR, "%s", msg);
M_StartMessage(msg, NULL, MM_NOTHING);
Z_Free(pdemoname);
Z_Free(demobuffer);
demoplayback = false;
titledemo = false;
return;
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Z_Free(pdemoname);
memset(&oldcmd,0,sizeof(oldcmd));
memset(&oldghost,0,sizeof(oldghost));
Skip errors for staff ghosts
2018-11-14 10:20:51 +00:00
#if defined(SKIPERRORS) && !defined(DEVELOP)
if ((VERSION != version || SUBVERSION != subversion) && !skiperrors)
#else
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (VERSION != version || SUBVERSION != subversion)
Skip errors for staff ghosts
2018-11-14 10:20:51 +00:00
#endif
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
CONS_Alert(CONS_WARNING, M_GetText("Demo version does not match game version. Desyncs may occur.\n"));
// console warning messages
Skip errors for staff ghosts
2018-11-14 10:20:51 +00:00
#if defined(SKIPERRORS) && !defined(DEVELOP)
demosynced = (!skiperrors);
#else
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
demosynced = true;
Skip errors for staff ghosts
2018-11-14 10:20:51 +00:00
#endif
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// didn't start recording right away.
demo_start = false;
Just do MapChange hook on G_InitNew Everything that's supposed to call it also calls this...
2018-12-03 05:33:35 +00:00
/*#ifdef HAVE_BLUA
Change MapChange so Lua returns the map number you change
2018-11-30 17:01:40 +00:00
LUAh_MapChange(gamemap);
Just do MapChange hook on G_InitNew Everything that's supposed to call it also calls this...
2018-12-03 05:33:35 +00:00
#endif*/
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
displayplayer = consoleplayer = 0;
memset(playeringame,0,sizeof(playeringame));
playeringame[0] = true;
P_SetRandSeed(randseed);
* Properly handle gametype changes when a different-gametype level pops up on the voting screen. * Defer the change until you're actually modifying the map, in service of the following. * Reset score. * Call that gametype change function. * Collary of the above: Don't reset score if you're `map mapxx`ing in the console, unless it's `force`'d. * Fix the basic, obvious issues that'd prevent us shipping with the new level title system. * Correct the non-green resolution support, which was ALMOST there but which I accidentially fucked up one of the signs on. * Adjust the subttl position if it'd get overwritten. * Draw the gametype with the subttl. * Adjust the gametype constants for easier gametype_cons_t array access.
2018-06-29 13:14:24 +00:00
G_InitNew(false, G_BuildMapName(gamemap), true, true); // Doesn't matter whether you reset or not here, given changes to resetplayer.
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Set color
for (i = 0; i < MAXSKINCOLORS; i++)
Some Color code, Kart powers
2016-08-12 01:42:11 +00:00
if (!stricmp(KartColor_Names[i],color)) // SRB2kart
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
players[0].skincolor = i;
break;
}
Staff attack ghost names on the `REPLAY...` menu. Also: Remove playercolor being set to the replay's color. No need to kill your settings, seeing as it makes no tangible effect on your replay (doesn't even lose colour when you die, so I don't even know...)
2018-11-04 01:00:17 +00:00
//CV_StealthSetValue(&cv_playercolor, players[0].skincolor); -- as far as I can tell this is more trouble than it's worth
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (players[0].mo)
{
players[0].mo->color = players[0].skincolor;
oldghost.x = players[0].mo->x;
oldghost.y = players[0].mo->y;
oldghost.z = players[0].mo->z;
}
// Set saved attribute values
// No cheat checking here, because even if they ARE wrong...
// it would only break the replay if we clipped them.
players[0].charability = charability;
players[0].charability2 = charability2;
players[0].actionspd = actionspd;
players[0].mindash = mindash;
players[0].maxdash = maxdash;
Added Accelcode, start boosting, reverted drifting, etc.
2017-02-07 22:19:04 +00:00
// SRB2kart
players[0].kartspeed = kartspeed;
players[0].kartweight = kartweight;
//
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
players[0].normalspeed = normalspeed;
players[0].runspeed = runspeed;
players[0].thrustfactor = thrustfactor;
players[0].accelstart = accelstart;
players[0].acceleration = acceleration;
players[0].jumpfactor = jumpfactor;
demo_start = true;
}
Skip errors for staff ghosts
2018-11-14 10:20:51 +00:00
#undef SKIPERRORS
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
void G_AddGhost(char *defdemoname)
{
INT32 i;
lumpnum_t l;
char name[17],skin[17],color[17],*n,*pdemoname,md5[16];
demoghost *gh;
UINT8 flags;
UINT8 *buffer,*p;
mapthing_t *mthing;
SRB2 2.1.7 release
2014-04-14 05:14:58 +00:00
UINT16 count, ghostversion;
whoopsie doodle, forgot gh wasn't allocated until after this section
2019-01-18 14:53:43 +00:00
skin_t *ghskin = &skins[0];
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
name[16] = '\0';
skin[16] = '\0';
color[16] = '\0';
n = defdemoname+strlen(defdemoname);
while (*n != '/' && *n != '\\' && n != defdemoname)
n--;
if (n != defdemoname)
n++;
pdemoname = ZZ_Alloc(strlen(n)+1);
strcpy(pdemoname,n);
// Internal if no extension, external if one exists
if (FIL_CheckExtension(defdemoname))
{
//FIL_DefaultExtension(defdemoname, ".lmp");
if (!FIL_ReadFileTag(defdemoname, &buffer, PU_LEVEL))
{
CONS_Alert(CONS_ERROR, M_GetText("Failed to read file '%s'.\n"), defdemoname);
Z_Free(pdemoname);
return;
}
p = buffer;
}
// load demo resource from WAD
else if ((l = W_CheckNumForName(defdemoname)) == LUMPERROR)
{
CONS_Alert(CONS_ERROR, M_GetText("Failed to read lump '%s'.\n"), defdemoname);
Z_Free(pdemoname);
return;
}
else // it's an internal demo
buffer = p = W_CacheLumpNum(l, PU_LEVEL);
// read demo header
if (memcmp(p, DEMOHEADER, 12))
{
Most items work (netgame needs testing), will do fireballs later.
2017-02-26 22:37:52 +00:00
CONS_Alert(CONS_NOTICE, M_GetText("Ghost %s: Not a SRB2Kart replay.\n"), pdemoname);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Z_Free(pdemoname);
Z_Free(buffer);
return;
} p += 12; // DEMOHEADER
p++; // VERSION
p++; // SUBVERSION
SRB2 2.1.7 release
2014-04-14 05:14:58 +00:00
ghostversion = READUINT16(p);
switch(ghostversion)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
SRB2 2.1.7 release
2014-04-14 05:14:58 +00:00
case DEMOVERSION: // latest always supported
break;
// too old, cannot support.
default:
CONS_Alert(CONS_NOTICE, M_GetText("Ghost %s: Demo version incompatible.\n"), pdemoname);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Z_Free(pdemoname);
Z_Free(buffer);
return;
}
M_Memcpy(md5, p, 16); p += 16; // demo checksum
for (gh = ghosts; gh; gh = gh->next)
if (!memcmp(md5, gh->checksum, 16)) // another ghost in the game already has this checksum?
{ // Don't add another one, then!
CONS_Debug(DBG_SETUP, "Rejecting duplicate ghost %s (MD5 was matched)\n", pdemoname);
Z_Free(pdemoname);
Z_Free(buffer);
return;
}
if (memcmp(p, "PLAY", 4))
{
CONS_Alert(CONS_NOTICE, M_GetText("Ghost %s: Demo format unacceptable.\n"), pdemoname);
Z_Free(pdemoname);
Z_Free(buffer);
return;
} p += 4; // "PLAY"
First, minor steps to Record Attack support To-Do: - fix demo desync (desync is only super noticeable on slopes, but a message pops up when the player starts moving regardless) - fix ghosts not appearing - replace that dumb level tally - remove a bunch of things that made the assumption that race & record attack would never mix (ex: "next map x doesn't support race mode, using map y anyway" message)
2017-10-15 06:33:28 +00:00
p += 2; // gamemap
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
p += 16; // mapmd5 (possibly check for consistency?)
flags = READUINT8(p);
if (!(flags & DF_GHOST))
{
CONS_Alert(CONS_NOTICE, M_GetText("Ghost %s: No ghost data in this demo.\n"), pdemoname);
Z_Free(pdemoname);
Z_Free(buffer);
return;
}
switch ((flags & DF_ATTACKMASK)>>DF_ATTACKSHIFT)
{
case ATTACKING_NONE: // 0
break;
case ATTACKING_RECORD: // 1
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
p += 8; // demo time, lap
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
break;
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
/*case ATTACKING_NIGHTS: // 2
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
p += 8; // demo time left, score
Record best lap time in Record Attack - Record Attack replays now save best lap time - Removed instances of NiGHTS Attack - Removed a lot of unlockable that have no use in Kart (ultimate mode, perfect bonus, score emblems, etc) - Removed all methods of activating ultimate mode
2018-01-22 00:15:26 +00:00
break;*/
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
default: // 3
break;
}
p += 4; // random seed
// Player name (TODO: Display this somehow if it doesn't match cv_playername!)
M_Memcpy(name, p,16);
p += 16;
// Skin
M_Memcpy(skin, p,16);
p += 16;
// Color
M_Memcpy(color, p,16);
p += 16;
// Ghosts do not have a player structure to put this in.
p++; // charability
p++; // charability2
p++; // actionspd
p++; // mindash
p++; // maxdash
Added Accelcode, start boosting, reverted drifting, etc.
2017-02-07 22:19:04 +00:00
// SRB2kart
p++; // kartspeed
p++; // kartweight
//
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
p++; // normalspeed
p++; // runspeed
p++; // thrustfactor
p++; // accelstart
p++; // acceleration
p += 4; // jumpfactor
// net var data
count = READUINT16(p);
while (count--)
{
p += 2;
SKIPSTRING(p);
p++;
}
if (*p == DEMOMARKER)
{
CONS_Alert(CONS_NOTICE, M_GetText("Failed to add ghost %s: Replay is empty.\n"), pdemoname);
Z_Free(pdemoname);
Z_Free(buffer);
return;
}
First steps at implementing a mechanism that allows you to load non-cheaty good-faith mods such as custom characters with no Lua scripting, and play record attack with them. Features a few bad hacks and a few more areas of improvement; I'll try to iron them out before they hit `next` or `master`.
2019-01-15 19:01:55 +00:00
for (i = 0; i < numskins; i++)
if (!stricmp(skins[i].name,skin))
{
whoopsie doodle, forgot gh wasn't allocated until after this section
2019-01-18 14:53:43 +00:00
ghskin = &skins[i];
First steps at implementing a mechanism that allows you to load non-cheaty good-faith mods such as custom characters with no Lua scripting, and play record attack with them. Features a few bad hacks and a few more areas of improvement; I'll try to iron them out before they hit `next` or `master`.
2019-01-15 19:01:55 +00:00
break;
}
if (i == numskins)
{
CONS_Alert(CONS_NOTICE, M_GetText("Failed to add ghost %s: Invalid character.\n"), pdemoname);
Z_Free(pdemoname);
Z_Free(buffer);
return;
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
gh = Z_Calloc(sizeof(demoghost), PU_LEVEL, NULL);
gh->next = ghosts;
gh->buffer = buffer;
M_Memcpy(gh->checksum, md5, 16);
gh->p = p;
ghosts = gh;
SRB2 2.1.7 release
2014-04-14 05:14:58 +00:00
gh->version = ghostversion;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
mthing = playerstarts[0];
I_Assert(mthing);
{ // A bit more complex than P_SpawnPlayer because ghosts aren't solid and won't just push themselves out of the ceiling.
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
fixed_t z,f,c;
gh->mo = P_SpawnMobj(mthing->x << FRACBITS, mthing->y << FRACBITS, 0, MT_GHOST);
gh->mo->angle = FixedAngle(mthing->angle*FRACUNIT);
f = gh->mo->floorz;
c = gh->mo->ceilingz - mobjinfo[MT_PLAYER].height;
SRB2 2.1.9 release
2014-08-04 03:49:33 +00:00
if (!!(mthing->options & MTF_AMBUSH) ^ !!(mthing->options & MTF_OBJECTFLIP))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
z = c;
SRB2 2.1.9 release
2014-08-04 03:49:33 +00:00
if (mthing->options >> ZSHIFT)
z -= ((mthing->options >> ZSHIFT) << FRACBITS);
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
if (z < f)
z = f;
SRB2 2.1.9 release
2014-08-04 03:49:33 +00:00
}
else
{
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
z = f;
SRB2 2.1.9 release
2014-08-04 03:49:33 +00:00
if (mthing->options >> ZSHIFT)
z += ((mthing->options >> ZSHIFT) << FRACBITS);
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
if (z > c)
z = c;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
Fix Ghost z not being set properly. Again.
2018-07-02 00:55:13 +00:00
gh->mo->z = z;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
Re-add lost player vibration frames Separate sprites for fast moving frames Rename some frames for a more sensible naming convention
2017-11-04 17:32:47 +00:00
gh->mo->state = states+S_KART_STND1; // SRB2kart - was S_PLAY_STND
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
gh->mo->sprite = gh->mo->state->sprite;
gh->mo->frame = (gh->mo->state->frame & FF_FRAMEMASK) | tr_trans20<<FF_TRANSSHIFT;
gh->mo->tics = -1;
gh->oldmo.x = gh->mo->x;
gh->oldmo.y = gh->mo->y;
gh->oldmo.z = gh->mo->z;
// Set skin
whoopsie doodle, forgot gh wasn't allocated until after this section
2019-01-18 14:53:43 +00:00
gh->mo->skin = gh->oldmo.skin = ghskin;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Set color
SRB2 2.1.7 release
2014-04-14 05:14:58 +00:00
gh->mo->color = ((skin_t*)gh->mo->skin)->prefcolor;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
for (i = 0; i < MAXSKINCOLORS; i++)
Some Color code, Kart powers
2016-08-12 01:42:11 +00:00
if (!stricmp(KartColor_Names[i],color)) // SRB2kart
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
gh->mo->color = (UINT8)i;
break;
}
SRB2 2.1.7 release
2014-04-14 05:14:58 +00:00
gh->oldmo.color = gh->mo->color;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
CONS_Printf(M_GetText("Added ghost %s from %s\n"), name, pdemoname);
Z_Free(pdemoname);
}
Staff attack ghost names on the `REPLAY...` menu. Also: Remove playercolor being set to the replay's color. No need to kill your settings, seeing as it makes no tangible effect on your replay (doesn't even lose colour when you die, so I don't even know...)
2018-11-04 01:00:17 +00:00
// A simplified version of G_AddGhost...
void G_UpdateStaffGhostName(lumpnum_t l)
{
UINT8 *buffer,*p;
UINT16 ghostversion;
UINT8 flags;
buffer = p = W_CacheLumpNum(l, PU_CACHE);
// read demo header
if (memcmp(p, DEMOHEADER, 12))
{
goto fail;
} p += 12; // DEMOHEADER
p++; // VERSION
p++; // SUBVERSION
ghostversion = READUINT16(p);
switch(ghostversion)
{
case DEMOVERSION: // latest always supported
break;
// too old, cannot support.
default:
goto fail;
}
p += 16; // demo checksum
if (memcmp(p, "PLAY", 4))
{
goto fail;
} p += 4; // "PLAY"
p += 2; // gamemap
p += 16; // mapmd5 (possibly check for consistency?)
flags = READUINT8(p);
if (!(flags & DF_GHOST))
{
goto fail; // we don't NEED to do it here, but whatever
}
switch ((flags & DF_ATTACKMASK)>>DF_ATTACKSHIFT)
{
case ATTACKING_NONE: // 0
break;
case ATTACKING_RECORD: // 1
p += 8; // demo time, lap
break;
/*case ATTACKING_NIGHTS: // 2
p += 8; // demo time left, score
break;*/
default: // 3
break;
}
p += 4; // random seed
// Player name
M_Memcpy(dummystaffname, p,16);
dummystaffname[16] = '\0';
// Ok, no longer any reason to care, bye
fail:
Z_Free(buffer);
return;
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
//
// G_TimeDemo
// NOTE: name is a full filename for external demos
//
static INT32 restorecv_vidwait;
void G_TimeDemo(const char *name)
{
nodrawers = M_CheckParm("-nodraw");
noblit = M_CheckParm("-noblit");
restorecv_vidwait = cv_vidwait.value;
if (cv_vidwait.value)
CV_Set(&cv_vidwait, "0");
timingdemo = true;
singletics = true;
framecount = 0;
demostarttime = I_GetTime();
G_DeferedPlayDemo(name);
}
void G_DoPlayMetal(void)
{
lumpnum_t l;
mobj_t *mo = NULL;
thinker_t *th;
// it's an internal demo
if ((l = W_CheckNumForName(va("%sMS",G_BuildMapName(gamemap)))) == LUMPERROR)
{
CONS_Alert(CONS_WARNING, M_GetText("No bot recording for this map.\n"));
return;
}
else
metalbuffer = metal_p = W_CacheLumpNum(l, PU_STATIC);
// find metal sonic
for (th = thinkercap.next; th != &thinkercap; th = th->next)
{
if (th->function.acp1 != (actionf_p1)P_MobjThinker)
continue;
mo = (mobj_t *)th;
if (mo->type == MT_METALSONIC_RACE)
break;
}
if (!mo)
{
CONS_Alert(CONS_ERROR, M_GetText("Failed to find bot entity.\n"));
SRB2 2.1.5 release
2014-03-23 16:00:29 +00:00
Z_Free(metalbuffer);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return;
}
// read demo header
metal_p += 12; // DEMOHEADER
metal_p++; // VERSION
metal_p++; // SUBVERSION
SRB2 2.1.7 release
2014-04-14 05:14:58 +00:00
metalversion = READUINT16(metal_p);
switch(metalversion)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
SRB2 2.1.7 release
2014-04-14 05:14:58 +00:00
case DEMOVERSION: // latest always supported
break;
// too old, cannot support.
default:
CONS_Alert(CONS_WARNING, M_GetText("Failed to load bot recording for this map, format version incompatible.\n"));
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Z_Free(metalbuffer);
return;
}
metal_p += 16; // demo checksum
if (memcmp(metal_p, "METL", 4))
{
CONS_Alert(CONS_WARNING, M_GetText("Failed to load bot recording for this map, wasn't recorded in Metal format.\n"));
Z_Free(metalbuffer);
return;
} metal_p += 4; // "METL"
// read initial tic
memset(&oldmetal,0,sizeof(oldmetal));
oldmetal.x = mo->x;
oldmetal.y = mo->y;
oldmetal.z = mo->z;
oldmetal.angle = mo->angle;
metalplayback = mo;
}
void G_DoneLevelLoad(void)
{
CONS_Printf(M_GetText("Loaded level in %f sec\n"), (double)(I_GetTime() - demostarttime) / TICRATE);
framecount = 0;
demostarttime = I_GetTime();
}
/*
===================
=
= G_CheckDemoStatus
=
= Called after a death or level completion to allow demos to be cleaned up
= Returns true if a new demo loop action will take place
===================
*/
SRB2 2.1.5 release
2014-03-23 16:00:29 +00:00
// Stops metal sonic's demo. Separate from other functions because metal + replays can coexist
void G_StopMetalDemo(void)
{
// Metal Sonic finishing doesn't end the game, dammit.
Z_Free(metalbuffer);
metalbuffer = NULL;
metalplayback = NULL;
metal_p = NULL;
}
// Stops metal sonic recording.
ATTRNORETURN void FUNCNORETURN G_StopMetalRecording(void)
{
boolean saved = false;
if (demo_p)
{
UINT8 *p = demobuffer+16; // checksum position
#ifdef NOMD5
UINT8 i;
WRITEUINT8(demo_p, DEMOMARKER); // add the demo end marker
for (i = 0; i < 16; i++, p++)
Starting from scratch. SRB2 v2.1.15
2016-07-06 04:09:17 +00:00
*p = P_RandomByte(); // This MD5 was chosen by fair dice roll and most likely < 50% correct.
SRB2 2.1.5 release
2014-03-23 16:00:29 +00:00
#else
WRITEUINT8(demo_p, DEMOMARKER); // add the demo end marker
md5_buffer((char *)p+16, demo_p - (p+16), (void *)p); // make a checksum of everything after the checksum in the file.
#endif
saved = FIL_WriteFile(va("%sMS.LMP", G_BuildMapName(gamemap)), demobuffer, demo_p - demobuffer); // finally output the file.
}
free(demobuffer);
metalrecording = false;
if (saved)
I_Error("Saved to %sMS.LMP", G_BuildMapName(gamemap));
I_Error("Failed to save demo!");
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// reset engine variable set for the demos
// called from stopdemo command, map command, and g_checkdemoStatus.
void G_StopDemo(void)
{
Z_Free(demobuffer);
demobuffer = NULL;
demoplayback = false;
TITLE SCREEN DEMOS: Pick a random Staff Attack demo!!! Also: Fix watching a demo replay of a map with a palette not resetting your palette back to normal when you go back to the menu(/titlescreen).
2018-11-05 13:45:40 +00:00
if (titledemo)
modeattacking = false;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
titledemo = false;
timingdemo = false;
singletics = false;
TITLE SCREEN DEMOS: Pick a random Staff Attack demo!!! Also: Fix watching a demo replay of a map with a palette not resetting your palette back to normal when you go back to the menu(/titlescreen).
2018-11-05 13:45:40 +00:00
if (gamestate == GS_LEVEL && rendermode != render_none)
{
V_SetPaletteLump("PLAYPAL"); // Reset the palette
R_ReInitColormaps(0, LUMPERROR);
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (gamestate == GS_INTERMISSION)
Y_EndIntermission(); // cleanup
Work so far Crashes, but baseline's there
2018-01-27 06:17:08 +00:00
if (gamestate == GS_VOTING)
Y_EndVote();
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
G_SetGamestate(GS_NULL);
wipegamestate = GS_NULL;
SV_StopServer();
SV_ResetServer();
}
boolean G_CheckDemoStatus(void)
{
boolean saved;
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
while (ghosts)
{
demoghost *next = ghosts->next;
Z_Free(ghosts);
ghosts = next;
}
ghosts = NULL;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
SRB2 2.1.5 release
2014-03-23 16:00:29 +00:00
// DO NOT end metal sonic demos here
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (timingdemo)
{
INT32 demotime;
double f1, f2;
demotime = I_GetTime() - demostarttime;
if (!demotime)
return true;
G_StopDemo();
timingdemo = false;
f1 = (double)demotime;
f2 = (double)framecount*TICRATE;
CONS_Printf(M_GetText("timed %u gametics in %d realtics\n%f seconds, %f avg fps\n"), leveltime,demotime,f1/TICRATE,f2/f1);
if (restorecv_vidwait != cv_vidwait.value)
CV_SetValue(&cv_vidwait, restorecv_vidwait);
D_AdvanceDemo();
return true;
}
if (demoplayback)
{
if (singledemo)
I_Quit();
G_StopDemo();
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
if (modeattacking)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
M_EndModeAttackRun();
else
D_AdvanceDemo();
return true;
}
if (demorecording)
{
UINT8 *p = demobuffer+16; // checksum position
#ifdef NOMD5
UINT8 i;
WRITEUINT8(demo_p, DEMOMARKER); // add the demo end marker
for (i = 0; i < 16; i++, p++)
Starting from scratch. SRB2 v2.1.15
2016-07-06 04:09:17 +00:00
*p = P_RandomByte(); // This MD5 was chosen by fair dice roll and most likely < 50% correct.
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
#else
WRITEUINT8(demo_p, DEMOMARKER); // add the demo end marker
md5_buffer((char *)p+16, demo_p - (p+16), p); // make a checksum of everything after the checksum in the file.
#endif
Use function va to avoid having to delcare a new variable. Thanks MonsterIestyn.
2016-09-11 21:59:24 +00:00
saved = FIL_WriteFile(va(pandf, srb2home, demoname), demobuffer, demo_p - demobuffer); // finally output the file.
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
free(demobuffer);
demorecording = false;
Starting from scratch. SRB2 v2.1.15
2016-07-06 04:09:17 +00:00
if (modeattacking != ATTACKING_RECORD)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
if (saved)
CONS_Printf(M_GetText("Demo %s recorded\n"), demoname);
else
CONS_Alert(CONS_WARNING, M_GetText("Demo %s not saved\n"), demoname);
}
return true;
}
return false;
}
//
// 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;
}
// 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));
}
Reference in a new issue Copy permalink