build/data/variant-reference/slashem.txt @@ -18,57 +18,10 @@ # define VARIANT_TILETYPE "nethack" #endif -#ifdef SLASHEM_0_0_6E4F8 -# define VARIANT_NAME "slashem" -# define VARIANT_VERSION "0.0.6E4F8" -#endif - -#ifdef SLASHEM_0_0_7E2 -# define VARIANT_NAME "slashem" -# define VARIANT_VERSION "0.0.7E2" -# define SLASHEM_0_0_7E0 -# define SLASHEM_0_0_7E1 -#endif - -#ifdef SLASHEM_0_0_7E5 -# define VARIANT_NAME "slashem" -# define VARIANT_VERSION "0.0.7E5" -# define SLASHEM_0_0_7E0 -# define SLASHEM_0_0_7E1 -# define SLASHEM_0_0_7E2 -# define VARIANT_TILETYPE "slashem-0.0.7E2" -#endif - -#ifdef SLASHEM_0_0_7E6 -# define VARIANT_NAME "slashem" -# define VARIANT_VERSION "0.0.7E6" -# define SLASHEM_0_0_7E0 -# define SLASHEM_0_0_7E1 -# define SLASHEM_0_0_7E2 -# define SLASHEM_0_0_7E5 -# define VARIANT_TILETYPE "slashem-0.0.7E2" -#endif - -#ifdef SLASHEM_0_0_7E6F2 -# define VARIANT_NAME "slashem" -# define VARIANT_VERSION "0.0.7E6F2" -# define SLASHEM_0_0_7E0 -# define SLASHEM_0_0_7E1 -# define SLASHEM_0_0_7E2 -# define SLASHEM_0_0_7E5 -# define SLASHEM_0_0_7E6 -# define VARIANT_TILETYPE "slashem-0.0.7E2" -#endif - -#ifdef SLASHEM_0_0_7E7F2 +#ifdef SLASHEM # define VARIANT_NAME "slashem" # define VARIANT_VERSION "0.0.7E7F2" -# define SLASHEM_0_0_7E0 -# define SLASHEM_0_0_7E1 -# define SLASHEM_0_0_7E2 -# define SLASHEM_0_0_7E5 -# define SLASHEM_0_0_7E6 -# define VARIANT_TILETYPE "slashem-0.0.7E1" +# define VARIANT_TILETYPE "slashem" #endif #ifndef VARIANT_NAME noegnud/noegnud_config.h @@ -11,9 +11,6 @@ /* nethack &| slashem */ extern short glyph2tile[]; -#ifdef SLASHEM -void substitute_tiles(d_level *plev); -#endif /* noegnud_gui */ noegnud/noegnud_extern.h @@ -1858,11 +1858,7 @@ void noegnud_gui_draw_minimap(noegnud_gui_twindow *window, int drawchildren) { glVertex2i(0,8); glVertex2i(0,0); glEnd(); -#ifdef SLASHEM_0_0_6E4F8 - } else if (iflags.hilite_pet&&(noegnud_map[x][y].glyph_primary!=MAX_GLYPH)&&(glyph_is_pet(noegnud_map[x][y].glyph_primary))) { -#else } else if (iflags.hilite_pet&&(noegnud_map[x][y].glyph_primary!=MAX_GLYPH)&&(noegnud_map[x][y].special_primary & MG_PET)) { -#endif highlight_multiplier=noegnud_render_highlight_strobe/2+0.5; } else { highlight_multiplier=1.0; @@ -1872,12 +1868,7 @@ void noegnud_gui_draw_minimap(noegnud_gui_twindow *window, int drawchildren) { if (noegnud_map[x][y].glyph_primary!=MAX_GLYPH) { - if -#ifdef SLASHEM_0_0_6E4F8 - (iflags.use_color) -#else - (iflags.wc_color) -#endif + if (iflags.wc_color) { glColor4f( noegnud/noegnud_gui.c @@ -38,10 +38,6 @@ extern void play_sound_for_message(const char *str); -#ifdef SLASHEM_0_0_6E4F8 -# include "slashem-0.0.6E4F8/mapglyph.h" -#endif - #ifdef NOEGNUD_GRAPHICS int noegnud_screenmode = SDL_OPENGL; @@ -138,9 +134,7 @@ char szWindowCaption[] = NOEGNUD_FULLNAMEVERSION; /* Interface definition, for windows.c */ struct window_procs noegnud_procs = { "noegnud", -#ifndef SLASHEM_0_0_6E4F8 WC_COLOR|WC_HILITE_PET, -#endif 0, noegnud_init_nhwindows, noegnud_player_selection, @@ -193,9 +187,7 @@ struct window_procs noegnud_procs = { noegnud_start_screen, noegnud_end_screen, noegnud_outrip, -#ifndef SLASHEM_0_0_6E4F8 noegnud_preference_update -#endif }; @@ -1066,11 +1058,7 @@ int noegnud_player_selection_alignment() { if (noegnud_select_menu (window, PICK_ONE, &menu_list)==1) { chosen=menu_list->item.a_int; if (chosen==-1) { -#ifdef SLASHEM_0_0_6E4F8 - chosen=pick_align(flags.initrole,flags.initrace,flags.initgend); -#else chosen=pick_align(flags.initrole,flags.initrace,flags.initgend,PICK_RANDOM); -#endif } else { chosen--; } @@ -1127,11 +1115,7 @@ int noegnud_player_selection_gender() { if (noegnud_select_menu (window, PICK_ONE, &menu_list)==1) { chosen=menu_list->item.a_int; if (chosen==-1) { -#ifdef SLASHEM_0_0_6E4F8 - chosen=pick_gend(flags.initrole,flags.initrace,flags.initalign); -#else chosen=pick_gend(flags.initrole,flags.initrace,flags.initalign,PICK_RANDOM); -#endif } else { chosen--; } @@ -1186,11 +1170,7 @@ int noegnud_player_selection_race() { if (noegnud_select_menu (window, PICK_ONE, &menu_list)==1) { chosen=menu_list->item.a_int; if (chosen==-1) { -#ifdef SLASHEM_0_0_6E4F8 - chosen=pick_race(flags.initrole,flags.initgend,flags.initalign); -#else chosen=pick_race(flags.initrole,flags.initgend,flags.initalign,PICK_RANDOM); -#endif } else { chosen--; } @@ -1249,11 +1229,7 @@ int noegnud_player_selection_role() { if (noegnud_select_menu (window, PICK_ONE, &menu_list)==1) { chosen=menu_list->item.a_int; if (chosen==-1) { -#ifdef SLASHEM_0_0_6E4F8 - chosen=pick_role(flags.initrace,flags.initgend,flags.initalign); -#else chosen=pick_role(flags.initrace,flags.initgend,flags.initalign,PICK_RANDOM); -#endif } else { chosen--; } @@ -1291,12 +1267,10 @@ void noegnud_player_selection (void) char *rolename; /* avoid asking if unnecessary */ -#ifndef SLASHEM_0_0_6E4F8 if ((flags.initrole ==ROLE_RANDOM)||(flags.randomall&&(flags.initrole ==ROLE_NONE))) flags.initrole =pick_role(flags.initrace,flags.initgend,flags.initalign,PICK_RANDOM); if ((flags.initrace ==ROLE_RANDOM)||(flags.randomall&&(flags.initrace ==ROLE_NONE))) flags.initrace =pick_race(flags.initrole,flags.initgend,flags.initalign,PICK_RANDOM); if ((flags.initgend ==ROLE_RANDOM)||(flags.randomall&&(flags.initgend ==ROLE_NONE))) flags.initgend =pick_gend(flags.initrole,flags.initrace,flags.initalign,PICK_RANDOM); if ((flags.initalign==ROLE_RANDOM)||(flags.randomall&&(flags.initalign==ROLE_NONE))) flags.initalign=pick_align(flags.initrole,flags.initrace,flags.initgend ,PICK_RANDOM); -#endif noegnud_player_selection_checks(); @@ -1368,17 +1342,10 @@ void noegnud_player_selection (void) } /* hmmm, did we forget anything ? if so, then randomize it */ -#ifdef SLASHEM_0_0_6E4F8 - if (flags.initrole ==ROLE_NONE) flags.initrole =pick_role(flags.initrace,flags.initgend,flags.initalign); - if (flags.initrace ==ROLE_NONE) flags.initrace =pick_race(flags.initrole,flags.initgend,flags.initalign); - if (flags.initgend ==ROLE_NONE) flags.initgend =pick_align(flags.initrole,flags.initrace,flags.initalign); - if (flags.initalign==ROLE_NONE) flags.initalign=pick_gend(flags.initrole,flags.initrace,flags.initgend); -#else if (flags.initrole ==ROLE_NONE) flags.initrole =pick_role(flags.initrace,flags.initgend,flags.initalign,PICK_RANDOM); if (flags.initrace ==ROLE_NONE) flags.initrace =pick_race(flags.initrole,flags.initgend,flags.initalign,PICK_RANDOM); if (flags.initgend ==ROLE_NONE) flags.initgend =pick_align(flags.initrole,flags.initrace,flags.initalign,PICK_RANDOM); if (flags.initalign==ROLE_NONE) flags.initalign=pick_gend(flags.initrole,flags.initrace,flags.initgend ,PICK_RANDOM); -#endif }; @@ -2220,25 +2187,12 @@ void noegnud_update_positionbar (char *features) { }; #endif -#ifdef SLASHEM_0_0_6E4F8 -d_level noegnud_print_glyph_level={-42,-37}; -#endif - - void noegnud_print_glyph (winid window, int nhx, int nhy, int glyph) { int x, y; x = nhx - 1; y = nhy; -#ifdef SLASHEM_0_0_6E4F8 - if (u.uz.dnum!=noegnud_print_glyph_level.dnum||u.uz.dlevel!=noegnud_print_glyph_level.dlevel) { - substitute_tiles(&u.uz); - noegnud_print_glyph_level=u.uz; - } -#endif - - /* if (glyph==cmap_to_glyph(S_stone)) if (levl[nhx][nhy].seenv&&(levl[nhx][nhy].typ==STONE||levl[nhx][nhy].typ==SCORR||levl[nhx][nhy].typ==SDOOR)) { @@ -2285,7 +2239,6 @@ void noegnud_print_glyph (winid window, int nhx, int nhy, int glyph) { /* Alternate floors are non-vanilla and therefore removed - #ifndef SLASHEM_0_0_6E4F8 # define NOEGNUD_TILES_BASE_FLOORS_START 1057 if (noegnud_map[x][y].tile_back == glyph2tile[cmap_to_glyph(S_room)]) { #ifndef In_caves @@ -2305,7 +2258,6 @@ void noegnud_print_glyph (winid window, int nhx, int nhy, int glyph) { Is_medusa_level(&u.uz) ? NOEGNUD_TILES_BASE_FLOORS_START + 7 : glyph2tile[cmap_to_glyph(S_room)]; } - #endif */ @@ -3998,11 +3950,9 @@ void noegnud_outrip(winid window, int how) { } } -#ifndef SLASHEM_0_0_6E4F8 void noegnud_preference_update(const char *pref) { genl_preference_update(pref); } -#endif void play_usersound(const char *filename, int volume) { noegnud_sound_play(filename,((float)volume)/100.0); noegnud/noegnud_interface.c @@ -11,11 +11,7 @@ void noegnud_render_map_single_char (int x, int y, int glyph_char, int colour) { if ((x == noegnud_clip_x) && (y == noegnud_clip_y)) { highlight_multiplier=noegnud_render_highlight_strobe/2+0.5; -#ifdef SLASHEM_0_0_6E4F8 - } else if (iflags.hilite_pet&&(noegnud_map[x][y].glyph_primary!=MAX_GLYPH)&&(glyph_is_pet(noegnud_map[x][y].glyph_primary))) { -#else } else if (iflags.hilite_pet&&(noegnud_map[x][y].glyph_primary!=MAX_GLYPH)&&(noegnud_map[x][y].special_primary & MG_PET)) { -#endif highlight_multiplier=noegnud_render_highlight_strobe/2+0.5; } else { highlight_multiplier=1.0; @@ -162,21 +158,13 @@ void noegnud_render_map_char() { noegnud_render_map_single_selection_char (x, y); } else if (noegnud_map[x][y].glyph_middle!=MAX_GLYPH) { -#ifdef SLASHEM_0_0_6E4F8 - if (iflags.use_color) { -#else if (iflags.wc_color) { -#endif noegnud_render_map_single_char (x, y, noegnud_map[x][y].ch_middle, noegnud_map[x][y].colour_middle); } else { noegnud_render_map_single_char (x, y, noegnud_map[x][y].ch_middle, CLR_WHITE); } } else if (noegnud_map[x][y].glyph_back!=MAX_GLYPH) { -#ifdef SLASHEM_0_0_6E4F8 - if (iflags.use_color) { -#else if (iflags.wc_color) { -#endif noegnud_render_map_single_char (x, y, noegnud_map[x][y].ch_back,CLR_GRAY); } else { @@ -185,11 +173,7 @@ void noegnud_render_map_char() { } if ((((x == noegnud_clip_x) && (y == noegnud_clip_y))||(((noegnud_render_mouse_map_x-1)==x)&&(noegnud_render_mouse_map_y==y))) || -#ifdef SLASHEM_0_0_6E4F8 - (iflags.hilite_pet&&(glyph_is_pet(noegnud_map[x][y].glyph_primary)))) { -#else (iflags.hilite_pet&&(noegnud_map[x][y].special_primary & MG_PET))) { -#endif glEnable (GL_BLEND); noegnud_render_map_char_highlight_block (); glDisable (GL_BLEND); @@ -222,33 +206,21 @@ void noegnud_render_map_char() { if (noegnud_map[x][y].glyph_fore!=MAX_GLYPH) { glTranslatef (0,noegnud_font_map->glheight*NOEGNUD_CHAR_MODIFIER,noegnud_font_map->glheight*NOEGNUD_CHAR_MODIFIER/2); glRotatef (70, 1, 0, 0); -#ifdef SLASHEM_0_0_6E4F8 - if (iflags.use_color) { -#else if (iflags.wc_color) { -#endif noegnud_render_map_single_char (x, y, noegnud_map[x][y].ch_fore, noegnud_map[x][y].colour_fore); } else { noegnud_render_map_single_char (x, y, noegnud_map[x][y].ch_fore, CLR_WHITE); } } } else if (noegnud_map[x][y].glyph_primary!=MAX_GLYPH) { -#ifdef SLASHEM_0_0_6E4F8 - if (iflags.use_color) { -#else if (iflags.wc_color) { -#endif noegnud_render_map_single_char (x, y, noegnud_map[x][y].ch_primary, noegnud_map[x][y].colour_primary); } else { noegnud_render_map_single_char (x, y, noegnud_map[x][y].ch_primary, CLR_WHITE); } if ((((x == noegnud_clip_x) && (y == noegnud_clip_y))||(((noegnud_render_mouse_map_x-1)==x)&&(noegnud_render_mouse_map_y==y))) || -#ifdef SLASHEM_0_0_6E4F8 - (iflags.hilite_pet&&(glyph_is_pet(noegnud_map[x][y].glyph_primary)))) { -#else (iflags.hilite_pet&&(noegnud_map[x][y].special_primary & MG_PET))) { -#endif if (!noegnud_options_render_features_cardboardcutout->value) glEnable (GL_BLEND); noegnud_render_map_char_highlight_block (); if (!noegnud_options_render_features_cardboardcutout->value) glDisable (GL_BLEND); noegnud/noegnud_render_char.c @@ -355,11 +355,7 @@ void noegnud_render_map_tile () { else if ((x == noegnud_clip_x) && (y == noegnud_clip_y)) { glColor4f(noegnud_render_highlight_strobe/2+0.5,noegnud_render_highlight_strobe/2+0.5,noegnud_render_highlight_strobe/2+0.5,1.0); -#ifdef SLASHEM_0_0_6E4F8 - } else if ((!noegnud_activetileset->isalphatileset)&&iflags.hilite_pet&&(noegnud_map[x][y].glyph_primary!=MAX_GLYPH)&&(glyph_is_pet(noegnud_map[x][y].glyph_primary))) { -#else } else if ((!noegnud_activetileset->isalphatileset)&&iflags.hilite_pet&&(noegnud_map[x][y].glyph_primary!=MAX_GLYPH)&&(noegnud_map[x][y].special_primary & MG_PET)) { -#endif glColor4f(noegnud_render_highlight_strobe/2+0.5,noegnud_render_highlight_strobe/2+0.5,noegnud_render_highlight_strobe/2+0.5,1.0); } else glColor4f(1.0,1.0,1.0,1.0); @@ -461,11 +457,7 @@ void noegnud_render_map_tile () { noegnud_render_map_single_tile (noegnud_map[x][y].tile_primary,1); if ((((x == noegnud_clip_x) && (y == noegnud_clip_y))||(((noegnud_render_mouse_map_x-1)==x)&&(noegnud_render_mouse_map_y==y))) || // if (((x == noegnud_clip_x) && (y == noegnud_clip_y)) || -#ifdef SLASHEM_0_0_6E4F8 - (iflags.hilite_pet&&(glyph_is_pet(noegnud_map[x][y].glyph_primary)))) { -#else (noegnud_map[x][y].glyph_primary!=MAX_GLYPH&&iflags.hilite_pet&&(noegnud_map[x][y].special_primary & MG_PET))) { -#endif glEnable (GL_BLEND); noegnud_render_map_tile_highlight_block (); @@ -595,11 +587,7 @@ void noegnud_render_map_tile () { } else if ((x == noegnud_clip_x) && (y == noegnud_clip_y)) { glColor4f(noegnud_render_highlight_strobe/2+0.5,noegnud_render_highlight_strobe/2+0.5,noegnud_render_highlight_strobe/2+0.5,current_alpha); -#ifdef SLASHEM_0_0_6E4F8 - } else if (iflags.hilite_pet&&(noegnud_map[x][y].glyph_primary!=MAX_GLYPH)&&(glyph_is_pet(noegnud_map[x][y].glyph_primary))) { -#else } else if (iflags.hilite_pet&&(noegnud_map[x][y].glyph_primary!=MAX_GLYPH)&&(noegnud_map[x][y].special_primary & MG_PET)) { -#endif glColor4f(noegnud_render_highlight_strobe/2+0.5,noegnud_render_highlight_strobe/2+0.5,noegnud_render_highlight_strobe/2+0.5,current_alpha); } else { glColor4f(1.0,1.0,1.0,current_alpha); @@ -615,11 +603,7 @@ void noegnud_render_map_tile () { } if (((x == noegnud_clip_x) && (y == noegnud_clip_y)) || (((noegnud_render_mouse_map_x-1)==x)&&(noegnud_render_mouse_map_y==y)) || -#ifdef SLASHEM_0_0_6E4F8 - (iflags.hilite_pet&&(glyph_is_pet(noegnud_map[x][y].glyph_primary)))) { -#else (noegnud_map[x][y].glyph_primary!=MAX_GLYPH&&iflags.hilite_pet&&(noegnud_map[x][y].special_primary & MG_PET))) { -#endif if (noegnud_options_render_features_cardboardcutout->value) glTranslatef(0,0.02,0); noegnud_render_map_tile_highlight_block (); } @@ -756,11 +740,7 @@ void noegnud_render_map_tile () { else if ((x == noegnud_clip_x) && (y == noegnud_clip_y)) { glColor4f(noegnud_render_highlight_strobe/2+0.5,noegnud_render_highlight_strobe/2+0.5,noegnud_render_highlight_strobe/2+0.5,current_alpha); -#ifdef SLASHEM_0_0_6E4F8 - } else if (iflags.hilite_pet&&(noegnud_map[x][y].glyph_primary!=MAX_GLYPH)&&(glyph_is_pet(noegnud_map[x][y].glyph_primary))) { -#else } else if (iflags.hilite_pet&&(noegnud_map[x][y].glyph_primary!=MAX_GLYPH)&&(noegnud_map[x][y].special_primary & MG_PET)) { -#endif glColor4f(noegnud_render_highlight_strobe/2+0.5,noegnud_render_highlight_strobe/2+0.5,noegnud_render_highlight_strobe/2+0.5,current_alpha); } else { glColor4f(1.0,1.0,1.0,current_alpha); noegnud/noegnud_render_tile.c @@ -300,7 +300,7 @@ SDLGL_CFLAGS = `sdl-config --cflags` # Files for Entro-P's OpenGL 3D interface :: slashem-noegnud -WINNOEGNUDCFLAGS = $(CFLAGS) -DSLASHEM_0_0_7E7F2 -fomit-frame-pointer `sdl-config --cflags` -I/usr/X11R6/include -I/usr/include/gnu +WINNOEGNUDCFLAGS = $(CFLAGS) -DSLASHEM -fomit-frame-pointer `sdl-config --cflags` -I/usr/X11R6/include -I/usr/include/gnu WINNOEGNUDLIB = `sdl-config --libs` -lSDL_image -lSDL_mixer -lGL -lGLU NOEGNUD = ../win/noegnud/noegnud slashem/sys/unix/Makefile.src build/data/variant-reference/slashem-0.0.6E4F8.txt build/data/variant-reference/slashem-0.0.7E0.txt build/data/variant-reference/slashem-0.0.7E1.txt d6f5cfe39ef61e17c3b45fbddaa0e65db268c0ac Clive Crous clive@crous.co.za http://github.com/clivecrous/noegnud/commit/85fd0c63a9bb37d31088955a6752da3d21e3b38c 85fd0c63a9bb37d31088955a6752da3d21e3b38c 2006-11-20T06:03:20-08:00 2006-11-20T06:03:20-08:00 Only support the latest SlashEM instead of multiple versions a8211c743b6cff0f70493ddec5432ee8bc25c3a3 Clive Crous clive@crous.co.za