#include <string.h>
#include <stdio.h>
#include <stdlib.h>
-#include <math.h>
#include "windows.h"
struct Map {
int select; };
struct World {
+ char * log;
+ int turn;
struct KeyBinding * keybindings;
struct KeysWinData * keyswindata; };
toggle = 1;
continue; }
else
- mvwaddch(win->curses_win, y, x, text[z]);
+ mvwaddch(win->curses, y, x, text[z]);
if ('\n' == text[z+1]) {
z++;
toggle = 1; }
toggle = 1;
fin = 1; } } } } }
-void draw_text_from_bottom (struct Win * win) {
-// Draw text in win->data from end/bottom to the top.
- char * text = (char *) win->data;
+void draw_text_from_bottom (struct Win * win, char * text) {
+// Draw text from end/bottom to the top.
char toggle = 0;
int x, y, offset;
int z = -1;
- for (y = 0; 0 == toggle; y++) // Determine number of lines text would have in a window of
- for (x = 0; x < win->width; x++) { // available width, but infinite height.
+ for (y = 0; 0 == toggle; y++) // Determine number of lines text would have in
+ for (x = 0; x < win->width; x++) { // a window of available width, but infinite height.
z++;
- if ('\n' == text[z]) // Treat \n and \0 as control characters for incrementing y and
- break; // stopping the loop. Make sure they don't count as cell space
- if ('\n' == text[z+1]) { // themselves.
+ if ('\n' == text[z]) // Treat \n and \0 as control characters for incrementing y and stopping
+ break; // the loop. Make sure they don't count as cell space themselves.
+ if ('\n' == text[z+1]) {
z++;
break; }
else if (0 == text[z+1]) {
text = text + (sizeof(char) * (z + 1)); }
draw_with_linebreaks(win, text, start_y); }
+void draw_log (struct Win * win) {
+// Draw log text from world struct in win->data from bottom to top.
+ struct World world = * (struct World *) win->data;
+ draw_text_from_bottom(win, world.log); }
+
void draw_map (struct Win * win) {
// Draw map determined by win->data Map struct into window. Respect offset.
struct Map map = * (struct Map *) win->data;
for (x = 0; x < win->width; x++) {
if (y < height_map_av && x < width_map_av) {
if (z == (map.width * map.player_y) + map.player_x)
- mvwaddch(win->curses_win, y, x, '@');
+ mvwaddch(win->curses, y, x, '@');
else
- mvwaddch(win->curses_win, y, x, cells[z]);
+ mvwaddch(win->curses, y, x, cells[z]);
z++; } } } }
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); }
void toggle_window (struct WinMeta * win_meta, struct Win * win) {
// Toggle display of window win.
- if (0 != win->curses_win)
+ if (0 != win->curses)
suspend_window(win_meta, win);
else
append_window(win_meta, win); }
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) {
+void update_log (struct World * world, char * text) {
// Update log with new text to be appended.
char * new_text;
- int len_old = strlen(win->data);
+ int len_old = strlen(world->log);
int len_new = strlen(text);
int len_whole = len_old + len_new + 1;
new_text = calloc(len_whole, sizeof(char));
- memcpy(new_text, win->data, len_old);
+ memcpy(new_text, world->log, len_old);
memcpy(new_text + len_old, text, len_new);
- free(win->data);
- win->data = new_text; }
+ free(world->log);
+ world->log = new_text; }
int get_action_key (struct KeyBinding * keybindings, char * name) {
// Return key matching name in keybindings.
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;
free(keyname);
for (x = 0; x < win->width; x++)
if (x < strlen(keydesc))
- mvwaddch(win->curses_win, y, x, keydesc[x] | attri);
+ mvwaddch(win->curses, y, x, keydesc[x] | attri);
else if (strlen(keydesc) < x && x < strlen(keybindings[y + offset].name) + strlen(keydesc) + 1)
- mvwaddch(win->curses_win, y, x, keybindings[y + offset].name[x - strlen(keydesc) - 1] | attri);
+ mvwaddch(win->curses, y, x, keybindings[y + offset].name[x - strlen(keydesc) - 1] | attri);
else
- mvwaddch(win->curses_win, y, x, ' ' | attri); }
+ mvwaddch(win->curses, y, x, ' ' | attri); }
free(keydesc); }
void init_keybindings(struct World * world) {
c = getc(file);
if ('\n' == c) {
if (c_count > linemax)
- linemax = c_count;
+ linemax = c_count + 1;
c_count = 0;
lines++; } }
struct KeyBinding * keybindings = malloc(lines * sizeof(struct KeyBinding));
fseek(file, 0, SEEK_SET);
char * command = malloc(linemax);
int commcount = 0;
- char * digits = malloc(3);
- int digicount = 0;
- int key, digimax;
- int keycount = 0;
- c = getc(file);
- while (EOF != c) {
- if ('\n' == c) {
- keybindings[keycount].name = calloc(commcount + 1, sizeof(char));
- memcpy(keybindings[keycount].name, command, commcount);
- keybindings[keycount].key = key;
- keycount++;
- digicount = 0;
- commcount = 0; }
- else if (-1 != digicount)
- if (' ' == c) {
- key = 0;
- digimax = digicount - 1;
- while (digicount > 0) {
- digicount--;
- key = key + ((digits[digicount] - 48) * pow(10, digimax - digicount)); }
- digicount = -1; }
- else {
- digits[digicount] = c;
- digicount++; }
- else {
- command[commcount] = c;
- commcount++; }
- c = getc(file); }
+ char * cmdptr;
+ while (fgets(command, linemax, file)) {
+ keybindings[commcount].key = atoi(command);
+ cmdptr = strchr(command, ' ') + 1;
+ keybindings[commcount].name = malloc(strlen(cmdptr));
+ memcpy(keybindings[commcount].name, cmdptr, strlen(cmdptr) - 1);
+ keybindings[commcount].name[strlen(cmdptr) - 1] = '\0';
+ commcount++; }
free(command);
- free(digits);
fclose(file);
struct KeysWinData * keyswindata = malloc(sizeof(struct KeysWinData));
keyswindata->max = lines - 1;
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;
+ world.log = calloc(1, sizeof(char));
struct Win win_log = init_window(&win_meta, "Log");
- win_log.draw = draw_text_from_bottom;
- win_log.data = calloc(1, sizeof(char));
- update_log (&win_log, "Start!");
+ win_log.draw = draw_log;
+ win_log.data = &world;
+ update_log (&world, "Start!");
int key;
while (1) {
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_log (&win_log, "\nYou move south.");
+ update_info (&world);
+ update_log (&world, "\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_log (&win_log, "\nYou move north.");
+ update_info (&world);
+ update_log (&world, "\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_log (&win_log, "\nYou move east.");
+ update_info (&world);
+ update_log (&world, "\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_log (&win_log, "\nYou move west.");
+ update_info (&world);
+ update_log (&world, "\nYou move west.");
map.player_x--; }
else if (key == get_action_key(world.keybindings, "wait") ) {
- update_info (&win_info);
- update_log (&win_log, "\nYou wait."); } }
+ update_info (&world);
+ update_log (&world, "\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(world.log);
endwin();
return 0; }
projects / plomrogue / blobdiff