teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-01-31 05:00:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Mapster32: fix 3d picture-in-picture when editing a map with TROR.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@5286 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2015-07-10 07:56:35 +00:00
parent c79691bb6f
commit 9d1503ac12
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
polymer/eduke32/build/src/build.c
View file

@ -3318,10 +3318,10 @@ void overheadeditor(void)
zoom = max(zoom, ztarget); zoom = max(zoom, ztarget);
} }
if (!((vel|angvel|svel) //DOWN_BK(MOVEFORWARD) || DOWN_BK(MOVEBACKWARD) || DOWN_BK(TURNLEFT) || DOWN_BK(TURNRIGHT) if (!((vel|angvel|svel) || ztarget != zoom//DOWN_BK(MOVEFORWARD) || DOWN_BK(MOVEBACKWARD) || DOWN_BK(TURNLEFT) || DOWN_BK(TURNRIGHT)
|| DOWN_BK(MOVEUP) || DOWN_BK(MOVEDOWN) || keystatus[0x10] || keystatus[0x11] || DOWN_BK(MOVEUP) || DOWN_BK(MOVEDOWN) || keystatus[0x10] || keystatus[0x11]
|| keystatus[0x48] || keystatus[0x4b] || keystatus[0x4d] || keystatus[0x50] // keypad keys || keystatus[0x48] || keystatus[0x4b] || keystatus[0x4d] || keystatus[0x50] // keypad keys
|| bstatus || OSD_IsMoving() || ztarget != zoom)) || bstatus || OSD_IsMoving()))
{ {
if (totalclock > waitdelay) if (totalclock > waitdelay)
{ {

2
polymer/eduke32/build/src/engine.c
View file

@ -1117,7 +1117,7 @@ void yax_drawrooms(void (*SpriteAnimFunc)(int32_t,int32_t,int32_t,int32_t),
g_nodraw = 0; g_nodraw = 0;
scansector_collectsprites = 0; scansector_collectsprites = 0;
if (editstatus==1) if (editstatus==1 && in3dmode())
{ {
if (getrendermode() == REND_CLASSIC) if (getrendermode() == REND_CLASSIC)
{ {