home
·
contact
·
privacy
projects
/
plomrogue
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Log is now saved in world struct, not in win_log.
[plomrogue]
/
roguelike.c
diff --git
a/roguelike.c
b/roguelike.c
index 6d75aa949ae181b5afd9ac783874905fde314d17..cd96364a9979221903bbc07ecf17f5e16fe568fd 100644
(file)
--- a/
roguelike.c
+++ b/
roguelike.c
@@
-24,6
+24,8
@@
struct KeysWinData {
int select; };
struct World {
int select; };
struct World {
+ char * log;
+ int turn;
struct KeyBinding * keybindings;
struct KeysWinData * keyswindata; };
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; } } } } }
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;
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); }
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;
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.
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); }
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; }
map.cells[(8 * map.width) + 3] = 'X';
return map; }
-void update_info (struct W
in * win
) {
+void update_info (struct W
orld * world
) {
// Update info data by incrementing turn value.
// 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;
// Update log with new text to be appended.
char * new_text;
- int len_old = strlen(w
in->data
);
+ int len_old = strlen(w
orld->log
);
int len_new = strlen(text);
int len_whole = len_old + len_new + 1;
new_text = calloc(len_whole, sizeof(char));
int len_new = strlen(text);
int len_whole = len_old + len_new + 1;
new_text = calloc(len_whole, sizeof(char));
- memcpy(new_text, w
in->data
, len_old);
+ memcpy(new_text, w
orld->log
, len_old);
memcpy(new_text + len_old, text, len_new);
memcpy(new_text + len_old, text, len_new);
- free(w
in->data
);
- w
in->data
= new_text; }
+ free(w
orld->log
);
+ w
orld->log
= new_text; }
int get_action_key (struct KeyBinding * keybindings, char * name) {
// Return key matching name in keybindings.
int get_action_key (struct KeyBinding * keybindings, char * name) {
// Return key matching name in keybindings.
@@
-331,15
+339,16
@@
int main () {
struct Map map = init_map();
win_map.data = ↦
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;
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");
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 (&w
in_log
, "Start!");
+ win_log.draw = draw_
log
;
+ win_log.data =
&world
;
+ update_log (&w
orld
, "Start!");
int key;
while (1) {
int key;
while (1) {
@@
-397,32
+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) {
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 (&w
in_info
);
- update_log (&w
in_log
, "\nYou move south.");
+ update_info (&w
orld
);
+ update_log (&w
orld
, "\nYou move south.");
map.player_y++; }
else if (key == get_action_key(world.keybindings, "player up") && map.player_y > 0) {
map.player_y++; }
else if (key == get_action_key(world.keybindings, "player up") && map.player_y > 0) {
- update_info (&w
in_info
);
- update_log (&w
in_log
, "\nYou move north.");
+ update_info (&w
orld
);
+ update_log (&w
orld
, "\nYou move north.");
map.player_y--; }
else if (key == get_action_key(world.keybindings, "player right") && map.player_x < map.width - 1) {
map.player_y--; }
else if (key == get_action_key(world.keybindings, "player right") && map.player_x < map.width - 1) {
- update_info (&w
in_info
);
- update_log (&w
in_log
, "\nYou move east.");
+ update_info (&w
orld
);
+ update_log (&w
orld
, "\nYou move east.");
map.player_x++; }
else if (key == get_action_key(world.keybindings, "player left") && map.player_x > 0) {
map.player_x++; }
else if (key == get_action_key(world.keybindings, "player left") && map.player_x > 0) {
- update_info (&w
in_info
);
- update_log (&w
in_log
, "\nYou move west.");
+ update_info (&w
orld
);
+ update_log (&w
orld
, "\nYou move west.");
map.player_x--; }
else if (key == get_action_key(world.keybindings, "wait") ) {
map.player_x--; }
else if (key == get_action_key(world.keybindings, "wait") ) {
- update_info (&w
in_info
);
- update_log (&w
in_log
, "\nYou wait."); } }
+ update_info (&w
orld
);
+ update_log (&w
orld
, "\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(map.cells);
for (key = 0; key <= world.keyswindata->max; key++)
free(world.keybindings[key].name);
free(world.keybindings);
free(world.keyswindata);
- free(win_info.data);
- free(win_log.data);
+ free(world.log);
endwin();
return 0; }
endwin();
return 0; }