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

Merge pull request #11 from EpicOrange/master

Browse Source 
Fix for autowire button
This commit is contained in:
Nathan Byrd 2016-10-28 18:12:22 -05:00 committed by GitHub
commit 588497cd89
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/droidquest/items/AutoWire.java
View File

@ -1,6 +1,7 @@
package com.droidquest.items; package com.droidquest.items;
import com.droidquest.Room; import com.droidquest.Room;
import com.droidquest.Wire;
import com.droidquest.chipstuff.Port; import com.droidquest.chipstuff.Port;
import com.droidquest.devices.Device; import com.droidquest.devices.Device;
import com.droidquest.devices.PortDevice; import com.droidquest.devices.PortDevice;
@ -112,8 +113,7 @@ public class AutoWire extends Item {
if (animation == 1) { if (animation == 1) {
if (portdevices[0].ports[0].myWire == null) { // Wiring if (portdevices[0].ports[0].myWire == null) { // Wiring
portdevices[0].ports[0].type = Port.TYPE_UNDEFINED; portdevices[0].ports[0].myWire = new Wire(chip.ports[0], portdevices[0].ports[0]);
portdevices[0].ports[0].value = false;
} }
else { // Unwiring else { // Unwiring
portdevices[0].ports[0].myWire.Remove(); portdevices[0].ports[0].myWire.Remove();
@ -128,8 +128,7 @@ public class AutoWire extends Item {
if (animation >= 2 && animation <= 8) { if (animation >= 2 && animation <= 8) {
if (portdevices[0].ports[0].myWire != null) { // Wiring if (portdevices[0].ports[0].myWire != null) { // Wiring
if (portdevices[animation - 1].ports[0].myWire == null) { if (portdevices[animation - 1].ports[0].myWire == null) {
portdevices[animation - 1].ports[0].type = Port.TYPE_UNDEFINED; portdevices[animation - 1].ports[0].myWire = new Wire(chip.ports[animation - 1], portdevices[animation - 1].ports[0]);
portdevices[animation - 1].ports[0].value = false;
} }
} }
else { // Unwiring else { // Unwiring