home
·
contact
·
privacy
projects
/
plomrogue
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More consistent code styling whitespace rules.
[plomrogue]
/
src
/
map_objects.h
diff --git
a/src/map_objects.h
b/src/map_objects.h
index 1489711279bb4d9e96cf9ce21e16c8e31cb69a7f..6342f4b1db39a8f87558838d556b7a86de94d626 100644
(file)
--- a/
src/map_objects.h
+++ b/
src/map_objects.h
@@
-7,12
+7,9
@@
#ifndef MAP_OBJECTS_H
#define MAP_OBJECTS_H
#ifndef MAP_OBJECTS_H
#define MAP_OBJECTS_H
-
-
#include <stdio.h> /* for FILE typedef */
#include <stdint.h> /* for uint8_t */
#include "yx_uint16.h" /* for yx_uint16 coordinates */
#include <stdio.h> /* for FILE typedef */
#include <stdint.h> /* for uint8_t */
#include "yx_uint16.h" /* for yx_uint16 coordinates */
-struct World;
@@
-26,8
+23,6
@@
struct MapObj
struct yx_uint16 pos; /* coordinate on map */
};
struct yx_uint16 pos; /* coordinate on map */
};
-
-
struct MapObjDef
{
struct MapObjDef * next;
struct MapObjDef
{
struct MapObjDef * next;
@@
-41,55
+36,38
@@
struct MapObjDef
/* Initialize map object defnitions chain from file at path "filename". */
/* Initialize map object defnitions chain from file at path "filename". */
-extern void init_map_object_defs(struct World * world, char * filename);
-
-
+extern void init_map_object_defs(char * filename);
/* Free map object definitions chain starting at "mod_start". */
extern void free_map_object_defs(struct MapObjDef * mod_start);
/* Free map object definitions chain starting at "mod_start". */
extern void free_map_object_defs(struct MapObjDef * mod_start);
-
-
/* Add new object(s) ("n": how many?) of "type" to map on random position(s).
* New animate objects are never placed in the same square with other animated
* ones.
*/
/* Add new object(s) ("n": how many?) of "type" to map on random position(s).
* New animate objects are never placed in the same square with other animated
* ones.
*/
-extern void add_map_object(struct World * world, uint8_t type);
-extern void add_map_objects(struct World * world, uint8_t type, uint8_t n);
-
-
+extern void add_map_object(uint8_t type);
+extern void add_map_objects(uint8_t type, uint8_t n);
/* Write map objects chain to "file". */
/* Write map objects chain to "file". */
-extern void write_map_objects(
struct World * world,
FILE * file);
+extern void write_map_objects(FILE * file);
/* Read from "file" map objects chain; use "line" as char array for fgets() and
* expect strings of max. "linemax" length.
*/
/* Read from "file" map objects chain; use "line" as char array for fgets() and
* expect strings of max. "linemax" length.
*/
-extern void read_map_objects(struct World * world, FILE * file,
- char * line, int linemax);
-
-
+extern void read_map_objects(FILE * file, char * line, int linemax);
/* Free map objects in map object chain starting at "mo_start. */
extern void free_map_objects(struct MapObj * mo_start);
/* Free map objects in map object chain starting at "mo_start. */
extern void free_map_objects(struct MapObj * mo_start);
-
-
/* Move object of "id" from "source" inventory to "target" inventory. */
extern void own_map_object(struct MapObj ** target, struct MapObj ** source,
uint8_t id);
/* Move object of "id" from "source" inventory to "target" inventory. */
extern void own_map_object(struct MapObj ** target, struct MapObj ** source,
uint8_t id);
-
-
/* Get pointer to the MapObj struct that represents the player. */
/* Get pointer to the MapObj struct that represents the player. */
-extern struct MapObj * get_player(struct World * world);
-
-
+extern struct MapObj * get_player();
/* Get pointer to the map object definition of identifier "def_id". */
/* Get pointer to the map object definition of identifier "def_id". */
-extern struct MapObjDef * get_map_object_def(struct World * w, uint8_t id);
-
-
+extern struct MapObjDef * get_map_object_def(uint8_t id);
/* Move not only "mo" to "pos", but also all map objects owned by it. */
extern void set_object_position(struct MapObj * mo, struct yx_uint16 pos);
/* Move not only "mo" to "pos", but also all map objects owned by it. */
extern void set_object_position(struct MapObj * mo, struct yx_uint16 pos);