Ports/perfect_dark
1
0 Fork 1
mirror of https://github.com/perfect-dark-pc-port/perfect_dark.git synced 2026-10-23 15:52:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

port: net: don't transfer projectile/embedded flags in damage event

Browse Source
This commit is contained in:
fgsfds committed 2025-09-28 10:26:50 +02:00
1 parent 57041735cb
commit d946e332ae
2 files changed
+3 -3
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

port/src/net/netmsg.c
+2 -2
View File
@@ -1170,7 +1170,7 @@ u32 netmsgSvcPropDamageWrite(struct netbuf *dst, struct prop *prop, f32 damage,
netbufWriteF32(dst, damage);
netbufWriteS8(dst, weaponnum);
netbufWriteS8(dst, playernum);
netbufWriteU32(dst, prop->obj->hidden);
netbufWriteU32(dst, prop->obj->hidden & ~(OBJHFLAG_PROJECTILE | OBJHFLAG_EMBEDDED));
return dst->error;
}
@@ -1188,7 +1188,7 @@ u32 netmsgSvcPropDamageRead(struct netbuf *src, struct netclient *srccl)
}
if (prop && prop->obj && prop->type != PROPTYPE_PLAYER && prop->type != PROPTYPE_CHR && !src->error) {
prop->obj->damage = damagepre;
prop->obj->hidden = hidden;
prop->obj->hidden = hidden | (prop->obj->hidden & (OBJHFLAG_PROJECTILE | OBJHFLAG_EMBEDDED));
objDamage(prop->obj, -damage, &pos, weaponnum, playernum);
}
return src->error;
src/game/propobj.c
+1 -1
View File
@@ -11040,7 +11040,7 @@ s32 objTickPlayer(struct prop *prop)
if (obj->hidden & OBJHFLAG_ISRETICK) {
obj->hidden &= ~OBJHFLAG_ISRETICK;
} else if ((obj->hidden & OBJHFLAG_PROJECTILE) && (obj->projectile->flags & PROJECTILEFLAG_SLIDING) == 0) {
} else if ((obj->hidden & OBJHFLAG_PROJECTILE) && obj->projectile && (obj->projectile->flags & PROJECTILEFLAG_SLIDING) == 0) {
prop->flags &= ~PROPFLAG_ONTHISSCREENTHISTICK;
obj->hidden |= OBJHFLAG_ISRETICK;
return TICKOP_RETICK;