mirror of
https://github.com/badvision/lawless-legends.git
synced 2024-06-26 00:29:30 +00:00
Updated Jace emulator to allow HD images as well as 800kb floppy images
This commit is contained in:
parent
030049b986
commit
19c68edadb
3
OutlawEditor/.gitignore
vendored
3
OutlawEditor/.gitignore
vendored
|
@ -1 +1,4 @@
|
||||||
/*~
|
/*~
|
||||||
|
/nb-configuration.xml
|
||||||
|
/OutlawEditor.iml
|
||||||
|
/.idea/
|
|
@ -1379,4 +1379,9 @@ public class MOS65C02 extends CPU {
|
||||||
default:
|
default:
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void reconfigure() {
|
||||||
|
// Currently do nothing
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -152,11 +152,15 @@ public class Speaker extends SoundGeneratorDevice {
|
||||||
@Override
|
@Override
|
||||||
public boolean suspend() {
|
public boolean suspend() {
|
||||||
boolean result = super.suspend();
|
boolean result = super.suspend();
|
||||||
playbackTimer.cancel();
|
if (playbackTimer != null) {
|
||||||
|
playbackTimer.cancel();
|
||||||
|
}
|
||||||
speakerBit = false;
|
speakerBit = false;
|
||||||
sdl = null;
|
sdl = null;
|
||||||
computer.getMotherboard().cancelSpeedRequest(this);
|
if (computer.getMotherboard() != null) {
|
||||||
computer.mixer.returnLine(this);
|
computer.getMotherboard().cancelSpeedRequest(this);
|
||||||
|
computer.mixer.returnLine(this);
|
||||||
|
}
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
|
@ -101,7 +101,7 @@ public abstract class Card extends Device {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void reconfigure() {
|
public void reconfigure() {
|
||||||
super.reconfigure();
|
//super.reconfigure();
|
||||||
boolean restart = suspend();
|
boolean restart = suspend();
|
||||||
unregisterListeners();
|
unregisterListeners();
|
||||||
if (restart) {
|
if (restart) {
|
||||||
|
|
|
@ -71,7 +71,7 @@ public class LawlessImageTool implements MediaConsumer {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean isAccepted(MediaEntry e, MediaEntry.MediaFile f) {
|
public boolean isAccepted(MediaEntry e, MediaEntry.MediaFile f) {
|
||||||
return e.type == DiskType.FLOPPY800;
|
return e.type == DiskType.FLOPPY800 || e.type == DiskType.LARGE;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
Loading…
Reference in New Issue
Block a user