From: Christian Heller <c.heller@plomlompom.de>
Date: Tue, 9 Jul 2013 02:32:53 +0000 (+0200)
Subject: Moved building/reading/writing of map objects into obejcts_on_map library. Fixed... 
X-Git-Tag: tce~1167
X-Git-Url: https://plomlompom.com/repos/%7Broute%7D?a=commitdiff_plain;h=0e8033daabeddfea46bbb756280292df84cd61af;p=plomrogue

Moved building/reading/writing of map objects into obejcts_on_map library. Fixed a bug whereby non-existence of an object type would not be properly marked by a zero value to the world.[object] element.
---

diff --git a/src/objects_on_map.c b/src/objects_on_map.c
index f779b5f..53027cd 100644
--- a/src/objects_on_map.c
+++ b/src/objects_on_map.c
@@ -2,15 +2,86 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include "yx_uint16.h"
+#include "readwrite.h"
 #include "roguelike.h"
 
-extern char is_passable (struct Map * map, struct yx_uint16 pos) {
-// Check if coordinate on (or beyond) map is accessible to actor movement.
-  char passable = 0;
-  if (0 <= pos.x && pos.x < map->size.x && 0 <= pos.y && pos.y < map->size.y)
-    if ('.' == map->cells[pos.y * map->size.x + pos.x])
-      passable = 1;
-  return passable; }
+extern void readwrite_map_objects_dummy (void * dummy, FILE * file) {
+// Dummy function for calls of (write|read)_map_objects on map objects without specific attributes.
+  ; }
+
+extern void write_map_objects_monsterdata (void * start, FILE * file) {
+// Write to file data specific tto map objects of type monster.
+  struct Monster * monster = (struct Monster *) start;
+  fputc(monster->hitpoints, file); }
+
+extern void write_map_objects (void * start, FILE * file, void (* f) (void *, FILE *) ) {
+// Write into file the map object chain starting at start, use f() for object-type specific data.
+  struct ChainMapObject * cmo;
+  for (cmo = start; cmo != 0; cmo = cmo->next) {
+    write_uint16_bigendian(cmo->pos.y + 1, file);
+    write_uint16_bigendian(cmo->pos.x + 1, file);
+    fputc(cmo->name, file);
+    f (cmo, file); }
+  write_uint16_bigendian(0, file); }
+
+extern void read_map_objects_monsterdata (void * start, FILE * file) {
+// Read from file data speciifc to map objects of type monster.
+  struct Monster * monster = (struct Monster *) start;
+  monster->hitpoints = fgetc(file); }
+
+extern void read_map_objects (void * start, FILE * file, size_t size, void (* f) (void *, FILE *) ) {
+// Read from file chain of map objects starting at start, use f() for object-type specific data.
+  struct ChainMapObject * cmo;
+  struct ChainMapObject * * z = start;
+  uint16_t test;
+  char still_at_start = 1;
+  while (1) {
+    test = read_uint16_bigendian(file);
+    if (0 == test)
+      break;
+    if (still_at_start) {
+      cmo = malloc(size);
+      * z = cmo;
+      still_at_start = 0; }
+    else {
+      cmo->next = malloc(size);
+      cmo = cmo->next; }
+    cmo->pos.y = test - 1;
+    cmo->pos.x = read_uint16_bigendian(file) - 1;
+    cmo->name = fgetc(file);
+    f (cmo, file); }
+  if (!still_at_start)
+    cmo->next = 0; }
+
+extern void build_map_objects_monsterdata (void * start) {
+// Build data specific to map objects of type monster.
+  struct Monster * monster = (struct Monster *) start;
+  monster->cmo.name = 'A' + (rrand(0, 0) % 8);
+  monster->hitpoints = 5; }
+
+extern void build_map_objects_itemdata (void * start) {
+// Build data speciifc to map objects of type data.
+  struct Item * item = (struct Item *) start;
+  item->cmo.name = '#' + (rrand(0, 0) % 4); }
+
+extern void build_map_objects (void * start, unsigned char n, size_t size, void (* f) (void *), struct Map * map) {
+// Build chain of n map objects starting at start, use f() for object-specific data.
+  unsigned char i;
+  struct ChainMapObject * cmo;
+  struct ChainMapObject * * z = start;
+  char still_at_start = 1;
+  for (i = 0; i < n; i++) {
+    if (still_at_start) {
+      cmo = malloc(size);
+      * z = cmo;
+      still_at_start = 0; }
+    else {
+      cmo->next = malloc(size);
+      cmo = cmo->next; }
+    cmo->pos = find_passable_pos(map);
+    f(cmo); }
+  if (!still_at_start)
+    cmo->next = 0; }
 
 extern struct yx_uint16 find_passable_pos (struct Map * map) {
 // Return a random passable position on map.
@@ -20,6 +91,14 @@ extern struct yx_uint16 find_passable_pos (struct Map * map) {
       pos.x = rrand(0, 0) % map->size.x; }
   return pos; }
 
+extern char is_passable (struct Map * map, struct yx_uint16 pos) {
+// Check if coordinate on (or beyond) map is accessible to actor movement.
+  char passable = 0;
+  if (0 <= pos.x && pos.x < map->size.x && 0 <= pos.y && pos.y < map->size.y)
+    if ('.' == map->cells[pos.y * map->size.x + pos.x])
+      passable = 1;
+  return passable; }
+
 extern void move_monster (struct World * world, struct Monster * monster) {
 // Move monster in random direction, trigger fighting when hindered by player/monster.
   char d = rrand(0, 0) % 5;
diff --git a/src/objects_on_map.h b/src/objects_on_map.h
index e9c7c65..0d56c01 100644
--- a/src/objects_on_map.h
+++ b/src/objects_on_map.h
@@ -1,6 +1,7 @@
 #ifndef ACTORS_H
 #define ACTORS_H
 
+#include <stdio.h>
 #include "yx_uint16.h"
 
 struct World;
@@ -21,8 +22,17 @@ struct Monster {
   struct ChainMapObject cmo;
   unsigned char hitpoints; };
 
-extern char is_passable (struct Map *, struct yx_uint16);
+extern void readwrite_map_objects_dummy (void *, FILE *);
+extern void write_map_objects_monsterdata (void *, FILE *);
+extern void write_map_objects (void * start, FILE *, void (*) (void *, FILE *) );
+extern void read_map_objects_monsterdata (void *, FILE *);
+extern void read_map_objects (void *, FILE *, size_t, void (*) (void *, FILE *) );
+extern void build_map_objects_monsterdata (void *);
+extern void build_map_objects_itemdata (void *);
+extern void build_map_objects (void *, unsigned char, size_t, void (*) (void *), struct Map *);
+
 extern struct yx_uint16 find_passable_pos (struct Map *);
+extern char is_passable (struct Map *, struct yx_uint16);
 extern void move_monster (struct World *, struct Monster *);
 extern void move_player (struct World *, char);
 extern void player_wait(struct World *);
diff --git a/src/roguelike.c b/src/roguelike.c
index 3f5469c..162740d 100644
--- a/src/roguelike.c
+++ b/src/roguelike.c
@@ -176,88 +176,6 @@ unsigned char meta_keys(int key, struct World * world, struct WinMeta * win_meta
     map_scroll (world->map, WEST);
   return 0; }
 
-void write_map_objects_monsterdata (void * start, FILE * file) {
-// Write to file data specific tto map objects of type monster.
-  struct Monster * monster = (struct Monster *) start;
-  fputc(monster->hitpoints, file); }
-
-void readwrite_map_objects_dummy (void * dummy, FILE * file) {
-// Dummy function for calls of (write|read)_map_objects on map objects without specific attributes.
-  ; }
-
-void write_map_objects (void * start, FILE * file, void (* f) (void *, FILE *) ) {
-// Write into file the map object chain starting at start, use f() for object-type specific data.
-  struct ChainMapObject * cmo;
-  for (cmo = start; cmo != 0; cmo = cmo->next) {
-    write_uint16_bigendian(cmo->pos.y + 1, file);
-    write_uint16_bigendian(cmo->pos.x + 1, file);
-    fputc(cmo->name, file);
-    f (cmo, file); }
-  write_uint16_bigendian(0, file); }
-
-void read_map_objects_monsterdata (void * start, FILE * file) {
-// Read from file data speciifc to map objects of type monster.
-  struct Monster * monster = (struct Monster *) start;
-  monster->hitpoints = fgetc(file); }
-
-void read_map_objects (void * start, FILE * file, size_t size, void (* f) (void *, FILE *) ) {
-// Read from file chain of map objects starting at start, use f() for object-type specific data.
-  int * q = start;
-  * q = 0;
-  struct ChainMapObject * cmo;
-  struct ChainMapObject * * z = start;
-  uint16_t test;
-  char still_at_start = 1;
-  while (1) {
-    test = read_uint16_bigendian(file);
-    if (0 == test)
-      break;
-    if (still_at_start) {
-      cmo = malloc(size);
-      * z = cmo;
-      still_at_start = 0; }
-    else {
-      cmo->next = malloc(size);
-      cmo = cmo->next; }
-    cmo->pos.y = test - 1;
-    cmo->pos.x = read_uint16_bigendian(file) - 1;
-    cmo->name = fgetc(file);
-    f (cmo, file); }
-  if (!still_at_start)
-    cmo->next = 0; }
-
-void build_map_objects_monsterdata (void * start) {
-// Build data specific to map objects of type monster.
-  struct Monster * monster = (struct Monster *) start;
-  monster->cmo.name = 'A' + (rrand(0, 0) % 8);
-  monster->hitpoints = 5; }
-
-void build_map_objects_itemdata (void * start) {
-// Build data speciifc to map objects of type data.
-  struct Item * item = (struct Item *) start;
-  item->cmo.name = '#' + (rrand(0, 0) % 4); }
-
-void build_map_objects (void * start, unsigned char n, size_t size, void (* f) (void *), struct Map * map) {
-// Build chain of n map objects starting at start, use f() for object-specific data.
-  int * q = start;
-  * q = 0;
-  unsigned char i;
-  struct ChainMapObject * cmo;
-  struct ChainMapObject * * z = start;
-  char still_at_start = 1;
-  for (i = 0; i < n; i++) {
-    if (still_at_start) {
-      cmo = malloc(size);
-      * z = cmo;
-      still_at_start = 0; }
-    else {
-      cmo->next = malloc(size);
-      cmo = cmo->next; }
-    cmo->pos = find_passable_pos(map);
-    f(cmo); }
-  if (!still_at_start)
-    cmo->next = 0; }
-
 int main (int argc, char *argv[]) {
   struct World world;
 
@@ -281,6 +199,8 @@ int main (int argc, char *argv[]) {
   update_log (&world, " ");
   struct Player player;
   world.player = &player;
+  world.monster = 0;
+  world.item = 0;
 
   // For interactive mode, try to load world state from savefile.
   FILE * file;
diff --git a/src/roguelike.h b/src/roguelike.h
index a933362..14ca783 100644
--- a/src/roguelike.h
+++ b/src/roguelike.h
@@ -1,7 +1,6 @@
 #ifndef ROGUELIKE_H
 #define ROGUELIKE_H
 
-#include <stdio.h>
 #include <stdint.h>
 #include "yx_uint16.h"
 
@@ -42,13 +41,4 @@ extern void growshrink_active_window (struct WinMeta *, char);
 
 extern unsigned char meta_keys(int, struct World *, struct WinMeta *, struct Win *, struct Win *, struct Win *, struct Win *);
 
-extern void write_map_objects_monsterdata (void *, FILE *);
-extern void readwrite_map_objects_dummy (void *, FILE *);
-extern void write_map_objects (void * start, FILE *, void (*) (void *, FILE *) );
-extern void read_map_objects_monsterdata (void *, FILE *);
-extern void read_map_objects (void *, FILE *, size_t, void (*) (void *, FILE *) );
-extern void build_map_objects_monsterdata (void *);
-extern void build_map_objects_itemdata (void *);
-extern void build_map_objects (void *, unsigned char, size_t, void (*) (void *), struct Map *);
-
 #endif