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

Fix for C4805: '|': unsafe mix of type 'unsigned char' and type 'bool' in operation

Browse source
This commit is contained in:
OPNA2608 2022-03-31 20:46:27 +02:00
parent 82d893082c
commit 4c19a973ef
6 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/engine/platform/ay8930.cpp
View file

@ -123,7 +123,7 @@ void DivPlatformAY8930::acquire(short* bufL, short* bufR, size_t start, size_t l
} }
while (!writes.empty()) { while (!writes.empty()) {
QueuedWrite w=writes.front(); QueuedWrite w=writes.front();
if (bank!=(w.addr>>4)) { if ((int)bank!=(w.addr>>4)) {
bank=w.addr>>4; bank=w.addr>>4;
ay->address_w(0x0d); ay->address_w(0x0d);
ay->data_w(0xa0|(bank<<4)|ayEnvMode[0]); ay->data_w(0xa0|(bank<<4)|ayEnvMode[0]);

16
src/engine/platform/c64.cpp
View file

@ -118,7 +118,7 @@ void DivPlatformC64::acquire(short* bufL, short* bufR, size_t start, size_t len)
void DivPlatformC64::updateFilter() { void DivPlatformC64::updateFilter() {
rWrite(0x15,filtCut&7); rWrite(0x15,filtCut&7);
rWrite(0x16,filtCut>>3); rWrite(0x16,filtCut>>3);
rWrite(0x17,(filtRes<<4)|(chan[2].filter<<2)|(chan[1].filter<<1)|(chan[0].filter)); rWrite(0x17,(filtRes<<4)|(chan[2].filter<<2)|(chan[1].filter<<1)|(int)(chan[0].filter));
rWrite(0x18,(filtControl<<4)|vol); rWrite(0x18,(filtControl<<4)|vol);
} }
@ -177,7 +177,7 @@ void DivPlatformC64::tick() {
} }
if (chan[i].std.hadWave) { if (chan[i].std.hadWave) {
chan[i].wave=chan[i].std.wave; chan[i].wave=chan[i].std.wave;
rWrite(i*7+4,(isMuted[i]?8:(chan[i].wave<<4))|(chan[i].ring<<2)|(chan[i].sync<<1)|chan[i].active); rWrite(i*7+4,(isMuted[i]?8:(chan[i].wave<<4))|(chan[i].ring<<2)|(chan[i].sync<<1)|(int)(chan[i].active));
} }
if (chan[i].std.hadEx1) { if (chan[i].std.hadEx1) {
filtControl=chan[i].std.ex1&15; filtControl=chan[i].std.ex1&15;
@ -232,7 +232,7 @@ int DivPlatformC64::dispatch(DivCommand c) {
rWrite(c.chan*7+3,chan[c.chan].duty>>8); rWrite(c.chan*7+3,chan[c.chan].duty>>8);
} }
if (chan[c.chan].insChanged) { if (chan[c.chan].insChanged) {
chan[c.chan].wave=(ins->c64.noiseOn<<3)|(ins->c64.pulseOn<<2)|(ins->c64.sawOn<<1)|(ins->c64.triOn); chan[c.chan].wave=(ins->c64.noiseOn<<3)|(ins->c64.pulseOn<<2)|(ins->c64.sawOn<<1)|(int)(ins->c64.triOn);
chan[c.chan].attack=ins->c64.a; chan[c.chan].attack=ins->c64.a;
chan[c.chan].decay=(ins->c64.s==15)?0:ins->c64.d; chan[c.chan].decay=(ins->c64.s==15)?0:ins->c64.d;
chan[c.chan].sustain=ins->c64.s; chan[c.chan].sustain=ins->c64.s;
@ -245,7 +245,7 @@ int DivPlatformC64::dispatch(DivCommand c) {
if (ins->c64.initFilter) { if (ins->c64.initFilter) {
filtCut=ins->c64.cut; filtCut=ins->c64.cut;
filtRes=ins->c64.res; filtRes=ins->c64.res;
filtControl=ins->c64.lp|(ins->c64.bp<<1)|(ins->c64.hp<<2)|(ins->c64.ch3off<<3); filtControl=(int)(ins->c64.lp)|(ins->c64.bp<<1)|(ins->c64.hp<<2)|(ins->c64.ch3off<<3);
} }
updateFilter(); updateFilter();
} }
@ -330,7 +330,7 @@ int DivPlatformC64::dispatch(DivCommand c) {
break; break;
case DIV_CMD_WAVE: case DIV_CMD_WAVE:
chan[c.chan].wave=c.value; chan[c.chan].wave=c.value;
rWrite(c.chan*7+4,(isMuted[c.chan]?8:(chan[c.chan].wave<<4))|(chan[c.chan].ring<<2)|(chan[c.chan].sync<<1)|chan[c.chan].active); rWrite(c.chan*7+4,(isMuted[c.chan]?8:(chan[c.chan].wave<<4))|(chan[c.chan].ring<<2)|(chan[c.chan].sync<<1)|(int)(chan[c.chan].active));
break; break;
case DIV_CMD_LEGATO: case DIV_CMD_LEGATO:
chan[c.chan].baseFreq=NOTE_FREQUENCY(c.value+((chan[c.chan].std.willArp && !chan[c.chan].std.arpMode)?(chan[c.chan].std.arp):(0))); chan[c.chan].baseFreq=NOTE_FREQUENCY(c.value+((chan[c.chan].std.willArp && !chan[c.chan].std.arpMode)?(chan[c.chan].std.arp):(0)));
@ -411,11 +411,11 @@ int DivPlatformC64::dispatch(DivCommand c) {
break; break;
case 4: case 4:
chan[c.chan].ring=c.value; chan[c.chan].ring=c.value;
rWrite(c.chan*7+4,(isMuted[c.chan]?8:(chan[c.chan].wave<<4))|(chan[c.chan].ring<<2)|(chan[c.chan].sync<<1)|chan[c.chan].active); rWrite(c.chan*7+4,(isMuted[c.chan]?8:(chan[c.chan].wave<<4))|(chan[c.chan].ring<<2)|(chan[c.chan].sync<<1)|(int)(chan[c.chan].active));
break; break;
case 5: case 5:
chan[c.chan].sync=c.value; chan[c.chan].sync=c.value;
rWrite(c.chan*7+4,(isMuted[c.chan]?8:(chan[c.chan].wave<<4))|(chan[c.chan].ring<<2)|(chan[c.chan].sync<<1)|chan[c.chan].active); rWrite(c.chan*7+4,(isMuted[c.chan]?8:(chan[c.chan].wave<<4))|(chan[c.chan].ring<<2)|(chan[c.chan].sync<<1)|(int)(chan[c.chan].active));
break; break;
case 6: case 6:
filtControl&=7; filtControl&=7;
@ -434,7 +434,7 @@ int DivPlatformC64::dispatch(DivCommand c) {
void DivPlatformC64::muteChannel(int ch, bool mute) { void DivPlatformC64::muteChannel(int ch, bool mute) {
isMuted[ch]=mute; isMuted[ch]=mute;
rWrite(ch*7+4,(isMuted[ch]?8:(chan[ch].wave<<4))|(chan[ch].ring<<2)|(chan[ch].sync<<1)|chan[ch].active); rWrite(ch*7+4,(isMuted[ch]?8:(chan[ch].wave<<4))|(chan[ch].ring<<2)|(chan[ch].sync<<1)|(int)(chan[ch].active));
} }
void DivPlatformC64::forceIns() { void DivPlatformC64::forceIns() {

2
src/engine/platform/opl.cpp
View file

@ -371,7 +371,7 @@ void DivPlatformOPL::tick() {
if (update4OpMask) { if (update4OpMask) {
update4OpMask=false; update4OpMask=false;
if (oplType==3) { if (oplType==3) {
unsigned char opMask=chan[0].fourOp|(chan[2].fourOp<<1)|(chan[4].fourOp<<2)|(chan[6].fourOp<<3)|(chan[8].fourOp<<4)|(chan[10].fourOp<<5); unsigned char opMask=(int)(chan[0].fourOp)|(chan[2].fourOp<<1)|(chan[4].fourOp<<2)|(chan[6].fourOp<<3)|(chan[8].fourOp<<4)|(chan[10].fourOp<<5);
immWrite(0x104,opMask); immWrite(0x104,opMask);
//printf("updating opMask to %.2x\n",opMask); //printf("updating opMask to %.2x\n",opMask);
} }

2
src/engine/platform/opll.cpp
View file

@ -620,7 +620,7 @@ int DivPlatformOPLL::dispatch(DivCommand c) {
} }
case DIV_CMD_FM_EXTCH: case DIV_CMD_FM_EXTCH:
if (!properDrumsSys) break; if (!properDrumsSys) break;
if (properDrums==c.value) break; if ((int)properDrums==c.value) break;
if (c.value) { if (c.value) {
properDrums=true; properDrums=true;
immWrite(0x0e,0x20); immWrite(0x0e,0x20);

2
src/engine/platform/sound/ay8910.cpp
View file

@ -1120,7 +1120,7 @@ void ay8910_device::sound_stream_update(short** outputs, int outLen)
for (int chan = 0; chan < NUM_CHANNELS; chan++) for (int chan = 0; chan < NUM_CHANNELS; chan++)
{ {
tone = &m_tone[chan]; tone = &m_tone[chan];
m_vol_enabled[chan] = (tone->output | tone_enable(chan)) & (noise_output() | noise_enable(chan)); m_vol_enabled[chan] = (tone->output | (unsigned char)tone_enable(chan)) & (noise_output() | (unsigned char)noise_enable(chan));
} }
/* update envelope */ /* update envelope */

2
src/gui/sysConf.cpp
View file

@ -284,7 +284,7 @@ void FurnaceGUI::drawSysConf(int i) {
} }
sysPal=flags&1; sysPal=flags&1;
if (ImGui::Checkbox("PAL",&sysPal)) { if (ImGui::Checkbox("PAL",&sysPal)) {
e->setSysFlags(i,(flags&(~1))|sysPal,restart); e->setSysFlags(i,(flags&(~1))|(unsigned int)sysPal,restart);
updateWindowTitle(); updateWindowTitle();
} }
bool bypassLimits=flags&4; bool bypassLimits=flags&4;