From 76ba2b9303078242b46d897fff5ae8ef8d6a17ac Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno@eressea.de>
Date: Thu, 17 May 2012 00:14:05 -0700
Subject: [PATCH] begin making shipowner use ship->owner.

---
 src/races/races.c          |  5 ++---
 src/spells/buildingcurse.c |  4 ++--
 src/spells/regioncurse.c   | 12 ++++++------
 src/spells/shipcurse.c     |  4 ++--
 src/spells/shipcurse.h     |  2 +-
 src/spells/unitcurse.c     | 16 ++++++++--------
 src/spells/unitcurse.h     |  2 +-
 7 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/src/races/races.c b/src/races/races.c
index 829a90e61..519a51940 100644
--- a/src/races/races.c
+++ b/src/races/races.c
@@ -79,10 +79,9 @@ static void equip_newunits(const struct equipment *eq, struct unit *u)
     break;
   case RC_AQUARIAN:
   {
-    ship *sh = new_ship(st_find("boat"), u->faction->locale, r);
+    ship *sh = new_ship(st_find("boat"), r, u->faction->locale);
     sh->size = sh->type->construction->maxsize;
-    u->ship = sh;
-    fset(u, UFL_OWNER);
+    u_set_ship(u, sh);
   }
     break;
   case RC_CENTAUR:
diff --git a/src/spells/buildingcurse.c b/src/spells/buildingcurse.c
index ca531c6fe..266cfcf45 100644
--- a/src/spells/buildingcurse.c
+++ b/src/spells/buildingcurse.c
@@ -33,7 +33,7 @@
 #include <stdlib.h>
 #include <assert.h>
 
-static message *cinfo_building(const void *obj, typ_t typ, const curse * c,
+static message *cinfo_building(const void *obj, objtype_t typ, const curse * c,
   int self)
 {
   unused(typ);
@@ -48,7 +48,7 @@ static message *cinfo_building(const void *obj, typ_t typ, const curse * c,
 /* CurseInfo mit Spezialabfragen */
 
 /* C_MAGICWALLS*/
-static message *cinfo_magicrunes(const void *obj, typ_t typ, const curse * c,
+static message *cinfo_magicrunes(const void *obj, objtype_t typ, const curse * c,
   int self)
 {
   message *msg = NULL;
diff --git a/src/spells/regioncurse.c b/src/spells/regioncurse.c
index 1012b163e..bf65656a6 100644
--- a/src/spells/regioncurse.c
+++ b/src/spells/regioncurse.c
@@ -41,7 +41,7 @@
 /*
  * godcursezone
  */
-static message *cinfo_cursed_by_the_gods(const void *obj, typ_t typ,
+static message *cinfo_cursed_by_the_gods(const void *obj, objtype_t typ,
   const curse * c, int self)
 {
   region *r = (region *) obj;
@@ -66,7 +66,7 @@ static struct curse_type ct_godcursezone = {
 /*
  * C_GBDREAM
  */
-static message *cinfo_dreamcurse(const void *obj, typ_t typ, const curse * c,
+static message *cinfo_dreamcurse(const void *obj, objtype_t typ, const curse * c,
   int self)
 {
   unused(self);
@@ -90,7 +90,7 @@ static struct curse_type ct_gbdream = {
  * C_MAGICSTREET
  *  erzeugt Straßennetz
  */
-static message *cinfo_magicstreet(const void *obj, typ_t typ, const curse * c,
+static message *cinfo_magicstreet(const void *obj, objtype_t typ, const curse * c,
   int self)
 {
   unused(typ);
@@ -113,7 +113,7 @@ static struct curse_type ct_magicstreet = {
 
 /* --------------------------------------------------------------------- */
 
-static message *cinfo_antimagiczone(const void *obj, typ_t typ, const curse * c,
+static message *cinfo_antimagiczone(const void *obj, objtype_t typ, const curse * c,
   int self)
 {
   unused(typ);
@@ -131,7 +131,7 @@ static message *cinfo_antimagiczone(const void *obj, typ_t typ, const curse * c,
 
 /* alle Magier können eine Antimagiezone wahrnehmen */
 static int
-cansee_antimagiczone(const struct faction *viewer, const void *obj, typ_t typ,
+cansee_antimagiczone(const struct faction *viewer, const void *obj, objtype_t typ,
   const curse * c, int self)
 {
   region *r;
@@ -163,7 +163,7 @@ static struct curse_type ct_antimagiczone = {
 };
 
 /* --------------------------------------------------------------------- */
-static message *cinfo_farvision(const void *obj, typ_t typ, const curse * c,
+static message *cinfo_farvision(const void *obj, objtype_t typ, const curse * c,
   int self)
 {
   unused(typ);
diff --git a/src/spells/shipcurse.c b/src/spells/shipcurse.c
index e481dc571..64a9aa849 100644
--- a/src/spells/shipcurse.c
+++ b/src/spells/shipcurse.c
@@ -34,7 +34,7 @@
 #include <stdlib.h>
 #include <assert.h>
 
-message *cinfo_ship(const void *obj, typ_t typ, const curse * c, int self)
+message *cinfo_ship(const void *obj, objtype_t typ, const curse * c, int self)
 {
   message *msg;
 
@@ -56,7 +56,7 @@ message *cinfo_ship(const void *obj, typ_t typ, const curse * c, int self)
 /* CurseInfo mit Spezialabfragen */
 
 /* C_SHIP_NODRIFT */
-static message *cinfo_shipnodrift(const void *obj, typ_t typ, const curse * c,
+static message *cinfo_shipnodrift(const void *obj, objtype_t typ, const curse * c,
   int self)
 {
   ship *sh = (ship *) obj;
diff --git a/src/spells/shipcurse.h b/src/spells/shipcurse.h
index 4d0d6cd1f..11a8486a6 100644
--- a/src/spells/shipcurse.h
+++ b/src/spells/shipcurse.h
@@ -19,7 +19,7 @@ extern "C" {
 
   struct locale;
   struct message;
-  extern struct message *cinfo_ship(const void *obj, typ_t typ,
+  extern struct message *cinfo_ship(const void *obj, objtype_t typ,
     const struct curse *c, int self);
   extern void register_shipcurse(void);
   extern struct curse *shipcurse_flyingship(struct ship *sh, struct unit *mage,
diff --git a/src/spells/unitcurse.c b/src/spells/unitcurse.c
index d1f89899c..9e8972995 100644
--- a/src/spells/unitcurse.c
+++ b/src/spells/unitcurse.c
@@ -43,7 +43,7 @@
  * C_AURA
  */
 /* erhöht/senkt regeneration und maxaura um effect% */
-static message *cinfo_auraboost(const void *obj, typ_t typ, const curse * c,
+static message *cinfo_auraboost(const void *obj, objtype_t typ, const curse * c,
   int self)
 {
   struct unit *u = (struct unit *)obj;
@@ -76,7 +76,7 @@ static struct curse_type ct_magicboost = {
 /*
  * C_SLAVE
  */
-static message *cinfo_slave(const void *obj, typ_t typ, const curse * c,
+static message *cinfo_slave(const void *obj, objtype_t typ, const curse * c,
   int self)
 {
   unit *u;
@@ -101,7 +101,7 @@ static struct curse_type ct_slavery = { "slavery",
 /*
  * C_CALM
  */
-static message *cinfo_calm(const void *obj, typ_t typ, const curse * c,
+static message *cinfo_calm(const void *obj, objtype_t typ, const curse * c,
   int self)
 {
   unused(typ);
@@ -130,7 +130,7 @@ static struct curse_type ct_calmmonster = {
 /*
  * C_SPEED
  */
-static message *cinfo_speed(const void *obj, typ_t typ, const curse * c,
+static message *cinfo_speed(const void *obj, objtype_t typ, const curse * c,
   int self)
 {
   unused(typ);
@@ -154,7 +154,7 @@ static struct curse_type ct_speed = {
 /*
  * C_ORC
  */
-message *cinfo_unit(const void *obj, typ_t typ, const curse * c, int self)
+message *cinfo_unit(const void *obj, objtype_t typ, const curse * c, int self)
 {
   unused(typ);
   assert(typ == TYP_UNIT);
@@ -177,7 +177,7 @@ static struct curse_type ct_orcish = {
 /*
  * C_KAELTESCHUTZ
  */
-static message *cinfo_kaelteschutz(const void *obj, typ_t typ, const curse * c,
+static message *cinfo_kaelteschutz(const void *obj, objtype_t typ, const curse * c,
   int self)
 {
   unused(typ);
@@ -201,7 +201,7 @@ static struct curse_type ct_insectfur = {
 /*
  * C_SPARKLE
  */
-static message *cinfo_sparkle(const void *obj, typ_t typ, const curse * c,
+static message *cinfo_sparkle(const void *obj, objtype_t typ, const curse * c,
   int self)
 {
   const char *effects[] = {
@@ -330,7 +330,7 @@ write_skill(struct storage *store, const curse * c, const void *target)
   return 0;
 }
 
-static message *cinfo_skillmod(const void *obj, typ_t typ, const curse * c,
+static message *cinfo_skillmod(const void *obj, objtype_t typ, const curse * c,
   int self)
 {
   unused(typ);
diff --git a/src/spells/unitcurse.h b/src/spells/unitcurse.h
index 88f6bf1e7..17458a7ff 100644
--- a/src/spells/unitcurse.h
+++ b/src/spells/unitcurse.h
@@ -19,7 +19,7 @@ extern "C" {
 
   struct curse;
   struct message;
-  extern struct message *cinfo_unit(const void *obj, typ_t typ,
+  extern struct message *cinfo_unit(const void *obj, objtype_t typ,
     const struct curse *c, int self);
 
   extern void register_unitcurse(void);