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

- wrapped almost everything

Browse source
This commit is contained in:
Christoph Oelckers 2022-08-31 00:44:27 +02:00
parent 8bb609fbb1
commit 153b5b84f3
3 changed files with 22 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
source/games/sw/src/game.h
View file

@ -944,6 +944,9 @@ struct USER
void set_int_change_x(int x) { change.X = x; } void set_int_change_x(int x) { change.X = x; }
void set_int_change_y(int x) { change.Y = x; } void set_int_change_y(int x) { change.Y = x; }
void set_int_change_z(int x) { change.Z = x; } void set_int_change_z(int x) { change.Z = x; }
void add_int_change_x(int x) { change.X += x; }
void add_int_change_y(int x) { change.Y += x; }
void add_int_change_z(int x) { change.Z += x; }
// frequently repeated patterns // frequently repeated patterns
void clearChange() { change.X = change.Y = change.Z = 0; } void clearChange() { change.X = change.Y = change.Z = 0; }

8
source/games/sw/src/jweapon.cpp
View file

@ -1275,8 +1275,8 @@ int PlayerInitChemBomb(PLAYER* pp)
UpdateChange(actorNew, 0.5); UpdateChange(actorNew, 0.5);
// adjust xvel according to player velocity // adjust xvel according to player velocity
actorNew->user.change.X += pp->vect.X >> 14; actorNew->user.add_int_change_x(pp->vect.X >> 14);
actorNew->user.change.Y += pp->vect.Y >> 14; actorNew->user.add_int_change_y(pp->vect.Y >> 14);
// Smoke will come out for this many seconds // Smoke will come out for this many seconds
actorNew->user.WaitTics = CHEMTICS; actorNew->user.WaitTics = CHEMTICS;
@ -1626,8 +1626,8 @@ int PlayerInitCaltrops(PLAYER* pp)
UpdateChange(actorNew, 0.5); UpdateChange(actorNew, 0.5);
// adjust xvel according to player velocity // adjust xvel according to player velocity
actorNew->user.change.X += pp->vect.X >> 14; actorNew->user.add_int_change_x(pp->vect.X >> 14);
actorNew->user.change.Y += pp->vect.Y >> 14; actorNew->user.add_int_change_y(pp->vect.Y >> 14);
SetupSpriteForBreak(actorNew); // Put Caltrops in the break queue SetupSpriteForBreak(actorNew); // Put Caltrops in the break queue
return 0; return 0;

30
source/games/sw/src/weapon.cpp
View file

@ -3862,7 +3862,7 @@ int DoFastShrapJumpFall(DSWActor* actor)
int DoTracerShrap(DSWActor* actor) int DoTracerShrap(DSWActor* actor)
{ {
actor->add_int_pos({ actor->user.int_change().X, actor->user.int_change().Y, actor->user.change.Z }); actor->add_int_pos({ actor->user.int_change().X, actor->user.int_change().Y, actor->user.int_change().Z });
actor->user.WaitTics -= MISSILEMOVETICS; actor->user.WaitTics -= MISSILEMOVETICS;
if (actor->user.WaitTics <= 0) if (actor->user.WaitTics <= 0)
@ -7850,9 +7850,9 @@ int VectorMissileSeek(DSWActor* actor, int16_t delay_tics, int16_t turn_speed, i
// the large turn_speed is the slower the turn // the large turn_speed is the slower the turn
actor->user.set_int_change_x((actor->user.change.X + ox*(turn_speed-1))/turn_speed); actor->user.set_int_change_x((actor->user.int_change().X + ox*(turn_speed-1))/turn_speed);
actor->user.set_int_change_y((actor->user.change.Y + oy*(turn_speed-1))/turn_speed); actor->user.set_int_change_y((actor->user.int_change().Y + oy*(turn_speed-1))/turn_speed);
actor->user.set_int_change_z((actor->user.change.Z + oz*(turn_speed-1))/turn_speed); actor->user.set_int_change_z((actor->user.int_change().Z + oz*(turn_speed-1))/turn_speed);
SetAngleFromChange(actor); SetAngleFromChange(actor);
} }
@ -7906,9 +7906,9 @@ int VectorWormSeek(DSWActor* actor, int16_t delay_tics, int16_t aware_range1, in
actor->user.set_int_change_y(Scale(actor->spr.xvel, goal->int_pos().Y - actor->int_pos().Y, dist)); actor->user.set_int_change_y(Scale(actor->spr.xvel, goal->int_pos().Y - actor->int_pos().Y, dist));
actor->user.set_int_change_z(Scale(actor->spr.xvel, zh - actor->int_pos().Z, dist)); actor->user.set_int_change_z(Scale(actor->spr.xvel, zh - actor->int_pos().Z, dist));
actor->user.set_int_change_x((actor->user.change.X + ox*7)/8); actor->user.set_int_change_x((actor->user.int_change().X + ox*7)/8);
actor->user.set_int_change_y((actor->user.change.Y + oy*7)/8); actor->user.set_int_change_y((actor->user.int_change().Y + oy*7)/8);
actor->user.set_int_change_z((actor->user.change.Z + oz*7)/8); actor->user.set_int_change_z((actor->user.int_change().Z + oz*7)/8);
SetAngleFromChange(actor); SetAngleFromChange(actor);
} }
@ -8191,9 +8191,9 @@ bool SlopeBounce(DSWActor* actor, bool *hit_wall)
if ((abs(k)>>14) < l) if ((abs(k)>>14) < l)
{ {
k = DivScale(k, l, 17); k = DivScale(k, l, 17);
actor->user.change.X -= MulScale(dax, k, 16); actor->user.add_int_change_x(-MulScale(dax, k, 16));
actor->user.change.Y -= MulScale(day, k, 16); actor->user.add_int_change_y(-MulScale(day, k, 16));
actor->user.change.Z -= MulScale(daz, k, 12); actor->user.add_int_change_z(-MulScale(daz, k, 12));
SetAngleFromChange(actor); SetAngleFromChange(actor);
} }
@ -8937,7 +8937,7 @@ int DoMine(DSWActor* actor)
int DoPuff(DSWActor* actor) int DoPuff(DSWActor* actor)
{ {
actor->add_int_pos({ actor->user.int_change().X, actor->user.int_change().Y, actor->user.change.Z }); actor->add_int_pos({ actor->user.int_change().X, actor->user.int_change().Y, actor->user.int_change().Z });
return 0; return 0;
} }
@ -16154,8 +16154,8 @@ int InitGrenade(PLAYER* pp)
if (!auto_aim) if (!auto_aim)
{ {
// adjust xvel according to player velocity // adjust xvel according to player velocity
actorNew->user.change.X += pp->vect.X>>14; actorNew->user.add_int_change_x(pp->vect.X>>14);
actorNew->user.change.Y += pp->vect.Y>>14; actorNew->user.add_int_change_y(pp->vect.Y>>14);
} }
actorNew->user.Counter2 = true; // Phosphorus Grenade actorNew->user.Counter2 = true; // Phosphorus Grenade
@ -16262,8 +16262,8 @@ int InitMine(PLAYER* pp)
if (labs(dot) > 10000) if (labs(dot) > 10000)
{ {
// adjust xvel according to player velocity // adjust xvel according to player velocity
actorNew->user.change.X += pp->vect.X>>13; actorNew->user.add_int_change_x(pp->vect.X>>13);
actorNew->user.change.Y += pp->vect.Y>>13; actorNew->user.add_int_change_y(pp->vect.Y>>13);
} }
return 0; return 0;