zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-01-31 12:30:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

- one last change plus formatting of actor.cpp

Browse source
This commit is contained in:
Christoph Oelckers 2022-09-04 20:27:54 +02:00
parent 7ba56bc6cc
commit 0f5d66a4a7
1 changed files with 64 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
source/games/sw/src/actor.cpp
View file

@ -627,8 +627,12 @@ int DoActorBeginSlide(DSWActor* actor, DAngle ang, double vel)
return 0; return 0;
} }
//---------------------------------------------------------------------------
//
// !AIC - Sliding can occur in different directions from movement of the actor. // !AIC - Sliding can occur in different directions from movement of the actor.
// Has its own set of variables // Has its own set of variables
//
//---------------------------------------------------------------------------
int DoActorSlide(DSWActor* actor) int DoActorSlide(DSWActor* actor)
{ {
@ -650,7 +654,11 @@ int DoActorSlide(DSWActor* actor)
return true; return true;
} }
//---------------------------------------------------------------------------
//
// !AIC - Actor jumping and falling // !AIC - Actor jumping and falling
//
//---------------------------------------------------------------------------
int DoActorBeginJump(DSWActor* actor) int DoActorBeginJump(DSWActor* actor)
{ {
@ -678,6 +686,12 @@ int DoActorBeginJump(DSWActor* actor)
return 0; return 0;
} }
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
int DoActorJump(DSWActor* actor) int DoActorJump(DSWActor* actor)
{ {
int jump_adj; int jump_adj;
@ -714,6 +728,11 @@ int DoActorJump(DSWActor* actor)
return 0; return 0;
} }
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
int DoActorBeginFall(DSWActor* actor) int DoActorBeginFall(DSWActor* actor)
{ {
@ -743,6 +762,11 @@ int DoActorBeginFall(DSWActor* actor)
return 0; return 0;
} }
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
int DoActorFall(DSWActor* actor) int DoActorFall(DSWActor* actor)
{ {
@ -761,6 +785,12 @@ int DoActorFall(DSWActor* actor)
return 0; return 0;
} }
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
int DoActorStopFall(DSWActor* actor) int DoActorStopFall(DSWActor* actor)
{ {
actor->spr.pos.Z = actor->user.loz; actor->spr.pos.Z = actor->user.loz;
@ -772,8 +802,7 @@ int DoActorStopFall(DSWActor* actor)
// don't stand on face or wall sprites - jump again // don't stand on face or wall sprites - jump again
if (actor->user.lowActor && !(actor->user.lowActor->spr.cstat & CSTAT_SPRITE_ALIGNMENT_FLOOR)) if (actor->user.lowActor && !(actor->user.lowActor->spr.cstat & CSTAT_SPRITE_ALIGNMENT_FLOOR))
{ {
//actor->spr.__int_angle = NORM_ANGLE(actor->spr.angle + (RANDOM_P2(64<<8)>>8) - 32); actor->spr.angle += DAngle180 + DAngle::fromBuild(RANDOM_P2(512<<8)>>8);
actor->set_int_ang(NORM_ANGLE(actor->int_ang() + 1024 + (RANDOM_P2(512<<8)>>8)));
actor->user.jump_speed = -350; actor->user.jump_speed = -350;
DoActorBeginJump(actor); DoActorBeginJump(actor);
@ -805,6 +834,12 @@ int DoActorStopFall(DSWActor* actor)
return 0; return 0;
} }
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
int DoActorDeathMove(DSWActor* actor) int DoActorDeathMove(DSWActor* actor)
{ {
if (actor->user.Flags & (SPR_JUMPING | SPR_FALLING)) if (actor->user.Flags & (SPR_JUMPING | SPR_FALLING))
@ -825,7 +860,12 @@ int DoActorDeathMove(DSWActor* actor)
return 0; return 0;
} }
//---------------------------------------------------------------------------
//
// !AIC - Jumping a falling for shrapnel and other stuff, not actors. // !AIC - Jumping a falling for shrapnel and other stuff, not actors.
//
//---------------------------------------------------------------------------
int DoBeginJump(DSWActor* actor) int DoBeginJump(DSWActor* actor)
{ {
@ -840,6 +880,12 @@ int DoBeginJump(DSWActor* actor)
return 0; return 0;
} }
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
int DoJump(DSWActor* actor) int DoJump(DSWActor* actor)
{ {
int jump_adj; int jump_adj;
@ -876,6 +922,11 @@ int DoJump(DSWActor* actor)
return 0; return 0;
} }
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
int DoBeginFall(DSWActor* actor) int DoBeginFall(DSWActor* actor)
{ {
@ -889,6 +940,12 @@ int DoBeginFall(DSWActor* actor)
return 0; return 0;
} }
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
int DoFall(DSWActor* actor) int DoFall(DSWActor* actor)
{ {
// adjust jump speed by gravity // adjust jump speed by gravity
@ -907,6 +964,11 @@ int DoFall(DSWActor* actor)
return 0; return 0;
} }
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
#include "saveable.h" #include "saveable.h"