Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Small cmatrix.c fixes #66

Merged
merged 1 commit into from
Mar 26, 2019
Merged

Small cmatrix.c fixes #66

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 9 additions & 12 deletions cmatrix.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*
/*
cmatrix.c

Copyright (C) 1999-2017 Chris Allegretta
Expand Down Expand Up @@ -122,7 +122,7 @@ void c_die(char *msg, ...) {
}

va_start(ap, msg);
vfprintf(stderr, "%s", ap);
vfprintf(stderr, msg, ap);
va_end(ap);
exit(0);
}
Expand Down Expand Up @@ -281,7 +281,7 @@ int main(int argc, char *argv[]) {
int update = 4;
int highnum = 0;
int mcolor = COLOR_GREEN;
int rainbow = 0;
int rainbow = 0;
int lambda = 0;
int randnum = 0;
int randmin = 0;
Expand Down Expand Up @@ -328,10 +328,9 @@ int main(int argc, char *argv[]) {
} else if (!strcasecmp(optarg, "black")) {
mcolor = COLOR_BLACK;
} else {
printf(" Invalid color selection\n Valid "
c_die(" Invalid color selection\n Valid "
"colors are green, red, blue, "
"white, yellow, cyan, magenta " "and black.\n");
exit(1);
}
break;
case 'f':
Expand Down Expand Up @@ -431,8 +430,6 @@ if (console) {
}
}

srand(time(NULL));

/* Set up values for random number generation */
if (console || xwindow) {
randnum = 51;
Expand Down Expand Up @@ -661,7 +658,7 @@ if (console) {
if (matrix[i][j].val == 0) {
if (console || xwindow) {
addch(183);
} else {
} else {
addch('&');
}
} else {
Expand All @@ -677,17 +674,17 @@ if (console) {
}
} else {

if(rainbow){
if(rainbow){
int randomColor = rand() % 6;

switch(randomColor){
case 0:
mcolor = COLOR_GREEN;
break;
case 1:
case 1:
mcolor = COLOR_BLUE;
break;
case 2:
case 2:
mcolor = COLOR_BLACK;
break;
case 3:
Expand All @@ -696,7 +693,7 @@ if (console) {
case 4:
mcolor = COLOR_CYAN;
break;
case 5:
case 5:
mcolor = COLOR_MAGENTA;
break;
}
Expand Down