nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

outrip() updating (trunk only)

Browse Source 
Part II of the bones tracking patch.  Change umpteen different outrip()
routines to handle its new time_t argument, and use formatkiller() instead
of directly accessing killer.{format,name} and killed_by_prefix[].  The
latter is now static within formatkiller().

     The many sys/* and win/* changes are untested....
This commit is contained in:
nethack.rankin
2012-01-24 04:26:33 +00:00
parent 9721470635
commit a871ad06e9
19 changed files with 80 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/.gitignore vendored
View File

@@ -1,7 +1,3 @@
pm.h
vis_tab.h
onames.h
date.h
dgn_comp.h
tile.h
lev_comp.h
.cvsignore
date.h onames.h pm.h vis_tab.h
dgn_comp.h lev_comp.h

7
include/qt_win.h
View File

@@ -1,5 +1,4 @@
// NetHack 3.5 qt_win.h $Date$ $Revision$
// SCCS Id: @(#)qt_win.h 3.5 1999/11/19
// Copyright (c) Warwick Allison, 1999.
// NetHack may be freely redistributed. See license for details.
//
@@ -256,7 +255,7 @@ public:
virtual int SelectMenu(int how, MENU_ITEM_P **menu_list);
virtual void ClipAround(int x,int y);
virtual void PrintGlyph(int x,int y,int glyph);
virtual void UseRIP(int how);
virtual void UseRIP(int how, time_t when);
int nhid;
};
@@ -621,7 +620,7 @@ public:
virtual bool Destroy();
virtual void Display(bool block);
virtual void PutStr(int attr, const char* text);
virtual void UseRIP(int how);
virtual void UseRIP(int how, time_t when);
public slots:
void Search();
@@ -839,7 +838,7 @@ public:
static void qt_start_screen();
static void qt_end_screen();
static void qt_outrip(winid wid, int how);
static void qt_outrip(winid wid, int how, time_t when);
static int qt_kbhit();
private:

6
include/winX.h
View File

@@ -349,7 +349,7 @@ E void FDECL(init_text_buffer,(struct text_buffer*));
E void FDECL(clear_text_buffer,(struct text_buffer*));
E void FDECL(free_text_buffer,(struct text_buffer*));
#ifdef GRAPHIC_TOMBSTONE
E void FDECL(calculate_rip_text, (int));
E void FDECL(calculate_rip_text, (int,time_t));
#endif
@@ -408,9 +408,9 @@ E void NDECL(X11_start_screen);
E void NDECL(X11_end_screen);
#ifdef GRAPHIC_TOMBSTONE
E void FDECL(X11_outrip, (winid,int));
E void FDECL(X11_outrip, (winid,int,time_t));
#else
E void FDECL(genl_outrip, (winid,int));
E void FDECL(genl_outrip, (winid,int,time_t));
#endif
E void FDECL(X11_preference_update, (const char *));

2
include/wingem.h
View File

@@ -105,7 +105,7 @@ E char * NDECL(Gem_get_color_string);
E void NDECL(Gem_start_screen);
E void NDECL(Gem_end_screen);
E void FDECL(genl_outrip, (winid,int));
E void FDECL(genl_outrip, (winid,int,time_t));
#undef E