summaryrefslogtreecommitdiff
path: root/src/tesseract/World.java
diff options
context:
space:
mode:
authorSteve <steveb9@u.washington.edu>2011-03-07 01:57:17 +0000
committerSteve <steveb9@u.washington.edu>2011-03-07 01:57:17 +0000
commit8611e3f55d4b8d6b4091deda5aa476fda9025f20 (patch)
treeb70086250688f187cc9710ba97ff1e00820a66f5 /src/tesseract/World.java
parent9257e9d52f6fe3975b0de24c673279e775761d06 (diff)
added all if statements back for testing
Diffstat (limited to 'src/tesseract/World.java')
-rw-r--r--src/tesseract/World.java16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/tesseract/World.java b/src/tesseract/World.java
index 57664c5..b4b1013 100644
--- a/src/tesseract/World.java
+++ b/src/tesseract/World.java
@@ -351,7 +351,7 @@ public class World implements Observer {
}
//if 'i' side and a neighbor exists, transmit j object to that node
- if (i_object.equals(my_side1) || i_object.equals(my_side3)) {
+ if (i_object.equals(my_side1)) {
int test = myPeer.getPeerSize();
if(test > 0) {
System.out.println("Hit Side 1 J" + i_object.getPosition());
@@ -368,7 +368,7 @@ public class World implements Observer {
i_object.resolveCollisions(j_object, collisions);
}
- if (i_object.equals(my_side2) || i_object.equals(my_side4)) {
+ if (i_object.equals(my_side2)) {
int test = myPeer.getPeerSize();
if(test > 0) {
@@ -386,7 +386,7 @@ public class World implements Observer {
i_object.resolveCollisions(j_object, collisions);
}
- /*if (i_object.equals(my_side3)) {
+ if (i_object.equals(my_side3)) {
int test = myPeer.getPeerSize();
if(test > 0) {
@@ -419,10 +419,10 @@ public class World implements Observer {
}
}
i_object.resolveCollisions(j_object, collisions);
- }*/
+ }
//if 'j' side and a neighbor exists, transmit i object to that node
- if (j_object.equals(my_side1) || j_object.equals(my_side3)) {
+ if (j_object.equals(my_side1)) {
int test = myPeer.getPeerSize();
if(test > 0) {
@@ -439,7 +439,7 @@ public class World implements Observer {
}
j_object.resolveCollisions(i_object, collisions);
}
- if (j_object.equals(my_side2) || j_object.equals(my_side4)) {
+ if (j_object.equals(my_side2)) {
int test = myPeer.getPeerSize();
if(test > 0) {
@@ -456,7 +456,7 @@ public class World implements Observer {
}
j_object.resolveCollisions(i_object, collisions);
}
- /*if (j_object.equals(my_side3)) {
+ if (j_object.equals(my_side3)) {
int test = myPeer.getPeerSize();
if(test > 0) {
@@ -489,7 +489,7 @@ public class World implements Observer {
}
}
j_object.resolveCollisions(i_object, collisions);
- }*/
+ }
} else {
i_object.resolveCollisions(j_object, collisions);
}