land final virus+ee support

git-svn-id: svn://katsu.triplehelix.org/dgamelaunch/trunk@163 db0b04b0-f4d1-0310-9a6d-de3e77497b0e
This commit is contained in:
Joshua Kwan 2004-01-25 22:44:34 +00:00
parent a68add55a3
commit 0957e52c6c
5 changed files with 23 additions and 10 deletions

View File

@ -16,12 +16,18 @@ else
endif endif
endif endif
ifdef VIRUS
EDITOR = virus.c
else
EDITOR = ee.c
endif
CC = gcc CC = gcc
LDFLAGS = LDFLAGS =
CFLAGS = -g3 $(optimize) -Wall -Wno-unused $(DEFS) CFLAGS = -g3 $(optimize) -Wall -Wno-unused $(DEFS)
INSTALL = install -c INSTALL = install -c
DEFS = -DVERSION=\"$(VERSION)\" DEFS = -DVERSION=\"$(VERSION)\"
SRCS = ee.c ttyrec.c dgamelaunch.c io.c ttyplay.c mygetnstr.c stripgfx.c strlcpy.c strlcat.c y.tab.c lex.yy.c SRCS = $(EDITOR) ttyrec.c dgamelaunch.c io.c ttyplay.c mygetnstr.c stripgfx.c strlcpy.c strlcat.c y.tab.c lex.yy.c
OBJS = $(SRCS:.c=.o) OBJS = $(SRCS:.c=.o)
LIBS = -lcurses -lcrypt $(LUTIL) -ll LIBS = -lcurses -lcrypt $(LUTIL) -ll
@ -63,3 +69,4 @@ io.o: io.c ttyrec.h
stripgfx.o: stripgfx.c stripgfx.h stripgfx.o: stripgfx.c stripgfx.h
ttyplay.o: ttyplay.c ttyrec.h io.h stripgfx.h ttyplay.o: ttyplay.c ttyrec.h io.h stripgfx.h
ttyrec.o: ttyrec.c dgamelaunch.h ttyrec.h io.h ttyrec.o: ttyrec.c dgamelaunch.h ttyrec.h io.h
virus.o: virus.c last_char_is.c

9
README
View File

@ -1,4 +1,4 @@
udgamelaunch dgamelaunch
=========== ===========
dgamelaunch is a network-based game shell where anyone can sign up for an dgamelaunch is a network-based game shell where anyone can sign up for an
@ -13,6 +13,13 @@ On all platforms you should make sure that the curses library is accessible
at runtime using the -R flag to gcc, or using LD_RUN_PATH or LD_LIBRARY_PATH at runtime using the -R flag to gcc, or using LD_RUN_PATH or LD_LIBRARY_PATH
as environment variables during build and run time, respectively. as environment variables during build and run time, respectively.
NOTE: As of version 1.4 of dgamelaunch, 'ee' is now the default rc-file editor.
Using the 'virus' editor is still supported - all you have to do is
make clean; make VIRUS=1
(The make clean will guarantee that the dgamelaunch binary gets rebuilt.)
dgamelaunch was originally developed by M. Drew Streib <dtype@dtype.org> but dgamelaunch was originally developed by M. Drew Streib <dtype@dtype.org> but
is now a collaborative project. Copyright and contact information is in the is now a collaborative project. Copyright and contact information is in the
COPYING file, included with this package. COPYING file, included with this package.

View File

@ -84,7 +84,7 @@ extern int yyparse ();
extern pid_t child; /* nethack process */ extern pid_t child; /* nethack process */
extern int ee_main (int argc, char **argv); extern int editor_main (int argc, char **argv);
extern int ttyplay_main (char *ttyfile, int mode, int rstripgfx); extern int ttyplay_main (char *ttyfile, int mode, int rstripgfx);
extern int ttyrec_main (char *username, char* ttyrec_filename); extern int ttyrec_main (char *username, char* ttyrec_filename);
extern int master, slave; extern int master, slave;
@ -711,7 +711,7 @@ drawmenu ()
{ {
mvprintw (banner.len + 2, 1, "Logged in as: %s", me->username); mvprintw (banner.len + 2, 1, "Logged in as: %s", me->username);
mvaddstr (banner.len + 4, 1, "c) Change password"); mvaddstr (banner.len + 4, 1, "c) Change password");
mvaddstr (banner.len + 5, 1, "o) Edit option file (uses ee)"); mvaddstr (banner.len + 5, 1, "o) Edit option file");
mvaddstr (banner.len + 6, 1, "w) Watch games in progress"); mvaddstr (banner.len + 6, 1, "w) Watch games in progress");
mvaddstr (banner.len + 7, 1, "p) Play nethack!"); mvaddstr (banner.len + 7, 1, "p) Play nethack!");
mvaddstr (banner.len + 8, 1, "q) Quit"); mvaddstr (banner.len + 8, 1, "q) Quit");
@ -1193,7 +1193,7 @@ editoptions ()
} }
else if (editor == 0) else if (editor == 0)
{ {
ee_main (2, myargv); editor_main (2, myargv);
exit(0); exit(0);
} }
else else

6
ee.c
View File

@ -49,7 +49,7 @@
| proprietary information which is protected by | proprietary information which is protected by
| copyright. All rights are reserved. | copyright. All rights are reserved.
| |
| $Header: /var/cvs/dgamelaunch/ee.c,v 1.6 2004/01/24 21:49:13 joshk Exp $ | $Header: /var/cvs/dgamelaunch/ee.c,v 1.7 2004/01/25 22:44:34 joshk Exp $
| |
*/ */
@ -62,7 +62,7 @@ char *ee_long_notice[] = {
"copyright. All rights are reserved." "copyright. All rights are reserved."
}; };
char *version = "@(#) ee, version 1.4.1 $Revision: 1.6 $"; char *version = "@(#) ee, version 1.4.1 $Revision: 1.7 $";
#define catgetlocal(a, b) (b) #define catgetlocal(a, b) (b)
@ -451,7 +451,7 @@ FILE *fopen(); /* declaration for open function */
#endif /* __STDC__ */ #endif /* __STDC__ */
int int
ee_main(argc, argv) /* beginning of main program */ editor_main(argc, argv) /* beginning of main program */
int argc; int argc;
char *argv[]; char *argv[];
{ {

View File

@ -46,7 +46,6 @@ char *vi_Version = "0.0.2+dgamelaunch " VERSION;
*/ */
//---- Feature -------------- Bytes to immplement //---- Feature -------------- Bytes to immplement
#define vi_main vi_main
#define BB_FEATURE_VI_COLON // 4288 #define BB_FEATURE_VI_COLON // 4288
#define BB_FEATURE_VI_YANKMARK // 1408 #define BB_FEATURE_VI_YANKMARK // 1408
#define BB_FEATURE_VI_SEARCH // 1088 #define BB_FEATURE_VI_SEARCH // 1088
@ -303,7 +302,7 @@ static int crashme = 0;
extern int extern int
vi_main (int argc, char **argv) editor_main (int argc, char **argv)
{ {
#ifdef BB_FEATURE_VI_YANKMARK #ifdef BB_FEATURE_VI_YANKMARK
int i; int i;