diff -rcN sl/Makefile sl5/Makefile
*** sl/Makefile	Wed Jul 22 23:00:41 1998
--- sl5/Makefile	Sat Jul  3 00:00:45 1999
***************
*** 5,14 ****
  #	Last Modified: 1998/ 7/22
  #==========================================
  
! CC=cc
! CFLAGS=-O
  
! sl: sl.c sl.h
! 	$(CC) $(CFLAGS) -o sl sl.c -lcurses -ltermcap
! #	$(CC) $(CFLAGS) -o sl sl.c -lcurses
  
--- 5,18 ----
  #	Last Modified: 1998/ 7/22
  #==========================================
  
! CC = gcc
! CFLAGS = -Wall -O # -DDEBUG
! LDFLAGS = -lcurses -ltermcap
! all: sl
  
! # For Solaris
! sl: sl.c sl.h header.h Makefile
! 	$(CC) $(CFLAGS) -o sl sl.c $(LDFLAGS)
  
+ clean:
+ 	-rm -f sl sl.o core
diff -rcN sl/README.patch5 sl5/README.patch5
*** sl/README.patch5	Thu Jan  1 09:00:00 1970
--- sl5/README.patch5	Sat Jul  3 00:07:54 1999
***************
*** 0 ****
--- 1,43 ----
+ 
+ sl5.patch について
+ 
+ 					1999 年 7 月 3 日
+ 					東京都立科学技術大学 泉
+ 
+ 
+ ・はじめに
+ 
+ このパッチは東工大の豊田さん作 sl に新機能を追加するためのパッチです.
+ 新機能としては,
+ 
+ (1) 踏切の追加
+ (2) 客車の追加
+ (3) 列車の往復
+ (4) 客車の数の乱数による決定
+ (5) 列車のスピードの乱数による決定
+ (6) 列車の往復の有無を乱数によって決定
+ (7) 列車が往復する場合は, 遮断機が一度上がりかけてから再び降りる機能
+ (8) D51 三重連 (本当は貨物列車です)
+ 
+ があります.  (1)〜(3),(7),(8) は泉による改造, (4)〜(6) は阪大の上田さ
+ んと秋山さんによる改造です.  上田さん, 秋山さんありがとうございます.
+ また, JAIST の田中さんに sl -aF を実行したとき core dump するという報
+ 告をいただき, 修正を施しました.  田中さんありがとうございます.
+ 
+ 動作確認は以下の OS でしてあります.
+ 
+ sparc-sun-solaris 2.3 
+ sparc-sun-solaris 2.4 
+ sparc-sun-solaris 2.6 
+ ix86-unknown-linux 2.0 (Slackware 3.5) 
+ 
+ ・作り方
+ 
+ % tar zxvf sl.tgz
+ % cd sl
+ % patch -p1 < ../sl5.patch
+ % make
+ 
+ でバイナリ sl ができるはずです.  Solaris 2.3, 2.4 では Makefile の 
+ LDFLAGS に「-lucb -L/usr/ucblib」を加えないとコンパイルできないと思い
+ ます.
diff -rcN sl/header.h sl5/header.h
*** sl/header.h	Thu Jan  1 09:00:00 1970
--- sl5/header.h	Fri Jul  2 23:35:24 1999
***************
*** 0 ****
--- 1,14 ----
+ /*                   *
+  *                   *
+  *                   */
+ 
+ extern int add_D51_coach();
+ extern int add_D51_coach_r();
+ extern int add_sl();
+ extern int add_man();
+ extern int add_smoke();
+ extern int add_smoke_r();
+ extern int add_cross();
+ extern int begin_gate();
+ extern int end_gate();
+ extern int x_gate();
diff -rcN sl/sl.c sl5/sl.c
*** sl/sl.c	Wed Jul 22 23:01:01 1998
--- sl5/sl.c	Fri Jul  2 23:58:49 1999
***************
*** 27,53 ****
  /* sl version 1.00 : SL runs vomitting out smoke.                            */
  /*						by Toyoda Masashi 1992/12/11 */
  
  #include <curses.h>
  #include <signal.h>
  #include <unistd.h>
  #include "sl.h"
  
  int ACCIDENT  = 0;
  int LOGO      = 0;
  int FLY       = 0;
  
  int my_mvaddstr(int y, int x, char *str)
  {
!     for ( ; x < 0; ++x, ++str)
! 	if (*str == '\0')  return ERR;
!     for ( ; *str != '\0'; ++str, ++x)
! 	if (mvaddch(y, x, *str) == ERR)  return ERR;
!     return OK;
  }
  
  void option(char *str)
  {
!     extern int ACCIDENT, FLY, LONG;
  
      while (*str != '\0') {
  	switch (*str++) {
--- 27,119 ----
  /* sl version 1.00 : SL runs vomitting out smoke.                            */
  /*						by Toyoda Masashi 1992/12/11 */
  
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <time.h>
  #include <curses.h>
  #include <signal.h>
  #include <unistd.h>
  #include "sl.h"
+ #include "header.h"
+ 
+ #define RTOL 0
+ #define LTOR 1
+ 
+ #ifndef useconds_t
+   #define USLEEP_ARG0_TYPE unsigned
+ #else
+   #define USLEEP_ARG0_TYPE useconds_t
+ #endif
  
  int ACCIDENT  = 0;
  int LOGO      = 0;
  int FLY       = 0;
+ int PASSNUM = 5;
+ int ALL_LENGTH = 0;
+ int DIREC = RTOL;
+ int WAIT_TIME = 20000;
  
  int my_mvaddstr(int y, int x, char *str)
  {
!   int i = 0;
! 
!   for ( ; x < 0; ++x, ++i) {
!     if (str[i] == '\0') {
!       return ERR;
!     }
!   }
!   for ( ; str[i] != '\0'; ++i, ++x) {
!     if (mvaddch(y, x, str[i]) == ERR) {
!       return ERR;
!     }
!   }
! 
!   return OK;
! }
! 
! int my_mvaddstr_r(int y, int x, char *str)
! {
!   int i = 0;
!   char c;
! 
!   for ( ; x >= COLS; --x, ++i) {
!     if (str[i] == '\0') {
!       return ERR;
!     }
!   }
!   for ( ; str[i] != '\0'; ++i, --x) {
!     c = str[i];
!     switch (c) {
!     case '\\':
!       c = '/';
!       break;
!     case '/':
!       c = '\\';
!       break;
!     case '(':
!       c = ')';
!       break;
!     case ')':
!       c = '(';
!       break;
!     case '[':
!       c = ']';
!       break;
!     case ']':
!       c = '[';
!       break;
!     }
!     if (mvaddch(y, x, c) == ERR) {
!       return ERR;
!     }
!   }
! 
!   return OK;
  }
  
  void option(char *str)
  {
!     extern int ACCIDENT, FLY;
  
      while (*str != '\0') {
  	switch (*str++) {
***************
*** 59,109 ****
      }
  }
  
! void main(int argc, char *argv[])
  {
!     int x, i;
  
      for (i = 1; i < argc; ++i) {
  	if (*argv[i] == '-') {
  	    option(argv[i] + 1);
  	}
      }
!     initscr();
      signal(SIGINT, SIG_IGN);
      noecho();
      leaveok(stdscr, TRUE);
      scrollok(stdscr, FALSE);
! 
!     for (x = COLS - 1; ; --x) {
! 	if (LOGO == 0) {
! 	    if (add_D51(x) == ERR) break;
! 	} else {
! 	    if (add_sl(x) == ERR) break;
! 	}
  	refresh();
! 	usleep(20000);
      }
      mvcur(0, COLS - 1, LINES - 1, 0);
      endwin();
  }
  
  
! int add_sl(int x)
  {
!     static char *sl[LOGOPATTERNS][LOGOHIGHT + 1]
! 	= {{LOGO1, LOGO2, LOGO3, LOGO4, LWHL11, LWHL12, DELLN},
! 	   {LOGO1, LOGO2, LOGO3, LOGO4, LWHL21, LWHL22, DELLN},
! 	   {LOGO1, LOGO2, LOGO3, LOGO4, LWHL31, LWHL32, DELLN},
! 	   {LOGO1, LOGO2, LOGO3, LOGO4, LWHL41, LWHL42, DELLN},
! 	   {LOGO1, LOGO2, LOGO3, LOGO4, LWHL51, LWHL52, DELLN},
! 	   {LOGO1, LOGO2, LOGO3, LOGO4, LWHL61, LWHL62, DELLN}};
  
!     static char *coal[LOGOHIGHT + 1]
! 	= {LCOAL1, LCOAL2, LCOAL3, LCOAL4, LCOAL5, LCOAL6, DELLN};
  
!     static char *car[LOGOHIGHT + 1]
! 	= {LCAR1, LCAR2, LCAR3, LCAR4, LCAR5, LCAR6, DELLN};
  
      int i, y, py1 = 0, py2 = 0, py3 = 0;
      
      if (x < - LOGOLENGTH)  return ERR;
--- 125,489 ----
      }
  }
  
! int dirc(int y, int x)
  {
!   if (DIREC == RTOL) {
!     my_mvaddstr(y + 5, cros0l[5] + x - 1, "<-- ");
!   } else {
!     my_mvaddstr(y + 5, cros0l[5] + x - 1, " -->");
!   }
! 
!   return 0;
! }
! 
! int main(int argc, char *argv[])
! {
!     int x, i, p, ONEDIREC;
!     time_t t;
!     unsigned short int s;
  
      for (i = 1; i < argc; ++i) {
  	if (*argv[i] == '-') {
  	    option(argv[i] + 1);
  	}
      }
!     time(&t);
!     s = (unsigned short int)t;
!     seed48(&s);
! #ifdef DEBUG
!     PASSNUM = 2;
!     ONEDIREC = 1;
!     WAIT_TIME = (USLEEP_ARG0_TYPE)100;
! #else
      signal(SIGINT, SIG_IGN);
+     PASSNUM = (int)(drand48() * 20.0) + 10;
+     if (drand48() > 0.5) {
+       ONEDIREC = 1;
+     } else {
+       ONEDIREC = 0;
+     }
+     WAIT_TIME = (USLEEP_ARG0_TYPE)(drand48() * 50000.0);
+ #endif
+     ALL_LENGTH = (3 * D51LENGTH + (PASSLENGTH * (PASSNUM - 1)) + LPASSLENGTH);
+     initscr();
      noecho();
      leaveok(stdscr, TRUE);
      scrollok(stdscr, FALSE);
!     DIREC = RTOL;
!     p = 3 * COLS / 10;
!     if (FLY != 1) {
!       begin_gate(p);
!     }
!     for (x = COLS - 1 ; ; --x) {
!       if (LOGO == 0) {
! 	if (add_D51_coach(x) == ERR) break;
!       } else {
! 	if (add_sl(x) == ERR) break;
!       }
!       if (FLY != 1) {
! 	if (add_cross(p) == ERR) break;
!       }
!       refresh();
!       usleep((USLEEP_ARG0_TYPE)WAIT_TIME);
!     }
!     if (FLY != 1 && LOGO == 0 && ONEDIREC == 1) {
!       x_gate(p);
!       for (x = 0; ; ++x) {
! 	if (add_D51_coach_r(x) == ERR) break;
! 	if (add_cross(p) == ERR) break;
  	refresh();
! 	usleep((USLEEP_ARG0_TYPE)WAIT_TIME);
!       }
!     }
!     if (FLY != 1) {
!       end_gate(p);
      }
      mvcur(0, COLS - 1, LINES - 1, 0);
      endwin();
+ 
+     return 0;
  }
  
+ int add_cross(int p)
+ {
+   int i, y, n = 20, hn;
+   static int tt;
  
!   hn = n / 2;
!   if ( LOGO == 0) {
!     y = LINES / 2 - 5;
!   } else {
!     y = LINES / 2 - 7;
!   }
!   for (i = 2; i < D51HIGHT; ++i) {
!     my_mvaddstr(y + i, cros0l[i] + p, cros0[i]);
!   }
!   for (i = 8; i < D51HIGHT; ++i) {
!     my_mvaddstr(y + i, p + 5, cros3[i]);
!   }
!   if ( tt % n >= 0 && tt % n < hn) {
!     my_mvaddstr(y + 4, cros0l[5] + p - 1, "O");
!     my_mvaddstr(y + 4, cros0l[5] + p + 2, "X");
!     my_mvaddstr(y + 5, cros0l[5] + p - 1, " || ");
!   } else if ( tt % n >= hn && tt % n < n) {
!     my_mvaddstr(y + 4, cros0l[5] + p - 1, "X");
!     my_mvaddstr(y + 4, cros0l[5] + p + 2, "O");
!     dirc(y, p);
!   }
!   ++tt;
! 
!   return 0;
! }
! 
! 
! int begin_gate(int p)
! {
!   int i, y, n = 20, hn;
!   int tt;
! 
!   hn = n / 2;
!   if ( LOGO == 0) {
!     y = LINES / 2 - 5;
!   } else {
!     y = LINES / 2 - 7;
!   }
!   
!   for (tt = 0; tt < 80; ++tt) {
!     for (i = 0; i < D51HIGHT; ++i) {
!       my_mvaddstr(y + i, p + 5, cros1[i]);
!     }
!     for (i = 2; i < D51HIGHT; ++i) {
!       my_mvaddstr(y + i, cros0l[i] + p, cros0[i]);
!     }
!     if ( tt % n >= 0 && tt % n < hn) {
!       my_mvaddstr(y + 4, cros0l[5] + p - 1, "O");
!       my_mvaddstr(y + 4, cros0l[5] + p + 2, "X");
!       my_mvaddstr(y + 5, cros0l[5] + p - 1, " || ");
!     } else if ( tt % n >= hn && tt % n < n) {
!       my_mvaddstr(y + 4, cros0l[5] + p - 1, "X");
!       my_mvaddstr(y + 4, cros0l[5] + p + 2, "O");
!       dirc(y, p);
!     }
!     my_mvaddstr(LINES + 1, COLS + 1, "");
!     refresh();
!     usleep((USLEEP_ARG0_TYPE)WAIT_TIME);
!   }
!   for (tt = 0; tt <= 15; ++tt) {
!     for (i = 0; i < D51HIGHT; ++i) {
!       my_mvaddstr(y + i, p + 5, cros2[i]);
!     }
!     for (i = 2; i < D51HIGHT; ++i) {
!       my_mvaddstr(y + i, cros0l[i] + p, cros0[i]);
!     }
!     if ( tt % n >= 0 && tt % n < hn) {
!       my_mvaddstr(y + 4, cros0l[5] + p - 1, "O");
!       my_mvaddstr(y + 4, cros0l[5] + p + 2, "X");
!       my_mvaddstr(y + 5, cros0l[5] + p - 1, " || ");
!     } else if ( tt % n >= hn && tt % n < n) {
!       my_mvaddstr(y + 4, cros0l[5] + p - 1, "X");
!       my_mvaddstr(y + 4, cros0l[5] + p + 2, "O");
!       dirc(y, p);
!     }
!     my_mvaddstr(LINES + 1, COLS + 1, "");
!     refresh();
!     usleep((USLEEP_ARG0_TYPE)WAIT_TIME);
!   }
!   for (tt = 0; tt <= 20; ++tt) {
!     for (i = 0; i < D51HIGHT; ++i) {
!       my_mvaddstr(y + i, p + 5, cros3[i]);
!     }
!     for (i = 2; i < D51HIGHT; ++i) {
!       my_mvaddstr(y + i, cros0l[i] + p, cros0[i]);
!     }
!     if ( tt % n >= 0 && tt % n < hn) {
!       my_mvaddstr(y + 4, cros0l[5] + p - 1, "O");
!       my_mvaddstr(y + 4, cros0l[5] + p + 2, "X");
!       my_mvaddstr(y + 5, cros0l[5] + p - 1, " || ");
!     } else if ( tt % n >= hn && tt % n < n) {
!       my_mvaddstr(y + 4, cros0l[5] + p - 1, "X");
!       my_mvaddstr(y + 4, cros0l[5] + p + 2, "O");
!       dirc(y, p);
!     }
!     my_mvaddstr(LINES + 1, COLS + 1, "");
!     refresh();
!     usleep((USLEEP_ARG0_TYPE)WAIT_TIME);
!   }
! 
!   return 0;
! }
! 
! 
! int end_gate(int p)
! {
!   int i, y, n = 20, hn;
!   int tt;
! 
!   hn = n / 2;
!   if ( LOGO == 0) {
!     y = LINES / 2 - 5;
!   } else {
!     y = LINES / 2 - 7;
!   }
!   
!   for (tt = 0; tt <= 20; ++tt) {
!     for (i = 0; i < D51HIGHT; ++i) {
!       my_mvaddstr(y + i, p + 5, cros3[i]);
!     }
!     for (i = 2; i < D51HIGHT; ++i) {
!       my_mvaddstr(y + i, cros0l[i] + p, cros0[i]);
!     }
!     if ( tt % n >= 0 && tt % n < hn) {
!       my_mvaddstr(y + 4, cros0l[5] + p - 1, "O");
!       my_mvaddstr(y + 4, cros0l[5] + p + 2, "X");
!       my_mvaddstr(y + 5, cros0l[5] + p - 1, " || ");
!     } else if ( tt % n >= hn && tt % n < n) {
!       my_mvaddstr(y + 4, cros0l[5] + p - 1, "X");
!       my_mvaddstr(y + 4, cros0l[5] + p + 2, "O");
!       dirc(y, p);
!     }
!     my_mvaddstr(LINES + 1, COLS + 1, "");
!     refresh();
!     usleep((USLEEP_ARG0_TYPE)WAIT_TIME);
!   }
!   for (tt = 0; tt <= 15; ++tt) {
!     for (i = 0; i < D51HIGHT; ++i) {
!       my_mvaddstr(y + i, p + 5, cros2[i]);
!     }
!     for (i = 2; i < D51HIGHT; ++i) {
!       my_mvaddstr(y + i, cros0l[i] + p, cros0[i]);
!     }
!     if ( tt % n >= 0 && tt % n < hn) {
!       my_mvaddstr(y + 4, cros0l[5] + p - 1, "O");
!       my_mvaddstr(y + 4, cros0l[5] + p + 2, "X");
!       my_mvaddstr(y + 5, cros0l[5] + p - 1, " || ");
!     } else if ( tt % n >= hn && tt % n < n) {
!       my_mvaddstr(y + 4, cros0l[5] + p - 1, "X");
!       my_mvaddstr(y + 4, cros0l[5] + p + 2, "O");
!       dirc(y, p);
!     }
!     my_mvaddstr(LINES + 1, COLS + 1, "");
!     refresh();
!     usleep((USLEEP_ARG0_TYPE)WAIT_TIME);
!   }
!   for (tt = 0; tt < 80; ++tt) {
!     for (i = 0; i < D51HIGHT; ++i) {
!       my_mvaddstr(y + i, p + 5, cros1[i]);
!     }
!     for (i = 2; i < D51HIGHT; ++i) {
!       my_mvaddstr(y + i, cros0l[i] + p, cros0[i]);
!     }
!     my_mvaddstr(y + 4, cros0l[5] + p - 1, "X");
!     my_mvaddstr(y + 4, cros0l[5] + p + 2, "X");
!     my_mvaddstr(LINES + 1, COLS + 1, "");
!     my_mvaddstr(y + 5, cros0l[5] + p - 1, " || ");
!     refresh();
!     usleep((USLEEP_ARG0_TYPE)WAIT_TIME);
!   }
! 
!   return 0;
! }
! 
! 
! int x_gate(int p)
  {
!   int i, y, n = 20, hn;
!   int tt;
  
!   hn = n / 2;
!   if ( LOGO == 0) {
!     y = LINES / 2 - 5;
!   } else {
!     y = LINES / 2 - 7;
!   }
!   
!   for (tt = 0; tt <= 20; ++tt) {
!     for (i = 0; i < D51HIGHT; ++i) {
!       my_mvaddstr(y + i, p + 5, cros3[i]);
!     }
!     for (i = 2; i < D51HIGHT; ++i) {
!       my_mvaddstr(y + i, cros0l[i] + p, cros0[i]);
!     }
!     if ( tt % n >= 0 && tt % n < hn) {
!       my_mvaddstr(y + 4, cros0l[5] + p - 1, "O");
!       my_mvaddstr(y + 4, cros0l[5] + p + 2, "X");
!       my_mvaddstr(y + 5, cros0l[5] + p - 1, " || ");
!     } else if ( tt % n >= hn && tt % n < n) {
!       my_mvaddstr(y + 4, cros0l[5] + p - 1, "X");
!       my_mvaddstr(y + 4, cros0l[5] + p + 2, "O");
!       dirc(y, p);
!     }
!     my_mvaddstr(LINES + 1, COLS + 1, "");
!     refresh();
!     usleep((USLEEP_ARG0_TYPE)WAIT_TIME);
!   }
!   for (tt = 0; tt <= 10; ++tt) {
!     for (i = 0; i < D51HIGHT; ++i) {
!       my_mvaddstr(y + i, p + 5, cros2[i]);
!     }
!     for (i = 2; i < D51HIGHT; ++i) {
!       my_mvaddstr(y + i, cros0l[i] + p, cros0[i]);
!     }
!     if ( tt % n >= 0 && tt % n < hn) {
!       my_mvaddstr(y + 4, cros0l[5] + p - 1, "O");
!       my_mvaddstr(y + 4, cros0l[5] + p + 2, "X");
!       my_mvaddstr(y + 5, cros0l[5] + p - 1, " || ");
!     } else if ( tt % n >= hn && tt % n < n) {
!       my_mvaddstr(y + 4, cros0l[5] + p - 1, "X");
!       my_mvaddstr(y + 4, cros0l[5] + p + 2, "O");
!       dirc(y, p);
!     }
!     my_mvaddstr(LINES + 1, COLS + 1, "");
!     refresh();
!     usleep((USLEEP_ARG0_TYPE)WAIT_TIME);
!   }
!   DIREC = ( DIREC + 1 ) % 2;
!   for (tt = 0; tt <= 10; ++tt) {
!     for (i = 0; i < D51HIGHT; ++i) {
!       my_mvaddstr(y + i, p + 5, cros2[i]);
!     }
!     for (i = 2; i < D51HIGHT; ++i) {
!       my_mvaddstr(y + i, cros0l[i] + p, cros0[i]);
!     }
!     if ( tt % n >= 0 && tt % n < hn) {
!       my_mvaddstr(y + 4, cros0l[5] + p - 1, "O");
!       my_mvaddstr(y + 4, cros0l[5] + p + 2, "X");
!       my_mvaddstr(y + 5, cros0l[5] + p - 1, " || ");
!     } else if ( tt % n >= hn && tt % n < n) {
!       my_mvaddstr(y + 4, cros0l[5] + p - 1, "X");
!       my_mvaddstr(y + 4, cros0l[5] + p + 2, "O");
!       dirc(y, p);
!     }
!     my_mvaddstr(LINES + 1, COLS + 1, "");
!     refresh();
!     usleep((USLEEP_ARG0_TYPE)WAIT_TIME);
!   }
!   for (tt = 0; tt <= 20; ++tt) {
!     for (i = 0; i < D51HIGHT; ++i) {
!       my_mvaddstr(y + i, p + 5, cros3[i]);
!     }
!     for (i = 2; i < D51HIGHT; ++i) {
!       my_mvaddstr(y + i, cros0l[i] + p, cros0[i]);
!     }
!     if ( tt % n >= 0 && tt % n < hn) {
!       my_mvaddstr(y + 4, cros0l[5] + p - 1, "O");
!       my_mvaddstr(y + 4, cros0l[5] + p + 2, "X");
!       my_mvaddstr(y + 5, cros0l[5] + p - 1, " || ");
!     } else if ( tt % n >= hn && tt % n < n) {
!       my_mvaddstr(y + 4, cros0l[5] + p - 1, "X");
!       my_mvaddstr(y + 4, cros0l[5] + p + 2, "O");
!       dirc(y, p);
!     }
!     my_mvaddstr(LINES + 1, COLS + 1, "");
!     refresh();
!     usleep((USLEEP_ARG0_TYPE)WAIT_TIME);
!   }
  
!   return 0;
! }
  
+ 
+ int add_sl(int x)
+ {
      int i, y, py1 = 0, py2 = 0, py3 = 0;
      
      if (x < - LOGOLENGTH)  return ERR;
***************
*** 115,121 ****
      }
      for (i = 0; i <= LOGOHIGHT; ++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]);
      }
--- 495,501 ----
      }
      for (i = 0; i <= LOGOHIGHT; ++i) {
  	my_mvaddstr(y + i, x, sl[(LOGOLENGTH + x) / 3 % LOGOPATTERNS][i]);
! 	my_mvaddstr(y + i + py1, x + 21, lcoal[i]);
  	my_mvaddstr(y + i + py2, x + 42, car[i]);
  	my_mvaddstr(y + i + py3, x + 63, car[i]);
      }
***************
*** 129,156 ****
  }
  
  
! add_D51(int x)
  {
!     static char *d51[D51PATTERNS][D51HIGHT + 1]
! 	= {{D51STR1, D51STR2, D51STR3, D51STR4, D51STR5, D51STR6, D51STR7,
! 	    D51WHL11, D51WHL12, D51WHL13, D51DEL},
! 	   {D51STR1, D51STR2, D51STR3, D51STR4, D51STR5, D51STR6, D51STR7,
! 	    D51WHL21, D51WHL22, D51WHL23, D51DEL},
! 	   {D51STR1, D51STR2, D51STR3, D51STR4, D51STR5, D51STR6, D51STR7,
! 	    D51WHL31, D51WHL32, D51WHL33, D51DEL},
! 	   {D51STR1, D51STR2, D51STR3, D51STR4, D51STR5, D51STR6, D51STR7,
! 	    D51WHL41, D51WHL42, D51WHL43, D51DEL},
! 	   {D51STR1, D51STR2, D51STR3, D51STR4, D51STR5, D51STR6, D51STR7,
! 	    D51WHL51, D51WHL52, D51WHL53, D51DEL},
! 	   {D51STR1, D51STR2, D51STR3, D51STR4, D51STR5, D51STR6, D51STR7,
! 	    D51WHL61, D51WHL62, D51WHL63, D51DEL}};
!     static char *coal[D51HIGHT + 1]
! 	= {COAL01, COAL02, COAL03, COAL04, COAL05,
! 	   COAL06, COAL07, COAL08, COAL09, COAL10, COALDEL};
  
!     int y, i, dy = 0;
! 
!     if (x < - D51LENGTH)  return ERR;
      y = LINES / 2 - 5;
  
      if (FLY == 1) {
--- 509,520 ----
  }
  
  
! int add_D51_coach(int x)
  {
!     int y, i, j, dy = 0;
!     char num[10];
  
!     if (x < - ALL_LENGTH)  return ERR;
      y = LINES / 2 - 5;
  
      if (FLY == 1) {
***************
*** 158,171 ****
  	dy = 1;
      }
      for (i = 0; i <= D51HIGHT; ++i) {
! 	my_mvaddstr(y + i, x, d51[(D51LENGTH + x) % D51PATTERNS][i]);
  	my_mvaddstr(y + i + dy, x + 53, coal[i]);
      }
      if (ACCIDENT == 1) {
  	add_man(y + 2, x + 43);
  	add_man(y + 2, x + 47);
      }
      add_smoke(y - 1, x + D51FUNNEL);
      return OK;
  }
  
--- 522,592 ----
  	dy = 1;
      }
      for (i = 0; i <= D51HIGHT; ++i) {
! 	my_mvaddstr(y + i, x, d51[(ALL_LENGTH + x) % D51PATTERNS][i]);
  	my_mvaddstr(y + i + dy, x + 53, coal[i]);
+ 	my_mvaddstr(y + i, x + 82, d51[(ALL_LENGTH + x) % D51PATTERNS][i]);
+ 	my_mvaddstr(y + i + dy, x + 135, coal[i]);
+ 	my_mvaddstr(y + i, x + 164, d51[(ALL_LENGTH + x) % D51PATTERNS][i]);
+ 	my_mvaddstr(y + i + dy, x + 217, coal[i]);
+         for (j = 0; j < PASSNUM - 1; ++j) {
+ 	  my_mvaddstr(y + i + dy * (j + 2), x + 246 + (PASSLENGTH * j), coach[i]);
+           if ( i == 3 ) {
+ 	    sprintf(num, "%d", j + 1);
+ 	    my_mvaddstr(y + i + dy * (j + 2), x + 254 + (PASSLENGTH * j), num);
+ 	  }
+         }
+ 	my_mvaddstr(y + i + dy * (j + 2), x + 246 + (PASSLENGTH * (PASSNUM - 1)), lcoach[i]);
+ 	if ( i == 3 ) {
+ 	  sprintf(num, "%d", j + 1);
+ 	  my_mvaddstr(y + i + dy * (j + 2), x + 254 + (PASSLENGTH * (PASSNUM - 1)), num);
+ 	}
      }
      if (ACCIDENT == 1) {
  	add_man(y + 2, x + 43);
  	add_man(y + 2, x + 47);
      }
      add_smoke(y - 1, x + D51FUNNEL);
+     add_smoke(y - 1, x + D51FUNNEL + 82);
+     add_smoke(y - 1, x + D51FUNNEL + 164);
+     return OK;
+ }
+ 
+ 
+ int add_D51_coach_r(int x)
+ {
+     int y, i, j;
+     char num[10];
+ 
+     if (x > ALL_LENGTH + COLS)  return ERR;
+     y = LINES / 2 - 5;
+ 
+     for (i = 0; i <= D51HIGHT; ++i) {
+ 	my_mvaddstr_r(y + i, x, d51_r[(ALL_LENGTH + x) % D51PATTERNS][i]);
+ 	my_mvaddstr_r(y + i, x - 53, coal[i]);
+ 	my_mvaddstr_r(y + i, x - 82, d51_r[(ALL_LENGTH + x) % D51PATTERNS][i]);
+ 	my_mvaddstr_r(y + i, x - 135, coal[i]);
+ 	my_mvaddstr_r(y + i, x - 164, d51_r[(ALL_LENGTH + x) % D51PATTERNS][i]);
+ 	my_mvaddstr_r(y + i, x - 217, coal[i]);
+         for (j = 0; j < PASSNUM - 1; ++j) {
+ 	  my_mvaddstr_r(y + i, x - 246 - (PASSLENGTH * j), coach[i]);
+           if ( i == 3 ) {
+ 	    sprintf(num, "%d", j + 1);
+ 	    my_mvaddstr(y + i, x - 255 - (PASSLENGTH * j), num);
+ 	  }
+         }
+ 	my_mvaddstr_r(y + i, x - 246 - (PASSLENGTH * (PASSNUM - 1)), lcoach[i]);
+ 	if ( i == 3 ) {
+ 	  sprintf(num, "%d", j + 1);
+ 	  my_mvaddstr(y + i, x - 255 - (PASSLENGTH * (PASSNUM - 1)), num);
+ 	}
+     }
+     if (ACCIDENT == 1) {
+ 	add_man(y + 2, x - 45);
+ 	add_man(y + 2, x - 49);
+     }
+     add_smoke_r(y - 1, x - D51FUNNEL - 3);
+     add_smoke_r(y - 1, x - D51FUNNEL - 85);
+     add_smoke_r(y - 1, x - D51FUNNEL - 169);
      return OK;
  }
  
***************
*** 175,183 ****
--- 596,608 ----
      static char *man[2][2] = {{"", "(O)"}, {"Help!", "\\O/"}};
      int i;
  
+     if ( x < 0 ) {
+       return 0;
+     }
      for (i = 0; i < 2; ++i) {
  	my_mvaddstr(y + i, x, man[(LOGOLENGTH + x) / 12 % 2][i]);
      }
+     return 0;
  }
  
  
***************
*** 222,225 ****
--- 647,696 ----
  	S[sum].ptrn = 0; S[sum].kind = sum % 2;
  	sum ++;
      }
+     return 0;
+ }
+ 
+ 
+ int add_smoke_r(int y, int x)
+ #define SMOKEPTNS	16
+ {
+     static struct smokes {
+ 	int y, x;
+ 	int ptrn, kind;
+     } S[1000];
+     static int sum = 0;
+     static char *Smoke[2][SMOKEPTNS]
+ 	= {{"(   )", "(    )", "(    )", "(   )", "(  )",
+ 	    "(  )" , "( )"   , "( )"   , "()"   , "()"  ,
+ 	    "O"    , "O"     , "O"     , "O"    , "O"   ,
+ 	    " "                                          },
+ 	   {"(@@@)", "(@@@@)", "(@@@@)", "(@@@)", "(@@)",
+ 	    "(@@)" , "(@)"   , "(@)"   , "@@"   , "@@"  ,
+ 	    "@"    , "@"     , "@"     , "@"    , "@"   ,
+ 	    " "                                          }};
+     static char *Eraser[SMOKEPTNS]
+ 	=  {"     ", "      ", "      ", "     ", "    ",
+ 	    "    " , "   "   , "   "   , "  "   , "  "  ,
+ 	    " "    , " "     , " "     , " "    , " "   ,
+ 	    " "                                          };
+     static int dy[SMOKEPTNS] = { 2,  1, 1, 1, 0, 0, 0, 0, 0, 0,
+ 				 0,  0, 0, 0, 0, 0             };
+     static int dx[SMOKEPTNS] = {-2, -1, 0, 1, 1, 1, 1, 1, 2, 2,
+ 				 2,  2, 2, 3, 3, 3             };
+     int i;
+ 
+     if (x % 4 == 0) {
+ 	for (i = 0; i < sum; ++i) {
+ 	    my_mvaddstr_r(S[i].y, S[i].x, Eraser[S[i].ptrn]);
+ 	    S[i].y    -= dy[S[i].ptrn];
+ 	    S[i].x    -= dx[S[i].ptrn];
+ 	    S[i].ptrn += (S[i].ptrn < SMOKEPTNS - 1) ? 1 : 0;
+ 	    my_mvaddstr_r(S[i].y, S[i].x, Smoke[S[i].kind][S[i].ptrn]);
+ 	}
+ 	my_mvaddstr(y, x, Smoke[sum % 2][0]);
+ 	S[sum].y = y;    S[sum].x = x;
+ 	S[sum].ptrn = 0; S[sum].kind = sum % 2;
+ 	sum ++;
+     }
+     return 0;
  }
diff -rcN sl/sl.h sl5/sl.h
*** sl/sl.h	Wed Jan 19 02:23:24 1994
--- sl5/sl.h	Fri Jul  2 23:35:24 1999
***************
*** 8,14 ****
  
  #define D51HIGHT	10
  #define D51FUNNEL	 7
! #define D51LENGTH       83
  #define D51PATTERNS	 6
  
  
--- 8,15 ----
  
  #define D51HIGHT	10
  #define D51FUNNEL	 7
! /*#define D51LENGTH       82*/
! #define D51LENGTH       172
  #define D51PATTERNS	 6
  
  
***************
*** 46,63 ****
  
  #define D51DEL   "                                                      "
  
! #define COAL01 "                              "
! #define COAL02 "                              "
! #define COAL03 "    _________________         "
! #define COAL04 "   _|                \\_____A  "
! #define COAL05 " =|                        |  "
! #define COAL06 " -|                        |  "
! #define COAL07 "__|________________________|_ "
! #define COAL08 "|__________________________|_ "
! #define COAL09 "   |_D__D__D_|  |_D__D__D_|   "
! #define COAL10 "    \\_/   \\_/    \\_/   \\_/    "
  
! #define COALDEL "                              "
  
  #define LOGOHIGHT    	 6
  #define LOGOFUNNEL  	 4
--- 47,64 ----
  
  #define D51DEL   "                                                      "
  
! #define COAL01 "                             "
! #define COAL02 "                             "
! #define COAL03 "    _________________        "
! #define COAL04 "   _|                \\_____A "
! #define COAL05 " =|                        | "
! #define COAL06 " -|                        | "
! #define COAL07 "__|________________________|_"
! #define COAL08 "|__________________________|_"
! #define COAL09 "   |_D__D__D_|  |_D__D__D_|  "
! #define COAL10 "    \\_/   \\_/    \\_/   \\_/   "
  
! #define COALDEL "                             "
  
  #define LOGOHIGHT    	 6
  #define LOGOFUNNEL  	 4
***************
*** 102,104 ****
--- 103,246 ----
  #define LCAR6  "   (O)        (O)    "
  
  #define DELLN  "                     "
+ 
+ #define PASSLENGTH 88
+ 
+ #define PASS01 "          _____  _____  _____  _____  _____  _____  _____  _____  _____  _____          "
+ #define PASS02 " _________|___|__|___|__|___|__|___|__|___|__|___|__|___|__|___|__|___|__|___|_________ "
+ #define PASS03 "  | ____  _____  _____  _____  _____  _____  _____  _____  _____  _____  _____  ____ |  "
+ #define PASS04 "  | |  |  |   |  |   |  |   |  |   |  |   |  |   |  |   |  |   |  |   |  |   |  |  | |  "
+ #define PASS05 "  | |  |  |___|  |___|  |___|  |___|  |___|  |___|  |___|  |___|  |___|  |___|  |  | |  "
+ #define PASS06 "  | |  |                                                                        |  | |  "
+ #define PASS07 "  | |  |                                   @@                                   |  | |  "
+ #define PASS08 "__|_|__|________________________________________________________________________|__|_|__"
+ #define PASS09 "\\==|_/_\\____/_\\_|  |______|Z          +--|_________________|------+    |_/_\\____/_\\_|==/"
+ #define PASS10 "     \\_/    \\_/                                       +++~~              \\_/    \\_/     "
+ 
+ #define PASSDEL "                                                                                        "
+ 
+ #define LPASSLENGTH 88
+ 
+ #define LPASS01 "          _____  _____  _____  _____  _____  _____  _____  _____  _____  _____           "
+ #define LPASS02 " _________|___|__|___|__|___|__|___|__|___|__|___|__|___|__|___|__|___|__|___|________   "
+ #define LPASS03 "  | ____  _____  _____  _____  _____  _____  _____  _____  _____  _____  ____   _____|   "
+ #define LPASS04 "  | |  |  |   |  |   |  |   |  |   |  |   |  |   |  |   |  |   |  |   |  |  |   |   |    "
+ #define LPASS05 "  | |  |  |___|  |___|  |___|  |___|  |___|  |___|  |___|  |___|  |___|  |  |   |   |    "
+ #define LPASS06 "  | |  |                                                                 |  |   |___|    "
+ #define LPASS07 "  | |  |                                   @@                            |  |   |_|_|    "
+ #define LPASS08 "__|_|__|_________________________________________________________________|__|___|_|_|___ "
+ #define LPASS09 "\\==|_/_\\____/_\\_|  |______|XX                    +-|_______|------+    |_/_\\____/_\\_|==/ "
+ #define LPASS10 "     \\_/    \\_/                                                          \\_/    \\_/      "
+ 
+ #define LPASSDEL "                                                                                         "
+ 
+ #define CROS001 ""
+ #define CROS002 ""
+ #define CROS003 "-_||_-"
+ #define CROS004  "_><_"
+ #define CROS005 "- || -"
+ #define CROS006   "||"
+ #define CROS007   "||"
+ #define CROS008   "||"
+ #define CROS009   "||"
+ #define CROS010 "\\&||~"
+ 
+ static int cros0l[] = {0, 0, 0, 1, 0, 2, 2, 2, 2, 0};
+ 
+ #define CROS101 " |                  "
+ #define CROS102 " |                  "
+ #define CROS103 " |                  "
+ #define CROS104 " |                  "
+ #define CROS105 " |                  "
+ #define CROS106 " |                  "
+ #define CROS107 " |                  "
+ #define CROS108 " |                  "
+ #define CROS109 "_|_                 "
+ #define CROS110 "|||                 "
+ 
+ #define CROS201 "          /         "
+ #define CROS202 "         /          "
+ #define CROS203 "        /           "
+ #define CROS204 "       /            "
+ #define CROS205 "      /             "
+ #define CROS206 "     /              "
+ #define CROS207 "    /               "
+ #define CROS208 "   /                "
+ #define CROS209 "__/                 "
+ #define CROS210 "|/|                 "
+ 
+ #define CROS301 "                    "
+ #define CROS302 "                    "
+ #define CROS303 "                    "
+ #define CROS304 "                    "
+ #define CROS305 "                    "
+ #define CROS306 "                    "
+ #define CROS307 "                    "
+ #define CROS308 "                    "
+ #define CROS309 "___"
+ #define CROS310 "|-+-----------------"
+ 
+ /*#define PASSNUM 5*/
+ /*#define ALL_LENGTH (D51LENGTH + (PASSLENGTH * (PASSNUM - 1)) + LPASSLENGTH)*/
+ 
+ static char *cros0[D51HIGHT]
+ = {CROS001, CROS002, CROS003, CROS004, CROS005,
+    CROS006, CROS007, CROS008, CROS009, CROS010};
+ static char *cros1[D51HIGHT]
+ = {CROS101, CROS102, CROS103, CROS104, CROS105,
+    CROS106, CROS107, CROS108, CROS109, CROS110};
+ static char *cros2[D51HIGHT]
+ = {CROS201, CROS202, CROS203, CROS204, CROS205,
+    CROS206, CROS207, CROS208, CROS209, CROS210};
+ static char *cros3[D51HIGHT]
+ = {CROS301, CROS302, CROS303, CROS304, CROS305,
+    CROS306, CROS307, CROS308, CROS309, CROS310};
+ 
+ static char *sl[LOGOPATTERNS][LOGOHIGHT + 1]
+ = {{LOGO1, LOGO2, LOGO3, LOGO4, LWHL11, LWHL12, DELLN},
+    {LOGO1, LOGO2, LOGO3, LOGO4, LWHL21, LWHL22, DELLN},
+    {LOGO1, LOGO2, LOGO3, LOGO4, LWHL31, LWHL32, DELLN},
+    {LOGO1, LOGO2, LOGO3, LOGO4, LWHL41, LWHL42, DELLN},
+    {LOGO1, LOGO2, LOGO3, LOGO4, LWHL51, LWHL52, DELLN},
+    {LOGO1, LOGO2, LOGO3, LOGO4, LWHL61, LWHL62, DELLN}};
+ static char *lcoal[LOGOHIGHT + 1]
+ = {LCOAL1, LCOAL2, LCOAL3, LCOAL4, LCOAL5, LCOAL6, DELLN};
+ static char *car[LOGOHIGHT + 1]
+ = {LCAR1, LCAR2, LCAR3, LCAR4, LCAR5, LCAR6, DELLN};
+ 
+ static char *d51[D51PATTERNS][D51HIGHT + 1]
+ = {{D51STR1, D51STR2, D51STR3, D51STR4, D51STR5, D51STR6, D51STR7,
+     D51WHL11, D51WHL12, D51WHL13, D51DEL},
+    {D51STR1, D51STR2, D51STR3, D51STR4, D51STR5, D51STR6, D51STR7,
+     D51WHL21, D51WHL22, D51WHL23, D51DEL},
+    {D51STR1, D51STR2, D51STR3, D51STR4, D51STR5, D51STR6, D51STR7,
+     D51WHL31, D51WHL32, D51WHL33, D51DEL},
+    {D51STR1, D51STR2, D51STR3, D51STR4, D51STR5, D51STR6, D51STR7,
+     D51WHL41, D51WHL42, D51WHL43, D51DEL},
+    {D51STR1, D51STR2, D51STR3, D51STR4, D51STR5, D51STR6, D51STR7,
+     D51WHL51, D51WHL52, D51WHL53, D51DEL},
+    {D51STR1, D51STR2, D51STR3, D51STR4, D51STR5, D51STR6, D51STR7,
+     D51WHL61, D51WHL62, D51WHL63, D51DEL}};
+ static char *coal[D51HIGHT + 1]
+ = {COAL01, COAL02, COAL03, COAL04, COAL05,
+    COAL06, COAL07, COAL08, COAL09, COAL10, COALDEL};
+ static char *coach[D51HIGHT + 1]
+ = {PASS01, PASS02, PASS03, PASS04, PASS05,
+    PASS06, PASS07, PASS08, PASS09, PASS10, PASSDEL};
+ static char *lcoach[D51HIGHT + 1]
+ = {LPASS01, LPASS02, LPASS03, LPASS04, LPASS05,
+    LPASS06, LPASS07, LPASS08, LPASS09, LPASS10, LPASSDEL};
+ 
+ static char *d51_r[D51PATTERNS][D51HIGHT + 1]
+ = {{D51STR1, D51STR2, D51STR3, D51STR4, D51STR5, D51STR6, D51STR7,
+     D51WHL11, D51WHL12, D51WHL13, D51DEL},
+    {D51STR1, D51STR2, D51STR3, D51STR4, D51STR5, D51STR6, D51STR7,
+     D51WHL61, D51WHL62, D51WHL63, D51DEL},
+    {D51STR1, D51STR2, D51STR3, D51STR4, D51STR5, D51STR6, D51STR7,
+     D51WHL51, D51WHL52, D51WHL53, D51DEL},
+    {D51STR1, D51STR2, D51STR3, D51STR4, D51STR5, D51STR6, D51STR7,
+     D51WHL41, D51WHL42, D51WHL43, D51DEL},
+    {D51STR1, D51STR2, D51STR3, D51STR4, D51STR5, D51STR6, D51STR7,
+     D51WHL31, D51WHL32, D51WHL33, D51DEL},
+    {D51STR1, D51STR2, D51STR3, D51STR4, D51STR5, D51STR6, D51STR7,
+     D51WHL21, D51WHL22, D51WHL23, D51DEL}};