Synchronize sink_notification format

1 files changed, 10 insertions, 6 deletions

diff --git a/netnavalbattle/event.py b/netnavalbattle/event.py
index 6daaa56..5ad96dd 100644
--- a/netnavalbattle/event.py
+++ b/netnavalbattle/event.py
@@ -548,27 +548,31 @@ class SinkNotificationEvent (Event):
     y = None
     rotated = None
 
-    def __init__ (self, source, target, ship_type, x, y, rotated):
+    def __init__ (self, source, target, x, y, ship_type, rotated):
         self.source = source
         self.target = target
-        self.ship_type = ship_type
         self.x = x
         self.y = y
+        self.ship_type = ship_type
+        if type (rotated) == type (True):
+            rotated = "horizontal" if rotated else "vertical"
         self.rotated = rotated
 
     def process (self, context):
+        rotated = self.rotated == "horizontal"
         context.sink_notification (self.target,
-                                   self.ship_type,
                                    self.x, self.y,
-                                   self.rotated)
+                                   self.ship_type,
+                                   rotated)
 
     def get_args (self):
         return [self.source, self.target,
-                self.ship_type, self.x, self.y, self.rotated]
+                self.x, self.y, self.ship_type, self.rotated]
 
     @staticmethod
     def describe_args ():
-        return ["base64-string", "base64-string", "string", "int", "int", "bool"]
+        return ["base64-string", "base64-string",
+                "int", "int", "string", "string"]
 
 class LostNotificationEvent (Event):