Se.Cherkasov/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2026-01-29 17:38:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

Re-organize editor shortcuts logic

Browse Source 
Previously, it was:

    if (ed.settingsmod)
    {
        (Settings menu controls)
        ...
    }
    else
    {
        (Literally everything else
        Also a bunch of copy-pasted ed.keydelay checks)
        ...
    }

Now it is:

    if (ed.settingsmod)
    {
        (Settings menu controls)
        ...
    }
    else if (ed.keydelay > 0)
    {
        ed.keydelay--;
    }
    else if (key.keymap[SDLK_LCTRL] || key.keymap[SDLK_RCTRL])
    {
        // Ctrl modifiers
        ...
    }
    else if (key.keymap[SDLK_LSHIFT] || key.keymap[SDLK_RSHIFT])
    {
        // Shift modifiers
        ...
    }
    else
    {
        // No modifiers
        ed.shiftkey = false;
        ...
    }

It might not counteract how completely huge this code is, but it's at
least organized better.

Also, I had to change the map resize logic around slightly, else it'll
get triggered any time you do a shift modifier keypress.
This commit is contained in:
Misa
2020-06-30 20:39:36 -07:00
committed by Ethan Lee
parent cf9c2f8933
commit a0f8b83563
1 changed files with 152 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

200
desktop_version/src/editor.cpp
View File

@@ -4403,11 +4403,90 @@ void editorinput()
} }
} }
} }
else if (ed.keydelay > 0)
{
ed.keydelay--;
}
else if (key.keymap[SDLK_LCTRL] || key.keymap[SDLK_RCTRL])
{
// Ctrl modifiers
ed.dmtileeditor=10;
if(left_pressed)
{
ed.dmtile--;
ed.keydelay=3;
if(ed.dmtile<0) ed.dmtile+=1200;
}
else if(right_pressed)
{
ed.dmtile++;
ed.keydelay=3;
if(ed.dmtile>=1200) ed.dmtile-=1200;
}
if(up_pressed)
{
ed.dmtile-=40;
ed.keydelay=3;
if(ed.dmtile<0) ed.dmtile+=1200;
}
else if(down_pressed)
{
ed.dmtile+=40;
ed.keydelay=3;
if(ed.dmtile>=1200) ed.dmtile-=1200;
}
}
else if (key.keymap[SDLK_LSHIFT] || key.keymap[SDLK_RSHIFT])
{
// Shift modifiers
if (up_pressed || down_pressed || left_pressed || right_pressed)
{
ed.keydelay=6;
if(up_pressed)
{
ed.mapheight--;
}
else if(down_pressed)
{
ed.mapheight++;
}
else if(left_pressed)
{
ed.mapwidth--;
}
else if(right_pressed)
{
ed.mapwidth++;
}
if(ed.mapwidth<1) ed.mapwidth=1;
if(ed.mapheight<1) ed.mapheight=1;
if(ed.mapwidth>=ed.maxwidth) ed.mapwidth=ed.maxwidth;
if(ed.mapheight>=ed.maxheight) ed.mapheight=ed.maxheight;
ed.note = "Mapsize is now [" + help.String(ed.mapwidth) + "," + help.String(ed.mapheight) + "]";
ed.notedelay=45;
}
if(!ed.shiftkey)
{
if(ed.shiftmenu)
{
ed.shiftmenu=false;
}
else else
{ {
//Shortcut keys ed.shiftmenu=true;
//TO DO: make more user friendly }
if(key.keymap[SDLK_F1] && ed.keydelay==0) }
ed.shiftkey=true;
}
else
{
// No modifiers
ed.shiftkey=false;
if(key.keymap[SDLK_F1])
{ {
ed.level[ed.levx+(ed.levy*ed.maxwidth)].tileset++; ed.level[ed.levx+(ed.levy*ed.maxwidth)].tileset++;
graphics.backgrounddrawn=false; graphics.backgrounddrawn=false;
@@ -4452,7 +4531,7 @@ void editorinput()
ed.updatetiles=true; ed.updatetiles=true;
ed.keydelay=6; ed.keydelay=6;
} }
if(key.keymap[SDLK_F2] && ed.keydelay==0) if(key.keymap[SDLK_F2])
{ {
ed.level[ed.levx+(ed.levy*ed.maxwidth)].tilecol++; ed.level[ed.levx+(ed.levy*ed.maxwidth)].tilecol++;
graphics.backgrounddrawn=false; graphics.backgrounddrawn=false;
@@ -4477,26 +4556,26 @@ void editorinput()
ed.notedelay=45; ed.notedelay=45;
ed.note="Tileset Colour Changed"; ed.note="Tileset Colour Changed";
} }
if(key.keymap[SDLK_F3] && ed.keydelay==0) if(key.keymap[SDLK_F3])
{ {
ed.level[ed.levx+(ed.levy*ed.maxwidth)].enemytype=(ed.level[ed.levx+(ed.levy*ed.maxwidth)].enemytype+1)%10; ed.level[ed.levx+(ed.levy*ed.maxwidth)].enemytype=(ed.level[ed.levx+(ed.levy*ed.maxwidth)].enemytype+1)%10;
ed.keydelay=6; ed.keydelay=6;
ed.notedelay=45; ed.notedelay=45;
ed.note="Enemy Type Changed"; ed.note="Enemy Type Changed";
} }
if(key.keymap[SDLK_F4] && ed.keydelay==0) if(key.keymap[SDLK_F4])
{ {
ed.keydelay=6; ed.keydelay=6;
ed.boundarytype=1; ed.boundarytype=1;
ed.boundarymod=1; ed.boundarymod=1;
} }
if(key.keymap[SDLK_F5] && ed.keydelay==0) if(key.keymap[SDLK_F5])
{ {
ed.keydelay=6; ed.keydelay=6;
ed.boundarytype=2; ed.boundarytype=2;
ed.boundarymod=1; ed.boundarymod=1;
} }
if(key.keymap[SDLK_F10] && ed.keydelay==0) if(key.keymap[SDLK_F10])
{ {
if(ed.level[ed.levx+(ed.levy*ed.maxwidth)].directmode==1) if(ed.level[ed.levx+(ed.levy*ed.maxwidth)].directmode==1)
{ {
@@ -4532,7 +4611,7 @@ void editorinput()
if(key.keymap[SDLK_o]) ed.drawmode=15; if(key.keymap[SDLK_o]) ed.drawmode=15;
if(key.keymap[SDLK_p]) ed.drawmode=16; if(key.keymap[SDLK_p]) ed.drawmode=16;
if(key.keymap[SDLK_w] && ed.keydelay==0) if(key.keymap[SDLK_w])
{ {
int j=0, tx=0, ty=0; int j=0, tx=0, ty=0;
for(size_t i=0; i<edentity.size(); i++) for(size_t i=0; i<edentity.size(); i++)
@@ -4582,7 +4661,7 @@ void editorinput()
} }
ed.keydelay=6; ed.keydelay=6;
} }
if(key.keymap[SDLK_e] && ed.keydelay==0) if(key.keymap[SDLK_e])
{ {
ed.roomnamemod=true; ed.roomnamemod=true;
ed.textentry=true; ed.textentry=true;
@@ -4593,7 +4672,7 @@ void editorinput()
} }
//Save and load //Save and load
if(key.keymap[SDLK_s] && ed.keydelay==0) if(key.keymap[SDLK_s])
{ {
ed.savemod=true; ed.savemod=true;
ed.textentry=true; ed.textentry=true;
@@ -4604,7 +4683,7 @@ void editorinput()
graphics.backgrounddrawn=false; graphics.backgrounddrawn=false;
} }
if(key.keymap[SDLK_l] && ed.keydelay==0) if(key.keymap[SDLK_l])
{ {
ed.loadmod=true; ed.loadmod=true;
ed.textentry=true; ed.textentry=true;
@@ -4716,48 +4795,6 @@ void editorinput()
ed.xmod = key.keymap[SDLK_x]; ed.xmod = key.keymap[SDLK_x];
ed.zmod = key.keymap[SDLK_z]; ed.zmod = key.keymap[SDLK_z];
//Keyboard shortcuts
if(ed.keydelay>0)
{
ed.keydelay--;
}
else
{
if(key.keymap[SDLK_LSHIFT] || key.keymap[SDLK_RSHIFT])
{
if(up_pressed)
{
ed.keydelay=6;
ed.mapheight--;
}
else if(down_pressed)
{
ed.keydelay=6;
ed.mapheight++;
}
if(left_pressed)
{
ed.keydelay=6;
ed.mapwidth--;
}
else if(right_pressed)
{
ed.keydelay=6;
ed.mapwidth++;
}
if(ed.keydelay==6)
{
if(ed.mapwidth<1) ed.mapwidth=1;
if(ed.mapheight<1) ed.mapheight=1;
if(ed.mapwidth>=ed.maxwidth) ed.mapwidth=ed.maxwidth;
if(ed.mapheight>=ed.maxheight) ed.mapheight=ed.maxheight;
ed.note = "Mapsize is now [" + help.String(ed.mapwidth) + "," + help.String(ed.mapheight) + "]";
ed.notedelay=45;
}
}
else
{
if(key.keymap[SDLK_COMMA]) if(key.keymap[SDLK_COMMA])
{ {
ed.drawmode--; ed.drawmode--;
@@ -4784,38 +4821,6 @@ void editorinput()
if(ed.spacemod) ed.spacemenu=0; if(ed.spacemod) ed.spacemenu=0;
} }
if(key.keymap[SDLK_LCTRL] || key.keymap[SDLK_RCTRL])
{
ed.dmtileeditor=10;
if(left_pressed)
{
ed.dmtile--;
ed.keydelay=3;
if(ed.dmtile<0) ed.dmtile+=1200;
}
else if(right_pressed)
{
ed.dmtile++;
ed.keydelay=3;
if(ed.dmtile>=1200) ed.dmtile-=1200;
}
if(up_pressed)
{
ed.dmtile-=40;
ed.keydelay=3;
if(ed.dmtile<0) ed.dmtile+=1200;
}
else if(down_pressed)
{
ed.dmtile+=40;
ed.keydelay=3;
if(ed.dmtile>=1200) ed.dmtile-=1200;
}
}
else
{
if(up_pressed) if(up_pressed)
{ {
ed.keydelay=6; ed.keydelay=6;
@@ -4848,39 +4853,16 @@ void editorinput()
ed.updatetiles=true; ed.updatetiles=true;
ed.changeroom=true; ed.changeroom=true;
} }
}
if(ed.levx<0) ed.levx+=ed.mapwidth; if(ed.levx<0) ed.levx+=ed.mapwidth;
if(ed.levx>= ed.mapwidth) ed.levx-=ed.mapwidth; if(ed.levx>= ed.mapwidth) ed.levx-=ed.mapwidth;
if(ed.levy<0) ed.levy+=ed.mapheight; if(ed.levy<0) ed.levy+=ed.mapheight;
if(ed.levy>=ed.mapheight) ed.levy-=ed.mapheight; if(ed.levy>=ed.mapheight) ed.levy-=ed.mapheight;
}
if(key.keymap[SDLK_SPACE]) if(key.keymap[SDLK_SPACE])
{ {
ed.spacemod = !ed.spacemod; ed.spacemod = !ed.spacemod;
ed.keydelay=6; ed.keydelay=6;
} }
if(key.keymap[SDLK_LSHIFT] || key.keymap[SDLK_RSHIFT])
{
if(!ed.shiftkey)
{
if(ed.shiftmenu)
{
ed.shiftmenu=false;
}
else
{
ed.shiftmenu=true;
}
}
ed.shiftkey=true;
}
else
{
ed.shiftkey=false;
}
}
} }
if(!ed.settingsmod) if(!ed.settingsmod)