From: Christian Heller Date: Tue, 6 Aug 2013 04:16:37 +0000 (+0200) Subject: Corrected indentation / line lengths. X-Git-Tag: tce~1101 X-Git-Url: https://plomlompom.com/repos/te"st.html?a=commitdiff_plain;h=c7cdbe6260e5cd6a8efe2c73a02c9635b67ec4b7;p=plomrogue Corrected indentation / line lengths. --- diff --git a/src/main.c b/src/main.c index c48d57b..8c1ac56 100644 --- a/src/main.c +++ b/src/main.c @@ -123,9 +123,12 @@ int main(int argc, char *argv[]) raw(); init_keybindings(&world); struct WinMeta win_meta = init_win_meta(screen); - struct Win win_keys = init_win(&win_meta, "Keys", 0, 29, &world, draw_keys_win); - struct Win win_info = init_win(&win_meta, "Info", 2, 20, &world, draw_info_win); - uint16_t height_logwin = win_meta.padframe.size.y - (2 + win_info.frame.size.y); + struct Win win_keys = init_win(&win_meta, "Keys", + 0, 29, &world, draw_keys_win); + struct Win win_info = init_win(&win_meta, "Info", + 2, 20, &world, draw_info_win); + uint16_t height_logwin = win_meta.padframe.size.y + - (2 + win_info.frame.size.y); struct Win win_log = init_win(&win_meta, "Log", height_logwin, 20, &world, draw_log_win); uint16_t width_mapwin = win_meta.padframe.size.x - win_keys.frame.size.x diff --git a/src/map_objects.h b/src/map_objects.h index 9eb055c..a5156f4 100644 --- a/src/map_objects.h +++ b/src/map_objects.h @@ -81,7 +81,7 @@ extern void init_map_object_defs(struct World * world, char * filename); * "def_id". */ extern void * build_map_objects(struct World * world, void * start, char def_id, - unsigned char n); + unsigned char n);