TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Pass vcobjptridx to check_trigger

Browse source
This commit is contained in:
Kp 2015-07-12 01:04:22 +00:00
parent f4ab295af8
commit 012b65a37c
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/main/switch.h
View file

@ -136,7 +136,7 @@ extern unsigned Num_triggers;
extern array<trigger, MAX_TRIGGERS> Triggers;
extern void trigger_init();
void check_trigger(vsegptridx_t seg, short side, objnum_t objnum,int shot);
void check_trigger(vcsegptridx_t seg, short side, vcobjptridx_t objnum, int shot);
extern int check_trigger_sub(int trigger_num, int player_num,int shot);
extern void triggers_frame_process();

4
similar/main/switch.cpp
View file

@ -587,7 +587,7 @@ int check_trigger_sub(int trigger_num, int pnum,int shot)
//-----------------------------------------------------------------
// Checks for a trigger whenever an object hits a trigger side.
void check_trigger(const vsegptridx_t seg, short side, objnum_t objnum,int shot)
void check_trigger(const vcsegptridx_t seg, short side, const vcobjptridx_t objnum, int shot)
{
if ((Game_mode & GM_MULTI) && (Players[Player_num].connected != CONNECT_PLAYING)) // as a host we may want to handle triggers for our clients. so this function may be called when we are not playing.
return;
@ -595,7 +595,7 @@ void check_trigger(const vsegptridx_t seg, short side, objnum_t objnum,int shot)
#if defined(DXX_BUILD_DESCENT_I)
if (objnum == Players[Player_num].objnum)
#elif defined(DXX_BUILD_DESCENT_II)
if ((objnum == Players[Player_num].objnum) || ((Objects[objnum].type == OBJ_ROBOT) && (Robot_info[get_robot_id(&Objects[objnum])].companion)))
if (objnum == Players[Player_num].objnum || (objnum->type == OBJ_ROBOT && Robot_info[get_robot_id(objnum)].companion))
#endif
{