zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-02-07 07:21:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

- a few player functions.

Browse source
This commit is contained in:
Christoph Oelckers 2021-11-01 19:08:45 +01:00
parent 448e57c86c
commit dd684f36a4
3 changed files with 22 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
source/games/sw/src/player.cpp
View file

@ -1267,7 +1267,6 @@ void DoPlayerResetMovement(PLAYERp pp)
void DoPlayerTeleportPause(PLAYERp pp) void DoPlayerTeleportPause(PLAYERp pp)
{ {
USERp u = pp->Actor()->u(); USERp u = pp->Actor()->u();
// SPRITEp sp = &pp->Actor()->s();
// set this so we don't get stuck in teleporting loop // set this so we don't get stuck in teleporting loop
pp->lastcursectnum = pp->cursectnum; pp->lastcursectnum = pp->cursectnum;
@ -1280,17 +1279,11 @@ void DoPlayerTeleportPause(PLAYERp pp)
DoPlayerBeginRun(pp); DoPlayerBeginRun(pp);
return; return;
} }
//sp->shade -= 2;
//if (sp->shade <= 0)
// sp->shade = 0;
//DoPlayerBob(pp);
} }
void DoPlayerTeleportToSprite(PLAYERp pp, SPRITEp sp) void DoPlayerTeleportToSprite(PLAYERp pp, vec3_t* sp, int ang)
{ {
pp->angle.ang = pp->angle.oang = buildang(sp->ang); pp->angle.ang = pp->angle.oang = buildang(ang);
pp->posx = pp->oposx = pp->oldposx = sp->x; pp->posx = pp->oposx = pp->oldposx = sp->x;
pp->posy = pp->oposy = pp->oldposy = sp->y; pp->posy = pp->oposy = pp->oldposy = sp->y;
@ -1314,26 +1307,26 @@ void DoPlayerTeleportToOffset(PLAYERp pp)
SET(pp->Flags2, PF2_TELEPORTED); SET(pp->Flags2, PF2_TELEPORTED);
} }
void DoSpawnTeleporterEffect(SPRITEp sp) void DoSpawnTeleporterEffect(DSWActor* actor)
{ {
auto sp = &actor->s();
extern STATE s_TeleportEffect[]; extern STATE s_TeleportEffect[];
short effect;
int nx, ny; int nx, ny;
SPRITEp ep; SPRITEp ep;
nx = MOVEx(512L, sp->ang); nx = MOVEx(512, sp->ang);
ny = MOVEy(512L, sp->ang); ny = MOVEy(512, sp->ang);
nx += sp->x; nx += sp->x;
ny += sp->y; ny += sp->y;
effect = SpawnSprite(STAT_MISSILE, 0, s_TeleportEffect, sp->sectnum, auto effectActor = SpawnActor(STAT_MISSILE, 0, s_TeleportEffect, sp->sectnum,
nx, ny, SPRITEp_TOS(sp) + Z(16), nx, ny, SPRITEp_TOS(sp) + Z(16),
sp->ang, 0); sp->ang, 0);
ep = &sprite[effect]; ep = &effectActor->s();
setspritez(effect, &ep->pos); SetActorZ(effectActor, &ep->pos);
ep->shade = -40; ep->shade = -40;
ep->xrepeat = ep->yrepeat = 42; ep->xrepeat = ep->yrepeat = 42;
@ -1341,22 +1334,21 @@ void DoSpawnTeleporterEffect(SPRITEp sp)
RESET(ep->cstat, CSTAT_SPRITE_BLOCK|CSTAT_SPRITE_BLOCK_HITSCAN); RESET(ep->cstat, CSTAT_SPRITE_BLOCK|CSTAT_SPRITE_BLOCK_HITSCAN);
SET(ep->cstat, CSTAT_SPRITE_ALIGNMENT_WALL); SET(ep->cstat, CSTAT_SPRITE_ALIGNMENT_WALL);
//ep->ang = NORM_ANGLE(ep->ang + 512);
} }
void DoSpawnTeleporterEffectPlace(SPRITEp sp) void DoSpawnTeleporterEffectPlace(DSWActor* actor)
{ {
auto sp = &actor->s();
extern STATE s_TeleportEffect[]; extern STATE s_TeleportEffect[];
short effect;
SPRITEp ep; SPRITEp ep;
effect = SpawnSprite(STAT_MISSILE, 0, s_TeleportEffect, sp->sectnum, auto effectActor = SpawnActor(STAT_MISSILE, 0, s_TeleportEffect, sp->sectnum,
sp->x, sp->y, SPRITEp_TOS(sp) + Z(16), sp->x, sp->y, SPRITEp_TOS(sp) + Z(16),
sp->ang, 0); sp->ang, 0);
ep = &sprite[effect]; ep = &effectActor->s();
setspritez(effect, &ep->pos); SetActorZ(effectActor, &ep->pos);
ep->shade = -40; ep->shade = -40;
ep->xrepeat = ep->yrepeat = 42; ep->xrepeat = ep->yrepeat = 42;
@ -1393,7 +1385,7 @@ void DoPlayerWarpTeleporter(PLAYERp pp)
UpdatePlayerSprite(pp); UpdatePlayerSprite(pp);
break; break;
default: default:
DoPlayerTeleportToSprite(pp, sp_warp); DoPlayerTeleportToSprite(pp, &sp_warp->pos, sp_warp->ang);
PlaySound(DIGI_TELEPORT, pp, v3df_none); PlaySound(DIGI_TELEPORT, pp, v3df_none);
@ -1409,7 +1401,7 @@ void DoPlayerWarpTeleporter(PLAYERp pp)
NewStateGroup(pp->Actor(), pp->Actor()->u()->ActorActionSet->Stand); NewStateGroup(pp->Actor(), pp->Actor()->u()->ActorActionSet->Stand);
UpdatePlayerSprite(pp); UpdatePlayerSprite(pp);
DoSpawnTeleporterEffect(sp); DoSpawnTeleporterEffect(pp->Actor());
TRAVERSE_CONNECT(pnum) TRAVERSE_CONNECT(pnum)
{ {
@ -5921,7 +5913,7 @@ void DoPlayerDeathCheckKeys(PLAYERp pp)
pp->SpriteP->z = pp->posz+PLAYER_HEIGHT; pp->SpriteP->z = pp->posz+PLAYER_HEIGHT;
pp->SpriteP->ang = pp->angle.ang.asbuild(); pp->SpriteP->ang = pp->angle.ang.asbuild();
DoSpawnTeleporterEffect(pp->SpriteP); DoSpawnTeleporterEffect(pp->Actor());
PlaySound(DIGI_TELEPORT, pp, v3df_none); PlaySound(DIGI_TELEPORT, pp, v3df_none);
DoPlayerZrange(pp); DoPlayerZrange(pp);

9
source/games/sw/src/sector.cpp
View file

@ -844,20 +844,19 @@ SectorDistanceByMid(short sect1, int sect2)
short short
DoSpawnActorTrigger(short match) DoSpawnActorTrigger(short match)
{ {
int i;
short spawn_count = 0; short spawn_count = 0;
SPRITEp sp; SPRITEp sp;
StatIterator it(STAT_SPAWN_TRIGGER); SWStatIterator it(STAT_SPAWN_TRIGGER);
while ((i = it.NextIndex()) >= 0) while (auto actor = it.Next())
{ {
sp = &sprite[i]; sp = &actor->s();
if (sp->hitag == match) if (sp->hitag == match)
{ {
if (ActorSpawn(sp)) if (ActorSpawn(sp))
{ {
DoSpawnTeleporterEffectPlace(sp); DoSpawnTeleporterEffectPlace(actor);
PlaySound(DIGI_PLAYER_TELEPORT, sp, v3df_none); PlaySound(DIGI_PLAYER_TELEPORT, sp, v3df_none);
spawn_count++; spawn_count++;
} }

3
source/games/sw/src/sprite.cpp
View file

@ -7056,7 +7056,6 @@ void MissileWarpType(SPRITEp sp, SPRITEp sp_warp)
break; break;
default: default:
PlaySound(DIGI_ITEM_SPAWN, sp, v3df_none); PlaySound(DIGI_ITEM_SPAWN, sp, v3df_none);
//DoSpawnTeleporterEffectPlace(sp);
DoSpawnItemTeleporterEffect(sp); DoSpawnItemTeleporterEffect(sp);
break; break;
} }
@ -7070,7 +7069,7 @@ void ActorWarpType(SPRITEp sp, SPRITEp sp_warp)
break; break;
default: default:
PlaySound(DIGI_ITEM_SPAWN, sp, v3df_none); PlaySound(DIGI_ITEM_SPAWN, sp, v3df_none);
DoSpawnTeleporterEffectPlace(sp); DoSpawnTeleporterEffectPlace(&swActors[sp - sprite]);
break; break;
} }
} }