From c7cc7fe6896f27762e2dd9b65de57f81bd1f33d4 Mon Sep 17 00:00:00 2001 From: Christian Heller Date: Tue, 30 Jul 2013 03:05:45 +0200 Subject: [PATCH] Minor formatting improvements. --- src/map_objects.c | 3 ++- src/map_objects.h | 3 ++- src/misc.c | 23 +++++++++++++---------- 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/src/map_objects.c b/src/map_objects.c index 2fb6b80..4fc9f1c 100644 --- a/src/map_objects.c +++ b/src/map_objects.c @@ -159,7 +159,8 @@ extern void read_map_objects_monsterdata (void * start, FILE * file) extern void * build_map_objects(struct World * world, void * start, char def_id, unsigned char n, size_t size, - void (* b_typedata) (struct MapObjDef *, void *)) + void (* b_typedata) (struct MapObjDef *, + void *)) { unsigned char i; struct MapObj * mo; diff --git a/src/map_objects.h b/src/map_objects.h index d598514..fb33fe5 100644 --- a/src/map_objects.h +++ b/src/map_objects.h @@ -87,7 +87,8 @@ extern void init_map_object_defs(struct World * world, char * filename); */ extern void * build_map_objects(struct World * world, void * start, char def_id, unsigned char n, size_t size, - void (*) (struct MapObjDef *, void *)); + void (* b_typedata) (struct MapObjDef *, + void *)); extern void build_map_objects_itemdata(struct MapObjDef * map_obj_def, void * start); extern void build_map_objects_monsterdata(struct MapObjDef * map_obj_def, diff --git a/src/misc.c b/src/misc.c index a8918a9..8998d0a 100644 --- a/src/misc.c +++ b/src/misc.c @@ -4,17 +4,20 @@ #include /* for exit(), EXIT_SUCCESS define, calloc(), free() */ #include /* for strlen(), strcmp(), memcpy() */ #include /* for endwin() */ -#include "windows.h" /* for suspend_win(), append_win(), reset_pad_offset(), */ - /* resize_active_win(), cycle_active_win(), */ - /* shift_active_win(), struct Win, struct WinMeta */ -#include "keybindings.h" /* for get_action_key(), save_keybindings(), */ - /* keyswin_move_selection(), keyswin_mod_key() */ -#include "readwrite.h" /* for write_uint16_bigendian() */ - /* write_uint32_bigendian() */ -#include "map_objects.h" /* for struct Monster, write_map_objects(), */ - /* write_map_objects_monsterdata() */ +#include "windows.h" /* for suspend_win(), append_win(), reset_pad_offset(), + * resize_active_win(), cycle_active_win(), + * shift_active_win(), struct Win, struct WinMeta + */ +#include "keybindings.h" /* for get_action_key(), save_keybindings(), + * keyswin_move_selection(), keyswin_mod_key() + */ +#include "readwrite.h" /* for write_uint16_bigendian(), write_uint32_bigendian() + */ +#include "map_objects.h" /* for struct Monster, write_map_objects(), + * write_map_objects_monsterdata() + */ #include "map_object_actions.h" /* for is_passable(), move_monster() */ -#include "map.h" /* for map_scroll()/map_center_player(), Map struct, dir enum */ +#include "map.h" /* for map_scroll(),map_center_player(), Map struct,dir enum */ #include "main.h" /* for World struct */ #include "yx_uint16.h" /* for yx_uint16 */ -- 2.30.2