zdoom
/
gzdoom-gles
mirror of https://github.com/ZDoom/gzdoom-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/zdoom/master'

This commit is contained in:
Christoph Oelckers 2016-12-26 19:33:16 +01:00
parent 3f7c057f92 625e97dfd1
commit b9f7e0eb36
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/p_map.cpp
View File

@ -6755,6 +6755,7 @@ void AActor::UpdateRenderSectorList()
sec = P_PointInSector(newpos); sec = P_PointInSector(newpos);
render_sectorlist = P_AddSecnode(sec, this, render_sectorlist, sec->render_thinglist); render_sectorlist = P_AddSecnode(sec, this, render_sectorlist, sec->render_thinglist);
} }
sec = Sector;
lasth = FLT_MAX; lasth = FLT_MAX;
while (!sec->PortalBlocksMovement(sector_t::floor)) while (!sec->PortalBlocksMovement(sector_t::floor))
{ {

21
src/scripting/vm/vm.h
View File

@ -21,27 +21,35 @@ typedef VM_UBYTE VM_ATAG;
#define VM_EPSILON (1/65536.0) #define VM_EPSILON (1/65536.0)
#ifdef __BIG_ENDIAN__
#define VM_DEFINE_OP2(TYPE, ARG1, ARG2) TYPE ARG2, ARG1
#define VM_DEFINE_OP4(TYPE, ARG1, ARG2, ARG3, ARG4) TYPE ARG4, ARG3, ARG2, ARG1
#else // little endian
#define VM_DEFINE_OP2(TYPE, ARG1, ARG2) TYPE ARG1, ARG2
#define VM_DEFINE_OP4(TYPE, ARG1, ARG2, ARG3, ARG4) TYPE ARG1, ARG2, ARG3, ARG4
#endif // __BIG_ENDIAN__
union VMOP union VMOP
{ {
struct struct
{ {
VM_UBYTE op, a, b, c; VM_DEFINE_OP4(VM_UBYTE, op, a, b, c);
}; };
struct struct
{ {
VM_SBYTE pad0, as, bs, cs; VM_DEFINE_OP4(VM_SBYTE, pad0, as, bs, cs);
}; };
struct struct
{ {
VM_SWORD pad1:8, i24:24; VM_DEFINE_OP2(VM_SWORD, pad1:8, i24:24);
}; };
struct struct
{ {
VM_SWORD pad2:16, i16:16; VM_DEFINE_OP2(VM_SWORD, pad2:16, i16:16);
}; };
struct struct
{ {
VM_UHALF pad3, i16u; VM_DEFINE_OP2(VM_UHALF, pad3, i16u);
}; };
VM_UWORD word; VM_UWORD word;
@ -56,6 +64,9 @@ union VMOP
// sar eax,10h // sar eax,10h
}; };
#undef VM_DEFINE_OP4
#undef VM_DEFINE_OP2
enum enum
{ {
#include "vmops.h" #include "vmops.h"