test and implement resource setters for ocean (eressea#43)

see also eressea#433 and https://bugs.eressea.de/view.php?id=2173#c6411

src/kernel/CMakeLists.txt

@@ -6,6 +6,7 @@ build.test.c
 config.test.c
 group.test.c
 faction.test.c
+region.test.c
 unit.test.c
 save.test.c
 ship.test.c

src/kernel/region.c

@@ -598,51 +598,55 @@ int rpeasants(const region * r)
     return r->land ? r->land->peasants : 0;
 }
 
-void rsetpeasants(region * r, int value)
+int rsetpeasants(const region * r, int value)
 {
+    assert(value >= 0);
     if (r->land) {
-        assert(value >= 0);
-        r->land->peasants = value;
+        return r->land->peasants = value;
     }
+    return 0;
 }
 
 int rmoney(const region * r)
 {
     return r->land ? r->land->money : 0;
 }
 
-void rsethorses(const region * r, int value)
+int rsethorses(const region * r, int value)
 {
+    assert(value >= 0);
     if (r->land) {
-        assert(value >= 0);
-        r->land->horses = value;
+        return r->land->horses = value;
     }
+    return 0;
 }
 
 int rhorses(const region * r)
 {
     return r->land ? r->land->horses : 0;
 }
 
-void rsetmoney(region * r, int value)
+int rsetmoney(const region * r, int value)
 {
+    assert(value >= 0);
     if (r->land) {
-        assert(value >= 0);
-        r->land->money = value;
+        return r->land->money = value;
     }
+    return 0;
 }
 
 int rherbs(const struct region *r)
 {
     return r->land?r->land->herbs:0;
 }
 
-void rsetherbs(const struct region *r, int value)
+int rsetherbs(const struct region *r, int value)
 {
+    assert(value >= 0 && value < (1 << 15));
     if (r->land) {
-        assert(value >= 0 && value < (1 << 15));
-        r->land->herbs = (short)(value);
+        return r->land->herbs = (short)(value);
     }
+    return 0;
 }
 
 
@@ -704,12 +708,11 @@ int rtrees(const region * r, int ageclass)
 
 int rsettrees(const region * r, int ageclass, int value)
 {
-    if (!r->land)
-        assert(value == 0);
-    else {
+    if (r->land) {
         assert(value >= 0);
         return r->land->trees[ageclass] = value;
     }
+    assert(value == 0);
     return 0;
 }
 

src/kernel/region.h

@@ -195,14 +195,14 @@ extern "C" {
     int rsettrees(const struct region *r, int ageclass, int value);
 
     int rpeasants(const struct region *r);
-    void rsetpeasants(struct region *r, int value);
+    int rsetpeasants(const struct region *r, int value);
     int rmoney(const struct region *r);
-    void rsetmoney(struct region *r, int value);
+    int rsetmoney(const struct region *r, int value);
     int rhorses(const struct region *r);
-    void rsethorses(const struct region *r, int value);
+    int rsethorses(const struct region *r, int value);
 
     int rherbs(const struct region *r);
-    void rsetherbs(const struct region *r, int value);
+    int rsetherbs(const struct region *r, int value);
 
 #define rbuildings(r) ((r)->buildings)
 

src/kernel/terrain.h

@@ -36,6 +36,8 @@ extern "C" {
 #define SWIM_INTO		     (1<<8)     /* man darf hierhin schwimmen */
 #define WALK_INTO		     (1<<9)     /* man darf hierhin laufen */
 
+    struct region;
+
     typedef struct production_rule {
         char *name;
         const struct resource_type *rtype;

src/test_eressea.c

@@ -98,6 +98,7 @@ int RunAllTests(int argc, char *argv[])
     ADD_SUITE(item);
     ADD_SUITE(magic);
     ADD_SUITE(alchemy);
+    ADD_SUITE(region);
     ADD_SUITE(reports);
     ADD_SUITE(save);
     ADD_SUITE(ship);