mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-12-25 09:30:35 +00:00
Code Issues Releases Wiki Activity

texture:: fixed the slavecolor hotkey clash

Browse Source
This commit is contained in:
Zeno Rogue 2018-04-06 00:34:33 +02:00
parent 951e00531b
commit 26e2927ed2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
textures.cpp
View File

@ -1029,7 +1029,7 @@ void showMenu() {
dialog::addBoolItem(XLAT("fine tune vertices"), panstate == tpsTune, 'F'); dialog::addBoolItem(XLAT("fine tune vertices"), panstate == tpsTune, 'F');
dialog::addColorItem(XLAT("grid color (master)"), config.master_color, 'M'); dialog::addColorItem(XLAT("grid color (master)"), config.master_color, 'M');
dialog::addColorItem(XLAT("grid color (copy)"), config.slave_color, 'C'); dialog::addColorItem(XLAT("grid color (copy)"), config.slave_color, 'K');
dialog::addBreak(50); dialog::addBreak(50);
@ -1161,7 +1161,7 @@ void showMenu() {
else if(uni == 'M' && config.tstate == tsAdjusting) else if(uni == 'M' && config.tstate == tsAdjusting)
dialog::openColorDialog(config.master_color, NULL); dialog::openColorDialog(config.master_color, NULL);
else if(uni == 'C' && config.tstate == tsAdjusting) else if(uni == 'K' && config.tstate == tsAdjusting)
dialog::openColorDialog(config.slave_color, NULL); dialog::openColorDialog(config.slave_color, NULL);
else if(uni == 'c' && config.tstate == tsActive) { else if(uni == 'c' && config.tstate == tsActive) {