cromer
/
DroidQuest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2 from mschubmehl/master 

ChipCompiler bugs
This commit is contained in:
Thomas Foote 2014-02-11 17:04:28 -05:00
parent 1714399a27 cab7aba49e
commit 642e746efe
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/com/droidquest/chipstuff/ChipCompiler.java
View File

@ -48,22 +48,22 @@ public ChipCompiler(PrototypeChip pc, SmallChip sc)
Device device = (Device) item; Device device = (Device) item;
Gate gate=null; Gate gate=null;
String type = item.getClass().toString(); String type = item.getClass().toString();
if (type.endsWith("ANDGate")) if (device instanceof com.droidquest.devices.ANDGate)
gate = new Gate("AND"); gate = new Gate("AND");
if (type.endsWith("ORGate")) if (device instanceof com.droidquest.devices.ORGate)
gate = new Gate("OR"); gate = new Gate("OR");
if (type.endsWith("NOTGate")) if (device instanceof com.droidquest.devices.NOTGate)
gate = new Gate("NOT"); gate = new Gate("NOT");
if (type.endsWith("XORGate")) if (device instanceof com.droidquest.devices.XORGate)
gate = new Gate("XOR"); gate = new Gate("XOR");
if (type.endsWith("FlipFlop")) if (device instanceof com.droidquest.devices.FlipFlop)
{ {
gate = new Gate("FF"); gate = new Gate("FF");
gate.state = ((FlipFlop)device).state; gate.state = ((FlipFlop)device).state;
} }
if (type.endsWith("Node")) if (device instanceof com.droidquest.devices.Node)
gate = new Gate("NODE"); gate = new Gate("NODE");
if (type.endsWith("SmallChip")) if (device instanceof com.droidquest.devices.SmallChip)
gate = new Gate((SmallChip)device); gate = new Gate((SmallChip)device);
if (gate != null) if (gate != null)
{ {
@ -99,7 +99,7 @@ public ChipCompiler(PrototypeChip pc, SmallChip sc)
for (int ap=1; ap<4; ap++) // For every output Signal in the Node for (int ap=1; ap<4; ap++) // For every output Signal in the Node
{ {
Signal s1 = gate1.portSignals[ap].externalSignal; Signal s1 = gate1.portSignals[ap].externalSignal;
if (s1!= null) if (s1!= null && s1!=dummy)
{ {
for (int b=0; b<sc.gates.size(); b++) // For every other Gate in the Chip for (int b=0; b<sc.gates.size(); b++) // For every other Gate in the Chip
{ {