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

Pass objptridx_t to add_stuck_object

Browse source
This commit is contained in:
Kp 2014-01-11 22:38:16 +00:00
parent f9c7311214
commit 7af7f60ffb
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
common/main/wall.h
View file

@ -23,6 +23,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
#include "segment.h"
struct object;
struct objptridx_t;
#ifdef __cplusplus
@ -303,7 +304,7 @@ extern stuckobj Stuck_objects[MAX_STUCK_OBJECTS];
// An object got stuck in a door (like a flare).
// Add global entry.
extern void add_stuck_object(object *objp, int segnum, int sidenum);
void add_stuck_object(objptridx_t objp, int segnum, int sidenum);
extern void remove_obsolete_stuck_objects(void);
//set the tmap_num or tmap_num2 field for a wall/door

4
similar/main/wall.cpp
View file

@ -1511,7 +1511,7 @@ stuckobj Stuck_objects[MAX_STUCK_OBJECTS];
// An object got stuck in a door (like a flare).
// Add global entry.
void add_stuck_object(object *objp, int segnum, int sidenum)
void add_stuck_object(objptridx_t objp, int segnum, int sidenum)
{
int i;
int wallnum;
@ -1522,7 +1522,7 @@ void add_stuck_object(object *objp, int segnum, int sidenum)
for (i=0; i<MAX_STUCK_OBJECTS; i++) {
if (Stuck_objects[i].wallnum == -1) {
Stuck_objects[i].wallnum = wallnum;
Stuck_objects[i].objnum = objp-Objects;
Stuck_objects[i].objnum = objp;
Stuck_objects[i].signature = objp->signature;
Num_stuck_objects++;
break;