zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-11-11 07:11:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

engine: fix unbalanced begindrawing()/enddrawing() pair in printext16().

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@5310 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2015-07-25 17:23:20 +00:00
parent 73ca265137
commit c9949f53a3
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3504,6 +3504,8 @@ void overheadeditor(void)
int32_t cx = halfxdim16+x2; int32_t cx = halfxdim16+x2;
int32_t cy = midydim16+y2; int32_t cy = midydim16+y2;
begindrawing(); //{{{ LOCK_FRAME_1
if ((cx >= 2 && cx <= xdim-3) && (cy >= 2 && cy <= ydim16-3)) if ((cx >= 2 && cx <= xdim-3) && (cy >= 2 && cy <= ydim16-3))
{ {
int16_t angofs = m32_sideview ? m32_sideang : 0; int16_t angofs = m32_sideview ? m32_sideang : 0;
@ -3511,15 +3513,11 @@ void overheadeditor(void)
y1 = mulscale11(sintable[(startang+angofs+2048)&2047],zoom) / 768; y1 = mulscale11(sintable[(startang+angofs+2048)&2047],zoom) / 768;
i = scalescreeny(x1); i = scalescreeny(x1);
j = scalescreeny(y1); j = scalescreeny(y1);
begindrawing(); //{{{
drawline16base(cx,cy, x1,j, -x1,-j, editorcolors[6]); drawline16base(cx,cy, x1,j, -x1,-j, editorcolors[6]);
drawline16base(cx,cy, x1,j, +y1,-i, editorcolors[6]); drawline16base(cx,cy, x1,j, +y1,-i, editorcolors[6]);
drawline16base(cx,cy, x1,j, -y1,+i, editorcolors[6]); drawline16base(cx,cy, x1,j, -y1,+i, editorcolors[6]);
enddrawing(); //}}}
} }
begindrawing(); //{{{
if (keystatus[0x2a] && (pointhighlight&16384) && highlightcnt<=0) // LShift if (keystatus[0x2a] && (pointhighlight&16384) && highlightcnt<=0) // LShift
{ {
// draw lines to linking sprites // draw lines to linking sprites
@ -3949,7 +3947,7 @@ void overheadeditor(void)
} }
} }
enddrawing(); //}}} enddrawing(); //}}} LOCK_FRAME_1
OSD_Draw(); OSD_Draw();
} }

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

@ -17778,13 +17778,13 @@ int32_t printext16(int32_t xpos, int32_t ypos, int16_t col, int16_t backcol, con
ptr += bytesperline; ptr += bytesperline;
} }
} }
enddrawing(); //}}}
stx += charxsiz; stx += charxsiz;
if (stx >= xdim) if (stx >= xdim)
break; break;
} }
enddrawing(); //}}}
return stx; return stx;
} }