mirror of
https://github.com/ZDoom/raze-gles.git
synced 2024-11-11 07:11:39 +00:00
Fixes some problems with mapster zooming; reset keystatus[] after playtesting.
git-svn-id: https://svn.eduke32.com/eduke32@1637 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
parent
7a9216ce93
commit
b1ffbfda36
1 changed files with 19 additions and 4 deletions
|
@ -1214,6 +1214,7 @@ void overheadeditor(void)
|
|||
walltype *wal;
|
||||
int32_t prefixarg = 0;
|
||||
hitdata_t hitinfo;
|
||||
int32_t resetsynctics = 0;
|
||||
|
||||
//qsetmode640480();
|
||||
qsetmodeany(xdim2d,ydim2d);
|
||||
|
@ -1288,8 +1289,14 @@ void overheadeditor(void)
|
|||
keystatus[buildkeys[BK_MODE2D_3D]] = 0;
|
||||
while ((keystatus[buildkeys[BK_MODE2D_3D]]>>1) == 0)
|
||||
{
|
||||
if ((keystatus[buildkeys[BK_MOVEUP]] || (bstatus&(16|32)) || keystatus[buildkeys[BK_MOVEDOWN]]) == 0)
|
||||
idle_waitevent();
|
||||
{
|
||||
if ((keystatus[buildkeys[BK_MOVEUP]] || (bstatus/*&(16|32)*/) || keystatus[buildkeys[BK_MOVEDOWN]]) == 0)
|
||||
{
|
||||
idle_waitevent();
|
||||
// have synctics reset to 0 after we've slept to avoid zooming out to the max instantly
|
||||
resetsynctics = 1;
|
||||
}
|
||||
}
|
||||
|
||||
if (handleevents())
|
||||
{
|
||||
|
@ -1300,6 +1307,13 @@ void overheadeditor(void)
|
|||
}
|
||||
}
|
||||
|
||||
if (resetsynctics)
|
||||
{
|
||||
resetsynctics = 0;
|
||||
lockclock = totalclock;
|
||||
synctics = 0;
|
||||
}
|
||||
|
||||
OSD_DispatchQueued();
|
||||
|
||||
if (totalclock < 120*3)
|
||||
|
@ -2867,7 +2881,7 @@ SKIP:
|
|||
|
||||
if ((keystatus[buildkeys[BK_MOVEUP]] || (bstatus&16)) && (zoom < 65536))
|
||||
{
|
||||
zoom += (synctics>>1)*(zoom>>3);
|
||||
zoom += synctics*(zoom>>4);
|
||||
if (zoom < 24) zoom += 2;
|
||||
if (bstatus&16 && (keystatus[0x38] || keystatus[0xb8]))
|
||||
{
|
||||
|
@ -2881,7 +2895,7 @@ SKIP:
|
|||
}
|
||||
if ((keystatus[buildkeys[BK_MOVEDOWN]] || (bstatus&32)) && (zoom > 8))
|
||||
{
|
||||
zoom -= (synctics>>1)*(zoom>>3);
|
||||
zoom -= synctics*(zoom>>4);
|
||||
if (bstatus&32 && (keystatus[0x38] || keystatus[0xb8]))
|
||||
{
|
||||
searchx = halfxdim16;
|
||||
|
@ -6688,6 +6702,7 @@ void test_map(int32_t mode)
|
|||
#endif
|
||||
printmessage16("Game process exited");
|
||||
initmouse();
|
||||
Bmemset(keystatus, 0, sizeof(keystatus));
|
||||
|
||||
Bfree(fullparam);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue