@@ -7,7 +7,6 @@ General functions --------------------------------------------------------------------------*/ #include <string> -using std::string; #include <stdarg.h> @@ -39,9 +38,9 @@ using std::string; #define OOM(do_exit) vultures_oom(do_exit, __FILE__, __LINE__) -extern string& trim(string &str); +extern std::string& trim(std::string &str); extern char *vultures_basename(const char *filename); -extern string vultures_make_filename(string subdir1, string subdir2, string name); +extern std::string vultures_make_filename(std::string subdir1, std::string subdir2, std::string name); extern void vultures_init_gamepath(void); extern void vultures_write_log(int msgtype, const char *file, vultures/vultures_gen.h @@ -153,11 +153,11 @@ loads the given file into a buffer and calls vultures_load_surface subdir: [in] subdirectory in which to look name: [in] filename of the image ---------------------------------------*/ -SDL_Surface *vultures_load_graphic(string name) +SDL_Surface *vultures_load_graphic(std::string name) { SDL_Surface *image; int fsize; - string filename; + std::string filename; FILE * fp; char * srcbuf; @@ -192,7 +192,7 @@ SDL_Surface *vultures_load_graphic(string name) /*-------------------------------------------- Save the contents of the surface to a png file --------------------------------------------*/ -void vultures_save_png(SDL_Surface *surface, string filename, int with_alpha) +void vultures_save_png(SDL_Surface *surface, std::string filename, int with_alpha) { png_structp png_ptr; png_infop info_ptr; @@ -249,9 +249,9 @@ back buffer) into a BMP file. ---------------------------------------*/ void vultures_save_screenshot(void) { - string filename; + std::string filename; int i; - string msg; + std::string msg; char namebuf[20]; for (i = 0; i < 1000; i++) @@ -261,7 +261,7 @@ void vultures_save_screenshot(void) if (access(filename.c_str(), R_OK) != 0) { vultures_save_png(vultures_screen, filename, 0); - msg = string("Screenshot saved as ") + namebuf + "."; + msg = std::string("Screenshot saved as ") + namebuf + "."; if (vultures_windows_inited) vultures_messagebox(msg); vultures/vultures_gfl.cpp @@ -7,12 +7,11 @@ #include <SDL.h> #include <string> -using std::string; extern SDL_Surface *vultures_load_surface(char *srcbuf, unsigned int buflen); -extern SDL_Surface *vultures_load_graphic(string name); +extern SDL_Surface *vultures_load_graphic(std::string name); -extern void vultures_save_png(SDL_Surface * surface, string filename, int with_alpha); +extern void vultures_save_png(SDL_Surface * surface, std::string filename, int with_alpha); extern void vultures_save_screenshot(void); vultures/vultures_gfl.h @@ -3,8 +3,6 @@ #include <vector> #include <string> -using std::vector; -using std::string; #include <errno.h> @@ -26,7 +24,7 @@ using std::string; #include "date.h" /* this is in <variant>/include it's needed for VERSION_ID */ -static void vultures_show_intro(string introscript_name); +static void vultures_show_intro(std::string introscript_name); /*---------------------------- @@ -71,7 +69,7 @@ void vultures_show_logo_screen(void) void vultures_player_selection(void) { SDL_Surface *logo; - string filename; + std::string filename; SDL_FillRect(vultures_screen, NULL, CLR32_BLACK); logo = vultures_load_graphic(V_FILENAME_CHARACTER_GENERATION); @@ -113,14 +111,14 @@ void vultures_askname(void) } -static void vultures_show_intro(string introscript_name) +static void vultures_show_intro(std::string introscript_name) { FILE *f; char buffer[1024]; unsigned int nr_scenes, lineno; - string line; - vector<string> imagenames; - vector< vector<string> > subtitles; + std::string line; + std::vector<std::string> imagenames; + std::vector< std::vector<std::string> > subtitles; introwin *iw; int dummy; @@ -138,7 +136,7 @@ static void vultures_show_intro(string introscript_name) if (buffer[0] == '%') { /* new scene */ - line = string(&buffer[1]); + line = std::string(&buffer[1]); trim(line); if (line.length() == 0) @@ -162,7 +160,7 @@ static void vultures_show_intro(string introscript_name) continue; } - line = string(buffer); + line = std::string(buffer); trim(line); subtitles[nr_scenes - 1].push_back(line); @@ -223,7 +221,7 @@ int vultures_init_graphics(void) { int all_ok = TRUE; SDL_Surface *image; - string fullname; + std::string fullname; int font_loaded = 0; vultures/vultures_init.cpp @@ -567,7 +567,7 @@ void vultures_putstr(int winid, int attr, const char *str) if (strncmp(str, "Done.", 5) == 0) return; - msgwin->add_message(string(str)); + msgwin->add_message(std::string(str)); /* Play any event sounds associated with this message */ vultures_play_event_sound(str); vultures/vultures_main.cpp @@ -22,7 +22,7 @@ static struct { static struct { point cur; SDL_Surface *background, *tip; - string text; + std::string text; int valid; SDL_Rect refresh; } vultures_tooltip = {{0, 0}, NULL, NULL, "", 0, {0,0,0,0}}; @@ -257,7 +257,7 @@ void vultures_mouse_invalidate_tooltip(int force) -void vultures_mouse_set_tooltip(string str) +void vultures_mouse_set_tooltip(std::string str) { int length, height; vultures/vultures_mou.cpp @@ -4,7 +4,6 @@ #define _vultures_mou_h_ #include <string> -using std::string; extern void vultures_mouse_init(void); extern void vultures_mouse_destroy(void); @@ -20,7 +19,7 @@ extern void vultures_mouse_restore_bg(); /* tooltip handling functions */ extern void vultures_mouse_invalidate_tooltip(int force); -extern void vultures_mouse_set_tooltip(string str); +extern void vultures_mouse_set_tooltip(std::string str); vultures/vultures_mou.h @@ -198,7 +198,7 @@ void vultures_read_sound_config(FILE * fp) -string vultures_get_userdir(void) +std::string vultures_get_userdir(void) { char userdir[512]; @@ -217,9 +217,9 @@ string vultures_get_userdir(void) void vultures_read_options(void) { FILE *fp; - string filename; + std::string filename; int i; - string userdir = vultures_get_userdir(); + std::string userdir = vultures_get_userdir(); /* initialize these, in case they aren't set in the config file */ vultures_opts.wall_opacity = 1.0; @@ -303,7 +303,7 @@ void vultures_read_options(void) void vultures_write_userconfig(void) { - string filename, dir; + std::string filename, dir; struct stat statbuf; mode_t oldmask; int i; vultures/vultures_opt.cpp @@ -16,7 +16,7 @@ /*******************************************************************/ -vector<vultures_event_sound> vultures_event_sounds; +std::vector<vultures_event_sound> vultures_event_sounds; int vultures_n_background_songs; int vultures_sound_inited = 0; @@ -33,9 +33,9 @@ Mix_Music *vultures_current_music=NULL; /*******************************************************************/ -static void vultures_play_song(string midifilename); -static void vultures_play_cd_track(string cdtrackname); -static void vultures_play_sound(string wavefilename); +static void vultures_play_song(std::string midifilename); +static void vultures_play_cd_track(std::string cdtrackname); +static void vultures_play_sound(std::string wavefilename); static int vultures_is_music_playing(void); /*******************************************************************/ @@ -134,7 +134,7 @@ void vultures_play_ambient_sound(int force_play) } -static void vultures_play_song(string midifilename) +static void vultures_play_song(std::string midifilename) { if (!vultures_opts.play_music) return; @@ -147,7 +147,7 @@ static void vultures_play_song(string midifilename) } -static void vultures_play_cd_track(string cdtrackname) +static void vultures_play_cd_track(std::string cdtrackname) { int nTrack; @@ -174,7 +174,7 @@ static void vultures_play_cd_track(string cdtrackname) } -static void vultures_play_sound(string wavefilename) +static void vultures_play_sound(std::string wavefilename) { int i; int sound_exists; vultures/vultures_sound.cpp @@ -9,8 +9,6 @@ #include <string> #include <vector> -using std::string; -using std::vector; #define V_MAX_CACHED_SOUNDS 40 @@ -28,13 +26,13 @@ enum vultures_event_sound_enum { typedef struct { char * searchpattern; int soundtype; - string filename; + std::string filename; } vultures_event_sound; typedef struct { Mix_Chunk *chunk; - string filename; + std::string filename; } vultures_cached_sound; @@ -46,7 +44,7 @@ extern void vultures_stop_music(void); extern vultures_cached_sound * vultures_cached_sounds; extern SDL_CD *vultures_cdrom; -extern vector<vultures_event_sound> vultures_event_sounds; +extern std::vector<vultures_event_sound> vultures_event_sounds; extern int vultures_n_background_songs; vultures/vultures_sound.h @@ -275,7 +275,7 @@ void vultures_put_tilehighlight(int x, int y, int tile_id) int vultures_load_gametiles(void) { - string filename; + std::string filename; FILE * fp; /* load gametiles.bin */ vultures/vultures_tile.cpp @@ -10,7 +10,6 @@ extern "C" { #include "hack.h" } -using std::string; extern void vultures_put_tile_shaded(int x, int y, int tile_id, int shadelevel); extern int vultures_load_gametiles(void); @@ -259,7 +258,7 @@ enum special_tiles { class gametiles { public: gametiles() : filename(""), ptr(0), hs_x(0), hs_y(0) {}; - string filename; + std::string filename; int ptr; int hs_x; int hs_y; vultures/vultures_tile.h @@ -11,22 +11,21 @@ extern "C" { #include "vultures_opt.h" #include <vector> -using std::vector; class tmp_tile { public: tmp_tile() : filename(""), ptr_type(0), ptr_num(0), hs_x(0), hs_y(0) {}; - string filename; + std::string filename; int ptr_type, ptr_num; int hs_x, hs_y; }; -vector< vector<string> > tilenames(NUM_TILETYPES); +std::vector< std::vector<std::string> > tilenames(NUM_TILETYPES); int tmp_wallstyles[V_WALL_STYLE_MAX][8]; int tmp_flooredges[V_FLOOR_EDGE_MAX][12]; -vector<tmp_tile> tmp_gametiles[NUM_TILETYPES]; +std::vector<tmp_tile> tmp_gametiles[NUM_TILETYPES]; tmp_tile deftiles[NUM_TILETYPES]; /* things that get used by vultures later */ @@ -38,16 +37,16 @@ int vultures_typecount[NUM_TILETYPES]; int glassgems[CLR_MAX]; /* names for the various tiletypes */ -static vector<string> typenames(NUM_TILETYPES); -static vector<string> floorstylenames(V_FLOOR_STYLE_MAX); -static vector<string> wallstylenames(V_WALL_STYLE_MAX); -static vector<string> edgestylenames(V_FLOOR_EDGE_MAX); +static std::vector<std::string> typenames(NUM_TILETYPES); +static std::vector<std::string> floorstylenames(V_FLOOR_STYLE_MAX); +static std::vector<std::string> wallstylenames(V_WALL_STYLE_MAX); +static std::vector<std::string> edgestylenames(V_FLOOR_EDGE_MAX); /* the enum for the misc tiles starts at MISCTILEOFFSET so that the enumerated * names can be used diretly in the code; here however this means we need to * subtract MISCTILEOFFSET everywhere to get usable array indices */ -static vector<string> miscnames(MISCTILECOUNT); -static vector<string> cursornames(V_CURSOR_MAX); +static std::vector<std::string> miscnames(MISCTILECOUNT); +static std::vector<std::string> cursornames(V_CURSOR_MAX); static void init_typenames(); vultures/vultures_tileconfig.cpp @@ -53,12 +53,12 @@ int vultures_load_font (int font_id, const char * ttf_filename, int fontindex, i } -int vultures_put_text (int font_id, string str, SDL_Surface *dest, int x, int y, Uint32 color) +int vultures_put_text (int font_id, std::string str, SDL_Surface *dest, int x, int y, Uint32 color) { SDL_Surface *textsurface; SDL_Color fontcolor; SDL_Rect dstrect; - string cleaned_str; + std::string cleaned_str; unsigned int i; if (font_id >= VULTURES_MAX_FONTS || (!vultures_fonts[font_id].fontptr) || str.empty()) @@ -95,7 +95,7 @@ int vultures_put_text (int font_id, string str, SDL_Surface *dest, int x, int y, -int vultures_put_text_shadow (int font_id, string str, SDL_Surface *dest, +int vultures_put_text_shadow (int font_id, std::string str, SDL_Surface *dest, int x, int y, Uint32 textcolor, Uint32 shadowcolor) { /* draw the shadow first */ @@ -106,10 +106,10 @@ int vultures_put_text_shadow (int font_id, string str, SDL_Surface *dest, /* draw text over multiple lines if its length exceeds maxlen */ -void vultures_put_text_multiline(int font_id, string str, SDL_Surface *dest, +void vultures_put_text_multiline(int font_id, std::string str, SDL_Surface *dest, int x, int y, Uint32 color, Uint32 shadowcolor, int maxlen) { - string str_copy; + std::string str_copy; int lastfit, txtlen, lineno, text_height; size_t endpos, startpos; @@ -123,7 +123,7 @@ void vultures_put_text_multiline(int font_id, string str, SDL_Surface *dest, lastfit = 1; startpos = startpos + endpos; - str_copy = str.substr(startpos, string::npos); + str_copy = str.substr(startpos, std::string::npos); endpos = str_copy.length() - 1; txtlen = vultures_text_length(font_id, str_copy); @@ -137,7 +137,7 @@ void vultures_put_text_multiline(int font_id, string str, SDL_Surface *dest, endpos = str_copy.find_last_of(" \t\n"); /* prevent infinite loops if a long word doesn't fit */ - if (endpos == string::npos) { + if (endpos == std::string::npos) { endpos = str_copy.length() - 1; lastfit = 1; break; @@ -155,7 +155,7 @@ void vultures_put_text_multiline(int font_id, string str, SDL_Surface *dest, -int vultures_text_length (int font_id, string str) +int vultures_text_length (int font_id, std::string str) { int width = 0; @@ -169,7 +169,7 @@ int vultures_text_length (int font_id, string str) -int vultures_text_height (int font_id, string str) +int vultures_text_height (int font_id, std::string str) { int height = 0; vultures/vultures_txt.cpp @@ -6,7 +6,6 @@ #include <string> #include "SDL_ttf.h" -using std::string; /* Font indices. Currently, there're only 2 fonts (large & small). */ #define V_FONT_SMALL 0 @@ -34,17 +33,17 @@ using std::string; extern int vultures_load_font (int font_id, const char *ttf_filename, int fontindex, int pointsize); -extern int vultures_put_text (int font_id, string str, SDL_Surface *dest, +extern int vultures_put_text (int font_id, std::string str, SDL_Surface *dest, int x, int y, Uint32 color); -extern int vultures_put_text_shadow (int font_id, string str, SDL_Surface *dest, +extern int vultures_put_text_shadow (int font_id, std::string str, SDL_Surface *dest, int x, int y, Uint32 textcolor, Uint32 shadowcolor); -extern void vultures_put_text_multiline(int font_id, string str, SDL_Surface *dest, +extern void vultures_put_text_multiline(int font_id, std::string str, SDL_Surface *dest, int x, int y, Uint32 color, Uint32 shadowcolor, int maxlen); -extern int vultures_text_length (int font_id, string str); +extern int vultures_text_length (int font_id, std::string str); -extern int vultures_text_height (int font_id, string str); +extern int vultures_text_height (int font_id, std::string str); extern int vultures_get_lineheight(int font_id); vultures/vultures_txt.h @@ -56,7 +56,7 @@ static int vultures_handle_event(struct window * topwin, struct window * win, /****************************** * High-level window functions ******************************/ -void vultures_messagebox(string message) +void vultures_messagebox(std::string message) { mainwin *win; int dummy; vultures/vultures_win.cpp @@ -5,7 +5,6 @@ #include "vultures_types.h" #include <string> -using std::string; class window; @@ -84,7 +83,7 @@ typedef struct event { /* exported functions */ /* high-level window functions */ -extern void vultures_messagebox(string message); +extern void vultures_messagebox(std::string message); extern int vultures_get_input(int x, int y, const char *ques, char *input); vultures/vultures_win.h @@ -13,7 +13,7 @@ #include "button.h" -anykeydialog::anykeydialog(window *p, string ques) : mainwin(p) +anykeydialog::anykeydialog(window *p, std::string ques) : mainwin(p) { caption = ques; count = 0; vultures/winclass/anykeydialog.cpp @@ -10,7 +10,7 @@ class textwin; class anykeydialog : public mainwin { public: - anykeydialog(window *p, string ques); + anykeydialog(window *p, std::string ques); virtual bool draw(); virtual eventresult handle_mousemotion_event(window* target, void* result, int xrel, int yrel, int state); vultures/winclass/anykeydialog.h @@ -8,7 +8,7 @@ #include "button.h" -button::button(window *p, string caption, int menuid, char accel) : window(p) +button::button(window *p, std::string caption, int menuid, char accel) : window(p) { v_type = V_WINTYPE_BUTTON; vultures/winclass/button.cpp @@ -9,7 +9,7 @@ class button : public window { public: - button(window *p, string caption, int menuid, char accel); + button(window *p, std::string caption, int menuid, char accel); virtual ~button(); virtual bool draw(); virtual eventresult handle_mousebuttonup_event(window* target, void* result, vultures/winclass/button.h @@ -11,7 +11,7 @@ #include "button.h" -choicedialog::choicedialog(window *p, string question, const char *choices, char defchoice) : mainwin(p) +choicedialog::choicedialog(window *p, std::string question, const char *choices, char defchoice) : mainwin(p) { button *btn; int nbuttons = 0, longdesc = 0; vultures/winclass/choicedialog.cpp @@ -10,7 +10,7 @@ class button; class choicedialog : public mainwin { public: - choicedialog(window *p, string question, const char *choices, char defchoice); + choicedialog(window *p, std::string question, const char *choices, char defchoice); virtual bool draw(); virtual eventresult handle_mousemotion_event(window* target, void* result, int xrel, int yrel, int state); vultures/winclass/choicedialog.h @@ -12,7 +12,7 @@ class contextmenu : public window { public: - typedef std::vector<std::pair<string, int> > itemlist; + typedef std::vector<std::pair<std::string, int> > itemlist; contextmenu(window *p); virtual bool draw(); vultures/winclass/contextmenu.h @@ -16,7 +16,7 @@ #include "levelwin.h" -dirdialog::dirdialog(window *p, string ques) : mainwin(p) +dirdialog::dirdialog(window *p, std::string ques) : mainwin(p) { int arrows_w, arrows_h; @@ -137,4 +137,4 @@ bool dirdialog::draw() vultures_invalidate_region(abs_x, abs_y, w, h); return false; -} \ No newline at end of file +} vultures/winclass/dirdialog.cpp @@ -10,7 +10,7 @@ class hotspot; class dirdialog : public mainwin { public: - dirdialog(window *p, string ques); + dirdialog(window *p, std::string ques); virtual bool draw(); virtual eventresult handle_mousemotion_event(window* target, void* result, int xrel, int yrel, int state); vultures/winclass/dirdialog.h @@ -2,7 +2,7 @@ #include "hotspot.h" -hotspot::hotspot(window *parent, int x, int y, int w, int h, int menu_id, string name) : window(parent) +hotspot::hotspot(window *parent, int x, int y, int w, int h, int menu_id, std::string name) : window(parent) { this->x = x; this->y = y; vultures/winclass/hotspot.cpp @@ -9,7 +9,7 @@ class hotspot : public window { public: - hotspot(window *parent, int x, int y, int w, int h, int menu_id, string name); + hotspot(window *parent, int x, int y, int w, int h, int menu_id, std::string name); virtual bool draw(); }; vultures/winclass/hotspot.h @@ -9,7 +9,7 @@ #include "textwin.h" -inputdialog::inputdialog(window *p, string ques, int size, +inputdialog::inputdialog(window *p, std::string ques, int size, int force_x, int force_y) : mainwin(p) { caption = ques; @@ -71,7 +71,7 @@ eventresult inputdialog::handle_mousemotion_event(window* target, void* result, eventresult inputdialog::handle_keydown_event(window* target, void* result, int sym, int mod, int unicode) { - string &text = first_child->caption; + std::string &text = first_child->caption; switch (sym) { case SDLK_KP_ENTER: vultures/winclass/inputdialog.cpp @@ -10,7 +10,7 @@ class textwin; class inputdialog : public mainwin { public: - inputdialog(window *p, string caption, int size, + inputdialog(window *p, std::string caption, int size, int force_x, int force_y); virtual bool draw(); virtual eventresult handle_mousemotion_event(window* target, void* result, vultures/winclass/inputdialog.h @@ -12,7 +12,7 @@ #include "vultures_mou.h" #include "vultures_tile.h" -introwin::introwin(window *p, vector<string> &imagenames, vector< vector<string> > &subtitles) : +introwin::introwin(window *p, std::vector<std::string> &imagenames, std::vector< std::vector<std::string> > &subtitles) : window(p), imagenames(imagenames), subtitles(subtitles) { current_scene = -1; vultures/winclass/introwin.cpp @@ -7,15 +7,13 @@ #include <string> #include <vector> -using std::string; -using std::vector; #define SCENETIME 5000 class introwin : public window { public: - introwin(window *p, vector<string> &imagenames, vector< vector<string> > &subtitles); + introwin(window *p, std::vector<std::string> &imagenames, std::vector< std::vector<std::string> > &subtitles); virtual ~introwin(); virtual bool draw(); virtual eventresult handle_timer_event(window* target, void* result, int time); @@ -32,8 +30,8 @@ private: int current_scene; SDL_Surface *image; - vector<string> imagenames; - vector< vector<string> > subtitles; + std::vector<std::string> imagenames; + std::vector< std::vector<std::string> > subtitles; bool image_changed; int starttick; }; vultures/winclass/introwin.h @@ -39,7 +39,7 @@ inventory::inventory(window *p, std::list<menuitem> &menuitems, int how, int id) bool inventory::draw() { - string stored_caption; + std::string stored_caption; char label[32]; int ix ,iy, iw, ih, labelwidth, buttonspace; vultures/winclass/inventory.cpp @@ -475,7 +475,7 @@ bool levelwin::draw() eventresult levelwin::handle_timer_event(window* target, void* result, int time) { - string ttext; + std::string ttext; point mappos, mouse; mouse = vultures_get_mouse_pos(); vultures/winclass/levelwin.cpp @@ -149,7 +149,7 @@ void map::toggle(void) eventresult map::handle_timer_event(window* target, void* result, int time) { - string ttext; + std::string ttext; point mappos = get_mouse_mappos(); if (time < HOVERTIMEOUT) vultures/winclass/map.cpp @@ -170,7 +170,7 @@ void mapdata::clear() } /* notify observers */ - for (vector<mapviewer*>::iterator i = views.begin(); i != views.end(); ++i) + for (std::vector<mapviewer*>::iterator i = views.begin(); i != views.end(); ++i) (*i)->map_clear(); } @@ -640,12 +640,14 @@ void mapdata::set_map_data(glyph_type type, int x, int y, int newval, bool force /* raw glyph values are only stored, not printed */ map_glyph[y][x] = newval; return; + default: + throw "Invalid type for map data"; } if ((*data_array)[y][x] != newval || force) { prevtile = (*data_array)[y][x]; - for (vector<mapviewer*>::iterator i = views.begin(); i != views.end(); ++i) + for (std::vector<mapviewer*>::iterator i = views.begin(); i != views.end(); ++i) (*i)->map_update(type, prevtile, newval, x, y); (*data_array)[y][x] = newval; @@ -671,10 +673,10 @@ int mapdata::get_glyph(glyph_type type, int x, int y) const } -string mapdata::map_square_description(point target, int include_seen) +std::string mapdata::map_square_description(point target, int include_seen) { struct permonst *pm; - string out_str = ""; + std::string out_str = ""; char monbuf[BUFSZ], temp_buf[BUFSZ], coybuf[BUFSZ], look_buf[BUFSZ]; struct monst *mtmp = (struct monst *) 0; const char *firstmatch; @@ -990,10 +992,10 @@ void mapdata::add_viewer(mapviewer *v) void mapdata::del_viewer(mapviewer *v) { - for (vector<mapviewer*>::iterator i = views.begin(); i != views.end(); ++i) { + for (std::vector<mapviewer*>::iterator i = views.begin(); i != views.end(); ++i) { if (*i == v) { views.erase(i); return; } } -} \ No newline at end of file +} vultures/winclass/mapdata.cpp @@ -11,8 +11,6 @@ extern "C" { #include <string> #include <vector> -using std::string; -using std::vector; typedef enum { MAP_MON, @@ -73,7 +71,7 @@ public: void clear(); void set_glyph(int x, int y, int glyph); int get_glyph(glyph_type type, int x, int y) const; - string map_square_description(point target, int include_seen); + std::string map_square_description(point target, int include_seen); eventresult handle_click(void* result, int button, point mappos); map_action get_map_action(point mappos); map_action get_map_contextmenu(point mappos); @@ -102,7 +100,7 @@ private: int vultures_tilemap_engulf[NUMMONS]; int vultures_tilemap_misc[MAXPCHARS]; - vector<mapviewer*> views; + std::vector<mapviewer*> views; }; extern mapdata *map_data; vultures/winclass/mapdata.h @@ -4,15 +4,14 @@ #define _menuitem_h_ #include <string> -using std::string; class menuitem { public: - menuitem(string str, bool sel, void *ident, char accel, int glyph) : + menuitem(std::string str, bool sel, void *ident, char accel, int glyph) : identifier(ident), str(str), glyph(glyph), preselected(sel), accelerator(accel), selected(false), count(-1) {}; const void *identifier; - string str; + std::string str; int glyph; bool preselected; char accelerator; @@ -20,4 +19,4 @@ public: int count; }; -#endif \ No newline at end of file +#endif vultures/winclass/menuitem.h @@ -328,7 +328,7 @@ void menuwin::layout() int scrollheight = 0; int buttonheight = vultures_get_lineheight(V_FONT_MENU) + 15; int menu_height_limit; - string newcaption; + std::string newcaption; // remove existing scrollarea if (scrollarea) vultures/winclass/menuwin.cpp @@ -61,7 +61,7 @@ bool messagewin::draw() { int age, textlen, num_messages; int pos_x, pos_y, i; - string message; + std::string message; int refresh_x, refresh_y, refresh_h, refresh_w; int time_cur = moves; @@ -175,7 +175,7 @@ eventresult messagewin::handle_mousebuttonup_event(window* target, void* result, } -void messagewin::add_message(string str) +void messagewin::add_message(std::string str) { message_cur = message_top = (message_top + 1) % V_MESSAGEBUF_SIZE; message_buf[message_top] = str; @@ -196,7 +196,7 @@ int messagewin::getshown() /* retrieve a message from the message buffer, offset messages before the current one */ -string messagewin::get_message(int offset, int *age) +std::string messagewin::get_message(int offset, int *age) { if (offset < V_MESSAGEBUF_SIZE) { @@ -217,7 +217,7 @@ string messagewin::get_message(int offset, int *age) void messagewin::view_all(void) { int offset, time, winid; - string message; + std::string message; char menuline[256]; winid = vultures_create_nhwindow(NHW_MENU); vultures/winclass/messagewin.cpp @@ -22,16 +22,16 @@ public: virtual eventresult handle_mousebuttonup_event(window* target, void* result, int mouse_x, int mouse_y, int button, int state); - void add_message(string msg); + void add_message(std::string msg); void setshown(int first); int getshown(void); - string get_message(int offset, int *age); + std::string get_message(int offset, int *age); void view_all(void); private: SDL_Surface *bg_img; int message_ages[V_MESSAGEBUF_SIZE]; - string message_buf[V_MESSAGEBUF_SIZE]; + std::string message_buf[V_MESSAGEBUF_SIZE]; int message_cur, message_top; }; vultures/winclass/messagewin.h @@ -4,9 +4,8 @@ #include "window.h" #include <vector> -using std::vector; -static vector<nhwindow*> vultures_nhwindows(8); +static std::vector<nhwindow*> vultures_nhwindows(8); int windowcount = 0; int windowcount_max = 8; @@ -59,7 +58,7 @@ nhwindow::~nhwindow() } -void nhwindow::add_menuitem(string str, bool preselected, void *identifier, char accelerator, int glyph) +void nhwindow::add_menuitem(std::string str, bool preselected, void *identifier, char accelerator, int glyph) { items.push_back(menuitem(str, preselected, identifier, accelerator, glyph)); } vultures/winclass/nhwindow.cpp @@ -6,26 +6,24 @@ #include "menuitem.h" #include <string> #include <list> -using std::string; -using std::list; class window; class nhwindow { public: - typedef list<menuitem>::iterator item_iterator; + typedef std::list<menuitem>::iterator item_iterator; nhwindow(int type); ~nhwindow(); - void add_menuitem(string str, bool preselected, void *identifier, char accelerator, int glyph); + void add_menuitem(std::string str, bool preselected, void *identifier, char accelerator, int glyph); void reset(); int id; int type; int ending_type; - string caption; + std::string caption; window *impl; - list<menuitem> items; + std::list<menuitem> items; bool has_objects; }; vultures/winclass/nhwindow.h @@ -8,7 +8,7 @@ #include "objheaderwin.h" -objheaderwin::objheaderwin(window *parent, string cap) : window(parent) +objheaderwin::objheaderwin(window *parent, std::string cap) : window(parent) { v_type = V_WINTYPE_OBJITEMHEADER; w = V_LISTITEM_WIDTH; vultures/winclass/objheaderwin.cpp @@ -9,7 +9,7 @@ class objheaderwin : public window { public: - objheaderwin(window *parent, string cap); + objheaderwin(window *parent, std::string cap); virtual bool draw(); }; vultures/winclass/objheaderwin.h @@ -11,7 +11,7 @@ #include "objitemwin.h" -objitemwin::objitemwin(window *p, menuitem* mi, string cap, char accel, +objitemwin::objitemwin(window *p, menuitem* mi, std::string cap, char accel, int glyph, bool selected, bool multiselect) : optionwin(p, mi, cap, accel, glyph, selected, multiselect) { @@ -29,28 +29,11 @@ bool objitemwin::draw() { char tmpstr[32]; int text_start_x, text_start_y, txt_height; - int tile_x, tile_y; int x = abs_x; int y = abs_y; - int tile = 0; int weight = 0; Uint32 textcolor; - if (obj) { - tile = vultures_object_to_tile(obj->otyp, -1, -1, obj); - weight = obj->owt; - - tile_x = x + h/2; - tile_y = y + h * 3 / 4; - - if (TILE_IS_OBJECT(tile)) - { - tile = tile - OBJTILEOFFSET + ICOTILEOFFSET; - tile_x = x + 2; - tile_y = y + 2; - } - } - vultures_set_draw_region(x, y, x + w - 1, y + h - 1); /* re-set the background to prevent shadings from stacking repatedly until they become solid */ @@ -136,7 +119,25 @@ bool objitemwin::draw() vultures_fill_rect(x + 2, y + 2, x + h - 3, y + h - 3, CLR32_CURSE_RED); /* draw the object tile */ - vultures_put_tile(tile_x, tile_y, tile); + if (obj) { + int tile_x, tile_y; + int tile = 0; + + tile = vultures_object_to_tile(obj->otyp, -1, -1, obj); + weight = obj->owt; + + tile_x = x + h/2; + tile_y = y + h * 3 / 4; + + if (TILE_IS_OBJECT(tile)) + { + tile = tile - OBJTILEOFFSET + ICOTILEOFFSET; + tile_x = x + 2; + tile_y = y + 2; + } + + vultures_put_tile(tile_x, tile_y, tile); + } /* draw the item letter on the top left corner of the object tile */ snprintf(tmpstr, 11, "%c", accelerator); vultures/winclass/objitemwin.cpp @@ -10,7 +10,7 @@ struct obj; class objitemwin : public optionwin { public: - objitemwin(window *p, menuitem* mi, string cap, + objitemwin(window *p, menuitem* mi, std::string cap, char accel, int glyph, bool selected, bool multiselect); virtual bool draw(); virtual eventresult handle_mousemotion_event(window* target, void* result, vultures/winclass/objitemwin.h @@ -9,7 +9,7 @@ #include "vultures_txt.h" -optionwin::optionwin(window *p, menuitem* mi, string cap, char accel, +optionwin::optionwin(window *p, menuitem* mi, std::string cap, char accel, int glyph, bool selected, bool is_checkbox) : window(p), glyph(glyph), item(mi), is_checkbox(is_checkbox) { vultures/winclass/optionwin.cpp @@ -12,7 +12,7 @@ class menuitem; class optionwin : public window { public: - optionwin(window *p, menuitem* mi, string cap, + optionwin(window *p, menuitem* mi, std::string cap, char accel, int glyph, bool selected, bool is_checkbox); virtual bool draw(); vultures/winclass/optionwin.h @@ -80,7 +80,7 @@ int scrollwin::get_menuitem_width(window *item, int colwidths[8]) { int width, i, thiscol, btnwidth; size_t prevpos, pos; - string coltxt; + std::string coltxt; /* if this is an option leave space for the checkbox in the first column */ btnwidth = 0; @@ -88,7 +88,7 @@ int scrollwin::get_menuitem_width(window *item, int colwidths[8]) btnwidth = vultures_winelem.checkbox_off->w + 4; pos = item->caption.find_first_of('\t'); - if (pos == string::npos) + if (pos == std::string::npos) return vultures_text_length(V_FONT_MENU, item->caption) + btnwidth + 5; width = prevpos = i = 0; @@ -113,7 +113,7 @@ int scrollwin::get_menuitem_width(window *item, int colwidths[8]) prevpos = ++pos; i++; pos = item->caption.find_first_of('\t', prevpos); - } while (prevpos-1 != string::npos && i <= 7); + } while (prevpos-1 != std::string::npos && i <= 7); return width; } @@ -125,7 +125,7 @@ void scrollwin::layout(void) int i, elem_maxwidth, saved_scrollpos, height; int colwidths[8] = {0, 0, 0, 0, 0, 0, 0, 0}; int colstart[8] = {0, 0, 0, 0, 0, 0, 0, 0}; - string txt, orig_caption; + std::string txt, orig_caption; bool done = false; elem_maxwidth = height = 0; saved_scrollpos = scrollpos; @@ -176,7 +176,7 @@ void scrollwin::layout(void) done = false; /* skip over elements without tab chars */ pos = prevpos = winelem->caption.find_first_of('\t'); - if (pos == string::npos) + if (pos == std::string::npos) continue; orig_caption = winelem->caption; @@ -185,7 +185,7 @@ void scrollwin::layout(void) i = 1; do { pos = orig_caption.find_first_of('\t', prevpos); - if (pos == string::npos) + if (pos == std::string::npos) done = true; txt = orig_caption.substr(prevpos, pos - prevpos); trim(txt); vultures/winclass/scrollwin.cpp @@ -107,18 +107,18 @@ eventresult statuswin::handle_resize_event(window* target, void* result, int res } -void statuswin::parse_statusline(string str) +void statuswin::parse_statusline(std::string str) { int hp, hpmax, nconds; long val; - string txt; + std::string txt; int cap = near_capacity(); size_t pos; char buf[64]; /* get player name + title */ pos = str.find("St:", 0); - if (pos != string::npos) + if (pos != std::string::npos) tokenarray[0][0]->caption = str.substr(0, pos); /* strength needs special treatment */ @@ -273,7 +273,7 @@ void statuswin::parse_statusline(string str) } -void statuswin::add_cond(string str, int warnno, int color) +void statuswin::add_cond(std::string str, int warnno, int color) { static const point pos[9] = {{4,1}, {4,2}, {4,3}, {4,4}, {3,4}, {2,4}, {1,4}, {0,4}, {4,0}}; if (warnno >= 9) vultures/winclass/statuswin.cpp @@ -31,10 +31,10 @@ public: virtual eventresult handle_mousebuttonup_event(window* target, void* result, int mouse_x, int mouse_y, int button, int state); virtual eventresult handle_resize_event(window* target, void* result, int res_w, int res_h); - void parse_statusline(string str); + void parse_statusline(std::string str); private: - void add_cond(string str, int warnno, int color); + void add_cond(std::string str, int warnno, int color); SDL_Surface *statusbg; textwin *tokenarray[5][5]; }; vultures/winclass/statuswin.h @@ -8,7 +8,7 @@ #include "textwin.h" -textwin::textwin(window *p, string cap) : window(p) +textwin::textwin(window *p, std::string cap) : window(p) { v_type = V_WINTYPE_TEXT; caption = cap; @@ -56,7 +56,7 @@ bool textwin::draw() } -void textwin::set_caption(string str) +void textwin::set_caption(std::string str) { window::set_caption(str); w = vultures_text_length(V_FONT_MENU, caption) + 10; vultures/winclass/textwin.cpp @@ -9,9 +9,9 @@ class textwin : public window { public: - textwin(window *p, string cap); + textwin(window *p, std::string cap); textwin(window *p, int destsize); - virtual void set_caption(string str); + virtual void set_caption(std::string str); virtual bool draw(); int textcolor; vultures/winclass/textwin.h @@ -14,7 +14,7 @@ #include "map.h" -toolbar::toolbar(window *p, int menuid, bool visible, int x, int y, string imgfile, const tb_buttondesc buttons[5]) : window(p) +toolbar::toolbar(window *p, int menuid, bool visible, int x, int y, std::string imgfile, const tb_buttondesc buttons[5]) : window(p) { this->bgimage = vultures_load_graphic(imgfile); this->w = bgimage->w; vultures/winclass/toolbar.cpp @@ -16,7 +16,7 @@ class toolbar : public window { public: toolbar(window *p, int menuid, bool visible, int x, int y, - string imgfile, const tb_buttondesc buttons[5]); + std::string imgfile, const tb_buttondesc buttons[5]); virtual ~toolbar(); virtual bool draw(); virtual eventresult handle_timer_event(window* target, void* result, int time); vultures/winclass/toolbar.h @@ -84,7 +84,7 @@ window::~window() } -void window::set_caption(string str) +void window::set_caption(std::string str) { caption = str; } vultures/winclass/window.cpp @@ -10,7 +10,6 @@ #define V_LISTITEM_WIDTH 300 #define V_LISTITEM_HEIGHT 52 -using std::string; typedef enum { V_WINTYPE_NONE, /* only the root window has this type */ @@ -92,7 +91,7 @@ public: virtual ~window(); virtual bool draw() = 0; - virtual void set_caption(string str); + virtual void set_caption(std::string str); virtual void hide(); virtual void layout() {}; virtual void update_background(void); @@ -127,7 +126,7 @@ public: // protected: window_type v_type; - string caption; + std::string caption; char accelerator; vultures/winclass/window.h 9115f6f8070adee5b549f31c28fd76b30677a526 413741f0c81f63bba748d2f86f5a30b366f83925 Clive Crous clive@crous.co.za http://github.com/clivecrous/vultures/commit/9e2116868e4b5d5856504b94b0f39b9bdf46fbe1 9e2116868e4b5d5856504b94b0f39b9bdf46fbe1 2009-02-18T06:52:08-08:00 2009-02-18T06:52:08-08:00 Merge branch 'master' into export_tiles ba3fbfa0ccb3f3b20ad47ce4bf00eb5bb1f62cb9 Clive Crous clive@crous.co.za