int select; };
struct World {
+ int turn;
struct KeyBinding * keybindings;
struct KeysWinData * keyswindata; };
void draw_info (struct Win * win) {
// Draw info window by appending win->data integer value to "Turn: " display.
- int count = * (int *) win->data;
+ struct World world = * (struct World *) win->data;
+ int count = world.turn;
char text[100];
snprintf(text, 100, "Turn: %d", count);
draw_with_linebreaks(win, text, 0); }
map.cells[(8 * map.width) + 3] = 'X';
return map; }
-void update_info (struct Win * win) {
+void update_info (struct World * world) {
// Update info data by incrementing turn value.
- * (int *) win->data = * (int *) win->data + 1; }
+ world->turn++; }
void update_log (struct Win * win, char * text) {
// Update log with new text to be appended.
struct KeyBinding * keybindings = world->keybindings;
int offset = 0;
if (keyswindata->max >= win->height) {
- if (keyswindata->select > win->height / 2)
+ if (keyswindata->select > win->height / 2) {
if (keyswindata->select < (keyswindata->max - (win->height / 2)))
offset = keyswindata->select - (win->height / 2);
else
- offset = keyswindata->max - win->height + 1; }
+ offset = keyswindata->max - win->height + 1; } }
int keydescwidth = 9 + 1; // max length assured by get_keyname() + \0
char * keydesc = malloc(keydescwidth);
attr_t attri;
int y, x;
char * keyname;
- for (y = 0; 0 != keybindings[offset + y].name && y < win->height; y++) {
+ for (y = 0; y <= keyswindata->max && y < win->height; y++) {
attri = 0;
if (y == keyswindata->select - offset) {
attri = A_REVERSE;
struct KeyBinding * keybindings = malloc(lines * sizeof(struct KeyBinding));
fseek(file, 0, SEEK_SET);
char * command = malloc(linemax);
- char commcount = 0;
+ int commcount = 0;
char * digits = malloc(3);
- char digicount = 0;
+ int digicount = 0;
int key, digimax;
int keycount = 0;
c = getc(file);
while (EOF != c) {
if ('\n' == c) {
- keybindings[keycount].name = calloc(commcount, sizeof(char));
+ keybindings[keycount].name = calloc(commcount + 1, sizeof(char));
memcpy(keybindings[keycount].name, command, commcount);
keybindings[keycount].key = key;
keycount++;
struct Map map = init_map();
win_map.data = ↦
+ world.turn = 0;
struct Win win_info = init_window(&win_meta, "Info");
win_info.draw = draw_info;
- win_info.data = malloc(sizeof(int));
- * (int *) win_info.data = 0;
+ win_info.data = &world;
struct Win win_log = init_window(&win_meta, "Log");
win_log.draw = draw_text_from_bottom;
else if (key == get_action_key(world.keybindings, "map left") && map.offset_x > 0)
map.offset_x--;
else if (key == get_action_key(world.keybindings, "player down") && map.player_y < map.height - 1) {
- update_info (&win_info);
+ update_info (&world);
update_log (&win_log, "\nYou move south.");
map.player_y++; }
else if (key == get_action_key(world.keybindings, "player up") && map.player_y > 0) {
- update_info (&win_info);
+ update_info (&world);
update_log (&win_log, "\nYou move north.");
map.player_y--; }
else if (key == get_action_key(world.keybindings, "player right") && map.player_x < map.width - 1) {
- update_info (&win_info);
+ update_info (&world);
update_log (&win_log, "\nYou move east.");
map.player_x++; }
else if (key == get_action_key(world.keybindings, "player left") && map.player_x > 0) {
- update_info (&win_info);
+ update_info (&world);
update_log (&win_log, "\nYou move west.");
map.player_x--; }
else if (key == get_action_key(world.keybindings, "wait") ) {
- update_info (&win_info);
+ update_info (&world);
update_log (&win_log, "\nYou wait."); } }
+ free(map.cells);
+ for (key = 0; key <= world.keyswindata->max; key++)
+ free(world.keybindings[key].name);
+ free(world.keybindings);
+ free(world.keyswindata);
+ free(win_log.data);
+
endwin();
return 0; }