mirror/perfect-dark
1
0
Fork 0
mirror of https://gitlab.com/ryandwyer/perfect-dark synced 2026-09-01 17:29:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rename/annotate object flags with editor's names

Browse Source
This commit is contained in:
Ryan Dwyer
2020-01-25 12:42:56 +10:00
parent 662663703b
commit bdae3055a4
19 changed files with 210 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/chr/chr.c
+3 -3
View File
@@ -12543,7 +12543,7 @@ struct prop *chrGetEquippedWeaponPropWithCheck(struct chrdata *chr, s32 hand)
if (prop) {
struct weaponobj *weapon = prop->weapon;
if (!weaponHasFlag(weapon->weapon_id, 0x00000010)) {
if (!weaponHasFlag(weapon->weapon_id, WEAPONFLAG_00000010)) {
prop = NULL;
}
}
@@ -33291,7 +33291,7 @@ s32 chrConsiderGrenadeThrow(struct chrdata *chr, u32 entitytype, u32 entityid)
if (prop) {
weapon = prop->weapon;
weapon->hidden |= 0x00000800;
weapon->hidden |= OBJHFLAG_00000800;
chrThrowGrenade(chr, rightprop == NULL ? 0 : 1, true);
chr->act_throwgrenade.entitytype = entitytype;
chr->act_throwgrenade.entityid = entityid;
@@ -49032,7 +49032,7 @@ bool chrHasStageFlag(struct chrdata *chr, u32 flag)
bool chrHasHiddenFlag00000002(struct chrdata *chr)
{
return (chr->hidden & 0x00000002) != 0;
return (chr->hidden & CHRHFLAG_00000002) != 0;
}
void chrRestartTimer(struct chrdata *chr)
src/game/chr/chraicommands.c
+11 -11
View File
@@ -2960,7 +2960,7 @@ bool aiIfGunUnclaimed(void)
struct weaponobj *weapon = g_Vars.chrdata->gunprop->weapon;
if (weapon && weapon->prop) {
weapon->flags |= 0x00400000;
weapon->flags |= OBJFLAG_00400000;
g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[4]);
} else {
g_Vars.aioffset += 5;
@@ -3160,7 +3160,7 @@ bool aiDestroyObject(void)
struct defaultobj *entity = obj->prop->obj;
if (entity->obj == 0xeb) {
obj->flags = (obj->flags & 0xfffeffff) | 0x20000;
obj->flags = (obj->flags & ~OBJFLAG_00010000) | OBJFLAG_INVINCIBLE;
func0f129900(entity->prop, &entity->prop->pos, &entity->prop->rooms[0], 3, 0);
func0f12e714(entity->prop, 0x16);
} else {
@@ -3259,12 +3259,12 @@ bool aiChrDropWeapon(void)
} else if (chr && chr->prop) {
if (chr->weapons_held[0]) {
func0f082964(chr->weapons_held[0], 1);
chr->hidden = chr->hidden | 0x00000001;
chr->hidden |= CHRHFLAG_00000001;
}
if (chr->weapons_held[1]) {
func0f082964(chr->weapons_held[1], 1);
chr->hidden = chr->hidden | 0x00000001;
chr->hidden |= CHRHFLAG_00000001;
}
}
@@ -13927,15 +13927,15 @@ bool aiMiscellaneous(void)
var8006ae28 = value;
break;
case 5:
g_RoomPtrs[room_id].flags &= ~0x00004000;
g_RoomPtrs[room_id].flags &= ~ROOMFLAG_00004000;
if (value) {
g_RoomPtrs[room_id].flags |= 0x00004000;
g_RoomPtrs[room_id].flags |= ROOMFLAG_00004000;
}
break;
case 6:
g_RoomPtrs[room_id].flags &= ~0x00008000;
g_RoomPtrs[room_id].flags &= ~ROOMFLAG_00008000;
if (value) {
g_RoomPtrs[room_id].flags |= 0x00008000;
g_RoomPtrs[room_id].flags |= ROOMFLAG_00008000;
}
break;
case 7:
@@ -13947,9 +13947,9 @@ bool aiMiscellaneous(void)
case 9:
for (i = 1; i < g_Vars.roomcount; i++) {
if (value) {
g_RoomPtrs[i].flags |= 0x00004000;
g_RoomPtrs[i].flags |= ROOMFLAG_00004000;
} else {
g_RoomPtrs[i].flags &= ~0x00004000;
g_RoomPtrs[i].flags &= ~ROOMFLAG_00004000;
}
}
break;
@@ -14111,7 +14111,7 @@ bool aiChrKill(void)
chr->act_dead.unk034 = 0;
chr->act_dead.unk03c = 0;
chr->sleep = 0;
chr->chrflags |= 0x04000000 | 0x00010000;
chr->chrflags |= CHRCFLAG_04000000 | CHRCFLAG_00010000;
}
g_Vars.aioffset += 3;
src/game/game_066310.c
+1 -1
View File
@@ -46188,7 +46188,7 @@ void func0f08e0c4(struct doorobj *door)
if (door->doortype == DOORTYPE_8) {
struct obj44 *obj44 = door->base.unk44;
door->base.flags |= OBJFLAG_02000000;
door->base.flags |= OBJFLAG_CANNOT_ACTIVATE;
door->perimfrac = 0;
if (obj44 && (door->base.flags & OBJFLAG_00000100)) {