git.shiar.nl
/
netris.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
code cosmetics
[netris.git]
/
curses.c
diff --git
a/curses.c
b/curses.c
index 4d350fd6e2cf301ba197a9fe4df63b441413586b..b1604b0b51384a272a99fae1c64867d92f14a1ec 100644
(file)
--- a/
curses.c
+++ b/
curses.c
@@
-403,8
+403,7
@@
static void block_draw_2(int y, int x, unsigned char type)
else {
#ifdef HAVE_NCURSES
if (Sets.standout) {
else {
#ifdef HAVE_NCURSES
if (Sets.standout) {
- if (haveColor) attrset(COLOR_PAIR(type & 15));
- else attrset(A_REVERSE);
+ attrset(haveColor ? COLOR_PAIR(type & 15) : A_REVERSE);
}
#endif
switch (Sets.drawstyle) {
}
#endif
switch (Sets.drawstyle) {
@@
-471,13
+470,11
@@
static void block_draw_1(int y, int x, unsigned char type)
if (type == BT_none) addch(' ');
else if (type == BT_shadow) addch(':');
else {
if (type == BT_none) addch(' ');
else if (type == BT_shadow) addch(':');
else {
- if (Sets.standout) {
#ifdef HAVE_NCURSES
#ifdef HAVE_NCURSES
- if (haveColor)
- attrset(COLOR_PAIR(type & 15));
- else attrset(A_REVERSE);
-#endif
+ if (Sets.standout) {
+ attrset(haveColor ? COLOR_PAIR(type & 15) : A_REVERSE);
}
}
+#endif
if ((type & 192) == 64)
addch('[');
else if ((type & 192) == 128)
if ((type & 192) == 64)
addch('[');
else if ((type & 192) == 128)
@@
-599,24
+596,24
@@
void window_msg_status(int player)
if (Players[player].alive > 0)
if (Players[player].flags & SCF_paused)
if (Game.started > 1)
if (Players[player].alive > 0)
if (Players[player].flags & SCF_paused)
if (Game.started > 1)
- window_msg_wide(player,
"PAUSED"
);
+ window_msg_wide(player,
MSG_PLAYER_PAUSE
);
else
else
- window_msg_wide(player,
"NOT READY"
);
+ window_msg_wide(player,
MSG_PLAYER_JOIN
);
else
if (Game.started > 1)
window_msg(player, NULL);
else
else
if (Game.started > 1)
window_msg(player, NULL);
else
- window_msg_wide(player,
"READY"
);
+ window_msg_wide(player,
MSG_PLAYER_START
);
else if (!Players[player].alive)
else if (!Players[player].alive)
- window_msg_wide(player,
"GAME OVER"
);
+ window_msg_wide(player,
MSG_PLAYER_STOP
);
else
else
- window_msg_wide(player,
"EMPTY"
);
+ window_msg_wide(player,
MSG_PLAYER_PART
);
}
void status_tick(void)
{ //display timer
}
void status_tick(void)
{ //display timer
- mvprintw(statusYPos, statusXPos,
"timer %7.0f "
, CurTimeval() / 1e6);
+ mvprintw(statusYPos, statusXPos,
MSG_TIME
, CurTimeval() / 1e6);
}
void ScheduleFullRedraw(void)
}
void ScheduleFullRedraw(void)