stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-28 23:21:58 +00:00
Code Issues Projects Releases Packages Wiki Activity
SRB2/src/p_saveg.c

5199 lines
142 KiB
C
Raw Normal View History

SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
Update copyright year & credits
2023-03-31 12:53:31 +00:00
// Copyright (C) 1999-2023 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 p_saveg.c
/// \brief Archiving: SaveGame I/O
#include "doomdef.h"
#include "byteptr.h"
#include "d_main.h"
#include "doomstat.h"
#include "g_game.h"
#include "m_random.h"
#include "m_misc.h"
#include "p_local.h"
#include "p_setup.h"
#include "p_saveg.h"
extracolormap_t refinement and netsyncing * Store raw values per rgba in extracolormap_t (no maskcolor or fadecolor) * Crunched some UINT16/32 into UINT8 * Calculate mask values in R_CreateLightTable * ifdef out EXTRACOLORMAPLUMPS
2018-09-11 00:36:34 +00:00
#include "r_data.h"
Move mobj interpolators to r_fps
2022-04-23 18:13:58 +00:00
#include "r_fps.h"
Move texture stuff to its own file
2020-01-07 15:35:10 +00:00
#include "r_textures.h"
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
#include "r_things.h"
Include r_skins.h instead of r_things.h in many files where all they wanted from it was skins stuff (oddly enough, this actually revealed some secret file dependencies previously included via r_things.h! I also needed to include d_player.h in r_skins.h itself it seems)
2020-03-09 13:54:56 +00:00
#include "r_skins.h"
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
#include "r_state.h"
#include "w_wad.h"
#include "y_inter.h"
#include "z_zone.h"
#include "r_main.h"
#include "r_sky.h"
#include "p_polyobj.h"
#include "lua_script.h"
Sync mobj->standingslope in netgames
2015-08-03 23:06:42 +00:00
#include "p_slopes.h"
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
savedata_t savedata;
UINT8 *save_p;
SRB2 2.1.2 release
2014-03-17 12:13:16 +00:00
// Block UINT32s to attempt to ensure that the correct data is
// being sent and received
Serialize sector portals
2023-08-24 19:04:31 +00:00
#define ARCHIVEBLOCK_MISC 0x7FEEDEED
#define ARCHIVEBLOCK_PLAYERS 0x7F448008
#define ARCHIVEBLOCK_WORLD 0x7F8C08C0
#define ARCHIVEBLOCK_POBJS 0x7F928546
#define ARCHIVEBLOCK_THINKERS 0x7F37037C
#define ARCHIVEBLOCK_SPECIALS 0x7F228378
#define ARCHIVEBLOCK_EMBLEMS 0x7F4A5445
#define ARCHIVEBLOCK_SECPORTALS 0x7FBE34C9
SRB2 2.1.2 release
2014-03-17 12:13:16 +00:00
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Note: This cannot be bigger
// than an UINT16
typedef enum
{
CAPSULE = 0x04,
AWAYVIEW = 0x08,
FIRSTAXIS = 0x10,
SECONDAXIS = 0x20,
Smiles follow-mobj initial support! Still using a Lua hook to follow closely behind, but now it doesn't need to be a generic thinkframe. Woo!
2017-10-02 13:08:58 +00:00
FOLLOW = 0x40,
Basic implementation for player position correction to Drone center * player->drone mobj variable * P_MoveNiGHTSToDrone, will change later
2018-08-10 23:25:49 +00:00
DRONE = 0x80,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
} player_saveflags;
static inline void P_ArchivePlayer(void)
{
const player_t *player = &players[consoleplayer];
Starting lives revamp, per the 2.2 priorities topic list! * Each time you die, the number of game overs you've had is counted. * Your save file updates to record this. * The number of startinglives is determined by the number of times you'ved game-overed, with the maximum being infinity lives (thereby providing a cap on the number of game overs you can go through in a typical game). Requires a new patch.dta, but I'm not uploading that yet because not happy with the icon we've got going for infinity lives on the save select menu.
2017-08-17 23:58:16 +00:00
SINT8 pllives = player->lives;
if (pllives < startinglivesbalance[numgameovers]) // Bump up to 3 lives if the player
pllives = startinglivesbalance[numgameovers]; // has less than that.
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Save skin name instead of skin number into save files Allows you to save a game as any character, and you don't have to load the files in a specific order to access the save file.
2021-05-06 21:41:43 +00:00
#ifdef NEWSKINSAVES
Add some comments, write an empty string instead of a boolean determining if the bot skin exists or not. I was a little scared of doing this at first, but after a bit of thought & some testing that it'll be fine.
2021-05-08 00:13:16 +00:00
// Write a specific value into the old skininfo location.
// If we read something other than this, it's an older save file that used skin numbers.
Save skin name instead of skin number into save files Allows you to save a game as any character, and you don't have to load the files in a specific order to access the save file.
2021-05-06 21:41:43 +00:00
WRITEUINT16(save_p, NEWSKINSAVES);
#endif
Add some comments, write an empty string instead of a boolean determining if the bot skin exists or not. I was a little scared of doing this at first, but after a bit of thought & some testing that it'll be fine.
2021-05-08 00:13:16 +00:00
// Write skin names, so that loading skins in different orders
// doesn't change who the save file is for!
Memory management fixes Date: Mon Aug 9 15:57:07 2021 -0300
2021-08-09 18:57:07 +00:00
WRITESTRINGN(save_p, skins[player->skin]->name, SKINNAMESIZE);
Save skin name instead of skin number into save files Allows you to save a game as any character, and you don't have to load the files in a specific order to access the save file.
2021-05-06 21:41:43 +00:00
if (botskin != 0)
{
Memory management fixes Date: Mon Aug 9 15:57:07 2021 -0300
2021-08-09 18:57:07 +00:00
WRITESTRINGN(save_p, skins[botskin-1]->name, SKINNAMESIZE);
Save skin name instead of skin number into save files Allows you to save a game as any character, and you don't have to load the files in a specific order to access the save file.
2021-05-06 21:41:43 +00:00
}
else
{
Add some comments, write an empty string instead of a boolean determining if the bot skin exists or not. I was a little scared of doing this at first, but after a bit of thought & some testing that it'll be fine.
2021-05-08 00:13:16 +00:00
WRITESTRINGN(save_p, "\0", SKINNAMESIZE);
Save skin name instead of skin number into save files Allows you to save a game as any character, and you don't have to load the files in a specific order to access the save file.
2021-05-06 21:41:43 +00:00
}
Starting lives revamp, per the 2.2 priorities topic list! * Each time you die, the number of game overs you've had is counted. * Your save file updates to record this. * The number of startinglives is determined by the number of times you'ved game-overed, with the maximum being infinity lives (thereby providing a cap on the number of game overs you can go through in a typical game). Requires a new patch.dta, but I'm not uploading that yet because not happy with the icon we've got going for infinity lives on the save select menu.
2017-08-17 23:58:16 +00:00
WRITEUINT8(save_p, numgameovers);
WRITESINT8(save_p, pllives);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
WRITEUINT32(save_p, player->score);
WRITEINT32(save_p, player->continues);
}
static inline void P_UnArchivePlayer(void)
{
Save skin name instead of skin number into save files Allows you to save a game as any character, and you don't have to load the files in a specific order to access the save file.
2021-05-06 21:41:43 +00:00
#ifdef NEWSKINSAVES
INT16 backwardsCompat = READUINT16(save_p);
if (backwardsCompat != NEWSKINSAVES)
{
Add some comments, write an empty string instead of a boolean determining if the bot skin exists or not. I was a little scared of doing this at first, but after a bit of thought & some testing that it'll be fine.
2021-05-08 00:13:16 +00:00
// This is an older save file, which used direct skin numbers.
Save skin name instead of skin number into save files Allows you to save a game as any character, and you don't have to load the files in a specific order to access the save file.
2021-05-06 21:41:43 +00:00
savedata.skin = backwardsCompat & ((1<<5) - 1);
savedata.botskin = backwardsCompat >> 5;
}
else
#endif
{
char ourSkinName[SKINNAMESIZE+1];
Add some comments, write an empty string instead of a boolean determining if the bot skin exists or not. I was a little scared of doing this at first, but after a bit of thought & some testing that it'll be fine.
2021-05-08 00:13:16 +00:00
char botSkinName[SKINNAMESIZE+1];
Save skin name instead of skin number into save files Allows you to save a game as any character, and you don't have to load the files in a specific order to access the save file.
2021-05-06 21:41:43 +00:00
READSTRINGN(save_p, ourSkinName, SKINNAMESIZE);
savedata.skin = R_SkinAvailable(ourSkinName);
Add some comments, write an empty string instead of a boolean determining if the bot skin exists or not. I was a little scared of doing this at first, but after a bit of thought & some testing that it'll be fine.
2021-05-08 00:13:16 +00:00
READSTRINGN(save_p, botSkinName, SKINNAMESIZE);
savedata.botskin = R_SkinAvailable(botSkinName) + 1;
Save skin name instead of skin number into save files Allows you to save a game as any character, and you don't have to load the files in a specific order to access the save file.
2021-05-06 21:41:43 +00:00
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Starting lives revamp, per the 2.2 priorities topic list! * Each time you die, the number of game overs you've had is counted. * Your save file updates to record this. * The number of startinglives is determined by the number of times you'ved game-overed, with the maximum being infinity lives (thereby providing a cap on the number of game overs you can go through in a typical game). Requires a new patch.dta, but I'm not uploading that yet because not happy with the icon we've got going for infinity lives on the save select menu.
2017-08-17 23:58:16 +00:00
savedata.numgameovers = READUINT8(save_p);
savedata.lives = READSINT8(save_p);
savedata.score = READUINT32(save_p);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
savedata.continues = READINT32(save_p);
}
P_NetArchivePlayers() is too bad for inline
2016-05-27 03:39:08 +00:00
static void P_NetArchivePlayers(void)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
INT32 i, j;
UINT16 flags;
// size_t q;
SRB2 2.1.2 release
2014-03-17 12:13:16 +00:00
WRITEUINT32(save_p, ARCHIVEBLOCK_PLAYERS);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
for (i = 0; i < MAXPLAYERS; i++)
{
Store most data in gamestate instead of server config packet
2020-01-31 14:29:22 +00:00
WRITESINT8(save_p, (SINT8)adminplayers[i]);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (!playeringame[i])
continue;
flags = 0;
Store most data in gamestate instead of server config packet
2020-01-31 14:29:22 +00:00
// no longer send ticcmds
SRB2 2.1.9 release
2014-08-04 03:49:33 +00:00
Store most data in gamestate instead of server config packet
2020-01-31 14:29:22 +00:00
WRITESTRINGN(save_p, player_names[i], MAXPLAYERNAME);
Fix potential desynch when a player spawns
2020-05-28 09:03:35 +00:00
WRITEINT16(save_p, players[i].angleturn);
WRITEINT16(save_p, players[i].oldrelangleturn);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
WRITEANGLE(save_p, players[i].aiming);
Drawangle. Mystic wanted it, just play it - too busy to give proper commit description. Will outline everything it is in the merge request when that happens.
2017-02-05 18:15:20 +00:00
WRITEANGLE(save_p, players[i].drawangle);
Un/archive viewrollangle in netsaves
2020-01-18 00:32:13 +00:00
WRITEANGLE(save_p, players[i].viewrollangle);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
WRITEANGLE(save_p, players[i].awayviewaiming);
WRITEINT32(save_p, players[i].awayviewtics);
MONSTER COMMIT. OLD SPECIAL STAGES: * Spheres in old special stages instead of rings! * Individual timers in old special stages instead of a global one! * Old special stages use a variant of the NiGHTS HUD now! * Special stage damage in old special stages loses 5 seconds of time instead of 10 rings/spheres! * All damage gained through old special stages is converted to special stage damage! As a consequence, the special spikeball has no need to be special anymore. * Made emerald gaining function be based on special stage number rather than gained emeralds! * Consistency with... NiGHTS SPECIAL STAGES: * Spheres now flash in bonus time. https://cdn.discordapp.com/attachments/400761370800422922/452590553100713984/srb20032.gif * Sphere and ring mapthingnums are now less fucked up in 'em. (Rings are 300, same as usual, while Spheres are now 1706 replacing NiGHTS Wings.) SPECIAL STAGES IN GENERAL: * useNightsSS is now dead. Each individual special stage is now assessed for NiGHTS-mode behaviour based on maptol & TOL_NIGHTS. * CRAWLA HONCHO\n CAN NOW BE\n SUPER CRAWLA HONCHO end tally modification now also includes a mini-tutorial on turning super. https://cdn.discordapp.com/attachments/400761370800422922/452844894113759233/srb20036.gif * SONIC GOT A CHAOS EMERALD? https://cdn.discordapp.com/attachments/400761370800422922/452623869497573386/srb20034.gif NiGHTS NON-SPECIAL STAGES: * Colour Chips and Star Chips! Replaces Spheres and Rings of NiGHTS Special Stages. * Colour Chips turn yellow in bonus time. * Ideya! * Its own "drowning" music! * All of the object types for Dream Hill. * GIF: https://cdn.discordapp.com/attachments/400761370800422922/452844894113759233/srb20036.gif RANDOM BS: * Turn super with the spin button instead of the jump button! * Followmobj now correctly set with P_SetTarget instead of pointer assignment. * Emerald hunt uses new sprites! * Made unlock noise different from emblem gain noise! (It's the CRAWLA HONCHO CAN NOW TURN yadda yadda sound from S3K now.)
2018-06-03 21:41:54 +00:00
WRITEINT16(save_p, players[i].rings);
WRITEINT16(save_p, players[i].spheres);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
WRITESINT8(save_p, players[i].pity);
WRITEINT32(save_p, players[i].currentweapon);
WRITEINT32(save_p, players[i].ringweapons);
Show a negative number to indicate ammo penalty
2019-08-26 23:07:17 +00:00
WRITEUINT16(save_p, players[i].ammoremoval);
WRITEUINT32(save_p, players[i].ammoremovaltimer);
WRITEINT32(save_p, players[i].ammoremovaltimer);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
for (j = 0; j < NUMPOWERS; j++)
WRITEUINT16(save_p, players[i].powers[j]);
WRITEUINT8(save_p, players[i].playerstate);
WRITEUINT32(save_p, players[i].pflags);
WRITEUINT8(save_p, players[i].panim);
Add player->powers[pw_strong], refactor attacks and busting conditions, and allow breaking floors and ceilings separately
2023-07-05 17:05:47 +00:00
WRITEUINT8(save_p, players[i].stronganim);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
WRITEUINT8(save_p, players[i].spectator);
Add per-player mute
2024-02-27 10:58:59 +00:00
WRITEUINT8(save_p, players[i].muted);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
WRITEUINT16(save_p, players[i].flashpal);
WRITEUINT16(save_p, players[i].flashcount);
Fix for "Leader of the Chaotix" name change bug (credit Zwip Zwap Zapony)
2023-10-29 17:43:40 +00:00
WRITEUINT16(save_p, players[i].skincolor);
Store most data in gamestate instead of server config packet
2020-01-31 14:29:22 +00:00
WRITEINT32(save_p, players[i].skin);
WRITEUINT32(save_p, players[i].availabilities);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
WRITEUINT32(save_p, players[i].score);
Allow obtaining ring, time & grade emblems in regular SP gameplay.
2022-03-02 22:47:15 +00:00
WRITEUINT32(save_p, players[i].recordscore);
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
WRITEFIXED(save_p, players[i].dashspeed);
SRB2 2.1.4 release
2014-03-21 18:42:55 +00:00
WRITESINT8(save_p, players[i].lives);
WRITESINT8(save_p, players[i].continues);
WRITESINT8(save_p, players[i].xtralife);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
WRITEUINT8(save_p, players[i].gotcontinue);
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
WRITEFIXED(save_p, players[i].speed);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
WRITEUINT8(save_p, players[i].secondjump);
WRITEUINT8(save_p, players[i].fly1);
WRITEUINT8(save_p, players[i].scoreadd);
WRITEUINT32(save_p, players[i].glidetime);
WRITEUINT8(save_p, players[i].climbing);
WRITEINT32(save_p, players[i].deadtimer);
WRITEUINT32(save_p, players[i].exiting);
WRITEUINT8(save_p, players[i].homing);
Went and fixed the dashmode variable hack nonsense once and for all myself would have gone for "dashtime", but then I was reminded that was already a name for something to do with spindash. Oh well
2016-01-25 11:47:33 +00:00
WRITEUINT32(save_p, players[i].dashmode);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
WRITEUINT32(save_p, players[i].skidtime);
Added botstuffs to savestate
2021-01-23 15:39:59 +00:00
//////////
// Bots //
//////////
WRITEUINT8(save_p, players[i].bot);
WRITEUINT8(save_p, players[i].botmem.lastForward);
WRITEUINT8(save_p, players[i].botmem.lastBlocked);
WRITEUINT8(save_p, players[i].botmem.catchup_tics);
WRITEUINT8(save_p, players[i].botmem.thinkstate);
Fixed G_RemovePlayer crash in players.iterate This was done by storing flag-for-removal status as a boolean inside the player struct. Bot players are instead removed at the start of G_Ticker, rather than being removed immediately by G_RemovePlayer.
2021-07-15 22:04:24 +00:00
WRITEUINT8(save_p, players[i].removing);
Cleanup whitespace changes from SRB2_release_2.2.9
2022-11-12 01:38:52 +00:00
Added botstuffs to savestate
2021-01-23 15:39:59 +00:00
WRITEUINT8(save_p, players[i].blocked);
WRITEUINT16(save_p, players[i].lastbuttons);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
////////////////////////////
// Conveyor Belt Movement //
////////////////////////////
WRITEFIXED(save_p, players[i].cmomx); // Conveyor momx
WRITEFIXED(save_p, players[i].cmomy); // Conveyor momy
WRITEFIXED(save_p, players[i].rmomx); // "Real" momx (momx - cmomx)
WRITEFIXED(save_p, players[i].rmomy); // "Real" momy (momy - cmomy)
/////////////////////
// Race Mode Stuff //
/////////////////////
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
WRITEINT16(save_p, players[i].numboxes);
WRITEINT16(save_p, players[i].totalring);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
WRITEUINT32(save_p, players[i].realtime);
SRB2 2.1.4 release
2014-03-21 18:42:55 +00:00
WRITEUINT8(save_p, players[i].laps);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
////////////////////
// CTF Mode Stuff //
////////////////////
WRITEINT32(save_p, players[i].ctfteam);
WRITEUINT16(save_p, players[i].gotflag);
WRITEINT32(save_p, players[i].weapondelay);
WRITEINT32(save_p, players[i].tossdelay);
WRITEUINT32(save_p, players[i].starposttime);
WRITEINT16(save_p, players[i].starpostx);
WRITEINT16(save_p, players[i].starposty);
WRITEINT16(save_p, players[i].starpostz);
WRITEINT32(save_p, players[i].starpostnum);
WRITEANGLE(save_p, players[i].starpostangle);
* Store gravflip (resolves #206) and destscale in starposts. (Using the same field, taking advantage of the fact that object scale will always be positive!) * Update the function signature of P_MixUp to accomodate both it and drawangle instead of doing it outside of the function. * If the player is spawning from the start of the stage and it's from the ceiling, be in fall frames as requested (resolves #191).
2019-09-07 21:11:33 +00:00
WRITEFIXED(save_p, players[i].starpostscale);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
WRITEANGLE(save_p, players[i].angle_pos);
WRITEANGLE(save_p, players[i].old_angle_pos);
WRITEINT32(save_p, players[i].flyangle);
WRITEUINT32(save_p, players[i].drilltimer);
WRITEINT32(save_p, players[i].linkcount);
WRITEUINT32(save_p, players[i].linktimer);
WRITEINT32(save_p, players[i].anotherflyangle);
WRITEUINT32(save_p, players[i].nightstime);
WRITEUINT32(save_p, players[i].bumpertime);
WRITEINT32(save_p, players[i].drillmeter);
WRITEUINT8(save_p, players[i].drilldelay);
WRITEUINT8(save_p, players[i].bonustime);
player->oldscale var for pre-Nightserize scale
2018-08-11 04:49:28 +00:00
WRITEFIXED(save_p, players[i].oldscale);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
WRITEUINT8(save_p, players[i].mare);
Add player_t marelap and marebonuslap, with logic
2018-03-30 18:36:49 +00:00
WRITEUINT8(save_p, players[i].marelap);
WRITEUINT8(save_p, players[i].marebonuslap);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
WRITEUINT32(save_p, players[i].marebegunat);
NiGHTS text changes: - Add lastmaretime to players, used to show time at mare/end results - Replace textvar numbers with an enum (NTV_)
2023-09-28 20:22:29 +00:00
WRITEUINT32(save_p, players[i].lastmaretime);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
WRITEUINT32(save_p, players[i].startedtime);
WRITEUINT32(save_p, players[i].finishedtime);
Add lapbegunat and lapstartedtime player variables There is no lapfinishedtime because [mare]finishedtime refers to when Egg Capsule is destroyed. That concept does not apply to laps.
2018-08-10 21:12:26 +00:00
WRITEUINT32(save_p, players[i].lapbegunat);
WRITEUINT32(save_p, players[i].lapstartedtime);
MONSTER COMMIT. OLD SPECIAL STAGES: * Spheres in old special stages instead of rings! * Individual timers in old special stages instead of a global one! * Old special stages use a variant of the NiGHTS HUD now! * Special stage damage in old special stages loses 5 seconds of time instead of 10 rings/spheres! * All damage gained through old special stages is converted to special stage damage! As a consequence, the special spikeball has no need to be special anymore. * Made emerald gaining function be based on special stage number rather than gained emeralds! * Consistency with... NiGHTS SPECIAL STAGES: * Spheres now flash in bonus time. https://cdn.discordapp.com/attachments/400761370800422922/452590553100713984/srb20032.gif * Sphere and ring mapthingnums are now less fucked up in 'em. (Rings are 300, same as usual, while Spheres are now 1706 replacing NiGHTS Wings.) SPECIAL STAGES IN GENERAL: * useNightsSS is now dead. Each individual special stage is now assessed for NiGHTS-mode behaviour based on maptol & TOL_NIGHTS. * CRAWLA HONCHO\n CAN NOW BE\n SUPER CRAWLA HONCHO end tally modification now also includes a mini-tutorial on turning super. https://cdn.discordapp.com/attachments/400761370800422922/452844894113759233/srb20036.gif * SONIC GOT A CHAOS EMERALD? https://cdn.discordapp.com/attachments/400761370800422922/452623869497573386/srb20034.gif NiGHTS NON-SPECIAL STAGES: * Colour Chips and Star Chips! Replaces Spheres and Rings of NiGHTS Special Stages. * Colour Chips turn yellow in bonus time. * Ideya! * Its own "drowning" music! * All of the object types for Dream Hill. * GIF: https://cdn.discordapp.com/attachments/400761370800422922/452844894113759233/srb20036.gif RANDOM BS: * Turn super with the spin button instead of the jump button! * Followmobj now correctly set with P_SetTarget instead of pointer assignment. * Emerald hunt uses new sprites! * Made unlock noise different from emblem gain noise! (It's the CRAWLA HONCHO CAN NOW TURN yadda yadda sound from S3K now.)
2018-06-03 21:41:54 +00:00
WRITEINT16(save_p, players[i].finishedspheres);
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
WRITEINT16(save_p, players[i].finishedrings);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
WRITEUINT32(save_p, players[i].marescore);
WRITEUINT32(save_p, players[i].lastmarescore);
totalmarescore player variable for NiGHTS scoring # Conflicts: # src/p_setup.c
2018-08-12 23:59:34 +00:00
WRITEUINT32(save_p, players[i].totalmarescore);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
WRITEUINT8(save_p, players[i].lastmare);
Add lastmarelap and lastmarebonuslap player variables
2018-08-10 20:30:49 +00:00
WRITEUINT8(save_p, players[i].lastmarelap);
WRITEUINT8(save_p, players[i].lastmarebonuslap);
totalmarelap and totalmarebonuslap player variables
2018-08-12 23:57:33 +00:00
WRITEUINT8(save_p, players[i].totalmarelap);
WRITEUINT8(save_p, players[i].totalmarebonuslap);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
WRITEINT32(save_p, players[i].maxlink);
WRITEUINT8(save_p, players[i].texttimer);
WRITEUINT8(save_p, players[i].textvar);
if (players[i].capsule)
flags |= CAPSULE;
if (players[i].awayviewmobj)
flags |= AWAYVIEW;
if (players[i].axis1)
flags |= FIRSTAXIS;
if (players[i].axis2)
flags |= SECONDAXIS;
Smiles follow-mobj initial support! Still using a Lua hook to follow closely behind, but now it doesn't need to be a generic thinkframe. Woo!
2017-10-02 13:08:58 +00:00
if (players[i].followmobj)
flags |= FOLLOW;
Basic implementation for player position correction to Drone center * player->drone mobj variable * P_MoveNiGHTSToDrone, will change later
2018-08-10 23:25:49 +00:00
if (players[i].drone)
flags |= DRONE;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
WRITEINT16(save_p, players[i].lastsidehit);
WRITEINT16(save_p, players[i].lastlinehit);
WRITEUINT32(save_p, players[i].losstime);
WRITEUINT8(save_p, players[i].timeshit);
WRITEINT32(save_p, players[i].onconveyor);
WRITEUINT32(save_p, players[i].jointime);
Let clients rejoin the server without losing their status This is accomplished by simply preserving the player's body after disconnecting. Bodies will despawn after the number of minutes specified by the "rejointimeout" console variable (float). A value of 0 disables the feature completely. Clients rejoining are identified by their IP address, and may rejoin even if the server is full or joins are disabled, for as long as their body remains. From a technical standpoint, when the user disconnects, the player they were controlling does not leave, the underlying player_t just keeps working normally, except it does not receive any input anymore. When the user reconnects, they are simply "relinked" to their player_t. Those "soulless" players can be identified through their "quittime" field, which is the number of tics elapsed since the user disconnected, or zero if still connected. "quittime" is exposed to Lua.
2020-01-22 02:05:08 +00:00
WRITEUINT32(save_p, players[i].quittime);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
WRITEUINT16(save_p, flags);
if (flags & CAPSULE)
WRITEUINT32(save_p, players[i].capsule->mobjnum);
if (flags & FIRSTAXIS)
WRITEUINT32(save_p, players[i].axis1->mobjnum);
if (flags & SECONDAXIS)
WRITEUINT32(save_p, players[i].axis2->mobjnum);
if (flags & AWAYVIEW)
WRITEUINT32(save_p, players[i].awayviewmobj->mobjnum);
Smiles follow-mobj initial support! Still using a Lua hook to follow closely behind, but now it doesn't need to be a generic thinkframe. Woo!
2017-10-02 13:08:58 +00:00
if (flags & FOLLOW)
WRITEUINT32(save_p, players[i].followmobj->mobjnum);
Basic implementation for player position correction to Drone center * player->drone mobj variable * P_MoveNiGHTSToDrone, will change later
2018-08-10 23:25:49 +00:00
if (flags & DRONE)
WRITEUINT32(save_p, players[i].drone->mobjnum);
* Skin-controlled radius is no longer set each tic, only on skin change and player spawn. * Camerascale, shieldscale, height and spinheight are now player attributes which are set to the skin attribute on skin change, not read directly from the skin. * P_GetPlayerHeight and P_GetPlayerSpinHeight are now macros instead of functions. * Extra protection against switching to a locked skin.
2016-09-25 17:21:52 +00:00
WRITEFIXED(save_p, players[i].camerascale);
WRITEFIXED(save_p, players[i].shieldscale);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
WRITEUINT8(save_p, players[i].charability);
WRITEUINT8(save_p, players[i].charability2);
WRITEUINT32(save_p, players[i].charflags);
WRITEUINT32(save_p, (UINT32)players[i].thokitem);
WRITEUINT32(save_p, (UINT32)players[i].spinitem);
WRITEUINT32(save_p, (UINT32)players[i].revitem);
Smiles follow-mobj initial support! Still using a Lua hook to follow closely behind, but now it doesn't need to be a generic thinkframe. Woo!
2017-10-02 13:08:58 +00:00
WRITEUINT32(save_p, (UINT32)players[i].followitem);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
WRITEFIXED(save_p, players[i].actionspd);
WRITEFIXED(save_p, players[i].mindash);
WRITEFIXED(save_p, players[i].maxdash);
WRITEFIXED(save_p, players[i].normalspeed);
WRITEFIXED(save_p, players[i].runspeed);
WRITEUINT8(save_p, players[i].thrustfactor);
WRITEUINT8(save_p, players[i].accelstart);
WRITEUINT8(save_p, players[i].acceleration);
WRITEFIXED(save_p, players[i].jumpfactor);
* Skin-controlled radius is no longer set each tic, only on skin change and player spawn. * Camerascale, shieldscale, height and spinheight are now player attributes which are set to the skin attribute on skin change, not read directly from the skin. * P_GetPlayerHeight and P_GetPlayerSpinHeight are now macros instead of functions. * Extra protection against switching to a locked skin.
2016-09-25 17:21:52 +00:00
WRITEFIXED(save_p, players[i].height);
WRITEFIXED(save_p, players[i].spinheight);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
}
P_NetUnArchivePlayers doesn't like having "inline" either
2016-05-27 13:49:11 +00:00
static void P_NetUnArchivePlayers(void)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
INT32 i, j;
UINT16 flags;
SRB2 2.1.2 release
2014-03-17 12:13:16 +00:00
if (READUINT32(save_p) != ARCHIVEBLOCK_PLAYERS)
I_Error("Bad $$$.sav at archive block Players");
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
for (i = 0; i < MAXPLAYERS; i++)
{
Store most data in gamestate instead of server config packet
2020-01-31 14:29:22 +00:00
adminplayers[i] = (INT32)READSINT8(save_p);
SRB2 2.1.9 release
2014-08-04 03:49:33 +00:00
// Do NOT memset player struct to 0
// other areas may initialize data elsewhere
//memset(&players[i], 0, sizeof (player_t));
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (!playeringame[i])
continue;
SRB2 2.1.9 release
2014-08-04 03:49:33 +00:00
// NOTE: sending tics should (hopefully) no longer be necessary
SRB2 2.1.4 release
2014-03-21 18:42:55 +00:00
Store most data in gamestate instead of server config packet
2020-01-31 14:29:22 +00:00
READSTRINGN(save_p, player_names[i], MAXPLAYERNAME);
Fix potential desynch when a player spawns
2020-05-28 09:03:35 +00:00
players[i].angleturn = READINT16(save_p);
players[i].oldrelangleturn = READINT16(save_p);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
players[i].aiming = READANGLE(save_p);
Drawangle. Mystic wanted it, just play it - too busy to give proper commit description. Will outline everything it is in the merge request when that happens.
2017-02-05 18:15:20 +00:00
players[i].drawangle = READANGLE(save_p);
Un/archive viewrollangle in netsaves
2020-01-18 00:32:13 +00:00
players[i].viewrollangle = READANGLE(save_p);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
players[i].awayviewaiming = READANGLE(save_p);
players[i].awayviewtics = READINT32(save_p);
MONSTER COMMIT. OLD SPECIAL STAGES: * Spheres in old special stages instead of rings! * Individual timers in old special stages instead of a global one! * Old special stages use a variant of the NiGHTS HUD now! * Special stage damage in old special stages loses 5 seconds of time instead of 10 rings/spheres! * All damage gained through old special stages is converted to special stage damage! As a consequence, the special spikeball has no need to be special anymore. * Made emerald gaining function be based on special stage number rather than gained emeralds! * Consistency with... NiGHTS SPECIAL STAGES: * Spheres now flash in bonus time. https://cdn.discordapp.com/attachments/400761370800422922/452590553100713984/srb20032.gif * Sphere and ring mapthingnums are now less fucked up in 'em. (Rings are 300, same as usual, while Spheres are now 1706 replacing NiGHTS Wings.) SPECIAL STAGES IN GENERAL: * useNightsSS is now dead. Each individual special stage is now assessed for NiGHTS-mode behaviour based on maptol & TOL_NIGHTS. * CRAWLA HONCHO\n CAN NOW BE\n SUPER CRAWLA HONCHO end tally modification now also includes a mini-tutorial on turning super. https://cdn.discordapp.com/attachments/400761370800422922/452844894113759233/srb20036.gif * SONIC GOT A CHAOS EMERALD? https://cdn.discordapp.com/attachments/400761370800422922/452623869497573386/srb20034.gif NiGHTS NON-SPECIAL STAGES: * Colour Chips and Star Chips! Replaces Spheres and Rings of NiGHTS Special Stages. * Colour Chips turn yellow in bonus time. * Ideya! * Its own "drowning" music! * All of the object types for Dream Hill. * GIF: https://cdn.discordapp.com/attachments/400761370800422922/452844894113759233/srb20036.gif RANDOM BS: * Turn super with the spin button instead of the jump button! * Followmobj now correctly set with P_SetTarget instead of pointer assignment. * Emerald hunt uses new sprites! * Made unlock noise different from emblem gain noise! (It's the CRAWLA HONCHO CAN NOW TURN yadda yadda sound from S3K now.)
2018-06-03 21:41:54 +00:00
players[i].rings = READINT16(save_p);
players[i].spheres = READINT16(save_p);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
players[i].pity = READSINT8(save_p);
players[i].currentweapon = READINT32(save_p);
players[i].ringweapons = READINT32(save_p);
Show a negative number to indicate ammo penalty
2019-08-26 23:07:17 +00:00
players[i].ammoremoval = READUINT16(save_p);
players[i].ammoremovaltimer = READUINT32(save_p);
players[i].ammoremovalweapon = READINT32(save_p);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
for (j = 0; j < NUMPOWERS; j++)
players[i].powers[j] = READUINT16(save_p);
players[i].playerstate = READUINT8(save_p);
players[i].pflags = READUINT32(save_p);
players[i].panim = READUINT8(save_p);
Add player->powers[pw_strong], refactor attacks and busting conditions, and allow breaking floors and ceilings separately
2023-07-05 17:05:47 +00:00
players[i].stronganim = READUINT8(save_p);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
players[i].spectator = READUINT8(save_p);
Add per-player mute
2024-02-27 10:58:59 +00:00
players[i].muted = READUINT8(save_p);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
players[i].flashpal = READUINT16(save_p);
players[i].flashcount = READUINT16(save_p);
Fix for "Leader of the Chaotix" name change bug (credit Zwip Zwap Zapony)
2023-10-29 17:43:40 +00:00
players[i].skincolor = READUINT16(save_p);
Store most data in gamestate instead of server config packet
2020-01-31 14:29:22 +00:00
players[i].skin = READINT32(save_p);
players[i].availabilities = READUINT32(save_p);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
players[i].score = READUINT32(save_p);
Allow obtaining ring, time & grade emblems in regular SP gameplay.
2022-03-02 22:47:15 +00:00
players[i].recordscore = READUINT32(save_p);
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
players[i].dashspeed = READFIXED(save_p); // dashing speed
SRB2 2.1.4 release
2014-03-21 18:42:55 +00:00
players[i].lives = READSINT8(save_p);
players[i].continues = READSINT8(save_p); // continues that player has acquired
players[i].xtralife = READSINT8(save_p); // Ring Extra Life counter
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
players[i].gotcontinue = READUINT8(save_p); // got continue from stage
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
players[i].speed = READFIXED(save_p); // Player's speed (distance formula of MOMX and MOMY values)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
players[i].secondjump = READUINT8(save_p);
players[i].fly1 = READUINT8(save_p); // Tails flying
players[i].scoreadd = READUINT8(save_p); // Used for multiple enemy attack bonus
players[i].glidetime = READUINT32(save_p); // Glide counter for thrust
players[i].climbing = READUINT8(save_p); // Climbing on the wall
players[i].deadtimer = READINT32(save_p); // End game if game over lasts too long
players[i].exiting = READUINT32(save_p); // Exitlevel timer
players[i].homing = READUINT8(save_p); // Are you homing?
Went and fixed the dashmode variable hack nonsense once and for all myself would have gone for "dashtime", but then I was reminded that was already a name for something to do with spindash. Oh well
2016-01-25 11:47:33 +00:00
players[i].dashmode = READUINT32(save_p); // counter for dashmode ability
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
players[i].skidtime = READUINT32(save_p); // Skid timer
Added botstuffs to savestate
2021-01-23 15:39:59 +00:00
//////////
// Bots //
//////////
players[i].bot = READUINT8(save_p);
Cleanup whitespace changes from SRB2_release_2.2.9
2022-11-12 01:38:52 +00:00
Added botstuffs to savestate
2021-01-23 15:39:59 +00:00
players[i].botmem.lastForward = READUINT8(save_p);
players[i].botmem.lastBlocked = READUINT8(save_p);
players[i].botmem.catchup_tics = READUINT8(save_p);
players[i].botmem.thinkstate = READUINT8(save_p);
Fixed G_RemovePlayer crash in players.iterate This was done by storing flag-for-removal status as a boolean inside the player struct. Bot players are instead removed at the start of G_Ticker, rather than being removed immediately by G_RemovePlayer.
2021-07-15 22:04:24 +00:00
players[i].removing = READUINT8(save_p);
Added botstuffs to savestate
2021-01-23 15:39:59 +00:00
players[i].blocked = READUINT8(save_p);
players[i].lastbuttons = READUINT16(save_p);
Cleanup whitespace changes from SRB2_release_2.2.9
2022-11-12 01:38:52 +00:00
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
////////////////////////////
// Conveyor Belt Movement //
////////////////////////////
players[i].cmomx = READFIXED(save_p); // Conveyor momx
players[i].cmomy = READFIXED(save_p); // Conveyor momy
players[i].rmomx = READFIXED(save_p); // "Real" momx (momx - cmomx)
players[i].rmomy = READFIXED(save_p); // "Real" momy (momy - cmomy)
/////////////////////
// Race Mode Stuff //
/////////////////////
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
players[i].numboxes = READINT16(save_p); // Number of item boxes obtained for Race Mode
players[i].totalring = READINT16(save_p); // Total number of rings obtained for Race Mode
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
players[i].realtime = READUINT32(save_p); // integer replacement for leveltime
SRB2 2.1.4 release
2014-03-21 18:42:55 +00:00
players[i].laps = READUINT8(save_p); // Number of laps (optional)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
////////////////////
// CTF Mode Stuff //
////////////////////
players[i].ctfteam = READINT32(save_p); // 1 == Red, 2 == Blue
players[i].gotflag = READUINT16(save_p); // 1 == Red, 2 == Blue Do you have the flag?
players[i].weapondelay = READINT32(save_p);
players[i].tossdelay = READINT32(save_p);
players[i].starposttime = READUINT32(save_p);
players[i].starpostx = READINT16(save_p);
players[i].starposty = READINT16(save_p);
players[i].starpostz = READINT16(save_p);
players[i].starpostnum = READINT32(save_p);
players[i].starpostangle = READANGLE(save_p);
* Store gravflip (resolves #206) and destscale in starposts. (Using the same field, taking advantage of the fact that object scale will always be positive!) * Update the function signature of P_MixUp to accomodate both it and drawangle instead of doing it outside of the function. * If the player is spawning from the start of the stage and it's from the ceiling, be in fall frames as requested (resolves #191).
2019-09-07 21:11:33 +00:00
players[i].starpostscale = READFIXED(save_p);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
players[i].angle_pos = READANGLE(save_p);
players[i].old_angle_pos = READANGLE(save_p);
players[i].flyangle = READINT32(save_p);
players[i].drilltimer = READUINT32(save_p);
players[i].linkcount = READINT32(save_p);
players[i].linktimer = READUINT32(save_p);
players[i].anotherflyangle = READINT32(save_p);
players[i].nightstime = READUINT32(save_p);
players[i].bumpertime = READUINT32(save_p);
players[i].drillmeter = READINT32(save_p);
players[i].drilldelay = READUINT8(save_p);
players[i].bonustime = (boolean)READUINT8(save_p);
player->oldscale var for pre-Nightserize scale
2018-08-11 04:49:28 +00:00
players[i].oldscale = READFIXED(save_p);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
players[i].mare = READUINT8(save_p);
Add player_t marelap and marebonuslap, with logic
2018-03-30 18:36:49 +00:00
players[i].marelap = READUINT8(save_p);
players[i].marebonuslap = READUINT8(save_p);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
players[i].marebegunat = READUINT32(save_p);
NiGHTS text changes: - Add lastmaretime to players, used to show time at mare/end results - Replace textvar numbers with an enum (NTV_)
2023-09-28 20:22:29 +00:00
players[i].lastmaretime = READUINT32(save_p);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
players[i].startedtime = READUINT32(save_p);
players[i].finishedtime = READUINT32(save_p);
Add lapbegunat and lapstartedtime player variables There is no lapfinishedtime because [mare]finishedtime refers to when Egg Capsule is destroyed. That concept does not apply to laps.
2018-08-10 21:12:26 +00:00
players[i].lapbegunat = READUINT32(save_p);
players[i].lapstartedtime = READUINT32(save_p);
MONSTER COMMIT. OLD SPECIAL STAGES: * Spheres in old special stages instead of rings! * Individual timers in old special stages instead of a global one! * Old special stages use a variant of the NiGHTS HUD now! * Special stage damage in old special stages loses 5 seconds of time instead of 10 rings/spheres! * All damage gained through old special stages is converted to special stage damage! As a consequence, the special spikeball has no need to be special anymore. * Made emerald gaining function be based on special stage number rather than gained emeralds! * Consistency with... NiGHTS SPECIAL STAGES: * Spheres now flash in bonus time. https://cdn.discordapp.com/attachments/400761370800422922/452590553100713984/srb20032.gif * Sphere and ring mapthingnums are now less fucked up in 'em. (Rings are 300, same as usual, while Spheres are now 1706 replacing NiGHTS Wings.) SPECIAL STAGES IN GENERAL: * useNightsSS is now dead. Each individual special stage is now assessed for NiGHTS-mode behaviour based on maptol & TOL_NIGHTS. * CRAWLA HONCHO\n CAN NOW BE\n SUPER CRAWLA HONCHO end tally modification now also includes a mini-tutorial on turning super. https://cdn.discordapp.com/attachments/400761370800422922/452844894113759233/srb20036.gif * SONIC GOT A CHAOS EMERALD? https://cdn.discordapp.com/attachments/400761370800422922/452623869497573386/srb20034.gif NiGHTS NON-SPECIAL STAGES: * Colour Chips and Star Chips! Replaces Spheres and Rings of NiGHTS Special Stages. * Colour Chips turn yellow in bonus time. * Ideya! * Its own "drowning" music! * All of the object types for Dream Hill. * GIF: https://cdn.discordapp.com/attachments/400761370800422922/452844894113759233/srb20036.gif RANDOM BS: * Turn super with the spin button instead of the jump button! * Followmobj now correctly set with P_SetTarget instead of pointer assignment. * Emerald hunt uses new sprites! * Made unlock noise different from emblem gain noise! (It's the CRAWLA HONCHO CAN NOW TURN yadda yadda sound from S3K now.)
2018-06-03 21:41:54 +00:00
players[i].finishedspheres = READINT16(save_p);
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
players[i].finishedrings = READINT16(save_p);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
players[i].marescore = READUINT32(save_p);
players[i].lastmarescore = READUINT32(save_p);
totalmarescore player variable for NiGHTS scoring # Conflicts: # src/p_setup.c
2018-08-12 23:59:34 +00:00
players[i].totalmarescore = READUINT32(save_p);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
players[i].lastmare = READUINT8(save_p);
Add lastmarelap and lastmarebonuslap player variables
2018-08-10 20:30:49 +00:00
players[i].lastmarelap = READUINT8(save_p);
players[i].lastmarebonuslap = READUINT8(save_p);
totalmarelap and totalmarebonuslap player variables
2018-08-12 23:57:33 +00:00
players[i].totalmarelap = READUINT8(save_p);
players[i].totalmarebonuslap = READUINT8(save_p);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
players[i].maxlink = READINT32(save_p);
players[i].texttimer = READUINT8(save_p);
players[i].textvar = READUINT8(save_p);
players[i].lastsidehit = READINT16(save_p);
players[i].lastlinehit = READINT16(save_p);
players[i].losstime = READUINT32(save_p);
players[i].timeshit = READUINT8(save_p);
players[i].onconveyor = READINT32(save_p);
players[i].jointime = READUINT32(save_p);
Let clients rejoin the server without losing their status This is accomplished by simply preserving the player's body after disconnecting. Bodies will despawn after the number of minutes specified by the "rejointimeout" console variable (float). A value of 0 disables the feature completely. Clients rejoining are identified by their IP address, and may rejoin even if the server is full or joins are disabled, for as long as their body remains. From a technical standpoint, when the user disconnects, the player they were controlling does not leave, the underlying player_t just keeps working normally, except it does not receive any input anymore. When the user reconnects, they are simply "relinked" to their player_t. Those "soulless" players can be identified through their "quittime" field, which is the number of tics elapsed since the user disconnected, or zero if still connected. "quittime" is exposed to Lua.
2020-01-22 02:05:08 +00:00
players[i].quittime = READUINT32(save_p);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
flags = READUINT16(save_p);
if (flags & CAPSULE)
players[i].capsule = (mobj_t *)(size_t)READUINT32(save_p);
if (flags & FIRSTAXIS)
players[i].axis1 = (mobj_t *)(size_t)READUINT32(save_p);
if (flags & SECONDAXIS)
players[i].axis2 = (mobj_t *)(size_t)READUINT32(save_p);
if (flags & AWAYVIEW)
players[i].awayviewmobj = (mobj_t *)(size_t)READUINT32(save_p);
Smiles follow-mobj initial support! Still using a Lua hook to follow closely behind, but now it doesn't need to be a generic thinkframe. Woo!
2017-10-02 13:08:58 +00:00
if (flags & FOLLOW)
players[i].followmobj = (mobj_t *)(size_t)READUINT32(save_p);
Basic implementation for player position correction to Drone center * player->drone mobj variable * P_MoveNiGHTSToDrone, will change later
2018-08-10 23:25:49 +00:00
if (flags & DRONE)
players[i].drone = (mobj_t *)(size_t)READUINT32(save_p);
* Skin-controlled radius is no longer set each tic, only on skin change and player spawn. * Camerascale, shieldscale, height and spinheight are now player attributes which are set to the skin attribute on skin change, not read directly from the skin. * P_GetPlayerHeight and P_GetPlayerSpinHeight are now macros instead of functions. * Extra protection against switching to a locked skin.
2016-09-25 17:21:52 +00:00
players[i].camerascale = READFIXED(save_p);
players[i].shieldscale = READFIXED(save_p);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
//SetPlayerSkinByNum(i, players[i].skin);
players[i].charability = READUINT8(save_p);
players[i].charability2 = READUINT8(save_p);
players[i].charflags = READUINT32(save_p);
players[i].thokitem = (mobjtype_t)READUINT32(save_p);
players[i].spinitem = (mobjtype_t)READUINT32(save_p);
players[i].revitem = (mobjtype_t)READUINT32(save_p);
Smiles follow-mobj initial support! Still using a Lua hook to follow closely behind, but now it doesn't need to be a generic thinkframe. Woo!
2017-10-02 13:08:58 +00:00
players[i].followitem = (mobjtype_t)READUINT32(save_p);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
players[i].actionspd = READFIXED(save_p);
players[i].mindash = READFIXED(save_p);
SRB2 2.1.2 release
2014-03-17 12:13:16 +00:00
players[i].maxdash = READFIXED(save_p);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
players[i].normalspeed = READFIXED(save_p);
players[i].runspeed = READFIXED(save_p);
players[i].thrustfactor = READUINT8(save_p);
players[i].accelstart = READUINT8(save_p);
players[i].acceleration = READUINT8(save_p);
players[i].jumpfactor = READFIXED(save_p);
* Skin-controlled radius is no longer set each tic, only on skin change and player spawn. * Camerascale, shieldscale, height and spinheight are now player attributes which are set to the skin attribute on skin change, not read directly from the skin. * P_GetPlayerHeight and P_GetPlayerSpinHeight are now macros instead of functions. * Extra protection against switching to a locked skin.
2016-09-25 17:21:52 +00:00
players[i].height = READFIXED(save_p);
players[i].spinheight = READFIXED(save_p);
Fix unmatched readfixed (by replacing).
2017-11-02 19:38:21 +00:00
players[i].viewheight = 41*players[i].height/48; // scale cannot be factored in at this point
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
}
Streamlined colormap netsyncing so duplicates are not saved to $$$.sav per sector
2018-09-17 00:02:29 +00:00
///
/// Colormaps
///
static extracolormap_t *net_colormaps = NULL;
static UINT32 num_net_colormaps = 0;
Colormap netsync: Count ffloors for colormap loading upper limit
2018-09-17 14:38:09 +00:00
static UINT32 num_ffloors = 0; // for loading
Streamlined colormap netsyncing so duplicates are not saved to $$$.sav per sector
2018-09-17 00:02:29 +00:00
// Copypasta from r_data.c AddColormapToList
// But also check for equality and return the matching index
static UINT32 CheckAddNetColormapToList(extracolormap_t *extra_colormap)
Split colormap netsync to Load/SaveExtraColormap methods
2018-09-12 02:44:31 +00:00
{
VC build fixes
2018-11-21 02:54:20 +00:00
extracolormap_t *exc, *exc_prev = NULL;
Streamlined colormap netsyncing so duplicates are not saved to $$$.sav per sector
2018-09-17 00:02:29 +00:00
UINT32 i = 0;
Colormap savegame failsafe - Handle NULL (default colormap)
2018-09-12 15:01:12 +00:00
Streamlined colormap netsyncing so duplicates are not saved to $$$.sav per sector
2018-09-17 00:02:29 +00:00
if (!net_colormaps)
{
New colormap netsync fixes
2018-09-17 02:41:08 +00:00
net_colormaps = R_CopyColormap(extra_colormap, false);
Streamlined colormap netsyncing so duplicates are not saved to $$$.sav per sector
2018-09-17 00:02:29 +00:00
net_colormaps->next = 0;
net_colormaps->prev = 0;
New colormap netsync fixes
2018-09-17 02:41:08 +00:00
num_net_colormaps = i+1;
Streamlined colormap netsyncing so duplicates are not saved to $$$.sav per sector
2018-09-17 00:02:29 +00:00
return i;
}
Split colormap netsync to Load/SaveExtraColormap methods
2018-09-12 02:44:31 +00:00
New colormap netsync fixes
2018-09-17 02:41:08 +00:00
for (exc = net_colormaps; exc; exc_prev = exc, exc = exc->next)
Streamlined colormap netsyncing so duplicates are not saved to $$$.sav per sector
2018-09-17 00:02:29 +00:00
{
if (R_CheckEqualColormaps(exc, extra_colormap, true, true, true))
return i;
i++;
}
Split colormap netsync to Load/SaveExtraColormap methods
2018-09-12 02:44:31 +00:00
New colormap netsync fixes
2018-09-17 02:41:08 +00:00
exc_prev->next = R_CopyColormap(extra_colormap, false);
extra_colormap->prev = exc_prev;
Streamlined colormap netsyncing so duplicates are not saved to $$$.sav per sector
2018-09-17 00:02:29 +00:00
extra_colormap->next = 0;
New colormap netsync fixes
2018-09-17 02:41:08 +00:00
num_net_colormaps = i+1;
Streamlined colormap netsyncing so duplicates are not saved to $$$.sav per sector
2018-09-17 00:02:29 +00:00
return i;
Split colormap netsync to Load/SaveExtraColormap methods
2018-09-12 02:44:31 +00:00
}
Streamlined colormap netsyncing so duplicates are not saved to $$$.sav per sector
2018-09-17 00:02:29 +00:00
static extracolormap_t *GetNetColormapFromList(UINT32 index)
Split colormap netsync to Load/SaveExtraColormap methods
2018-09-12 02:44:31 +00:00
{
Streamlined colormap netsyncing so duplicates are not saved to $$$.sav per sector
2018-09-17 00:02:29 +00:00
// For loading, we have to be tricky:
// We load the sectors BEFORE knowing the colormap values
// So if an index doesn't exist, fill our list with dummy colormaps
// until we get the index we want
// Then when we load the color data, we set up the dummy colormaps
Split colormap netsync to Load/SaveExtraColormap methods
2018-09-12 02:44:31 +00:00
Streamlined colormap netsyncing so duplicates are not saved to $$$.sav per sector
2018-09-17 00:02:29 +00:00
extracolormap_t *exc, *last_exc = NULL;
UINT32 i = 0;
Split colormap netsync to Load/SaveExtraColormap methods
2018-09-12 02:44:31 +00:00
New colormap netsync fixes
2018-09-17 02:41:08 +00:00
if (!net_colormaps) // initialize our list
net_colormaps = R_CreateDefaultColormap(false);
Streamlined colormap netsyncing so duplicates are not saved to $$$.sav per sector
2018-09-17 00:02:29 +00:00
for (exc = net_colormaps; exc; last_exc = exc, exc = exc->next)
{
if (i++ == index)
return exc;
}
Split colormap netsync to Load/SaveExtraColormap methods
2018-09-12 02:44:31 +00:00
New colormap netsync fixes
2018-09-17 02:41:08 +00:00
// LET'S HOPE that index is a sane value, because we create up to [index]
// entries in net_colormaps. At this point, we don't know
// what the total colormap count is
Colormap netsync: Count ffloors for colormap loading upper limit
2018-09-17 14:38:09 +00:00
if (index >= numsectors*3 + num_ffloors)
// if every sector had a unique colormap change AND a fade color thinker which has two colormap entries
// AND every ffloor had a fade FOF thinker with one colormap entry
Colormap netsync: String format numsectors to UINT32 (thanks buildbot)
2018-09-17 12:05:51 +00:00
I_Error("Colormap %d from server is too high for sectors %d", index, (UINT32)numsectors);
New colormap netsync fixes
2018-09-17 02:41:08 +00:00
Streamlined colormap netsyncing so duplicates are not saved to $$$.sav per sector
2018-09-17 00:02:29 +00:00
// our index doesn't exist, so just make the entry
New colormap netsync fixes
2018-09-17 02:41:08 +00:00
for (; i <= index; i++)
Streamlined colormap netsyncing so duplicates are not saved to $$$.sav per sector
2018-09-17 00:02:29 +00:00
{
exc = R_CreateDefaultColormap(false);
if (last_exc)
last_exc->next = exc;
exc->prev = last_exc;
exc->next = NULL;
last_exc = exc;
}
return exc;
}
static void ClearNetColormaps(void)
{
// We're actually Z_Freeing each entry here,
// so don't call this in P_NetUnArchiveColormaps (where entries will be used in-game)
extracolormap_t *exc, *exc_next;
for (exc = net_colormaps; exc; exc = exc_next)
{
exc_next = exc->next;
Z_Free(exc);
}
num_net_colormaps = 0;
Colormap netsync: Count ffloors for colormap loading upper limit
2018-09-17 14:38:09 +00:00
num_ffloors = 0;
Streamlined colormap netsyncing so duplicates are not saved to $$$.sav per sector
2018-09-17 00:02:29 +00:00
net_colormaps = NULL;
}
New colormap netsync fixes
2018-09-17 02:41:08 +00:00
static void P_NetArchiveColormaps(void)
Streamlined colormap netsyncing so duplicates are not saved to $$$.sav per sector
2018-09-17 00:02:29 +00:00
{
// We save and then we clean up our colormap mess
extracolormap_t *exc, *exc_next;
New colormap netsync fixes
2018-09-17 02:41:08 +00:00
UINT32 i = 0;
Streamlined colormap netsyncing so duplicates are not saved to $$$.sav per sector
2018-09-17 00:02:29 +00:00
WRITEUINT32(save_p, num_net_colormaps); // save for safety
New colormap netsync fixes
2018-09-17 02:41:08 +00:00
for (exc = net_colormaps; i < num_net_colormaps; i++, exc = exc_next)
Streamlined colormap netsyncing so duplicates are not saved to $$$.sav per sector
2018-09-17 00:02:29 +00:00
{
New colormap netsync fixes
2018-09-17 02:41:08 +00:00
// We must save num_net_colormaps worth of data
// So fill non-existent entries with default.
if (!exc)
exc = R_CreateDefaultColormap(false);
Streamlined colormap netsyncing so duplicates are not saved to $$$.sav per sector
2018-09-17 00:02:29 +00:00
WRITEUINT8(save_p, exc->fadestart);
WRITEUINT8(save_p, exc->fadeend);
Clean up the mess that is extracolormap_t::fog
2020-02-16 19:19:24 +00:00
WRITEUINT8(save_p, exc->flags);
Split colormap netsync to Load/SaveExtraColormap methods
2018-09-12 02:44:31 +00:00
Streamlined colormap netsyncing so duplicates are not saved to $$$.sav per sector
2018-09-17 00:02:29 +00:00
WRITEINT32(save_p, exc->rgba);
WRITEINT32(save_p, exc->fadergba);
#ifdef EXTRACOLORMAPLUMPS
WRITESTRINGN(save_p, exc->lumpname, 9);
Split colormap netsync to Load/SaveExtraColormap methods
2018-09-12 02:44:31 +00:00
#endif
Streamlined colormap netsyncing so duplicates are not saved to $$$.sav per sector
2018-09-17 00:02:29 +00:00
exc_next = exc->next;
Z_Free(exc); // don't need anymore
}
num_net_colormaps = 0;
Colormap netsync: Count ffloors for colormap loading upper limit
2018-09-17 14:38:09 +00:00
num_ffloors = 0;
New colormap netsync fixes
2018-09-17 02:41:08 +00:00
net_colormaps = NULL;
Streamlined colormap netsyncing so duplicates are not saved to $$$.sav per sector
2018-09-17 00:02:29 +00:00
}
New colormap netsync fixes
2018-09-17 02:41:08 +00:00
static void P_NetUnArchiveColormaps(void)
Streamlined colormap netsyncing so duplicates are not saved to $$$.sav per sector
2018-09-17 00:02:29 +00:00
{
// When we reach this point, we already populated our list with
// dummy colormaps. Now that we are loading the color data,
// set up the dummies.
New colormap netsync fixes
2018-09-17 02:41:08 +00:00
extracolormap_t *exc, *existing_exc, *exc_next = NULL;
UINT32 i = 0;
Streamlined colormap netsyncing so duplicates are not saved to $$$.sav per sector
2018-09-17 00:02:29 +00:00
Colormap netsync: Mixed D+C fixes
2018-09-17 04:26:58 +00:00
num_net_colormaps = READUINT32(save_p);
New colormap netsync fixes
2018-09-17 02:41:08 +00:00
for (exc = net_colormaps; i < num_net_colormaps; i++, exc = exc_next)
Split colormap netsync to Load/SaveExtraColormap methods
2018-09-12 02:44:31 +00:00
{
Clean up the mess that is extracolormap_t::fog
2020-02-16 19:19:24 +00:00
UINT8 fadestart, fadeend, flags;
New colormap netsync fixes
2018-09-17 02:41:08 +00:00
INT32 rgba, fadergba;
#ifdef EXTRACOLORMAPLUMPS
char lumpname[9];
#endif
fadestart = READUINT8(save_p);
fadeend = READUINT8(save_p);
Clean up the mess that is extracolormap_t::fog
2020-02-16 19:19:24 +00:00
flags = READUINT8(save_p);
Streamlined colormap netsyncing so duplicates are not saved to $$$.sav per sector
2018-09-17 00:02:29 +00:00
New colormap netsync fixes
2018-09-17 02:41:08 +00:00
rgba = READINT32(save_p);
fadergba = READINT32(save_p);
Split colormap netsync to Load/SaveExtraColormap methods
2018-09-12 02:44:31 +00:00
Streamlined colormap netsyncing so duplicates are not saved to $$$.sav per sector
2018-09-17 00:02:29 +00:00
#ifdef EXTRACOLORMAPLUMPS
READSTRINGN(save_p, lumpname, 9);
if (lumpname[0])
{
New colormap netsync fixes
2018-09-17 02:41:08 +00:00
if (!exc)
// no point making a new entry since nothing points to it,
// but we needed to read the data so now continue
continue;
exc_next = exc->next; // this gets overwritten during our operations here, so get it now
Streamlined colormap netsyncing so duplicates are not saved to $$$.sav per sector
2018-09-17 00:02:29 +00:00
existing_exc = R_ColormapForName(lumpname);
*exc = *existing_exc;
R_AddColormapToList(exc); // see HACK note below on why we're adding duplicates
continue;
}
#endif
Split colormap netsync to Load/SaveExtraColormap methods
2018-09-12 02:44:31 +00:00
New colormap netsync fixes
2018-09-17 02:41:08 +00:00
if (!exc)
// no point making a new entry since nothing points to it,
// but we needed to read the data so now continue
continue;
exc_next = exc->next; // this gets overwritten during our operations here, so get it now
Split colormap netsync to Load/SaveExtraColormap methods
2018-09-12 02:44:31 +00:00
exc->fadestart = fadestart;
exc->fadeend = fadeend;
Clean up the mess that is extracolormap_t::fog
2020-02-16 19:19:24 +00:00
exc->flags = flags;
Split colormap netsync to Load/SaveExtraColormap methods
2018-09-12 02:44:31 +00:00
exc->rgba = rgba;
exc->fadergba = fadergba;
#ifdef EXTRACOLORMAPLUMPS
exc->lump = LUMPERROR;
exc->lumpname[0] = 0;
#endif
Colormap savegame failsafe - Handle NULL (default colormap)
2018-09-12 15:01:12 +00:00
Clean up the mess that is extracolormap_t::fog
2020-02-16 19:19:24 +00:00
existing_exc = R_GetColormapFromListByValues(rgba, fadergba, fadestart, fadeend, flags);
Streamlined colormap netsyncing so duplicates are not saved to $$$.sav per sector
2018-09-17 00:02:29 +00:00
if (existing_exc)
exc->colormap = existing_exc->colormap;
Colormap savegame failsafe - Handle NULL (default colormap)
2018-09-12 15:01:12 +00:00
else
Streamlined colormap netsyncing so duplicates are not saved to $$$.sav per sector
2018-09-17 00:02:29 +00:00
// CONS_Debug(DBG_RENDER, "Creating Colormap: rgba(%d,%d,%d,%d) fadergba(%d,%d,%d,%d)\n",
// R_GetRgbaR(rgba), R_GetRgbaG(rgba), R_GetRgbaB(rgba), R_GetRgbaA(rgba),
// R_GetRgbaR(fadergba), R_GetRgbaG(fadergba), R_GetRgbaB(fadergba), R_GetRgbaA(fadergba));
exc->colormap = R_CreateLightTable(exc);
// HACK: If this dummy is a duplicate, we're going to add it
// to the extra_colormaps list anyway. I think this is faster
// than going through every loaded sector and correcting their
// colormap address to the pre-existing one, PER net_colormap entry
R_AddColormapToList(exc);
New colormap netsync fixes
2018-09-17 02:41:08 +00:00
if (i < num_net_colormaps-1 && !exc_next)
exc_next = R_CreateDefaultColormap(false);
Split colormap netsync to Load/SaveExtraColormap methods
2018-09-12 02:44:31 +00:00
}
Colormap netsync: Handle unaccounted dummy colormaps properly
2018-09-17 14:24:55 +00:00
// if we still have a valid net_colormap after iterating up to num_net_colormaps,
// some sector had a colormap index higher than num_net_colormaps. We done goofed or $$$ was corrupted.
// In any case, add them to the colormap list too so that at least the sectors' colormap
// addresses are valid and accounted properly
if (exc_next)
{
existing_exc = R_GetDefaultColormap();
for (exc = exc_next; exc; exc = exc->next)
{
exc->colormap = existing_exc->colormap; // all our dummies are default values
R_AddColormapToList(exc);
}
}
Streamlined colormap netsyncing so duplicates are not saved to $$$.sav per sector
2018-09-17 00:02:29 +00:00
// Don't need these anymore
num_net_colormaps = 0;
Colormap netsync: Count ffloors for colormap loading upper limit
2018-09-17 14:38:09 +00:00
num_ffloors = 0;
Streamlined colormap netsyncing so duplicates are not saved to $$$.sav per sector
2018-09-17 00:02:29 +00:00
net_colormaps = NULL;
Split colormap netsync to Load/SaveExtraColormap methods
2018-09-12 02:44:31 +00:00
}
Netsync waypoint sequences
2020-05-31 20:44:25 +00:00
static void P_NetArchiveWaypoints(void)
{
INT32 i, j;
for (i = 0; i < NUMWAYPOINTSEQUENCES; i++)
{
WRITEUINT16(save_p, numwaypoints[i]);
for (j = 0; j < numwaypoints[i]; j++)
Use 0 instead of 0xffff as dummy mobjnum
2020-05-31 20:58:14 +00:00
WRITEUINT32(save_p, waypoints[i][j] ? waypoints[i][j]->mobjnum : 0);
Netsync waypoint sequences
2020-05-31 20:44:25 +00:00
}
}
static void P_NetUnArchiveWaypoints(void)
{
INT32 i, j;
UINT32 mobjnum;
for (i = 0; i < NUMWAYPOINTSEQUENCES; i++)
{
numwaypoints[i] = READUINT16(save_p);
for (j = 0; j < numwaypoints[i]; j++)
{
mobjnum = READUINT32(save_p);
Use 0 instead of 0xffff as dummy mobjnum
2020-05-31 20:58:14 +00:00
waypoints[i][j] = (mobjnum == 0) ? NULL : P_FindNewPosition(mobjnum);
Netsync waypoint sequences
2020-05-31 20:44:25 +00:00
}
}
}
Streamlined colormap netsyncing so duplicates are not saved to $$$.sav per sector
2018-09-17 00:02:29 +00:00
///
/// World Archiving
///
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
#define SD_FLOORHT 0x01
#define SD_CEILHT 0x02
#define SD_FLOORPIC 0x04
#define SD_CEILPIC 0x08
#define SD_LIGHT 0x10
#define SD_SPECIAL 0x20
#define SD_DIFF2 0x40
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
#define SD_FFLOORS 0x80
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// diff2 flags
#define SD_FXOFFS 0x01
#define SD_FYOFFS 0x02
#define SD_CXOFFS 0x04
#define SD_CYOFFS 0x08
Savegame netsync for sector colormaps; add spawn_midmap and co for comparison
2018-09-09 16:01:50 +00:00
#define SD_FLOORANG 0x10
#define SD_CEILANG 0x20
#define SD_TAG 0x40
#define SD_DIFF3 0x80
// diff3 flags
Serialize sector portals
2023-08-24 19:04:31 +00:00
#define SD_TAGLIST 0x01
#define SD_COLORMAP 0x02
These are flags! Serves me right for just rushing this out
2020-04-24 15:53:54 +00:00
#define SD_CRUMBLESTATE 0x04
Serialize sector portals
2023-08-24 19:04:31 +00:00
#define SD_FLOORLIGHT 0x08
#define SD_CEILLIGHT 0x10
#define SD_FLAG 0x20
#define SD_SPECIALFLAG 0x40
#define SD_DIFF4 0x80
Implement sector damagetype field
2021-12-31 07:53:00 +00:00
Merge branch 'next' into sector-portals
2023-12-28 02:46:16 +00:00
// diff4 flags
Implement sector damagetype field
2021-12-31 07:53:00 +00:00
#define SD_DAMAGETYPE 0x01
Implement sector fields for linedef executor triggering
2021-12-31 10:39:34 +00:00
#define SD_TRIGGERTAG 0x02
#define SD_TRIGGERER 0x04
Merge branch 'next' into sector-portals
2023-12-28 02:46:16 +00:00
#define SD_FXSCALE 0x08
#define SD_FYSCALE 0x10
#define SD_CXSCALE 0x20
#define SD_CYSCALE 0x40
#define SD_DIFF5 0x80
// diff5 flags
#define SD_GRAVITY 0x01
#define SD_FLOORPORTAL 0x02
#define SD_CEILPORTAL 0x04
// diff1 flags
Serialize new side fields
2023-11-24 00:56:18 +00:00
#define LD_FLAG 0x01
#define LD_SPECIAL 0x02
#define LD_CLLCOUNT 0x04
#define LD_ARGS 0x08
#define LD_STRINGARGS 0x10
Merge branch 'next' into sector-portals
2023-12-28 02:46:16 +00:00
#define LD_SIDE1 0x20
#define LD_SIDE2 0x40
#define LD_DIFF2 0x80
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// diff2 flags
Merge branch 'next' into sector-portals
2023-12-28 02:46:16 +00:00
#define LD_EXECUTORDELAY 0x01
#define LD_TRANSFPORTAL 0x02
Serialize new side fields
2023-11-24 00:56:18 +00:00
// sidedef flags
enum
{
LD_SDTEXOFFX = 1,
LD_SDTEXOFFY = 1<<1,
LD_SDTOPTEX = 1<<2,
LD_SDBOTTEX = 1<<3,
LD_SDMIDTEX = 1<<4,
LD_SDTOPOFFX = 1<<5,
LD_SDTOPOFFY = 1<<6,
LD_SDMIDOFFX = 1<<7,
LD_SDMIDOFFY = 1<<8,
LD_SDBOTOFFX = 1<<9,
LD_SDBOTOFFY = 1<<10,
LD_SDTOPSCALEX = 1<<11,
LD_SDTOPSCALEY = 1<<12,
LD_SDMIDSCALEX = 1<<13,
LD_SDMIDSCALEY = 1<<14,
LD_SDBOTSCALEX = 1<<15,
LD_SDBOTSCALEY = 1<<16,
LD_SDLIGHT = 1<<17,
LD_SDTOPLIGHT = 1<<18,
LD_SDMIDLIGHT = 1<<19,
LD_SDBOTLIGHT = 1<<20,
LD_SDREPEATCNT = 1<<21,
Per-wall lighting
2024-06-12 12:25:45 +00:00
LD_SDFLAGS = 1<<22,
LD_SDLIGHTABS = 1<<23,
LD_SDTOPLIGHTABS = 1<<24,
LD_SDMIDLIGHTABS = 1<<25,
LD_SDBOTLIGHTABS = 1<<26
Serialize new side fields
2023-11-24 00:56:18 +00:00
};
Implement linedef string arguments
2020-01-08 07:42:35 +00:00
static boolean P_AreArgsEqual(const line_t *li, const line_t *spawnli)
Implement linedef args (unused and untested so far)
2020-01-02 11:23:14 +00:00
{
UINT8 i;
for (i = 0; i < NUMLINEARGS; i++)
Implement linedef string arguments
2020-01-08 07:42:35 +00:00
if (li->args[i] != spawnli->args[i])
return false;
return true;
}
static boolean P_AreStringArgsEqual(const line_t *li, const line_t *spawnli)
{
UINT8 i;
for (i = 0; i < NUMLINESTRINGARGS; i++)
Fix NULL pointer crash involving stringargs
2020-04-18 10:23:01 +00:00
{
if (!li->stringargs[i])
return !spawnli->stringargs[i];
Implement linedef string arguments
2020-01-08 07:42:35 +00:00
if (strcmp(li->stringargs[i], spawnli->stringargs[i]))
Implement linedef args (unused and untested so far)
2020-01-02 11:23:14 +00:00
return false;
Fix NULL pointer crash involving stringargs
2020-04-18 10:23:01 +00:00
}
Implement linedef args (unused and untested so far)
2020-01-02 11:23:14 +00:00
return true;
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Split off FOF archiving-related code into their own functions
2020-04-24 19:26:57 +00:00
#define FD_FLAGS 0x01
#define FD_ALPHA 0x02
// Check if any of the sector's FOFs differ from how they spawned
Don't discard const, added missing &
2020-04-29 14:24:28 +00:00
static boolean CheckFFloorDiff(const sector_t *ss)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Split off FOF archiving-related code into their own functions
2020-04-24 19:26:57 +00:00
ffloor_t *rover;
for (rover = ss->ffloors; rover; rover = rover->next)
{
Add Lua backwards compatibility for FOF flags
2022-07-31 10:04:42 +00:00
if (rover->fofflags != rover->spawnflags
Split off FOF archiving-related code into their own functions
2020-04-24 19:26:57 +00:00
|| rover->alpha != rover->spawnalpha)
{
return true; // we found an FOF that changed!
// don't bother checking for more, we do that later
}
}
return false;
}
// Special case: save the stats of all modified ffloors along with their ffloor "number"s
// we don't bother with ffloors that haven't changed, that would just add to savegame even more than is really needed
Don't discard const, added missing &
2020-04-29 14:24:28 +00:00
static void ArchiveFFloors(const sector_t *ss)
Split off FOF archiving-related code into their own functions
2020-04-24 19:26:57 +00:00
{
size_t j = 0; // ss->ffloors is saved as ffloor #0, ss->ffloors->next is #1, etc
ffloor_t *rover;
UINT8 fflr_diff;
for (rover = ss->ffloors; rover; rover = rover->next)
{
fflr_diff = 0; // reset diff flags
Add Lua backwards compatibility for FOF flags
2022-07-31 10:04:42 +00:00
if (rover->fofflags != rover->spawnflags)
Split off FOF archiving-related code into their own functions
2020-04-24 19:26:57 +00:00
fflr_diff |= FD_FLAGS;
if (rover->alpha != rover->spawnalpha)
fflr_diff |= FD_ALPHA;
if (fflr_diff)
{
we don't actually need put/get pointers at all (plus with everything put into functions they wouldn't work properly anyway)
2020-04-24 19:57:48 +00:00
WRITEUINT16(save_p, j); // save ffloor "number"
WRITEUINT8(save_p, fflr_diff);
Split off FOF archiving-related code into their own functions
2020-04-24 19:26:57 +00:00
if (fflr_diff & FD_FLAGS)
Add Lua backwards compatibility for FOF flags
2022-07-31 10:04:42 +00:00
WRITEUINT32(save_p, rover->fofflags);
Split off FOF archiving-related code into their own functions
2020-04-24 19:26:57 +00:00
if (fflr_diff & FD_ALPHA)
we don't actually need put/get pointers at all (plus with everything put into functions they wouldn't work properly anyway)
2020-04-24 19:57:48 +00:00
WRITEINT16(save_p, rover->alpha);
Split off FOF archiving-related code into their own functions
2020-04-24 19:26:57 +00:00
}
j++;
}
we don't actually need put/get pointers at all (plus with everything put into functions they wouldn't work properly anyway)
2020-04-24 19:57:48 +00:00
WRITEUINT16(save_p, 0xffff);
Split off FOF archiving-related code into their own functions
2020-04-24 19:26:57 +00:00
}
Don't discard const, added missing &
2020-04-29 14:24:28 +00:00
static void UnArchiveFFloors(const sector_t *ss)
Split off FOF archiving-related code into their own functions
2020-04-24 19:26:57 +00:00
{
UINT16 j = 0; // number of current ffloor in loop
UINT16 fflr_i; // saved ffloor "number" of next modified ffloor
UINT16 fflr_diff; // saved ffloor diff
ffloor_t *rover;
rover = ss->ffloors;
if (!rover) // it is assumed sectors[i].ffloors actually exists, but just in case...
I_Error("Sector does not have any ffloors!");
we don't actually need put/get pointers at all (plus with everything put into functions they wouldn't work properly anyway)
2020-04-24 19:57:48 +00:00
fflr_i = READUINT16(save_p); // get first modified ffloor's number ready
Split off FOF archiving-related code into their own functions
2020-04-24 19:26:57 +00:00
for (;;) // for some reason the usual for (rover = x; ...) thing doesn't work here?
{
if (fflr_i == 0xffff) // end of modified ffloors list, let's stop already
break;
// should NEVER need to be checked
//if (rover == NULL)
//break;
if (j != fflr_i) // this ffloor was not modified
{
j++;
rover = rover->next;
continue;
}
we don't actually need put/get pointers at all (plus with everything put into functions they wouldn't work properly anyway)
2020-04-24 19:57:48 +00:00
fflr_diff = READUINT8(save_p);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Split off FOF archiving-related code into their own functions
2020-04-24 19:26:57 +00:00
if (fflr_diff & FD_FLAGS)
Add Lua backwards compatibility for FOF flags
2022-07-31 10:04:42 +00:00
rover->fofflags = READUINT32(save_p);
Split off FOF archiving-related code into their own functions
2020-04-24 19:26:57 +00:00
if (fflr_diff & FD_ALPHA)
we don't actually need put/get pointers at all (plus with everything put into functions they wouldn't work properly anyway)
2020-04-24 19:57:48 +00:00
rover->alpha = READINT16(save_p);
Split off FOF archiving-related code into their own functions
2020-04-24 19:26:57 +00:00
we don't actually need put/get pointers at all (plus with everything put into functions they wouldn't work properly anyway)
2020-04-24 19:57:48 +00:00
fflr_i = READUINT16(save_p); // get next ffloor "number" ready
Split off FOF archiving-related code into their own functions
2020-04-24 19:26:57 +00:00
j++;
rover = rover->next;
}
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
we don't actually need put/get pointers at all (plus with everything put into functions they wouldn't work properly anyway)
2020-04-24 19:57:48 +00:00
static void ArchiveSectors(void)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Merge branch 'udmf-next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-multitag # Conflicts: # src/hardware/hw_main.c # src/p_ceilng.c # src/p_floor.c # src/p_mobj.c # src/p_mobj.h # src/p_polyobj.c # src/p_saveg.c # src/p_setup.c # src/p_spec.c # src/p_spec.h # src/p_user.c # src/r_bsp.c # src/r_defs.h
2020-07-10 14:51:11 +00:00
size_t i, j;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
const sector_t *ss = sectors;
Remove redundant netarchive-related sector vars as they're not used anymore. Replace lump-based difference checks for sectors in P_NetArchiveWorld(), now it uses the mapload-created copy instead.
2019-12-23 11:42:38 +00:00
const sector_t *spawnss = spawnsectors;
Merge branch 'next' into sector-portals
2023-12-28 02:46:16 +00:00
UINT8 diff, diff2, diff3, diff4, diff5;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Remove redundant netarchive-related sector vars as they're not used anymore. Replace lump-based difference checks for sectors in P_NetArchiveWorld(), now it uses the mapload-created copy instead.
2019-12-23 11:42:38 +00:00
for (i = 0; i < numsectors; i++, ss++, spawnss++)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Merge branch 'next' into sector-portals
2023-12-28 02:46:16 +00:00
diff = diff2 = diff3 = diff4 = diff5 = 0;
Remove redundant netarchive-related sector vars as they're not used anymore. Replace lump-based difference checks for sectors in P_NetArchiveWorld(), now it uses the mapload-created copy instead.
2019-12-23 11:42:38 +00:00
if (ss->floorheight != spawnss->floorheight)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
diff |= SD_FLOORHT;
Remove redundant netarchive-related sector vars as they're not used anymore. Replace lump-based difference checks for sectors in P_NetArchiveWorld(), now it uses the mapload-created copy instead.
2019-12-23 11:42:38 +00:00
if (ss->ceilingheight != spawnss->ceilingheight)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
diff |= SD_CEILHT;
//
// flats
//
Remove redundant netarchive-related sector vars as they're not used anymore. Replace lump-based difference checks for sectors in P_NetArchiveWorld(), now it uses the mapload-created copy instead.
2019-12-23 11:42:38 +00:00
if (ss->floorpic != spawnss->floorpic)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
diff |= SD_FLOORPIC;
Remove redundant netarchive-related sector vars as they're not used anymore. Replace lump-based difference checks for sectors in P_NetArchiveWorld(), now it uses the mapload-created copy instead.
2019-12-23 11:42:38 +00:00
if (ss->ceilingpic != spawnss->ceilingpic)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
diff |= SD_CEILPIC;
Remove redundant netarchive-related sector vars as they're not used anymore. Replace lump-based difference checks for sectors in P_NetArchiveWorld(), now it uses the mapload-created copy instead.
2019-12-23 11:42:38 +00:00
if (ss->lightlevel != spawnss->lightlevel)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
diff |= SD_LIGHT;
Remove redundant netarchive-related sector vars as they're not used anymore. Replace lump-based difference checks for sectors in P_NetArchiveWorld(), now it uses the mapload-created copy instead.
2019-12-23 11:42:38 +00:00
if (ss->special != spawnss->special)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
diff |= SD_SPECIAL;
c-side offset/angle variable renamed
2022-11-25 23:01:27 +00:00
if (ss->floorxoffset != spawnss->floorxoffset)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
diff2 |= SD_FXOFFS;
c-side offset/angle variable renamed
2022-11-25 23:01:27 +00:00
if (ss->flooryoffset != spawnss->flooryoffset)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
diff2 |= SD_FYOFFS;
c-side offset/angle variable renamed
2022-11-25 23:01:27 +00:00
if (ss->ceilingxoffset != spawnss->ceilingxoffset)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
diff2 |= SD_CXOFFS;
c-side offset/angle variable renamed
2022-11-25 23:01:27 +00:00
if (ss->ceilingyoffset != spawnss->ceilingyoffset)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
diff2 |= SD_CYOFFS;
Add sector texture scale fields
2023-11-24 04:52:57 +00:00
if (ss->floorxscale != spawnss->floorxscale)
diff2 |= SD_FXSCALE;
if (ss->flooryscale != spawnss->flooryscale)
diff2 |= SD_FYSCALE;
if (ss->ceilingxscale != spawnss->ceilingxscale)
diff2 |= SD_CXSCALE;
if (ss->ceilingyscale != spawnss->ceilingyscale)
diff2 |= SD_CYSCALE;
c-side offset/angle variable renamed
2022-11-25 23:01:27 +00:00
if (ss->floorangle != spawnss->floorangle)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
diff2 |= SD_FLOORANG;
c-side offset/angle variable renamed
2022-11-25 23:01:27 +00:00
if (ss->ceilingangle != spawnss->ceilingangle)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
diff2 |= SD_CEILANG;
Netsynch the sector local taglists.
2020-04-17 20:29:26 +00:00
if (!Tag_Compare(&ss->tags, &spawnss->tags))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
diff2 |= SD_TAG;
Merge remote-tracking branch 'origin/master' into colormap-overhaul
2018-09-12 21:28:22 +00:00
Remove redundant netarchive-related sector vars as they're not used anymore. Replace lump-based difference checks for sectors in P_NetArchiveWorld(), now it uses the mapload-created copy instead.
2019-12-23 11:42:38 +00:00
if (ss->extra_colormap != spawnss->extra_colormap)
extracolormap_t refinement and netsyncing * Store raw values per rgba in extracolormap_t (no maskcolor or fadecolor) * Crunched some UINT16/32 into UINT8 * Calculate mask values in R_CreateLightTable * ifdef out EXTRACOLORMAPLUMPS
2018-09-11 00:36:34 +00:00
diff3 |= SD_COLORMAP;
Sync crumblestate in netgames
2020-04-24 15:40:09 +00:00
if (ss->crumblestate)
diff3 |= SD_CRUMBLESTATE;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Netsync floor/ceiling lighting
2021-09-19 07:20:00 +00:00
if (ss->floorlightlevel != spawnss->floorlightlevel || ss->floorlightabsolute != spawnss->floorlightabsolute)
diff3 |= SD_FLOORLIGHT;
if (ss->ceilinglightlevel != spawnss->ceilinglightlevel || ss->ceilinglightabsolute != spawnss->ceilinglightabsolute)
diff3 |= SD_CEILLIGHT;
Netsync sector flags
2021-12-30 13:33:24 +00:00
if (ss->flags != spawnss->flags)
diff3 |= SD_FLAG;
Replace most sector specials with sector special flags
2021-12-30 23:03:24 +00:00
if (ss->specialflags != spawnss->specialflags)
diff3 |= SD_SPECIALFLAG;
Implement sector damagetype field
2021-12-31 07:53:00 +00:00
if (ss->damagetype != spawnss->damagetype)
diff4 |= SD_DAMAGETYPE;
Implement sector fields for linedef executor triggering
2021-12-31 10:39:34 +00:00
if (ss->triggertag != spawnss->triggertag)
diff4 |= SD_TRIGGERTAG;
if (ss->triggerer != spawnss->triggerer)
diff4 |= SD_TRIGGERER;
Add sector gravity field for UDMF
2021-12-30 17:19:42 +00:00
if (ss->gravity != spawnss->gravity)
Merge branch 'next' into sector-portals
2023-12-28 02:46:16 +00:00
diff5 |= SD_GRAVITY;
Serialize sector portals
2023-08-24 19:04:31 +00:00
if (ss->portal_floor != spawnss->portal_floor)
Merge branch 'next' into sector-portals
2023-12-28 02:46:16 +00:00
diff5 |= SD_FLOORPORTAL;
Serialize sector portals
2023-08-24 19:04:31 +00:00
if (ss->portal_ceiling != spawnss->portal_ceiling)
Merge branch 'next' into sector-portals
2023-12-28 02:46:16 +00:00
diff5 |= SD_CEILPORTAL;
Netsync floor/ceiling lighting
2021-09-19 07:20:00 +00:00
Split off FOF archiving-related code into their own functions
2020-04-24 19:26:57 +00:00
if (ss->ffloors && CheckFFloorDiff(ss))
diff |= SD_FFLOORS;
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
Merge branch 'next' into sector-portals
2023-12-28 02:46:16 +00:00
if (diff5)
diff4 |= SD_DIFF5;
Implement sector damagetype field
2021-12-31 07:53:00 +00:00
if (diff4)
diff3 |= SD_DIFF4;
Savegame netsync for sector colormaps; add spawn_midmap and co for comparison
2018-09-09 16:01:50 +00:00
if (diff3)
diff2 |= SD_DIFF3;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (diff2)
diff |= SD_DIFF2;
if (diff)
{
Raise sidedef limits Also, fixes reading of GL3 nodes to use 32-bit indices for line IDs.
2023-09-21 05:06:06 +00:00
WRITEUINT32(save_p, i);
we don't actually need put/get pointers at all (plus with everything put into functions they wouldn't work properly anyway)
2020-04-24 19:57:48 +00:00
WRITEUINT8(save_p, diff);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (diff & SD_DIFF2)
we don't actually need put/get pointers at all (plus with everything put into functions they wouldn't work properly anyway)
2020-04-24 19:57:48 +00:00
WRITEUINT8(save_p, diff2);
Savegame netsync for sector colormaps; add spawn_midmap and co for comparison
2018-09-09 16:01:50 +00:00
if (diff2 & SD_DIFF3)
we don't actually need put/get pointers at all (plus with everything put into functions they wouldn't work properly anyway)
2020-04-24 19:57:48 +00:00
WRITEUINT8(save_p, diff3);
Implement sector damagetype field
2021-12-31 07:53:00 +00:00
if (diff3 & SD_DIFF4)
WRITEUINT8(save_p, diff4);
Merge branch 'next' into sector-portals
2023-12-28 02:46:16 +00:00
if (diff4 & SD_DIFF5)
WRITEUINT8(save_p, diff5);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (diff & SD_FLOORHT)
we don't actually need put/get pointers at all (plus with everything put into functions they wouldn't work properly anyway)
2020-04-24 19:57:48 +00:00
WRITEFIXED(save_p, ss->floorheight);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (diff & SD_CEILHT)
we don't actually need put/get pointers at all (plus with everything put into functions they wouldn't work properly anyway)
2020-04-24 19:57:48 +00:00
WRITEFIXED(save_p, ss->ceilingheight);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (diff & SD_FLOORPIC)
we don't actually need put/get pointers at all (plus with everything put into functions they wouldn't work properly anyway)
2020-04-24 19:57:48 +00:00
WRITEMEM(save_p, levelflats[ss->floorpic].name, 8);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (diff & SD_CEILPIC)
we don't actually need put/get pointers at all (plus with everything put into functions they wouldn't work properly anyway)
2020-04-24 19:57:48 +00:00
WRITEMEM(save_p, levelflats[ss->ceilingpic].name, 8);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (diff & SD_LIGHT)
we don't actually need put/get pointers at all (plus with everything put into functions they wouldn't work properly anyway)
2020-04-24 19:57:48 +00:00
WRITEINT16(save_p, ss->lightlevel);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (diff & SD_SPECIAL)
we don't actually need put/get pointers at all (plus with everything put into functions they wouldn't work properly anyway)
2020-04-24 19:57:48 +00:00
WRITEINT16(save_p, ss->special);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (diff2 & SD_FXOFFS)
c-side offset/angle variable renamed
2022-11-25 23:01:27 +00:00
WRITEFIXED(save_p, ss->floorxoffset);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (diff2 & SD_FYOFFS)
c-side offset/angle variable renamed
2022-11-25 23:01:27 +00:00
WRITEFIXED(save_p, ss->flooryoffset);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (diff2 & SD_CXOFFS)
c-side offset/angle variable renamed
2022-11-25 23:01:27 +00:00
WRITEFIXED(save_p, ss->ceilingxoffset);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (diff2 & SD_CYOFFS)
c-side offset/angle variable renamed
2022-11-25 23:01:27 +00:00
WRITEFIXED(save_p, ss->ceilingyoffset);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (diff2 & SD_FLOORANG)
c-side offset/angle variable renamed
2022-11-25 23:01:27 +00:00
WRITEANGLE(save_p, ss->floorangle);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (diff2 & SD_CEILANG)
c-side offset/angle variable renamed
2022-11-25 23:01:27 +00:00
WRITEANGLE(save_p, ss->ceilingangle);
Netsynch the sector local taglists.
2020-04-17 20:29:26 +00:00
if (diff2 & SD_TAG)
{
Merge branch 'udmf-next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-multitag # Conflicts: # src/hardware/hw_main.c # src/p_ceilng.c # src/p_floor.c # src/p_mobj.c # src/p_mobj.h # src/p_polyobj.c # src/p_saveg.c # src/p_setup.c # src/p_spec.c # src/p_spec.h # src/p_user.c # src/r_bsp.c # src/r_defs.h
2020-07-10 14:51:11 +00:00
WRITEUINT32(save_p, ss->tags.count);
Netsynch the sector local taglists.
2020-04-17 20:29:26 +00:00
for (j = 0; j < ss->tags.count; j++)
Merge branch 'udmf-next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-multitag # Conflicts: # src/hardware/hw_main.c # src/p_ceilng.c # src/p_floor.c # src/p_mobj.c # src/p_mobj.h # src/p_polyobj.c # src/p_saveg.c # src/p_setup.c # src/p_spec.c # src/p_spec.h # src/p_user.c # src/r_bsp.c # src/r_defs.h
2020-07-10 14:51:11 +00:00
WRITEINT16(save_p, ss->tags.tags[j]);
Sync sector tags and tag list variables properly Dunno who thought it was a good idea to lump tag, nexttag and firsttag together in $$$.sav, but that meant changing sector tags caused SRB2 to stop responding since it lead to the tag lists being broken
2017-01-03 20:48:39 +00:00
}
extracolormap_t refinement and netsyncing * Store raw values per rgba in extracolormap_t (no maskcolor or fadecolor) * Crunched some UINT16/32 into UINT8 * Calculate mask values in R_CreateLightTable * ifdef out EXTRACOLORMAPLUMPS
2018-09-11 00:36:34 +00:00
if (diff3 & SD_COLORMAP)
we don't actually need put/get pointers at all (plus with everything put into functions they wouldn't work properly anyway)
2020-04-24 19:57:48 +00:00
WRITEUINT32(save_p, CheckAddNetColormapToList(ss->extra_colormap));
Streamlined colormap netsyncing so duplicates are not saved to $$$.sav per sector
2018-09-17 00:02:29 +00:00
// returns existing index if already added, or appends to net_colormaps and returns new index
Sync crumblestate in netgames
2020-04-24 15:40:09 +00:00
if (diff3 & SD_CRUMBLESTATE)
we don't actually need put/get pointers at all (plus with everything put into functions they wouldn't work properly anyway)
2020-04-24 19:57:48 +00:00
WRITEINT32(save_p, ss->crumblestate);
Netsync floor/ceiling lighting
2021-09-19 07:20:00 +00:00
if (diff3 & SD_FLOORLIGHT)
{
WRITEINT16(save_p, ss->floorlightlevel);
WRITEUINT8(save_p, ss->floorlightabsolute);
}
if (diff3 & SD_CEILLIGHT)
{
WRITEINT16(save_p, ss->ceilinglightlevel);
WRITEUINT8(save_p, ss->ceilinglightabsolute);
}
Netsync sector flags
2021-12-30 13:33:24 +00:00
if (diff3 & SD_FLAG)
WRITEUINT32(save_p, ss->flags);
Replace most sector specials with sector special flags
2021-12-30 23:03:24 +00:00
if (diff3 & SD_SPECIALFLAG)
WRITEUINT32(save_p, ss->specialflags);
Implement sector damagetype field
2021-12-31 07:53:00 +00:00
if (diff4 & SD_DAMAGETYPE)
WRITEUINT8(save_p, ss->damagetype);
Implement sector fields for linedef executor triggering
2021-12-31 10:39:34 +00:00
if (diff4 & SD_TRIGGERTAG)
WRITEINT16(save_p, ss->triggertag);
if (diff4 & SD_TRIGGERER)
WRITEUINT8(save_p, ss->triggerer);
Add sector texture scale fields
2023-11-24 04:52:57 +00:00
if (diff4 & SD_FXSCALE)
WRITEFIXED(save_p, ss->floorxscale);
if (diff4 & SD_FYSCALE)
WRITEFIXED(save_p, ss->flooryscale);
if (diff4 & SD_CXSCALE)
WRITEFIXED(save_p, ss->ceilingxscale);
if (diff4 & SD_CYSCALE)
WRITEFIXED(save_p, ss->ceilingyscale);
Merge branch 'next' into sector-portals
2023-12-28 02:46:16 +00:00
if (diff5 & SD_GRAVITY)
Add sector gravity field for UDMF
2021-12-30 17:19:42 +00:00
WRITEFIXED(save_p, ss->gravity);
Merge branch 'next' into sector-portals
2023-12-28 02:46:16 +00:00
if (diff5 & SD_FLOORPORTAL)
Serialize sector portals
2023-08-24 19:04:31 +00:00
WRITEUINT32(save_p, ss->portal_floor);
Merge branch 'next' into sector-portals
2023-12-28 02:46:16 +00:00
if (diff5 & SD_CEILPORTAL)
Serialize sector portals
2023-08-24 19:04:31 +00:00
WRITEUINT32(save_p, ss->portal_ceiling);
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
if (diff & SD_FFLOORS)
Whoops the third
2020-04-29 13:45:52 +00:00
ArchiveFFloors(ss);
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
Raise sidedef limits Also, fixes reading of GL3 nodes to use 32-bit indices for line IDs.
2023-09-21 05:06:06 +00:00
WRITEUINT32(save_p, 0xffffffff);
split sector/lines archiving-related code into their own functions too
2020-04-24 19:40:50 +00:00
}
we don't actually need put/get pointers at all (plus with everything put into functions they wouldn't work properly anyway)
2020-04-24 19:57:48 +00:00
static void UnArchiveSectors(void)
split sector/lines archiving-related code into their own functions too
2020-04-24 19:40:50 +00:00
{
Raise sidedef limits Also, fixes reading of GL3 nodes to use 32-bit indices for line IDs.
2023-09-21 05:06:06 +00:00
UINT32 i;
UINT16 j;
Merge branch 'next' into sector-portals
2023-12-28 02:46:16 +00:00
UINT8 diff, diff2, diff3, diff4, diff5;
split sector/lines archiving-related code into their own functions too
2020-04-24 19:40:50 +00:00
for (;;)
{
Raise sidedef limits Also, fixes reading of GL3 nodes to use 32-bit indices for line IDs.
2023-09-21 05:06:06 +00:00
i = READUINT32(save_p);
split sector/lines archiving-related code into their own functions too
2020-04-24 19:40:50 +00:00
Raise sidedef limits Also, fixes reading of GL3 nodes to use 32-bit indices for line IDs.
2023-09-21 05:06:06 +00:00
if (i == 0xffffffff)
split sector/lines archiving-related code into their own functions too
2020-04-24 19:40:50 +00:00
break;
if (i > numsectors)
I_Error("Invalid sector number %u from server (expected end at %s)", i, sizeu1(numsectors));
we don't actually need put/get pointers at all (plus with everything put into functions they wouldn't work properly anyway)
2020-04-24 19:57:48 +00:00
diff = READUINT8(save_p);
split sector/lines archiving-related code into their own functions too
2020-04-24 19:40:50 +00:00
if (diff & SD_DIFF2)
we don't actually need put/get pointers at all (plus with everything put into functions they wouldn't work properly anyway)
2020-04-24 19:57:48 +00:00
diff2 = READUINT8(save_p);
split sector/lines archiving-related code into their own functions too
2020-04-24 19:40:50 +00:00
else
diff2 = 0;
if (diff2 & SD_DIFF3)
we don't actually need put/get pointers at all (plus with everything put into functions they wouldn't work properly anyway)
2020-04-24 19:57:48 +00:00
diff3 = READUINT8(save_p);
split sector/lines archiving-related code into their own functions too
2020-04-24 19:40:50 +00:00
else
diff3 = 0;
Implement sector damagetype field
2021-12-31 07:53:00 +00:00
if (diff3 & SD_DIFF4)
diff4 = READUINT8(save_p);
else
diff4 = 0;
Merge branch 'next' into sector-portals
2023-12-28 02:46:16 +00:00
if (diff4 & SD_DIFF5)
diff5 = READUINT8(save_p);
else
diff5 = 0;
split sector/lines archiving-related code into their own functions too
2020-04-24 19:40:50 +00:00
if (diff & SD_FLOORHT)
we don't actually need put/get pointers at all (plus with everything put into functions they wouldn't work properly anyway)
2020-04-24 19:57:48 +00:00
sectors[i].floorheight = READFIXED(save_p);
split sector/lines archiving-related code into their own functions too
2020-04-24 19:40:50 +00:00
if (diff & SD_CEILHT)
we don't actually need put/get pointers at all (plus with everything put into functions they wouldn't work properly anyway)
2020-04-24 19:57:48 +00:00
sectors[i].ceilingheight = READFIXED(save_p);
split sector/lines archiving-related code into their own functions too
2020-04-24 19:40:50 +00:00
if (diff & SD_FLOORPIC)
{
we don't actually need put/get pointers at all (plus with everything put into functions they wouldn't work properly anyway)
2020-04-24 19:57:48 +00:00
sectors[i].floorpic = P_AddLevelFlatRuntime((char *)save_p);
save_p += 8;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
split sector/lines archiving-related code into their own functions too
2020-04-24 19:40:50 +00:00
if (diff & SD_CEILPIC)
{
we don't actually need put/get pointers at all (plus with everything put into functions they wouldn't work properly anyway)
2020-04-24 19:57:48 +00:00
sectors[i].ceilingpic = P_AddLevelFlatRuntime((char *)save_p);
save_p += 8;
split sector/lines archiving-related code into their own functions too
2020-04-24 19:40:50 +00:00
}
if (diff & SD_LIGHT)
we don't actually need put/get pointers at all (plus with everything put into functions they wouldn't work properly anyway)
2020-04-24 19:57:48 +00:00
sectors[i].lightlevel = READINT16(save_p);
split sector/lines archiving-related code into their own functions too
2020-04-24 19:40:50 +00:00
if (diff & SD_SPECIAL)
we don't actually need put/get pointers at all (plus with everything put into functions they wouldn't work properly anyway)
2020-04-24 19:57:48 +00:00
sectors[i].special = READINT16(save_p);
split sector/lines archiving-related code into their own functions too
2020-04-24 19:40:50 +00:00
if (diff2 & SD_FXOFFS)
c-side offset/angle variable renamed
2022-11-25 23:01:27 +00:00
sectors[i].floorxoffset = READFIXED(save_p);
split sector/lines archiving-related code into their own functions too
2020-04-24 19:40:50 +00:00
if (diff2 & SD_FYOFFS)
c-side offset/angle variable renamed
2022-11-25 23:01:27 +00:00
sectors[i].flooryoffset = READFIXED(save_p);
split sector/lines archiving-related code into their own functions too
2020-04-24 19:40:50 +00:00
if (diff2 & SD_CXOFFS)
c-side offset/angle variable renamed
2022-11-25 23:01:27 +00:00
sectors[i].ceilingxoffset = READFIXED(save_p);
split sector/lines archiving-related code into their own functions too
2020-04-24 19:40:50 +00:00
if (diff2 & SD_CYOFFS)
c-side offset/angle variable renamed
2022-11-25 23:01:27 +00:00
sectors[i].ceilingyoffset = READFIXED(save_p);
split sector/lines archiving-related code into their own functions too
2020-04-24 19:40:50 +00:00
if (diff2 & SD_FLOORANG)
c-side offset/angle variable renamed
2022-11-25 23:01:27 +00:00
sectors[i].floorangle = READANGLE(save_p);
split sector/lines archiving-related code into their own functions too
2020-04-24 19:40:50 +00:00
if (diff2 & SD_CEILANG)
c-side offset/angle variable renamed
2022-11-25 23:01:27 +00:00
sectors[i].ceilingangle = READANGLE(save_p);
split sector/lines archiving-related code into their own functions too
2020-04-24 19:40:50 +00:00
if (diff2 & SD_TAG)
{
Merge branch 'udmf-next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-multitag # Conflicts: # src/hardware/hw_main.c # src/p_ceilng.c # src/p_floor.c # src/p_mobj.c # src/p_mobj.h # src/p_polyobj.c # src/p_saveg.c # src/p_setup.c # src/p_spec.c # src/p_spec.h # src/p_user.c # src/r_bsp.c # src/r_defs.h
2020-07-10 14:51:11 +00:00
size_t ncount = READUINT32(save_p);
// Remove entries from global lists.
for (j = 0; j < sectors[i].tags.count; j++)
Taggroup_Remove(tags_sectors, sectors[i].tags.tags[j], i);
// Reallocate if size differs.
if (ncount != sectors[i].tags.count)
{
sectors[i].tags.count = ncount;
sectors[i].tags.tags = Z_Realloc(sectors[i].tags.tags, ncount*sizeof(mtag_t), PU_LEVEL, NULL);
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
}
Merge branch 'udmf-next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-multitag # Conflicts: # src/hardware/hw_main.c # src/p_ceilng.c # src/p_floor.c # src/p_mobj.c # src/p_mobj.h # src/p_polyobj.c # src/p_saveg.c # src/p_setup.c # src/p_spec.c # src/p_spec.h # src/p_user.c # src/r_bsp.c # src/r_defs.h
2020-07-10 14:51:11 +00:00
for (j = 0; j < ncount; j++)
sectors[i].tags.tags[j] = READINT16(save_p);
// Add new entries.
for (j = 0; j < sectors[i].tags.count; j++)
Taggroup_Remove(tags_sectors, sectors[i].tags.tags[j], i);
split sector/lines archiving-related code into their own functions too
2020-04-24 19:40:50 +00:00
}
Merge branch 'udmf-next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-multitag # Conflicts: # src/hardware/hw_main.c # src/p_ceilng.c # src/p_floor.c # src/p_mobj.c # src/p_mobj.h # src/p_polyobj.c # src/p_saveg.c # src/p_setup.c # src/p_spec.c # src/p_spec.h # src/p_user.c # src/r_bsp.c # src/r_defs.h
2020-07-10 14:51:11 +00:00
split sector/lines archiving-related code into their own functions too
2020-04-24 19:40:50 +00:00
if (diff3 & SD_COLORMAP)
we don't actually need put/get pointers at all (plus with everything put into functions they wouldn't work properly anyway)
2020-04-24 19:57:48 +00:00
sectors[i].extra_colormap = GetNetColormapFromList(READUINT32(save_p));
split sector/lines archiving-related code into their own functions too
2020-04-24 19:40:50 +00:00
if (diff3 & SD_CRUMBLESTATE)
we don't actually need put/get pointers at all (plus with everything put into functions they wouldn't work properly anyway)
2020-04-24 19:57:48 +00:00
sectors[i].crumblestate = READINT32(save_p);
Netsync floor/ceiling lighting
2021-09-19 07:20:00 +00:00
if (diff3 & SD_FLOORLIGHT)
{
sectors[i].floorlightlevel = READINT16(save_p);
sectors[i].floorlightabsolute = READUINT8(save_p);
}
if (diff3 & SD_CEILLIGHT)
{
sectors[i].ceilinglightlevel = READINT16(save_p);
sectors[i].ceilinglightabsolute = READUINT8(save_p);
}
Netsync sector flags
2021-12-30 13:33:24 +00:00
if (diff3 & SD_FLAG)
Replace verticalflip in sector_t with a sector flag that's accessible via Lua and UDMF
2021-12-30 17:50:02 +00:00
{
Netsync sector flags
2021-12-30 13:33:24 +00:00
sectors[i].flags = READUINT32(save_p);
Replace verticalflip in sector_t with a sector flag that's accessible via Lua and UDMF
2021-12-30 17:50:02 +00:00
CheckForReverseGravity |= (sectors[i].flags & MSF_GRAVITYFLIP);
}
Replace most sector specials with sector special flags
2021-12-30 23:03:24 +00:00
if (diff3 & SD_SPECIALFLAG)
sectors[i].specialflags = READUINT32(save_p);
Implement sector damagetype field
2021-12-31 07:53:00 +00:00
if (diff4 & SD_DAMAGETYPE)
sectors[i].damagetype = READUINT8(save_p);
Implement sector fields for linedef executor triggering
2021-12-31 10:39:34 +00:00
if (diff4 & SD_TRIGGERTAG)
sectors[i].triggertag = READINT16(save_p);
if (diff4 & SD_TRIGGERER)
sectors[i].triggerer = READUINT8(save_p);
Add sector texture scale fields
2023-11-24 04:52:57 +00:00
if (diff4 & SD_FXSCALE)
sectors[i].floorxscale = READFIXED(save_p);
if (diff4 & SD_FYSCALE)
sectors[i].flooryscale = READFIXED(save_p);
if (diff4 & SD_CXSCALE)
sectors[i].ceilingxscale = READFIXED(save_p);
if (diff4 & SD_CYSCALE)
sectors[i].ceilingyscale = READFIXED(save_p);
Merge branch 'next' into sector-portals
2023-12-28 02:46:16 +00:00
if (diff5 & SD_GRAVITY)
Add sector gravity field for UDMF
2021-12-30 17:19:42 +00:00
sectors[i].gravity = READFIXED(save_p);
Merge branch 'next' into sector-portals
2023-12-28 02:46:16 +00:00
if (diff5 & SD_FLOORPORTAL)
Serialize sector portals
2023-08-24 19:04:31 +00:00
sectors[i].portal_floor = READUINT32(save_p);
Merge branch 'next' into sector-portals
2023-12-28 02:46:16 +00:00
if (diff5 & SD_CEILPORTAL)
Serialize sector portals
2023-08-24 19:04:31 +00:00
sectors[i].portal_ceiling = READUINT32(save_p);
split sector/lines archiving-related code into their own functions too
2020-04-24 19:40:50 +00:00
if (diff & SD_FFLOORS)
Don't discard const, added missing &
2020-04-29 14:24:28 +00:00
UnArchiveFFloors(&sectors[i]);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
split sector/lines archiving-related code into their own functions too
2020-04-24 19:40:50 +00:00
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Serialize new side fields
2023-11-24 00:56:18 +00:00
static UINT32 GetSideDiff(const side_t *si, const side_t *spawnsi)
{
UINT32 diff = 0;
if (si->textureoffset != spawnsi->textureoffset)
diff |= LD_SDTEXOFFX;
if (si->rowoffset != spawnsi->rowoffset)
diff |= LD_SDTEXOFFY;
//SoM: 4/1/2000: Some textures are colormaps. Don't worry about invalid textures.
if (si->toptexture != spawnsi->toptexture)
diff |= LD_SDTOPTEX;
if (si->bottomtexture != spawnsi->bottomtexture)
diff |= LD_SDBOTTEX;
if (si->midtexture != spawnsi->midtexture)
diff |= LD_SDMIDTEX;
if (si->offsetx_top != spawnsi->offsetx_top)
diff |= LD_SDTOPOFFX;
if (si->offsetx_mid != spawnsi->offsetx_mid)
diff |= LD_SDMIDOFFX;
if (si->offsetx_bottom != spawnsi->offsetx_bottom)
diff |= LD_SDBOTOFFX;
if (si->offsety_top != spawnsi->offsety_top)
diff |= LD_SDTOPOFFY;
if (si->offsety_mid != spawnsi->offsety_mid)
diff |= LD_SDMIDOFFY;
if (si->offsety_bottom != spawnsi->offsety_bottom)
diff |= LD_SDBOTOFFY;
if (si->scalex_top != spawnsi->scalex_top)
diff |= LD_SDTOPSCALEX;
if (si->scalex_mid != spawnsi->scalex_mid)
diff |= LD_SDMIDSCALEX;
if (si->scalex_bottom != spawnsi->scalex_bottom)
diff |= LD_SDBOTSCALEX;
if (si->scaley_top != spawnsi->scaley_top)
diff |= LD_SDTOPSCALEY;
if (si->scaley_mid != spawnsi->scaley_mid)
diff |= LD_SDMIDSCALEY;
if (si->scaley_bottom != spawnsi->scaley_bottom)
diff |= LD_SDBOTSCALEY;
if (si->repeatcnt != spawnsi->repeatcnt)
diff |= LD_SDREPEATCNT;
Per-wall lighting
2024-06-12 12:25:45 +00:00
if (si->light != spawnsi->light)
diff |= LD_SDLIGHT;
if (si->light_top != spawnsi->light_top)
diff |= LD_SDTOPLIGHT;
if (si->light_mid != spawnsi->light_mid)
diff |= LD_SDMIDLIGHT;
if (si->light_bottom != spawnsi->light_bottom)
diff |= LD_SDBOTLIGHT;
if (si->lightabsolute != spawnsi->lightabsolute)
diff |= LD_SDLIGHTABS;
Fix tedious mistakes, comment out unused functions
2024-06-12 13:38:52 +00:00
if (si->lightabsolute_top != spawnsi->lightabsolute_top)
diff |= LD_SDTOPLIGHTABS;
if (si->lightabsolute_mid != spawnsi->lightabsolute_mid)
diff |= LD_SDMIDLIGHTABS;
if (si->lightabsolute_bottom != spawnsi->lightabsolute_bottom)
diff |= LD_SDBOTLIGHTABS;
Serialize new side fields
2023-11-24 00:56:18 +00:00
return diff;
}
static void ArchiveSide(const side_t *si, UINT32 diff)
{
WRITEUINT32(save_p, diff);
if (diff & LD_SDTEXOFFX)
WRITEFIXED(save_p, si->textureoffset);
if (diff & LD_SDTEXOFFY)
WRITEFIXED(save_p, si->rowoffset);
if (diff & LD_SDTOPTEX)
WRITEINT32(save_p, si->toptexture);
if (diff & LD_SDBOTTEX)
WRITEINT32(save_p, si->bottomtexture);
if (diff & LD_SDMIDTEX)
WRITEINT32(save_p, si->midtexture);
if (diff & LD_SDTOPOFFX)
WRITEFIXED(save_p, si->offsetx_top);
if (diff & LD_SDMIDOFFX)
WRITEFIXED(save_p, si->offsetx_mid);
if (diff & LD_SDBOTOFFX)
WRITEFIXED(save_p, si->offsetx_bottom);
if (diff & LD_SDTOPOFFY)
WRITEFIXED(save_p, si->offsety_top);
if (diff & LD_SDMIDOFFY)
WRITEFIXED(save_p, si->offsety_mid);
if (diff & LD_SDBOTOFFY)
WRITEFIXED(save_p, si->offsety_bottom);
if (diff & LD_SDTOPSCALEX)
WRITEFIXED(save_p, si->scalex_top);
if (diff & LD_SDMIDSCALEX)
WRITEFIXED(save_p, si->scalex_mid);
if (diff & LD_SDBOTSCALEX)
WRITEFIXED(save_p, si->scalex_bottom);
if (diff & LD_SDTOPSCALEY)
WRITEFIXED(save_p, si->scaley_top);
if (diff & LD_SDMIDSCALEY)
WRITEFIXED(save_p, si->scaley_mid);
if (diff & LD_SDBOTSCALEY)
WRITEFIXED(save_p, si->scaley_bottom);
if (diff & LD_SDREPEATCNT)
WRITEINT16(save_p, si->repeatcnt);
Per-wall lighting
2024-06-12 12:25:45 +00:00
if (diff & LD_SDLIGHT)
WRITEINT16(save_p, si->light);
Fix tedious mistakes, comment out unused functions
2024-06-12 13:38:52 +00:00
if (diff & LD_SDTOPLIGHT)
WRITEINT16(save_p, si->light_top);
if (diff & LD_SDMIDLIGHT)
WRITEINT16(save_p, si->light_mid);
if (diff & LD_SDBOTLIGHT)
WRITEINT16(save_p, si->light_bottom);
Per-wall lighting
2024-06-12 12:25:45 +00:00
if (diff & LD_SDLIGHTABS)
Fix tedious mistakes, comment out unused functions
2024-06-12 13:38:52 +00:00
WRITEUINT8(save_p, si->lightabsolute);
if (diff & LD_SDTOPLIGHTABS)
WRITEUINT8(save_p, si->lightabsolute_top);
if (diff & LD_SDMIDLIGHTABS)
WRITEUINT8(save_p, si->lightabsolute_mid);
if (diff & LD_SDBOTLIGHTABS)
WRITEUINT8(save_p, si->lightabsolute_bottom);
Serialize new side fields
2023-11-24 00:56:18 +00:00
}
we don't actually need put/get pointers at all (plus with everything put into functions they wouldn't work properly anyway)
2020-04-24 19:57:48 +00:00
static void ArchiveLines(void)
split sector/lines archiving-related code into their own functions too
2020-04-24 19:40:50 +00:00
{
size_t i;
const line_t *li = lines;
const line_t *spawnli = spawnlines;
Merge branch 'next' into sector-portals
2023-12-28 02:46:16 +00:00
UINT8 diff, diff2;
UINT32 side1diff;
UINT32 side2diff;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Make lines and sides use the mapload copies in P_NetArchiveWorld() too; do no longer use vres stuff there.
2019-12-23 11:47:40 +00:00
for (i = 0; i < numlines; i++, spawnli++, li++)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
no diff3 needed for line archiving
2020-04-24 19:58:38 +00:00
diff = diff2 = 0;
Merge branch 'next' into sector-portals
2023-12-28 02:46:16 +00:00
side1diff = side2diff = 0;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Make lines and sides use the mapload copies in P_NetArchiveWorld() too; do no longer use vres stuff there.
2019-12-23 11:47:40 +00:00
if (li->special != spawnli->special)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
diff |= LD_SPECIAL;
Make lines and sides use the mapload copies in P_NetArchiveWorld() too; do no longer use vres stuff there.
2019-12-23 11:47:40 +00:00
if (spawnli->special == 321 || spawnli->special == 322) // only reason li->callcount would be non-zero is if either of these are involved
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
diff |= LD_CLLCOUNT;
Implement linedef string arguments
2020-01-08 07:42:35 +00:00
if (!P_AreArgsEqual(li, spawnli))
Serialize new side fields
2023-11-24 00:56:18 +00:00
diff |= LD_ARGS;
Implement linedef args (unused and untested so far)
2020-01-02 11:23:14 +00:00
Implement linedef string arguments
2020-01-08 07:42:35 +00:00
if (!P_AreStringArgsEqual(li, spawnli))
Serialize new side fields
2023-11-24 00:56:18 +00:00
diff |= LD_STRINGARGS;
Implement linedef string arguments
2020-01-08 07:42:35 +00:00
Adapt linedef executor delay to UDMF
2020-05-03 18:41:37 +00:00
if (li->executordelay != spawnli->executordelay)
diff2 |= LD_EXECUTORDELAY;
Implement "copy portal to line" sector portal type
2023-08-24 20:36:38 +00:00
if (li->secportal != spawnli->secportal)
diff2 |= LD_TRANSFPORTAL;
Adapt linedef executor delay to UDMF
2020-05-03 18:41:37 +00:00
Raise sidedef limits Also, fixes reading of GL3 nodes to use 32-bit indices for line IDs.
2023-09-21 05:06:06 +00:00
if (li->sidenum[0] != NO_SIDEDEF)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Merge branch 'next' into sector-portals
2023-12-28 02:46:16 +00:00
side1diff = GetSideDiff(&sides[li->sidenum[0]], &spawnsides[li->sidenum[0]]);
if (side1diff)
Serialize new side fields
2023-11-24 00:56:18 +00:00
diff |= LD_SIDE1;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
Raise sidedef limits Also, fixes reading of GL3 nodes to use 32-bit indices for line IDs.
2023-09-21 05:06:06 +00:00
if (li->sidenum[1] != NO_SIDEDEF)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Merge branch 'next' into sector-portals
2023-12-28 02:46:16 +00:00
side2diff = GetSideDiff(&sides[li->sidenum[1]], &spawnsides[li->sidenum[1]]);
if (side2diff)
Serialize new side fields
2023-11-24 00:56:18 +00:00
diff |= LD_SIDE2;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
Implement linedef args (unused and untested so far)
2020-01-02 11:23:14 +00:00
if (diff2)
diff |= LD_DIFF2;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (diff)
{
Raise sidedef limits Also, fixes reading of GL3 nodes to use 32-bit indices for line IDs.
2023-09-21 05:06:06 +00:00
WRITEUINT32(save_p, i);
we don't actually need put/get pointers at all (plus with everything put into functions they wouldn't work properly anyway)
2020-04-24 19:57:48 +00:00
WRITEUINT8(save_p, diff);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (diff & LD_DIFF2)
we don't actually need put/get pointers at all (plus with everything put into functions they wouldn't work properly anyway)
2020-04-24 19:57:48 +00:00
WRITEUINT8(save_p, diff2);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (diff & LD_FLAG)
we don't actually need put/get pointers at all (plus with everything put into functions they wouldn't work properly anyway)
2020-04-24 19:57:48 +00:00
WRITEINT16(save_p, li->flags);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (diff & LD_SPECIAL)
we don't actually need put/get pointers at all (plus with everything put into functions they wouldn't work properly anyway)
2020-04-24 19:57:48 +00:00
WRITEINT16(save_p, li->special);
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
if (diff & LD_CLLCOUNT)
we don't actually need put/get pointers at all (plus with everything put into functions they wouldn't work properly anyway)
2020-04-24 19:57:48 +00:00
WRITEINT16(save_p, li->callcount);
Serialize new side fields
2023-11-24 00:56:18 +00:00
if (diff & LD_ARGS)
Implement linedef args (unused and untested so far)
2020-01-02 11:23:14 +00:00
{
UINT8 j;
for (j = 0; j < NUMLINEARGS; j++)
Merge branch 'next' into udmf-next # Conflicts: # src/p_saveg.c # src/p_slopes.c # src/p_spec.c
2020-05-01 10:44:39 +00:00
WRITEINT32(save_p, li->args[j]);
Implement linedef args (unused and untested so far)
2020-01-02 11:23:14 +00:00
}
Serialize new side fields
2023-11-24 00:56:18 +00:00
if (diff & LD_STRINGARGS)
Implement linedef string arguments
2020-01-08 07:42:35 +00:00
{
UINT8 j;
for (j = 0; j < NUMLINESTRINGARGS; j++)
{
size_t len, k;
if (!li->stringargs[j])
{
Merge branch 'next' into udmf-next # Conflicts: # src/p_saveg.c # src/p_slopes.c # src/p_spec.c
2020-05-01 10:44:39 +00:00
WRITEINT32(save_p, 0);
Implement linedef string arguments
2020-01-08 07:42:35 +00:00
continue;
}
len = strlen(li->stringargs[j]);
Merge branch 'next' into udmf-next # Conflicts: # src/p_saveg.c # src/p_slopes.c # src/p_spec.c
2020-05-01 10:44:39 +00:00
WRITEINT32(save_p, len);
Implement linedef string arguments
2020-01-08 07:42:35 +00:00
for (k = 0; k < len; k++)
Merge branch 'next' into udmf-next # Conflicts: # src/p_saveg.c # src/p_slopes.c # src/p_spec.c
2020-05-01 10:44:39 +00:00
WRITECHAR(save_p, li->stringargs[j][k]);
Implement linedef string arguments
2020-01-08 07:42:35 +00:00
}
}
Serialize new side fields
2023-11-24 00:56:18 +00:00
if (diff & LD_SIDE1)
Merge branch 'next' into sector-portals
2023-12-28 02:46:16 +00:00
ArchiveSide(&sides[li->sidenum[0]], side1diff);
Serialize new side fields
2023-11-24 00:56:18 +00:00
if (diff & LD_SIDE2)
Merge branch 'next' into sector-portals
2023-12-28 02:46:16 +00:00
ArchiveSide(&sides[li->sidenum[1]], side2diff);
Adapt linedef executor delay to UDMF
2020-05-03 18:41:37 +00:00
if (diff2 & LD_EXECUTORDELAY)
WRITEINT32(save_p, li->executordelay);
Implement "copy portal to line" sector portal type
2023-08-24 20:36:38 +00:00
if (diff2 & LD_TRANSFPORTAL)
WRITEUINT32(save_p, li->secportal);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
}
Raise sidedef limits Also, fixes reading of GL3 nodes to use 32-bit indices for line IDs.
2023-09-21 05:06:06 +00:00
WRITEUINT32(save_p, 0xffffffff);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
Serialize new side fields
2023-11-24 00:56:18 +00:00
static void UnArchiveSide(side_t *si)
{
UINT32 diff = READUINT32(save_p);
if (diff & LD_SDTEXOFFX)
si->textureoffset = READFIXED(save_p);
if (diff & LD_SDTEXOFFY)
si->rowoffset = READFIXED(save_p);
if (diff & LD_SDTOPTEX)
si->toptexture = READINT32(save_p);
if (diff & LD_SDBOTTEX)
si->bottomtexture = READINT32(save_p);
if (diff & LD_SDMIDTEX)
si->midtexture = READINT32(save_p);
if (diff & LD_SDTOPOFFX)
si->offsetx_top = READFIXED(save_p);
if (diff & LD_SDMIDOFFX)
si->offsetx_mid = READFIXED(save_p);
if (diff & LD_SDBOTOFFX)
si->offsetx_bottom = READFIXED(save_p);
if (diff & LD_SDTOPOFFY)
si->offsety_top = READFIXED(save_p);
if (diff & LD_SDMIDOFFY)
si->offsety_mid = READFIXED(save_p);
if (diff & LD_SDBOTOFFY)
si->offsety_bottom = READFIXED(save_p);
if (diff & LD_SDTOPSCALEX)
si->scalex_top = READFIXED(save_p);
if (diff & LD_SDMIDSCALEX)
si->scalex_mid = READFIXED(save_p);
if (diff & LD_SDBOTSCALEX)
si->scalex_bottom = READFIXED(save_p);
if (diff & LD_SDTOPSCALEY)
si->scaley_top = READFIXED(save_p);
if (diff & LD_SDMIDSCALEY)
si->scaley_mid = READFIXED(save_p);
if (diff & LD_SDBOTSCALEY)
si->scaley_bottom = READFIXED(save_p);
if (diff & LD_SDREPEATCNT)
si->repeatcnt = READINT16(save_p);
Per-wall lighting
2024-06-12 12:25:45 +00:00
if (diff & LD_SDLIGHT)
si->light = READINT16(save_p);
Fix tedious mistakes, comment out unused functions
2024-06-12 13:38:52 +00:00
if (diff & LD_SDTOPLIGHT)
si->light_top = READINT16(save_p);
if (diff & LD_SDMIDLIGHT)
si->light_mid = READINT16(save_p);
if (diff & LD_SDBOTLIGHT)
si->light_bottom = READINT16(save_p);
Per-wall lighting
2024-06-12 12:25:45 +00:00
if (diff & LD_SDLIGHTABS)
Fix tedious mistakes, comment out unused functions
2024-06-12 13:38:52 +00:00
si->lightabsolute = READUINT8(save_p);
if (diff & LD_SDTOPLIGHTABS)
si->lightabsolute_top = READUINT8(save_p);
if (diff & LD_SDMIDLIGHTABS)
si->lightabsolute_mid = READUINT8(save_p);
if (diff & LD_SDBOTLIGHTABS)
si->lightabsolute_bottom = READUINT8(save_p);
Serialize new side fields
2023-11-24 00:56:18 +00:00
}
we don't actually need put/get pointers at all (plus with everything put into functions they wouldn't work properly anyway)
2020-04-24 19:57:48 +00:00
static void UnArchiveLines(void)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Raise sidedef limits Also, fixes reading of GL3 nodes to use 32-bit indices for line IDs.
2023-09-21 05:06:06 +00:00
UINT32 i;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
line_t *li;
Merge branch 'next' into sector-portals
2023-12-28 02:46:16 +00:00
UINT8 diff, diff2;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
for (;;)
{
Raise sidedef limits Also, fixes reading of GL3 nodes to use 32-bit indices for line IDs.
2023-09-21 05:06:06 +00:00
i = READUINT32(save_p);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Raise sidedef limits Also, fixes reading of GL3 nodes to use 32-bit indices for line IDs.
2023-09-21 05:06:06 +00:00
if (i == 0xffffffff)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
break;
if (i > numlines)
I_Error("Invalid line number %u from server", i);
we don't actually need put/get pointers at all (plus with everything put into functions they wouldn't work properly anyway)
2020-04-24 19:57:48 +00:00
diff = READUINT8(save_p);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (diff & LD_DIFF2)
we don't actually need put/get pointers at all (plus with everything put into functions they wouldn't work properly anyway)
2020-04-24 19:57:48 +00:00
diff2 = READUINT8(save_p);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
else
diff2 = 0;
li = &lines[i];
if (diff & LD_FLAG)
we don't actually need put/get pointers at all (plus with everything put into functions they wouldn't work properly anyway)
2020-04-24 19:57:48 +00:00
li->flags = READINT16(save_p);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (diff & LD_SPECIAL)
we don't actually need put/get pointers at all (plus with everything put into functions they wouldn't work properly anyway)
2020-04-24 19:57:48 +00:00
li->special = READINT16(save_p);
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
if (diff & LD_CLLCOUNT)
we don't actually need put/get pointers at all (plus with everything put into functions they wouldn't work properly anyway)
2020-04-24 19:57:48 +00:00
li->callcount = READINT16(save_p);
Serialize new side fields
2023-11-24 00:56:18 +00:00
if (diff & LD_ARGS)
Implement linedef args (unused and untested so far)
2020-01-02 11:23:14 +00:00
{
UINT8 j;
for (j = 0; j < NUMLINEARGS; j++)
Merge branch 'next' into udmf-next # Conflicts: # src/p_saveg.c # src/p_slopes.c # src/p_spec.c
2020-05-01 10:44:39 +00:00
li->args[j] = READINT32(save_p);
Implement linedef args (unused and untested so far)
2020-01-02 11:23:14 +00:00
}
Serialize new side fields
2023-11-24 00:56:18 +00:00
if (diff & LD_STRINGARGS)
Implement linedef string arguments
2020-01-08 07:42:35 +00:00
{
UINT8 j;
for (j = 0; j < NUMLINESTRINGARGS; j++)
{
Merge branch 'next' into udmf-next # Conflicts: # src/p_saveg.c # src/p_slopes.c # src/p_spec.c
2020-05-01 10:44:39 +00:00
size_t len = READINT32(save_p);
Implement linedef string arguments
2020-01-08 07:42:35 +00:00
size_t k;
Implement linedef args (unused and untested so far)
2020-01-02 11:23:14 +00:00
Implement linedef string arguments
2020-01-08 07:42:35 +00:00
if (!len)
{
Z_Free(li->stringargs[j]);
li->stringargs[j] = NULL;
continue;
}
li->stringargs[j] = Z_Realloc(li->stringargs[j], len + 1, PU_LEVEL, NULL);
for (k = 0; k < len; k++)
Merge branch 'next' into udmf-next # Conflicts: # src/p_saveg.c # src/p_slopes.c # src/p_spec.c
2020-05-01 10:44:39 +00:00
li->stringargs[j][k] = READCHAR(save_p);
Implement linedef string arguments
2020-01-08 07:42:35 +00:00
li->stringargs[j][len] = '\0';
}
}
Serialize new side fields
2023-11-24 00:56:18 +00:00
if (diff & LD_SIDE1)
UnArchiveSide(&sides[li->sidenum[0]]);
if (diff & LD_SIDE2)
UnArchiveSide(&sides[li->sidenum[1]]);
Adapt linedef executor delay to UDMF
2020-05-03 18:41:37 +00:00
if (diff2 & LD_EXECUTORDELAY)
li->executordelay = READINT32(save_p);
Implement "copy portal to line" sector portal type
2023-08-24 20:36:38 +00:00
if (diff2 & LD_TRANSFPORTAL)
li->secportal = READUINT32(save_p);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
split sector/lines archiving-related code into their own functions too
2020-04-24 19:40:50 +00:00
}
static void P_NetArchiveWorld(void)
{
// initialize colormap vars because paranoia
ClearNetColormaps();
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
split sector/lines archiving-related code into their own functions too
2020-04-24 19:40:50 +00:00
WRITEUINT32(save_p, ARCHIVEBLOCK_WORLD);
we don't actually need put/get pointers at all (plus with everything put into functions they wouldn't work properly anyway)
2020-04-24 19:57:48 +00:00
ArchiveSectors();
ArchiveLines();
split sector/lines archiving-related code into their own functions too
2020-04-24 19:40:50 +00:00
R_ClearTextureNumCache(false);
}
static void P_NetUnArchiveWorld(void)
{
UINT16 i;
if (READUINT32(save_p) != ARCHIVEBLOCK_WORLD)
I_Error("Bad $$$.sav at archive block World");
// initialize colormap vars because paranoia
ClearNetColormaps();
// count the level's ffloors so that colormap loading can have an upper limit
for (i = 0; i < numsectors; i++)
{
ffloor_t *rover;
for (rover = sectors[i].ffloors; rover; rover = rover->next)
num_ffloors++;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
we don't actually need put/get pointers at all (plus with everything put into functions they wouldn't work properly anyway)
2020-04-24 19:57:48 +00:00
UnArchiveSectors();
UnArchiveLines();
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
//
// Thinkers
//
typedef enum
{
MD_SPAWNPOINT = 1,
MD_POS = 1<<1,
MD_TYPE = 1<<2,
MD_MOM = 1<<3,
MD_RADIUS = 1<<4,
MD_HEIGHT = 1<<5,
MD_FLAGS = 1<<6,
MD_HEALTH = 1<<7,
MD_RTIME = 1<<8,
MD_STATE = 1<<9,
MD_TICS = 1<<10,
MD_SPRITE = 1<<11,
MD_FRAME = 1<<12,
MD_EFLAGS = 1<<13,
MD_PLAYER = 1<<14,
MD_MOVEDIR = 1<<15,
MD_MOVECOUNT = 1<<16,
MD_THRESHOLD = 1<<17,
MD_LASTLOOK = 1<<18,
MD_TARGET = 1<<19,
MD_TRACER = 1<<20,
MD_FRICTION = 1<<21,
MD_MOVEFACTOR = 1<<22,
MD_FLAGS2 = 1<<23,
MD_FUSE = 1<<24,
MD_WATERTOP = 1<<25,
MD_WATERBOTTOM = 1<<26,
MD_SCALE = 1<<27,
MD_DSCALE = 1<<28,
MD_BLUEFLAG = 1<<29,
MD_REDFLAG = 1<<30,
MD_MORE = 1<<31
} mobj_diff_t;
typedef enum
{
Add "drawonlyforplayer" and "dontdrawforviewmobj"
2023-06-29 22:09:20 +00:00
MD2_CUSVAL = 1,
MD2_CVMEM = 1<<1,
MD2_SKIN = 1<<2,
MD2_COLOR = 1<<3,
MD2_SCALESPEED = 1<<4,
MD2_EXTVAL1 = 1<<5,
MD2_EXTVAL2 = 1<<6,
MD2_HNEXT = 1<<7,
MD2_HPREV = 1<<8,
MD2_FLOORROVER = 1<<9,
MD2_CEILINGROVER = 1<<10,
MD2_SLOPE = 1<<11,
MD2_COLORIZED = 1<<12,
MD2_MIRRORED = 1<<13,
MD2_SPRITEROLL = 1<<14,
MD2_SHADOWSCALE = 1<<15,
MD2_RENDERFLAGS = 1<<16,
MD2_BLENDMODE = 1<<17,
MD2_SPRITEXSCALE = 1<<18,
MD2_SPRITEYSCALE = 1<<19,
MD2_SPRITEXOFFSET = 1<<20,
MD2_SPRITEYOFFSET = 1<<21,
MD2_FLOORSPRITESLOPE = 1<<22,
MD2_DISPOFFSET = 1<<23,
MD2_DRAWONLYFORPLAYER = 1<<24,
Add 'translation' object property
2023-10-30 02:34:18 +00:00
MD2_DONTDRAWFORVIEWMOBJ = 1<<25,
Add alpha support for mobjs
2024-02-25 01:04:48 +00:00
MD2_TRANSLATION = 1<<26,
Make alpha use fixed_t and add alpha field to precipmobj_t
2024-03-01 21:29:39 +00:00
MD2_ALPHA = 1<<27
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
} mobj_diff2_t;
typedef enum
{
tc_mobj,
tc_ceiling,
tc_floor,
tc_flash,
tc_strobe,
tc_glow,
tc_fireflicker,
tc_thwomp,
tc_camerascanner,
tc_elevator,
tc_continuousfalling,
tc_bouncecheese,
tc_startcrumble,
tc_marioblock,
Make sure that T_MarioBlockChecker is synced in netgames, so that the textures of Mario Blocks can change when there are no more items
2018-09-14 20:01:07 +00:00
tc_marioblockchecker,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
tc_floatsector,
tc_crushceiling,
tc_scroll,
tc_friction,
tc_pusher,
tc_laserflash,
tc_lightfade,
tc_executor,
tc_raisesector,
tc_noenemies,
tc_eachtime,
tc_disappear,
Define fader thinker names
2018-03-30 19:27:37 +00:00
tc_fade,
Fade colormap special 455! And stop fade colormap 456 * Added T_FadeColormap thinker and netsync * Added sector_t fadecolormapdata property
2018-09-12 13:06:38 +00:00
tc_fadecolormap,
Add code for saving/loading planedisplace_t thinkers to/from $$$.sav
2017-01-20 20:17:40 +00:00
tc_planedisplace,
Dynamic slopes now use thinkers. * Moved dynamic slope-related data into its own thinker. * Vertex slopes no longer use the mapthings directly. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-19 12:14:43 +00:00
tc_dynslopeline,
tc_dynslopevert,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
tc_polyrotate, // haleyjd 03/26/06: polyobjects
tc_polymove,
tc_polywaypoint,
tc_polyslidedoor,
tc_polyswingdoor,
tc_polyflag,
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
tc_polydisplace,
Implement displacement-based polyobject rotation. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-05 09:50:59 +00:00
tc_polyrotdisplace,
Initial polyobj fade skeleton
2018-09-07 19:27:18 +00:00
tc_polyfade,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
tc_end
} specials_e;
static inline UINT32 SaveMobjnum(const mobj_t *mobj)
{
if (mobj) return mobj->mobjnum;
return 0;
}
static UINT32 SaveSector(const sector_t *sector)
{
if (sector) return (UINT32)(sector - sectors);
return 0xFFFFFFFF;
}
static UINT32 SaveLine(const line_t *line)
{
if (line) return (UINT32)(line - lines);
return 0xFFFFFFFF;
}
static inline UINT32 SavePlayer(const player_t *player)
{
if (player) return (UINT32)(player - players);
return 0xFFFFFFFF;
}
Dynamic slopes now use thinkers. * Moved dynamic slope-related data into its own thinker. * Vertex slopes no longer use the mapthings directly. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-19 12:14:43 +00:00
static UINT32 SaveSlope(const pslope_t *slope)
{
if (slope) return (UINT32)(slope->id);
return 0xFFFFFFFF;
}
SRB2 2.1.14 release
2015-01-01 19:50:31 +00:00
static void SaveMobjThinker(const thinker_t *th, const UINT8 type)
{
const mobj_t *mobj = (const mobj_t *)th;
UINT32 diff;
Fix archived mobjs having no default blend mode and sprite scales
2020-12-06 20:29:20 +00:00
UINT32 diff2;
SRB2 2.1.14 release
2015-01-01 19:50:31 +00:00
// Ignore stationary hoops - these will be respawned from mapthings.
if (mobj->type == MT_HOOP)
return;
// These are NEVER saved.
if (mobj->type == MT_HOOPCOLLIDE)
return;
// This hoop has already been collected.
if (mobj->type == MT_HOOPCENTER && mobj->threshold == 4242)
return;
if (mobj->spawnpoint && mobj->info->doomednum != -1)
{
// spawnpoint is not modified but we must save it since it is an identifier
diff = MD_SPAWNPOINT;
if ((mobj->x != mobj->spawnpoint->x << FRACBITS) ||
(mobj->y != mobj->spawnpoint->y << FRACBITS) ||
Add textmap pitch and roll parsing, and mobj pitch and roll variables.
2020-04-19 12:39:16 +00:00
(mobj->angle != FixedAngle(mobj->spawnpoint->angle*FRACUNIT)) ||
(mobj->pitch != FixedAngle(mobj->spawnpoint->pitch*FRACUNIT)) ||
(mobj->roll != FixedAngle(mobj->spawnpoint->roll*FRACUNIT)) )
SRB2 2.1.14 release
2015-01-01 19:50:31 +00:00
diff |= MD_POS;
if (mobj->info->doomednum != mobj->spawnpoint->type)
diff |= MD_TYPE;
}
else
diff = MD_POS | MD_TYPE; // not a map spawned thing so make it from scratch
diff2 = 0;
// not the default but the most probable
Include pmomz for mobjs in net savestates and load if it exists
2021-12-09 08:42:06 +00:00
if (mobj->momx != 0 || mobj->momy != 0 || mobj->momz != 0 || mobj->pmomz !=0)
SRB2 2.1.14 release
2015-01-01 19:50:31 +00:00
diff |= MD_MOM;
if (mobj->radius != mobj->info->radius)
diff |= MD_RADIUS;
if (mobj->height != mobj->info->height)
diff |= MD_HEIGHT;
if (mobj->flags != mobj->info->flags)
diff |= MD_FLAGS;
if (mobj->flags2)
diff |= MD_FLAGS2;
if (mobj->health != mobj->info->spawnhealth)
diff |= MD_HEALTH;
if (mobj->reactiontime != mobj->info->reactiontime)
diff |= MD_RTIME;
if ((statenum_t)(mobj->state-states) != mobj->info->spawnstate)
diff |= MD_STATE;
if (mobj->tics != mobj->state->tics)
diff |= MD_TICS;
if (mobj->sprite != mobj->state->sprite)
diff |= MD_SPRITE;
Add 'sprite2' field to states
2023-11-13 00:46:49 +00:00
if (mobj->sprite == SPR_PLAY && mobj->sprite2 != P_GetStateSprite2(mobj->state))
Hotfix for sprite2 in netgames It wasn't properly added to $$$.sav because MD_SPRITE didn't get set. :/
2015-05-29 18:26:39 +00:00
diff |= MD_SPRITE;
SRB2 2.1.14 release
2015-01-01 19:50:31 +00:00
if (mobj->frame != mobj->state->frame)
diff |= MD_FRAME;
backport state-animations from internal master to public next most other code in the branch did not come along for the ride.
2016-02-09 10:39:16 +00:00
if (mobj->anim_duration != (UINT16)mobj->state->var2)
diff |= MD_FRAME;
SRB2 2.1.14 release
2015-01-01 19:50:31 +00:00
if (mobj->eflags)
diff |= MD_EFLAGS;
if (mobj->player)
diff |= MD_PLAYER;
if (mobj->movedir)
diff |= MD_MOVEDIR;
if (mobj->movecount)
diff |= MD_MOVECOUNT;
if (mobj->threshold)
diff |= MD_THRESHOLD;
if (mobj->lastlook != -1)
diff |= MD_LASTLOOK;
if (mobj->target)
diff |= MD_TARGET;
if (mobj->tracer)
diff |= MD_TRACER;
if (mobj->friction != ORIG_FRICTION)
diff |= MD_FRICTION;
Changes to match the new default value and to make player acceleration perfectly match what it was previously.
2016-08-09 23:31:16 +00:00
if (mobj->movefactor != FRACUNIT)
SRB2 2.1.14 release
2015-01-01 19:50:31 +00:00
diff |= MD_MOVEFACTOR;
if (mobj->fuse)
diff |= MD_FUSE;
if (mobj->watertop)
diff |= MD_WATERTOP;
if (mobj->waterbottom)
diff |= MD_WATERBOTTOM;
if (mobj->scale != FRACUNIT)
diff |= MD_SCALE;
if (mobj->destscale != mobj->scale)
diff |= MD_DSCALE;
if (mobj->scalespeed != FRACUNIT/12)
diff2 |= MD2_SCALESPEED;
if (mobj == redflag)
diff |= MD_REDFLAG;
if (mobj == blueflag)
diff |= MD_BLUEFLAG;
if (mobj->cusval)
diff2 |= MD2_CUSVAL;
if (mobj->cvmem)
diff2 |= MD2_CVMEM;
if (mobj->color)
diff2 |= MD2_COLOR;
Add 'translation' object property
2023-10-30 02:34:18 +00:00
if (mobj->translation)
diff2 |= MD2_TRANSLATION;
SRB2 2.1.14 release
2015-01-01 19:50:31 +00:00
if (mobj->skin)
diff2 |= MD2_SKIN;
if (mobj->extravalue1)
diff2 |= MD2_EXTVAL1;
if (mobj->extravalue2)
diff2 |= MD2_EXTVAL2;
if (mobj->hnext)
diff2 |= MD2_HNEXT;
if (mobj->hprev)
diff2 |= MD2_HPREV;
Savegame netsync for mobj->floorrover and ceilingrrover
2018-09-10 03:48:14 +00:00
if (mobj->floorrover)
diff2 |= MD2_FLOORROVER;
if (mobj->ceilingrover)
diff2 |= MD2_CEILINGROVER;
Sync mobj->standingslope in netgames
2015-08-03 23:06:42 +00:00
if (mobj->standingslope)
diff2 |= MD2_SLOPE;
With permission from Kart Krew (Sal and Sryder specifically - they don't know WHY vanilla's using it): * Port across the additional colour translation maps, including mobj-level support for "colorized" objects. * Make Fangboss and both Metal Sonic objects greyscale if, on spawn, there is a player in the game who is not a spectator whose skin is that character. * Allow bosses with MF_GRENADEBOUNCE to opt out of the MF2_FRET colour-flashing tomfoolery, and give this flag to Fang.
2019-06-18 16:55:57 +00:00
if (mobj->colorized)
diff2 |= MD2_COLORIZED;
FF_HORIZONTALFLIP and mobj->mirrored (sprite enhancements)
2020-06-07 20:11:36 +00:00
if (mobj->mirrored)
diff2 |= MD2_MIRRORED;
Remove the need for setting rotation axis in spriteinfo for models Now it just does it like Software
2020-10-30 06:15:49 +00:00
if (mobj->spriteroll)
diff2 |= MD2_SPRITEROLL;
Implement object-defined floor sprite slopes.
2020-10-14 03:57:13 +00:00
if (mobj->shadowscale)
diff2 |= MD2_SHADOWSCALE;
if (mobj->renderflags)
diff2 |= MD2_RENDERFLAGS;
Fix archived mobjs having no default blend mode and sprite scales
2020-12-06 20:29:20 +00:00
if (mobj->blendmode != AST_TRANSLUCENT)
Implement blend modes
2020-10-27 03:03:41 +00:00
diff2 |= MD2_BLENDMODE;
Changes to sprite rendering: - Added render flags (see r_defs.h) - Implemented floor splats - Drop shadow sprite rendering through render flags
2020-10-12 03:13:22 +00:00
if (mobj->spritexscale != FRACUNIT)
diff2 |= MD2_SPRITEXSCALE;
if (mobj->spriteyscale != FRACUNIT)
diff2 |= MD2_SPRITEYSCALE;
Implement relative and absolute sprite offsets for objects (mobjs) Added RF_ABSOLUTEOFFSETS and RF_FLIPOFFSETS
2020-10-13 15:57:36 +00:00
if (mobj->spritexoffset)
diff2 |= MD2_SPRITEXOFFSET;
Fix archived mobjs having no default blend mode and sprite scales
2020-12-06 20:29:20 +00:00
if (mobj->spriteyoffset)
diff2 |= MD2_SPRITEYOFFSET;
Only create floor sprite slopes when needed, instead of always allocating them. Has to be done manually in Lua. Use P_CreateFloorSpriteSlope, and P_DeleteFloorSpriteSlope when done with it.
2020-10-14 16:07:02 +00:00
if (mobj->floorspriteslope)
Implement object-defined floor sprite slopes.
2020-10-14 03:57:13 +00:00
{
pslope_t *slope = mobj->floorspriteslope;
if (slope->zangle || slope->zdelta || slope->xydirection
|| slope->o.x || slope->o.y || slope->o.z
|| slope->d.x || slope->d.y
|| slope->normal.x || slope->normal.y
|| (slope->normal.z != FRACUNIT))
diff2 |= MD2_FLOORSPRITESLOPE;
}
Add "drawonlyforplayer" and "dontdrawforviewmobj"
2023-06-29 22:09:20 +00:00
if (mobj->drawonlyforplayer)
diff2 |= MD2_DRAWONLYFORPLAYER;
if (mobj->dontdrawforviewmobj)
diff2 |= MD2_DONTDRAWFORVIEWMOBJ;
Turn dispoffset into a mobj field
2022-01-13 07:53:26 +00:00
if (mobj->dispoffset != mobj->info->dispoffset)
diff2 |= MD2_DISPOFFSET;
Implement Lactozilla's suggestions and add 3D model support
2024-05-20 02:21:09 +00:00
if (mobj->alpha != FRACUNIT)
Add alpha support for mobjs
2024-02-25 01:04:48 +00:00
diff2 |= MD2_ALPHA;
Implement object-defined floor sprite slopes.
2020-10-14 03:57:13 +00:00
SRB2 2.1.14 release
2015-01-01 19:50:31 +00:00
if (diff2 != 0)
diff |= MD_MORE;
// Scrap all of that. If we're a hoop center, this is ALL we're saving.
if (mobj->type == MT_HOOPCENTER)
diff = MD_SPAWNPOINT;
WRITEUINT8(save_p, type);
WRITEUINT32(save_p, diff);
if (diff & MD_MORE)
Fix archived mobjs having no default blend mode and sprite scales
2020-12-06 20:29:20 +00:00
WRITEUINT32(save_p, diff2);
SRB2 2.1.14 release
2015-01-01 19:50:31 +00:00
// save pointer, at load time we will search this pointer to reinitilize pointers
WRITEUINT32(save_p, (size_t)mobj);
WRITEFIXED(save_p, mobj->z); // Force this so 3dfloor problems don't arise.
WRITEFIXED(save_p, mobj->floorz);
WRITEFIXED(save_p, mobj->ceilingz);
Savegame floorrover fixes
2018-09-10 04:07:22 +00:00
if (diff2 & MD2_FLOORROVER)
Savegame netsync for mobj->floorrover and ceilingrrover
2018-09-10 03:48:14 +00:00
{
created P_GetFFloorID to get an "ID" of an FOF in its target sector (an opposite to P_GetFFloorByID you could say!), rewrote floor/ceiling rover archiving code to use both P_GetFFloorID and P_GetFFloorByID
2020-04-24 21:29:41 +00:00
WRITEUINT32(save_p, SaveSector(mobj->floorrover->target));
WRITEUINT16(save_p, P_GetFFloorID(mobj->floorrover));
Savegame netsync for mobj->floorrover and ceilingrrover
2018-09-10 03:48:14 +00:00
}
Savegame floorrover fixes
2018-09-10 04:07:22 +00:00
if (diff2 & MD2_CEILINGROVER)
Savegame netsync for mobj->floorrover and ceilingrrover
2018-09-10 03:48:14 +00:00
{
created P_GetFFloorID to get an "ID" of an FOF in its target sector (an opposite to P_GetFFloorByID you could say!), rewrote floor/ceiling rover archiving code to use both P_GetFFloorID and P_GetFFloorByID
2020-04-24 21:29:41 +00:00
WRITEUINT32(save_p, SaveSector(mobj->ceilingrover->target));
WRITEUINT16(save_p, P_GetFFloorID(mobj->ceilingrover));
Savegame netsync for mobj->floorrover and ceilingrrover
2018-09-10 03:48:14 +00:00
}
SRB2 2.1.14 release
2015-01-01 19:50:31 +00:00
if (diff & MD_SPAWNPOINT)
{
size_t z;
for (z = 0; z < nummapthings; z++)
if (&mapthings[z] == mobj->spawnpoint)
WRITEUINT16(save_p, z);
if (mobj->type == MT_HOOPCENTER)
return;
}
if (diff & MD_TYPE)
WRITEUINT32(save_p, mobj->type);
if (diff & MD_POS)
{
WRITEFIXED(save_p, mobj->x);
WRITEFIXED(save_p, mobj->y);
WRITEANGLE(save_p, mobj->angle);
Add textmap pitch and roll parsing, and mobj pitch and roll variables.
2020-04-19 12:39:16 +00:00
WRITEANGLE(save_p, mobj->pitch);
WRITEANGLE(save_p, mobj->roll);
SRB2 2.1.14 release
2015-01-01 19:50:31 +00:00
}
if (diff & MD_MOM)
{
WRITEFIXED(save_p, mobj->momx);
WRITEFIXED(save_p, mobj->momy);
WRITEFIXED(save_p, mobj->momz);
Include pmomz for mobjs in net savestates and load if it exists
2021-12-09 08:42:06 +00:00
WRITEFIXED(save_p, mobj->pmomz);
SRB2 2.1.14 release
2015-01-01 19:50:31 +00:00
}
if (diff & MD_RADIUS)
WRITEFIXED(save_p, mobj->radius);
if (diff & MD_HEIGHT)
WRITEFIXED(save_p, mobj->height);
if (diff & MD_FLAGS)
WRITEUINT32(save_p, mobj->flags);
if (diff & MD_FLAGS2)
WRITEUINT32(save_p, mobj->flags2);
if (diff & MD_HEALTH)
WRITEINT32(save_p, mobj->health);
if (diff & MD_RTIME)
WRITEINT32(save_p, mobj->reactiontime);
if (diff & MD_STATE)
WRITEUINT16(save_p, mobj->state-states);
if (diff & MD_TICS)
WRITEINT32(save_p, mobj->tics);
Merge branch 'player-animations' SPR_PLAY now calls up a secondary spritedef for all animations for all players. Old character wads (including player.dta) are no longer compatible. git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@8993 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-01-22 15:23:45 +00:00
if (diff & MD_SPRITE) {
SRB2 2.1.14 release
2015-01-01 19:50:31 +00:00
WRITEUINT16(save_p, mobj->sprite);
Merge branch 'player-animations' SPR_PLAY now calls up a secondary spritedef for all animations for all players. Old character wads (including player.dta) are no longer compatible. git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@8993 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-01-22 15:23:45 +00:00
if (mobj->sprite == SPR_PLAY)
Update sprite2 serialize Increase demo version Fix code not using P_GetSkinSpritedef Fix code not using correct data type for player sprite
2023-11-13 14:46:55 +00:00
WRITEUINT16(save_p, mobj->sprite2);
Merge branch 'player-animations' SPR_PLAY now calls up a secondary spritedef for all animations for all players. Old character wads (including player.dta) are no longer compatible. git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@8993 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-01-22 15:23:45 +00:00
}
SRB2 2.1.14 release
2015-01-01 19:50:31 +00:00
if (diff & MD_FRAME)
backport state-animations from internal master to public next most other code in the branch did not come along for the ride.
2016-02-09 10:39:16 +00:00
{
SRB2 2.1.14 release
2015-01-01 19:50:31 +00:00
WRITEUINT32(save_p, mobj->frame);
backport state-animations from internal master to public next most other code in the branch did not come along for the ride.
2016-02-09 10:39:16 +00:00
WRITEUINT16(save_p, mobj->anim_duration);
}
SRB2 2.1.14 release
2015-01-01 19:50:31 +00:00
if (diff & MD_EFLAGS)
tmsprung is dead, long live MFE_SPRUNG a bunch of other painful tweaks to springs to fix this long-standing "AAA IM STUCK FOREVER UNDER A SPRING" thing when you touch a vertical spring from below (or above for reverse) git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9037 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-02-11 20:54:11 +00:00
WRITEUINT16(save_p, mobj->eflags);
SRB2 2.1.14 release
2015-01-01 19:50:31 +00:00
if (diff & MD_PLAYER)
WRITEUINT8(save_p, mobj->player-players);
if (diff & MD_MOVEDIR)
WRITEANGLE(save_p, mobj->movedir);
if (diff & MD_MOVECOUNT)
WRITEINT32(save_p, mobj->movecount);
if (diff & MD_THRESHOLD)
WRITEINT32(save_p, mobj->threshold);
if (diff & MD_LASTLOOK)
WRITEINT32(save_p, mobj->lastlook);
if (diff & MD_TARGET)
WRITEUINT32(save_p, mobj->target->mobjnum);
if (diff & MD_TRACER)
WRITEUINT32(save_p, mobj->tracer->mobjnum);
if (diff & MD_FRICTION)
WRITEFIXED(save_p, mobj->friction);
if (diff & MD_MOVEFACTOR)
WRITEFIXED(save_p, mobj->movefactor);
if (diff & MD_FUSE)
WRITEINT32(save_p, mobj->fuse);
if (diff & MD_WATERTOP)
WRITEFIXED(save_p, mobj->watertop);
if (diff & MD_WATERBOTTOM)
WRITEFIXED(save_p, mobj->waterbottom);
if (diff & MD_SCALE)
WRITEFIXED(save_p, mobj->scale);
if (diff & MD_DSCALE)
WRITEFIXED(save_p, mobj->destscale);
if (diff2 & MD2_SCALESPEED)
WRITEFIXED(save_p, mobj->scalespeed);
if (diff2 & MD2_CUSVAL)
WRITEINT32(save_p, mobj->cusval);
if (diff2 & MD2_CVMEM)
WRITEINT32(save_p, mobj->cvmem);
if (diff2 & MD2_SKIN)
Memory management fixes Date: Mon Aug 9 15:57:07 2021 -0300
2021-08-09 18:57:07 +00:00
WRITEUINT8(save_p, (UINT8)(((skin_t *)mobj->skin)->skinnum));
SRB2 2.1.14 release
2015-01-01 19:50:31 +00:00
if (diff2 & MD2_COLOR)
Make colors UINT16, increase color freeslots to 1024
2020-05-24 00:29:07 +00:00
WRITEUINT16(save_p, mobj->color);
SRB2 2.1.14 release
2015-01-01 19:50:31 +00:00
if (diff2 & MD2_EXTVAL1)
WRITEINT32(save_p, mobj->extravalue1);
if (diff2 & MD2_EXTVAL2)
WRITEINT32(save_p, mobj->extravalue2);
if (diff2 & MD2_HNEXT)
WRITEUINT32(save_p, mobj->hnext->mobjnum);
if (diff2 & MD2_HPREV)
WRITEUINT32(save_p, mobj->hprev->mobjnum);
Sync mobj->standingslope in netgames
2015-08-03 23:06:42 +00:00
if (diff2 & MD2_SLOPE)
WRITEUINT16(save_p, mobj->standingslope->id);
With permission from Kart Krew (Sal and Sryder specifically - they don't know WHY vanilla's using it): * Port across the additional colour translation maps, including mobj-level support for "colorized" objects. * Make Fangboss and both Metal Sonic objects greyscale if, on spawn, there is a player in the game who is not a spectator whose skin is that character. * Allow bosses with MF_GRENADEBOUNCE to opt out of the MF2_FRET colour-flashing tomfoolery, and give this flag to Fang.
2019-06-18 16:55:57 +00:00
if (diff2 & MD2_COLORIZED)
WRITEUINT8(save_p, mobj->colorized);
FF_HORIZONTALFLIP and mobj->mirrored (sprite enhancements)
2020-06-07 20:11:36 +00:00
if (diff2 & MD2_MIRRORED)
WRITEUINT8(save_p, mobj->mirrored);
Remove the need for setting rotation axis in spriteinfo for models Now it just does it like Software
2020-10-30 06:15:49 +00:00
if (diff2 & MD2_SPRITEROLL)
WRITEANGLE(save_p, mobj->spriteroll);
Implement object-defined floor sprite slopes.
2020-10-14 03:57:13 +00:00
if (diff2 & MD2_SHADOWSCALE)
WRITEFIXED(save_p, mobj->shadowscale);
if (diff2 & MD2_RENDERFLAGS)
WRITEUINT32(save_p, mobj->renderflags);
Implement blend modes
2020-10-27 03:03:41 +00:00
if (diff2 & MD2_BLENDMODE)
WRITEINT32(save_p, mobj->blendmode);
Changes to sprite rendering: - Added render flags (see r_defs.h) - Implemented floor splats - Drop shadow sprite rendering through render flags
2020-10-12 03:13:22 +00:00
if (diff2 & MD2_SPRITEXSCALE)
WRITEFIXED(save_p, mobj->spritexscale);
if (diff2 & MD2_SPRITEYSCALE)
WRITEFIXED(save_p, mobj->spriteyscale);
Implement relative and absolute sprite offsets for objects (mobjs) Added RF_ABSOLUTEOFFSETS and RF_FLIPOFFSETS
2020-10-13 15:57:36 +00:00
if (diff2 & MD2_SPRITEXOFFSET)
WRITEFIXED(save_p, mobj->spritexoffset);
if (diff2 & MD2_SPRITEYOFFSET)
WRITEFIXED(save_p, mobj->spriteyoffset);
Implement object-defined floor sprite slopes.
2020-10-14 03:57:13 +00:00
if (diff2 & MD2_FLOORSPRITESLOPE)
{
pslope_t *slope = mobj->floorspriteslope;
WRITEFIXED(save_p, slope->zdelta);
WRITEANGLE(save_p, slope->zangle);
WRITEANGLE(save_p, slope->xydirection);
WRITEFIXED(save_p, slope->o.x);
WRITEFIXED(save_p, slope->o.y);
WRITEFIXED(save_p, slope->o.z);
WRITEFIXED(save_p, slope->d.x);
WRITEFIXED(save_p, slope->d.y);
WRITEFIXED(save_p, slope->normal.x);
WRITEFIXED(save_p, slope->normal.y);
WRITEFIXED(save_p, slope->normal.z);
}
Add "drawonlyforplayer" and "dontdrawforviewmobj"
2023-06-29 22:09:20 +00:00
if (diff2 & MD2_DRAWONLYFORPLAYER)
WRITEUINT8(save_p, mobj->drawonlyforplayer-players);
if (diff2 & MD2_DONTDRAWFORVIEWMOBJ)
WRITEUINT32(save_p, mobj->dontdrawforviewmobj->mobjnum);
Turn dispoffset into a mobj field
2022-01-13 07:53:26 +00:00
if (diff2 & MD2_DISPOFFSET)
WRITEINT32(save_p, mobj->dispoffset);
Add 'translation' object property
2023-10-30 02:34:18 +00:00
if (diff2 & MD2_TRANSLATION)
WRITEUINT16(save_p, mobj->translation);
Add alpha support for mobjs
2024-02-25 01:04:48 +00:00
if (diff2 & MD2_ALPHA)
Make alpha use fixed_t and add alpha field to precipmobj_t
2024-03-01 21:29:39 +00:00
WRITEFIXED(save_p, mobj->alpha);
SRB2 2.1.14 release
2015-01-01 19:50:31 +00:00
WRITEUINT32(save_p, mobj->mobjnum);
}
Refactor T_NoEnemiesSector
2020-04-18 07:21:04 +00:00
static void SaveNoEnemiesThinker(const thinker_t *th, const UINT8 type)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Refactor T_NoEnemiesSector
2020-04-18 07:21:04 +00:00
const noenemies_t *ht = (const void *)th;
WRITEUINT8(save_p, type);
WRITEUINT32(save_p, SaveLine(ht->sourceline));
}
Make T_BounceCheese use its own thinker struct
2020-04-18 08:45:21 +00:00
static void SaveBounceCheeseThinker(const thinker_t *th, const UINT8 type)
{
const bouncecheese_t *ht = (const void *)th;
WRITEUINT8(save_p, type);
WRITEUINT32(save_p, SaveLine(ht->sourceline));
WRITEUINT32(save_p, SaveSector(ht->sector));
WRITEFIXED(save_p, ht->speed);
WRITEFIXED(save_p, ht->distance);
WRITEFIXED(save_p, ht->floorwasheight);
WRITEFIXED(save_p, ht->ceilingwasheight);
WRITECHAR(save_p, ht->low);
}
Refactor T_ContinuousFalling
2020-04-17 23:42:13 +00:00
static void SaveContinuousFallThinker(const thinker_t *th, const UINT8 type)
{
const continuousfall_t *ht = (const void *)th;
WRITEUINT8(save_p, type);
WRITEUINT32(save_p, SaveSector(ht->sector));
WRITEFIXED(save_p, ht->speed);
WRITEINT32(save_p, ht->direction);
WRITEFIXED(save_p, ht->floorstartheight);
WRITEFIXED(save_p, ht->ceilingstartheight);
WRITEFIXED(save_p, ht->destheight);
}
Make T_MarioBlock use its own thinker data structure
2020-04-18 00:05:23 +00:00
static void SaveMarioBlockThinker(const thinker_t *th, const UINT8 type)
{
const mariothink_t *ht = (const void *)th;
WRITEUINT8(save_p, type);
WRITEUINT32(save_p, SaveSector(ht->sector));
WRITEFIXED(save_p, ht->speed);
WRITEINT32(save_p, ht->direction);
WRITEFIXED(save_p, ht->floorstartheight);
WRITEFIXED(save_p, ht->ceilingstartheight);
WRITEINT16(save_p, ht->tag);
}
Eradicate levelspecthink_t
2020-04-18 09:05:58 +00:00
static void SaveMarioCheckThinker(const thinker_t *th, const UINT8 type)
{
const mariocheck_t *ht = (const void *)th;
WRITEUINT8(save_p, type);
WRITEUINT32(save_p, SaveLine(ht->sourceline));
WRITEUINT32(save_p, SaveSector(ht->sector));
}
Refactor T_ThwompSector
2020-04-18 08:26:03 +00:00
static void SaveThwompThinker(const thinker_t *th, const UINT8 type)
{
const thwomp_t *ht = (const void *)th;
WRITEUINT8(save_p, type);
WRITEUINT32(save_p, SaveLine(ht->sourceline));
WRITEUINT32(save_p, SaveSector(ht->sector));
WRITEFIXED(save_p, ht->crushspeed);
WRITEFIXED(save_p, ht->retractspeed);
WRITEINT32(save_p, ht->direction);
WRITEFIXED(save_p, ht->floorstartheight);
WRITEFIXED(save_p, ht->ceilingstartheight);
WRITEINT32(save_p, ht->delay);
WRITEINT16(save_p, ht->tag);
WRITEUINT16(save_p, ht->sound);
}
Refactor T_FloatSector
2020-04-17 22:26:49 +00:00
static void SaveFloatThinker(const thinker_t *th, const UINT8 type)
{
const floatthink_t *ht = (const void *)th;
WRITEUINT8(save_p, type);
WRITEUINT32(save_p, SaveLine(ht->sourceline));
WRITEUINT32(save_p, SaveSector(ht->sector));
WRITEINT16(save_p, ht->tag);
}
Make T_EachTimeThinker use its own struct
2020-04-17 12:00:48 +00:00
static void SaveEachTimeThinker(const thinker_t *th, const UINT8 type)
{
const eachtime_t *ht = (const void *)th;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
size_t i;
WRITEUINT8(save_p, type);
Make T_EachTimeThinker use its own struct
2020-04-17 12:00:48 +00:00
WRITEUINT32(save_p, SaveLine(ht->sourceline));
for (i = 0; i < MAXPLAYERS; i++)
Line exec trigger netsync: Save var2s in addition to vars
2018-09-17 18:12:16 +00:00
{
Make T_EachTimeThinker use its own struct
2020-04-17 12:00:48 +00:00
WRITECHAR(save_p, ht->playersInArea[i]);
Line exec trigger netsync: Save var2s in addition to vars
2018-09-17 18:12:16 +00:00
}
Make T_EachTimeThinker use its own struct
2020-04-17 12:00:48 +00:00
WRITECHAR(save_p, ht->triggerOnExit);
}
Make T_RaiseSector use its own thinker struct instead of levelspecthink_t
2020-04-17 07:58:53 +00:00
static void SaveRaiseThinker(const thinker_t *th, const UINT8 type)
{
const raise_t *ht = (const void *)th;
WRITEUINT8(save_p, type);
Store tag instead of sourceline in raise thinker
2020-04-27 10:54:08 +00:00
WRITEINT16(save_p, ht->tag);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
WRITEUINT32(save_p, SaveSector(ht->sector));
Make T_RaiseSector use its own thinker struct instead of levelspecthink_t
2020-04-17 07:58:53 +00:00
WRITEFIXED(save_p, ht->ceilingbottom);
WRITEFIXED(save_p, ht->ceilingtop);
WRITEFIXED(save_p, ht->basespeed);
WRITEFIXED(save_p, ht->extraspeed);
WRITEUINT8(save_p, ht->shaketimer);
WRITEUINT8(save_p, ht->flags);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
static void SaveCeilingThinker(const thinker_t *th, const UINT8 type)
{
const ceiling_t *ht = (const void *)th;
WRITEUINT8(save_p, type);
WRITEUINT8(save_p, ht->type);
WRITEUINT32(save_p, SaveSector(ht->sector));
WRITEFIXED(save_p, ht->bottomheight);
WRITEFIXED(save_p, ht->topheight);
WRITEFIXED(save_p, ht->speed);
WRITEFIXED(save_p, ht->delay);
WRITEFIXED(save_p, ht->delaytimer);
WRITEUINT8(save_p, ht->crush);
WRITEINT32(save_p, ht->texture);
WRITEINT32(save_p, ht->direction);
Linedef type 403: Allow executor chaining and flat change at the same time
2021-06-26 13:28:28 +00:00
WRITEINT16(save_p, ht->tag);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
WRITEFIXED(save_p, ht->origspeed);
WRITEFIXED(save_p, ht->sourceline);
}
static void SaveFloormoveThinker(const thinker_t *th, const UINT8 type)
{
const floormove_t *ht = (const void *)th;
WRITEUINT8(save_p, type);
WRITEUINT8(save_p, ht->type);
WRITEUINT8(save_p, ht->crush);
WRITEUINT32(save_p, SaveSector(ht->sector));
WRITEINT32(save_p, ht->direction);
WRITEINT32(save_p, ht->texture);
WRITEFIXED(save_p, ht->floordestheight);
WRITEFIXED(save_p, ht->speed);
WRITEFIXED(save_p, ht->origspeed);
WRITEFIXED(save_p, ht->delay);
WRITEFIXED(save_p, ht->delaytimer);
Linedef type 403: Allow executor chaining and flat change at the same time
2021-06-26 13:28:28 +00:00
WRITEINT16(save_p, ht->tag);
Floor/ceiling movers: Stop abusing the texture variable to store the sourceline
2021-06-26 14:25:14 +00:00
WRITEFIXED(save_p, ht->sourceline);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
static void SaveLightflashThinker(const thinker_t *th, const UINT8 type)
{
const lightflash_t *ht = (const void *)th;
WRITEUINT8(save_p, type);
WRITEUINT32(save_p, SaveSector(ht->sector));
WRITEINT32(save_p, ht->maxlight);
WRITEINT32(save_p, ht->minlight);
}
static void SaveStrobeThinker(const thinker_t *th, const UINT8 type)
{
const strobe_t *ht = (const void *)th;
WRITEUINT8(save_p, type);
WRITEUINT32(save_p, SaveSector(ht->sector));
WRITEINT32(save_p, ht->count);
Make light levels in thinkers INT16
2021-09-19 14:25:27 +00:00
WRITEINT16(save_p, ht->minlight);
WRITEINT16(save_p, ht->maxlight);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
WRITEINT32(save_p, ht->darktime);
WRITEINT32(save_p, ht->brighttime);
}
static void SaveGlowThinker(const thinker_t *th, const UINT8 type)
{
const glow_t *ht = (const void *)th;
WRITEUINT8(save_p, type);
WRITEUINT32(save_p, SaveSector(ht->sector));
Make light levels in thinkers INT16
2021-09-19 14:25:27 +00:00
WRITEINT16(save_p, ht->minlight);
WRITEINT16(save_p, ht->maxlight);
WRITEINT16(save_p, ht->direction);
WRITEINT16(save_p, ht->speed);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
Remove bogus comments from p_saveg.c
2020-05-01 09:25:32 +00:00
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
static inline void SaveFireflickerThinker(const thinker_t *th, const UINT8 type)
{
const fireflicker_t *ht = (const void *)th;
WRITEUINT8(save_p, type);
WRITEUINT32(save_p, SaveSector(ht->sector));
WRITEINT32(save_p, ht->count);
WRITEINT32(save_p, ht->resetcount);
Make light levels in thinkers INT16
2021-09-19 14:25:27 +00:00
WRITEINT16(save_p, ht->maxlight);
WRITEINT16(save_p, ht->minlight);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
Remove bogus comments from p_saveg.c
2020-05-01 09:25:32 +00:00
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
static void SaveElevatorThinker(const thinker_t *th, const UINT8 type)
{
const elevator_t *ht = (const void *)th;
WRITEUINT8(save_p, type);
WRITEUINT8(save_p, ht->type);
WRITEUINT32(save_p, SaveSector(ht->sector));
WRITEUINT32(save_p, SaveSector(ht->actionsector));
WRITEINT32(save_p, ht->direction);
WRITEFIXED(save_p, ht->floordestheight);
WRITEFIXED(save_p, ht->ceilingdestheight);
WRITEFIXED(save_p, ht->speed);
WRITEFIXED(save_p, ht->origspeed);
WRITEFIXED(save_p, ht->low);
WRITEFIXED(save_p, ht->high);
WRITEFIXED(save_p, ht->distance);
WRITEFIXED(save_p, ht->delay);
WRITEFIXED(save_p, ht->delaytimer);
WRITEFIXED(save_p, ht->floorwasheight);
WRITEFIXED(save_p, ht->ceilingwasheight);
WRITEUINT32(save_p, SaveLine(ht->sourceline));
}
Make T_StartCrumble use its own thinker data structure
2020-04-26 09:55:10 +00:00
static void SaveCrumbleThinker(const thinker_t *th, const UINT8 type)
{
const crumble_t *ht = (const void *)th;
WRITEUINT8(save_p, type);
T_StartCrumble refactoring, part 1
2020-04-26 14:51:14 +00:00
WRITEUINT32(save_p, SaveLine(ht->sourceline));
Make T_StartCrumble use its own thinker data structure
2020-04-26 09:55:10 +00:00
WRITEUINT32(save_p, SaveSector(ht->sector));
WRITEUINT32(save_p, SaveSector(ht->actionsector));
T_StartCrumble refactoring, part 1
2020-04-26 14:51:14 +00:00
WRITEUINT32(save_p, SavePlayer(ht->player)); // was dummy
Make T_StartCrumble use its own thinker data structure
2020-04-26 09:55:10 +00:00
WRITEINT32(save_p, ht->direction);
T_StartCrumble refactoring, part 1
2020-04-26 14:51:14 +00:00
WRITEINT32(save_p, ht->origalpha);
WRITEINT32(save_p, ht->timer);
Make T_StartCrumble use its own thinker data structure
2020-04-26 09:55:10 +00:00
WRITEFIXED(save_p, ht->speed);
WRITEFIXED(save_p, ht->floorwasheight);
WRITEFIXED(save_p, ht->ceilingwasheight);
T_StartCrumble refactoring, part 1
2020-04-26 14:51:14 +00:00
WRITEUINT8(save_p, ht->flags);
Make T_StartCrumble use its own thinker data structure
2020-04-26 09:55:10 +00:00
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
static inline void SaveScrollThinker(const thinker_t *th, const UINT8 type)
{
const scroll_t *ht = (const void *)th;
WRITEUINT8(save_p, type);
WRITEFIXED(save_p, ht->dx);
WRITEFIXED(save_p, ht->dy);
WRITEINT32(save_p, ht->affectee);
WRITEINT32(save_p, ht->control);
WRITEFIXED(save_p, ht->last_height);
WRITEFIXED(save_p, ht->vdx);
WRITEFIXED(save_p, ht->vdy);
WRITEINT32(save_p, ht->accel);
WRITEINT32(save_p, ht->exclusive);
WRITEUINT8(save_p, ht->type);
}
static inline void SaveFrictionThinker(const thinker_t *th, const UINT8 type)
{
const friction_t *ht = (const void *)th;
WRITEUINT8(save_p, type);
WRITEINT32(save_p, ht->friction);
WRITEINT32(save_p, ht->movefactor);
WRITEINT32(save_p, ht->affectee);
WRITEINT32(save_p, ht->referrer);
WRITEUINT8(save_p, ht->roverfriction);
}
static inline void SavePusherThinker(const thinker_t *th, const UINT8 type)
{
const pusher_t *ht = (const void *)th;
WRITEUINT8(save_p, type);
WRITEUINT8(save_p, ht->type);
Refactor wind/current thinker
2021-07-01 18:05:23 +00:00
WRITEFIXED(save_p, ht->x_mag);
WRITEFIXED(save_p, ht->y_mag);
WRITEFIXED(save_p, ht->z_mag);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
WRITEINT32(save_p, ht->affectee);
WRITEUINT8(save_p, ht->roverpusher);
WRITEINT32(save_p, ht->referrer);
WRITEINT32(save_p, ht->exclusive);
WRITEINT32(save_p, ht->slider);
}
static void SaveLaserThinker(const thinker_t *th, const UINT8 type)
{
const laserthink_t *ht = (const void *)th;
WRITEUINT8(save_p, type);
Make the laser thinker find the FOF itself instead of storing it in the thinker struct
2020-05-02 08:03:16 +00:00
WRITEINT16(save_p, ht->tag);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
WRITEUINT32(save_p, SaveLine(ht->sourceline));
Store "no bosses" setting for lasers in thinker instead of checking sourceline.
2020-04-27 11:09:57 +00:00
WRITEUINT8(save_p, ht->nobosses);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
static void SaveLightlevelThinker(const thinker_t *th, const UINT8 type)
{
const lightlevel_t *ht = (const void *)th;
WRITEUINT8(save_p, type);
WRITEUINT32(save_p, SaveSector(ht->sector));
Use percentage calc instead of interval decrement for tic-based timing
2018-09-11 14:05:25 +00:00
WRITEINT16(save_p, ht->sourcelevel);
WRITEINT16(save_p, ht->destlevel);
The thinker is entirely unified now, and there is no difference in the light levels between the "old" behavior and this one now.
2018-09-15 10:21:25 +00:00
WRITEFIXED(save_p, ht->fixedcurlevel);
WRITEFIXED(save_p, ht->fixedpertic);
Replace firsttic with decrement timer
2018-09-10 00:18:43 +00:00
WRITEINT32(save_p, ht->timer);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
static void SaveExecutorThinker(const thinker_t *th, const UINT8 type)
{
const executor_t *ht = (const void *)th;
WRITEUINT8(save_p, type);
WRITEUINT32(save_p, SaveLine(ht->line));
WRITEUINT32(save_p, SaveMobjnum(ht->caller));
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
WRITEUINT32(save_p, SaveSector(ht->sector));
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
WRITEINT32(save_p, ht->timer);
}
static void SaveDisappearThinker(const thinker_t *th, const UINT8 type)
{
const disappear_t *ht = (const void *)th;
WRITEUINT8(save_p, type);
WRITEUINT32(save_p, ht->appeartime);
WRITEUINT32(save_p, ht->disappeartime);
WRITEUINT32(save_p, ht->offset);
WRITEUINT32(save_p, ht->timer);
WRITEINT32(save_p, ht->affectee);
WRITEINT32(save_p, ht->sourceline);
WRITEINT32(save_p, ht->exists);
}
Define fader thinker names
2018-03-30 19:27:37 +00:00
static void SaveFadeThinker(const thinker_t *th, const UINT8 type)
{
const fade_t *ht = (const void *)th;
WRITEUINT8(save_p, type);
453: Use new colormap netsync for fade FOF thinker
2018-09-17 04:34:03 +00:00
WRITEUINT32(save_p, CheckAddNetColormapToList(ht->dest_exc));
Store sectornum/ffloornum as UINT32, not INT32
2018-09-10 03:52:36 +00:00
WRITEUINT32(save_p, ht->sectornum);
WRITEUINT32(save_p, ht->ffloornum);
Add alpha clamping so OpenGL conforms to Software's translucent levels
2018-08-17 20:27:32 +00:00
WRITEINT32(save_p, ht->alpha);
Use percentage calc instead of interval decrement for tic-based fading
2018-09-11 14:28:24 +00:00
WRITEINT16(save_p, ht->sourcevalue);
Allow immediate alpha setting when speed = 0; refactoring * Separate fade logic into P_FindFakeFloorsDoAlpha, P_DoFakeFloorAlpha * Change INT32 destvalue and speed to INT16
2018-04-07 11:09:04 +00:00
WRITEINT16(save_p, ht->destvalue);
Finalize light level on fade finish (not forced stop) * Added destlightlevel property to fade_t * Fixed dotranslucent, dolighting, docollision order weirdness in function calls
2018-09-09 21:19:49 +00:00
WRITEINT16(save_p, ht->destlightlevel);
Allow immediate alpha setting when speed = 0; refactoring * Separate fade logic into P_FindFakeFloorsDoAlpha, P_DoFakeFloorAlpha * Change INT32 destvalue and speed to INT16
2018-04-07 11:09:04 +00:00
WRITEINT16(save_p, ht->speed);
Replace firsttic with timer increment
2018-09-10 00:45:12 +00:00
WRITEUINT8(save_p, (UINT8)ht->ticbased);
WRITEINT32(save_p, ht->timer);
Refactor flag handling toggles
2018-04-07 03:14:48 +00:00
WRITEUINT8(save_p, ht->doexists);
WRITEUINT8(save_p, ht->dotranslucent);
Add dolighting flag to FadeFakeFloor thinker
2018-09-09 00:41:45 +00:00
WRITEUINT8(save_p, ht->dolighting);
Fade FOF colormap support
2018-09-12 20:57:35 +00:00
WRITEUINT8(save_p, ht->docolormap);
Finalize light level on fade finish (not forced stop) * Added destlightlevel property to fade_t * Fixed dotranslucent, dolighting, docollision order weirdness in function calls
2018-09-09 21:19:49 +00:00
WRITEUINT8(save_p, ht->docollision);
Rename dofadeinonly to doghostfade * Ghost fading: when transitioning to/from alpha=0, don't set solid/tangibility until fade is finished
2018-08-14 14:18:08 +00:00
WRITEUINT8(save_p, ht->doghostfade);
Refactor function and variable names; change defaults for fake floor fader line flags
2018-08-17 19:13:05 +00:00
WRITEUINT8(save_p, ht->exactalpha);
Define fader thinker names
2018-03-30 19:27:37 +00:00
}
Fade colormap special 455! And stop fade colormap 456 * Added T_FadeColormap thinker and netsync * Added sector_t fadecolormapdata property
2018-09-12 13:06:38 +00:00
static void SaveFadeColormapThinker(const thinker_t *th, const UINT8 type)
{
const fadecolormap_t *ht = (const void *)th;
WRITEUINT8(save_p, type);
WRITEUINT32(save_p, SaveSector(ht->sector));
455: Fade colormap netsync use new colormap saving
2018-09-17 00:27:24 +00:00
WRITEUINT32(save_p, CheckAddNetColormapToList(ht->source_exc));
WRITEUINT32(save_p, CheckAddNetColormapToList(ht->dest_exc));
455: Add speed increment timing (~EFFECT4) to FadeColormap
2018-09-13 14:38:15 +00:00
WRITEUINT8(save_p, (UINT8)ht->ticbased);
Fade colormap special 455! And stop fade colormap 456 * Added T_FadeColormap thinker and netsync * Added sector_t fadecolormapdata property
2018-09-12 13:06:38 +00:00
WRITEINT32(save_p, ht->duration);
WRITEINT32(save_p, ht->timer);
}
Add code for saving/loading planedisplace_t thinkers to/from $$$.sav
2017-01-20 20:17:40 +00:00
static void SavePlaneDisplaceThinker(const thinker_t *th, const UINT8 type)
{
const planedisplace_t *ht = (const void *)th;
WRITEUINT8(save_p, type);
WRITEINT32(save_p, ht->affectee);
WRITEINT32(save_p, ht->control);
WRITEFIXED(save_p, ht->last_height);
WRITEFIXED(save_p, ht->speed);
WRITEUINT8(save_p, ht->type);
}
Make SRB2 flat like Earth
2020-03-20 17:55:29 +00:00
Separate thinker structs for dynamic line and vertex slopes
2021-12-29 12:53:38 +00:00
static inline void SaveDynamicLineSlopeThinker(const thinker_t *th, const UINT8 type)
Dynamic slopes now use thinkers. * Moved dynamic slope-related data into its own thinker. * Vertex slopes no longer use the mapthings directly. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-19 12:14:43 +00:00
{
Separate thinker structs for dynamic line and vertex slopes
2021-12-29 12:53:38 +00:00
const dynlineplanethink_t* ht = (const void*)th;
Dynamic slopes now use thinkers. * Moved dynamic slope-related data into its own thinker. * Vertex slopes no longer use the mapthings directly. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-19 12:14:43 +00:00
WRITEUINT8(save_p, type);
WRITEUINT8(save_p, ht->type);
WRITEUINT32(save_p, SaveSlope(ht->slope));
WRITEUINT32(save_p, SaveLine(ht->sourceline));
WRITEFIXED(save_p, ht->extent);
Separate thinker structs for dynamic line and vertex slopes
2021-12-29 12:53:38 +00:00
}
static inline void SaveDynamicVertexSlopeThinker(const thinker_t *th, const UINT8 type)
{
Add "relative" setting to linedef type 799 and adapt it to UDMF
2021-12-29 14:29:59 +00:00
size_t i;
Separate thinker structs for dynamic line and vertex slopes
2021-12-29 12:53:38 +00:00
const dynvertexplanethink_t* ht = (const void*)th;
Dynamic slopes now use thinkers. * Moved dynamic slope-related data into its own thinker. * Vertex slopes no longer use the mapthings directly. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-19 12:14:43 +00:00
Separate thinker structs for dynamic line and vertex slopes
2021-12-29 12:53:38 +00:00
WRITEUINT8(save_p, type);
WRITEUINT32(save_p, SaveSlope(ht->slope));
Add "relative" setting to linedef type 799 and adapt it to UDMF
2021-12-29 14:29:59 +00:00
for (i = 0; i < 3; i++)
WRITEUINT32(save_p, SaveSector(ht->secs[i]));
WRITEMEM(save_p, ht->vex, sizeof(ht->vex));
WRITEMEM(save_p, ht->origsecheights, sizeof(ht->origsecheights));
WRITEMEM(save_p, ht->origvecheights, sizeof(ht->origvecheights));
WRITEUINT8(save_p, ht->relative);
Dynamic slopes now use thinkers. * Moved dynamic slope-related data into its own thinker. * Vertex slopes no longer use the mapthings directly. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-19 12:14:43 +00:00
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
static inline void SavePolyrotatetThinker(const thinker_t *th, const UINT8 type)
{
const polyrotate_t *ht = (const void *)th;
WRITEUINT8(save_p, type);
WRITEINT32(save_p, ht->polyObjNum);
WRITEINT32(save_p, ht->speed);
WRITEINT32(save_p, ht->distance);
Sync turnobjs for polyrotate_t thinkers in netgames
2020-06-04 20:31:26 +00:00
WRITEUINT8(save_p, ht->turnobjs);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
static void SavePolymoveThinker(const thinker_t *th, const UINT8 type)
{
const polymove_t *ht = (const void *)th;
WRITEUINT8(save_p, type);
WRITEINT32(save_p, ht->polyObjNum);
WRITEINT32(save_p, ht->speed);
WRITEFIXED(save_p, ht->momx);
WRITEFIXED(save_p, ht->momy);
WRITEINT32(save_p, ht->distance);
WRITEANGLE(save_p, ht->angle);
}
static void SavePolywaypointThinker(const thinker_t *th, UINT8 type)
{
const polywaypoint_t *ht = (const void *)th;
WRITEUINT8(save_p, type);
WRITEINT32(save_p, ht->polyObjNum);
WRITEINT32(save_p, ht->speed);
WRITEINT32(save_p, ht->sequence);
WRITEINT32(save_p, ht->pointnum);
WRITEINT32(save_p, ht->direction);
Store PolyObject waypoint return behavior in an enum
2020-05-13 14:21:47 +00:00
WRITEUINT8(save_p, ht->returnbehavior);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
WRITEUINT8(save_p, ht->continuous);
WRITEUINT8(save_p, ht->stophere);
}
static void SavePolyslidedoorThinker(const thinker_t *th, const UINT8 type)
{
const polyslidedoor_t *ht = (const void *)th;
WRITEUINT8(save_p, type);
WRITEINT32(save_p, ht->polyObjNum);
WRITEINT32(save_p, ht->delay);
WRITEINT32(save_p, ht->delayCount);
WRITEINT32(save_p, ht->initSpeed);
WRITEINT32(save_p, ht->speed);
WRITEINT32(save_p, ht->initDistance);
WRITEINT32(save_p, ht->distance);
WRITEUINT32(save_p, ht->initAngle);
WRITEUINT32(save_p, ht->angle);
WRITEUINT32(save_p, ht->revAngle);
WRITEFIXED(save_p, ht->momx);
WRITEFIXED(save_p, ht->momy);
WRITEUINT8(save_p, ht->closing);
}
static void SavePolyswingdoorThinker(const thinker_t *th, const UINT8 type)
{
const polyswingdoor_t *ht = (const void *)th;
WRITEUINT8(save_p, type);
WRITEINT32(save_p, ht->polyObjNum);
WRITEINT32(save_p, ht->delay);
WRITEINT32(save_p, ht->delayCount);
WRITEINT32(save_p, ht->initSpeed);
WRITEINT32(save_p, ht->speed);
WRITEINT32(save_p, ht->initDistance);
WRITEINT32(save_p, ht->distance);
WRITEUINT8(save_p, ht->closing);
}
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
static void SavePolydisplaceThinker(const thinker_t *th, const UINT8 type)
{
const polydisplace_t *ht = (const void *)th;
WRITEUINT8(save_p, type);
WRITEINT32(save_p, ht->polyObjNum);
WRITEUINT32(save_p, SaveSector(ht->controlSector));
WRITEFIXED(save_p, ht->dx);
WRITEFIXED(save_p, ht->dy);
WRITEFIXED(save_p, ht->oldHeights);
}
Implement displacement-based polyobject rotation. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-05 09:50:59 +00:00
static void SavePolyrotdisplaceThinker(const thinker_t *th, const UINT8 type)
{
const polyrotdisplace_t *ht = (const void *)th;
WRITEUINT8(save_p, type);
WRITEINT32(save_p, ht->polyObjNum);
WRITEUINT32(save_p, SaveSector(ht->controlSector));
WRITEFIXED(save_p, ht->rotscale);
WRITEUINT8(save_p, ht->turnobjs);
WRITEFIXED(save_p, ht->oldHeights);
}
Polyobject Fade logic
2018-09-09 05:08:02 +00:00
static void SavePolyfadeThinker(const thinker_t *th, const UINT8 type)
{
const polyfade_t *ht = (const void *)th;
WRITEUINT8(save_p, type);
WRITEINT32(save_p, ht->polyObjNum);
492 PolyObj Fade, 491 PolyObj Translucency, 490 PolyObj changes * 490: Set proper render flags according to spawnflags * 491: Add relative calc (EFFECT3) and Front X alpha param (DONTPEGTOP) * 492: * Tic-based (EFFECT4) and speed timing * Add relative calc (EFFECT3) and Front X alpha param (DONTPEGTOP) * Set proper render flags according to spawnflags * Fix OpenGL >= NUMTRANSMAPS render bug
2018-09-13 04:04:50 +00:00
WRITEINT32(save_p, ht->sourcevalue);
Polyobject Fade logic
2018-09-09 05:08:02 +00:00
WRITEINT32(save_p, ht->destvalue);
WRITEUINT8(save_p, (UINT8)ht->docollision);
WRITEUINT8(save_p, (UINT8)ht->doghostfade);
492 PolyObj Fade, 491 PolyObj Translucency, 490 PolyObj changes * 490: Set proper render flags according to spawnflags * 491: Add relative calc (EFFECT3) and Front X alpha param (DONTPEGTOP) * 492: * Tic-based (EFFECT4) and speed timing * Add relative calc (EFFECT3) and Front X alpha param (DONTPEGTOP) * Set proper render flags according to spawnflags * Fix OpenGL >= NUMTRANSMAPS render bug
2018-09-13 04:04:50 +00:00
WRITEUINT8(save_p, (UINT8)ht->ticbased);
492: Merge speed and duration logic for fade polyobject
2018-09-16 00:00:04 +00:00
WRITEINT32(save_p, ht->duration);
Replace firsttic with timer increment
2018-09-10 01:01:00 +00:00
WRITEINT32(save_p, ht->timer);
Polyobject Fade logic
2018-09-09 05:08:02 +00:00
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
static void P_NetArchiveThinkers(void)
{
const thinker_t *th;
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
UINT32 i;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
SRB2 2.1.2 release
2014-03-17 12:13:16 +00:00
WRITEUINT32(save_p, ARCHIVEBLOCK_THINKERS);
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
for (i = 0; i < NUM_THINKERLISTS; i++)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
UINT32 numsaved = 0;
// save off the current thinkers
for (th = thlist[i].next; th != &thlist[i]; th = th->next)
Add code for saving/loading planedisplace_t thinkers to/from $$$.sav
2017-01-20 20:17:40 +00:00
{
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
if (!(th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed
|| th->function.acp1 == (actionf_p1)P_NullPrecipThinker))
numsaved++;
if (th->function.acp1 == (actionf_p1)P_MobjThinker)
{
SaveMobjThinker(th, tc_mobj);
continue;
}
#ifdef PARANOIA
else if (th->function.acp1 == (actionf_p1)P_NullPrecipThinker);
#endif
else if (th->function.acp1 == (actionf_p1)T_MoveCeiling)
{
SaveCeilingThinker(th, tc_ceiling);
continue;
}
else if (th->function.acp1 == (actionf_p1)T_CrushCeiling)
{
SaveCeilingThinker(th, tc_crushceiling);
continue;
}
else if (th->function.acp1 == (actionf_p1)T_MoveFloor)
{
SaveFloormoveThinker(th, tc_floor);
continue;
}
else if (th->function.acp1 == (actionf_p1)T_LightningFlash)
{
SaveLightflashThinker(th, tc_flash);
continue;
}
else if (th->function.acp1 == (actionf_p1)T_StrobeFlash)
{
SaveStrobeThinker(th, tc_strobe);
continue;
}
else if (th->function.acp1 == (actionf_p1)T_Glow)
{
SaveGlowThinker(th, tc_glow);
continue;
}
else if (th->function.acp1 == (actionf_p1)T_FireFlicker)
{
SaveFireflickerThinker(th, tc_fireflicker);
continue;
}
else if (th->function.acp1 == (actionf_p1)T_MoveElevator)
{
SaveElevatorThinker(th, tc_elevator);
continue;
}
else if (th->function.acp1 == (actionf_p1)T_ContinuousFalling)
{
Refactor T_ContinuousFalling
2020-04-17 23:42:13 +00:00
SaveContinuousFallThinker(th, tc_continuousfalling);
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
continue;
}
else if (th->function.acp1 == (actionf_p1)T_ThwompSector)
{
Refactor T_ThwompSector
2020-04-18 08:26:03 +00:00
SaveThwompThinker(th, tc_thwomp);
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
continue;
}
else if (th->function.acp1 == (actionf_p1)T_NoEnemiesSector)
{
Refactor T_NoEnemiesSector
2020-04-18 07:21:04 +00:00
SaveNoEnemiesThinker(th, tc_noenemies);
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
continue;
}
else if (th->function.acp1 == (actionf_p1)T_EachTimeThinker)
{
Make T_EachTimeThinker use its own struct
2020-04-17 12:00:48 +00:00
SaveEachTimeThinker(th, tc_eachtime);
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
continue;
}
else if (th->function.acp1 == (actionf_p1)T_RaiseSector)
{
Make T_RaiseSector use its own thinker struct instead of levelspecthink_t
2020-04-17 07:58:53 +00:00
SaveRaiseThinker(th, tc_raisesector);
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
continue;
}
else if (th->function.acp1 == (actionf_p1)T_CameraScanner)
{
SaveElevatorThinker(th, tc_camerascanner);
continue;
}
else if (th->function.acp1 == (actionf_p1)T_Scroll)
{
SaveScrollThinker(th, tc_scroll);
continue;
}
else if (th->function.acp1 == (actionf_p1)T_Friction)
{
SaveFrictionThinker(th, tc_friction);
continue;
}
else if (th->function.acp1 == (actionf_p1)T_Pusher)
{
SavePusherThinker(th, tc_pusher);
continue;
}
else if (th->function.acp1 == (actionf_p1)T_BounceCheese)
{
Make T_BounceCheese use its own thinker struct
2020-04-18 08:45:21 +00:00
SaveBounceCheeseThinker(th, tc_bouncecheese);
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
continue;
}
else if (th->function.acp1 == (actionf_p1)T_StartCrumble)
{
Accidentally changed the wrong SaveElevatorThinker call to SaveCrumbleThinker
2020-04-26 16:31:39 +00:00
SaveCrumbleThinker(th, tc_startcrumble);
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
continue;
}
else if (th->function.acp1 == (actionf_p1)T_MarioBlock)
{
Make T_MarioBlock use its own thinker data structure
2020-04-18 00:05:23 +00:00
SaveMarioBlockThinker(th, tc_marioblock);
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
continue;
}
else if (th->function.acp1 == (actionf_p1)T_MarioBlockChecker)
{
Eradicate levelspecthink_t
2020-04-18 09:05:58 +00:00
SaveMarioCheckThinker(th, tc_marioblockchecker);
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
continue;
}
else if (th->function.acp1 == (actionf_p1)T_FloatSector)
{
Refactor T_FloatSector
2020-04-17 22:26:49 +00:00
SaveFloatThinker(th, tc_floatsector);
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
continue;
}
else if (th->function.acp1 == (actionf_p1)T_LaserFlash)
{
SaveLaserThinker(th, tc_laserflash);
continue;
}
else if (th->function.acp1 == (actionf_p1)T_LightFade)
{
SaveLightlevelThinker(th, tc_lightfade);
continue;
}
else if (th->function.acp1 == (actionf_p1)T_ExecutorDelay)
{
SaveExecutorThinker(th, tc_executor);
continue;
}
else if (th->function.acp1 == (actionf_p1)T_Disappear)
{
SaveDisappearThinker(th, tc_disappear);
continue;
}
else if (th->function.acp1 == (actionf_p1)T_Fade)
{
SaveFadeThinker(th, tc_fade);
continue;
}
else if (th->function.acp1 == (actionf_p1)T_FadeColormap)
{
SaveFadeColormapThinker(th, tc_fadecolormap);
continue;
}
else if (th->function.acp1 == (actionf_p1)T_PlaneDisplace)
{
SavePlaneDisplaceThinker(th, tc_planedisplace);
continue;
}
else if (th->function.acp1 == (actionf_p1)T_PolyObjRotate)
{
SavePolyrotatetThinker(th, tc_polyrotate);
continue;
}
else if (th->function.acp1 == (actionf_p1)T_PolyObjMove)
{
SavePolymoveThinker(th, tc_polymove);
continue;
}
else if (th->function.acp1 == (actionf_p1)T_PolyObjWaypoint)
{
SavePolywaypointThinker(th, tc_polywaypoint);
continue;
}
else if (th->function.acp1 == (actionf_p1)T_PolyDoorSlide)
{
SavePolyslidedoorThinker(th, tc_polyslidedoor);
continue;
}
else if (th->function.acp1 == (actionf_p1)T_PolyDoorSwing)
{
SavePolyswingdoorThinker(th, tc_polyswingdoor);
continue;
}
else if (th->function.acp1 == (actionf_p1)T_PolyObjFlag)
{
SavePolymoveThinker(th, tc_polyflag);
continue;
}
else if (th->function.acp1 == (actionf_p1)T_PolyObjDisplace)
{
SavePolydisplaceThinker(th, tc_polydisplace);
continue;
}
else if (th->function.acp1 == (actionf_p1)T_PolyObjRotDisplace)
{
SavePolyrotdisplaceThinker(th, tc_polyrotdisplace);
continue;
}
else if (th->function.acp1 == (actionf_p1)T_PolyObjFade)
{
SavePolyfadeThinker(th, tc_polyfade);
continue;
}
Merge branch 'slopethinkers' into thinkerlists Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-21 09:45:59 +00:00
else if (th->function.acp1 == (actionf_p1)T_DynamicSlopeLine)
{
Separate thinker structs for dynamic line and vertex slopes
2021-12-29 12:53:38 +00:00
SaveDynamicLineSlopeThinker(th, tc_dynslopeline);
Merge branch 'slopethinkers' into thinkerlists Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-21 09:45:59 +00:00
continue;
}
else if (th->function.acp1 == (actionf_p1)T_DynamicSlopeVert)
{
Separate thinker structs for dynamic line and vertex slopes
2021-12-29 12:53:38 +00:00
SaveDynamicVertexSlopeThinker(th, tc_dynslopevert);
Merge branch 'slopethinkers' into thinkerlists Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-21 09:45:59 +00:00
continue;
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
#ifdef PARANOIA
Ring Racers CMake + Debug build improvements
2023-08-01 02:29:45 +00:00
else
I_Assert(th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed); // wait garbage collection
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
#endif
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Fixed the thinkerlist issues by removing THINK_LIMBO. Delay-removed thinkers now stay in their list. Also includes toaster's assorted fixes and improvements from target_painted_on_your_ass.
2019-07-12 23:42:03 +00:00
CONS_Debug(DBG_NETPLAY, "%u thinkers saved in list %d\n", numsaved, i);
Keeping a total of thinkers saved/loaded and print the total in netplay devmode Not a fix for anything, probably just useful for debugging
2017-06-12 16:55:15 +00:00
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
WRITEUINT8(save_p, tc_end);
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
// Now save the pointers, tracer and target, but at load time we must
// relink to this; the savegame contains the old position in the pointer
// field copyed in the info field temporarily, but finally we just search
// for the old position and relink to it.
mobj_t *P_FindNewPosition(UINT32 oldposition)
{
thinker_t *th;
mobj_t *mobj;
Added a mobj-only list entry for mobj thinkers Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 21:29:20 +00:00
for (th = thlist[THINK_MOBJ].next; th != &thlist[THINK_MOBJ]; th = th->next)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Fixed the thinkerlist issues by removing THINK_LIMBO. Delay-removed thinkers now stay in their list. Also includes toaster's assorted fixes and improvements from target_painted_on_your_ass.
2019-07-12 23:42:03 +00:00
if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
continue;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
mobj = (mobj_t *)th;
Fixed the thinkerlist issues by removing THINK_LIMBO. Delay-removed thinkers now stay in their list. Also includes toaster's assorted fixes and improvements from target_painted_on_your_ass.
2019-07-12 23:42:03 +00:00
if (mobj->mobjnum != oldposition)
continue;
return mobj;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
CONS_Debug(DBG_GAMELOGIC, "mobj not found\n");
return NULL;
}
static inline mobj_t *LoadMobj(UINT32 mobjnum)
{
if (mobjnum == 0) return NULL;
return (mobj_t *)(size_t)mobjnum;
}
static sector_t *LoadSector(UINT32 sector)
{
if (sector >= numsectors) return NULL;
return &sectors[sector];
}
static line_t *LoadLine(UINT32 line)
{
if (line >= numlines) return NULL;
return &lines[line];
}
static inline player_t *LoadPlayer(UINT32 player)
{
if (player >= MAXPLAYERS) return NULL;
return &players[player];
}
Dynamic slopes now use thinkers. * Moved dynamic slope-related data into its own thinker. * Vertex slopes no longer use the mapthings directly. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-19 12:14:43 +00:00
static inline pslope_t *LoadSlope(UINT32 slopeid)
{
pslope_t *p = slopelist;
if (slopeid > slopecount) return NULL;
do
{
if (p->id == slopeid)
return p;
} while ((p = p->next));
return NULL;
}
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
static thinker_t* LoadMobjThinker(actionf_p1 thinker)
SRB2 2.1.14 release
2015-01-01 19:50:31 +00:00
{
thinker_t *next;
mobj_t *mobj;
UINT32 diff;
Fix archived mobjs having no default blend mode and sprite scales
2020-12-06 20:29:20 +00:00
UINT32 diff2;
SRB2 2.1.14 release
2015-01-01 19:50:31 +00:00
INT32 i;
fixed_t z, floorz, ceilingz;
Savegame netsync for mobj->floorrover and ceilingrrover
2018-09-10 03:48:14 +00:00
ffloor_t *floorrover = NULL, *ceilingrover = NULL;
SRB2 2.1.14 release
2015-01-01 19:50:31 +00:00
diff = READUINT32(save_p);
if (diff & MD_MORE)
Fix archived mobjs having no default blend mode and sprite scales
2020-12-06 20:29:20 +00:00
diff2 = READUINT32(save_p);
SRB2 2.1.14 release
2015-01-01 19:50:31 +00:00
else
diff2 = 0;
next = (void *)(size_t)READUINT32(save_p);
z = READFIXED(save_p); // Force this so 3dfloor problems don't arise.
floorz = READFIXED(save_p);
ceilingz = READFIXED(save_p);
Savegame netsync for mobj->floorrover and ceilingrrover
2018-09-10 03:48:14 +00:00
if (diff2 & MD2_FLOORROVER)
Replace sectornum/rovernum index vars with ffloor pointers
2018-09-10 03:12:37 +00:00
{
created P_GetFFloorID to get an "ID" of an FOF in its target sector (an opposite to P_GetFFloorByID you could say!), rewrote floor/ceiling rover archiving code to use both P_GetFFloorID and P_GetFFloorByID
2020-04-24 21:29:41 +00:00
sector_t *sec = LoadSector(READUINT32(save_p));
UINT16 id = READUINT16(save_p);
floorrover = P_GetFFloorByID(sec, id);
Replace sectornum/rovernum index vars with ffloor pointers
2018-09-10 03:12:37 +00:00
}
Savegame netsync for mobj->floorrover and ceilingrrover
2018-09-10 03:48:14 +00:00
if (diff2 & MD2_CEILINGROVER)
{
created P_GetFFloorID to get an "ID" of an FOF in its target sector (an opposite to P_GetFFloorByID you could say!), rewrote floor/ceiling rover archiving code to use both P_GetFFloorID and P_GetFFloorByID
2020-04-24 21:29:41 +00:00
sector_t *sec = LoadSector(READUINT32(save_p));
UINT16 id = READUINT16(save_p);
ceilingrover = P_GetFFloorByID(sec, id);
Savegame netsync for mobj->floorrover and ceilingrrover
2018-09-10 03:48:14 +00:00
}
SRB2 2.1.14 release
2015-01-01 19:50:31 +00:00
if (diff & MD_SPAWNPOINT)
{
UINT16 spawnpointnum = READUINT16(save_p);
Adapt NiGHTS things to UDMF
2021-12-19 09:16:03 +00:00
if (mapthings[spawnpointnum].type == 1713) // NiGHTS Hoop special case
SRB2 2.1.14 release
2015-01-01 19:50:31 +00:00
{
Separate P_SpawnHoopsAndRings into different functions: -Hoops are spawned in P_SpawnHoop -Item patterns are spawned in P_SpawnItemPattern -Ring-like items are spawned normally via P_SpawnMapThing -Bonus time items are spawned via P_SpawnBonusTimeItem, which is a wrapper for P_SpawnMapThing
2019-12-24 09:50:49 +00:00
P_SpawnHoop(&mapthings[spawnpointnum]);
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
return NULL;
SRB2 2.1.14 release
2015-01-01 19:50:31 +00:00
}
mobj = Z_Calloc(sizeof (*mobj), PU_LEVEL, NULL);
mobj->spawnpoint = &mapthings[spawnpointnum];
mapthings[spawnpointnum].mobj = mobj;
}
else
mobj = Z_Calloc(sizeof (*mobj), PU_LEVEL, NULL);
// declare this as a valid mobj as soon as possible.
mobj->thinker.function.acp1 = thinker;
mobj->z = z;
mobj->floorz = floorz;
mobj->ceilingz = ceilingz;
Savegame netsync for mobj->floorrover and ceilingrrover
2018-09-10 03:48:14 +00:00
mobj->floorrover = floorrover;
mobj->ceilingrover = ceilingrover;
SRB2 2.1.14 release
2015-01-01 19:50:31 +00:00
if (diff & MD_TYPE)
mobj->type = READUINT32(save_p);
else
{
for (i = 0; i < NUMMOBJTYPES; i++)
if (mobj->spawnpoint && mobj->spawnpoint->type == mobjinfo[i].doomednum)
break;
if (i == NUMMOBJTYPES)
{
if (mobj->spawnpoint)
CONS_Alert(CONS_ERROR, "Found mobj with unknown map thing type %d\n", mobj->spawnpoint->type);
else
CONS_Alert(CONS_ERROR, "Found mobj with unknown map thing type NULL\n");
I_Error("Savegame corrupted");
}
mobj->type = i;
}
mobj->info = &mobjinfo[mobj->type];
if (diff & MD_POS)
{
mobj->x = READFIXED(save_p);
mobj->y = READFIXED(save_p);
mobj->angle = READANGLE(save_p);
Add textmap pitch and roll parsing, and mobj pitch and roll variables.
2020-04-19 12:39:16 +00:00
mobj->pitch = READANGLE(save_p);
mobj->roll = READANGLE(save_p);
SRB2 2.1.14 release
2015-01-01 19:50:31 +00:00
}
else
{
mobj->x = mobj->spawnpoint->x << FRACBITS;
mobj->y = mobj->spawnpoint->y << FRACBITS;
mobj->angle = FixedAngle(mobj->spawnpoint->angle*FRACUNIT);
Add textmap pitch and roll parsing, and mobj pitch and roll variables.
2020-04-19 12:39:16 +00:00
mobj->pitch = FixedAngle(mobj->spawnpoint->pitch*FRACUNIT);
mobj->roll = FixedAngle(mobj->spawnpoint->roll*FRACUNIT);
SRB2 2.1.14 release
2015-01-01 19:50:31 +00:00
}
if (diff & MD_MOM)
{
mobj->momx = READFIXED(save_p);
mobj->momy = READFIXED(save_p);
mobj->momz = READFIXED(save_p);
Include pmomz for mobjs in net savestates and load if it exists
2021-12-09 08:42:06 +00:00
mobj->pmomz = READFIXED(save_p);
SRB2 2.1.14 release
2015-01-01 19:50:31 +00:00
} // otherwise they're zero, and the memset took care of it
if (diff & MD_RADIUS)
mobj->radius = READFIXED(save_p);
Revert "Move a few mobj spawn defaults to its own function" This reverts commit 6f9c48a30560b0f2d89f7202371dfc164015b9ba. # Conflicts: # src/p_mobj.c
2020-12-06 20:46:35 +00:00
else
mobj->radius = mobj->info->radius;
SRB2 2.1.14 release
2015-01-01 19:50:31 +00:00
if (diff & MD_HEIGHT)
mobj->height = READFIXED(save_p);
Revert "Move a few mobj spawn defaults to its own function" This reverts commit 6f9c48a30560b0f2d89f7202371dfc164015b9ba. # Conflicts: # src/p_mobj.c
2020-12-06 20:46:35 +00:00
else
mobj->height = mobj->info->height;
SRB2 2.1.14 release
2015-01-01 19:50:31 +00:00
if (diff & MD_FLAGS)
mobj->flags = READUINT32(save_p);
Revert "Move a few mobj spawn defaults to its own function" This reverts commit 6f9c48a30560b0f2d89f7202371dfc164015b9ba. # Conflicts: # src/p_mobj.c
2020-12-06 20:46:35 +00:00
else
mobj->flags = mobj->info->flags;
SRB2 2.1.14 release
2015-01-01 19:50:31 +00:00
if (diff & MD_FLAGS2)
mobj->flags2 = READUINT32(save_p);
if (diff & MD_HEALTH)
mobj->health = READINT32(save_p);
Revert "Move a few mobj spawn defaults to its own function" This reverts commit 6f9c48a30560b0f2d89f7202371dfc164015b9ba. # Conflicts: # src/p_mobj.c
2020-12-06 20:46:35 +00:00
else
mobj->health = mobj->info->spawnhealth;
SRB2 2.1.14 release
2015-01-01 19:50:31 +00:00
if (diff & MD_RTIME)
mobj->reactiontime = READINT32(save_p);
Revert "Move a few mobj spawn defaults to its own function" This reverts commit 6f9c48a30560b0f2d89f7202371dfc164015b9ba. # Conflicts: # src/p_mobj.c
2020-12-06 20:46:35 +00:00
else
mobj->reactiontime = mobj->info->reactiontime;
SRB2 2.1.14 release
2015-01-01 19:50:31 +00:00
if (diff & MD_STATE)
mobj->state = &states[READUINT16(save_p)];
Revert "Move a few mobj spawn defaults to its own function" This reverts commit 6f9c48a30560b0f2d89f7202371dfc164015b9ba. # Conflicts: # src/p_mobj.c
2020-12-06 20:46:35 +00:00
else
mobj->state = &states[mobj->info->spawnstate];
SRB2 2.1.14 release
2015-01-01 19:50:31 +00:00
if (diff & MD_TICS)
mobj->tics = READINT32(save_p);
Revert "Move a few mobj spawn defaults to its own function" This reverts commit 6f9c48a30560b0f2d89f7202371dfc164015b9ba. # Conflicts: # src/p_mobj.c
2020-12-06 20:46:35 +00:00
else
mobj->tics = mobj->state->tics;
Merge branch 'player-animations' SPR_PLAY now calls up a secondary spritedef for all animations for all players. Old character wads (including player.dta) are no longer compatible. git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@8993 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-01-22 15:23:45 +00:00
if (diff & MD_SPRITE) {
SRB2 2.1.14 release
2015-01-01 19:50:31 +00:00
mobj->sprite = READUINT16(save_p);
Merge branch 'player-animations' SPR_PLAY now calls up a secondary spritedef for all animations for all players. Old character wads (including player.dta) are no longer compatible. git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@8993 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-01-22 15:23:45 +00:00
if (mobj->sprite == SPR_PLAY)
Update sprite2 serialize Increase demo version Fix code not using P_GetSkinSpritedef Fix code not using correct data type for player sprite
2023-11-13 14:46:55 +00:00
mobj->sprite2 = READUINT16(save_p);
Merge branch 'player-animations' SPR_PLAY now calls up a secondary spritedef for all animations for all players. Old character wads (including player.dta) are no longer compatible. git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@8993 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-01-22 15:23:45 +00:00
}
else {
SRB2 2.1.14 release
2015-01-01 19:50:31 +00:00
mobj->sprite = mobj->state->sprite;
Merge branch 'player-animations' SPR_PLAY now calls up a secondary spritedef for all animations for all players. Old character wads (including player.dta) are no longer compatible. git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@8993 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-01-22 15:23:45 +00:00
if (mobj->sprite == SPR_PLAY)
Update sprite2 serialize Increase demo version Fix code not using P_GetSkinSpritedef Fix code not using correct data type for player sprite
2023-11-13 14:46:55 +00:00
mobj->sprite2 = P_GetStateSprite2(mobj->state);
Merge branch 'player-animations' SPR_PLAY now calls up a secondary spritedef for all animations for all players. Old character wads (including player.dta) are no longer compatible. git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@8993 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-01-22 15:23:45 +00:00
}
SRB2 2.1.14 release
2015-01-01 19:50:31 +00:00
if (diff & MD_FRAME)
backport state-animations from internal master to public next most other code in the branch did not come along for the ride.
2016-02-09 10:39:16 +00:00
{
SRB2 2.1.14 release
2015-01-01 19:50:31 +00:00
mobj->frame = READUINT32(save_p);
backport state-animations from internal master to public next most other code in the branch did not come along for the ride.
2016-02-09 10:39:16 +00:00
mobj->anim_duration = READUINT16(save_p);
}
Revert "Move a few mobj spawn defaults to its own function" This reverts commit 6f9c48a30560b0f2d89f7202371dfc164015b9ba. # Conflicts: # src/p_mobj.c
2020-12-06 20:46:35 +00:00
else
{
mobj->frame = mobj->state->frame;
mobj->anim_duration = (UINT16)mobj->state->var2;
}
SRB2 2.1.14 release
2015-01-01 19:50:31 +00:00
if (diff & MD_EFLAGS)
tmsprung is dead, long live MFE_SPRUNG a bunch of other painful tweaks to springs to fix this long-standing "AAA IM STUCK FOREVER UNDER A SPRING" thing when you touch a vertical spring from below (or above for reverse) git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9037 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-02-11 20:54:11 +00:00
mobj->eflags = READUINT16(save_p);
SRB2 2.1.14 release
2015-01-01 19:50:31 +00:00
if (diff & MD_PLAYER)
{
i = READUINT8(save_p);
mobj->player = &players[i];
mobj->player->mo = mobj;
}
if (diff & MD_MOVEDIR)
mobj->movedir = READANGLE(save_p);
if (diff & MD_MOVECOUNT)
mobj->movecount = READINT32(save_p);
if (diff & MD_THRESHOLD)
mobj->threshold = READINT32(save_p);
if (diff & MD_LASTLOOK)
mobj->lastlook = READINT32(save_p);
Revert "Move a few mobj spawn defaults to its own function" This reverts commit 6f9c48a30560b0f2d89f7202371dfc164015b9ba. # Conflicts: # src/p_mobj.c
2020-12-06 20:46:35 +00:00
else
mobj->lastlook = -1;
SRB2 2.1.14 release
2015-01-01 19:50:31 +00:00
if (diff & MD_TARGET)
mobj->target = (mobj_t *)(size_t)READUINT32(save_p);
if (diff & MD_TRACER)
mobj->tracer = (mobj_t *)(size_t)READUINT32(save_p);
if (diff & MD_FRICTION)
mobj->friction = READFIXED(save_p);
Revert "Move a few mobj spawn defaults to its own function" This reverts commit 6f9c48a30560b0f2d89f7202371dfc164015b9ba. # Conflicts: # src/p_mobj.c
2020-12-06 20:46:35 +00:00
else
mobj->friction = ORIG_FRICTION;
SRB2 2.1.14 release
2015-01-01 19:50:31 +00:00
if (diff & MD_MOVEFACTOR)
mobj->movefactor = READFIXED(save_p);
Revert "Move a few mobj spawn defaults to its own function" This reverts commit 6f9c48a30560b0f2d89f7202371dfc164015b9ba. # Conflicts: # src/p_mobj.c
2020-12-06 20:46:35 +00:00
else
mobj->movefactor = FRACUNIT;
SRB2 2.1.14 release
2015-01-01 19:50:31 +00:00
if (diff & MD_FUSE)
mobj->fuse = READINT32(save_p);
if (diff & MD_WATERTOP)
mobj->watertop = READFIXED(save_p);
if (diff & MD_WATERBOTTOM)
mobj->waterbottom = READFIXED(save_p);
if (diff & MD_SCALE)
mobj->scale = READFIXED(save_p);
Revert "Move a few mobj spawn defaults to its own function" This reverts commit 6f9c48a30560b0f2d89f7202371dfc164015b9ba. # Conflicts: # src/p_mobj.c
2020-12-06 20:46:35 +00:00
else
mobj->scale = FRACUNIT;
SRB2 2.1.14 release
2015-01-01 19:50:31 +00:00
if (diff & MD_DSCALE)
mobj->destscale = READFIXED(save_p);
Revert "Move a few mobj spawn defaults to its own function" This reverts commit 6f9c48a30560b0f2d89f7202371dfc164015b9ba. # Conflicts: # src/p_mobj.c
2020-12-06 20:46:35 +00:00
else
mobj->destscale = mobj->scale;
SRB2 2.1.14 release
2015-01-01 19:50:31 +00:00
if (diff2 & MD2_SCALESPEED)
mobj->scalespeed = READFIXED(save_p);
Revert "Move a few mobj spawn defaults to its own function" This reverts commit 6f9c48a30560b0f2d89f7202371dfc164015b9ba. # Conflicts: # src/p_mobj.c
2020-12-06 20:46:35 +00:00
else
mobj->scalespeed = FRACUNIT/12;
SRB2 2.1.14 release
2015-01-01 19:50:31 +00:00
if (diff2 & MD2_CUSVAL)
mobj->cusval = READINT32(save_p);
if (diff2 & MD2_CVMEM)
mobj->cvmem = READINT32(save_p);
if (diff2 & MD2_SKIN)
Memory management fixes Date: Mon Aug 9 15:57:07 2021 -0300
2021-08-09 18:57:07 +00:00
mobj->skin = skins[READUINT8(save_p)];
SRB2 2.1.14 release
2015-01-01 19:50:31 +00:00
if (diff2 & MD2_COLOR)
Make colors UINT16, increase color freeslots to 1024
2020-05-24 00:29:07 +00:00
mobj->color = READUINT16(save_p);
SRB2 2.1.14 release
2015-01-01 19:50:31 +00:00
if (diff2 & MD2_EXTVAL1)
mobj->extravalue1 = READINT32(save_p);
if (diff2 & MD2_EXTVAL2)
mobj->extravalue2 = READINT32(save_p);
if (diff2 & MD2_HNEXT)
mobj->hnext = (mobj_t *)(size_t)READUINT32(save_p);
if (diff2 & MD2_HPREV)
mobj->hprev = (mobj_t *)(size_t)READUINT32(save_p);
Sync mobj->standingslope in netgames
2015-08-03 23:06:42 +00:00
if (diff2 & MD2_SLOPE)
mobj->standingslope = P_SlopeById(READUINT16(save_p));
With permission from Kart Krew (Sal and Sryder specifically - they don't know WHY vanilla's using it): * Port across the additional colour translation maps, including mobj-level support for "colorized" objects. * Make Fangboss and both Metal Sonic objects greyscale if, on spawn, there is a player in the game who is not a spectator whose skin is that character. * Allow bosses with MF_GRENADEBOUNCE to opt out of the MF2_FRET colour-flashing tomfoolery, and give this flag to Fang.
2019-06-18 16:55:57 +00:00
if (diff2 & MD2_COLORIZED)
mobj->colorized = READUINT8(save_p);
FF_HORIZONTALFLIP and mobj->mirrored (sprite enhancements)
2020-06-07 20:11:36 +00:00
if (diff2 & MD2_MIRRORED)
mobj->mirrored = READUINT8(save_p);
Remove the need for setting rotation axis in spriteinfo for models Now it just does it like Software
2020-10-30 06:15:49 +00:00
if (diff2 & MD2_SPRITEROLL)
mobj->spriteroll = READANGLE(save_p);
Implement object-defined floor sprite slopes.
2020-10-14 03:57:13 +00:00
if (diff2 & MD2_SHADOWSCALE)
mobj->shadowscale = READFIXED(save_p);
if (diff2 & MD2_RENDERFLAGS)
mobj->renderflags = READUINT32(save_p);
Implement blend modes
2020-10-27 03:03:41 +00:00
if (diff2 & MD2_BLENDMODE)
mobj->blendmode = READINT32(save_p);
Revert "Move a few mobj spawn defaults to its own function" This reverts commit 6f9c48a30560b0f2d89f7202371dfc164015b9ba. # Conflicts: # src/p_mobj.c
2020-12-06 20:46:35 +00:00
else
mobj->blendmode = AST_TRANSLUCENT;
Changes to sprite rendering: - Added render flags (see r_defs.h) - Implemented floor splats - Drop shadow sprite rendering through render flags
2020-10-12 03:13:22 +00:00
if (diff2 & MD2_SPRITEXSCALE)
mobj->spritexscale = READFIXED(save_p);
Revert "Move a few mobj spawn defaults to its own function" This reverts commit 6f9c48a30560b0f2d89f7202371dfc164015b9ba. # Conflicts: # src/p_mobj.c
2020-12-06 20:46:35 +00:00
else
mobj->spritexscale = FRACUNIT;
Changes to sprite rendering: - Added render flags (see r_defs.h) - Implemented floor splats - Drop shadow sprite rendering through render flags
2020-10-12 03:13:22 +00:00
if (diff2 & MD2_SPRITEYSCALE)
mobj->spriteyscale = READFIXED(save_p);
Revert "Move a few mobj spawn defaults to its own function" This reverts commit 6f9c48a30560b0f2d89f7202371dfc164015b9ba. # Conflicts: # src/p_mobj.c
2020-12-06 20:46:35 +00:00
else
mobj->spriteyscale = FRACUNIT;
Implement relative and absolute sprite offsets for objects (mobjs) Added RF_ABSOLUTEOFFSETS and RF_FLIPOFFSETS
2020-10-13 15:57:36 +00:00
if (diff2 & MD2_SPRITEXOFFSET)
mobj->spritexoffset = READFIXED(save_p);
if (diff2 & MD2_SPRITEYOFFSET)
mobj->spriteyoffset = READFIXED(save_p);
Implement object-defined floor sprite slopes.
2020-10-14 03:57:13 +00:00
if (diff2 & MD2_FLOORSPRITESLOPE)
{
Only create floor sprite slopes when needed, instead of always allocating them. Has to be done manually in Lua. Use P_CreateFloorSpriteSlope, and P_DeleteFloorSpriteSlope when done with it.
2020-10-14 16:07:02 +00:00
pslope_t *slope = (pslope_t *)P_CreateFloorSpriteSlope(mobj);
Implement object-defined floor sprite slopes.
2020-10-14 03:57:13 +00:00
slope->zdelta = READFIXED(save_p);
slope->zangle = READANGLE(save_p);
slope->xydirection = READANGLE(save_p);
slope->o.x = READFIXED(save_p);
slope->o.y = READFIXED(save_p);
slope->o.z = READFIXED(save_p);
slope->d.x = READFIXED(save_p);
slope->d.y = READFIXED(save_p);
slope->normal.x = READFIXED(save_p);
slope->normal.y = READFIXED(save_p);
slope->normal.z = READFIXED(save_p);
Recalculate slope vectors at render time
2024-01-30 17:29:38 +00:00
slope->moved = true;
Implement object-defined floor sprite slopes.
2020-10-14 03:57:13 +00:00
}
Add "drawonlyforplayer" and "dontdrawforviewmobj"
2023-06-29 22:09:20 +00:00
if (diff2 & MD2_DRAWONLYFORPLAYER)
mobj->drawonlyforplayer = &players[READUINT8(save_p)];
if (diff2 & MD2_DONTDRAWFORVIEWMOBJ)
mobj->dontdrawforviewmobj = (mobj_t *)(size_t)READUINT32(save_p);
Turn dispoffset into a mobj field
2022-01-13 07:53:26 +00:00
if (diff2 & MD2_DISPOFFSET)
mobj->dispoffset = READINT32(save_p);
else
mobj->dispoffset = mobj->info->dispoffset;
Add 'translation' object property
2023-10-30 02:34:18 +00:00
if (diff2 & MD2_TRANSLATION)
mobj->translation = READUINT16(save_p);
Add alpha support for mobjs
2024-02-25 01:04:48 +00:00
if (diff2 & MD2_ALPHA)
Make alpha use fixed_t and add alpha field to precipmobj_t
2024-03-01 21:29:39 +00:00
mobj->alpha = READFIXED(save_p);
Fix a bug that !2382 introduced
2024-06-26 20:14:30 +00:00
else
mobj->alpha = FRACUNIT;
SRB2 2.1.14 release
2015-01-01 19:50:31 +00:00
if (diff & MD_REDFLAG)
{
redflag = mobj;
rflagpoint = mobj->spawnpoint;
}
if (diff & MD_BLUEFLAG)
{
blueflag = mobj;
bflagpoint = mobj->spawnpoint;
}
// set sprev, snext, bprev, bnext, subsector
P_SetThingPosition(mobj);
mobj->mobjnum = READUINT32(save_p);
if (mobj->player)
{
if (mobj->eflags & MFE_VERTICALFLIP)
mobj->player->viewz = mobj->z + mobj->height - mobj->player->viewheight;
else
mobj->player->viewz = mobj->player->mo->z + mobj->player->viewheight;
}
Fix use after free bug
2022-11-12 23:20:03 +00:00
if (mobj->type == MT_SKYBOX && mobj->spawnpoint)
{
mtag_t tag = Tag_FGet(&mobj->spawnpoint->tags);
if (tag >= 0 && tag <= 15)
{
if (mobj->spawnpoint->args[0])
skyboxcenterpnts[tag] = mobj;
else
skyboxviewpnts[tag] = mobj;
}
}
SRB2 2.1.14 release
2015-01-01 19:50:31 +00:00
mobj->info = (mobjinfo_t *)next; // temporarily, set when leave this function
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
Move mobj interpolators to r_fps
2022-04-23 18:13:58 +00:00
R_AddMobjInterpolator(mobj);
Add mobj interpolator on load netgame
2022-04-23 17:49:54 +00:00
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
return &mobj->thinker;
SRB2 2.1.14 release
2015-01-01 19:50:31 +00:00
}
Refactor T_NoEnemiesSector
2020-04-18 07:21:04 +00:00
static thinker_t* LoadNoEnemiesThinker(actionf_p1 thinker)
{
noenemies_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
ht->thinker.function.acp1 = thinker;
ht->sourceline = LoadLine(READUINT32(save_p));
return &ht->thinker;
}
Make T_BounceCheese use its own thinker struct
2020-04-18 08:45:21 +00:00
static thinker_t* LoadBounceCheeseThinker(actionf_p1 thinker)
{
bouncecheese_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
ht->thinker.function.acp1 = thinker;
ht->sourceline = LoadLine(READUINT32(save_p));
ht->sector = LoadSector(READUINT32(save_p));
ht->speed = READFIXED(save_p);
ht->distance = READFIXED(save_p);
ht->floorwasheight = READFIXED(save_p);
ht->ceilingwasheight = READFIXED(save_p);
ht->low = READCHAR(save_p);
Make new thinker loading functions set floordata/ceilingdata where necessary
2020-04-26 16:54:03 +00:00
if (ht->sector)
ht->sector->ceilingdata = ht;
Make T_BounceCheese use its own thinker struct
2020-04-18 08:45:21 +00:00
return &ht->thinker;
}
Refactor T_ContinuousFalling
2020-04-17 23:42:13 +00:00
static thinker_t* LoadContinuousFallThinker(actionf_p1 thinker)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Refactor T_ContinuousFalling
2020-04-17 23:42:13 +00:00
continuousfall_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
ht->thinker.function.acp1 = thinker;
ht->sector = LoadSector(READUINT32(save_p));
ht->speed = READFIXED(save_p);
ht->direction = READINT32(save_p);
ht->floorstartheight = READFIXED(save_p);
ht->ceilingstartheight = READFIXED(save_p);
ht->destheight = READFIXED(save_p);
Make new thinker loading functions set floordata/ceilingdata where necessary
2020-04-26 16:54:03 +00:00
if (ht->sector)
{
ht->sector->ceilingdata = ht;
ht->sector->floordata = ht;
}
Refactor T_ContinuousFalling
2020-04-17 23:42:13 +00:00
return &ht->thinker;
}
Make T_MarioBlock use its own thinker data structure
2020-04-18 00:05:23 +00:00
static thinker_t* LoadMarioBlockThinker(actionf_p1 thinker)
{
mariothink_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
ht->thinker.function.acp1 = thinker;
ht->sector = LoadSector(READUINT32(save_p));
ht->speed = READFIXED(save_p);
ht->direction = READINT32(save_p);
ht->floorstartheight = READFIXED(save_p);
ht->ceilingstartheight = READFIXED(save_p);
ht->tag = READINT16(save_p);
Make new thinker loading functions set floordata/ceilingdata where necessary
2020-04-26 16:54:03 +00:00
if (ht->sector)
{
ht->sector->ceilingdata = ht;
ht->sector->floordata = ht;
}
Make T_MarioBlock use its own thinker data structure
2020-04-18 00:05:23 +00:00
return &ht->thinker;
}
Eradicate levelspecthink_t
2020-04-18 09:05:58 +00:00
static thinker_t* LoadMarioCheckThinker(actionf_p1 thinker)
{
mariocheck_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
ht->thinker.function.acp1 = thinker;
ht->sourceline = LoadLine(READUINT32(save_p));
ht->sector = LoadSector(READUINT32(save_p));
Eradicate levelspecthink_t
2020-04-18 09:05:58 +00:00
return &ht->thinker;
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Refactor T_ThwompSector
2020-04-18 08:26:03 +00:00
static thinker_t* LoadThwompThinker(actionf_p1 thinker)
{
thwomp_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
ht->thinker.function.acp1 = thinker;
ht->sourceline = LoadLine(READUINT32(save_p));
ht->sector = LoadSector(READUINT32(save_p));
ht->crushspeed = READFIXED(save_p);
ht->retractspeed = READFIXED(save_p);
ht->direction = READINT32(save_p);
ht->floorstartheight = READFIXED(save_p);
ht->ceilingstartheight = READFIXED(save_p);
ht->delay = READINT32(save_p);
ht->tag = READINT16(save_p);
ht->sound = READUINT16(save_p);
Make new thinker loading functions set floordata/ceilingdata where necessary
2020-04-26 16:54:03 +00:00
if (ht->sector)
{
ht->sector->ceilingdata = ht;
ht->sector->floordata = ht;
}
Refactor T_ThwompSector
2020-04-18 08:26:03 +00:00
return &ht->thinker;
}
Refactor T_FloatSector
2020-04-17 22:26:49 +00:00
static thinker_t* LoadFloatThinker(actionf_p1 thinker)
{
floatthink_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
ht->thinker.function.acp1 = thinker;
ht->sourceline = LoadLine(READUINT32(save_p));
ht->sector = LoadSector(READUINT32(save_p));
ht->tag = READINT16(save_p);
return &ht->thinker;
}
Make T_EachTimeThinker use its own struct
2020-04-17 12:00:48 +00:00
static thinker_t* LoadEachTimeThinker(actionf_p1 thinker)
{
size_t i;
eachtime_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
ht->thinker.function.acp1 = thinker;
ht->sourceline = LoadLine(READUINT32(save_p));
for (i = 0; i < MAXPLAYERS; i++)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Make T_EachTimeThinker use its own struct
2020-04-17 12:00:48 +00:00
ht->playersInArea[i] = READCHAR(save_p);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
Make T_EachTimeThinker use its own struct
2020-04-17 12:00:48 +00:00
ht->triggerOnExit = READCHAR(save_p);
return &ht->thinker;
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Make T_RaiseSector use its own thinker struct instead of levelspecthink_t
2020-04-17 07:58:53 +00:00
static thinker_t* LoadRaiseThinker(actionf_p1 thinker)
{
raise_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
ht->thinker.function.acp1 = thinker;
Store tag instead of sourceline in raise thinker
2020-04-27 10:54:08 +00:00
ht->tag = READINT16(save_p);
Make T_RaiseSector use its own thinker struct instead of levelspecthink_t
2020-04-17 07:58:53 +00:00
ht->sector = LoadSector(READUINT32(save_p));
ht->ceilingbottom = READFIXED(save_p);
ht->ceilingtop = READFIXED(save_p);
ht->basespeed = READFIXED(save_p);
ht->extraspeed = READFIXED(save_p);
ht->shaketimer = READUINT8(save_p);
ht->flags = READUINT8(save_p);
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
return &ht->thinker;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
static thinker_t* LoadCeilingThinker(actionf_p1 thinker)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
ceiling_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
ht->thinker.function.acp1 = thinker;
ht->type = READUINT8(save_p);
ht->sector = LoadSector(READUINT32(save_p));
ht->bottomheight = READFIXED(save_p);
ht->topheight = READFIXED(save_p);
ht->speed = READFIXED(save_p);
ht->delay = READFIXED(save_p);
ht->delaytimer = READFIXED(save_p);
ht->crush = READUINT8(save_p);
ht->texture = READINT32(save_p);
ht->direction = READINT32(save_p);
Linedef type 403: Allow executor chaining and flat change at the same time
2021-06-26 13:28:28 +00:00
ht->tag = READINT16(save_p);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
ht->origspeed = READFIXED(save_p);
ht->sourceline = READFIXED(save_p);
if (ht->sector)
ht->sector->ceilingdata = ht;
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
return &ht->thinker;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
static thinker_t* LoadFloormoveThinker(actionf_p1 thinker)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
floormove_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
ht->thinker.function.acp1 = thinker;
ht->type = READUINT8(save_p);
ht->crush = READUINT8(save_p);
ht->sector = LoadSector(READUINT32(save_p));
ht->direction = READINT32(save_p);
ht->texture = READINT32(save_p);
ht->floordestheight = READFIXED(save_p);
ht->speed = READFIXED(save_p);
ht->origspeed = READFIXED(save_p);
ht->delay = READFIXED(save_p);
ht->delaytimer = READFIXED(save_p);
Linedef type 403: Allow executor chaining and flat change at the same time
2021-06-26 13:28:28 +00:00
ht->tag = READINT16(save_p);
Floor/ceiling movers: Stop abusing the texture variable to store the sourceline
2021-06-26 14:25:14 +00:00
ht->sourceline = READFIXED(save_p);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (ht->sector)
ht->sector->floordata = ht;
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
return &ht->thinker;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
static thinker_t* LoadLightflashThinker(actionf_p1 thinker)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
lightflash_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
ht->thinker.function.acp1 = thinker;
ht->sector = LoadSector(READUINT32(save_p));
ht->maxlight = READINT32(save_p);
ht->minlight = READINT32(save_p);
if (ht->sector)
ht->sector->lightingdata = ht;
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
return &ht->thinker;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
static thinker_t* LoadStrobeThinker(actionf_p1 thinker)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
strobe_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
ht->thinker.function.acp1 = thinker;
ht->sector = LoadSector(READUINT32(save_p));
ht->count = READINT32(save_p);
Make light levels in thinkers INT16
2021-09-19 14:25:27 +00:00
ht->minlight = READINT16(save_p);
ht->maxlight = READINT16(save_p);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
ht->darktime = READINT32(save_p);
ht->brighttime = READINT32(save_p);
if (ht->sector)
ht->sector->lightingdata = ht;
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
return &ht->thinker;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
static thinker_t* LoadGlowThinker(actionf_p1 thinker)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
glow_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
ht->thinker.function.acp1 = thinker;
ht->sector = LoadSector(READUINT32(save_p));
Make light levels in thinkers INT16
2021-09-19 14:25:27 +00:00
ht->minlight = READINT16(save_p);
ht->maxlight = READINT16(save_p);
ht->direction = READINT16(save_p);
ht->speed = READINT16(save_p);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (ht->sector)
ht->sector->lightingdata = ht;
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
return &ht->thinker;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
Remove bogus comments from p_saveg.c
2020-05-01 09:25:32 +00:00
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
static thinker_t* LoadFireflickerThinker(actionf_p1 thinker)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
fireflicker_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
ht->thinker.function.acp1 = thinker;
ht->sector = LoadSector(READUINT32(save_p));
ht->count = READINT32(save_p);
ht->resetcount = READINT32(save_p);
Make light levels in thinkers INT16
2021-09-19 14:25:27 +00:00
ht->maxlight = READINT16(save_p);
ht->minlight = READINT16(save_p);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (ht->sector)
ht->sector->lightingdata = ht;
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
return &ht->thinker;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
Remove bogus comments from p_saveg.c
2020-05-01 09:25:32 +00:00
Remove obsolete stuff from elevator_t
2020-04-26 16:38:45 +00:00
static thinker_t* LoadElevatorThinker(actionf_p1 thinker, boolean setplanedata)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
elevator_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
ht->thinker.function.acp1 = thinker;
ht->type = READUINT8(save_p);
ht->sector = LoadSector(READUINT32(save_p));
ht->actionsector = LoadSector(READUINT32(save_p));
ht->direction = READINT32(save_p);
ht->floordestheight = READFIXED(save_p);
ht->ceilingdestheight = READFIXED(save_p);
ht->speed = READFIXED(save_p);
ht->origspeed = READFIXED(save_p);
ht->low = READFIXED(save_p);
ht->high = READFIXED(save_p);
ht->distance = READFIXED(save_p);
ht->delay = READFIXED(save_p);
ht->delaytimer = READFIXED(save_p);
ht->floorwasheight = READFIXED(save_p);
ht->ceilingwasheight = READFIXED(save_p);
ht->sourceline = LoadLine(READUINT32(save_p));
Remove obsolete stuff from elevator_t
2020-04-26 16:38:45 +00:00
if (ht->sector && setplanedata)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Remove obsolete stuff from elevator_t
2020-04-26 16:38:45 +00:00
ht->sector->ceilingdata = ht;
ht->sector->floordata = ht;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
return &ht->thinker;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
Make T_StartCrumble use its own thinker data structure
2020-04-26 09:55:10 +00:00
static thinker_t* LoadCrumbleThinker(actionf_p1 thinker)
{
crumble_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
ht->thinker.function.acp1 = thinker;
T_StartCrumble refactoring, part 1
2020-04-26 14:51:14 +00:00
ht->sourceline = LoadLine(READUINT32(save_p));
Make T_StartCrumble use its own thinker data structure
2020-04-26 09:55:10 +00:00
ht->sector = LoadSector(READUINT32(save_p));
ht->actionsector = LoadSector(READUINT32(save_p));
T_StartCrumble refactoring, part 1
2020-04-26 14:51:14 +00:00
ht->player = LoadPlayer(READUINT32(save_p));
Make T_StartCrumble use its own thinker data structure
2020-04-26 09:55:10 +00:00
ht->direction = READINT32(save_p);
T_StartCrumble refactoring, part 1
2020-04-26 14:51:14 +00:00
ht->origalpha = READINT32(save_p);
ht->timer = READINT32(save_p);
Make T_StartCrumble use its own thinker data structure
2020-04-26 09:55:10 +00:00
ht->speed = READFIXED(save_p);
ht->floorwasheight = READFIXED(save_p);
ht->ceilingwasheight = READFIXED(save_p);
T_StartCrumble refactoring, part 1
2020-04-26 14:51:14 +00:00
ht->flags = READUINT8(save_p);
Make T_StartCrumble use its own thinker data structure
2020-04-26 09:55:10 +00:00
if (ht->sector)
ht->sector->floordata = ht;
return &ht->thinker;
}
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
static thinker_t* LoadScrollThinker(actionf_p1 thinker)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
scroll_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
ht->thinker.function.acp1 = thinker;
ht->dx = READFIXED(save_p);
ht->dy = READFIXED(save_p);
ht->affectee = READINT32(save_p);
ht->control = READINT32(save_p);
ht->last_height = READFIXED(save_p);
ht->vdx = READFIXED(save_p);
ht->vdy = READFIXED(save_p);
ht->accel = READINT32(save_p);
ht->exclusive = READINT32(save_p);
ht->type = READUINT8(save_p);
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
return &ht->thinker;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
static inline thinker_t* LoadFrictionThinker(actionf_p1 thinker)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
friction_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
ht->thinker.function.acp1 = thinker;
ht->friction = READINT32(save_p);
ht->movefactor = READINT32(save_p);
ht->affectee = READINT32(save_p);
ht->referrer = READINT32(save_p);
ht->roverfriction = READUINT8(save_p);
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
return &ht->thinker;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
static thinker_t* LoadPusherThinker(actionf_p1 thinker)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
pusher_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
ht->thinker.function.acp1 = thinker;
ht->type = READUINT8(save_p);
Refactor wind/current thinker
2021-07-01 18:05:23 +00:00
ht->x_mag = READFIXED(save_p);
ht->y_mag = READFIXED(save_p);
ht->z_mag = READFIXED(save_p);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
ht->affectee = READINT32(save_p);
ht->roverpusher = READUINT8(save_p);
ht->referrer = READINT32(save_p);
ht->exclusive = READINT32(save_p);
ht->slider = READINT32(save_p);
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
return &ht->thinker;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
static inline thinker_t* LoadLaserThinker(actionf_p1 thinker)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
laserthink_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
ht->thinker.function.acp1 = thinker;
Make the laser thinker find the FOF itself instead of storing it in the thinker struct
2020-05-02 08:03:16 +00:00
ht->tag = READINT16(save_p);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
ht->sourceline = LoadLine(READUINT32(save_p));
Store "no bosses" setting for lasers in thinker instead of checking sourceline.
2020-04-27 11:09:57 +00:00
ht->nobosses = READUINT8(save_p);
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
return &ht->thinker;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
static inline thinker_t* LoadLightlevelThinker(actionf_p1 thinker)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
lightlevel_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
ht->thinker.function.acp1 = thinker;
ht->sector = LoadSector(READUINT32(save_p));
Use percentage calc instead of interval decrement for tic-based timing
2018-09-11 14:05:25 +00:00
ht->sourcelevel = READINT16(save_p);
ht->destlevel = READINT16(save_p);
The thinker is entirely unified now, and there is no difference in the light levels between the "old" behavior and this one now.
2018-09-15 10:21:25 +00:00
ht->fixedcurlevel = READFIXED(save_p);
ht->fixedpertic = READFIXED(save_p);
Replace firsttic with decrement timer
2018-09-10 00:18:43 +00:00
ht->timer = READINT32(save_p);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (ht->sector)
ht->sector->lightingdata = ht;
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
return &ht->thinker;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
static inline thinker_t* LoadExecutorThinker(actionf_p1 thinker)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
executor_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
ht->thinker.function.acp1 = thinker;
ht->line = LoadLine(READUINT32(save_p));
ht->caller = LoadMobj(READUINT32(save_p));
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
ht->sector = LoadSector(READUINT32(save_p));
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
ht->timer = READINT32(save_p);
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
return &ht->thinker;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
static inline thinker_t* LoadDisappearThinker(actionf_p1 thinker)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
disappear_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
ht->thinker.function.acp1 = thinker;
ht->appeartime = READUINT32(save_p);
ht->disappeartime = READUINT32(save_p);
ht->offset = READUINT32(save_p);
ht->timer = READUINT32(save_p);
ht->affectee = READINT32(save_p);
ht->sourceline = READINT32(save_p);
ht->exists = READINT32(save_p);
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
return &ht->thinker;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
static inline thinker_t* LoadFadeThinker(actionf_p1 thinker)
Define fader thinker names
2018-03-30 19:27:37 +00:00
{
453: Mixed D+C fixes; unused param cast in P_FadeFakeFloor
2018-09-15 05:04:15 +00:00
sector_t *ss;
Define fader thinker names
2018-03-30 19:27:37 +00:00
fade_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
ht->thinker.function.acp1 = thinker;
453: Use new colormap netsync for fade FOF thinker
2018-09-17 04:34:03 +00:00
ht->dest_exc = GetNetColormapFromList(READUINT32(save_p));
Store sectornum/ffloornum as UINT32, not INT32
2018-09-10 03:52:36 +00:00
ht->sectornum = READUINT32(save_p);
ht->ffloornum = READUINT32(save_p);
Add alpha clamping so OpenGL conforms to Software's translucent levels
2018-08-17 20:27:32 +00:00
ht->alpha = READINT32(save_p);
Use percentage calc instead of interval decrement for tic-based fading
2018-09-11 14:28:24 +00:00
ht->sourcevalue = READINT16(save_p);
Allow immediate alpha setting when speed = 0; refactoring * Separate fade logic into P_FindFakeFloorsDoAlpha, P_DoFakeFloorAlpha * Change INT32 destvalue and speed to INT16
2018-04-07 11:09:04 +00:00
ht->destvalue = READINT16(save_p);
Finalize light level on fade finish (not forced stop) * Added destlightlevel property to fade_t * Fixed dotranslucent, dolighting, docollision order weirdness in function calls
2018-09-09 21:19:49 +00:00
ht->destlightlevel = READINT16(save_p);
Allow immediate alpha setting when speed = 0; refactoring * Separate fade logic into P_FindFakeFloorsDoAlpha, P_DoFakeFloorAlpha * Change INT32 destvalue and speed to INT16
2018-04-07 11:09:04 +00:00
ht->speed = READINT16(save_p);
Replace firsttic with timer increment
2018-09-10 00:45:12 +00:00
ht->ticbased = (boolean)READUINT8(save_p);
ht->timer = READINT32(save_p);
Refactor flag handling toggles
2018-04-07 03:14:48 +00:00
ht->doexists = READUINT8(save_p);
ht->dotranslucent = READUINT8(save_p);
Add dolighting flag to FadeFakeFloor thinker
2018-09-09 00:41:45 +00:00
ht->dolighting = READUINT8(save_p);
Fade FOF colormap support
2018-09-12 20:57:35 +00:00
ht->docolormap = READUINT8(save_p);
Finalize light level on fade finish (not forced stop) * Added destlightlevel property to fade_t * Fixed dotranslucent, dolighting, docollision order weirdness in function calls
2018-09-09 21:19:49 +00:00
ht->docollision = READUINT8(save_p);
Rename dofadeinonly to doghostfade * Ghost fading: when transitioning to/from alpha=0, don't set solid/tangibility until fade is finished
2018-08-14 14:18:08 +00:00
ht->doghostfade = READUINT8(save_p);
Refactor function and variable names; change defaults for fake floor fader line flags
2018-08-17 19:13:05 +00:00
ht->exactalpha = READUINT8(save_p);
Add fadingdata to sector_t
2018-03-31 04:40:41 +00:00
453: Mixed D+C fixes; unused param cast in P_FadeFakeFloor
2018-09-15 05:04:15 +00:00
ss = LoadSector(ht->sectornum);
Move fading thinker to ffloor_t.fadingdata
2018-08-17 06:28:52 +00:00
if (ss)
{
size_t j = 0; // ss->ffloors is saved as ffloor #0, ss->ffloors->next is #1, etc
ffloor_t *rover;
for (rover = ss->ffloors; rover; rover = rover->next)
{
if (j == ht->ffloornum)
{
ht->rover = rover;
rover->fadingdata = ht;
break;
}
j++;
}
}
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
return &ht->thinker;
Merge branch 'colormap-overhaul-fade' into le-fadefof
2018-09-18 15:05:30 +00:00
}
Add fadingdata to sector_t
2018-03-31 04:40:41 +00:00
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
static inline thinker_t* LoadFadeColormapThinker(actionf_p1 thinker)
Fade colormap special 455! And stop fade colormap 456 * Added T_FadeColormap thinker and netsync * Added sector_t fadecolormapdata property
2018-09-12 13:06:38 +00:00
{
fadecolormap_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
ht->thinker.function.acp1 = thinker;
ht->sector = LoadSector(READUINT32(save_p));
455: Fade colormap netsync use new colormap saving
2018-09-17 00:27:24 +00:00
ht->source_exc = GetNetColormapFromList(READUINT32(save_p));
ht->dest_exc = GetNetColormapFromList(READUINT32(save_p));
455: Add speed increment timing (~EFFECT4) to FadeColormap
2018-09-13 14:38:15 +00:00
ht->ticbased = (boolean)READUINT8(save_p);
Fade colormap special 455! And stop fade colormap 456 * Added T_FadeColormap thinker and netsync * Added sector_t fadecolormapdata property
2018-09-12 13:06:38 +00:00
ht->duration = READINT32(save_p);
ht->timer = READINT32(save_p);
if (ht->sector)
ht->sector->fadecolormapdata = ht;
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
return &ht->thinker;
Define fader thinker names
2018-03-30 19:27:37 +00:00
}
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
static inline thinker_t* LoadPlaneDisplaceThinker(actionf_p1 thinker)
Add code for saving/loading planedisplace_t thinkers to/from $$$.sav
2017-01-20 20:17:40 +00:00
{
planedisplace_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
ht->thinker.function.acp1 = thinker;
Dynamic slopes now use thinkers. * Moved dynamic slope-related data into its own thinker. * Vertex slopes no longer use the mapthings directly. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-19 12:14:43 +00:00
Add code for saving/loading planedisplace_t thinkers to/from $$$.sav
2017-01-20 20:17:40 +00:00
ht->affectee = READINT32(save_p);
ht->control = READINT32(save_p);
ht->last_height = READFIXED(save_p);
ht->speed = READFIXED(save_p);
ht->type = READUINT8(save_p);
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
return &ht->thinker;
Add code for saving/loading planedisplace_t thinkers to/from $$$.sav
2017-01-20 20:17:40 +00:00
}
Separate thinker structs for dynamic line and vertex slopes
2021-12-29 12:53:38 +00:00
static inline thinker_t* LoadDynamicLineSlopeThinker(actionf_p1 thinker)
Dynamic slopes now use thinkers. * Moved dynamic slope-related data into its own thinker. * Vertex slopes no longer use the mapthings directly. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-19 12:14:43 +00:00
{
Separate thinker structs for dynamic line and vertex slopes
2021-12-29 12:53:38 +00:00
dynlineplanethink_t* ht = Z_Malloc(sizeof(*ht), PU_LEVSPEC, NULL);
Dynamic slopes now use thinkers. * Moved dynamic slope-related data into its own thinker. * Vertex slopes no longer use the mapthings directly. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-19 12:14:43 +00:00
ht->thinker.function.acp1 = thinker;
ht->type = READUINT8(save_p);
ht->slope = LoadSlope(READUINT32(save_p));
ht->sourceline = LoadLine(READUINT32(save_p));
ht->extent = READFIXED(save_p);
Separate thinker structs for dynamic line and vertex slopes
2021-12-29 12:53:38 +00:00
return &ht->thinker;
}
static inline thinker_t* LoadDynamicVertexSlopeThinker(actionf_p1 thinker)
{
Add "relative" setting to linedef type 799 and adapt it to UDMF
2021-12-29 14:29:59 +00:00
size_t i;
Separate thinker structs for dynamic line and vertex slopes
2021-12-29 12:53:38 +00:00
dynvertexplanethink_t* ht = Z_Malloc(sizeof(*ht), PU_LEVSPEC, NULL);
ht->thinker.function.acp1 = thinker;
ht->slope = LoadSlope(READUINT32(save_p));
Add "relative" setting to linedef type 799 and adapt it to UDMF
2021-12-29 14:29:59 +00:00
for (i = 0; i < 3; i++)
ht->secs[i] = LoadSector(READUINT32(save_p));
Dynamic slopes now use thinkers. * Moved dynamic slope-related data into its own thinker. * Vertex slopes no longer use the mapthings directly. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-19 12:14:43 +00:00
READMEM(save_p, ht->vex, sizeof(ht->vex));
Add "relative" setting to linedef type 799 and adapt it to UDMF
2021-12-29 14:29:59 +00:00
READMEM(save_p, ht->origsecheights, sizeof(ht->origsecheights));
READMEM(save_p, ht->origvecheights, sizeof(ht->origvecheights));
ht->relative = READUINT8(save_p);
Merge branch 'slopethinkers' into thinkerlists Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-21 09:45:59 +00:00
return &ht->thinker;
Add code for saving/loading planedisplace_t thinkers to/from $$$.sav
2017-01-20 20:17:40 +00:00
}
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
static inline thinker_t* LoadPolyrotatetThinker(actionf_p1 thinker)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
polyrotate_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
ht->thinker.function.acp1 = thinker;
ht->polyObjNum = READINT32(save_p);
ht->speed = READINT32(save_p);
ht->distance = READINT32(save_p);
Sync turnobjs for polyrotate_t thinkers in netgames
2020-06-04 20:31:26 +00:00
ht->turnobjs = READUINT8(save_p);
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
return &ht->thinker;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
static thinker_t* LoadPolymoveThinker(actionf_p1 thinker)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
polymove_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
ht->thinker.function.acp1 = thinker;
ht->polyObjNum = READINT32(save_p);
ht->speed = READINT32(save_p);
ht->momx = READFIXED(save_p);
ht->momy = READFIXED(save_p);
ht->distance = READINT32(save_p);
ht->angle = READANGLE(save_p);
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
return &ht->thinker;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
static inline thinker_t* LoadPolywaypointThinker(actionf_p1 thinker)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
polywaypoint_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
ht->thinker.function.acp1 = thinker;
ht->polyObjNum = READINT32(save_p);
ht->speed = READINT32(save_p);
ht->sequence = READINT32(save_p);
ht->pointnum = READINT32(save_p);
ht->direction = READINT32(save_p);
Store PolyObject waypoint return behavior in an enum
2020-05-13 14:21:47 +00:00
ht->returnbehavior = READUINT8(save_p);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
ht->continuous = READUINT8(save_p);
ht->stophere = READUINT8(save_p);
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
return &ht->thinker;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
static inline thinker_t* LoadPolyslidedoorThinker(actionf_p1 thinker)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
polyslidedoor_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
ht->thinker.function.acp1 = thinker;
ht->polyObjNum = READINT32(save_p);
ht->delay = READINT32(save_p);
ht->delayCount = READINT32(save_p);
ht->initSpeed = READINT32(save_p);
ht->speed = READINT32(save_p);
ht->initDistance = READINT32(save_p);
ht->distance = READINT32(save_p);
ht->initAngle = READUINT32(save_p);
ht->angle = READUINT32(save_p);
ht->revAngle = READUINT32(save_p);
ht->momx = READFIXED(save_p);
ht->momy = READFIXED(save_p);
ht->closing = READUINT8(save_p);
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
return &ht->thinker;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
static inline thinker_t* LoadPolyswingdoorThinker(actionf_p1 thinker)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
polyswingdoor_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
ht->thinker.function.acp1 = thinker;
ht->polyObjNum = READINT32(save_p);
ht->delay = READINT32(save_p);
ht->delayCount = READINT32(save_p);
ht->initSpeed = READINT32(save_p);
ht->speed = READINT32(save_p);
ht->initDistance = READINT32(save_p);
ht->distance = READINT32(save_p);
ht->closing = READUINT8(save_p);
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
return &ht->thinker;
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
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
static inline thinker_t* LoadPolydisplaceThinker(actionf_p1 thinker)
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
{
polydisplace_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
ht->thinker.function.acp1 = thinker;
ht->polyObjNum = READINT32(save_p);
ht->controlSector = LoadSector(READUINT32(save_p));
ht->dx = READFIXED(save_p);
ht->dy = READFIXED(save_p);
ht->oldHeights = READFIXED(save_p);
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
return &ht->thinker;
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
}
Initial polyobj fade skeleton
2018-09-07 19:27:18 +00:00
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
static inline thinker_t* LoadPolyrotdisplaceThinker(actionf_p1 thinker)
Implement displacement-based polyobject rotation. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-05 09:50:59 +00:00
{
polyrotdisplace_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
ht->thinker.function.acp1 = thinker;
ht->polyObjNum = READINT32(save_p);
ht->controlSector = LoadSector(READUINT32(save_p));
ht->rotscale = READFIXED(save_p);
ht->turnobjs = READUINT8(save_p);
ht->oldHeights = READFIXED(save_p);
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
return &ht->thinker;
Implement displacement-based polyobject rotation. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-05 09:50:59 +00:00
}
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
static thinker_t* LoadPolyfadeThinker(actionf_p1 thinker)
Initial polyobj fade skeleton
2018-09-07 19:27:18 +00:00
{
polyfade_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
ht->thinker.function.acp1 = thinker;
ht->polyObjNum = READINT32(save_p);
492 PolyObj Fade, 491 PolyObj Translucency, 490 PolyObj changes * 490: Set proper render flags according to spawnflags * 491: Add relative calc (EFFECT3) and Front X alpha param (DONTPEGTOP) * 492: * Tic-based (EFFECT4) and speed timing * Add relative calc (EFFECT3) and Front X alpha param (DONTPEGTOP) * Set proper render flags according to spawnflags * Fix OpenGL >= NUMTRANSMAPS render bug
2018-09-13 04:04:50 +00:00
ht->sourcevalue = READINT32(save_p);
Polyobject Fade logic
2018-09-09 05:08:02 +00:00
ht->destvalue = READINT32(save_p);
ht->docollision = (boolean)READUINT8(save_p);
ht->doghostfade = (boolean)READUINT8(save_p);
492 PolyObj Fade, 491 PolyObj Translucency, 490 PolyObj changes * 490: Set proper render flags according to spawnflags * 491: Add relative calc (EFFECT3) and Front X alpha param (DONTPEGTOP) * 492: * Tic-based (EFFECT4) and speed timing * Add relative calc (EFFECT3) and Front X alpha param (DONTPEGTOP) * Set proper render flags according to spawnflags * Fix OpenGL >= NUMTRANSMAPS render bug
2018-09-13 04:04:50 +00:00
ht->ticbased = (boolean)READUINT8(save_p);
492: Merge speed and duration logic for fade polyobject
2018-09-16 00:00:04 +00:00
ht->duration = READINT32(save_p);
Replace firsttic with timer increment
2018-09-10 01:01:00 +00:00
ht->timer = READINT32(save_p);
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
return &ht->thinker;
Initial polyobj fade skeleton
2018-09-07 19:27:18 +00:00
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
static void P_NetUnArchiveThinkers(void)
{
thinker_t *currentthinker;
thinker_t *next;
UINT8 tclass;
UINT8 restoreNum = false;
Fix sector floordata/ceilingdata/lightingdata pointers not being NULL when they should be This fixes ERCZ's lava falls not moving after joining a netgame at that stage. Possibly explains other various floor/ceiling related netgame quirks that haven't been noticed until now, maybe even in multiplayer levels.
2017-01-03 18:47:46 +00:00
UINT32 i;
Keeping a total of thinkers saved/loaded and print the total in netplay devmode Not a fix for anything, probably just useful for debugging
2017-06-12 16:55:15 +00:00
UINT32 numloaded = 0;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
SRB2 2.1.2 release
2014-03-17 12:13:16 +00:00
if (READUINT32(save_p) != ARCHIVEBLOCK_THINKERS)
I_Error("Bad $$$.sav at archive block Thinkers");
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// remove all the current thinkers
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
for (i = 0; i < NUM_THINKERLISTS; i++)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
currentthinker = thlist[i].next;
for (currentthinker = thlist[i].next; currentthinker != &thlist[i]; currentthinker = next)
{
next = currentthinker->next;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Fix use after free bug
2022-11-12 23:20:03 +00:00
if (currentthinker->function.acp1 == (actionf_p1)P_MobjThinker || currentthinker->function.acp1 == (actionf_p1)P_NullPrecipThinker)
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
P_RemoveSavegameMobj((mobj_t *)currentthinker); // item isn't saved, don't remove it
else
Fix use after free bug
2022-11-12 23:20:03 +00:00
{
(next->prev = currentthinker->prev)->next = next;
R_DestroyLevelInterpolators(currentthinker);
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
Z_Free(currentthinker);
Fix use after free bug
2022-11-12 23:20:03 +00:00
}
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
// we don't want the removed mobjs to come back
iquetail = iquehead = 0;
P_InitThinkers();
Fix sector floordata/ceilingdata/lightingdata pointers not being NULL when they should be This fixes ERCZ's lava falls not moving after joining a netgame at that stage. Possibly explains other various floor/ceiling related netgame quirks that haven't been noticed until now, maybe even in multiplayer levels.
2017-01-03 18:47:46 +00:00
// clear sector thinker pointers so they don't point to non-existant thinkers for all of eternity
for (i = 0; i < numsectors; i++)
{
Fade colormap special 455! And stop fade colormap 456 * Added T_FadeColormap thinker and netsync * Added sector_t fadecolormapdata property
2018-09-12 13:06:38 +00:00
sectors[i].floordata = sectors[i].ceilingdata = sectors[i].lightingdata = sectors[i].fadecolormapdata = NULL;
Move fadingdata (fade_t thinker) to line_t
2018-08-17 04:32:20 +00:00
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// read in saved thinkers
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
for (i = 0; i < NUM_THINKERLISTS; i++)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
for (;;)
{
Fix building with MSVC
2019-07-29 23:02:45 +00:00
thinker_t* th = NULL;
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
tclass = READUINT8(save_p);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
if (tclass == tc_end)
break; // leave the saved thinker reading loop
numloaded++;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
switch (tclass)
{
case tc_mobj:
th = LoadMobjThinker((actionf_p1)P_MobjThinker);
break;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
case tc_ceiling:
th = LoadCeilingThinker((actionf_p1)T_MoveCeiling);
break;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
case tc_crushceiling:
th = LoadCeilingThinker((actionf_p1)T_CrushCeiling);
break;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
case tc_floor:
th = LoadFloormoveThinker((actionf_p1)T_MoveFloor);
break;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
case tc_flash:
th = LoadLightflashThinker((actionf_p1)T_LightningFlash);
break;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
case tc_strobe:
th = LoadStrobeThinker((actionf_p1)T_StrobeFlash);
break;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
case tc_glow:
th = LoadGlowThinker((actionf_p1)T_Glow);
break;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
case tc_fireflicker:
th = LoadFireflickerThinker((actionf_p1)T_FireFlicker);
break;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
case tc_elevator:
Remove obsolete stuff from elevator_t
2020-04-26 16:38:45 +00:00
th = LoadElevatorThinker((actionf_p1)T_MoveElevator, true);
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
break;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
case tc_continuousfalling:
Refactor T_ContinuousFalling
2020-04-17 23:42:13 +00:00
th = LoadContinuousFallThinker((actionf_p1)T_ContinuousFalling);
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
break;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
case tc_thwomp:
Refactor T_ThwompSector
2020-04-18 08:26:03 +00:00
th = LoadThwompThinker((actionf_p1)T_ThwompSector);
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
break;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
case tc_noenemies:
Refactor T_NoEnemiesSector
2020-04-18 07:21:04 +00:00
th = LoadNoEnemiesThinker((actionf_p1)T_NoEnemiesSector);
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
break;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
case tc_eachtime:
Make T_EachTimeThinker use its own struct
2020-04-17 12:00:48 +00:00
th = LoadEachTimeThinker((actionf_p1)T_EachTimeThinker);
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
break;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
case tc_raisesector:
Make T_RaiseSector use its own thinker struct instead of levelspecthink_t
2020-04-17 07:58:53 +00:00
th = LoadRaiseThinker((actionf_p1)T_RaiseSector);
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
break;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
case tc_camerascanner:
Remove obsolete stuff from elevator_t
2020-04-26 16:38:45 +00:00
th = LoadElevatorThinker((actionf_p1)T_CameraScanner, false);
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
break;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
case tc_bouncecheese:
Make T_BounceCheese use its own thinker struct
2020-04-18 08:45:21 +00:00
th = LoadBounceCheeseThinker((actionf_p1)T_BounceCheese);
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
break;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
case tc_startcrumble:
Make T_StartCrumble use its own thinker data structure
2020-04-26 09:55:10 +00:00
th = LoadCrumbleThinker((actionf_p1)T_StartCrumble);
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
break;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
case tc_marioblock:
Make T_MarioBlock use its own thinker data structure
2020-04-18 00:05:23 +00:00
th = LoadMarioBlockThinker((actionf_p1)T_MarioBlock);
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
break;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
case tc_marioblockchecker:
Eradicate levelspecthink_t
2020-04-18 09:05:58 +00:00
th = LoadMarioCheckThinker((actionf_p1)T_MarioBlockChecker);
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
break;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
case tc_floatsector:
Refactor T_FloatSector
2020-04-17 22:26:49 +00:00
th = LoadFloatThinker((actionf_p1)T_FloatSector);
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
break;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
case tc_laserflash:
th = LoadLaserThinker((actionf_p1)T_LaserFlash);
break;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
case tc_lightfade:
th = LoadLightlevelThinker((actionf_p1)T_LightFade);
break;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
case tc_executor:
th = LoadExecutorThinker((actionf_p1)T_ExecutorDelay);
restoreNum = true;
break;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
case tc_disappear:
th = LoadDisappearThinker((actionf_p1)T_Disappear);
break;
Add code for saving/loading planedisplace_t thinkers to/from $$$.sav
2017-01-20 20:17:40 +00:00
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
case tc_fade:
th = LoadFadeThinker((actionf_p1)T_Fade);
break;
Define fader thinker names
2018-03-30 19:27:37 +00:00
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
case tc_fadecolormap:
th = LoadFadeColormapThinker((actionf_p1)T_FadeColormap);
break;
Fade colormap special 455! And stop fade colormap 456 * Added T_FadeColormap thinker and netsync * Added sector_t fadecolormapdata property
2018-09-12 13:06:38 +00:00
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
case tc_planedisplace:
th = LoadPlaneDisplaceThinker((actionf_p1)T_PlaneDisplace);
break;
case tc_polyrotate:
th = LoadPolyrotatetThinker((actionf_p1)T_PolyObjRotate);
break;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
case tc_polymove:
th = LoadPolymoveThinker((actionf_p1)T_PolyObjMove);
break;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
case tc_polywaypoint:
th = LoadPolywaypointThinker((actionf_p1)T_PolyObjWaypoint);
break;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
case tc_polyslidedoor:
th = LoadPolyslidedoorThinker((actionf_p1)T_PolyDoorSlide);
break;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
case tc_polyswingdoor:
th = LoadPolyswingdoorThinker((actionf_p1)T_PolyDoorSwing);
break;
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
case tc_polyflag:
th = LoadPolymoveThinker((actionf_p1)T_PolyObjFlag);
break;
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
case tc_polydisplace:
th = LoadPolydisplaceThinker((actionf_p1)T_PolyObjDisplace);
break;
Initial polyobj fade skeleton
2018-09-07 19:27:18 +00:00
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
case tc_polyrotdisplace:
th = LoadPolyrotdisplaceThinker((actionf_p1)T_PolyObjRotDisplace);
break;
Implement displacement-based polyobject rotation. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-05 09:50:59 +00:00
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
case tc_polyfade:
th = LoadPolyfadeThinker((actionf_p1)T_PolyObjFade);
break;
Make SRB2 flat like Earth
2020-03-20 17:55:29 +00:00
Merge branch 'slopethinkers' into thinkerlists Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-21 09:45:59 +00:00
case tc_dynslopeline:
Separate thinker structs for dynamic line and vertex slopes
2021-12-29 12:53:38 +00:00
th = LoadDynamicLineSlopeThinker((actionf_p1)T_DynamicSlopeLine);
Merge branch 'slopethinkers' into thinkerlists Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-21 09:45:59 +00:00
break;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Merge branch 'slopethinkers' into thinkerlists Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-21 09:45:59 +00:00
case tc_dynslopevert:
Separate thinker structs for dynamic line and vertex slopes
2021-12-29 12:53:38 +00:00
th = LoadDynamicVertexSlopeThinker((actionf_p1)T_DynamicSlopeVert);
Merge branch 'slopethinkers' into thinkerlists Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-21 09:45:59 +00:00
break;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
case tc_scroll:
th = LoadScrollThinker((actionf_p1)T_Scroll);
break;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
case tc_friction:
th = LoadFrictionThinker((actionf_p1)T_Friction);
break;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
case tc_pusher:
th = LoadPusherThinker((actionf_p1)T_Pusher);
break;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
default:
I_Error("P_UnarchiveSpecials: Unknown tclass %d in savegame", tclass);
}
if (th)
P_AddThinker(i, th);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
Fixed the thinkerlist issues by removing THINK_LIMBO. Delay-removed thinkers now stay in their list. Also includes toaster's assorted fixes and improvements from target_painted_on_your_ass.
2019-07-12 23:42:03 +00:00
CONS_Debug(DBG_NETPLAY, "%u thinkers loaded in list %d\n", numloaded, i);
}
Keeping a total of thinkers saved/loaded and print the total in netplay devmode Not a fix for anything, probably just useful for debugging
2017-06-12 16:55:15 +00:00
Fix use after free bug
2022-11-12 23:20:03 +00:00
// Set each skyboxmo to the first skybox (or NULL)
skyboxmo[0] = skyboxviewpnts[0];
skyboxmo[1] = skyboxcenterpnts[0];
Fixed the thinkerlist issues by removing THINK_LIMBO. Delay-removed thinkers now stay in their list. Also includes toaster's assorted fixes and improvements from target_painted_on_your_ass.
2019-07-12 23:42:03 +00:00
if (restoreNum)
{
executor_t *delay = NULL;
UINT32 mobjnum;
added a "target" pointer to polywaypoint_t, so the polyobj waypoint thinker doesn't have to re-find the next waypoint every tic
2019-12-27 19:10:14 +00:00
for (currentthinker = thlist[THINK_MAIN].next; currentthinker != &thlist[THINK_MAIN]; currentthinker = currentthinker->next)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Fixed the thinkerlist issues by removing THINK_LIMBO. Delay-removed thinkers now stay in their list. Also includes toaster's assorted fixes and improvements from target_painted_on_your_ass.
2019-07-12 23:42:03 +00:00
if (currentthinker->function.acp1 != (actionf_p1)T_ExecutorDelay)
continue;
delay = (void *)currentthinker;
if (!(mobjnum = (UINT32)(size_t)delay->caller))
continue;
delay->caller = P_FindNewPosition(mobjnum);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
}
}
///////////////////////////////////////////////////////////////////////////////
//
// haleyjd 03/26/06: PolyObject saving code
//
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
#define PD_FLAGS 0x01
#define PD_TRANS 0x02
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
static inline void P_ArchivePolyObj(polyobj_t *po)
{
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
UINT8 diff = 0;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
WRITEINT32(save_p, po->id);
WRITEANGLE(save_p, po->angle);
WRITEFIXED(save_p, po->spawnSpot.x);
WRITEFIXED(save_p, po->spawnSpot.y);
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
if (po->flags != po->spawnflags)
diff |= PD_FLAGS;
WARNING: I HAVE PROBABLY JUST BROKEN 3/4 OF THE GAME WITH THIS COMMIT PolyObject setup is now much simplified: First line alone spawns a PolyObject, PolyObject Params apply extra settings Disabled Explicitly Include Line for the meantime, since goodness knows how anyone's supposed to use that at all (let alone working properly) Starting translucencies from PO Params is stored for reference in netgames git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9000 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-01-22 19:24:40 +00:00
if (po->translucency != po->spawntrans)
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
diff |= PD_TRANS;
WRITEUINT8(save_p, diff);
if (diff & PD_FLAGS)
WRITEINT32(save_p, po->flags);
if (diff & PD_TRANS)
WRITEINT32(save_p, po->translucency);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
static inline void P_UnArchivePolyObj(polyobj_t *po)
{
INT32 id;
UINT32 angle;
fixed_t x, y;
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
UINT8 diff;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// nullify all polyobject thinker pointers;
// the thinkers themselves will fight over who gets the field
// when they first start to run.
po->thinker = NULL;
id = READINT32(save_p);
angle = READANGLE(save_p);
x = READFIXED(save_p);
y = READFIXED(save_p);
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
diff = READUINT8(save_p);
if (diff & PD_FLAGS)
po->flags = READINT32(save_p);
if (diff & PD_TRANS)
po->translucency = READINT32(save_p);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// if the object is bad or isn't in the id hash, we can do nothing more
// with it, so return now
if (po->isBad || po != Polyobj_GetForNum(id))
return;
// rotate and translate polyobject
Polyobj_MoveOnLoad(po, angle, x, y);
}
static inline void P_ArchivePolyObjects(void)
{
INT32 i;
SRB2 2.1.2 release
2014-03-17 12:13:16 +00:00
WRITEUINT32(save_p, ARCHIVEBLOCK_POBJS);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// save number of polyobjects
WRITEINT32(save_p, numPolyObjects);
for (i = 0; i < numPolyObjects; ++i)
P_ArchivePolyObj(&PolyObjects[i]);
}
static inline void P_UnArchivePolyObjects(void)
{
INT32 i, numSavedPolys;
SRB2 2.1.2 release
2014-03-17 12:13:16 +00:00
if (READUINT32(save_p) != ARCHIVEBLOCK_POBJS)
I_Error("Bad $$$.sav at archive block Pobjs");
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
numSavedPolys = READINT32(save_p);
if (numSavedPolys != numPolyObjects)
I_Error("P_UnArchivePolyObjects: polyobj count inconsistency\n");
for (i = 0; i < numSavedPolys; ++i)
P_UnArchivePolyObj(&PolyObjects[i]);
}
Remove bogus comments from p_saveg.c
2020-05-01 09:25:32 +00:00
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
static inline void P_FinishMobjs(void)
{
thinker_t *currentthinker;
mobj_t *mobj;
// put info field there real value
Added a mobj-only list entry for mobj thinkers Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 21:29:20 +00:00
for (currentthinker = thlist[THINK_MOBJ].next; currentthinker != &thlist[THINK_MOBJ];
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
currentthinker = currentthinker->next)
{
Fixed the thinkerlist issues by removing THINK_LIMBO. Delay-removed thinkers now stay in their list. Also includes toaster's assorted fixes and improvements from target_painted_on_your_ass.
2019-07-12 23:42:03 +00:00
if (currentthinker->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
continue;
Fixed more mobj thinker iterator oversights and removed all mobj thinker function checks Mobjs got their own thinker list after all, and disappearing thinkers are automatically purged from their lists and sent to the limbo list. So it's safe to assume all thinkers inside the mobj list must be mobjs. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-21 14:39:57 +00:00
mobj = (mobj_t *)currentthinker;
mobj->info = &mobjinfo[mobj->type];
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
}
static void P_RelinkPointers(void)
{
thinker_t *currentthinker;
mobj_t *mobj;
UINT32 temp;
// use info field (value = oldposition) to relink mobjs
Added a mobj-only list entry for mobj thinkers Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 21:29:20 +00:00
for (currentthinker = thlist[THINK_MOBJ].next; currentthinker != &thlist[THINK_MOBJ];
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
currentthinker = currentthinker->next)
{
Fixed the thinkerlist issues by removing THINK_LIMBO. Delay-removed thinkers now stay in their list. Also includes toaster's assorted fixes and improvements from target_painted_on_your_ass.
2019-07-12 23:42:03 +00:00
if (currentthinker->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
continue;
Fixed more mobj thinker iterator oversights and removed all mobj thinker function checks Mobjs got their own thinker list after all, and disappearing thinkers are automatically purged from their lists and sent to the limbo list. So it's safe to assume all thinkers inside the mobj list must be mobjs. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-21 14:39:57 +00:00
mobj = (mobj_t *)currentthinker;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Fixed more mobj thinker iterator oversights and removed all mobj thinker function checks Mobjs got their own thinker list after all, and disappearing thinkers are automatically purged from their lists and sent to the limbo list. So it's safe to assume all thinkers inside the mobj list must be mobjs. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-21 14:39:57 +00:00
if (mobj->type == MT_HOOP || mobj->type == MT_HOOPCOLLIDE || mobj->type == MT_HOOPCENTER)
continue;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Add "drawonlyforplayer" and "dontdrawforviewmobj"
2023-06-29 22:09:20 +00:00
if (mobj->dontdrawforviewmobj)
{
temp = (UINT32)(size_t)mobj->dontdrawforviewmobj;
mobj->dontdrawforviewmobj = NULL;
if (!P_SetTarget(&mobj->dontdrawforviewmobj, P_FindNewPosition(temp)))
CONS_Debug(DBG_GAMELOGIC, "dontdrawforviewmobj not found on %d\n", mobj->type);
}
Fixed more mobj thinker iterator oversights and removed all mobj thinker function checks Mobjs got their own thinker list after all, and disappearing thinkers are automatically purged from their lists and sent to the limbo list. So it's safe to assume all thinkers inside the mobj list must be mobjs. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-21 14:39:57 +00:00
if (mobj->tracer)
{
temp = (UINT32)(size_t)mobj->tracer;
mobj->tracer = NULL;
if (!P_SetTarget(&mobj->tracer, P_FindNewPosition(temp)))
CONS_Debug(DBG_GAMELOGIC, "tracer not found on %d\n", mobj->type);
}
if (mobj->target)
{
temp = (UINT32)(size_t)mobj->target;
mobj->target = NULL;
if (!P_SetTarget(&mobj->target, P_FindNewPosition(temp)))
CONS_Debug(DBG_GAMELOGIC, "target not found on %d\n", mobj->type);
}
if (mobj->hnext)
{
temp = (UINT32)(size_t)mobj->hnext;
mobj->hnext = NULL;
if (!(mobj->hnext = P_FindNewPosition(temp)))
CONS_Debug(DBG_GAMELOGIC, "hnext not found on %d\n", mobj->type);
}
if (mobj->hprev)
{
temp = (UINT32)(size_t)mobj->hprev;
mobj->hprev = NULL;
if (!(mobj->hprev = P_FindNewPosition(temp)))
CONS_Debug(DBG_GAMELOGIC, "hprev not found on %d\n", mobj->type);
}
if (mobj->player && mobj->player->capsule)
{
temp = (UINT32)(size_t)mobj->player->capsule;
mobj->player->capsule = NULL;
if (!P_SetTarget(&mobj->player->capsule, P_FindNewPosition(temp)))
CONS_Debug(DBG_GAMELOGIC, "capsule not found on %d\n", mobj->type);
}
if (mobj->player && mobj->player->axis1)
{
temp = (UINT32)(size_t)mobj->player->axis1;
mobj->player->axis1 = NULL;
if (!P_SetTarget(&mobj->player->axis1, P_FindNewPosition(temp)))
CONS_Debug(DBG_GAMELOGIC, "axis1 not found on %d\n", mobj->type);
}
if (mobj->player && mobj->player->axis2)
{
temp = (UINT32)(size_t)mobj->player->axis2;
mobj->player->axis2 = NULL;
if (!P_SetTarget(&mobj->player->axis2, P_FindNewPosition(temp)))
CONS_Debug(DBG_GAMELOGIC, "axis2 not found on %d\n", mobj->type);
}
if (mobj->player && mobj->player->awayviewmobj)
{
temp = (UINT32)(size_t)mobj->player->awayviewmobj;
mobj->player->awayviewmobj = NULL;
if (!P_SetTarget(&mobj->player->awayviewmobj, P_FindNewPosition(temp)))
CONS_Debug(DBG_GAMELOGIC, "awayviewmobj not found on %d\n", mobj->type);
}
if (mobj->player && mobj->player->followmobj)
{
temp = (UINT32)(size_t)mobj->player->followmobj;
mobj->player->followmobj = NULL;
if (!P_SetTarget(&mobj->player->followmobj, P_FindNewPosition(temp)))
CONS_Debug(DBG_GAMELOGIC, "followmobj not found on %d\n", mobj->type);
}
if (mobj->player && mobj->player->drone)
{
temp = (UINT32)(size_t)mobj->player->drone;
mobj->player->drone = NULL;
if (!P_SetTarget(&mobj->player->drone, P_FindNewPosition(temp)))
CONS_Debug(DBG_GAMELOGIC, "drone not found on %d\n", mobj->type);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
}
}
static inline void P_NetArchiveSpecials(void)
{
size_t i, z;
SRB2 2.1.2 release
2014-03-17 12:13:16 +00:00
WRITEUINT32(save_p, ARCHIVEBLOCK_SPECIALS);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// itemrespawn queue for deathmatch
i = iquetail;
while (iquehead != i)
{
for (z = 0; z < nummapthings; z++)
{
if (&mapthings[z] == itemrespawnque[i])
{
WRITEUINT32(save_p, z);
break;
}
}
WRITEUINT32(save_p, itemrespawntime[i]);
i = (i + 1) & (ITEMQUESIZE-1);
}
// end delimiter
WRITEUINT32(save_p, 0xffffffff);
// Sky number
WRITEINT32(save_p, globallevelskynum);
// Current global weather type
WRITEUINT8(save_p, globalweather);
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
if (metalplayback) // Is metal sonic running?
{
WRITEUINT8(save_p, 0x01);
G_SaveMetal(&save_p);
}
else
WRITEUINT8(save_p, 0x00);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
static void P_NetUnArchiveSpecials(void)
{
size_t i;
INT32 j;
SRB2 2.1.2 release
2014-03-17 12:13:16 +00:00
if (READUINT32(save_p) != ARCHIVEBLOCK_SPECIALS)
I_Error("Bad $$$.sav at archive block Specials");
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// BP: added save itemrespawn queue for deathmatch
iquetail = iquehead = 0;
while ((i = READUINT32(save_p)) != 0xffffffff)
{
itemrespawnque[iquehead] = &mapthings[i];
itemrespawntime[iquehead++] = READINT32(save_p);
}
j = READINT32(save_p);
if (j != globallevelskynum)
P_SetupLevelSky(j, true);
globalweather = READUINT8(save_p);
if (globalweather)
{
if (curWeather == globalweather)
curWeather = PRECIP_NONE;
P_SwitchWeather(globalweather);
}
else // PRECIP_NONE
{
if (curWeather != PRECIP_NONE)
P_SwitchWeather(globalweather);
}
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
if (READUINT8(save_p) == 0x01) // metal sonic
G_LoadMetal(&save_p);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
// =======================================================================
// Misc
// =======================================================================
Special saves! All this refactoring, just to resolve #162. Specifically, it engages savegame events not at level load (except for savefile start) but on level completion, just after you've gotten all the intermission bonuses but before the intermission actually starts. Also fixes a never-before-discovered bug where if the titlemap has LF_SAVEGAME, your save file will be overwritten upon returning to the title screen. This game is a mess of hacks, I swear... One unintended side effect: It may actually be faster in some speedrun circumstances in mods with cutscenes to complete the map, exit back to the title screen, and reload the file. It's a common feature of optimal runs in games with cutscenes, though, and Marathon Run has a toggle for cutscenes, so I'm not particularly bothered.
2020-06-22 18:00:47 +00:00
static inline void P_ArchiveMisc(INT16 mapnum)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Special saves! All this refactoring, just to resolve #162. Specifically, it engages savegame events not at level load (except for savefile start) but on level completion, just after you've gotten all the intermission bonuses but before the intermission actually starts. Also fixes a never-before-discovered bug where if the titlemap has LF_SAVEGAME, your save file will be overwritten upon returning to the title screen. This game is a mess of hacks, I swear... One unintended side effect: It may actually be faster in some speedrun circumstances in mods with cutscenes to complete the map, exit back to the title screen, and reload the file. It's a common feature of optimal runs in games with cutscenes, though, and Marathon Run has a toggle for cutscenes, so I'm not particularly bothered.
2020-06-22 18:00:47 +00:00
//lastmapsaved = mapnum;
lastmaploaded = mapnum;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Special saves! All this refactoring, just to resolve #162. Specifically, it engages savegame events not at level load (except for savefile start) but on level completion, just after you've gotten all the intermission bonuses but before the intermission actually starts. Also fixes a never-before-discovered bug where if the titlemap has LF_SAVEGAME, your save file will be overwritten upon returning to the title screen. This game is a mess of hacks, I swear... One unintended side effect: It may actually be faster in some speedrun circumstances in mods with cutscenes to complete the map, exit back to the title screen, and reload the file. It's a common feature of optimal runs in games with cutscenes, though, and Marathon Run has a toggle for cutscenes, so I'm not particularly bothered.
2020-06-22 18:00:47 +00:00
if (gamecomplete)
mapnum |= 8192;
Clean whitespace
2017-08-07 03:47:39 +00:00
Special saves! All this refactoring, just to resolve #162. Specifically, it engages savegame events not at level load (except for savefile start) but on level completion, just after you've gotten all the intermission bonuses but before the intermission actually starts. Also fixes a never-before-discovered bug where if the titlemap has LF_SAVEGAME, your save file will be overwritten upon returning to the title screen. This game is a mess of hacks, I swear... One unintended side effect: It may actually be faster in some speedrun circumstances in mods with cutscenes to complete the map, exit back to the title screen, and reload the file. It's a common feature of optimal runs in games with cutscenes, though, and Marathon Run has a toggle for cutscenes, so I'm not particularly bothered.
2020-06-22 18:00:47 +00:00
WRITEINT16(save_p, mapnum);
* New, pretty save select! Requires patch.dta to really appreciate. * Changed the save format a little more, since I had free reign over it. * Modified the string drawing functions to not awkwardly clip at the very edges of the screen, considering the relevant patch drawing functions avoid out-of-range memory writes.
2017-08-20 22:18:47 +00:00
WRITEUINT16(save_p, emeralds+357);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
WRITESTRINGN(save_p, timeattackfolder, sizeof(timeattackfolder));
}
static inline void P_UnArchiveSPGame(INT16 mapoverride)
{
char testname[sizeof(timeattackfolder)];
gamemap = READINT16(save_p);
if (mapoverride != 0)
{
gamemap = mapoverride;
Introducing Marathon Run. (I was going to call it Marathon Mode, but NiGHTS Mode being right next to it on the menu looked terrible.) Basically a dedicated Record Attack-like experience for speedrunning the game as a continuous chunk rather than ILs. Has several quality of life features. Benefits include: * An unambiguous real-time bar across the bottom of the screen, always displaying the current time, ticking up until you reach the ending. * Disable the console (pausing is still allowed, but the timer will still increment). * Automatically skip intermissions as if you're holding down the spin button. * Show centiseconds on HUD automatically, like record attack. * "Live Event Backups" - a category of run fit for major events like GDQ, where recovery from crashes or chokes makes for better entertainment. Essentially a modified SP savefile, down to using the same basic functions, but has its own filename and tweaked internal layout. * "spmarathon_start" MainCfg block parameter and "marathonnext" mapheader parameter, allowing for a customised flow (makes this fit for purpose for an eventual SUGOI port). * Disabling inter-level custom cutscenes by default with a menu option to toggle this (won't show up if the mod doesn't *have* any custom cutscenes), although either way ending cutscenes (vanilla or custom) remain intact since is time is called before them. * Won't show up if you have a mod that consists of only one level (determined by spmarathon_start's nextlevel; this won't trip if you manually set its marathonnext). * Unconditional gratitude on the evaluation screen, instead of a negging "Try again..." if you didn't get all the emeralds (which you may not have been aiming for). * Gorgeous new menu (no new assets required, unless you wanna give it a header later). Changes which were required for the above but affect other areas of the game include: * "useBlackRock" MainCFG block parameter, which can be used to disable the presence of the Black Rock or Egg Rock in both the Evaluation screen and the Marathon Run menu (for total conversions with different stories). * Disabling Continues in NiGHTS mode, to match the most common singleplayer experience post 2.2.4's release (is reverted if useContinues is set to true). * Hiding the exitmove "powerup" outside of multiplayer. (Okay, this isn't really related, I just saw this bug in action a lot while doing test runs and got annoyed enough to fix it here.) * The ability to use V_DrawPromptBack (in hardcode only at the moment, but) to draw in terms of pixels rather than rows of text, by providing negative instead of positive inputs). * A refactoring of redundant game saves smattered across the ending, credits, and evaluation - in addition to saving the game slightly earlier. * Minor m_menu.c touchups and refactorings here and there. Built using feedback from the official server's #speedruns channel, among other places.
2020-05-14 22:10:00 +00:00
gamecomplete = 1;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
else
Introducing Marathon Run. (I was going to call it Marathon Mode, but NiGHTS Mode being right next to it on the menu looked terrible.) Basically a dedicated Record Attack-like experience for speedrunning the game as a continuous chunk rather than ILs. Has several quality of life features. Benefits include: * An unambiguous real-time bar across the bottom of the screen, always displaying the current time, ticking up until you reach the ending. * Disable the console (pausing is still allowed, but the timer will still increment). * Automatically skip intermissions as if you're holding down the spin button. * Show centiseconds on HUD automatically, like record attack. * "Live Event Backups" - a category of run fit for major events like GDQ, where recovery from crashes or chokes makes for better entertainment. Essentially a modified SP savefile, down to using the same basic functions, but has its own filename and tweaked internal layout. * "spmarathon_start" MainCfg block parameter and "marathonnext" mapheader parameter, allowing for a customised flow (makes this fit for purpose for an eventual SUGOI port). * Disabling inter-level custom cutscenes by default with a menu option to toggle this (won't show up if the mod doesn't *have* any custom cutscenes), although either way ending cutscenes (vanilla or custom) remain intact since is time is called before them. * Won't show up if you have a mod that consists of only one level (determined by spmarathon_start's nextlevel; this won't trip if you manually set its marathonnext). * Unconditional gratitude on the evaluation screen, instead of a negging "Try again..." if you didn't get all the emeralds (which you may not have been aiming for). * Gorgeous new menu (no new assets required, unless you wanna give it a header later). Changes which were required for the above but affect other areas of the game include: * "useBlackRock" MainCFG block parameter, which can be used to disable the presence of the Black Rock or Egg Rock in both the Evaluation screen and the Marathon Run menu (for total conversions with different stories). * Disabling Continues in NiGHTS mode, to match the most common singleplayer experience post 2.2.4's release (is reverted if useContinues is set to true). * Hiding the exitmove "powerup" outside of multiplayer. (Okay, this isn't really related, I just saw this bug in action a lot while doing test runs and got annoyed enough to fix it here.) * The ability to use V_DrawPromptBack (in hardcode only at the moment, but) to draw in terms of pixels rather than rows of text, by providing negative instead of positive inputs). * A refactoring of redundant game saves smattered across the ending, credits, and evaluation - in addition to saving the game slightly earlier. * Minor m_menu.c touchups and refactorings here and there. Built using feedback from the official server's #speedruns channel, among other places.
2020-05-14 22:10:00 +00:00
gamecomplete = 0;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// gamemap changed; we assume that its map header is always valid,
// so make it so
if(!mapheaderinfo[gamemap-1])
P_AllocMapHeader(gamemap-1);
Commenting out lastmapsaved
2017-08-04 17:57:47 +00:00
//lastmapsaved = gamemap;
Added lastmaploaded to replace the lastmapsaved check This allows saving in special cases where you can go to a map that doesn't save, and then back to the map you saved on (see: SUBARASHII special stages), while still preventing you from killing your lives by repeatedly retrying in said map. Kept lastmapsaved just in case. Can be removed if deemed unnecessary.
2017-08-04 00:27:31 +00:00
lastmaploaded = gamemap;
Clean whitespace
2017-08-07 03:47:39 +00:00
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
tokenlist = 0;
token = 0;
savedata.emeralds = READUINT16(save_p)-357;
READSTRINGN(save_p, testname, sizeof(testname));
if (strcmp(testname, timeattackfolder))
{
if (modifiedgame)
I_Error("Save game not for this modification.");
else
I_Error("This save file is for a particular mod, it cannot be used with the regular game.");
}
memset(playeringame, 0, sizeof(*playeringame));
playeringame[consoleplayer] = true;
}
Add "resendgamestate" command
2020-01-31 14:57:04 +00:00
static void P_NetArchiveMisc(boolean resending)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
INT32 i;
SRB2 2.1.2 release
2014-03-17 12:13:16 +00:00
WRITEUINT32(save_p, ARCHIVEBLOCK_MISC);
Add "resendgamestate" command
2020-01-31 14:57:04 +00:00
if (resending)
WRITEUINT32(save_p, gametic);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
WRITEINT16(save_p, gamemap);
Port SRB2Kart join on intermission fix All gamestates besides GS_LEVEL are unsupported by the save game functions. This commit forces players joining during these gamestates into GS_WAITINGPLAYERS, which is a basic gamestate that just maintains the connection until we can enter the start of a new one. Also provides an extremely simple drawer for GS_WAITINGPLAYERS so the joining player knows what's going on.
2023-06-13 02:34:42 +00:00
if (gamestate != GS_LEVEL)
WRITEINT16(save_p, GS_WAITINGPLAYERS); // nice hack to put people back into waitingplayers
else
WRITEINT16(save_p, gamestate);
Store most data in gamestate instead of server config packet
2020-01-31 14:29:22 +00:00
WRITEINT16(save_p, gametype);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
STOP THE CLOCK linedef exectutor! * When activated, stops the timer in SP/MP. * Applies to the mapheader countdowntimer as well. * If you're playing Record Attack, also exits the level immediately. * It has no special modes, no linedef flags, no parameters, nothing. * Only not an innate property of A_BossDeath because people may want it to NOT happen sometimes, or make it happen with non-boss events too. Also, skip over calling P_DoPlayerExit if the player isn't in game.
2019-11-08 15:47:12 +00:00
{
UINT32 pig = 0;
for (i = 0; i < MAXPLAYERS; i++)
pig |= (playeringame[i] != 0)<<i;
WRITEUINT32(save_p, pig);
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
WRITEUINT32(save_p, P_GetRandSeed());
SRB2 2.1.2 release
2014-03-17 12:13:16 +00:00
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
WRITEUINT32(save_p, tokenlist);
WRITEUINT32(save_p, leveltime);
MONSTER COMMIT. OLD SPECIAL STAGES: * Spheres in old special stages instead of rings! * Individual timers in old special stages instead of a global one! * Old special stages use a variant of the NiGHTS HUD now! * Special stage damage in old special stages loses 5 seconds of time instead of 10 rings/spheres! * All damage gained through old special stages is converted to special stage damage! As a consequence, the special spikeball has no need to be special anymore. * Made emerald gaining function be based on special stage number rather than gained emeralds! * Consistency with... NiGHTS SPECIAL STAGES: * Spheres now flash in bonus time. https://cdn.discordapp.com/attachments/400761370800422922/452590553100713984/srb20032.gif * Sphere and ring mapthingnums are now less fucked up in 'em. (Rings are 300, same as usual, while Spheres are now 1706 replacing NiGHTS Wings.) SPECIAL STAGES IN GENERAL: * useNightsSS is now dead. Each individual special stage is now assessed for NiGHTS-mode behaviour based on maptol & TOL_NIGHTS. * CRAWLA HONCHO\n CAN NOW BE\n SUPER CRAWLA HONCHO end tally modification now also includes a mini-tutorial on turning super. https://cdn.discordapp.com/attachments/400761370800422922/452844894113759233/srb20036.gif * SONIC GOT A CHAOS EMERALD? https://cdn.discordapp.com/attachments/400761370800422922/452623869497573386/srb20034.gif NiGHTS NON-SPECIAL STAGES: * Colour Chips and Star Chips! Replaces Spheres and Rings of NiGHTS Special Stages. * Colour Chips turn yellow in bonus time. * Ideya! * Its own "drowning" music! * All of the object types for Dream Hill. * GIF: https://cdn.discordapp.com/attachments/400761370800422922/452844894113759233/srb20036.gif RANDOM BS: * Turn super with the spin button instead of the jump button! * Followmobj now correctly set with P_SetTarget instead of pointer assignment. * Emerald hunt uses new sprites! * Made unlock noise different from emblem gain noise! (It's the CRAWLA HONCHO CAN NOW TURN yadda yadda sound from S3K now.)
2018-06-03 21:41:54 +00:00
WRITEUINT32(save_p, ssspheres);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
WRITEINT16(save_p, lastmap);
* Added boss enable linedef (type 449). - Frontside x offset = boss ID (determined via parameter for all bosses) - Noclimb flag = disable mode - Bosses don't do a fuckin' THING - no state updates, no player searches, no sounds, no lua, no nothin' - and it's all totally netsynced. - The only thing they WILL do is flash infinitely if you hurt them, but this is designed for stuff where you're not meant to be in the same room as the boss til it's activated. - All bosses of all IDs are automatically enabled on mapload, then if an enable mode version of this linedef is present in the map for a specific boss id, that boss id is automatically disabled. * Add multi-boss support via parameter for: - All bosses' MT_BOSSFLYPOINT search - Boss 5's waypoint search - Oldbrak's waypoint search (this one's for you, jood)
2019-07-31 22:17:17 +00:00
WRITEUINT16(save_p, bossdisabled);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
WRITEUINT16(save_p, emeralds);
STOP THE CLOCK linedef exectutor! * When activated, stops the timer in SP/MP. * Applies to the mapheader countdowntimer as well. * If you're playing Record Attack, also exits the level immediately. * It has no special modes, no linedef flags, no parameters, nothing. * Only not an innate property of A_BossDeath because people may want it to NOT happen sometimes, or make it happen with non-boss events too. Also, skip over calling P_DoPlayerExit if the player isn't in game.
2019-11-08 15:47:12 +00:00
{
UINT8 globools = 0;
if (stagefailed)
globools |= 1;
if (stoppedclock)
globools |= (1<<1);
WRITEUINT8(save_p, globools);
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
WRITEUINT32(save_p, token);
WRITEINT32(save_p, sstimer);
WRITEUINT32(save_p, bluescore);
WRITEUINT32(save_p, redscore);
Add skincolor vars to the NetSave
2020-11-09 02:43:16 +00:00
WRITEUINT16(save_p, skincolor_redteam);
WRITEUINT16(save_p, skincolor_blueteam);
WRITEUINT16(save_p, skincolor_redring);
WRITEUINT16(save_p, skincolor_bluering);
Ring sparkle mirroring
2019-08-03 22:28:53 +00:00
WRITEINT32(save_p, modulothing);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
WRITEINT16(save_p, autobalance);
WRITEINT16(save_p, teamscramble);
for (i = 0; i < MAXPLAYERS; i++)
WRITEINT16(save_p, scrambleplayers[i]);
for (i = 0; i < MAXPLAYERS; i++)
WRITEINT16(save_p, scrambleteams[i]);
WRITEINT16(save_p, scrambletotal);
WRITEINT16(save_p, scramblecount);
WRITEUINT32(save_p, countdown);
WRITEUINT32(save_p, countdown2);
WRITEFIXED(save_p, gravity);
WRITEUINT32(save_p, countdowntimer);
WRITEUINT8(save_p, countdowntimeup);
WRITEUINT32(save_p, hidetime);
// Is it paused?
if (paused)
WRITEUINT8(save_p, 0x2f);
else
WRITEUINT8(save_p, 0x2e);
}
Add "resendgamestate" command
2020-01-31 14:57:04 +00:00
static inline boolean P_NetUnArchiveMisc(boolean reloading)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
INT32 i;
SRB2 2.1.2 release
2014-03-17 12:13:16 +00:00
if (READUINT32(save_p) != ARCHIVEBLOCK_MISC)
I_Error("Bad $$$.sav at archive block Misc");
Add "resendgamestate" command
2020-01-31 14:57:04 +00:00
if (reloading)
gametic = READUINT32(save_p);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
gamemap = READINT16(save_p);
// gamemap changed; we assume that its map header is always valid,
// so make it so
if(!mapheaderinfo[gamemap-1])
P_AllocMapHeader(gamemap-1);
SRB2 2.1.2 release
2014-03-17 12:13:16 +00:00
// tell the sound code to reset the music since we're skipping what
// normally sets this flag
The concept of "music slots" doesn't exist anymore. Use whatever names you want for your music. So long as you prefix the lumps with O_ or D_, it doesn't matter anymore. DISCLAIMER: Linedef type 413 (change music) and Lua scripting is not tested. (cherry picked from commit 025ca413a2a01a8ec7c104748c2f510e350aa457) # Conflicts: # src/p_user.c
2016-01-08 03:48:20 +00:00
mapmusflags |= MUSIC_RELOADRESET;
SRB2 2.1.2 release
2014-03-17 12:13:16 +00:00
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
G_SetGamestate(READINT16(save_p));
Store most data in gamestate instead of server config packet
2020-01-31 14:29:22 +00:00
gametype = READINT16(save_p);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
STOP THE CLOCK linedef exectutor! * When activated, stops the timer in SP/MP. * Applies to the mapheader countdowntimer as well. * If you're playing Record Attack, also exits the level immediately. * It has no special modes, no linedef flags, no parameters, nothing. * Only not an innate property of A_BossDeath because people may want it to NOT happen sometimes, or make it happen with non-boss events too. Also, skip over calling P_DoPlayerExit if the player isn't in game.
2019-11-08 15:47:12 +00:00
UINT32 pig = READUINT32(save_p);
for (i = 0; i < MAXPLAYERS; i++)
{
playeringame[i] = (pig & (1<<i)) != 0;
// playerstate is set in unarchiveplayers
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
P_SetRandSeed(READUINT32(save_p));
tokenlist = READUINT32(save_p);
Add "resendgamestate" command
2020-01-31 14:57:04 +00:00
if (!P_LoadLevel(true, reloading))
move the old "can't load the level" error to its proper place, added specific error messages for all the times that unarchiving Lua banks can fail
2021-04-26 18:07:11 +00:00
{
CONS_Alert(CONS_ERROR, M_GetText("Can't load the level!\n"));
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return false;
move the old "can't load the level" error to its proper place, added specific error messages for all the times that unarchiving Lua banks can fail
2021-04-26 18:07:11 +00:00
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// get the time
leveltime = READUINT32(save_p);
MONSTER COMMIT. OLD SPECIAL STAGES: * Spheres in old special stages instead of rings! * Individual timers in old special stages instead of a global one! * Old special stages use a variant of the NiGHTS HUD now! * Special stage damage in old special stages loses 5 seconds of time instead of 10 rings/spheres! * All damage gained through old special stages is converted to special stage damage! As a consequence, the special spikeball has no need to be special anymore. * Made emerald gaining function be based on special stage number rather than gained emeralds! * Consistency with... NiGHTS SPECIAL STAGES: * Spheres now flash in bonus time. https://cdn.discordapp.com/attachments/400761370800422922/452590553100713984/srb20032.gif * Sphere and ring mapthingnums are now less fucked up in 'em. (Rings are 300, same as usual, while Spheres are now 1706 replacing NiGHTS Wings.) SPECIAL STAGES IN GENERAL: * useNightsSS is now dead. Each individual special stage is now assessed for NiGHTS-mode behaviour based on maptol & TOL_NIGHTS. * CRAWLA HONCHO\n CAN NOW BE\n SUPER CRAWLA HONCHO end tally modification now also includes a mini-tutorial on turning super. https://cdn.discordapp.com/attachments/400761370800422922/452844894113759233/srb20036.gif * SONIC GOT A CHAOS EMERALD? https://cdn.discordapp.com/attachments/400761370800422922/452623869497573386/srb20034.gif NiGHTS NON-SPECIAL STAGES: * Colour Chips and Star Chips! Replaces Spheres and Rings of NiGHTS Special Stages. * Colour Chips turn yellow in bonus time. * Ideya! * Its own "drowning" music! * All of the object types for Dream Hill. * GIF: https://cdn.discordapp.com/attachments/400761370800422922/452844894113759233/srb20036.gif RANDOM BS: * Turn super with the spin button instead of the jump button! * Followmobj now correctly set with P_SetTarget instead of pointer assignment. * Emerald hunt uses new sprites! * Made unlock noise different from emblem gain noise! (It's the CRAWLA HONCHO CAN NOW TURN yadda yadda sound from S3K now.)
2018-06-03 21:41:54 +00:00
ssspheres = READUINT32(save_p);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
lastmap = READINT16(save_p);
* Added boss enable linedef (type 449). - Frontside x offset = boss ID (determined via parameter for all bosses) - Noclimb flag = disable mode - Bosses don't do a fuckin' THING - no state updates, no player searches, no sounds, no lua, no nothin' - and it's all totally netsynced. - The only thing they WILL do is flash infinitely if you hurt them, but this is designed for stuff where you're not meant to be in the same room as the boss til it's activated. - All bosses of all IDs are automatically enabled on mapload, then if an enable mode version of this linedef is present in the map for a specific boss id, that boss id is automatically disabled. * Add multi-boss support via parameter for: - All bosses' MT_BOSSFLYPOINT search - Boss 5's waypoint search - Oldbrak's waypoint search (this one's for you, jood)
2019-07-31 22:17:17 +00:00
bossdisabled = READUINT16(save_p);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
emeralds = READUINT16(save_p);
STOP THE CLOCK linedef exectutor! * When activated, stops the timer in SP/MP. * Applies to the mapheader countdowntimer as well. * If you're playing Record Attack, also exits the level immediately. * It has no special modes, no linedef flags, no parameters, nothing. * Only not an innate property of A_BossDeath because people may want it to NOT happen sometimes, or make it happen with non-boss events too. Also, skip over calling P_DoPlayerExit if the player isn't in game.
2019-11-08 15:47:12 +00:00
{
UINT8 globools = READUINT8(save_p);
stagefailed = !!(globools & 1);
stoppedclock = !!(globools & (1<<1));
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
token = READUINT32(save_p);
sstimer = READINT32(save_p);
bluescore = READUINT32(save_p);
redscore = READUINT32(save_p);
Add skincolor vars to the NetSave
2020-11-09 02:43:16 +00:00
skincolor_redteam = READUINT16(save_p);
skincolor_blueteam = READUINT16(save_p);
skincolor_redring = READUINT16(save_p);
skincolor_bluering = READUINT16(save_p);
Last min changes
2019-08-04 15:34:55 +00:00
modulothing = READINT32(save_p);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
autobalance = READINT16(save_p);
teamscramble = READINT16(save_p);
for (i = 0; i < MAXPLAYERS; i++)
scrambleplayers[i] = READINT16(save_p);
for (i = 0; i < MAXPLAYERS; i++)
scrambleteams[i] = READINT16(save_p);
scrambletotal = READINT16(save_p);
scramblecount = READINT16(save_p);
countdown = READUINT32(save_p);
countdown2 = READUINT32(save_p);
gravity = READFIXED(save_p);
countdowntimer = (tic_t)READUINT32(save_p);
countdowntimeup = (boolean)READUINT8(save_p);
hidetime = READUINT32(save_p);
// Is it paused?
if (READUINT8(save_p) == 0x2f)
paused = true;
return true;
}
Online emblems Currently, emblems share with everyone. Will add an option to toggle this.
2022-02-27 21:52:05 +00:00
static inline void P_NetArchiveEmblems(void)
{
gamedata_t *data = serverGamedata;
INT32 i, j;
UINT8 btemp;
INT32 curmare;
WRITEUINT32(save_p, ARCHIVEBLOCK_EMBLEMS);
// These should be synchronized before savegame loading by the wad files being the same anyway,
// but just in case, for now, we'll leave them here for testing. It would be very bad if they mismatch.
WRITEUINT8(save_p, (UINT8)savemoddata);
WRITEINT32(save_p, numemblems);
WRITEINT32(save_p, numextraemblems);
// The rest of this is lifted straight from G_SaveGameData in g_game.c
// TODO: Optimize this to only send information about emblems, unlocks, etc. which actually exist
// There is no need to go all the way up to MAXEMBLEMS when wads are guaranteed to be the same.
WRITEUINT32(save_p, data->totalplaytime);
// TODO put another cipher on these things? meh, I don't care...
for (i = 0; i < NUMMAPS; i++)
WRITEUINT8(save_p, (data->mapvisited[i] & MV_MAX));
// 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 |= (data->collected[j+i] << j);
WRITEUINT8(save_p, btemp);
i += j;
}
for (i = 0; i < MAXEXTRAEMBLEMS;)
{
btemp = 0;
for (j = 0; j < 8 && j+i < MAXEXTRAEMBLEMS; ++j)
btemp |= (data->extraCollected[j+i] << j);
WRITEUINT8(save_p, btemp);
i += j;
}
for (i = 0; i < MAXUNLOCKABLES;)
{
btemp = 0;
for (j = 0; j < 8 && j+i < MAXUNLOCKABLES; ++j)
btemp |= (data->unlocked[j+i] << j);
WRITEUINT8(save_p, btemp);
i += j;
}
for (i = 0; i < MAXCONDITIONSETS;)
{
btemp = 0;
for (j = 0; j < 8 && j+i < MAXCONDITIONSETS; ++j)
btemp |= (data->achieved[j+i] << j);
WRITEUINT8(save_p, btemp);
i += j;
}
WRITEUINT32(save_p, data->timesBeaten);
WRITEUINT32(save_p, data->timesBeatenWithEmeralds);
WRITEUINT32(save_p, data->timesBeatenUltimate);
// Main records
for (i = 0; i < NUMMAPS; i++)
{
if (data->mainrecords[i])
{
WRITEUINT32(save_p, data->mainrecords[i]->score);
WRITEUINT32(save_p, data->mainrecords[i]->time);
WRITEUINT16(save_p, data->mainrecords[i]->rings);
}
else
{
WRITEUINT32(save_p, 0);
WRITEUINT32(save_p, 0);
WRITEUINT16(save_p, 0);
}
}
// NiGHTS records
for (i = 0; i < NUMMAPS; i++)
{
if (!data->nightsrecords[i] || !data->nightsrecords[i]->nummares)
{
WRITEUINT8(save_p, 0);
continue;
}
WRITEUINT8(save_p, data->nightsrecords[i]->nummares);
for (curmare = 0; curmare < (data->nightsrecords[i]->nummares + 1); ++curmare)
{
WRITEUINT32(save_p, data->nightsrecords[i]->score[curmare]);
WRITEUINT8(save_p, data->nightsrecords[i]->grade[curmare]);
WRITEUINT32(save_p, data->nightsrecords[i]->time[curmare]);
}
}
Allow obtaining ring, time & grade emblems in regular SP gameplay.
2022-03-02 22:47:15 +00:00
// Mid-map stuff
WRITEUINT32(save_p, unlocktriggers);
for (i = 0; i < MAXPLAYERS; i++)
{
if (!ntemprecords[i].nummares)
{
WRITEUINT8(save_p, 0);
continue;
}
WRITEUINT8(save_p, ntemprecords[i].nummares);
for (curmare = 0; curmare < (ntemprecords[i].nummares + 1); ++curmare)
{
WRITEUINT32(save_p, ntemprecords[i].score[curmare]);
WRITEUINT8(save_p, ntemprecords[i].grade[curmare]);
WRITEUINT32(save_p, ntemprecords[i].time[curmare]);
}
}
Online emblems Currently, emblems share with everyone. Will add an option to toggle this.
2022-02-27 21:52:05 +00:00
}
static inline void P_NetUnArchiveEmblems(void)
{
gamedata_t *data = serverGamedata;
INT32 i, j;
UINT8 rtemp;
UINT32 recscore;
tic_t rectime;
UINT16 recrings;
UINT8 recmares;
INT32 curmare;
if (READUINT32(save_p) != ARCHIVEBLOCK_EMBLEMS)
I_Error("Bad $$$.sav at archive block Emblems");
savemoddata = (boolean)READUINT8(save_p); // this one is actually necessary because savemoddata stays false otherwise for some reason.
if (numemblems != READINT32(save_p))
Allow obtaining ring, time & grade emblems in regular SP gameplay.
2022-03-02 22:47:15 +00:00
I_Error("Bad $$$.sav dearchiving Emblems (numemblems mismatch)");
Online emblems Currently, emblems share with everyone. Will add an option to toggle this.
2022-02-27 21:52:05 +00:00
if (numextraemblems != READINT32(save_p))
Allow obtaining ring, time & grade emblems in regular SP gameplay.
2022-03-02 22:47:15 +00:00
I_Error("Bad $$$.sav dearchiving Emblems (numextraemblems mismatch)");
Online emblems Currently, emblems share with everyone. Will add an option to toggle this.
2022-02-27 21:52:05 +00:00
// This shouldn't happen, but if something really fucked up happens and you transfer
// the SERVER player's gamedata over your own CLIENT gamedata,
// then this prevents it from being saved over yours.
data->loaded = false;
M_ClearSecrets(data);
G_ClearRecords(data);
// The rest of this is lifted straight from G_LoadGameData in g_game.c
// TODO: Optimize this to only read information about emblems, unlocks, etc. which actually exist
// There is no need to go all the way up to MAXEMBLEMS when wads are guaranteed to be the same.
data->totalplaytime = READUINT32(save_p);
// TODO put another cipher on these things? meh, I don't care...
for (i = 0; i < NUMMAPS; i++)
if ((data->mapvisited[i] = READUINT8(save_p)) > MV_MAX)
Allow obtaining ring, time & grade emblems in regular SP gameplay.
2022-03-02 22:47:15 +00:00
I_Error("Bad $$$.sav dearchiving Emblems (invalid visit flags)");
Online emblems Currently, emblems share with everyone. Will add an option to toggle this.
2022-02-27 21:52:05 +00:00
// 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)
data->collected[j+i] = ((rtemp >> j) & 1);
i += j;
}
for (i = 0; i < MAXEXTRAEMBLEMS;)
{
rtemp = READUINT8(save_p);
for (j = 0; j < 8 && j+i < MAXEXTRAEMBLEMS; ++j)
data->extraCollected[j+i] = ((rtemp >> j) & 1);
i += j;
}
for (i = 0; i < MAXUNLOCKABLES;)
{
rtemp = READUINT8(save_p);
for (j = 0; j < 8 && j+i < MAXUNLOCKABLES; ++j)
data->unlocked[j+i] = ((rtemp >> j) & 1);
i += j;
}
for (i = 0; i < MAXCONDITIONSETS;)
{
rtemp = READUINT8(save_p);
for (j = 0; j < 8 && j+i < MAXCONDITIONSETS; ++j)
data->achieved[j+i] = ((rtemp >> j) & 1);
i += j;
}
data->timesBeaten = READUINT32(save_p);
data->timesBeatenWithEmeralds = READUINT32(save_p);
data->timesBeatenUltimate = READUINT32(save_p);
// Main records
for (i = 0; i < NUMMAPS; ++i)
{
recscore = READUINT32(save_p);
rectime = (tic_t)READUINT32(save_p);
recrings = READUINT16(save_p);
if (recrings > 10000 || recscore > MAXSCORE)
Allow obtaining ring, time & grade emblems in regular SP gameplay.
2022-03-02 22:47:15 +00:00
I_Error("Bad $$$.sav dearchiving Emblems (invalid score)");
Online emblems Currently, emblems share with everyone. Will add an option to toggle this.
2022-02-27 21:52:05 +00:00
if (recscore || rectime || recrings)
{
G_AllocMainRecordData((INT16)i, data);
data->mainrecords[i]->score = recscore;
data->mainrecords[i]->time = rectime;
data->mainrecords[i]->rings = recrings;
}
}
// Nights records
for (i = 0; i < NUMMAPS; ++i)
{
if ((recmares = READUINT8(save_p)) == 0)
continue;
G_AllocNightsRecordData((INT16)i, data);
for (curmare = 0; curmare < (recmares+1); ++curmare)
{
data->nightsrecords[i]->score[curmare] = READUINT32(save_p);
data->nightsrecords[i]->grade[curmare] = READUINT8(save_p);
data->nightsrecords[i]->time[curmare] = (tic_t)READUINT32(save_p);
if (data->nightsrecords[i]->grade[curmare] > GRADE_S)
{
Allow obtaining ring, time & grade emblems in regular SP gameplay.
2022-03-02 22:47:15 +00:00
I_Error("Bad $$$.sav dearchiving Emblems (invalid grade)");
Online emblems Currently, emblems share with everyone. Will add an option to toggle this.
2022-02-27 21:52:05 +00:00
}
}
data->nightsrecords[i]->nummares = recmares;
}
Allow obtaining ring, time & grade emblems in regular SP gameplay.
2022-03-02 22:47:15 +00:00
// Mid-map stuff
unlocktriggers = READUINT32(save_p);
for (i = 0; i < MAXPLAYERS; ++i)
{
if ((recmares = READUINT8(save_p)) == 0)
continue;
for (curmare = 0; curmare < (recmares+1); ++curmare)
{
ntemprecords[i].score[curmare] = READUINT32(save_p);
ntemprecords[i].grade[curmare] = READUINT8(save_p);
ntemprecords[i].time[curmare] = (tic_t)READUINT32(save_p);
if (ntemprecords[i].grade[curmare] > GRADE_S)
{
I_Error("Bad $$$.sav dearchiving Emblems (invalid temp grade)");
}
}
ntemprecords[i].nummares = recmares;
}
Online emblems Currently, emblems share with everyone. Will add an option to toggle this.
2022-02-27 21:52:05 +00:00
}
Serialize sector portals
2023-08-24 19:04:31 +00:00
static void P_NetArchiveSectorPortals(void)
{
WRITEUINT32(save_p, ARCHIVEBLOCK_SECPORTALS);
WRITEUINT32(save_p, secportalcount);
for (size_t i = 0; i < secportalcount; i++)
{
UINT8 type = secportals[i].type;
WRITEUINT8(save_p, type);
Use original portal's origin for the viewpoint displacement
2023-08-25 03:18:20 +00:00
WRITEFIXED(save_p, secportals[i].origin.x);
WRITEFIXED(save_p, secportals[i].origin.y);
Serialize sector portals
2023-08-24 19:04:31 +00:00
switch (type)
{
case SECPORTAL_LINE:
WRITEUINT32(save_p, SaveLine(secportals[i].line.start));
WRITEUINT32(save_p, SaveLine(secportals[i].line.dest));
break;
case SECPORTAL_PLANE:
case SECPORTAL_HORIZON:
case SECPORTAL_FLOOR:
case SECPORTAL_CEILING:
WRITEUINT32(save_p, SaveSector(secportals[i].sector));
break;
case SECPORTAL_OBJECT:
if (secportals[i].mobj && !P_MobjWasRemoved(secportals[i].mobj))
SaveMobjnum(secportals[i].mobj);
else
WRITEUINT32(save_p, 0);
break;
default:
break;
}
}
}
static void P_NetUnArchiveSectorPortals(void)
{
if (READUINT32(save_p) != ARCHIVEBLOCK_SECPORTALS)
I_Error("Bad $$$.sav at archive block Secportals");
Z_Free(secportals);
P_InitSectorPortals();
UINT32 count = READUINT32(save_p);
for (UINT32 i = 0; i < count; i++)
{
UINT32 id = P_NewSectorPortal();
sectorportal_t *secportal = &secportals[id];
secportal->type = READUINT8(save_p);
Use original portal's origin for the viewpoint displacement
2023-08-25 03:18:20 +00:00
secportal->origin.x = READFIXED(save_p);
secportal->origin.y = READFIXED(save_p);
Serialize sector portals
2023-08-24 19:04:31 +00:00
switch (secportal->type)
{
case SECPORTAL_LINE:
secportal->line.start = LoadLine(READUINT32(save_p));
secportal->line.dest = LoadLine(READUINT32(save_p));
break;
case SECPORTAL_PLANE:
case SECPORTAL_HORIZON:
case SECPORTAL_FLOOR:
case SECPORTAL_CEILING:
secportal->sector = LoadSector(READUINT32(save_p));
break;
case SECPORTAL_OBJECT:
id = READUINT32(save_p);
secportal->mobj = (id == 0) ? NULL : P_FindNewPosition(id);
break;
default:
break;
}
}
}
Lua save-banks! * Array of 8 INT32's natively embedded into savedata (net and SP)! * Initialised to zero whenever a new save (or equivalent) is started, otherwise untouched by the base game. * Requires reservation to avoid clobber-conflicts. * Access via `reserveLuabanks()` - returns a read-write userdata. * Assign userdata to local variable or global rawset to use later. Mostly for future SUGOIlikes, but I'm sure someone could figure out an unrelated usage eventually.
2019-08-24 17:25:27 +00:00
static inline void P_ArchiveLuabanksAndConsistency(void)
{
UINT8 i, banksinuse = NUM_LUABANKS;
while (banksinuse && !luabanks[banksinuse-1])
banksinuse--; // get the last used bank
if (banksinuse)
{
WRITEUINT8(save_p, 0xb7); // luabanks marker
WRITEUINT8(save_p, banksinuse);
for (i = 0; i < banksinuse; i++)
WRITEINT32(save_p, luabanks[i]);
}
WRITEUINT8(save_p, 0x1d); // consistency marker
}
static inline boolean P_UnArchiveLuabanksAndConsistency(void)
{
switch (READUINT8(save_p))
{
move the old "can't load the level" error to its proper place, added specific error messages for all the times that unarchiving Lua banks can fail
2021-04-26 18:07:11 +00:00
case 0xb7: // luabanks marker
Lua save-banks! * Array of 8 INT32's natively embedded into savedata (net and SP)! * Initialised to zero whenever a new save (or equivalent) is started, otherwise untouched by the base game. * Requires reservation to avoid clobber-conflicts. * Access via `reserveLuabanks()` - returns a read-write userdata. * Assign userdata to local variable or global rawset to use later. Mostly for future SUGOIlikes, but I'm sure someone could figure out an unrelated usage eventually.
2019-08-24 17:25:27 +00:00
{
UINT8 i, banksinuse = READUINT8(save_p);
if (banksinuse > NUM_LUABANKS)
move the old "can't load the level" error to its proper place, added specific error messages for all the times that unarchiving Lua banks can fail
2021-04-26 18:07:11 +00:00
{
CONS_Alert(CONS_ERROR, M_GetText("Corrupt Luabanks! (Too many banks in use)\n"));
Lua save-banks! * Array of 8 INT32's natively embedded into savedata (net and SP)! * Initialised to zero whenever a new save (or equivalent) is started, otherwise untouched by the base game. * Requires reservation to avoid clobber-conflicts. * Access via `reserveLuabanks()` - returns a read-write userdata. * Assign userdata to local variable or global rawset to use later. Mostly for future SUGOIlikes, but I'm sure someone could figure out an unrelated usage eventually.
2019-08-24 17:25:27 +00:00
return false;
move the old "can't load the level" error to its proper place, added specific error messages for all the times that unarchiving Lua banks can fail
2021-04-26 18:07:11 +00:00
}
Lua save-banks! * Array of 8 INT32's natively embedded into savedata (net and SP)! * Initialised to zero whenever a new save (or equivalent) is started, otherwise untouched by the base game. * Requires reservation to avoid clobber-conflicts. * Access via `reserveLuabanks()` - returns a read-write userdata. * Assign userdata to local variable or global rawset to use later. Mostly for future SUGOIlikes, but I'm sure someone could figure out an unrelated usage eventually.
2019-08-24 17:25:27 +00:00
for (i = 0; i < banksinuse; i++)
luabanks[i] = READINT32(save_p);
move the old "can't load the level" error to its proper place, added specific error messages for all the times that unarchiving Lua banks can fail
2021-04-26 18:07:11 +00:00
if (READUINT8(save_p) != 0x1d) // consistency marker
{
CONS_Alert(CONS_ERROR, M_GetText("Corrupt Luabanks! (Failed consistency check)\n"));
Lua save-banks! * Array of 8 INT32's natively embedded into savedata (net and SP)! * Initialised to zero whenever a new save (or equivalent) is started, otherwise untouched by the base game. * Requires reservation to avoid clobber-conflicts. * Access via `reserveLuabanks()` - returns a read-write userdata. * Assign userdata to local variable or global rawset to use later. Mostly for future SUGOIlikes, but I'm sure someone could figure out an unrelated usage eventually.
2019-08-24 17:25:27 +00:00
return false;
move the old "can't load the level" error to its proper place, added specific error messages for all the times that unarchiving Lua banks can fail
2021-04-26 18:07:11 +00:00
}
Lua save-banks! * Array of 8 INT32's natively embedded into savedata (net and SP)! * Initialised to zero whenever a new save (or equivalent) is started, otherwise untouched by the base game. * Requires reservation to avoid clobber-conflicts. * Access via `reserveLuabanks()` - returns a read-write userdata. * Assign userdata to local variable or global rawset to use later. Mostly for future SUGOIlikes, but I'm sure someone could figure out an unrelated usage eventually.
2019-08-24 17:25:27 +00:00
}
move the old "can't load the level" error to its proper place, added specific error messages for all the times that unarchiving Lua banks can fail
2021-04-26 18:07:11 +00:00
case 0x1d: // consistency marker
Lua save-banks! * Array of 8 INT32's natively embedded into savedata (net and SP)! * Initialised to zero whenever a new save (or equivalent) is started, otherwise untouched by the base game. * Requires reservation to avoid clobber-conflicts. * Access via `reserveLuabanks()` - returns a read-write userdata. * Assign userdata to local variable or global rawset to use later. Mostly for future SUGOIlikes, but I'm sure someone could figure out an unrelated usage eventually.
2019-08-24 17:25:27 +00:00
break;
move the old "can't load the level" error to its proper place, added specific error messages for all the times that unarchiving Lua banks can fail
2021-04-26 18:07:11 +00:00
default: // anything else is nonsense
CONS_Alert(CONS_ERROR, M_GetText("Failed consistency check (???)\n"));
Lua save-banks! * Array of 8 INT32's natively embedded into savedata (net and SP)! * Initialised to zero whenever a new save (or equivalent) is started, otherwise untouched by the base game. * Requires reservation to avoid clobber-conflicts. * Access via `reserveLuabanks()` - returns a read-write userdata. * Assign userdata to local variable or global rawset to use later. Mostly for future SUGOIlikes, but I'm sure someone could figure out an unrelated usage eventually.
2019-08-24 17:25:27 +00:00
return false;
}
return true;
}
Special saves! All this refactoring, just to resolve #162. Specifically, it engages savegame events not at level load (except for savefile start) but on level completion, just after you've gotten all the intermission bonuses but before the intermission actually starts. Also fixes a never-before-discovered bug where if the titlemap has LF_SAVEGAME, your save file will be overwritten upon returning to the title screen. This game is a mess of hacks, I swear... One unintended side effect: It may actually be faster in some speedrun circumstances in mods with cutscenes to complete the map, exit back to the title screen, and reload the file. It's a common feature of optimal runs in games with cutscenes, though, and Marathon Run has a toggle for cutscenes, so I'm not particularly bothered.
2020-06-22 18:00:47 +00:00
void P_SaveGame(INT16 mapnum)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Special saves! All this refactoring, just to resolve #162. Specifically, it engages savegame events not at level load (except for savefile start) but on level completion, just after you've gotten all the intermission bonuses but before the intermission actually starts. Also fixes a never-before-discovered bug where if the titlemap has LF_SAVEGAME, your save file will be overwritten upon returning to the title screen. This game is a mess of hacks, I swear... One unintended side effect: It may actually be faster in some speedrun circumstances in mods with cutscenes to complete the map, exit back to the title screen, and reload the file. It's a common feature of optimal runs in games with cutscenes, though, and Marathon Run has a toggle for cutscenes, so I'm not particularly bothered.
2020-06-22 18:00:47 +00:00
P_ArchiveMisc(mapnum);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
P_ArchivePlayer();
Lua save-banks! * Array of 8 INT32's natively embedded into savedata (net and SP)! * Initialised to zero whenever a new save (or equivalent) is started, otherwise untouched by the base game. * Requires reservation to avoid clobber-conflicts. * Access via `reserveLuabanks()` - returns a read-write userdata. * Assign userdata to local variable or global rawset to use later. Mostly for future SUGOIlikes, but I'm sure someone could figure out an unrelated usage eventually.
2019-08-24 17:25:27 +00:00
P_ArchiveLuabanksAndConsistency();
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
Add "resendgamestate" command
2020-01-31 14:57:04 +00:00
void P_SaveNetGame(boolean resending)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
thinker_t *th;
mobj_t *mobj;
Start mobjnums at 1 instead of 0, so that the first found mobj can be relinked as a target etc to other mobjs properly This fixes Brak's electric barrier disappearing for joiners to ERZC. There seems to be some issues with the lava falls there too I've found, but the electric barrier actually stays around now at least
2017-01-01 17:03:13 +00:00
INT32 i = 1; // don't start from 0, it'd be confused with a blank pointer otherwise
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
CV_SaveNetVars(&save_p);
Add "resendgamestate" command
2020-01-31 14:57:04 +00:00
P_NetArchiveMisc(resending);
Online emblems Currently, emblems share with everyone. Will add an option to toggle this.
2022-02-27 21:52:05 +00:00
P_NetArchiveEmblems();
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Assign the mobjnumber for pointer tracking
Added a mobj-only list entry for mobj thinkers Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 21:29:20 +00:00
for (th = thlist[THINK_MOBJ].next; th != &thlist[THINK_MOBJ]; th = th->next)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Fixed the thinkerlist issues by removing THINK_LIMBO. Delay-removed thinkers now stay in their list. Also includes toaster's assorted fixes and improvements from target_painted_on_your_ass.
2019-07-12 23:42:03 +00:00
if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
continue;
Fixed more mobj thinker iterator oversights and removed all mobj thinker function checks Mobjs got their own thinker list after all, and disappearing thinkers are automatically purged from their lists and sent to the limbo list. So it's safe to assume all thinkers inside the mobj list must be mobjs. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-21 14:39:57 +00:00
mobj = (mobj_t *)th;
if (mobj->type == MT_HOOP || mobj->type == MT_HOOPCOLLIDE || mobj->type == MT_HOOPCENTER)
continue;
mobj->mobjnum = i++;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
P_NetArchivePlayers();
if (gamestate == GS_LEVEL)
{
P_NetArchiveWorld();
P_ArchivePolyObjects();
P_NetArchiveThinkers();
P_NetArchiveSpecials();
Streamlined colormap netsyncing so duplicates are not saved to $$$.sav per sector
2018-09-17 00:02:29 +00:00
P_NetArchiveColormaps();
Netsync waypoint sequences
2020-05-31 20:44:25 +00:00
P_NetArchiveWaypoints();
Serialize sector portals
2023-08-24 19:04:31 +00:00
P_NetArchiveSectorPortals();
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
LUA_Archive();
Lua save-banks! * Array of 8 INT32's natively embedded into savedata (net and SP)! * Initialised to zero whenever a new save (or equivalent) is started, otherwise untouched by the base game. * Requires reservation to avoid clobber-conflicts. * Access via `reserveLuabanks()` - returns a read-write userdata. * Assign userdata to local variable or global rawset to use later. Mostly for future SUGOIlikes, but I'm sure someone could figure out an unrelated usage eventually.
2019-08-24 17:25:27 +00:00
P_ArchiveLuabanksAndConsistency();
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
boolean P_LoadGame(INT16 mapoverride)
{
if (gamestate == GS_INTERMISSION)
Y_EndIntermission();
G_SetGamestate(GS_NULL); // should be changed in P_UnArchiveMisc
P_UnArchiveSPGame(mapoverride);
P_UnArchivePlayer();
Lua save-banks! * Array of 8 INT32's natively embedded into savedata (net and SP)! * Initialised to zero whenever a new save (or equivalent) is started, otherwise untouched by the base game. * Requires reservation to avoid clobber-conflicts. * Access via `reserveLuabanks()` - returns a read-write userdata. * Assign userdata to local variable or global rawset to use later. Mostly for future SUGOIlikes, but I'm sure someone could figure out an unrelated usage eventually.
2019-08-24 17:25:27 +00:00
if (!P_UnArchiveLuabanksAndConsistency())
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return false;
// Only do this after confirming savegame is ok
G_DeferedInitNew(false, G_BuildMapName(gamemap), savedata.skin, false, true);
COM_BufAddText("dummyconsvar 1\n"); // G_DeferedInitNew doesn't do this
return true;
}
Add "resendgamestate" command
2020-01-31 14:57:04 +00:00
boolean P_LoadNetGame(boolean reloading)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
CV_LoadNetVars(&save_p);
Add "resendgamestate" command
2020-01-31 14:57:04 +00:00
if (!P_NetUnArchiveMisc(reloading))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return false;
Online emblems Currently, emblems share with everyone. Will add an option to toggle this.
2022-02-27 21:52:05 +00:00
P_NetUnArchiveEmblems();
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
P_NetUnArchivePlayers();
if (gamestate == GS_LEVEL)
{
P_NetUnArchiveWorld();
P_UnArchivePolyObjects();
P_NetUnArchiveThinkers();
P_NetUnArchiveSpecials();
Streamlined colormap netsyncing so duplicates are not saved to $$$.sav per sector
2018-09-17 00:02:29 +00:00
P_NetUnArchiveColormaps();
Netsync waypoint sequences
2020-05-31 20:44:25 +00:00
P_NetUnArchiveWaypoints();
Serialize sector portals
2023-08-24 19:04:31 +00:00
P_NetUnArchiveSectorPortals();
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
P_RelinkPointers();
P_FinishMobjs();
}
LUA_UnArchive();
SRB2 2.1.2 release
2014-03-17 12:13:16 +00:00
// This is stupid and hacky, but maybe it'll work!
P_SetRandSeed(P_GetInitSeed());
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// The precipitation would normally be spawned in P_SetupLevel, which is called by
// P_NetUnArchiveMisc above. However, that would place it up before P_NetUnArchiveThinkers,
// so the thinkers would be deleted later. Therefore, P_SetupLevel will *not* spawn
// precipitation when loading a netgame save. Instead, precip has to be spawned here.
// This is done in P_NetUnArchiveSpecials now.
Lua save-banks! * Array of 8 INT32's natively embedded into savedata (net and SP)! * Initialised to zero whenever a new save (or equivalent) is started, otherwise untouched by the base game. * Requires reservation to avoid clobber-conflicts. * Access via `reserveLuabanks()` - returns a read-write userdata. * Assign userdata to local variable or global rawset to use later. Mostly for future SUGOIlikes, but I'm sure someone could figure out an unrelated usage eventually.
2019-08-24 17:25:27 +00:00
return P_UnArchiveLuabanksAndConsistency();
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
Reference in a new issue Copy permalink