teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2024-11-15 08:52:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

First round of Blood Savegame fix.

Browse source 
- const-ify most tables in actor.cpp for documentation purposes.
- gVectorData cannot be made const because one single field in there gets modified by code. :?
- save the global data in nnexts.cpp.
This commit is contained in:
Christoph Oelckers 2020-02-11 23:15:25 +01:00
parent 2f0a31508e
commit 29e51a677f
7 changed files with 83 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
source/blood/src/actor.cpp
View file

@ -79,7 +79,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
BEGIN_BLD_NS
VECTORDATA gVectorData[] = {
VECTORDATA gVectorData[] = { // this is constant EXCEPT for [VECTOR_TYPE_20].maxDist. What were they thinking...
// Tine
{
@ -703,7 +703,7 @@ VECTORDATA gVectorData[] = {
},
};
ITEMDATA gItemData[] = {
const ITEMDATA gItemData[] = {
{
0,
2552,
@ -1147,7 +1147,7 @@ ITEMDATA gItemData[] = {
}
};
AMMOITEMDATA gAmmoItemData[] = {
const AMMOITEMDATA gAmmoItemData[] = {
{
0,
618,
@ -1381,7 +1381,7 @@ AMMOITEMDATA gAmmoItemData[] = {
},
};
WEAPONITEMDATA gWeaponItemData[] = {
const WEAPONITEMDATA gWeaponItemData[] = {
{
0,
-1,
@ -1505,7 +1505,7 @@ WEAPONITEMDATA gWeaponItemData[] = {
}
};
MissileType missileInfo[] = {
const MissileType missileInfo[] = {
// Cleaver
{
2138,
@ -2268,7 +2268,7 @@ const THINGINFO thingInfo[] = {
},
};
EXPLOSION explodeInfo[] = {
const EXPLOSION explodeInfo[] = {
{
40,
10,
@ -2359,11 +2359,11 @@ EXPLOSION explodeInfo[] = {
},
};
int gDudeDrag = 0x2a00;
short gAffectedSectors[kMaxSectors];
short gAffectedXWalls[kMaxXWalls];
short gPlayerGibThingComments[] = {
static const short gPlayerGibThingComments[] = {
734, 735, 736, 737, 738, 739, 740, 741, 3038, 3049
};
@ -2375,13 +2375,13 @@ void TreeToGibCallback(int, int);
void DudeToGibCallback1(int, int);
void DudeToGibCallback2(int, int);
int nFireballClient = seqRegisterClient(FireballSeqCallback);
int dword_2192D8 = seqRegisterClient(sub_38938); // fireball smoke
int nNapalmClient = seqRegisterClient(NapalmSeqCallback);
int dword_2192E0 = seqRegisterClient(sub_3888C); // flame lick
int nTreeToGibClient = seqRegisterClient(TreeToGibCallback);
int nDudeToGibClient1 = seqRegisterClient(DudeToGibCallback1);
int nDudeToGibClient2 = seqRegisterClient(DudeToGibCallback2);
const int nFireballClient = seqRegisterClient(FireballSeqCallback);
const int dword_2192D8 = seqRegisterClient(sub_38938); // fireball smoke
const int nNapalmClient = seqRegisterClient(NapalmSeqCallback);
const int dword_2192E0 = seqRegisterClient(sub_3888C); // flame lick
const int nTreeToGibClient = seqRegisterClient(TreeToGibCallback);
const int nDudeToGibClient1 = seqRegisterClient(DudeToGibCallback1);
const int nDudeToGibClient2 = seqRegisterClient(DudeToGibCallback2);
int gPostCount = 0;
@ -2454,7 +2454,7 @@ void actAllocateSpares(void)
{
}
int DudeDifficulty[5] = {
const int DudeDifficulty[5] = {
512, 384, 256, 208, 160
};
@ -2816,7 +2816,7 @@ spritetype *actDropAmmo(spritetype *pSprite, int nType)
if (pSprite && pSprite->statnum < kMaxStatus && nType >= kItemAmmoBase && nType < kItemAmmoMax)
{
pSprite2 = actSpawnFloor(pSprite);
AMMOITEMDATA *pAmmo = &gAmmoItemData[nType - kItemAmmoBase];
const AMMOITEMDATA *pAmmo = &gAmmoItemData[nType - kItemAmmoBase];
pSprite2->type = nType;
pSprite2->picnum = pAmmo->picnum;
pSprite2->shade = pAmmo->shade;
@ -2832,7 +2832,7 @@ spritetype *actDropWeapon(spritetype *pSprite, int nType)
if (pSprite && pSprite->statnum < kMaxStatus && nType >= kItemWeaponBase && nType < kItemWeaponMax)
{
pSprite2 = actSpawnFloor(pSprite);
WEAPONITEMDATA *pWeapon = &gWeaponItemData[nType - kItemWeaponBase];
const WEAPONITEMDATA *pWeapon = &gWeaponItemData[nType - kItemWeaponBase];
pSprite2->type = nType;
pSprite2->picnum = pWeapon->picnum;
pSprite2->shade = pWeapon->shade;
@ -2848,7 +2848,7 @@ spritetype *actDropItem(spritetype *pSprite, int nType)
if (pSprite && pSprite->statnum < kMaxStatus && nType >= kItemBase && nType < kItemMax)
{
pSprite2 = actSpawnFloor(pSprite);
ITEMDATA *pItem = &gItemData[nType - kItemBase];
const ITEMDATA *pItem = &gItemData[nType - kItemBase];
pSprite2->type = nType;
pSprite2->picnum = pItem->picnum;
pSprite2->shade = pItem->shade;
@ -5383,7 +5383,7 @@ void actExplodeSprite(spritetype *pSprite)
pSprite->flags &= ~3;
pSprite->type = nType;
EXPLOSION *pExplodeInfo = &explodeInfo[nType];
const EXPLOSION *pExplodeInfo = &explodeInfo[nType];
xsprite[nXSprite].target = 0;
xsprite[nXSprite].data1 = pExplodeInfo->ticks;
xsprite[nXSprite].data2 = pExplodeInfo->quakeEffect;
@ -5681,7 +5681,7 @@ void actProcessSprites(void)
int nOwner = actSpriteOwnerToSpriteId(pSprite);
int nType = pSprite->type;
dassert(nType >= 0 && nType < kExplodeMax);
EXPLOSION *pExplodeInfo = &explodeInfo[nType];
const EXPLOSION *pExplodeInfo = &explodeInfo[nType];
int nXSprite = pSprite->extra;
dassert(nXSprite > 0 && nXSprite < kMaxXSprites);
XSPRITE *pXSprite = &xsprite[nXSprite];
@ -6278,7 +6278,7 @@ spritetype* actFireMissile(spritetype *pSprite, int a2, int a3, int a4, int a5,
dassert(nType >= kMissileBase && nType < kMissileMax);
char v4 = 0;
int nSprite = pSprite->index;
MissileType *pMissileInfo = &missileInfo[nType-kMissileBase];
const MissileType *pMissileInfo = &missileInfo[nType-kMissileBase];
int x = pSprite->x+mulscale30(a2, Cos(pSprite->ang+512));
int y = pSprite->y+mulscale30(a2, Sin(pSprite->ang+512));
int z = pSprite->z+a3;
@ -6508,7 +6508,7 @@ void actFireVector(spritetype *pShooter, int a2, int a3, int a4, int a5, int a6,
{
int nShooter = pShooter->index;
dassert(vectorType >= 0 && vectorType < kVectorMax);
VECTORDATA *pVectorData = &gVectorData[vectorType];
const VECTORDATA *pVectorData = &gVectorData[vectorType];
int nRange = pVectorData->maxDist;
int hit = VectorScan(pShooter, a2, a3, a4, a5, a6, nRange, 1);
if (hit == 3)
@ -6678,7 +6678,7 @@ void actFireVector(spritetype *pShooter, int a2, int a3, int a4, int a5, int a6,
int y = gHitInfo.hity - mulscale(a5, 16, 14);
int z = gHitInfo.hitz - mulscale(a6, 16<<4, 14);
int nSurf = surfType[wall[nWall].picnum];
VECTORDATA *pVectorData = &gVectorData[19];
const VECTORDATA *pVectorData = &gVectorData[19];
FX_ID t2 = pVectorData->surfHit[nSurf].fx2;
FX_ID t3 = pVectorData->surfHit[nSurf].fx3;
spritetype *pFX = NULL;
@ -6925,6 +6925,7 @@ class ActorLoadSave : public LoadSave
void ActorLoadSave::Load(void)
{
Read(&gVectorData[VECTOR_TYPE_20].maxDist, sizeof(gVectorData[VECTOR_TYPE_20].maxDist)); // The code messes around with this field so better save it.
Read(gSpriteHit, sizeof(gSpriteHit));
Read(gAffectedSectors, sizeof(gAffectedSectors));
Read(gAffectedXWalls, sizeof(gAffectedXWalls));
@ -6935,6 +6936,7 @@ void ActorLoadSave::Load(void)
void ActorLoadSave::Save(void)
{
Write(&gVectorData[VECTOR_TYPE_20].maxDist, sizeof(gVectorData[VECTOR_TYPE_20].maxDist));
Write(gSpriteHit, sizeof(gSpriteHit));
Write(gAffectedSectors, sizeof(gAffectedSectors));
Write(gAffectedXWalls, sizeof(gAffectedXWalls));

14
source/blood/src/actor.h
View file

@ -167,15 +167,15 @@ struct VECTORDATA {
SURFHIT surfHit[15];
};
extern AMMOITEMDATA gAmmoItemData[];
extern WEAPONITEMDATA gWeaponItemData[];
extern ITEMDATA gItemData[];
extern MissileType missileInfo[];
extern EXPLOSION explodeInfo[];
extern const AMMOITEMDATA gAmmoItemData[];
extern const WEAPONITEMDATA gWeaponItemData[];
extern const ITEMDATA gItemData[];
extern const MissileType missileInfo[];
extern const EXPLOSION explodeInfo[];
extern const THINGINFO thingInfo[];
extern VECTORDATA gVectorData[];
extern int gDudeDrag;
const int gDudeDrag = 0x2a00;
extern short gAffectedSectors[kMaxSectors];
extern short gAffectedXWalls[kMaxXWalls];
@ -266,6 +266,6 @@ void actPostProcess(void);
void MakeSplash(spritetype *pSprite, XSPRITE *pXSprite);
void actBuildMissile(spritetype* pMissile, int nXSprite, int nSprite);
extern int DudeDifficulty[];
extern const int DudeDifficulty[];
END_BLD_NS

8
source/blood/src/aiunicult.cpp
View file

@ -160,7 +160,7 @@ bool genDudeAdjustSlope(spritetype* pSprite, XSPRITE* pXSprite, int dist, int we
if (weaponType == kGenDudeWeaponHitscan)
gDudeSlope[pSprite->extra] = fStart - ((fStart - fEnd) >> 2);
else if (weaponType == kGenDudeWeaponMissile) {
MissileType* pMissile = &missileInfo[pExtra->curWeapon - kMissileBase];
const MissileType* pMissile = &missileInfo[pExtra->curWeapon - kMissileBase];
gDudeSlope[pSprite->extra] = (fStart - ((fStart - fEnd) >> 2)) - (pMissile->clipDist << 1);
}
@ -501,7 +501,7 @@ static void thinkChase( spritetype* pSprite, XSPRITE* pXSprite ) {
gDudeSlope[pSprite->extra] = divscale(pTarget->z - pSprite->z, dist, 10);
short curWeapon = gGenDudeExtra[pSprite->index].curWeapon; short weaponType = gGenDudeExtra[pSprite->index].weaponType;
spritetype* pLeech = leechIsDropped(pSprite); VECTORDATA* meleeVector = &gVectorData[22];
spritetype* pLeech = leechIsDropped(pSprite); const VECTORDATA* meleeVector = &gVectorData[22];
if (weaponType == kGenDudeWeaponThrow) {
if (klabs(losAngle) < kAng15) {
if (!gThingInfoExtra[curWeapon - kThingBase].allowThrow) {
@ -651,7 +651,7 @@ static void thinkChase( spritetype* pSprite, XSPRITE* pXSprite ) {
break;
}
} else if (weaponType == kGenDudeWeaponKamikaze) {
int nType = curWeapon - kTrapExploder; EXPLOSION* pExpl = &explodeInfo[nType];
int nType = curWeapon - kTrapExploder; const EXPLOSION* pExpl = &explodeInfo[nType];
if (CheckProximity(pSprite, pTarget->x, pTarget->y, pTarget->z, pTarget->sectnum, pExpl->radius >> 1)) {
xvel[pSprite->index] = zvel[pSprite->index] = yvel[pSprite->index] = 0;
if (doExplosion(pSprite, nType) && pXSprite->health > 0)
@ -1596,7 +1596,7 @@ bool doExplosion(spritetype* pSprite, int nType) {
if (pExplosion->extra < 0 || pExplosion->extra >= kMaxXSprites)
return false;
int nSeq = 4; int nSnd = 304; EXPLOSION* pExpl = &explodeInfo[nType];
int nSeq = 4; int nSnd = 304; const EXPLOSION* pExpl = &explodeInfo[nType];
pExplosion->type = nType;
pExplosion->cstat |= CSTAT_SPRITE_INVISIBLE;

2
source/blood/src/loadsave.cpp
View file

@ -427,6 +427,7 @@ void TriggersLoadSaveConstruct(void);
void ViewLoadSaveConstruct(void);
void WarpLoadSaveConstruct(void);
void WeaponLoadSaveConstruct(void);
void NNLoadSaveConstruct(void);
void LoadSaveSetup(void)
{
@ -445,6 +446,7 @@ void LoadSaveSetup(void)
ViewLoadSaveConstruct();
WarpLoadSaveConstruct();
WeaponLoadSaveConstruct();
NNLoadSaveConstruct();
}
END_BLD_NS

41
source/blood/src/nnexts.cpp
View file

@ -32,6 +32,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "nnexts.h"
#ifdef NOONE_EXTENSIONS
#include <random>
#include "loadsave.h"
#include "aiunicult.h"
#include "triggers.h"
#include "sectorfx.h"
@ -1179,7 +1180,7 @@ void trPlayerCtrlGiveStuff(XSPRITE* pXSource, PLAYER* pPlayer, TRPLAYERCTRL* pCt
for (int i = 0; i < 12; i++) {
if (gWeaponItemData[i].type != pXSource->data3) continue;
WEAPONITEMDATA* pWeaponData = &gWeaponItemData[i]; int nAmmoType = pWeaponData->ammoType;
const WEAPONITEMDATA* pWeaponData = &gWeaponItemData[i]; int nAmmoType = pWeaponData->ammoType;
if (pXSource->data2 == 1) {
pPlayer->ammoCount[nAmmoType] = ClipHigh(pPlayer->ammoCount[nAmmoType] + pWeaponData->count, gAmmoInfo[nAmmoType].max);
} else {
@ -3710,6 +3711,44 @@ void callbackGenDudeUpdate(int nSprite) // 24
}
#endif
class NNLoadSave : public LoadSave
{
virtual void Load(void);
virtual void Save(void);
};
void NNLoadSave::Load(void)
{
Read(&gModernMap, sizeof(gModernMap));
Read(gSpriteMass, sizeof(gSpriteMass));
Read(&gProxySpritesCount, sizeof(gProxySpritesCount));
Read(gProxySpritesList, sizeof(gProxySpritesList));
Read(&gSightSpritesCount, sizeof(gSightSpritesCount));
Read(gSightSpritesList, sizeof(gSightSpritesList));
Read(&gPhysSpritesCount, sizeof(gPhysSpritesCount));
Read(gPhysSpritesList, sizeof(gPhysSpritesList));
}
void NNLoadSave::Save(void)
{
Write(&gModernMap, sizeof(gModernMap));
Write(gSpriteMass, sizeof(gSpriteMass));
Write(&gProxySpritesCount, sizeof(gProxySpritesCount));
Write(gProxySpritesList, sizeof(gProxySpritesList));
Write(&gSightSpritesCount, sizeof(gSightSpritesCount));
Write(gSightSpritesList, sizeof(gSightSpritesList));
Write(&gPhysSpritesCount, sizeof(gPhysSpritesCount));
Write(gPhysSpritesList, sizeof(gPhysSpritesList));
}
static NNLoadSave* myLoadSave;
void NNLoadSaveConstruct(void)
{
myLoadSave = new NNLoadSave();
}
///////////////////////////////////////////////////////////////////
// This file provides modern features for mappers.
// For full documentation please visit http://cruo.bloodgame.ru/xxsystem

4
source/blood/src/player.cpp
View file

@ -1085,7 +1085,7 @@ char PickupItem(PLAYER *pPlayer, spritetype *pItem) {
}
char PickupAmmo(PLAYER* pPlayer, spritetype* pAmmo) {
AMMOITEMDATA* pAmmoItemData = &gAmmoItemData[pAmmo->type - kItemAmmoBase];
const AMMOITEMDATA* pAmmoItemData = &gAmmoItemData[pAmmo->type - kItemAmmoBase];
int nAmmoType = pAmmoItemData->type;
if (pPlayer->ammoCount[nAmmoType] >= gAmmoInfo[nAmmoType].max) return 0;
@ -1102,7 +1102,7 @@ char PickupAmmo(PLAYER* pPlayer, spritetype* pAmmo) {
}
char PickupWeapon(PLAYER *pPlayer, spritetype *pWeapon) {
WEAPONITEMDATA *pWeaponItemData = &gWeaponItemData[pWeapon->type - kItemWeaponBase];
const WEAPONITEMDATA *pWeaponItemData = &gWeaponItemData[pWeapon->type - kItemWeaponBase];
int nWeaponType = pWeaponItemData->type;
int nAmmoType = pWeaponItemData->ammoType;
if (!pPlayer->hasWeapon[nWeaponType] || gGameOptions.nWeaponSettings == 2 || gGameOptions.nWeaponSettings == 3) {

4
source/common/version.h
View file

@ -67,13 +67,13 @@ const char *GetVersionString();
#define SAVESIG_PS GAMENAME ".Exhumed"
#define MINSAVEVER_DN3D 3
#define MINSAVEVER_BLD 2
#define MINSAVEVER_BLD 3
#define MINSAVEVER_RR 2
#define MINSAVEVER_SW 2
#define MINSAVEVER_PS 2
#define SAVEVER_DN3D 3
#define SAVEVER_BLD 2
#define SAVEVER_BLD 3
#define SAVEVER_RR 2
#define SAVEVER_SW 2
#define SAVEVER_PS 2