@@ -1,4 +1,5 @@ -/* Copyright (c) Jaakko Peltonen, 2000 */ +/* Copyright (c) Jaakko Peltonen, 2000 */ +/* Copyright (c) Daniel Thaler, 2008 */ /* NetHack may be freely redistributed. See license for details. */ #include <stdlib.h> vultures/vultures_gen.cpp @@ -1,5 +1,6 @@ /* NetHack may be freely redistributed. See license for details. */ /* Copyright (c) Jaakko Peltonen, 2000 */ +/* Copyright (c) Daniel Thaler, 2008 */ #include <vector> #include <string> @@ -25,20 +26,6 @@ using std::string; #include "date.h" /* this is in <variant>/include it's needed for VERSION_ID */ -/*---------------------------- -* constants -*---------------------------- */ - -/* why is this here? It should ALWAYS be defined by unistd.h */ -#ifndef R_OK -# define R_OK 4 -#endif - - -/*---------------------------- -* pre-declared functions -*---------------------------- */ -static void trimright(char *buf); static void vultures_show_intro(string introscript_name); @@ -46,16 +33,6 @@ static void vultures_show_intro(string introscript_name); * function implementaions *---------------------------- */ -static void trimright(char *buf) -{ - int i; - - i = strlen(buf) - 1; - while (i >= 0 && (buf[i] == ' ' || buf[i] == '\n' || buf[i] == '\r')) - i--; - buf[i + 1] = '\0'; -} - void vultures_show_logo_screen(void) { @@ -91,7 +68,6 @@ void vultures_show_logo_screen(void) } - void vultures_player_selection(void) { SDL_Surface *logo; @@ -118,7 +94,6 @@ void vultures_player_selection(void) } - void vultures_askname(void) { int done; @@ -324,10 +299,8 @@ int vultures_init_graphics(void) vultures_write_log(V_LOG_DEBUG, __FILE__, __LINE__, "Initializing fonts\n"); /* try custom font first */ - if (iflags.wc_font_text) - { - if (access(iflags.wc_font_text, R_OK) == 0) - { + if (iflags.wc_font_text) { + if (access(iflags.wc_font_text, R_OK) == 0) { font_loaded = 1; font_loaded &= vultures_load_font(V_FONT_SMALL, iflags.wc_font_text, 0, 12); font_loaded &= vultures_load_font(V_FONT_LARGE, iflags.wc_font_text, 0, 14); @@ -336,8 +309,7 @@ int vultures_init_graphics(void) printf("Could not access %s: %s\n", iflags.wc_font_text, strerror(errno)); } - if (!font_loaded) /* fallback to default font */ - { + if (!font_loaded) {/* fallback to default font */ font_loaded = 1; /* add the path to the filename */ fullname = vultures_make_filename(V_FONTS_DIRECTORY, "", V_FILENAME_FONT); @@ -352,8 +324,7 @@ int vultures_init_graphics(void) image = vultures_load_graphic(V_FILENAME_WINDOW_STYLE); if (image == NULL) all_ok = FALSE; - else - { + else { vultures_winelem.corner_tl = vultures_get_img_src(1, 1, 23, 23, image); vultures_winelem.border_top = vultures_get_img_src(27, 1, 57, 23, image); vultures_winelem.corner_tr = vultures_get_img_src(61, 1, 84, 23, image); @@ -442,5 +413,3 @@ void vultures_destroy_graphics(void) /* misc small stuff */ delete vultures_px_format; } - - vultures/vultures_init.cpp @@ -1,10 +1,8 @@ -/* Copyright (c) Daniel Thaler, 2006 */ +/* Copyright (c) Daniel Thaler, 2006, 2008 */ /* NetHack may be freely redistributed. See license for details. */ -/* system headers */ #include <ctype.h> -/* SDL headers */ #include <SDL.h> /* nethack headers */ @@ -21,12 +19,8 @@ extern "C" { #endif #include "func_tab.h" /* For extended commands list */ - } -#include <assert.h> - - #define TRAVEL_HACK /* XXX This is to be removed once Slash'EM (NetHack?) fixes the problem of infinite loops */ /* vultures headers */ @@ -142,7 +136,6 @@ void vultures_init_nhwindows(int *argcp, char **argv) /* try to chdir to our datadir */ vultures_chdir_to_datadir(argv[0]); - if (!vultures_init_graphics()) panic("could not initalize graphic mode"); @@ -182,7 +175,6 @@ void vultures_init_nhwindows(int *argcp, char **argv) iflags.menu_tab_sep = 1; iflags.wc_hilite_pet = 1; - vultures_show_logo_screen(); map_data = new mapdata(); @@ -190,7 +182,6 @@ void vultures_init_nhwindows(int *argcp, char **argv) new levelwin(map_data); vultures_windows_inited = 1; - /* Success! */ iflags.window_inited = TRUE; } @@ -220,8 +211,7 @@ winid vultures_create_nhwindow(int type) { window *win; - switch(type) - { + switch(type) { case NHW_STATUS: win = new statuswin(vultures_get_window(0)); break; @@ -284,13 +274,10 @@ static void vultures_display_nhmap(struct window * win, vultures_event *result, win->need_redraw = 1; - if (flags.travel) - { + if (flags.travel) { if (vultures_event_dispatcher_nonblocking(result, NULL)) vultures_stop_travelling = 1; - } - else - { + } else { win->draw_windows(); vultures_refresh_window_region(); } @@ -318,8 +305,7 @@ void vultures_display_nhwindow(int winid, BOOLEAN_P blocking) if (!win) return; - switch(win->get_nh_type()) - { + switch(win->get_nh_type()) { case NHW_TEXT: if (win->get_wintype() == V_WINTYPE_ENDING) { int response; @@ -382,7 +368,6 @@ void vultures_destroy_nhwindow(int winid) } - void vultures_start_menu(int winid) { window *win = vultures_get_window(winid); @@ -395,9 +380,6 @@ void vultures_start_menu(int winid) if (win->get_nh_type() != NHW_MENU) return; - /* start menu should never be called on a window that is not a menu */ - assert (win->get_wintype() == V_WINTYPE_MENU || win->get_wintype() == V_WINTYPE_OBJWIN); - menu = static_cast<menuwin*>(win); menu->reset(); @@ -406,7 +388,6 @@ void vultures_start_menu(int winid) } - /* add an item to a menu that was started with vultures_start_menu */ void vultures_add_menu(int winid, int glyph, const ANY_P * identifier, CHAR_P accelerator, CHAR_P groupacc, int attr, @@ -551,14 +532,12 @@ void vultures_raw_print_bold(const char *str) void vultures_putstr(int winid, int attr, const char *str) { struct window * win; -// ANY_P menuid; if (!str) return; /* Display error messages immediately */ - if (winid == WIN_ERR) - { + if (winid == WIN_ERR) { vultures_messagebox(str); return; } @@ -569,8 +548,7 @@ void vultures_putstr(int winid, int attr, const char *str) * For windows of type NHW_MESSAGE, both the messages * and their send time are stored. */ - switch (win->get_nh_type()) - { + switch (win->get_nh_type()) { case NHW_MESSAGE: /* If "what's this" is active,skip the help messages * associated with NetHack's lookat command. */ @@ -603,12 +581,8 @@ void vultures_putstr(int winid, int attr, const char *str) case NHW_TEXT: case NHW_MENU: -// win->content_is_text = 1; /* Text content */ - /* Add the new text line as a menu item */ -// menuid.a_void = 0; /* Since text lines can't be selected anyway, these can be the same */ -// vultures_add_menu(winid, NO_GLYPH, &menuid, 0, 0, ATR_NONE, str, FALSE); - static_cast<menuwin*>(win)->add_menuitem(str, false, NULL, '\0', 0); + static_cast<menuwin*>(win)->add_menuitem(str, false, NULL, '\0', 0); break; case NHW_STATUS: @@ -730,6 +704,7 @@ void vultures_bail(const char *mesg) /*NOTREACHED*/ } + /* display a list of extended commands for the user to pick from */ int vultures_get_ext_cmd(void) { @@ -747,8 +722,7 @@ int vultures_get_ext_cmd(void) used_accels[0] = '\0'; /* Add extended commands as menu items */ - for (i = 0; extcmdlist[i].ef_txt != NULL; i++) - { + for (i = 0; extcmdlist[i].ef_txt != NULL; i++) { /* try to find an accelerator that fits the command name */ cur_accelerator = tolower(extcmdlist[i].ef_txt[0]); @@ -761,8 +735,7 @@ int vultures_get_ext_cmd(void) if (j < len) /* cur_accelerator is already used, so find another */ cur_accelerator = vultures_find_menu_accelerator(used_accels); - else - { + else { /* cur_accelerator is not in use: claim it */ used_accels[len] = cur_accelerator; used_accels[len+1] = '\0'; @@ -789,7 +762,6 @@ int vultures_get_ext_cmd(void) } - /* display a file in a menu window */ void vultures_display_file(const char *fname, BOOLEAN_P complain) { @@ -799,10 +771,8 @@ void vultures_display_file(const char *fname, BOOLEAN_P complain) /* Read the file */ f = dlb_fopen(fname, "r"); - if (!f) - { - if (complain == TRUE) - { + if (!f) { + if (complain == TRUE) { sprintf(tempbuffer, "Can't open file [%s].\n", fname); vultures_messagebox(tempbuffer); } @@ -858,8 +828,7 @@ void vultures_delay_output(void) /* the time it took to draw the map is subtracted from the delay time; * this allows the game to adapt to slow-drawing systems (ie unaccelerated * software graphics) */ - if (vultures_map_draw_lastmove == moves) - { + if (vultures_map_draw_lastmove == moves) { delay -= vultures_map_draw_msecs; if (delay < 0) delay = 1; @@ -868,8 +837,7 @@ void vultures_delay_output(void) origdelay = delay; /* delay in small increments and run the eventloop in between */ - while (delay > 10) - { + while (delay > 10) { starttick = SDL_GetTicks(); if (vultures_event_dispatcher_nonblocking(&result, NULL)) @@ -877,8 +845,7 @@ void vultures_delay_output(void) endtick = SDL_GetTicks(); elapsed = endtick - starttick; - if (elapsed < 10) - { + if (elapsed < 10) { SDL_Delay(10 - elapsed); elapsed = 10; } @@ -911,8 +878,7 @@ char vultures_message_menu(CHAR_P let, int how, const char *mesg) void vultures_curs(winid window, int x, int y) { /* allow selecting a position via keyboard for look and teleport (both set vultures_whatis_active) */ - if (window == WIN_MAP && vultures_whatis_active) - { + if (window == WIN_MAP && vultures_whatis_active) { point mappos, mouse; mappos.x = x; mappos.y = y; @@ -920,8 +886,7 @@ void vultures_curs(winid window, int x, int y) /* move the viewport when the mouse approaches the edge */ if (mouse.x < 50 || mouse.x > (vultures_screen->w-50) || - mouse.y < 50 || mouse.y > (vultures_screen->h-50)) - { + mouse.y < 50 || mouse.y > (vultures_screen->h-50)) { levwin->set_view(x, y); /* calculate the new mouse position */ @@ -940,22 +905,18 @@ void vultures_get_nh_event(void) { static point lastpos[2] = {{-1,-1}, {-1,-1}}; - if (flags.travel) - { + if (flags.travel) { /* if the positon 2 turns ago is identical to the current position, * the travel algorithm has hung and travel needs to be canceled */ if (vultures_stop_travelling || ((lastpos[1].x != lastpos[0].x || lastpos[1].y != lastpos[0].y) && - lastpos[1].x == u.ux && lastpos[1].y == u.uy)) - { + lastpos[1].x == u.ux && lastpos[1].y == u.uy)) { flags.travel = 0; flags.mv = 0; u.tx = u.ux; u.ty = u.uy; lastpos[0].x = lastpos[1].x = -1; - } - else - { + } else { lastpos[1] = lastpos[0]; lastpos[0].x = u.ux; lastpos[0].y = u.uy; @@ -968,8 +929,6 @@ void vultures_get_nh_event(void) } - - /******************************************************* * utility functions *******************************************************/ @@ -986,8 +945,7 @@ int vultures_find_menu_accelerator(char *used_accelerators) cur_accelerator = 0; /* Pick any available letter from [a-zA-Z] */ - for (i = 0; i < strlen(acclist); i++) - { + for (i = 0; i < strlen(acclist); i++) { cur_accelerator = acclist[i]; acc_found = 1; @@ -998,8 +956,7 @@ int vultures_find_menu_accelerator(char *used_accelerators) break; } - if (acc_found) - { + if (acc_found) { /* Add found accelerator to string of used ones (assume there's enough room) */ j = strlen(used_accelerators); used_accelerators[j] = cur_accelerator; @@ -1010,7 +967,6 @@ int vultures_find_menu_accelerator(char *used_accelerators) return -1; } - /******************************************************* * unsupported/unnecessary functions of the nethack api *******************************************************/ @@ -1036,5 +992,3 @@ void vultures_cliparound(int x, int y) {} #ifdef POSITIONBAR void vultures_update_positionbar(char *features) {} #endif - - vultures/vultures_main.cpp @@ -13,10 +13,12 @@ extern "C" { extern struct window_procs vultures_procs; +extern int vultures_whatis_active; extern void win_vultures_init(); extern int vultures_find_menu_accelerator(char *used_accelerators); +extern void vultures_bail(const char *mesg); /* external declarations */ @@ -74,13 +76,6 @@ extern char * vultures_get_color_string(); #endif -extern void vultures_bail(const char *mesg); - - -extern int vultures_whatis_active; - - - #ifdef __cplusplus } #endif vultures/vultures_main.h @@ -122,10 +122,8 @@ void vultures_mouse_draw(void) /* draw a new tooltip, if necessary */ - if (vultures_tooltip.valid && vultures_tooltip.tip) - { - if (vultures_tooltip.cur.x == -1) - { + if (vultures_tooltip.valid && vultures_tooltip.tip) { + if (vultures_tooltip.cur.x == -1) { if (new_x + vultures_tooltip.tip->w > vultures_screen->w) vultures_tooltip.cur.x = vultures_screen->w - vultures_tooltip.tip->w; else if (new_x + cursor->xmod < 0) @@ -172,8 +170,7 @@ void vultures_mouse_refresh(void) new_y + cursor->graphic->h); /* refresh the position of the previous tooltip */ - if (vultures_tooltip.refresh.x != -1) - { + if (vultures_tooltip.refresh.x != -1) { vultures_refresh_region(vultures_tooltip.refresh.x, vultures_tooltip.refresh.y, vultures_tooltip.refresh.x + vultures_tooltip.refresh.w, vultures_tooltip.refresh.y + vultures_tooltip.refresh.h); @@ -187,8 +184,7 @@ void vultures_mouse_restore_bg() { vultures_tile * cursor; - if (vultures_tooltip.background) - { + if (vultures_tooltip.background) { vultures_put_img(vultures_tooltip.cur.x, vultures_tooltip.cur.y, vultures_tooltip.background); SDL_FreeSurface(vultures_tooltip.background); vultures_tooltip.background = NULL; @@ -200,8 +196,7 @@ void vultures_mouse_restore_bg() vultures_tooltip.refresh.h = vultures_tooltip.tip->h; } - if (vultures_mouse.background) - { + if (vultures_mouse.background) { cursor = vultures_get_tile(vultures_mouse.cursor); vultures_put_img(vultures_mouse.cur.x + cursor->xmod, @@ -233,8 +228,7 @@ static void vultures_mouse_get_bg(void) static void vultures_mouse_get_tt_bg(void) { - if (vultures_tooltip.tip && vultures_tooltip.valid) - { + if (vultures_tooltip.tip && vultures_tooltip.valid) { if (vultures_tooltip.background) SDL_FreeSurface(vultures_tooltip.background); @@ -255,8 +249,7 @@ void vultures_mouse_invalidate_tooltip(int force) abs(vultures_mouse.cur.x - (vultures_tooltip.cur.x - cursor->xmod)) > 4 || abs(vultures_mouse.cur.y - (vultures_tooltip.cur.y - - cursor->ymod - cursor->graphic->h)) > 4) - { + cursor->ymod - cursor->graphic->h)) > 4) { vultures_tooltip.valid = 0; vultures_tooltip.cur.x = -1; vultures_tooltip.cur.x = -1; @@ -269,8 +262,7 @@ void vultures_mouse_set_tooltip(string str) { int length, height; - if (!str.empty() && str != vultures_tooltip.text) - { + if (!str.empty() && str != vultures_tooltip.text) { vultures_tooltip.text = str; if (vultures_tooltip.background) vultures/vultures_mou.cpp @@ -1,11 +1,10 @@ /* Copyright (c) Daniel Thaler, 2006, 2008 */ /* NetHack may be freely redistributed. See license for details. */ -#include <stdlib.h> -#include <string.h> #include <errno.h> #include "hack.h" +#include "epri.h" #if !defined WIN32 #include <sys/mman.h> @@ -20,12 +19,7 @@ #include "vultures_opt.h" #include "vultures_tileconfig.h" -#include "epri.h" - - - #define TILEARRAYLEN (GAMETILECOUNT*3) - #define TILECACHE_MAXAGE 4 typedef struct { @@ -70,6 +64,7 @@ void vultures_tilecache_discard(void) } } + void vultures_tilecache_age(void) { int i; @@ -84,6 +79,7 @@ void vultures_tilecache_age(void) } } + void vultures_tilecache_add(vultures_tile *tile, int tile_id) { if (vultures_tilecache[tile_id].tile && vultures_tilecache[tile_id].tile != tile) @@ -228,7 +224,6 @@ static inline vultures_tile * vultures_shade_tile(vultures_tile *orig, int shade } - void vultures_put_tilehighlight(int x, int y, int tile_id) { vultures_tile *tile; @@ -277,8 +272,6 @@ void vultures_put_tilehighlight(int x, int y, int tile_id) } - - int vultures_load_gametiles(void) { string filename; @@ -327,7 +320,6 @@ void vultures_unload_gametiles(void) } - static vultures_tile *vultures_make_alpha_player_tile(int monnum, double op_scale) { static int tilenum = -1; @@ -379,7 +371,6 @@ static inline void vultures_set_tile_alpha(vultures_tile *tile, double opacity) } - int vultures_object_to_tile(int obj_id, int x, int y, struct obj *in_obj) { struct obj *obj; @@ -514,7 +505,7 @@ int vultures_monster_to_tile(int mon_id, int x, int y) /* we have different tiles for priests depending on their alignment */ if (mon_id == PM_ALIGNED_PRIEST) { - register struct monst *mtmp = m_at(x, y); + struct monst *mtmp = m_at(x, y); switch (EPRI(mtmp)->shralign) { case A_LAWFUL: return V_MISC_LAWFUL_PRIEST; @@ -529,6 +520,3 @@ int vultures_monster_to_tile(int mon_id, int x, int y) return V_TILE_NONE; } - - - vultures/vultures_tile.cpp @@ -27,8 +27,7 @@ static struct vultures_font { int vultures_load_font (int font_id, const char * ttf_filename, int fontindex, int pointsize) { TTF_Font *newfont; - if(!TTF_WasInit()) - { + if(!TTF_WasInit()) { if(TTF_Init()==-1) return FALSE; @@ -121,8 +120,7 @@ void vultures_put_text_multiline(int font_id, string str, SDL_Surface *dest, text_height = vultures_text_height(font_id, str); /* lastfit is true when the last segment has been fit onto the surface (drawn) */ - while (!lastfit) - { + while (!lastfit) { lastfit = 1; startpos = startpos + endpos; @@ -132,8 +130,7 @@ void vultures_put_text_multiline(int font_id, string str, SDL_Surface *dest, txtlen = vultures_text_length(font_id, str_copy); /* split word off the end of the string until it is short enough to fit */ - while (txtlen > maxlen) - { + while (txtlen > maxlen) { /* a piece will be split off the end, so this is not the last piece */ lastfit = 0; vultures/vultures_txt.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) Daniel Thaler, 2006 */ +/* Copyright (c) Daniel Thaler, 2006, 2008 */ /* NetHack may be freely redistributed. See license for details. */ #ifndef _vultures_win_h_ vultures/vultures_win.h @@ -1,3 +1,5 @@ +/* Copyright (c) Daniel Thaler, 2008 */ +/* NetHack may be freely redistributed. See license for details. */ #include "vultures_win.h" #include "vultures_sdl.h" vultures/winclass/anykeydialog.cpp @@ -1,3 +1,6 @@ +/* Copyright (c) Daniel Thaler, 2008 */ +/* NetHack may be freely redistributed. See license for details. */ + #ifndef _anykeydialog_h_ #define _anykeydialog_h_ vultures/winclass/anykeydialog.h @@ -1,3 +1,5 @@ +/* Copyright (c) Daniel Thaler, 2008 */ +/* NetHack may be freely redistributed. See license for details. */ #include "vultures_win.h" #include "vultures_gra.h" vultures/winclass/button.cpp @@ -1,3 +1,6 @@ +/* Copyright (c) Daniel Thaler, 2008 */ +/* NetHack may be freely redistributed. See license for details. */ + #ifndef _button_h_ #define _button_h_ vultures/winclass/button.h @@ -1,3 +1,5 @@ +/* Copyright (c) Daniel Thaler, 2008 */ +/* NetHack may be freely redistributed. See license for details. */ #include <cstring> vultures/winclass/choicedialog.cpp @@ -1,3 +1,6 @@ +/* Copyright (c) Daniel Thaler, 2008 */ +/* NetHack may be freely redistributed. See license for details. */ + #ifndef _choicedialog_h_ #define _choicedialog_h_ vultures/winclass/choicedialog.h @@ -1,3 +1,5 @@ +/* Copyright (c) Daniel Thaler, 2008 */ +/* NetHack may be freely redistributed. See license for details. */ #include "vultures_gra.h" #include "vultures_sdl.h" vultures/winclass/contextmenu.cpp @@ -1,3 +1,6 @@ +/* Copyright (c) Daniel Thaler, 2008 */ +/* NetHack may be freely redistributed. See license for details. */ + #ifndef _contextmenu_h_ #define _contextmenu_h_ vultures/winclass/contextmenu.h @@ -1,3 +1,5 @@ +/* Copyright (c) Daniel Thaler, 2008 */ +/* NetHack may be freely redistributed. See license for details. */ #include "vultures_win.h" #include "vultures_gen.h" vultures/winclass/dirdialog.cpp @@ -1,3 +1,6 @@ +/* Copyright (c) Daniel Thaler, 2008 */ +/* NetHack may be freely redistributed. See license for details. */ + #ifndef _dirdialog_h_ #define _dirdialog_h_ vultures/winclass/dirdialog.h @@ -1,3 +1,5 @@ +/* Copyright (c) Daniel Thaler, 2008 */ +/* NetHack may be freely redistributed. See license for details. */ extern "C" { #include "hack.h" vultures/winclass/endingwin.cpp @@ -1,3 +1,6 @@ +/* Copyright (c) Daniel Thaler, 2008 */ +/* NetHack may be freely redistributed. See license for details. */ + #ifndef _endingwin_h_ #define _endingwin_h_ vultures/winclass/endingwin.h @@ -1,7 +1,8 @@ +/* Copyright (c) Daniel Thaler, 2008 */ +/* NetHack may be freely redistributed. See license for details. */ extern "C" { #include "hack.h" -// #include "skills.h" boolean can_advance(int skill, int speedy); } vultures/winclass/enhancebutton.cpp @@ -1,11 +1,12 @@ +/* Copyright (c) Daniel Thaler, 2008 */ +/* NetHack may be freely redistributed. See license for details. */ + #ifndef _enhancebutton_h_ #define _enhancebutton_h_ #include <SDL.h> - #include "window.h" - #define V_FILENAME_ENHANCE "enhance" vultures/winclass/enhancebutton.h @@ -1,7 +1,8 @@ +/* Copyright (c) Daniel Thaler, 2008 */ +/* NetHack may be freely redistributed. See license for details. */ #include "hotspot.h" - hotspot::hotspot(window *parent, int x, int y, int w, int h, int menu_id, string name) : window(parent) { this->x = x; vultures/winclass/hotspot.cpp @@ -1,3 +1,6 @@ +/* Copyright (c) Daniel Thaler, 2008 */ +/* NetHack may be freely redistributed. See license for details. */ + #ifndef _hotspot_h_ #define _hotspot_h_ vultures/winclass/hotspot.h @@ -1,3 +1,5 @@ +/* Copyright (c) Daniel Thaler, 2008 */ +/* NetHack may be freely redistributed. See license for details. */ #include "vultures_win.h" #include "vultures_txt.h" vultures/winclass/inputdialog.cpp @@ -1,3 +1,6 @@ +/* Copyright (c) Daniel Thaler, 2008 */ +/* NetHack may be freely redistributed. See license for details. */ + #ifndef _inputdialog_h_ #define _inputdialog_h_ vultures/winclass/inputdialog.h @@ -1,4 +1,5 @@ - +/* Copyright (c) Daniel Thaler, 2008 */ +/* NetHack may be freely redistributed. See license for details. */ extern "C" { #include "hack.h" vultures/winclass/inventory.cpp @@ -1,3 +1,6 @@ +/* Copyright (c) Daniel Thaler, 2008 */ +/* NetHack may be freely redistributed. See license for details. */ + #ifndef _inventory_h_ #define _inventory_h_ vultures/winclass/inventory.h @@ -1,9 +1,10 @@ +/* Copyright (c) Daniel Thaler, 2008 */ +/* NetHack may be freely redistributed. See license for details. */ extern "C" { #include "hack.h" } - #include "levelwin.h" #include "hotspot.h" #include "minimap.h" vultures/winclass/levelwin.cpp @@ -1,3 +1,5 @@ +/* Copyright (c) Daniel Thaler, 2008 */ +/* NetHack may be freely redistributed. See license for details. */ #include "mainwin.h" vultures/winclass/mainwin.cpp @@ -1,3 +1,6 @@ +/* Copyright (c) Daniel Thaler, 2008 */ +/* NetHack may be freely redistributed. See license for details. */ + #ifndef _mainwin_h_ #define _mainwin_h_ vultures/winclass/mainwin.h @@ -1,3 +1,6 @@ +/* Copyright (c) Daniel Thaler, 2008 */ +/* NetHack may be freely redistributed. See license for details. */ + extern "C" { #include "hack.h" vultures/winclass/map.cpp @@ -1,3 +1,6 @@ +/* Copyright (c) Daniel Thaler, 2008 */ +/* NetHack may be freely redistributed. See license for details. */ + #ifndef _map_h_ #define _map_h_ @@ -28,5 +31,4 @@ private: mapdata *map_data; }; - #endif vultures/winclass/map.h @@ -1,3 +1,6 @@ +/* Copyright (c) Daniel Thaler, 2008 */ +/* NetHack may be freely redistributed. See license for details. */ + #include "vultures_main.h" #include "vultures_win.h" #include "vultures_gen.h" vultures/winclass/mapdata.cpp @@ -1,3 +1,6 @@ +/* Copyright (c) Daniel Thaler, 2008 */ +/* NetHack may be freely redistributed. See license for details. */ + #ifndef _mapdata_h_ #define _mapdata_h_ vultures/winclass/mapdata.h @@ -1,3 +1,6 @@ +/* Copyright (c) Daniel Thaler, 2008 */ +/* NetHack may be freely redistributed. See license for details. */ + extern "C" { #include "hack.h" } vultures/winclass/menuwin.cpp @@ -1,3 +1,6 @@ +/* Copyright (c) Daniel Thaler, 2008 */ +/* NetHack may be freely redistributed. See license for details. */ + #ifndef _menuwin_h_ #define _menuwin_h_ @@ -72,5 +75,4 @@ protected: int count; }; - #endif vultures/winclass/menuwin.h @@ -1,3 +1,5 @@ +/* Copyright (c) Daniel Thaler, 2008 */ +/* NetHack may be freely redistributed. See license for details. */ extern "C" { #include "hack.h" vultures/winclass/messagewin.cpp @@ -1,3 +1,6 @@ +/* Copyright (c) Daniel Thaler, 2008 */ +/* NetHack may be freely redistributed. See license for details. */ + #ifndef _messagewin_h_ #define _messagewin_h_ @@ -32,5 +35,4 @@ private: extern messagewin *msgwin; - #endif vultures/winclass/messagewin.h @@ -1,3 +1,5 @@ +/* Copyright (c) Daniel Thaler, 2008 */ +/* NetHack may be freely redistributed. See license for details. */ extern "C" { #include "hack.h" @@ -15,7 +17,6 @@ extern "C" { #include "levelwin.h" - minimap::minimap(levelwin *p, mapdata *data) : window(p), level(p), map_data(data) { minimapbg = vultures_load_graphic(V_FILENAME_MINIMAPBG); vultures/winclass/minimap.cpp @@ -1,3 +1,6 @@ +/* Copyright (c) Daniel Thaler, 2008 */ +/* NetHack may be freely redistributed. See license for details. */ + #ifndef _minimap_h_ #define _minimap_h_ vultures/winclass/minimap.h @@ -1,3 +1,5 @@ +/* Copyright (c) Daniel Thaler, 2008 */ +/* NetHack may be freely redistributed. See license for details. */ #include "vultures_sdl.h" #include "vultures_gra.h" vultures/winclass/objheaderwin.cpp @@ -1,3 +1,6 @@ +/* Copyright (c) Daniel Thaler, 2008 */ +/* NetHack may be freely redistributed. See license for details. */ + #ifndef _objheaderwin_h_ #define _objheaderwin_h_ @@ -12,5 +15,4 @@ public: virtual eventresult event_handler(window *target, void *result, SDL_Event *event); }; - #endif vultures/winclass/objheaderwin.h @@ -1,3 +1,5 @@ +/* Copyright (c) Daniel Thaler, 2008 */ +/* NetHack may be freely redistributed. See license for details. */ #include "vultures_win.h" #include "vultures_gra.h" vultures/winclass/objitemwin.cpp @@ -1,3 +1,6 @@ +/* Copyright (c) Daniel Thaler, 2008 */ +/* NetHack may be freely redistributed. See license for details. */ + #ifndef _objitemwin_h_ #define _objitemwin_h_ vultures/winclass/objitemwin.h @@ -1,3 +1,5 @@ +/* Copyright (c) Daniel Thaler, 2008 */ +/* NetHack may be freely redistributed. See license for details. */ #include "optionwin.h" #include "menuwin.h" vultures/winclass/optionwin.cpp @@ -1,3 +1,6 @@ +/* Copyright (c) Daniel Thaler, 2008 */ +/* NetHack may be freely redistributed. See license for details. */ + #ifndef _optionwin_h_ #define _optionwin_h_ vultures/winclass/optionwin.h @@ -1,3 +1,5 @@ +/* Copyright (c) Daniel Thaler, 2008 */ +/* NetHack may be freely redistributed. See license for details. */ #include "vultures_gra.h" #include "vultures_sdl.h" vultures/winclass/scrollbar.cpp @@ -1,3 +1,6 @@ +/* Copyright (c) Daniel Thaler, 2008 */ +/* NetHack may be freely redistributed. See license for details. */ + #ifndef _scrollbar_h_ #define _scrollbar_h_ vultures/winclass/scrollbar.h @@ -1,3 +1,5 @@ +/* Copyright (c) Daniel Thaler, 2008 */ +/* NetHack may be freely redistributed. See license for details. */ #include "scrollwin.h" #include "scrollbar.h" vultures/winclass/scrollwin.cpp @@ -1,3 +1,6 @@ +/* Copyright (c) Daniel Thaler, 2008 */ +/* NetHack may be freely redistributed. See license for details. */ + #ifndef _scrollwin_h_ #define _scrollwin_h_ vultures/winclass/scrollwin.h @@ -1,3 +1,5 @@ +/* Copyright (c) Daniel Thaler, 2008 */ +/* NetHack may be freely redistributed. See license for details. */ extern "C" { #include "hack.h" vultures/winclass/statuswin.cpp @@ -1,3 +1,6 @@ +/* Copyright (c) Daniel Thaler, 2008 */ +/* NetHack may be freely redistributed. See license for details. */ + #ifndef _statuswin_h_ #define _statuswin_h_ vultures/winclass/statuswin.h @@ -1,5 +1,5 @@ -#include <cstring> - +/* Copyright (c) Daniel Thaler, 2008 */ +/* NetHack may be freely redistributed. See license for details. */ #include "vultures_gra.h" #include "vultures_txt.h" vultures/winclass/textwin.cpp @@ -1,3 +1,6 @@ +/* Copyright (c) Daniel Thaler, 2008 */ +/* NetHack may be freely redistributed. See license for details. */ + #ifndef _textwin_h_ #define _textwin_h_ vultures/winclass/textwin.h @@ -1,3 +1,5 @@ +/* Copyright (c) Daniel Thaler, 2008 */ +/* NetHack may be freely redistributed. See license for details. */ #include "vultures_gfl.h" #include "vultures_gra.h" vultures/winclass/toolbar.cpp @@ -1,3 +1,6 @@ +/* Copyright (c) Daniel Thaler, 2008 */ +/* NetHack may be freely redistributed. See license for details. */ + #ifndef _toolbar_h_ #define _toolbar_h_ vultures/winclass/toolbar.h @@ -1,4 +1,5 @@ -#include <cstring> +/* Copyright (c) Daniel Thaler, 2008 */ +/* NetHack may be freely redistributed. See license for details. */ #include "window.h" vultures/winclass/window.cpp @@ -1,3 +1,6 @@ +/* Copyright (c) Daniel Thaler, 2008 */ +/* NetHack may be freely redistributed. See license for details. */ + #ifndef _window_h_ #define _window_h_ vultures/winclass/window.h 8cd3cc4948f662f62a94cd70aa4f9660adb0b0d1 Daniel Thaler daniel@dthaler.de http://github.com/clivecrous/vultures/commit/3d72fbefbca181e7f9f32cea065556993894df7d 3d72fbefbca181e7f9f32cea065556993894df7d 2008-12-21T06:50:11-08:00 2008-12-21T06:50:11-08:00 Add copyright headers where they were missing Also some minor cleanups eab7bad03e0c68b85822086bdc082828c4743f4f Daniel Thaler daniel@dthaler.de