zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-26 00:40:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert "gameexec.c: in VM_Move(), update actor[].{floor,ceiling}z for enemies."

Browse source 
This reverts r4975. DONT_BUILD.

git-svn-id: https://svn.eduke32.com/eduke32@5014 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2015-02-18 20:46:49 +00:00
parent 5e0bed4c39
commit 120746322b
1 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
polymer/eduke32/source/gameexec.c
View file

@ -788,21 +788,18 @@ dead:
} }
else if (vm.g_sp->picnum != ORGANTIC) else if (vm.g_sp->picnum != ORGANTIC)
{ {
int32_t l; // All other actors besides ORGANTIC don't update .floorz or
// .ceilingz here.
// In Duke3D, all other actors don't update .floorz or
// .ceilingz here. In EDuke32, they do.
if (vm.g_sp->zvel > 0) if (vm.g_sp->zvel > 0)
{ {
actor[vm.g_i].floorz = l = VM_GetFlorZOfSlope(); if (vm.g_sp->z > actor[vm.g_i].floorz)
if (vm.g_sp->z > l) vm.g_sp->z = actor[vm.g_i].floorz;
vm.g_sp->z = l;
vm.g_sp->z += A_GetWaterZOffset(vm.g_i); vm.g_sp->z += A_GetWaterZOffset(vm.g_i);
} }
else if (vm.g_sp->zvel < 0) else if (vm.g_sp->zvel < 0)
{ {
actor[vm.g_i].ceilingz = l = VM_GetCeilZOfSlope(); const int32_t l = VM_GetCeilZOfSlope();
if (vm.g_sp->z < l+(66<<8)) if (vm.g_sp->z < l+(66<<8))
{ {
vm.g_sp->z = l+(66<<8); vm.g_sp->z = l+(66<<8);