otomatalabs/furnace
8
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/tildearrow/furnace into x1_010

Browse source 
# Conflicts:
#	.gitmodules
#	CMakeLists.txt
This commit is contained in:
cam900 2022-03-07 02:35:14 +09:00
commit fca4bdc1ee
10 changed files with 1022 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/gui/gui.cpp
View file

@ -17,7 +17,6 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <SDL_video.h>
#define _USE_MATH_DEFINES
#include "gui.h"
#include "util.h"
@ -4911,12 +4910,10 @@ bool FurnaceGUI::loop() {
e->setSysFlags(i,(flags&(~3))|2,restart);
updateWindowTitle();
}
/*
if (ImGui::RadioButton("Use system beeper",(flags&3)==3)) {
if (ImGui::RadioButton("Use system beeper (Linux only!)",(flags&3)==3)) {
e->setSysFlags(i,(flags&(~3))|3,restart);
updateWindowTitle();
}
*/
break;
}
case DIV_SYSTEM_QSOUND: {