Fix: SE054 Problem: There are still a number of places where Slash'EM refers to itself as NetHack. This fix removes a number (but probably not all) of them. Compatible with: Slash'EM 0.0.6E0F2+SE049+SE050 Author: J. Ali Harlow, ali@avrc.city.ac.uk Date: 4 Mar 2000 diff -Nacr ../slashem-0.0.6E0F2+SE049+SE050/src/allmain.c ./src/allmain.c *** ../slashem-0.0.6E0F2+SE049+SE050/src/allmain.c Sat Mar 4 16:47:54 2000 --- ./src/allmain.c Sat Mar 4 16:50:04 2000 *************** *** 564,570 **** if (new_game) pline("%s %s, welcome to %s! You are a%s %s %s.", Hello(), plname, DEF_GAME_NAME, buf, urace.adj, (currentgend && urole.name.f) ? urole.name.f : urole.name.m); ! else pline("%s %s, the%s %s %s, welcome back to NetHack!", Hello(), plname, buf, urace.adj, (currentgend && urole.name.f) ? urole.name.f : urole.name.m, DEF_GAME_NAME); --- 564,570 ---- if (new_game) pline("%s %s, welcome to %s! You are a%s %s %s.", Hello(), plname, DEF_GAME_NAME, buf, urace.adj, (currentgend && urole.name.f) ? urole.name.f : urole.name.m); ! else pline("%s %s, the%s %s %s, welcome back to %s!", Hello(), plname, buf, urace.adj, (currentgend && urole.name.f) ? urole.name.f : urole.name.m, DEF_GAME_NAME); diff -Nacr ../slashem-0.0.6E0F2+SE049+SE050/src/artifact.c ./src/artifact.c *** ../slashem-0.0.6E0F2+SE049+SE050/src/artifact.c Sat Mar 4 16:47:54 2000 --- ./src/artifact.c Sat Mar 4 16:50:04 2000 *************** *** 1724,1730 **** } while (line && (strstri(line, "fortune") || strstri(line, "pity")) && ++count < 30); } if (!*line) ! line = "NetHack rumors file closed for renovation."; pline("%s whispers:", The(xname(obj))); verbalize("%s", line); return; --- 1724,1730 ---- } while (line && (strstri(line, "fortune") || strstri(line, "pity")) && ++count < 30); } if (!*line) ! line = "Slash'EM rumors file closed for renovation."; pline("%s whispers:", The(xname(obj))); verbalize("%s", line); return; diff -Nacr ../slashem-0.0.6E0F2+SE049+SE050/src/cmd.c ./src/cmd.c *** ../slashem-0.0.6E0F2+SE049+SE050/src/cmd.c Sat Mar 4 16:47:54 2000 --- ./src/cmd.c Sat Mar 4 16:50:04 2000 *************** *** 1853,1859 **** {"turn", "turn undead", doturn, TRUE}, {"twoweapon", "toggle two-weapon combat", dotwoweapon, FALSE}, {"untrap", "untrap something", dountrap, FALSE}, ! {"version", "list compile time options for this version of NetHack", doextversion, TRUE}, {"wipe", "wipe off your face", dowipe, FALSE}, {"youpoly", "polymorph at will", polyatwill, FALSE}, /* jla */ --- 1853,1859 ---- {"turn", "turn undead", doturn, TRUE}, {"twoweapon", "toggle two-weapon combat", dotwoweapon, FALSE}, {"untrap", "untrap something", dountrap, FALSE}, ! {"version", "list compile time options for this version of Slash'EM", doextversion, TRUE}, {"wipe", "wipe off your face", dowipe, FALSE}, {"youpoly", "polymorph at will", polyatwill, FALSE}, /* jla */ diff -Nacr ../slashem-0.0.6E0F2+SE049+SE050/src/do.c ./src/do.c *** ../slashem-0.0.6E0F2+SE049+SE050/src/do.c Sat Mar 4 16:47:54 2000 --- ./src/do.c Sat Mar 4 16:50:04 2000 *************** *** 795,801 **** if (!savelev(fd, ledger_no(&u.uz), COUNT_SAVE)) { (void) close(fd); delete_levelfile(ledger_no(&u.uz)); ! pline("NetHack is out of disk space for making levels!"); You("can save, quit, or continue playing."); return -1; } --- 795,801 ---- if (!savelev(fd, ledger_no(&u.uz), COUNT_SAVE)) { (void) close(fd); delete_levelfile(ledger_no(&u.uz)); ! pline("Slash'EM is out of disk space for making levels!"); You("can save, quit, or continue playing."); return -1; } diff -Nacr ../slashem-0.0.6E0F2+SE049+SE050/src/pager.c ./src/pager.c *** ../slashem-0.0.6E0F2+SE049+SE050/src/pager.c Sat Mar 4 16:47:54 2000 --- ./src/pager.c Sat Mar 4 16:50:04 2000 *************** *** 771,777 **** static const char *help_menu_items[] = { /* 0*/ "Long description of the game and commands.", /* 1*/ "List of game commands.", ! /* 2*/ "Concise history of NetHack.", /* 3*/ "Info on a character in the game display.", /* 4*/ "Info on what a given key does.", /* 5*/ "List of game options.", --- 771,777 ---- static const char *help_menu_items[] = { /* 0*/ "Long description of the game and commands.", /* 1*/ "List of game commands.", ! /* 2*/ "Concise history of Slash'EM.", /* 3*/ "Info on a character in the game display.", /* 4*/ "Info on what a given key does.", /* 5*/ "List of game options.", *************** *** 779,785 **** /* 7*/ "List of extended commands.", /* 8*/ "The NetHack license.", /*WAC Add access to txt guidebook*/ ! /* 9*/ "The Nethack Guidebook.", #ifdef PORT_HELP "%s-specific help and commands.", #define PORT_HELP_ID 100 --- 779,785 ---- /* 7*/ "List of extended commands.", /* 8*/ "The NetHack license.", /*WAC Add access to txt guidebook*/ ! /* 9*/ "The Slash'EM Guidebook.", #ifdef PORT_HELP "%s-specific help and commands.", #define PORT_HELP_ID 100 diff -Nacr ../slashem-0.0.6E0F2+SE049+SE050/sys/unix/Makefile.src ./sys/unix/Makefile.src *** ../slashem-0.0.6E0F2+SE049+SE050/sys/unix/Makefile.src Sat Mar 4 16:48:20 2000 --- ./sys/unix/Makefile.src Sat Mar 4 16:51:14 2000 *************** *** 590,596 **** ../win/X11/nh56icon ../win/X11/nh32icon $(CC) $(CFLAGS) -c ../win/X11/winX.c winmap.o: ../win/X11/winmap.c ../include/xwindow.h $(HACK_H) ../include/dlb.h \ ! ../include/winX.h ../include/tile2x11.h $(CC) $(CFLAGS) -c ../win/X11/winmap.c winmenu.o: ../win/X11/winmenu.c $(HACK_H) ../include/winX.h $(CC) $(CFLAGS) -c ../win/X11/winmenu.c --- 590,596 ---- ../win/X11/nh56icon ../win/X11/nh32icon $(CC) $(CFLAGS) -c ../win/X11/winX.c winmap.o: ../win/X11/winmap.c ../include/xwindow.h $(HACK_H) ../include/dlb.h \ ! ../include/patchlevel.h ../include/winX.h ../include/tile2x11.h $(CC) $(CFLAGS) -c ../win/X11/winmap.c winmenu.o: ../win/X11/winmenu.c $(HACK_H) ../include/winX.h $(CC) $(CFLAGS) -c ../win/X11/winmenu.c *************** *** 606,612 **** winval.o: ../win/X11/winval.c $(HACK_H) ../include/winX.h $(CC) $(CFLAGS) -c ../win/X11/winval.c gtk.o: ../win/gtk/gtk.c ../include/winGTK.h $(HACK_H) ../include/func_tab.h \ ! ../include/dlb.h $(CC) $(CFLAGS) $(WINGTKCFLAGS) -c ../win/gtk/gtk.c gtkgetlin.o: ../win/gtk/gtkgetlin.c ../include/winGTK.h $(HACK_H) $(CC) $(CFLAGS) $(WINGTKCFLAGS) -c ../win/gtk/gtkgetlin.c --- 606,612 ---- winval.o: ../win/X11/winval.c $(HACK_H) ../include/winX.h $(CC) $(CFLAGS) -c ../win/X11/winval.c gtk.o: ../win/gtk/gtk.c ../include/winGTK.h $(HACK_H) ../include/func_tab.h \ ! ../include/dlb.h ../include/patchlevel.h $(CC) $(CFLAGS) $(WINGTKCFLAGS) -c ../win/gtk/gtk.c gtkgetlin.o: ../win/gtk/gtkgetlin.c ../include/winGTK.h $(HACK_H) $(CC) $(CFLAGS) $(WINGTKCFLAGS) -c ../win/gtk/gtkgetlin.c *************** *** 617,622 **** gtkyn.o: ../win/gtk/gtkyn.c ../include/winGTK.h $(HACK_H) $(CC) $(CFLAGS) $(WINGTKCFLAGS) -c ../win/gtk/gtkyn.c ! gtkmap.o: ../win/gtk/gtkmap.c ../include/winGTK.h $(HACK_H) ../include/dlb.h $(CC) $(CFLAGS) $(WINGTKCFLAGS) -c ../win/gtk/gtkmap.c gtkmessage.o: ../win/gtk/gtkmessage.c ../include/winGTK.h $(HACK_H) $(CC) $(CFLAGS) $(WINGTKCFLAGS) -c ../win/gtk/gtkmessage.c --- 617,623 ---- gtkyn.o: ../win/gtk/gtkyn.c ../include/winGTK.h $(HACK_H) $(CC) $(CFLAGS) $(WINGTKCFLAGS) -c ../win/gtk/gtkyn.c ! gtkmap.o: ../win/gtk/gtkmap.c ../include/winGTK.h $(HACK_H) ../include/dlb.h \ + ../include/patchlevel.h $(CC) $(CFLAGS) $(WINGTKCFLAGS) -c ../win/gtk/gtkmap.c gtkmessage.o: ../win/gtk/gtkmessage.c ../include/winGTK.h $(HACK_H) $(CC) $(CFLAGS) $(WINGTKCFLAGS) -c ../win/gtk/gtkmessage.c diff -Nacr ../slashem-0.0.6E0F2+SE049+SE050/win/Qt/qt_win.cpp ./win/Qt/qt_win.cpp *** ../slashem-0.0.6E0F2+SE049+SE050/win/Qt/qt_win.cpp Sat Mar 4 16:47:54 2000 --- ./win/Qt/qt_win.cpp Sat Mar 4 16:50:04 2000 *************** *** 3299,3306 **** void NetHackQtMainWindow::closeEvent(QCloseEvent* e) { if ( program_state.something_worth_saving ) { ! switch ( QMessageBox::information( this, "NetHack", ! "This will end your NetHack session", "&Save", "&Quit", "&Cancel", 0, 2 ) ) { case 0: --- 3299,3306 ---- void NetHackQtMainWindow::closeEvent(QCloseEvent* e) { if ( program_state.something_worth_saving ) { ! switch ( QMessageBox::information( this, DEF_GAME_NAME, ! "This will end your " DEF_GAME_NAME " session", "&Save", "&Quit", "&Cancel", 0, 2 ) ) { case 0: diff -Nacr ../slashem-0.0.6E0F2+SE049+SE050/win/X11/winX.c ./win/X11/winX.c *** ../slashem-0.0.6E0F2+SE049+SE050/win/X11/winX.c Sat Mar 4 16:47:54 2000 --- ./win/X11/winX.c Sat Mar 4 16:50:04 2000 *************** *** 1717,1723 **** num_args = 0; XtSetArg(args[num_args], XtNallowShellResize, True); num_args++; ! form = XtCreateManagedWidget("nethack", panedWidgetClass, toplevel, args, num_args); --- 1717,1723 ---- num_args = 0; XtSetArg(args[num_args], XtNallowShellResize, True); num_args++; ! form = XtCreateManagedWidget(DEF_GAME_NAME, panedWidgetClass, toplevel, args, num_args); diff -Nacr ../slashem-0.0.6E0F2+SE049+SE050/win/X11/winmap.c ./win/X11/winmap.c *** ../slashem-0.0.6E0F2+SE049+SE050/win/X11/winmap.c Sat Mar 4 16:47:54 2000 --- ./win/X11/winmap.c Sat Mar 4 16:50:04 2000 *************** *** 39,44 **** --- 39,49 ---- #include "hack.h" #include "dlb.h" #include "winX.h" + #ifdef SHORT_FILENAMES + #include "patchlev.h" + #else + #include "patchlevel.h" + #endif #ifdef USE_XPM #include *************** *** 1483,1489 **** num_args = 0; XtSetArg(args[num_args], XtNinput, False); num_args++; ! wp->popup = parent = XtCreatePopupShell("nethack", topLevelShellWidgetClass, toplevel, args, num_args); /* --- 1488,1494 ---- num_args = 0; XtSetArg(args[num_args], XtNinput, False); num_args++; ! wp->popup = parent = XtCreatePopupShell(DEF_GAME_NAME, topLevelShellWidgetClass, toplevel, args, num_args); /* diff -Nacr ../slashem-0.0.6E0F2+SE049+SE050/win/gtk/gtk.c ./win/gtk/gtk.c *** ../slashem-0.0.6E0F2+SE049+SE050/win/gtk/gtk.c Sat Mar 4 16:47:54 2000 --- ./win/gtk/gtk.c Sat Mar 4 16:50:04 2000 *************** *** 8,13 **** --- 8,18 ---- #include "wintype.h" #include "func_tab.h" #include "dlb.h" + #ifdef SHORT_FILENAMES + #include "patchlev.h" + #else + #include "patchlevel.h" + #endif static int initialized; static int initialized2; *************** *** 657,663 **** GTK_OBJECT(main_window), "delete_event", GTK_SIGNAL_FUNC(main_window_destroy), 0); ! gtk_window_set_title(GTK_WINDOW(main_window), "NetHack"); gtk_widget_set_events(main_window, GDK_KEY_PRESS_MASK); gtk_widget_realize(main_window); --- 662,668 ---- GTK_OBJECT(main_window), "delete_event", GTK_SIGNAL_FUNC(main_window_destroy), 0); ! gtk_window_set_title(GTK_WINDOW(main_window), DEF_GAME_NAME); gtk_widget_set_events(main_window, GDK_KEY_PRESS_MASK); gtk_widget_realize(main_window); diff -Nacr ../slashem-0.0.6E0F2+SE049+SE050/win/gtk/gtkmap.c ./win/gtk/gtkmap.c *** ../slashem-0.0.6E0F2+SE049+SE050/win/gtk/gtkmap.c Sat Mar 4 16:48:19 2000 --- ./win/gtk/gtkmap.c Sat Mar 4 16:52:01 2000 *************** *** 9,14 **** --- 9,19 ---- #include #include "winGTK.h" #include "dlb.h" + #ifdef SHORT_FILENAMES + #include "patchlev.h" + #else + #include "patchlevel.h" + #endif /* if map_click is true, we do gtk_main_quit() when clicking map *************** *** 765,771 **** radar_is_created = 1; ! gtk_window_set_title(GTK_WINDOW(radar), "NetHack Radar"); radar_darea = nh_gtk_new_and_add(gtk_drawing_area_new(), radar, ""); gtk_drawing_area_size( --- 770,776 ---- radar_is_created = 1; ! gtk_window_set_title(GTK_WINDOW(radar), DEF_GAME_NAME " Radar"); radar_darea = nh_gtk_new_and_add(gtk_drawing_area_new(), radar, ""); gtk_drawing_area_size(