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

- only use the floatified version of findplayer.

Browse source
This commit is contained in:
Christoph Oelckers 2022-09-14 22:49:01 +02:00
parent 848d7fc16e
commit 1fdfe4635b
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/games/duke/src/funct.h
View file

@ -174,7 +174,7 @@ DDukeActor* LocateTheLocator(int n, sectortype* sectnum);
void clearcamera(player_struct* ps); void clearcamera(player_struct* ps);
void LoadActor(DDukeActor* i, int p, int x); void LoadActor(DDukeActor* i, int p, int x);
void execute(DDukeActor* s, int p, int d); void execute(DDukeActor* s, int p, double d);
void makeitfall(DDukeActor* s); void makeitfall(DDukeActor* s);
DAngle furthestangle(DDukeActor* snum, int angDiv); DAngle furthestangle(DDukeActor* snum, int angDiv);
void getglobalz(DDukeActor* s); void getglobalz(DDukeActor* s);

6
source/games/duke/src/gameexec.cpp
View file

@ -3703,7 +3703,7 @@ void LoadActor(DDukeActor *actor, int p, int x)
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
void execute(DDukeActor *actor,int p,int x) void execute(DDukeActor *actor,int p,double xx)
{ {
if (gs.actorinfo[actor->spr.picnum].scriptaddress == 0) return; if (gs.actorinfo[actor->spr.picnum].scriptaddress == 0) return;
@ -3711,7 +3711,7 @@ void execute(DDukeActor *actor,int p,int x)
ParseState s; ParseState s;
s.g_p = p; // Player ID s.g_p = p; // Player ID
s.g_x = x; // ?? s.g_x = int(xx / maptoworld); // ??
s.g_ac = actor; s.g_ac = actor;
s.g_t = &actor->temp_data[0]; // Sprite's 'extra' data s.g_t = &actor->temp_data[0]; // Sprite's 'extra' data
@ -3760,7 +3760,7 @@ void execute(DDukeActor *actor,int p,int x)
} }
else else
{ {
fi.move(actor, p, x); fi.move(actor, p, int(xx / maptoworld));
if (actor->spr.statnum == STAT_ACTOR) if (actor->spr.statnum == STAT_ACTOR)
{ {

2
source/games/duke/src/vmexports.cpp
View file

@ -143,7 +143,7 @@ DEFINE_ACTION_FUNCTION_NATIVE(DDukeActor, getglobalz, getglobalz)
player_struct* DukeActor_findplayer(DDukeActor* self) player_struct* DukeActor_findplayer(DDukeActor* self)
{ {
int a; double a;
return &ps[findplayer(self, &a)]; return &ps[findplayer(self, &a)];
} }