X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=era.mi%2Fsrc%2Fera%2Fmi%2Flogic%2Fwires%2FWire.java;fp=era.mi%2Fsrc%2Fera%2Fmi%2Flogic%2Fwires%2FWire.java;h=db932536f8293df625e9322bda99c7100ef41b73;hb=dcbba0b189fd37135adc4487f1b8b645e7045bc4;hp=1b26a15d0ae5c379c4c60e5b73c00350667b7856;hpb=2ccdd5a2ed812bc4eb864ab4fbb1adb1c723a1c9;p=Mograsim.git

diff --git a/era.mi/src/era/mi/logic/wires/Wire.java b/era.mi/src/era/mi/logic/wires/Wire.java
index 1b26a15d..db932536 100644
--- a/era.mi/src/era/mi/logic/wires/Wire.java
+++ b/era.mi/src/era/mi/logic/wires/Wire.java
@@ -5,9 +5,9 @@ import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
 
-import era.mi.logic.Bit;
 import era.mi.logic.Simulation;
 import era.mi.logic.Util;
+import era.mi.logic.types.Bit;
 
 /**
  * Represents an array of wires that can store n bits of information.
@@ -60,7 +60,7 @@ public class Wire
 			Bit[] bits = input.getInputValues();
 			for (int i = 0; i < length; i++)
 			{
-				newValues[i] = newValues[i].combineWith(bits[i]);
+				newValues[i] = newValues[i].join(bits[i]);
 			}
 		}