2 files changed, 11 insertions, 2 deletions

diff --git a/src/ch/epfl/xblast/Cell.java b/src/ch/epfl/xblast/Cell.java
index 098c19c..a8a5a08 100644
--- a/src/ch/epfl/xblast/Cell.java
+++ b/src/ch/epfl/xblast/Cell.java
@@ -181,7 +181,7 @@ public final class Cell {
      */
     @Override
     public int hashCode() {
-        return 0; // TODO
+        return this.rowMajorIndex();
     }
 
     /**
diff --git a/src/ch/epfl/xblast/SubCell.java b/src/ch/epfl/xblast/SubCell.java
index 3b7fdb1..8a25997 100644
--- a/src/ch/epfl/xblast/SubCell.java
+++ b/src/ch/epfl/xblast/SubCell.java
@@ -143,7 +143,7 @@ public final class SubCell {
      */
     @Override
     public int hashCode() {
-        return 0; // TODO
+        return this.rowMajorIndex();
     }
 
     /**
@@ -156,4 +156,13 @@ public final class SubCell {
         return String.format("(%d,%d)", this.x, this.y);
     }
 
+    /**
+     * Returns the index of the SubCell (major ordered).
+     *
+     * @return the index of the SubCell
+     */
+    private int rowMajorIndex() {
+        return this.y * SUB_COLUMNS + this.x;
+    }
+
 }