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

Use valptr for hostage.cpp

Browse source
This commit is contained in:
Kp 2015-07-12 01:04:18 +00:00
parent aac7575b8f
commit fee9672377
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
d1x-rebirth/main/hostage.cpp
View file

@ -51,7 +51,7 @@ int hostage_is_valid( int hostage_num ) {
if ( Hostages[hostage_num].objnum > Highest_object_index ) return 0;
if ( Objects[Hostages[hostage_num].objnum].type != OBJ_HOSTAGE ) return 0;
if ( Objects[Hostages[hostage_num].objnum].signature != Hostages[hostage_num].objsig ) return 0;
if ( get_hostage_id(&Objects[Hostages[hostage_num].objnum]) != hostage_num) return 0;
if ( get_hostage_id(vcobjptr(Hostages[hostage_num].objnum)) != hostage_num) return 0;
return 1;
}
@ -103,7 +103,7 @@ void hostage_compress_all() {
newslot = hostage_get_next_slot();
if ( newslot < i ) {
Hostages[newslot] = Hostages[i];
set_hostage_id(&Objects[Hostages[newslot].objnum], newslot);
set_hostage_id(vobjptr(Hostages[newslot].objnum), newslot);
Hostages[i].objnum = object_none;
i = 0; // start over
}