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

- Removed link support for various upper / lower stacks (deprecated)

Browse source 
- Removed link support for path marker (deprecated)
- Removed link support for counter sector (deprecated)
- STD random for wind generator
This commit is contained in:
NoOneBlood 2020-04-12 23:30:49 +03:00 committed by Christoph Oelckers
parent 142e611125
commit c000e2e3b3
4 changed files with 8 additions and 147 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -359,11 +359,7 @@ void EnemyBubble(int nSprite) // 11
void CounterCheck(int nSector) // 12
{
dassert(nSector >= 0 && nSector < kMaxSectors);
// remove check below, so every sector can be counter if command 12 (this callback) received.
#ifndef NOONE_EXTENSIONS
if (sector[nSector].type != kSectorCounter) return;
#endif
if (sector[nSector].extra <= 0) return;
XSECTOR *pXSector = &xsector[sector[nSector].extra];

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

@ -1962,7 +1962,7 @@ void useSectorWindGen(XSPRITE* pXSource, sectortype* pSector) {
break;
case 1:
case 3:
pXSector->windVel = Random(windVel);
pXSector->windVel = nnExtRandom(0, windVel);
break;
}
@ -1972,7 +1972,7 @@ void useSectorWindGen(XSPRITE* pXSource, sectortype* pSector) {
case 2:
case 3:
while (pSource->ang == ang)
pSource->ang = Random3(kAng360);
pSource->ang = nnExtRandom(-kAng360, kAng360) & 2047;
break;
}
}
@ -3194,13 +3194,6 @@ bool modernTypeOperateSprite(int nSprite, spritetype* pSprite, XSPRITE* pXSprite
case kModernCondition: // WIP
if (!pXSprite->isTriggered) useCondition(pXSprite, event);
return true;
// add linking for path markers and stacks
case kMarkerLowWater: case kMarkerUpWater: case kMarkerUpGoo:
case kMarkerLowGoo: case kMarkerUpLink: case kMarkerLowLink:
case kMarkerUpStack: case kMarkerLowStack: case kMarkerPath:
if (pXSprite->txID > 0 && pXSprite->command == kCmdLink)
evSend(nSprite, 3, pXSprite->txID, (COMMAND_ID)pXSprite->command);
return true;
// add spawn random dude feature - works only if at least 2 data fields are not empty.
case kMarkerDudeSpawn:
if (gGameOptions.nMonsterSettings && pXSprite->data1 >= kDudeBase && pXSprite->data1 < kDudeVanillaMax) {
@ -3544,123 +3537,6 @@ bool modernTypeOperateSprite(int nSprite, spritetype* pSprite, XSPRITE* pXSprite
}
}
bool modernTypeLinkSprite(spritetype* pSprite, XSPRITE* pXSprite, EVENT event) {
switch (pSprite->type) {
// these can be linked too now, so it's possible to change palette, underwater status and more...
case kMarkerLowWater:
case kMarkerUpWater:
case kMarkerUpGoo:
case kMarkerLowGoo:
case kMarkerUpLink:
case kMarkerLowLink:
case kMarkerUpStack:
case kMarkerLowStack: {
if (event.type != OBJ_SPRITE) break;
spritetype* pSprite2 = &sprite[event.index];
if (pSprite2->extra < 0) break;
XSPRITE* pXSprite2 = &xsprite[pSprite2->extra];
// Only lower to lower and upper to upper linking allowed.
switch (pSprite->type) {
case kMarkerLowWater:
case kMarkerLowLink:
case kMarkerLowStack:
case kMarkerLowGoo:
switch (pSprite2->type) {
case kMarkerLowWater:
case kMarkerLowLink:
case kMarkerLowStack:
case kMarkerLowGoo:
break;
default:
return true;
}
break;
case kMarkerUpWater:
case kMarkerUpLink:
case kMarkerUpStack:
case kMarkerUpGoo:
switch (pSprite2->type) {
case kMarkerUpWater:
case kMarkerUpLink:
case kMarkerUpStack:
case kMarkerUpGoo:
break;
default:
return true;
}
break;
}
// swap link location
/*short tmp1 = pXSprite2.data1;*/
/*pXSprite2.data1 = pXSprite.data1;*/
/*pXSprite.data1 = tmp1;*/
if (pXSprite->data2 < kMaxPAL)
{
// swap medium
int tmp2 = pXSprite2->data2;
pXSprite2->data2 = pXSprite->data2;
pXSprite->data2 = tmp2;
}
// swap link type // swap link owners (sectors)
short tmp3 = pSprite2->type; //short tmp7 = pSprite2.owner;
pSprite2->type = pSprite->type; //pSprite2.owner = pSprite.owner;
pSprite->type = tmp3; //pSprite.owner = tmp7;
// Deal with linked sectors
sectortype* pSector = &sector[pSprite->sectnum];
sectortype* pSector2 = &sector[pSprite2->sectnum];
// Check for underwater
XSECTOR* pXSector = NULL; XSECTOR* pXSector2 = NULL;
if (pSector->extra > 0) pXSector = &xsector[pSector->extra];
if (pSector2->extra > 0) pXSector2 = &xsector[pSector2->extra];
if (pXSector != NULL && pXSector2 != NULL) {
bool tmp6 = pXSector->Underwater;
pXSector->Underwater = pXSector2->Underwater;
pXSector2->Underwater = tmp6;
}
// optionally swap floorpic
if (pXSprite2->data3 == 1) {
short tmp4 = pSector->floorpicnum;
pSector->floorpicnum = pSector2->floorpicnum;
pSector2->floorpicnum = tmp4;
}
// optionally swap ceilpic
if (pXSprite2->data4 == 1) {
short tmp5 = pSector->ceilingpicnum;
pSector->ceilingpicnum = pSector2->ceilingpicnum;
pSector2->ceilingpicnum = tmp5;
}
}
return true;
// add a way to link between path markers, so path sectors can change their path on the fly.
case kMarkerPath:
// only path marker to path marker link allowed
if (event.type == OBJ_SPRITE) {
int nXSprite2 = sprite[event.index].extra;
// get master path marker data fields
pXSprite->data1 = xsprite[nXSprite2].data1;
pXSprite->data2 = xsprite[nXSprite2].data2;
pXSprite->data3 = xsprite[nXSprite2].data3; // include soundId(?)
// get master path marker busy and wait times
pXSprite->busyTime = xsprite[nXSprite2].busyTime;
pXSprite->waitTime = xsprite[nXSprite2].waitTime;
}
return true;
}
return false;
}
bool modernTypeOperateWall(int nWall, walltype* pWall, XWALL* pXWall, EVENT event) {
switch (pWall->type) {

1
source/blood/src/nnexts.h
View file

@ -295,7 +295,6 @@ void trPlayerCtrlUsePackItem(XSPRITE* pXSource, PLAYER* pPlayer);
void modernTypeTrigger(int type, int nDest, EVENT event);
char modernTypeSetSpriteState(int nSprite, XSPRITE* pXSprite, int nState);
bool modernTypeOperateSprite(int nSprite, spritetype* pSprite, XSPRITE* pXSprite, EVENT event);
bool modernTypeLinkSprite(spritetype* pSprite, XSPRITE* pXSprite, EVENT event);
bool modernTypeOperateWall(int nWall, walltype* pWall, XWALL* pXWall, EVENT event);
void modernTypeSendCommand(int nSprite, int channel, COMMAND_ID command);
// ------------------------------------------------------------------------- //

22
source/blood/src/triggers.cpp
View file

@ -1580,7 +1580,7 @@ void OperateSector(unsigned int nSector, XSECTOR *pXSector, EVENT event)
case kCmdUnlock:
case kCmdToggleLock:
if (pXSector->locked != 1) break;
pXSector->state = 0;
SetSectorState(nSector, pXSector, 0);
evPost(nSector, 6, 0, kCallbackCounterCheck);
break;
}
@ -1725,14 +1725,6 @@ void LinkSector(int nSector, XSECTOR *pXSector, EVENT event)
case kSectorRotate:
RDoorBusy(nSector, nBusy);
break;
#ifdef NOONE_EXTENSIONS
// add link support for counter sectors so they can change necessary type and count of types
case kSectorCounter:
if (!gModernMap) break;
pXSector->waitTimeA = xsector[sector[event.index].extra].waitTimeA;
pXSector->data = xsector[sector[event.index].extra].data;
break;
#endif
default:
pXSector->busy = nBusy;
if ((pXSector->busy&0xffff) == 0)
@ -1744,10 +1736,7 @@ void LinkSector(int nSector, XSECTOR *pXSector, EVENT event)
void LinkSprite(int nSprite, XSPRITE *pXSprite, EVENT event) {
spritetype *pSprite = &sprite[nSprite];
int nBusy = GetSourceBusy(event);
#ifdef NOONE_EXTENSIONS
if (gModernMap && modernTypeLinkSprite(pSprite, pXSprite, event))
return;
#endif
switch (pSprite->type) {
case kSwitchCombo:
{
@ -2087,11 +2076,12 @@ void trInit(void)
switch (pSector->type)
{
case kSectorCounter:
// no need to trigger once it, instead lock so it can be unlocked and used again.
#ifdef NOONE_EXTENSIONS
if (!gModernMap)
if (gModernMap)
pXSector->triggerOff = false;
else
#endif
pXSector->triggerOnce = 1;
pXSector->triggerOnce = 1;
evPost(i, 6, 0, kCallbackCounterCheck);
break;
case kSectorZMotion: