teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2024-11-15 08:52:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixes some problems with mapster zooming; reset keystatus[] after playtesting.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@1637 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2010-05-10 21:23:30 +00:00
parent 7a9216ce93
commit b1ffbfda36
1 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1214,6 +1214,7 @@ void overheadeditor(void)
walltype *wal; walltype *wal;
int32_t prefixarg = 0; int32_t prefixarg = 0;
hitdata_t hitinfo; hitdata_t hitinfo;
int32_t resetsynctics = 0;
//qsetmode640480(); //qsetmode640480();
qsetmodeany(xdim2d,ydim2d); qsetmodeany(xdim2d,ydim2d);
@ -1288,8 +1289,14 @@ void overheadeditor(void)
keystatus[buildkeys[BK_MODE2D_3D]] = 0; keystatus[buildkeys[BK_MODE2D_3D]] = 0;
while ((keystatus[buildkeys[BK_MODE2D_3D]]>>1) == 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()) if (handleevents())
{ {
@ -1300,6 +1307,13 @@ void overheadeditor(void)
} }
} }
if (resetsynctics)
{
resetsynctics = 0;
lockclock = totalclock;
synctics = 0;
}
OSD_DispatchQueued(); OSD_DispatchQueued();
if (totalclock < 120*3) if (totalclock < 120*3)
@ -2867,7 +2881,7 @@ SKIP:
if ((keystatus[buildkeys[BK_MOVEUP]] || (bstatus&16)) && (zoom < 65536)) if ((keystatus[buildkeys[BK_MOVEUP]] || (bstatus&16)) && (zoom < 65536))
{ {
zoom += (synctics>>1)*(zoom>>3); zoom += synctics*(zoom>>4);
if (zoom < 24) zoom += 2; if (zoom < 24) zoom += 2;
if (bstatus&16 && (keystatus[0x38] || keystatus[0xb8])) if (bstatus&16 && (keystatus[0x38] || keystatus[0xb8]))
{ {
@ -2881,7 +2895,7 @@ SKIP:
} }
if ((keystatus[buildkeys[BK_MOVEDOWN]] || (bstatus&32)) && (zoom > 8)) 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])) if (bstatus&32 && (keystatus[0x38] || keystatus[0xb8]))
{ {
searchx = halfxdim16; searchx = halfxdim16;
@ -6688,6 +6702,7 @@ void test_map(int32_t mode)
#endif #endif
printmessage16("Game process exited"); printmessage16("Game process exited");
initmouse(); initmouse();
Bmemset(keystatus, 0, sizeof(keystatus));
Bfree(fullparam); Bfree(fullparam);
} }