home
·
contact
·
privacy
projects
/
plomrogue
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Turn is now part of world struct, instead of being saved in win_info.data
[plomrogue]
/
roguelike.c
diff --git
a/roguelike.c
b/roguelike.c
index 34f3c855da6c9d2927bfad84e73ff11fe207f4e7..fc4f5d16f511e44f01ade0c31cd692ede62d4ecf 100644
(file)
--- a/
roguelike.c
+++ b/
roguelike.c
@@
-24,6
+24,7
@@
struct KeysWinData {
int select; };
struct World {
int select; };
struct World {
+ int turn;
struct KeyBinding * keybindings;
struct KeysWinData * keyswindata; };
struct KeyBinding * keybindings;
struct KeysWinData * keyswindata; };
@@
-104,7
+105,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,9
+137,9
@@
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) {
// Update log with new text to be appended.
void update_log (struct Win * win, char * text) {
// Update log with new text to be appended.
@@
-218,7
+220,7
@@
void draw_keys_window (struct Win * win) {
attr_t attri;
int y, x;
char * keyname;
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;
attri = 0;
if (y == keyswindata->select - offset) {
attri = A_REVERSE;
@@
-331,10
+333,10
@@
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;
struct Win win_log = init_window(&win_meta, "Log");
win_log.draw = draw_text_from_bottom;
struct Win win_log = init_window(&win_meta, "Log");
win_log.draw = draw_text_from_bottom;
@@
-397,24
+399,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_info (&w
orld
);
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_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 (&w
in_info
);
+ update_info (&w
orld
);
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_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 (&w
in_info
);
+ update_info (&w
orld
);
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_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 (&w
in_info
);
+ update_info (&w
orld
);
update_log (&win_log, "\nYou move west.");
map.player_x--; }
else if (key == get_action_key(world.keybindings, "wait") ) {
update_log (&win_log, "\nYou move west.");
map.player_x--; }
else if (key == get_action_key(world.keybindings, "wait") ) {
- update_info (&w
in_info
);
+ update_info (&w
orld
);
update_log (&win_log, "\nYou wait."); } }
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; }
endwin();
return 0; }