X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=roguelike.c;h=cd96364a9979221903bbc07ecf17f5e16fe568fd;hb=a09638673d6c79fcf430299c63aab915e2ca19ba;hp=34f3c855da6c9d2927bfad84e73ff11fe207f4e7;hpb=81aeeeb1272e4a729bc65e30f8502b7a5a9a14dd;p=plomrogue
diff --git a/roguelike.c b/roguelike.c
index 34f3c85..cd96364 100644
--- a/roguelike.c
+++ b/roguelike.c
@@ -24,6 +24,8 @@ struct KeysWinData {
int select; };
struct World {
+ char * log;
+ int turn;
struct KeyBinding * keybindings;
struct KeysWinData * keyswindata; };
@@ -51,9 +53,8 @@ void draw_with_linebreaks (struct Win * win, char * text, int start_y) {
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;
@@ -85,6 +86,11 @@ void draw_text_from_bottom (struct Win * win) {
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;
@@ -104,7 +110,8 @@ void draw_map (struct Win * win) {
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); }
@@ -135,21 +142,22 @@ struct Map init_map () {
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 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.
@@ -218,7 +226,7 @@ void draw_keys_window (struct Win * win) {
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;
@@ -331,15 +339,16 @@ int main () {
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) {
@@ -397,24 +406,31 @@ int main () {
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; }