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

Jump to bottom

add option for the number of cars #56

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

add option for the number of cars #56

Show file tree
Hide file tree
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
3 changes: 3 additions & 0 deletions sl.1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ It flies like the galaxy express 999.
.TP
.B \-c
C51 appears instead of D51.
.TP
.B \-<number of cars>
Specify the number of cars like `sl -5`.
.PP
.SH SEE ALSO
.BR ls (1)
Expand Down
49 changes: 35 additions & 14 deletions sl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
/* sl version 1.00 : SL runs vomiting out smoke. */
/* by Toyoda Masashi 1992/12/11 */

#include <ctype.h>
#include <curses.h>
#include <signal.h>
#include <unistd.h>
Expand All @@ -55,6 +56,7 @@ int ACCIDENT = 0;
int LOGO = 0;
int FLY = 0;
int C51 = 0;
int NUMBER = -1;

int my_mvaddstr(int y, int x, char *str)
{
Expand All @@ -70,13 +72,17 @@ void option(char *str)
extern int ACCIDENT, LOGO, FLY, C51;

while (*str != '\0') {
switch (*str++) {
switch (*str) {
case 'a': ACCIDENT = 1; break;
case 'F': FLY = 1; break;
case 'l': LOGO = 1; break;
case 'c': C51 = 1; break;
default: break;
default:
if (isdigit(*str))
NUMBER = (NUMBER < 0 ? 0 : NUMBER*10) + *str - '0';
break;
}
str++;
}
}

Expand Down Expand Up @@ -134,25 +140,30 @@ int add_sl(int x)
static char *car[LOGOHEIGHT + 1]
= {LCAR1, LCAR2, LCAR3, LCAR4, LCAR5, LCAR6, DELLN};

int i, y, py1 = 0, py2 = 0, py3 = 0;
if (NUMBER < 0)
NUMBER = 2;

int i, j, y, py = 0;
int LOGOLENGTH = 42 + 21*NUMBER;

if (x < - LOGOLENGTH) return ERR;
y = LINES / 2 - 3;

if (FLY == 1) {
y = (x / 6) + LINES - (COLS / 6) - LOGOHEIGHT;
py1 = 2; py2 = 4; py3 = 6;
py = 2;
}
for (i = 0; i <= LOGOHEIGHT; ++i) {
my_mvaddstr(y + i, x, sl[(LOGOLENGTH + x) / 3 % LOGOPATTERNS][i]);
my_mvaddstr(y + i + py1, x + 21, coal[i]);
my_mvaddstr(y + i + py2, x + 42, car[i]);
my_mvaddstr(y + i + py3, x + 63, car[i]);
my_mvaddstr(y + i + py, x + 21, coal[i]);
for (j = 2; j <= NUMBER + 1; ++j)
my_mvaddstr(y + i + py*j, x + 21*j, car[i]);
}
if (ACCIDENT == 1) {
add_man(y + 1, x + 14);
add_man(y + 1 + py2, x + 45); add_man(y + 1 + py2, x + 53);
add_man(y + 1 + py3, x + 66); add_man(y + 1 + py3, x + 74);
for (j = 2; j <= NUMBER + 1; ++j) {
add_man(y + 1 + py*j, x + 3 + 21*j); add_man(y + 1 + py*j, x + 11 + 21*j);
}
}
add_smoke(y - 1, x + LOGOFUNNEL);
return OK;
Expand All @@ -178,7 +189,11 @@ int add_D51(int x)
= {COAL01, COAL02, COAL03, COAL04, COAL05,
COAL06, COAL07, COAL08, COAL09, COAL10, COALDEL};

int y, i, dy = 0;
if (NUMBER < 0)
NUMBER = 1;

int y, i, j, dy = 0;
int D51LENGTH = 54 + 29*NUMBER;

if (x < - D51LENGTH) return ERR;
y = LINES / 2 - 5;
Expand All @@ -189,7 +204,8 @@ int add_D51(int x)
}
for (i = 0; i <= D51HEIGHT; ++i) {
my_mvaddstr(y + i, x, d51[(D51LENGTH + x) % D51PATTERNS][i]);
my_mvaddstr(y + i + dy, x + 53, coal[i]);
for (j = 1; j <= NUMBER; ++j)
my_mvaddstr(y + i + dy*j, x + 24 + 29*j, coal[i]);
}
if (ACCIDENT == 1) {
add_man(y + 2, x + 43);
Expand Down Expand Up @@ -218,7 +234,11 @@ int add_C51(int x)
= {COALDEL, COAL01, COAL02, COAL03, COAL04, COAL05,
COAL06, COAL07, COAL08, COAL09, COAL10, COALDEL};

int y, i, dy = 0;
if (NUMBER < 0)
NUMBER = 1;

int y, i, j, dy = 0;
int C51LENGTH = 58 + 29*NUMBER;

if (x < - C51LENGTH) return ERR;
y = LINES / 2 - 5;
Expand All @@ -229,7 +249,8 @@ int add_C51(int x)
}
for (i = 0; i <= C51HEIGHT; ++i) {
my_mvaddstr(y + i, x, c51[(C51LENGTH + x) % C51PATTERNS][i]);
my_mvaddstr(y + i + dy, x + 55, coal[i]);
for (j = 1; j <= NUMBER; j++)
my_mvaddstr(y + i + dy*j, x + 26 + 29*j, coal[i]);
}
if (ACCIDENT == 1) {
add_man(y + 3, x + 45);
Expand All @@ -246,7 +267,7 @@ void add_man(int y, int x)
int i;

for (i = 0; i < 2; ++i) {
my_mvaddstr(y + i, x, man[(LOGOLENGTH + x) / 12 % 2][i]);
my_mvaddstr(y + i, x, man[(42 + 21*NUMBER + x) / 12 % 2][i]);
}
}

Expand Down
3 changes: 0 additions & 3 deletions sl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@

#define D51HEIGHT 10
#define D51FUNNEL 7
#define D51LENGTH 83
#define D51PATTERNS 6


Expand Down Expand Up @@ -62,7 +61,6 @@

#define LOGOHEIGHT 6
#define LOGOFUNNEL 4
#define LOGOLENGTH 84
#define LOGOPATTERNS 6

#define LOGO1 " ++ +------ "
Expand Down Expand Up @@ -106,7 +104,6 @@

#define C51HEIGHT 11
#define C51FUNNEL 7
#define C51LENGTH 87
#define C51PATTERNS 6

#define C51DEL " "
Expand Down